2010-07-20 Sebastien Pouliot <sebastien@ximian.com>

* image.c: Use DPI from source image when creating a Graphics instance from it. Fix bug #556181 [Backport r160638] svn path=/branches/mono-2-6/libgdiplus/; revision=160640
mono · Jul 21, 2010 · 3e91518 · 3e91518
1 parent a98047e
commit 3e91518
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/ChangeLog b/src/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Sebastien Pouliot  <sebastien@ximian.com>
+
+	* image.c: Use DPI from source image when creating a Graphics
+	instance from it. Fix bug #556181
+	[Backport r160638]
+
 2010-07-14  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* lineargradientbrush.c: Do not accept empty (width/height) 

diff --git a/src/image.c b/src/image.c
@@ -313,7 +313,8 @@ GdipGetImageGraphicsContext (GpImage *image, GpGraphics **graphics)
 				image->active_bitmap->width, image->active_bitmap->height, image->active_bitmap->stride);
 
 	gfx = gdip_graphics_new (surface);
-	gfx->dpi_x = gfx->dpi_y = gdip_get_display_dpi ();
+	gfx->dpi_x = image->active_bitmap->dpi_horz <= 0 ? gdip_get_display_dpi () : image->active_bitmap->dpi_horz;
+	gfx->dpi_y = image->active_bitmap->dpi_vert <= 0 ? gdip_get_display_dpi () : image->active_bitmap->dpi_vert;
 	cairo_surface_destroy (surface);
 
 	gfx->image = image;