From: Bob Friesenhahn Date: Sat, 27 Sep 2014 07:37:31 +0000 (+0100) Subject: AnnotateImage() should not treat empty text primitive as an error X-Git-Tag: archive/raspbian/1.4+really1.3.36+hg16442-1+rpi1~1^2^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10cf5d1dd8e61933f08b825e4048f029f0683a6f;p=graphicsmagick.git AnnotateImage() should not treat empty text primitive as an error Origin: upstream, https://sourceforge.net/p/graphicsmagick/code/ci/6a495ea9d47f42d8e900ac10e7be45892d052feb/ Bug-Debian: https://bugs.debian.org/759956 Last-Update: 2014-09-27 Gbp-Pq: Name AnnotateImage_fix.patch --- diff --git a/magick/annotate.c b/magick/annotate.c index d245678..7602db5 100644 --- a/magick/annotate.c +++ b/magick/annotate.c @@ -194,7 +194,7 @@ MagickExport MagickPassFail AnnotateImage(Image *image,const DrawInfo *draw_info if (draw_info->text == (char *) NULL) return(MagickFail); if (*draw_info->text == '\0') - return(MagickFail); + return(MagickPass); text=TranslateText((ImageInfo *) NULL,image,draw_info->text); if (text == (char *) NULL) ThrowBinaryException3(ResourceLimitError,MemoryAllocationFailed,