From c88f4d452fe56088b317fce165818513a05da4aa Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 2 Nov 2011 11:06:32 +0100 Subject: [PATCH] gdi32: Get rid of the get_bitmap_image helper. --- dlls/gdi32/bitmap.c | 21 --------------------- dlls/gdi32/gdi_private.h | 1 - 2 files changed, 22 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a1587357268..7407906a0a5 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -297,27 +297,6 @@ HBITMAP WINAPI CreateBitmapIndirect( const BITMAP *bmp ) } -/* convenience wrapper for GetImage to retrieve the full contents of a bitmap */ -BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) -{ - struct bitblt_coords src; - BOOL ret = FALSE; - BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ); - - if (bmp) - { - const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); - src.visrect.left = src.x = 0; - src.visrect.top = src.y = 0; - src.visrect.right = src.width = bmp->bitmap.bmWidth; - src.visrect.bottom = src.height = bmp->bitmap.bmHeight; - ret = !funcs->pGetImage( NULL, hbitmap, info, bits, &src ); - GDI_ReleaseObj( hbitmap ); - } - return ret; -} - - /*********************************************************************** * GetBitmapBits [GDI32.@] * diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3dfd9a50eec..9e40fc52625 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -229,7 +229,6 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* bitmap.c */ -extern BOOL get_bitmap_image( HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; extern HBITMAP BITMAP_CopyBitmap( HBITMAP hbitmap ) DECLSPEC_HIDDEN; extern BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, PHYSDEV physdev ) DECLSPEC_HIDDEN;