(no commit message)

[imagemagick] / coders / ttf.c

diff --git a/coders/ttf.c b/coders/ttf.c
index 7f6544fa193f92d3907d798fc7061e59a2c5f375..c3f880375aaeef28c5686c352700027cfbcbfc4c 100644 (file)
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -17,7 +17,7 @@
 %                                 July 1992                                   %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
 %  dedicated to making software imaging solutions freely available.           %
 %                                                                             %
 %  You may not use this file except in compliance with the License.  You may  %
@@ -97,7 +97,7 @@ static MagickBooleanType IsPFA(const unsigned char *magick,const size_t length)
 {
   if (length < 14)
     return(MagickFalse);
-  if (LocaleNCompare((char *) magick,"%!PS-AdobeFont-1.0",14) == 0)
+  if (LocaleNCompare((char *) magick,"%!PS-AdobeFont",14) == 0)
     return(MagickTrue);
   return(MagickFalse);
 }
@@ -134,7 +134,7 @@ static MagickBooleanType IsTTF(const unsigned char *magick,const size_t length)
     return(MagickFalse);
   if (((int) magick[0] == 0x00) && ((int) magick[1] == 0x01) &&
       ((int) magick[2] == 0x00) && ((int) magick[3] == 0x00) &&
-      ((int) magick[4] == 0x0))
+      ((int) magick[4] == 0x00))
     return(MagickTrue);
   return(MagickFalse);
 }
@@ -187,9 +187,6 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   Image
     *image;
 
-  ssize_t
-    y;
-
   MagickBooleanType
     status;
 
@@ -203,6 +200,9 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   register PixelPacket
     *q;
 
+  ssize_t
+    y;
+
   /*
     Open image file.
   */
@@ -249,29 +249,30 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception)
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   draw_info->font=AcquireString(image->filename);
   ConcatenateString(&draw_info->primitive,"push graphic-context\n");
-  (void) FormatMagickString(buffer,MaxTextExtent," viewbox 0 0 %lu %lu\n",
-    (unsigned long) image->columns,(unsigned long) image->rows);
+  (void) FormatMagickString(buffer,MaxTextExtent," viewbox 0 0 %.20g %.20g\n",
+    (double) image->columns,(double) image->rows);
   ConcatenateString(&draw_info->primitive,buffer);
   ConcatenateString(&draw_info->primitive," font-size 18\n");
-  (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '",(long) y);
+  (void) FormatMagickString(buffer,MaxTextExtent," text 10,%.20g '",(double) y);
   ConcatenateString(&draw_info->primitive,buffer);
   text=EscapeString(Text,'"');
   ConcatenateString(&draw_info->primitive,text);
   text=DestroyString(text);
   (void) FormatMagickString(buffer,MaxTextExtent,"'\n");
   ConcatenateString(&draw_info->primitive,buffer);
-  y+=20*MultilineCensus((char *) Text)+20;
+  y+=20*(ssize_t) MultilineCensus((char *) Text)+20;
   for (i=12; i <= 72; i+=6)
   {
     y+=i+12;
     ConcatenateString(&draw_info->primitive," font-size 18\n");
-    (void) FormatMagickString(buffer,MaxTextExtent," text 10,%ld '%ld'\n",
-      (long) y,(long) i);
+    (void) FormatMagickString(buffer,MaxTextExtent," text 10,%.20g '%.20g'\n",
+      (double) y,(double) i);
     ConcatenateString(&draw_info->primitive,buffer);
-    (void) FormatMagickString(buffer,MaxTextExtent," font-size %ld\n",(long) i);
+    (void) FormatMagickString(buffer,MaxTextExtent," font-size %.20g\n",
+      (double) i);
     ConcatenateString(&draw_info->primitive,buffer);
-    (void) FormatMagickString(buffer,MaxTextExtent," text 50,%ld "
-      "'That which does not destroy me, only makes me stronger.'\n",(long) y);
+    (void) FormatMagickString(buffer,MaxTextExtent," text 50,%.20g "
+      "'That which does not destroy me, only makes me stronger.'\n",(double) y);
     ConcatenateString(&draw_info->primitive,buffer);
     if (i >= 24)
       i+=6;