]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 23 Mar 2010 13:08:21 +0000 (13:08 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 23 Mar 2010 13:08:21 +0000 (13:08 +0000)
magick/annotate.c

index e3faef0396439ece499b367e9212795b84037a95..21d23026298ac1d8f9bc2fbe04aac7d21251f22a 100644 (file)
@@ -816,18 +816,20 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info,
         (void) ThrowMagickException(&image->exception,GetMagickModule(),
           TypeWarning,"UnableToReadFont","`%s'",draw_info->family);
     }
-  if (type_info == (const TypeInfo *) NULL)
-    type_info=GetTypeInfoByFamily("Century Schoolbook",draw_info->style,
-      draw_info->stretch,draw_info->weight,&image->exception);
   if (type_info == (const TypeInfo *) NULL)
     type_info=GetTypeInfoByFamily("Arial",draw_info->style,
       draw_info->stretch,draw_info->weight,&image->exception);
   if (type_info == (const TypeInfo *) NULL)
     type_info=GetTypeInfoByFamily("Helvetica",draw_info->style,
       draw_info->stretch,draw_info->weight,&image->exception);
+  if (type_info == (const TypeInfo *) NULL)
+    type_info=GetTypeInfoByFamily("Century Schoolbook",draw_info->style,
+      draw_info->stretch,draw_info->weight,&image->exception);
   if (type_info == (const TypeInfo *) NULL)
     type_info=GetTypeInfoByFamily((const char *) NULL,draw_info->style,
       draw_info->stretch,draw_info->weight,&image->exception);
+  if (type_info == (const TypeInfo *) NULL)
+    type_info=GetTypeInfo("*",&image->exception);
   if (type_info == (const TypeInfo *) NULL)
     {
       status=RenderFreetype(image,draw_info,draw_info->encoding,offset,metrics);