From dcf8f73b2c558978add85031fe65f2607bbca057 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 24 Jan 2015 20:54:48 +0000 Subject: [PATCH] --- MagickCore/annotate.c | 3 ++- MagickCore/distort.c | 7 ------- coders/pict.c | 2 -- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index dcd385694..3670f9d51 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1463,7 +1463,8 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, x_offset++; if ((x_offset < 0) || (x_offset >= (ssize_t) image->columns)) { - q+=GetPixelChannels(image); + if (q != (Quantum *) NULL) + q+=GetPixelChannels(image); continue; } if (bitmap->bitmap.pixel_mode != ft_pixel_mode_mono) diff --git a/MagickCore/distort.c b/MagickCore/distort.c index f455aa93a..f49fa5ed7 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -423,13 +423,6 @@ static double *GenerateCoefficients(const Image *image, break; case PolynomialDistortion: /* number of coefficents depend on the given polynomal 'order' */ - if ( number_arguments <= 1 && (number_arguments-1)%cp_size != 0) - { - (void) ThrowMagickException(exception,GetMagickModule(),OptionError, - "InvalidArgument","%s : '%s'","Polynomial", - "Invalid number of args: order [CPs]..."); - return((double *) NULL); - } i = poly_number_terms(arguments[0]); number_coeff = 2 + i*number_values; if ( i == 0 ) { diff --git a/coders/pict.c b/coders/pict.c index c6a71b5db..e9d570a13 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -1398,8 +1398,6 @@ static Image *ReadPICTImage(const ImageInfo *image_info, file=fdopen(unique_file,"wb"); if ((unique_file == -1) || (file == (FILE *) NULL)) { - if (file != (FILE *) NULL) - (void) fclose(file); (void) RelinquishUniqueFileResource(read_info->filename); (void) CopyMagickString(image->filename,read_info->filename, MaxTextExtent); -- 2.40.0