From 06486f723b9f48240d0248a6b349ab92dafe8fc3 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 28 Jul 2018 09:22:11 -0400 Subject: [PATCH] ... --- coders/svg.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/coders/svg.c b/coders/svg.c index 5d5f3452f..93f6fa969 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -332,19 +332,19 @@ static double GetUserSpaceCoordinateValue(const SVGInfo *svg_info,int type, } GetNextToken(p,&p,MagickPathExtent,token); if (LocaleNCompare(token,"cm",2) == 0) - return(96.0*svg_info->scale[0]/2.54*value); + return(72.0*svg_info->scale[0]/2.54*value); if (LocaleNCompare(token,"em",2) == 0) return(svg_info->pointsize*value); if (LocaleNCompare(token,"ex",2) == 0) return(svg_info->pointsize*value/2.0); if (LocaleNCompare(token,"in",2) == 0) - return(96.0*svg_info->scale[0]*value); + return(72.0*svg_info->scale[0]*value); if (LocaleNCompare(token,"mm",2) == 0) - return(96.0*svg_info->scale[0]/25.4*value); + return(72.0*svg_info->scale[0]/25.4*value); if (LocaleNCompare(token,"pc",2) == 0) - return(96.0*svg_info->scale[0]/6.0*value); + return(72.0*svg_info->scale[0]/6.0*value); if (LocaleNCompare(token,"pt",2) == 0) - return(1.25*svg_info->scale[0]*value); + return(svg_info->scale[0]*value); if (LocaleNCompare(token,"px",2) == 0) return(value); return(value); @@ -3023,7 +3023,7 @@ static void SVGExternalSubset(void *context,const xmlChar *name, Static declarations. */ static char - SVGDensityGeometry[] = "96.0x96.0"; + SVGDensityGeometry[] = "72.0x72.0"; static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) @@ -3264,8 +3264,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) (ssize_t *) NULL,&image->columns,&image->rows); if ((image->columns != 0) || (image->rows != 0)) { - image->resolution.x=96.0*image->columns/dimension_info.width; - image->resolution.y=96.0*image->rows/dimension_info.height; + image->resolution.x=72.0*image->columns/dimension_info.width; + image->resolution.y=72.0*image->rows/dimension_info.height; if (fabs(image->resolution.x) < MagickEpsilon) image->resolution.x=image->resolution.y; else @@ -3279,8 +3279,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (apply_density != MagickFalse) { - image->columns=image->resolution.x*dimension_info.width/96.0; - image->rows=image->resolution.y*dimension_info.height/96.0; + image->columns=image->resolution.x*dimension_info.width/72.0; + image->rows=image->resolution.y*dimension_info.height/72.0; } else { @@ -3347,8 +3347,8 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) cairo_paint(cairo_image); cairo_set_operator(cairo_image,CAIRO_OPERATOR_OVER); if (apply_density != MagickFalse) - cairo_scale(cairo_image,image->resolution.x/96.0, - image->resolution.y/96.0); + cairo_scale(cairo_image,image->resolution.x/72.0, + image->resolution.y/72.0); rsvg_handle_render_cairo(svg_handle,cairo_image); cairo_destroy(cairo_image); cairo_surface_destroy(cairo_surface); -- 2.40.0