Lazily evaluate the image storage class and colorspace to prevent cache allocation...

diff --git a/ChangeLog b/ChangeLog
index 54eed0fef237d51f2ef3234d133f1b42ab6aa309..21a6dfbd44fc55ae417439821050599c9c1a7e77 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-14  7.0.4-0 Cristy  <quetzlzacatenango@image...>
+ * Lazily evaluate the image storage class and colorspace to prevent cache 
+   allocation when pinging an image.
+
 2016-12-10  7.0.3-10 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.3-10, GIT revision 19191:338f088:20161210.
 

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 85a57f72d6ca67adf1c0b7849b8c099699b9154f..8d6eec4cd56054a775b2351a3203f90ab3be9d9d 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1078,9 +1078,12 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image,
   ImageType
     type;
 
-  MagickBooleanType
-    status;
-
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
   if (image->colorspace == colorspace)
     return(MagickTrue);
   image->colorspace=colorspace;
@@ -1115,9 +1118,8 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image,
         image->chromaticity.white_point.y=0.3290;
         image->chromaticity.white_point.z=0.3583;
       }
-  status=SyncImagePixelCache(image,exception);
   image->type=type;
-  return(status);
+  return(MagickTrue);
 }
 
 /*

diff --git a/MagickCore/image.c b/MagickCore/image.c
index a07421b0e37374bef4d84430226a631a032d0089..6212171d1416cc01ca67c55985233e8659b680a8 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2423,8 +2423,14 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
 MagickExport MagickBooleanType SetImageStorageClass(Image *image,
   const ClassType storage_class,ExceptionInfo *exception)
 {
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickCoreSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(exception != (ExceptionInfo *) NULL);
+  assert(exception->signature == MagickCoreSignature);
   image->storage_class=storage_class;
-  return(SyncImagePixelCache(image,exception));
+  return(MagickTrue);
 }
 \f
 /*