(no commit message)

[imagemagick] / coders / pango.c

diff --git a/coders/pango.c b/coders/pango.c
index c02c50f1d719716f32ae1d371b204b7dccf879fa..5d6221e40f6b55b88b506a460569257a47ef0d79 100644 (file)
--- a/coders/pango.c
+++ b/coders/pango.c
@@ -275,10 +275,10 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
         pango_layout_set_ellipsize(layout,PANGO_ELLIPSIZE_START);
     }
   option=GetImageOption(image_info,"pango:justify");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+  if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_justify(layout,1);
   option=GetImageOption(image_info,"pango:single-paragraph");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) != MagickFalse))
+  if (IfMagickTrue(IsStringTrue(option)))
     pango_layout_set_single_paragraph_mode(layout,1);
   option=GetImageOption(image_info,"pango:wrap");
   if (option != (const char *) NULL)
@@ -329,7 +329,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
       pango_font_description_free(description);
     }
   option=GetImageOption(image_info,"pango:markup");
-  if ((option != (const char *) NULL) && (IsMagickTrue(option) == MagickFalse))
+  if ((option != (const char *) NULL) && (IsStringTrue(option) == MagickFalse))
     pango_layout_set_text(layout,caption,-1);
   else
     {
@@ -374,7 +374,7 @@ static Image *ReadPANGOImage(const ImageInfo *image_info,
   */
   stride=(size_t) cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32,
     image->columns);
-  pixels=(unsigned char *) AcquireQuantumMemory(image->columns,stride*
+  pixels=(unsigned char *) AcquireQuantumMemory(image->rows,stride*
     sizeof(*pixels));
   if (pixels == (unsigned char *) NULL)
     {