From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 19 Apr 2012 14:21:04 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5768
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98af444820c7204a6364dfe8e0a1b34d3f4223d9;p=imagemagick

---

diff --git a/coders/svg.c b/coders/svg.c
index 0469b76ab..88116fab3 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2734,18 +2734,6 @@ static void SVGExternalSubset(void *context,const xmlChar *name,
   parser->inputTab=parser_context.inputTab;
 }
 
-#if defined(MAGICKCORE_RSVG_DELEGATE)
-static void SVGSetImageSize(int *width,int *height,gpointer context)
-{
-  Image
-    *image;
-
-  image=(Image *) context;
-  *width=(int) (*width*image->resolution.x/72.0);
-  *height=(int) (*height*image->resolution.y/72.0);
-}
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif
@@ -2847,7 +2835,6 @@ 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);
-      rsvg_handle_set_size_callback(svg_handle,SVGSetImageSize,image,NULL);
       if ((image->resolution.x != 72.0) && (image->resolution.y != 72.0))
         rsvg_handle_set_dpi_x_y(svg_handle,image->resolution.x,
           image->resolution.y);
@@ -2876,10 +2863,6 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image->matte=MagickTrue;
       SetImageProperty(image,"svg:base-uri",
         rsvg_handle_get_base_uri(svg_handle),exception);
-      SetImageProperty(image,"svg:title",rsvg_handle_get_title(svg_handle),
-        exception);
-      SetImageProperty(image,"svg:description",
-        rsvg_handle_get_desc(svg_handle),exception);
       if ((image->columns == 0) || (image->rows == 0))
         {
 #if !defined(MAGICKCORE_CAIRO_DELEGATE)
@@ -3140,7 +3123,7 @@ ModuleExport size_t RegisterSVGImage(void)
   (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MaxTextExtent);
 #endif
 #if defined(MAGICKCORE_RSVG_DELEGATE)
-  rsvg_init();
+  g_type_init();
   (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d",
     LIBRSVG_MAJOR_VERSION,LIBRSVG_MINOR_VERSION,LIBRSVG_MICRO_VERSION);
 #endif
@@ -3208,9 +3191,6 @@ ModuleExport void UnregisterSVGImage(void)
   (void) UnregisterMagickInfo("SVGZ");
   (void) UnregisterMagickInfo("SVG");
   (void) UnregisterMagickInfo("MSVG");
-#if defined(MAGICKCORE_RSVG_DELEGATE)
-  rsvg_term();
-#endif
 }
 
 /*