From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 4 Oct 2010 14:43:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8763
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cfae90a336a521609913688472c10f0eff8a7af1;p=imagemagick

---

diff --git a/magick/cache.c b/magick/cache.c
index 34c3372cd..54a75144c 100644
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -4296,7 +4296,7 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
   cache_info=(CacheInfo *) image->cache;
   status=OpenPixelCache(image,IOMode,exception);
   if (status != MagickFalse)
-   status=ClonePixelCachePixels(cache_info,clone_info,&image->exception);
+    status=ClonePixelCachePixels(cache_info,clone_info,&image->exception);
   *offset+=cache_info->length+page_size-(cache_info->length % page_size);
   clone_info=(CacheInfo *) DestroyPixelCache(clone_info);
   return(status);
diff --git a/magick/stream.c b/magick/stream.c
index 1d5b472a4..6b5da155c 100644
--- a/magick/stream.c
+++ b/magick/stream.c
@@ -419,7 +419,8 @@ static PixelPacket *GetAuthenticPixelsFromStream(const Image *image)
 %  The format of the GetOneAuthenticPixelFromStream() method is:
 %
 %      MagickBooleanType GetOneAuthenticPixelFromStream(const Image image,
-%        const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
+%        const ssize_t x,const ssize_t y,PixelPacket *pixel,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -821,8 +822,10 @@ static PixelPacket *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
     Validate pixel cache geometry.
   */
   assert(image != (Image *) NULL);
-  if ((x < 0) || (y < 0) || ((x+(ssize_t) columns) > (ssize_t) image->columns) ||
-      ((y+(ssize_t) rows) > (ssize_t) image->rows) || (columns == 0) || (rows == 0))
+  if ((x < 0) || (y < 0) ||
+      ((x+(ssize_t) columns) > (ssize_t) image->columns) ||
+      ((y+(ssize_t) rows) > (ssize_t) image->rows) ||
+      (columns == 0) || (rows == 0))
     {
       (void) ThrowMagickException(exception,GetMagickModule(),StreamError,
         "ImageDoesNotContainTheStreamGeometry","`%s'",image->filename);