From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 1 Oct 2016 16:21:15 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/273
X-Git-Tag: 7.0.3-2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=23f956b4fbe8b8ed704662015227d650ecc20e2c;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/273
---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index c43f91496..5e92ae27e 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -920,6 +920,8 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info,
         }
       if (*draw_info->font == '-')
         return(RenderX11(image,draw_info,offset,metrics,exception));
+      if (*draw_info->font == '^')
+        return(RenderPostscript(image,draw_info,offset,metrics,exception));
       if (IsPathAccessible(draw_info->font) != MagickFalse)
         {
           status=RenderFreetype(image,draw_info,draw_info->encoding,offset,
@@ -1333,7 +1335,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       (void) FT_Done_FreeType(library);
       (void) ThrowMagickException(exception,GetMagickModule(),TypeError,
         "UnableToReadFont","`%s'",draw_info->font);
-      return(RenderPostscript(image,draw_info,offset,metrics,exception));
+      return(MagickFalse);
     }
   if ((draw_info->metrics != (char *) NULL) &&
       (IsPathAccessible(draw_info->metrics) != MagickFalse))
diff --git a/coders/ps.c b/coders/ps.c
index 90cf62218..e85e2bfc2 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -980,7 +980,8 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
     }
   do
   {
-    (void) CopyMagickString(postscript_image->filename,filename,MagickPathExtent);
+    (void) CopyMagickString(postscript_image->filename,filename,
+      MagickPathExtent);
     (void) CopyMagickString(postscript_image->magick,image->magick,
       MagickPathExtent);
     if (columns != 0)