From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 19 Mar 2012 11:27:53 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6014
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d84e4a1622795a8a43a1c9c375d923b58c60cb6;p=imagemagick

---

diff --git a/coders/pango.c b/coders/pango.c
index a9afcc3dc..32485ad42 100644
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -284,10 +284,19 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
     Render caption.
   */
   option=GetImageOption(image_info,"pango:markup");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
-    pango_layout_set_markup(layout,caption,-1);
-  else
+  if ((option == (const char *) NULL) || (IsMagickTrue(option) == MagickFalse))
     pango_layout_set_text(layout,caption,-1);
+  else
+    {
+      GError
+        *error;
+
+      error=(GError *) NULL;
+      if (pango_parse_markup(caption,-1,0,NULL,NULL,NULL,&error) == 0)
+        (void) ThrowMagickException(exception,GetMagickModule(),CoderError,
+          error->message,"`%s'",image_info->filename);
+      pango_layout_set_markup(layout,caption,-1);
+    }
   pango_layout_context_changed(layout);
   page.x=0;
   page.y=0;