commit 85a57106881158ef7c7399cf2d10da445cfd529c
author Vincent Povirk <vincent@codeweavers.com> Sun Aug 08 15:24:45 2010 -0500
committer Alexandre Julliard <julliard@winehq.org> Tue Aug 17 11:55:33 2010 +0200
tree 9d76faca092d6cf404166601b7a0902e90349bc0
parent e2b4d4e71329cb5328aeadef9cfe57f815e532fe

gdiplus: Don't require an HDC for the convert_unit function.

dlls/gdiplus/graphics.c

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index ada2c58..094ed61 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -84,6 +84,12 @@
     return ret;
 }
 
+static REAL graphics_res(GpGraphics *graphics)
+{
+    if (graphics->image) return graphics->image->xres;
+    else return (REAL)GetDeviceCaps(graphics->hdc, LOGPIXELSX);
+}
+
 static INT prepare_dc(GpGraphics *graphics, GpPen *pen)
 {
     HPEN gdipen;
@@ -108,7 +114,7 @@
         width = sqrt((pt[1].X - pt[0].X) * (pt[1].X - pt[0].X) +
                      (pt[1].Y - pt[0].Y) * (pt[1].Y - pt[0].Y)) / sqrt(2.0);
 
-        width *= pen->width * convert_unit(graphics->hdc,
+        width *= pen->width * convert_unit(graphics_res(graphics),
                               pen->unit == UnitWorld ? graphics->unit : pen->unit);
     }
 
@@ -156,7 +162,7 @@
     GpMatrix *matrix;
     int i;
 
-    unitscale = convert_unit(graphics->hdc, graphics->unit);
+    unitscale = convert_unit(graphics_res(graphics), graphics->unit);
 
     /* apply page scale */
     if(graphics->unit != UnitDisplay)
@@ -4602,7 +4608,7 @@
     stat = GdipCreateMatrix(&matrix);
     if (stat == Ok)
     {
-        unitscale = convert_unit(graphics->hdc, graphics->unit);
+        unitscale = convert_unit(graphics_res(graphics), graphics->unit);
 
         if(graphics->unit != UnitDisplay)
             unitscale *= graphics->scale;