Henri Verbeet : d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap ().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b313680ab4d723fb6fc45581e3dfca9958bfe526
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b313680ab4d723fb6fc45581e3...

Author: Henri Verbeet 
Date:   Thu Apr 23 20:23:25 2015 +0200

d2d1: Take scaling into account for the source offset in d2d_d3d_render_target_DrawBitmap().

---

dlls/d2d1/render_target.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c
index f8bdf95..757cdac 100644
--- a/dlls/d2d1/render_target.c
+++ b/dlls/d2d1/render_target.c
@@ -779,10 +779,10 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawBitmap(ID2D1RenderTarget
     brush_desc.opacity = opacity;
     brush_desc.transform._11 = fabsf((d.right - d.left) / (s.right - s.left));
     brush_desc.transform._21 = 0.0f;
-    brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right);
+    brush_desc.transform._31 = min(d.left, d.right) - min(s.left, s.right) * brush_desc.transform._11;
     brush_desc.transform._12 = 0.0f;
     brush_desc.transform._22 = fabsf((d.bottom - d.top) / (s.bottom - s.top));
-    brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom);
+    brush_desc.transform._32 = min(d.top, d.bottom) - min(s.top, s.bottom) * brush_desc.transform._22;

if (FAILED(hr = ID2D1RenderTarget_CreateBitmapBrush(iface, bitmap, &bitmap_brush_desc, &brush_desc, &brush)))
     {