From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 10 Jun 2018 20:59:14 +0000 (-0400)
Subject: https://github.com/ImageMagick/ImageMagick/issues/1169
X-Git-Tag: 7.0.7-39~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c85edd16e1adf8850b00bdf1379773eac003079;p=imagemagick

https://github.com/ImageMagick/ImageMagick/issues/1169
---

diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c
index 2d7649234..0b5ba7f62 100644
--- a/MagickCore/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -238,7 +238,7 @@ static Image *cloneImage(const Image* image,ExceptionInfo *exception)
       ((image->channel_mask & GreenChannel) != 0) &&
       ((image->channel_mask & BlueChannel) != 0) &&
       ((image->channel_mask & AlphaChannel) != 0))
-    clone=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+    clone=CloneImage(image,0,0,MagickTrue,exception);
   else
     {
       clone=CloneImage(image,0,0,MagickTrue,exception);
@@ -1592,7 +1592,7 @@ static Image *ComputeConvolveImage(const Image* image,MagickCLEnv clEnv,
     goto cleanup;
   }
 
-  filteredImage = CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  filteredImage = CloneImage(image,0,0,MagickTrue,exception);
   assert(filteredImage != NULL);
   if (SetImageStorageClass(filteredImage,DirectClass,exception) != MagickTrue)
   {
@@ -1958,7 +1958,7 @@ static Image *ComputeDespeckleImage(const Image *image,MagickCLEnv clEnv,
     }
   }
 
-  filteredImage = CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  filteredImage = CloneImage(image,0,0,MagickTrue,exception);
   assert(filteredImage != NULL);
   if (SetImageStorageClass(filteredImage,DirectClass,exception) != MagickTrue)
   {
@@ -3068,7 +3068,7 @@ static Image *ComputeLocalContrastImage(const Image *image,MagickCLEnv clEnv,
 
   /* create output */
   {
-    filteredImage = CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+    filteredImage = CloneImage(image,0,0,MagickTrue,exception);
     assert(filteredImage != NULL);
     if (SetImageStorageClass(filteredImage,DirectClass,exception) != MagickTrue)
     {
@@ -5075,7 +5075,7 @@ static Image *ComputeWaveletDenoiseImage(const Image *image,MagickCLEnv clEnv,
   if (strcmp("Intel(R) HD Graphics",device->name) == 0)
     goto cleanup;
   queue=AcquireOpenCLCommandQueue(device);
-  filteredImage=CloneImage(image,image->columns,image->rows,MagickTrue,
+  filteredImage=CloneImage(image,0,0,MagickTrue,
     exception);
   if (filteredImage == (Image *) NULL)
     goto cleanup;
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index 65b5ab6cc..c1df68e61 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -729,7 +729,7 @@ MagickExport Image *SeparateImage(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  separate_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  separate_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (separate_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 6142450ea..a1756bf5d 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -805,7 +805,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         Blur Image dictated by an overlay gradient map: X = red_channel;
           Y = green_channel; compose:args =  x_scale[,y_scale[,angle]].
       */
-      canvas_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+      canvas_image=CloneImage(image,0,0,MagickTrue,
         exception);
       if (canvas_image == (Image *) NULL)
         {
@@ -972,7 +972,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           X = red_channel;  Y = green_channel;
           compose:args = x_scale[,y_scale[,center.x,center.y]]
       */
-      canvas_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+      canvas_image=CloneImage(image,0,0,MagickTrue,
         exception);
       if (canvas_image == (Image *) NULL)
         {
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 676d5f052..d9fdabbb4 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1348,7 +1348,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  enhance_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  enhance_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (enhance_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 2ff4ccfaa..a0006bdba 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -2174,7 +2174,7 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  mean_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  mean_image=CloneImage(image,0,0,MagickTrue,exception);
   if (mean_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(mean_image,DirectClass,exception) == MagickFalse)
diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 03171b466..664057265 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -179,7 +179,7 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
         "ImageSequenceRequired","`%s'",images->filename);
       return((Image *) NULL);
     }
-  image=CloneImage(images,images->columns,images->rows,MagickTrue,exception);
+  image=CloneImage(images,0,0,MagickTrue,exception);
   if (image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
@@ -190,7 +190,7 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op,
   image->depth=32UL;
   complex_images=NewImageList();
   AppendImageToList(&complex_images,image);
-  image=CloneImage(images,images->columns,images->rows,MagickTrue,exception);
+  image=CloneImage(images,0,0,MagickTrue,exception);
   if (image == (Image *) NULL)
     {
       complex_images=DestroyImageList(complex_images);
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index a89a4444a..6aa38f771 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -305,7 +305,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type,
   if (noise_image != (Image *) NULL)
     return(noise_image);
 #endif
-  noise_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  noise_image=CloneImage(image,0,0,MagickTrue,exception);
   if (noise_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(noise_image,DirectClass,exception) == MagickFalse)
@@ -461,7 +461,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  shift_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  shift_image=CloneImage(image,0,0,MagickTrue,exception);
   if (shift_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(shift_image,DirectClass,exception) == MagickFalse)
@@ -3122,7 +3122,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression,
   fx_info=AcquireFxThreadSet(image,expression,exception);
   if (fx_info == (FxInfo **) NULL)
     return((Image *) NULL);
-  fx_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  fx_image=CloneImage(image,0,0,MagickTrue,exception);
   if (fx_image == (Image *) NULL)
     {
       fx_info=DestroyFxThreadSet(fx_info);
@@ -5347,7 +5347,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  tint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  tint_image=CloneImage(image,0,0,MagickTrue,exception);
   if (tint_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(tint_image,DirectClass,exception) == MagickFalse)
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index cf7096102..b31e83947 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -186,7 +186,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   /*
     Set floodfill state.
   */
-  floodplane_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  floodplane_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (floodplane_image == (Image *) NULL)
     return(MagickFalse);
@@ -722,7 +722,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
   assert(exception->signature == MagickCoreSignature);
   width=GetOptimalKernelWidth2D(radius,sigma);
   linear_image=CloneImage(image,0,0,MagickTrue,exception);
-  paint_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  paint_image=CloneImage(image,0,0,MagickTrue,exception);
   if ((linear_image == (Image *) NULL) || (paint_image == (Image *) NULL))
     {
       if (linear_image != (Image *) NULL)
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index b41e62662..056f20911 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -736,7 +736,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
     rotate_image=CloneImage(image,image->rows,image->columns,MagickTrue,
       exception);
   else
-    rotate_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+    rotate_image=CloneImage(image,0,0,MagickTrue,
       exception);
   if (rotate_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index f4fe99733..f66bf7390 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -2862,7 +2862,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  statistic_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  statistic_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (statistic_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 3e667770f..8271798d8 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -209,7 +209,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  threshold_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  threshold_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (threshold_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 356c84e3c..20357240a 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -442,7 +442,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       i;
 
     assert(images != (Image *) NULL);
-    cmyk_image=CloneImage(images,images->columns,images->rows,MagickTrue,
+    cmyk_image=CloneImage(images,0,0,MagickTrue,
       exception);
     if (cmyk_image == (Image *) NULL)
       break;
@@ -1194,7 +1194,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  flip_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  flip_image=CloneImage(image,0,0,MagickTrue,exception);
   if (flip_image == (Image *) NULL)
     return((Image *) NULL);
   /*
@@ -1328,7 +1328,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  flop_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  flop_image=CloneImage(image,0,0,MagickTrue,exception);
   if (flop_image == (Image *) NULL)
     return((Image *) NULL);
   /*
@@ -1538,7 +1538,7 @@ MagickExport Image *RollImage(const Image *image,const ssize_t x_offset,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  roll_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  roll_image=CloneImage(image,0,0,MagickTrue,exception);
   if (roll_image == (Image *) NULL)
     return((Image *) NULL);
   offset.x=x_offset;
diff --git a/MagickCore/vision.c b/MagickCore/vision.c
index 94bcf16bb..eeaaf3dfb 100644
--- a/MagickCore/vision.c
+++ b/MagickCore/vision.c
@@ -185,7 +185,7 @@ MagickExport Image *ConnectedComponentsImage(const Image *image,
   assert(exception->signature == MagickCoreSignature);
   if (objects != (CCObjectInfo **) NULL)
     *objects=(CCObjectInfo *) NULL;
-  component_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+  component_image=CloneImage(image,0,0,MagickTrue,
     exception);
   if (component_image == (Image *) NULL)
     return((Image *) NULL);
diff --git a/coders/mask.c b/coders/mask.c
index bec8811d5..d23690abc 100644
--- a/coders/mask.c
+++ b/coders/mask.c
@@ -227,8 +227,7 @@ static Image *MaskImage(const Image *image,ExceptionInfo *exception)
   ssize_t
     y;
 
-  mask_image=CloneImage(image,image->columns,image->rows,MagickTrue,
-    exception);
+  mask_image=CloneImage(image,0,0,MagickTrue,exception);
   if (mask_image == (Image *) NULL)
     return((Image *) NULL);
   if (SetImageStorageClass(mask_image,DirectClass,exception) == MagickFalse)
diff --git a/coders/matte.c b/coders/matte.c
index 23406c14f..6d70717b7 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -178,7 +178,7 @@ static MagickBooleanType WriteMATTEImage(const ImageInfo *image_info,
 
   if (image->alpha_trait == UndefinedPixelTrait)
     ThrowWriterException(CoderError,"ImageDoesNotHaveAnAlphaChannel");
-  matte_image=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  matte_image=CloneImage(image,0,0,MagickTrue,exception);
   if (matte_image == (Image *) NULL)
     return(MagickFalse);
   (void) SetImageType(matte_image,TrueColorAlphaType,exception);
diff --git a/coders/psd.c b/coders/psd.c
index c587f47ce..4f9cf7180 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -451,8 +451,7 @@ static MagickBooleanType ApplyPSDOpacityMask(Image *image,const Image *mask,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(CoderEvent,GetMagickModule(),
       "  applying opacity mask");
-  complete_mask=CloneImage(image,image->columns,image->rows,MagickTrue,
-    exception);
+  complete_mask=CloneImage(image,0,0,MagickTrue,exception);
   if (complete_mask == (Image *) NULL)
     return(MagickFalse);
   complete_mask->alpha_trait=BlendPixelTrait;
diff --git a/coders/tiff.c b/coders/tiff.c
index f08209dcb..e6af9d425 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1190,7 +1190,7 @@ static void TIFFReadPhotoshopLayers(Image* image,const ImageInfo *image_info,
   custom_stream=TIFFAcquireCustomStreamForReading(&photoshop_profile,exception);
   if (custom_stream == (CustomStreamInfo *) NULL)
     return;
-  layers=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
+  layers=CloneImage(image,0,0,MagickTrue,exception);
   if (layers == (Image *) NULL)
     {
       custom_stream=DestroyCustomStreamInfo(custom_stream);