Changeset 11608 for ImageMagick/trunk

Timestamp:

07/10/08 07:36:33 (7 weeks ago)

Author:

cristy

Message:

 

Files:

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

ImageMagick/trunk/magick/cache.c

@@ -1209 +1209 @@
 %  The format of the CloneCacheNexus() method is:
 %
-%      MagickBooleanType CloneCacheNexus(Image *image,CacheInfo *destination,
+%      MagickBooleanType CloneCacheNexus(CacheInfo *destination,
 %        CacheInfo *source)
 %
 %  A description of each parameter follows:
-%
-%    o image: the image.
 %
 %    o destination: the destination cache nexus.
@@ -1242 +1240 @@
 }
 
-static MagickBooleanType CloneCacheNexus(Image *image,CacheInfo *destination,
+static MagickBooleanType CloneCacheNexus(CacheInfo *destination,
   CacheInfo *source)
 {
-  MagickBooleanType
-    status;
-
   MagickSizeType
     number_pixels;
-
-  RectangleInfo
-    region;
 
   register const NexusInfo
@@ -1295 +1287 @@
       }
   } 
-  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(MagickTrue);
 }
 
@@ -3388 +3374 @@
   (void) SetCacheVirtualPixelMethod(image,clone_info->virtual_pixel_method);
   cache_info=(CacheInfo *) image->cache;
-  status=CloneCacheNexus(image,cache_info,clone_info);
+  status=CloneCacheNexus(cache_info,clone_info);
   if (status != MagickFalse)
     {
@@ -3796 +3782 @@
   cache_info->offset=(*offset);
   cache_info=(CacheInfo *) image->cache;
-  status=CloneCacheNexus(image,cache_info,clone_info);
+  status=CloneCacheNexus(cache_info,clone_info);
   if (status != MagickFalse)
     {
@@ -4374 +4360 @@
           if (status != MagickFalse)
             status=SyncCache(image);
+          if (status != MagickFalse)
+            {
+              RectangleInfo
+                region;
+
+              region.x=0;
+              region.y=0;
+              region.width=image->columns;
+              region.height=1;
+              if (SetNexus(image,&region,0) == (PixelPacket *) NULL)
+                status=MagickFalse;
+            }
         }
       RelinquishSemaphoreInfo(cache_info->semaphore);