Andrew Eikum : d2d1: Implement d2d_transformed_geometry_FillContainsPoint( ).
Alexandre Julliard
julliard at winehq.org
Wed Oct 26 14:50:09 CDT 2016
Module: wine
Branch: master
Commit: 930dd951b3e0325f05a6e28c0ff37480b04c0aeb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=930dd951b3e0325f05a6e28c0ff37480b04c0aeb
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Wed Oct 26 15:20:21 2016 +0200
d2d1: Implement d2d_transformed_geometry_FillContainsPoint().
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d2d1/geometry.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/dlls/d2d1/geometry.c b/dlls/d2d1/geometry.c
index 9fa1783..57dcce2 100644
--- a/dlls/d2d1/geometry.c
+++ b/dlls/d2d1/geometry.c
@@ -2627,10 +2627,17 @@ static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_StrokeContainsPoint(ID
static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_FillContainsPoint(ID2D1TransformedGeometry *iface,
D2D1_POINT_2F point, const D2D1_MATRIX_3X2_F *transform, float tolerance, BOOL *contains)
{
- FIXME("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p stub!\n",
+ struct d2d_geometry *geometry = impl_from_ID2D1TransformedGeometry(iface);
+ D2D1_MATRIX_3X2_F g;
+
+ TRACE("iface %p, point {%.8e, %.8e}, transform %p, tolerance %.8e, contains %p.\n",
iface, point.x, point.y, transform, tolerance, contains);
- return E_NOTIMPL;
+ g = geometry->transform;
+ if (transform)
+ d2d_matrix_multiply(&g, transform);
+
+ return ID2D1Geometry_FillContainsPoint(geometry->u.transformed.src_geometry, point, &g, tolerance, contains);
}
static HRESULT STDMETHODCALLTYPE d2d_transformed_geometry_CompareWithGeometry(ID2D1TransformedGeometry *iface,
More information about the wine-cvs
mailing list