From cbb34a4def108d6db032ca9631a433afd3ea5a5d Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 16 Mar 2010 01:45:18 +0000 Subject: [PATCH] --- ChangeLog | 3 +++ magick/annotate.c | 4 ++-- magick/type.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 007f7d36f..7b2813afe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2010-03-13 6.6.0-6 Cristy * 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 * Permit user to get virtual pixels with a region width of 0. diff --git a/magick/annotate.c b/magick/annotate.c index 9676b5fab..b42512a86 100644 --- 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 7856715ca..2204ff08c 100644 --- 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" }, -- 2.50.1