Michael Stefaniuc : dwrite: Use SetRect() instead of open coding it.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue May 3 11:15:34 CDT 2016
Module: wine
Branch: master
Commit: 41729840e4085ac35b0ca47a512caf02b46afd0c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=41729840e4085ac35b0ca47a512caf02b46afd0c
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue May 3 11:32:33 2016 +0200
dwrite: Use SetRect() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dwrite/freetype.c | 5 +----
dlls/dwrite/gdiinterop.c | 4 +---
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c
index ec85579..d8afa69 100644
--- a/dlls/dwrite/freetype.c
+++ b/dlls/dwrite/freetype.c
@@ -603,10 +603,7 @@ void freetype_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap)
LeaveCriticalSection(&freetype_cs);
/* flip Y axis */
- bitmap->bbox.left = bbox.xMin;
- bitmap->bbox.right = bbox.xMax;
- bitmap->bbox.top = -bbox.yMax;
- bitmap->bbox.bottom = -bbox.yMin;
+ SetRect(&bitmap->bbox, bbox.xMin, -bbox.yMax, bbox.xMax, -bbox.yMin);
}
static BOOL freetype_get_aliased_glyph_bitmap(struct dwrite_glyphbitmap *bitmap, FT_Glyph glyph)
diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c
index 84b463a..ede1a12 100644
--- a/dlls/dwrite/gdiinterop.c
+++ b/dlls/dwrite/gdiinterop.c
@@ -339,9 +339,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac
if (FAILED(hr))
return hr;
- target.left = target.top = 0;
- target.right = This->size.cx;
- target.bottom = This->size.cy;
+ SetRect(&target, 0, 0, This->size.cx, This->size.cy);
if (rendermode == DWRITE_RENDERING_MODE_OUTLINE) {
static const XFORM identity = { 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f };
More information about the wine-cvs
mailing list