(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 007f7d36f1a764232f584e173fa38447f3295dbb..7b2813afe0247b27cb3e56477c50850735d6fde0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2010-03-13  6.6.0-6 Cristy  <quetzlzacatenango@image...>
   * Add support for the Adobe Large Document format.
   * Recognize -remap option for the mogrify utility.
+  * The default Helvetica font is not always available, check for
+    Century Schoolbook too (reference
+    http://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=15780).
 
 2010-03-11  6.6.0-5 Cristy  <quetzlzacatenango@image...>
   * Permit user to get virtual pixels with a region width of 0.

diff --git a/magick/annotate.c b/magick/annotate.c
index 9676b5fab60874e7139e3d6917a4527fb92c5290..b42512a86500209a912861eea6473ceaec4d80fd 100644 (file)
--- a/magick/annotate.c
+++ b/magick/annotate.c
@@ -817,10 +817,10 @@ static MagickBooleanType RenderType(Image *image,const DrawInfo *draw_info,
           TypeWarning,"UnableToReadFont","`%s'",draw_info->family);
     }
   if (type_info == (const TypeInfo *) NULL)
-    type_info=GetTypeInfoByFamily("arial",draw_info->style,
+    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("helvetica",draw_info->style,
+    type_info=GetTypeInfoByFamily("Helvetica",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,

diff --git a/magick/type.c b/magick/type.c
index 7856715caff38618c81b11651ffb96dd69328fae..2204ff08c3a43d78e6d38c5d6c44ab5c7b3b1e8a 100644 (file)
--- a/magick/type.c
+++ b/magick/type.c
@@ -248,7 +248,7 @@ MagickExport const TypeInfo *GetTypeInfoByFamily(const char *family,
   register long
     i;
 
-  static Fontmap
+  static const Fontmap
     fontmap[] =
     {
       { "fixed", "courier" },