[04/12] gdiplus: Get rid of convert_unit(). Resend.
Dmitry Timoshkov
dmitry at baikal.ru
Tue Aug 14 22:06:16 CDT 2012
---
dlls/gdiplus/gdiplus.c | 23 -----------------------
dlls/gdiplus/gdiplus_private.h | 1 -
2 files changed, 24 deletions(-)
diff --git a/dlls/gdiplus/gdiplus.c b/dlls/gdiplus/gdiplus.c
index 0146a0f..9ada462 100644
--- a/dlls/gdiplus/gdiplus.c
+++ b/dlls/gdiplus/gdiplus.c
@@ -320,29 +320,6 @@ GpStatus hresult_to_status(HRESULT res)
}
}
-/* converts a given unit to its value in inches */
-REAL convert_unit(REAL logpixels, GpUnit unit)
-{
- switch(unit)
- {
- case UnitInch:
- return logpixels;
- case UnitPoint:
- return logpixels / 72.0;
- case UnitDocument:
- return logpixels / 300.0;
- case UnitMillimeter:
- return logpixels / 25.4;
- case UnitWorld:
- ERR("cannot convert UnitWorld\n");
- return 0.0;
- case UnitPixel:
- case UnitDisplay:
- default:
- return 1.0;
- }
-}
-
/* converts a given unit to its value in pixels */
REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi)
{
diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h
index ac070fe..fbc6772 100644
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -48,7 +48,6 @@ extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2,
REAL startAngle, REAL sweepAngle) DECLSPEC_HIDDEN;
extern REAL gdiplus_atan2(REAL dy, REAL dx) DECLSPEC_HIDDEN;
extern GpStatus hresult_to_status(HRESULT res) DECLSPEC_HIDDEN;
-extern REAL convert_unit(REAL logpixels, GpUnit unit) DECLSPEC_HIDDEN;
extern REAL units_to_pixels(REAL units, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN;
extern REAL pixels_to_units(REAL pixels, GpUnit unit, REAL dpi) DECLSPEC_HIDDEN;
extern REAL units_scale(GpUnit from, GpUnit to, REAL dpi) DECLSPEC_HIDDEN;
--
1.7.11.4
More information about the wine-patches
mailing list