From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 15 Mar 2012 00:20:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6041
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bafa870811628ddab665963123c0a414c98b6595;p=imagemagick

---

diff --git a/coders/pango.c b/coders/pango.c
index fd18ede12..8cba35c54 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -160,11 +160,11 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
   fontmap=(PangoFontMap *) pango_ft2_font_map_new();
   pango_ft2_font_map_set_resolution((PangoFT2FontMap *) fontmap,
     image->resolution.x,image->resolution.y);
-  option=GetImageOption(image_info,"caption:hinting");
+  option=GetImageOption(image_info,"pango:hinting");
   pango_ft2_font_map_set_default_substitute((PangoFT2FontMap *) fontmap,
     PangoSubstitute,(char *) option,NULL);
   context=pango_font_map_create_context(fontmap);
-  option=GetImageOption(image_info,"caption:language");
+  option=GetImageOption(image_info,"pango:language");
   if (option != (const char *) NULL)
     pango_context_set_language(context,pango_language_from_string(option));
   pango_context_set_base_dir(context,draw_info->direction ==
@@ -178,7 +178,7 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
     default: gravity=PANGO_GRAVITY_AUTO; break;
   }
   pango_context_set_base_gravity(context,gravity);
-  option=GetImageOption(image_info,"caption:gravity-hint");
+  option=GetImageOption(image_info,"pango:gravity-hint");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"line") == 0)
@@ -192,10 +192,10 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
     Configure layout.
   */
   layout=pango_layout_new(context);
-  option=GetImageOption(image_info,"caption:auto-dir");
+  option=GetImageOption(image_info,"pango:auto-dir");
   if (option != (const char *) NULL)
     pango_layout_set_auto_dir(layout,1);
-  option=GetImageOption(image_info,"caption:ellipsize");
+  option=GetImageOption(image_info,"pango:ellipsize");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"end") == 0)
@@ -207,13 +207,13 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
       if (LocaleCompare(option,"start") == 0)
         pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
     }
-  option=GetImageOption(image_info,"caption:justify");
+  option=GetImageOption(image_info,"pango:justify");
   if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
     pango_layout_set_justify(layout,1);
-  option=GetImageOption(image_info,"caption:single-paragraph");
+  option=GetImageOption(image_info,"pango:single-paragraph");
   if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
     pango_layout_set_single_paragraph_mode(layout,1);
-  option=GetImageOption(image_info,"caption:wrap");
+  option=GetImageOption(image_info,"pango:wrap");
   if (option != (const char *) NULL)
     {
       if (LocaleCompare(option,"char") == 0)
@@ -223,7 +223,7 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
       if (LocaleCompare(option,"word-char") == 0)
         pango_layout_set_wrap(layout,PANGO_WRAP_WORD_CHAR);
     }
-  option=GetImageOption(image_info,"caption:indent");
+  option=GetImageOption(image_info,"pango:indent");
   if (option != (const char *) NULL)
     pango_layout_set_indent(layout,(StringToLong(option)*image->resolution.x*
       PANGO_SCALE+36)/72);
@@ -256,7 +256,7 @@ static MagickBooleanType PangoImage(const ImageInfo *image_info,Image *image,
   /*
     Render caption.
   */
-  option=GetImageOption(image_info,"caption:markup");
+  option=GetImageOption(image_info,"pango:markup");
   if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
     pango_layout_set_markup(layout,draw_info->text,-1);
   else
@@ -415,7 +415,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     property=InterpretImageProperties(image_info,image,image_info->filename,
       exception);
   else
-    if (LocaleNCompare(option,"caption:",8) == 0)
+    if (LocaleNCompare(option,"pango:",8) == 0)
       property=InterpretImageProperties(image_info,image,option+8,exception);
     else
       property=InterpretImageProperties(image_info,image,option,exception);