From: cristy Date: Tue, 21 Sep 2010 15:30:59 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~8838 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=537e272ac1ccb2054d0ea8f69efe234af1d5a756;p=imagemagick --- diff --git a/magick/colorspace.c b/magick/colorspace.c index b8ea5b18e..109b26b57 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -1170,15 +1170,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, MagickExport MagickBooleanType SetImageColorspace(Image *image, const ColorspaceType colorspace) { - PixelPacket - *pixels; - - if (image->colorspace == colorspace) - return(MagickTrue); image->colorspace=colorspace; - pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); - image->colorspace=colorspace; /* GRAY colorspace might get reset to RGB */ - return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); + return(MagickTrue); } /* diff --git a/magick/image.c b/magick/image.c index 9f4ca8b63..968141584 100644 --- a/magick/image.c +++ b/magick/image.c @@ -2939,14 +2939,8 @@ MagickExport MagickBooleanType SetImageColor(Image *image, MagickExport MagickBooleanType SetImageStorageClass(Image *image, const ClassType storage_class) { - PixelPacket - *pixels; - - if (image->storage_class == storage_class) - return(MagickTrue); image->storage_class=storage_class; - pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); - return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); + return(MagickTrue); } /* @@ -3030,16 +3024,11 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image, MagickExport MagickBooleanType SetImageExtent(Image *image, const size_t columns,const size_t rows) { - PixelPacket - *pixels; - - if ((columns != 0) && (rows != 0)) - { - image->columns=columns; - image->rows=rows; - } - pixels=QueueAuthenticPixels(image,0,0,1,1,&image->exception); - return(pixels == (PixelPacket *) NULL ? MagickFalse : MagickTrue); + if ((columns == 0) || (rows == 0)) + return(MagickFalse); + image->columns=columns; + image->rows=rows; + return(MagickTrue); } /*