(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 517758fa3363187beeac973b876a0cbf0432a0bf..2a3880fc555551200c2726f14d5ce655a4b63a86 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1076,7 +1076,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     encoding_type;
 
   FT_Error
-    status;
+    ft_status;
 
   FT_Face
     face;
@@ -1100,6 +1100,9 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     glyph,
     last_glyph;
 
+  MagickBooleanType
+    status;
+
   PointInfo
     point,
     resolution;
@@ -1127,8 +1130,8 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
   /*
     Initialize Truetype library.
   */
-  status=FT_Init_FreeType(&library);
-  if (status != 0)
+  ft_status=FT_Init_FreeType(&library);
+  if (ft_status != 0)
     ThrowBinaryException(TypeError,"UnableToInitializeFreetypeLibrary",
       image->filename);
   args.flags=FT_OPEN_PATHNAME;
@@ -1140,9 +1143,9 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
     else
       args.pathname=ConstantString(draw_info->font+1);
   face=(FT_Face) NULL;
-  status=FT_Open_Face(library,&args,(long) draw_info->face,&face);
+  ft_status=FT_Open_Face(library,&args,(long) draw_info->face,&face);
   args.pathname=DestroyString(args.pathname);
-  if (status != 0)
+  if (ft_status != 0)
     {
       (void) FT_Done_FreeType(library);
       (void) ThrowMagickException(exception,GetMagickModule(),TypeError,
@@ -1153,9 +1156,9 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       (IsPathAccessible(draw_info->metrics) != MagickFalse))
     (void) FT_Attach_File(face,draw_info->metrics);
   encoding_type=ft_encoding_unicode;
-  status=FT_Select_Charmap(face,encoding_type);
-  if ((status != 0) && (face->num_charmaps != 0))
-    status=FT_Set_Charmap(face,face->charmaps[0]);
+  ft_status=FT_Select_Charmap(face,encoding_type);
+  if ((ft_status != 0) && (face->num_charmaps != 0))
+    ft_status=FT_Set_Charmap(face,face->charmaps[0]);
   if (encoding != (const char *) NULL)
     {
       if (LocaleCompare(encoding,"AdobeCustom") == 0)
@@ -1188,8 +1191,8 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
         encoding_type=ft_encoding_unicode;
       if (LocaleCompare(encoding,"Wansung") == 0)
         encoding_type=ft_encoding_wansung;
-      status=FT_Select_Charmap(face,encoding_type);
-      if (status != 0)
+      ft_status=FT_Select_Charmap(face,encoding_type);
+      if (ft_status != 0)
         ThrowBinaryException(TypeError,"UnrecognizedFontEncoding",encoding);
     }
   /*
@@ -1211,7 +1214,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       if ((flags & SigmaValue) == 0)
         resolution.y=resolution.x;
     }
-  status=FT_Set_Char_Size(face,(FT_F26Dot6) (64.0*draw_info->pointsize),
+  ft_status=FT_Set_Char_Size(face,(FT_F26Dot6) (64.0*draw_info->pointsize),
     (FT_F26Dot6) (64.0*draw_info->pointsize),(FT_UInt) resolution.x,
     (FT_UInt) resolution.y);
   metrics->pixels_per_em.x=face->size->metrics.x_ppem;
@@ -1304,6 +1307,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       if (utf8 != (unsigned char *) NULL)
         p=(char *) utf8;
     }
+  status=MagickTrue;
   for (code=0; GetUTFCode(p) != 0; p+=GetUTFOctets(p))
   {
     /*
@@ -1322,22 +1326,22 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
               FT_Vector
                 kerning;
 
-              status=FT_Get_Kerning(face,last_glyph.id,glyph.id,
+              ft_status=FT_Get_Kerning(face,last_glyph.id,glyph.id,
                 ft_kerning_default,&kerning);
-              if (status == 0)
+              if (ft_status == 0)
                 origin.x+=(FT_Pos) (direction*kerning.x);
             }
         }
     glyph.origin=origin;
-    status=FT_Load_Glyph(face,glyph.id,flags);
-    if (status != 0)
+    ft_status=FT_Load_Glyph(face,glyph.id,flags);
+    if (ft_status != 0)
       continue;
-    status=FT_Get_Glyph(face->glyph,&glyph.image);
-    if (status != 0)
+    ft_status=FT_Get_Glyph(face->glyph,&glyph.image);
+    if (ft_status != 0)
       continue;
-    status=FT_Outline_Get_BBox(&((FT_OutlineGlyph) glyph.image)->outline,
+    ft_status=FT_Outline_Get_BBox(&((FT_OutlineGlyph) glyph.image)->outline,
       &bounds);
-    if (status != 0)
+    if (ft_status != 0)
       continue;
     if ((p == draw_info->text) || (bounds.xMin < metrics->bounds.x1))
       metrics->bounds.x1=(double) bounds.xMin;
@@ -1347,23 +1351,25 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       metrics->bounds.x2=(double) bounds.xMax;
     if ((p == draw_info->text) || (bounds.yMax > metrics->bounds.y2))
       metrics->bounds.y2=(double) bounds.yMax;
-    if (draw_info->render != MagickFalse)
-      if ((draw_info->stroke.alpha != TransparentAlpha) ||
-          (draw_info->stroke_pattern != (Image *) NULL))
-        {
-          /*
-            Trace the glyph.
-          */
-          annotate_info->affine.tx=glyph.origin.x/64.0;
-          annotate_info->affine.ty=glyph.origin.y/64.0;
-          (void) FT_Outline_Decompose(&((FT_OutlineGlyph) glyph.image)->
-            outline,&OutlineMethods,annotate_info);
+    if ((draw_info->stroke.alpha != TransparentAlpha) ||
+        (draw_info->stroke_pattern != (Image *) NULL))
+      {
+        if ((status != MagickFalse) && (draw_info->render != MagickFalse))
+          {
+            /*
+              Trace the glyph.
+            */
+            annotate_info->affine.tx=glyph.origin.x/64.0;
+            annotate_info->affine.ty=glyph.origin.y/64.0;
+            (void) FT_Outline_Decompose(&((FT_OutlineGlyph) glyph.image)->
+              outline,&OutlineMethods,annotate_info);
+          }
         }
     FT_Vector_Transform(&glyph.origin,&affine);
     (void) FT_Glyph_Transform(glyph.image,&affine,&glyph.origin);
-    status=FT_Glyph_To_Bitmap(&glyph.image,ft_render_mode_normal,
+    ft_status=FT_Glyph_To_Bitmap(&glyph.image,ft_render_mode_normal,
       (FT_Vector *) NULL,MagickTrue);
-    if (status != 0)
+    if (ft_status != 0)
       continue;
     bitmap=(FT_BitmapGlyph) glyph.image;
     point.x=offset->x+bitmap->left;
@@ -1375,16 +1381,12 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
         CacheView
           *image_view;
 
-        MagickBooleanType
-          status;
-
         register unsigned char
           *p;
 
         /*
           Rasterize the glyph.
         */
-        status=MagickTrue;
         image_view=AcquireAuthenticCacheView(image,exception);
         p=bitmap->bitmap.buffer;
         for (y=0; y < (ssize_t) bitmap->bitmap.rows; y++)
@@ -1492,7 +1494,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
   if ((draw_info->stroke.alpha != TransparentAlpha) ||
       (draw_info->stroke_pattern != (Image *) NULL))
     {
-      if (draw_info->render != MagickFalse)
+      if ((status != MagickFalse) && (draw_info->render != MagickFalse))
         {
           /*
             Draw text stroke.
@@ -1509,19 +1511,19 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
   */
   glyph.id=FT_Get_Char_Index(face,'_');
   glyph.origin=origin;
-  status=FT_Load_Glyph(face,glyph.id,flags);
-  if (status == 0)
+  ft_status=FT_Load_Glyph(face,glyph.id,flags);
+  if (ft_status == 0)
     {
-      status=FT_Get_Glyph(face->glyph,&glyph.image);
-      if (status == 0)
+      ft_status=FT_Get_Glyph(face->glyph,&glyph.image);
+      if (ft_status == 0)
         {
-          status=FT_Outline_Get_BBox(&((FT_OutlineGlyph) glyph.image)->outline,
-            &bounds);
-          if (status == 0)
+          ft_status=FT_Outline_Get_BBox(&((FT_OutlineGlyph) glyph.image)->
+            outline,&bounds);
+          if (ft_status == 0)
             {
               FT_Vector_Transform(&glyph.origin,&affine);
               (void) FT_Glyph_Transform(glyph.image,&affine,&glyph.origin);
-              status=FT_Glyph_To_Bitmap(&glyph.image,ft_render_mode_normal,
+              ft_status=FT_Glyph_To_Bitmap(&glyph.image,ft_render_mode_normal,
                 (FT_Vector *) NULL,MagickTrue);
               bitmap=(FT_BitmapGlyph) glyph.image;
               if (bitmap->left > metrics->width)
@@ -1544,7 +1546,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
   annotate_info=DestroyDrawInfo(annotate_info);
   (void) FT_Done_Face(face);
   (void) FT_Done_FreeType(library);
-  return(MagickTrue);
+  return(status);
 }
 #else
 static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,