Changeset 11607 for ImageMagick/trunk

Timestamp:

07/10/08 07:12:33 (6 weeks ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/magick/cache.c (modified) (7 diffs)

ImageMagick/trunk/magick/cache.c

@@ -1209 +1209 @@
 %  The format of the CloneCacheNexus() method is:
 %
-%      MagickBooleanType CloneCacheNexus(CacheInfo *destination,
+%      MagickBooleanType CloneCacheNexus(Image *image,CacheInfo *destination,
 %        CacheInfo *source)
 %
 %  A description of each parameter follows:
+%
+%    o image: the image.
 %
 %    o destination: the destination cache nexus.
@@ -1240 +1242 @@
 }
 
-static MagickBooleanType CloneCacheNexus(CacheInfo *destination,
+static MagickBooleanType CloneCacheNexus(Image *image,CacheInfo *destination,
   CacheInfo *source)
 {
+  MagickBooleanType
+    status;
+
   MagickSizeType
     number_pixels;
+
+  RectangleInfo
+    region;
 
   register const NexusInfo
@@ -1286 +1294 @@
           q->indexes=(IndexPacket *) (q->pixels+number_pixels);
       }
-  }
-  return(MagickTrue);
+  } 
+  region.x=0;
+  region.y=0;
+  region.width=image->columns;
+  region.height=1;
+  status=SetNexus(image,&region,0) != (PixelPacket *) NULL ?  MagickTrue :
+     MagickFalse;
+  return(status);
 }
 
@@ -3374 +3388 @@
   (void) SetCacheVirtualPixelMethod(image,clone_info->virtual_pixel_method);
   cache_info=(CacheInfo *) image->cache;
-  status=CloneCacheNexus(cache_info,clone_info);
+  status=CloneCacheNexus(image,cache_info,clone_info);
   if (status != MagickFalse)
     {
@@ -3782 +3796 @@
   cache_info->offset=(*offset);
   cache_info=(CacheInfo *) image->cache;
-  status=CloneCacheNexus(cache_info,clone_info);
+  status=CloneCacheNexus(image,cache_info,clone_info);
   if (status != MagickFalse)
     {
@@ -4624 +4638 @@
     *cache_info;
 
-  MagickBooleanType
-    status;
-
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -4636 +4647 @@
   if (IsCacheSynchronized(image) != MagickFalse)
     return(MagickTrue);
-  status=OpenCache(image,IOMode,&image->exception);
-  if (status != MagickFalse)
-    {
-      RectangleInfo
-        region;
-
-      region.x=0;
-      region.y=0;
-      region.width=image->columns;
-      region.height=1;
-      status=SetNexus(image,&region,0) != (PixelPacket *) NULL ?
-        MagickTrue : MagickFalse;
-    }
-  return(status);
+  return(OpenCache(image,IOMode,&image->exception));
 }