]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Wed, 2 Jan 2013 19:19:21 +0000 (19:19 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Wed, 2 Jan 2013 19:19:21 +0000 (19:19 +0000)
coders/pango.c

index c61eac39291962e2bfe72fd3efe07d35a306a976..945ac0380c33fe64c9d54cedbfdd18f610cfdb84 100644 (file)
@@ -193,7 +193,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   */
   fontmap=pango_cairo_font_map_new();
   pango_cairo_font_map_set_resolution(PANGO_CAIRO_FONT_MAP(fontmap),
-    image->resolution.x == 0.0 ? 72.0 : image->resolution.x);
+    image->resolution.x == 0.0 ? 90.0 : image->resolution.x);
   font_options=cairo_font_options_create();
   option=GetImageOption(image_info,"pango:hinting");
   if (option != (const char *) NULL)
@@ -293,8 +293,8 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   option=GetImageOption(image_info,"pango:indent");
   if (option != (const char *) NULL)
     pango_layout_set_indent(layout,(int) ((StringToLong(option)*
-      (image->resolution.x == 0.0 ? 72.0 : image->resolution.x)*PANGO_SCALE+36)/
-      72.0+0.5));
+      (image->resolution.x == 0.0 ? 90.0 : image->resolution.x)*PANGO_SCALE+36)/
+      90.0+0.5));
   switch (draw_info->align)
   {
     case CenterAlign: align=PANGO_ALIGN_CENTER; break;
@@ -357,7 +357,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     {
       image->columns-=2*page.x;
       pango_layout_set_width(layout,(int) ((PANGO_SCALE*image->columns*
-        (image->resolution.x == 0.0 : 72.0 : image->resolution.x)+36.0)/72.0+
+        (image->resolution.x == 0.0 : 90.0 : image->resolution.x)+36.0)/90.0+
         0.5));
     }
   if (image->rows == 0)
@@ -369,7 +369,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     {
       image->rows-=2*page.y;
       pango_layout_set_height(layout,(int) ((PANGO_SCALE*image->rows*
-        (image->resolution.y == 0.0 : 72.0 : image->resolution.y)+36.0)/72.0+
+        (image->resolution.y == 0.0 : 90.0 : image->resolution.y)+36.0)/90.0+
         0.5));
     }
   /*