From: Cristy Date: Sat, 17 Dec 2016 00:46:04 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.4-0~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=227ac0004f0d792443f72ccc40a6775019068acd;p=imagemagick ... --- diff --git a/ChangeLog b/ChangeLog index 090c1efc7..271f55337 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ 2016-12-14 7.0.4-0 Cristy * Lazily evaluate the image storage class and colorspace to prevent cache allocation when pinging an image. - * Does not close path for linejoins of round (reference + * Do not close path for linejoins of round (reference https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31039). 2016-12-10 7.0.3-10 Cristy diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 8d6eec4cd..674013a52 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -1119,9 +1119,9 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image, image->chromaticity.white_point.z=0.3583; } image->type=type; - return(MagickTrue); + return(SyncImagePixelCache(image,exception)); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -1178,7 +1178,7 @@ MagickExport MagickBooleanType SetImageGray(Image *image, image->type=type; return(MagickTrue); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -1231,7 +1231,7 @@ MagickExport MagickBooleanType SetImageMonochrome(Image *image, image->type=BilevelType; return(MagickTrue); } - + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % diff --git a/MagickCore/image.c b/MagickCore/image.c index 6212171d1..5c09fcab6 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -2430,7 +2430,7 @@ MagickExport MagickBooleanType SetImageStorageClass(Image *image, assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickCoreSignature); image->storage_class=storage_class; - return(MagickTrue); + return(SyncImagePixelCache(image,exception)); } /*