- Revert 49927 "Update to trunk" as it breaks KsStudio (again)

[reactos.git] / dll / win32 / gdiplus / gdiplus_private.h

diff --git a/dll/win32/gdiplus/gdiplus_private.h b/dll/win32/gdiplus/gdiplus_private.h
index b78e459..eafed7c 100644 (file)
--- a/dll/win32/gdiplus/gdiplus_private.h
+++ b/dll/win32/gdiplus/gdiplus_private.h
@@ -47,9 +47,7 @@ extern INT arc2polybezier(GpPointF * points, REAL x1, REAL y1, REAL x2, REAL y2,
     REAL startAngle, REAL sweepAngle);
 extern REAL gdiplus_atan2(REAL dy, REAL dx);
 extern GpStatus hresult_to_status(HRESULT res);
-extern REAL convert_unit(REAL logpixels, GpUnit unit);
-
-extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics);
+extern REAL convert_unit(HDC hdc, GpUnit unit);
 
 extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1,
     REAL *y1, REAL *x2, REAL *y2);
@@ -152,12 +150,6 @@ struct GpGraphics{
     UINT textcontrast; /* not used yet. get/set only */
     struct list containers;
     GraphicsContainer contid; /* last-issued container ID */
-    /* For giving the caller an HDC when we technically can't: */
-    HBITMAP temp_hbitmap;
-    int temp_hbitmap_width;
-    int temp_hbitmap_height;
-    BYTE *temp_bits;
-    HDC temp_hdc;
 };
 
 struct GpBrush{
@@ -277,7 +269,6 @@ struct GpBitmap{
     HDC hdc;
     BYTE *bits; /* actual image bits if this is a DIB */
     INT stride; /* stride of bits if this is a DIB */
-    BYTE *own_bits; /* image bits that need to be freed with this object */
 };
 
 struct GpCachedBitmap{