Fix font family regression

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index bb27add1b62db5d18d0b4f6de0789d6095691d4d..b6db0e6c611509b50450b59ae265d4de7ad10225 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1012,32 +1012,37 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info,
   if ((type_info == (const TypeInfo *) NULL) &&
       (draw_info->family != (const char *) NULL))
     {
-      char
-        **family;
+      type_info=GetTypeInfoByFamily(draw_info->family,draw_info->style,
+        draw_info->stretch,draw_info->weight,exception);
+      if (type_info == (const TypeInfo *) NULL)
+        {
+          char
+            **family;
 
-      int
-        number_families;
+          int
+            number_families;
 
-      register ssize_t
-        i;
+          register ssize_t
+            i;
 
-      /*
-        Parse font family list.
-      */
-      family=StringToArgv(draw_info->family,&number_families);
-      for (i=1; i < (ssize_t) number_families; i++)
-      {
-        type_info=GetTypeInfoByFamily(family[i],draw_info->style,
-          draw_info->stretch,draw_info->weight,exception);
-        if (type_info != (const TypeInfo *) NULL)
-          break;
-      }
-      for (i=0; i < (ssize_t) number_families; i++)
-        family[i]=DestroyString(family[i]);
-      family=(char **) RelinquishMagickMemory(family);
-      if (type_info == (const TypeInfo *) NULL)
-        (void) ThrowMagickException(exception,GetMagickModule(),TypeWarning,
-          "UnableToReadFont","`%s'",draw_info->family);
+          /*
+            Parse font family list.
+          */
+          family=StringToArgv(draw_info->family,&number_families);
+          for (i=1; i < (ssize_t) number_families; i++)
+          {
+            type_info=GetTypeInfoByFamily(family[i],draw_info->style,
+              draw_info->stretch,draw_info->weight,exception);
+            if (type_info != (const TypeInfo *) NULL)
+              break;
+          }
+          for (i=0; i < (ssize_t) number_families; i++)
+            family[i]=DestroyString(family[i]);
+          family=(char **) RelinquishMagickMemory(family);
+          if (type_info == (const TypeInfo *) NULL)
+            (void) ThrowMagickException(exception,GetMagickModule(),TypeWarning,
+              "UnableToReadFont","`%s'",draw_info->family);
+        }
     }
   if (type_info == (const TypeInfo *) NULL)
     type_info=GetTypeInfoByFamily("Arial",draw_info->style,