ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d2d1: Implement d2d_bitmap_GetDpi().

This commit is contained in:
Henri Verbeet 2015-02-06 09:56:59 +01:00 committed by Alexandre Julliard
parent b270384dfb
commit 4b0f47cdbc
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/d2d1/bitmap.c
View File

@ -107,10 +107,12 @@ static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_bitmap_GetPixelFormat(ID2D1Bitm
static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y) static void STDMETHODCALLTYPE d2d_bitmap_GetDpi(ID2D1Bitmap *iface, float *dpi_x, float *dpi_y)
{ {
FIXME("iface %p, dpi_x %p, dpi_y %p stub!\n", iface, dpi_x, dpi_y); struct d2d_bitmap *bitmap = impl_from_ID2D1Bitmap(iface);
*dpi_x = 96.0f; TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y);
*dpi_y = 96.0f;
*dpi_x = bitmap->dpi_x;
*dpi_y = bitmap->dpi_y;
} }
static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface, static HRESULT STDMETHODCALLTYPE d2d_bitmap_CopyFromBitmap(ID2D1Bitmap *iface,
@ -161,4 +163,12 @@ void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *sr
bitmap->refcount = 1; bitmap->refcount = 1;
bitmap->pixel_size = size; bitmap->pixel_size = size;
bitmap->dpi_x = desc->dpiX;
bitmap->dpi_y = desc->dpiY;
if (bitmap->dpi_x == 0.0f && bitmap->dpi_y == 0.0f)
{
bitmap->dpi_x = 96.0f;
bitmap->dpi_y = 96.0f;
}
} }

2
dlls/d2d1/d2d1_private.h
View File

@ -154,6 +154,8 @@ struct d2d_bitmap
LONG refcount; LONG refcount;
D2D1_SIZE_U pixel_size; D2D1_SIZE_U pixel_size;
float dpi_x;
float dpi_y;
}; };
void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data, void d2d_bitmap_init(struct d2d_bitmap *bitmap, D2D1_SIZE_U size, const void *src_data,