From 71709bfb884744dbf7c9030810cc8599600ab7d3 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 25 Sep 2011 13:10:29 +0000 Subject: [PATCH] --- Install-windows.txt | 26 +++++++++++++------------- MagickCore/annotate.c | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Install-windows.txt b/Install-windows.txt index 378cb69bd..594f5a093 100644 --- a/Install-windows.txt +++ b/Install-windows.txt @@ -60,20 +60,22 @@ Configure Edit "magick_config.h" - Click on this button to bring up magick-config.h in Windows Notepad. Review and - optionally change any preprocessor defines in ImageMagick's magick_config.h - file to suit your needs. This file is copied to magick\magick_config.h. You - may safely open magick\magick_config.h, modify it, and recompile without - re-running the configure program. In fact, using Notepad to edit the copied - file may be preferable since it preserves the original magick_config.h file. + Click on this button to bring up magick-config.h in Windows Notepad. Review + and optionally change any preprocessor defines in ImageMagick's + magick_config.h file to suit your needs. This file is copied to + magick\magick_config.h. You may safely open magick\magick_config.h, modify + it, and recompile without re-running the configure program. In fact, using + Notepad to edit the copied file may be preferable since it preserves the + original magick_config.h file. Key user defines in magick_config.h include: MAGICKCORE_QUANTUM_DEPTH (default 16) - Specify the depth of the pixel component depth (8, 16, or 32). A value of 8 - uses half the memory than 16 and may run 30% faster, but provides 256 times - less color resolution than a value of 16. We recommend a quantum depth - of 16 because 16-bit images are becoming more prevalent on the Internet. + Specify the depth of the pixel component depth (8, 16, or 32). A value of + 8 uses half the memory than 16 and may run 30% faster, but provides 256 + times less color resolution than a value of 16. We recommend a quantum + depth of 16 because 16-bit images are becoming more prevalent on the + Internet. MAGICKCORE_INSTALLED_SUPPORT (default undefined) Define to build a ImageMagick which uses registry settings or embedded @@ -389,7 +391,7 @@ Building Your Custom Project The Windows binary distribution includes a number of demo projects that you can use as a template for your own custom project. For example, start with the Button project, generally located in the c:/Program - Files/ImageMagick-6.5.5-0/Magick++_demos folder. If not, be sure to select + Files/ImageMagick-7.0.0-0/Magick++_demos folder. If not, be sure to select Configuration Properties->C/C++->Preprocessor and set these definitions: NDEBUG @@ -399,5 +401,3 @@ Building Your Custom Project NeedFunctionPrototypes _DLL _MAGICKMOD_ - - diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 0579b63aa..3b4db8fff 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1229,7 +1229,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, metrics->bounds.y2=metrics->ascent+metrics->descent; metrics->underline_position=face->underline_position/64.0; metrics->underline_thickness=face->underline_thickness/64.0; - if (*draw_info->text == '\0') + if ((draw_info->text == (char *) NULL) || (*draw_info->text == '\0')) { (void) FT_Done_Face(face); (void) FT_Done_FreeType(library); -- 2.40.0