From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 23 Apr 2012 19:54:54 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5744
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=888e613fa3f5073983c4e34d41482ac170888a16;p=imagemagick

---

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 720143cac..0c5710fc2 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -898,27 +898,29 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info,
           clone_offset+=sizeof(Quantum);
         }
     }
-    length=clone_info->number_channels*sizeof(Quantum);
-    (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
     if (y < clone_info->rows)
-      for ( ; x < (ssize_t) clone_info->columns; x++)
       {
         /*
           Set remaining columns as undefined.
         */
-        if (clone_info->type != DiskCache)
-          (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,blob,
-            length);
-        else
-          {
-            count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
-            if ((MagickSizeType) count != length)
-              {
-                status=MagickFalse;
-                break;
+        length=clone_info->number_channels*sizeof(Quantum);
+        (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+        for ( ; x < (ssize_t) clone_info->columns; x++)
+        {
+          if (clone_info->type != DiskCache)
+            (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+              blob,length);
+          else
+            {
+              count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
+              if ((MagickSizeType) count != length)
+                {
+                  status=MagickFalse;
+                  break;
               }
-          }
-        clone_offset+=length;
+            }
+          clone_offset+=length;
+        }
       }
   }
   length=clone_info->number_channels*sizeof(Quantum);
@@ -1015,30 +1017,32 @@ static MagickBooleanType PixelCacheCloneUnoptimized(CacheInfo *clone_info,
           clone_offset+=length;
         }
       }
-      length=clone_info->metacontent_extent;
-      (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
       if (y < clone_info->rows)
-        for ( ; y < (ssize_t) clone_info->rows; y++)
         {
           /*
             Set remaining rows as undefined.
           */
-          for (x=0; x < (ssize_t) clone_info->columns; x++)
+          length=clone_info->metacontent_extent;
+          (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+          for ( ; y < (ssize_t) clone_info->rows; y++)
           {
-            if (clone_info->type != DiskCache)
-              (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
-                blob,length);
-            else
-              {
-                count=WritePixelCacheRegion(clone_info,clone_offset,length,
-                  blob);
-                if ((MagickSizeType) count != length)
-                  {
-                    status=MagickFalse;
-                    break;
-                  }
-              }
-            clone_offset+=length;
+            for (x=0; x < (ssize_t) clone_info->columns; x++)
+            {
+              if (clone_info->type != DiskCache)
+                (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+                  blob,length);
+              else
+                {
+                  count=WritePixelCacheRegion(clone_info,clone_offset,length,
+                    blob);
+                  if ((MagickSizeType) count != length)
+                    {
+                      status=MagickFalse;
+                      break;
+                    }
+                }
+              clone_offset+=length;
+            }
           }
         }
     }
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 315b687ae..37c219db3 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -741,7 +741,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
       if ((flags & WidthValue) == 0 ) {
           (void) ThrowMagickException(exception,GetMagickModule(),
                OptionWarning,"InvalidSetting","'%s' '%s'",
-               "distort:viewport",artifact);
+               "distort:viewport",value);
           destination_image=DestroyImage(destination_image);
           return(MagickFalse);
         }
diff --git a/PerlMagick/t/jpeg/write.t b/PerlMagick/t/jpeg/write.t
index ac9102d91..710a7c73b 100644
--- a/PerlMagick/t/jpeg/write.t
+++ b/PerlMagick/t/jpeg/write.t
@@ -20,7 +20,7 @@ chdir 't/jpeg' || die 'Cd failed';
 print( "Non-interlaced JPEG ...\n" );
 testReadWriteCompare( 'input.jpg', 'output_tmp.jpg',
                       '../reference/jpeg/write_non_interlaced.miff',
-                      q//, q//, 0.000001, 0.04);
+                      q//, q//, 0.00001, 0.04);
 
 #
 # 2) Test with plane-interlaced image
@@ -29,5 +29,5 @@ testReadWriteCompare( 'input.jpg', 'output_tmp.jpg',
 print( "Plane-interlaced JPEG ...\n" );
 testReadWriteCompare( 'input.jpg', 'output_plane_tmp.jpg',
                       '../reference/jpeg/write_plane_interlaced.miff',
-                      q//, q//, 0.000001, 0.04);
+                      q//, q//, 0.00001, 0.04);