From: dirk Date: Thu, 9 Jan 2014 20:22:42 +0000 (+0000) Subject: Fixed newlines. X-Git-Tag: 7.0.1-0~2920 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c1e5200dbc332719a205fc2cf6004fa90258cfcb;p=imagemagick Fixed newlines. --- diff --git a/coders/icon.c b/coders/icon.c index 9bb995e74..0ea42cdf5 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -847,11 +847,11 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, scene=sizeof(sizes)/sizeof(sizes[0]); for (i=0; i < scene; i++) { - next=ResizeImage(image,sizes[i],sizes[i],image->filter,exception); - if (next == (Image *) NULL) - { - images=DestroyImageList(images); - return(MagickFalse); + next=ResizeImage(image,sizes[i],sizes[i],image->filter,exception); + if (next == (Image *) NULL) + { + images=DestroyImageList(images); + return(MagickFalse); } AppendImageToList(&images,next); } @@ -915,10 +915,10 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, *png; write_image=CloneImage(next,0,0,MagickTrue,exception); - if (write_image == (Image *) NULL) - { - images=DestroyImageList(images); - return(MagickFalse); + if (write_image == (Image *) NULL) + { + images=DestroyImageList(images); + return(MagickFalse); } write_info=CloneImageInfo(image_info); (void) CopyMagickString(write_info->filename,"PNG:",MaxTextExtent); @@ -933,10 +933,10 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, exception); write_image=DestroyImage(write_image); write_info=DestroyImageInfo(write_info); - if (png == (unsigned char *) NULL) - { - images=DestroyImageList(images); - return(MagickFalse); + if (png == (unsigned char *) NULL) + { + images=DestroyImageList(images); + return(MagickFalse); } icon_file.directory[scene].width=0; icon_file.directory[scene].height=0; @@ -1042,11 +1042,11 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, */ pixels=(unsigned char *) AcquireQuantumMemory((size_t) icon_info.image_size,sizeof(*pixels)); - if (pixels == (unsigned char *) NULL) - { + if (pixels == (unsigned char *) NULL) + { images=DestroyImageList(images); ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - } + } (void) ResetMagickMemory(pixels,0,(size_t) icon_info.image_size); switch (icon_info.bits_per_pixel) { @@ -1226,11 +1226,11 @@ static MagickBooleanType WriteICONImage(const ImageInfo *image_info, */ icon_colormap=(unsigned char *) AcquireQuantumMemory((size_t) (1UL << icon_info.bits_per_pixel),4UL*sizeof(*icon_colormap)); - if (icon_colormap == (unsigned char *) NULL) - { - images=DestroyImageList(images); - ThrowWriterException(ResourceLimitError, - "MemoryAllocationFailed"); + if (icon_colormap == (unsigned char *) NULL) + { + images=DestroyImageList(images); + ThrowWriterException(ResourceLimitError, + "MemoryAllocationFailed"); } q=icon_colormap; for (i=0; i < (ssize_t) next->colors; i++)