From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 24 May 2010 13:13:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~9402
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7a693874a87122c0ed9cf4aebcce3c58d3d8b137;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index ea593f21d..a03e4636c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-05-24  6.6.2-1 Cristy  <quetzlzacatenango@image...>
+  * Respect density when rendering SVG images.
+
 2010-05-23  6.6.2.0 Anthony Thyssen <A.Thyssen@griffith...>
   * Third Re-write of MorphologyApply() to better handle compound methods.
   * Implemented  -set option:morphology:compose for merging results of
diff --git a/coders/svg.c b/coders/svg.c
index 746833b8f..385ff0da1 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2657,7 +2657,6 @@ static void SVGExternalSubset(void *context,const xmlChar *name,
 }
 
 #if defined(MAGICKCORE_RSVG_DELEGATE)
-#if !defined(MAGICKCORE_CAIRO_DELEGATE)
 static void SVGSetImageSize(int *width,int *height,gpointer context)
 {
   Image
@@ -2668,7 +2667,6 @@ static void SVGSetImageSize(int *width,int *height,gpointer context)
   *height=(int) (*height*image->y_resolution/72.0);
 }
 #endif
-#endif
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
@@ -2771,9 +2769,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
       if (svg_handle == (RsvgHandle *) NULL)
         ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
       rsvg_handle_set_base_uri(svg_handle,image_info->filename);
-#if !defined(MAGICKCORE_CAIRO_DELEGATE)
       rsvg_handle_set_size_callback(svg_handle,SVGSetImageSize,image,NULL);
-#endif
       if ((image->x_resolution != 72.0) && (image->y_resolution != 72.0))
         rsvg_handle_set_dpi_x_y(svg_handle,image->x_resolution,
           image->y_resolution);