Changeset 11599

Timestamp:

07/09/08 09:37:30 (7 weeks ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk/magick

Files:

• cache.c (modified) (16 diffs)
• cache.h (modified) (1 diff)
• image.c (modified) (6 diffs)
• resize.c (modified) (4 diffs)
• shear.c (modified) (1 diff)

ImageMagick/trunk/magick/cache.c

@@ -579 +579 @@
             }
           }
-                                        if (p == (const PixelPacket *) NULL)
+          if (p == (const PixelPacket *) NULL)
             break;
           *q++=(*p);
@@ -1210 +1210 @@
 %
 %      MagickBooleanType CloneCacheNexus(CacheInfo *destination,
-%        CacheInfo *source,const unsigned long nexus)
+%        CacheInfo *source)
 %
 %  A description of each parameter follows:
@@ -1217 +1217 @@
 %
 %    o source: the source cache nexus.
-%
-%    o nexus: specifies which cache nexus to clone.
 %
 */
@@ -1243 +1241 @@
 
 static MagickBooleanType CloneCacheNexus(CacheInfo *destination,
-  CacheInfo *source,const unsigned long nexus)
+  CacheInfo *source)
 {
   MagickSizeType
@@ -1285 +1283 @@
         q->indexes=(IndexPacket *) NULL;
         number_pixels=(MagickSizeType) q->columns*q->rows;
-        if ((destination->storage_class == PseudoClass) ||
-            (destination->colorspace == CMYKColorspace))
+        if (p->indexes != (IndexPacket *) NULL)
           q->indexes=(IndexPacket *) (q->pixels+number_pixels);
       }
+if (0)
+    DestroyCacheNexus(source,id);
   }
-  if (nexus != 0)
-    DestroyCacheNexus(source,nexus);
   return(MagickTrue);
 }
@@ -3346 +3343 @@
 %  The format of the ModifyCache method is:
 %
-%      MagickBooleanType ModifyCache(Image *image,const unsigned long nexus)
+%      MagickBooleanType ModifyCache(Image *image)
 %
 %  A description of each parameter follows:
@@ -3352 +3349 @@
 %    o image: the image.
 %
-%    o nexus: specifies which cache nexus to acquire.
-%
-*/
-static MagickBooleanType ModifyCache(Image *image,const unsigned long nexus)
+*/
+static MagickBooleanType ModifyCache(Image *image)
 {
   CacheInfo
@@ -3364 +3359 @@
     clone_image;
 
-  MagickStatusType
+  MagickBooleanType
     status;
 
@@ -3380 +3375 @@
   (void) GetCacheInfo(&image->cache);
   (void) SetCacheVirtualPixelMethod(image,clone_info->virtual_pixel_method);
-  status=OpenCache(image,IOMode,&image->exception);
+  cache_info=(CacheInfo *) image->cache;
+  status=CloneCacheNexus(cache_info,clone_info);
   if (status != MagickFalse)
     {
-      cache_info=(CacheInfo *) image->cache;
-      status=CloneCacheNexus(cache_info,clone_info,nexus);
-      status|=ClonePixelCache(cache_info,clone_info,&image->exception);
-    }
-  return(status != 0 ? MagickTrue : MagickFalse);
+      status=OpenCache(image,IOMode,&image->exception);
+      if (status != MagickFalse)
+        status=ClonePixelCache(cache_info,clone_info,&image->exception);
+    }
+  return(status);
 }
 
@@ -3714 +3710 @@
     pagesize;
 
-  MagickStatusType
+  MagickBooleanType
     status;
 
@@ -3787 +3783 @@
   cache_info->type=DiskCache;
   cache_info->offset=(*offset);
-  status=OpenCache(image,IOMode,exception);
+  cache_info=(CacheInfo *) image->cache;
+  status=CloneCacheNexus(cache_info,clone_info);
   if (status != MagickFalse)
     {
-      cache_info=(CacheInfo *) image->cache;
-      status=CloneCacheNexus(cache_info,clone_info,0);
-      status|=ClonePixelCache(cache_info,clone_info,&image->exception);
+      status=OpenCache(image,IOMode,exception);
+      if (status != MagickFalse)
+       status=ClonePixelCache(cache_info,clone_info,&image->exception);
     }
   *offset+=cache_info->length+pagesize-(cache_info->length % pagesize);
   clone_info=(CacheInfo *) DestroyCacheInfo(clone_info);
-  return(status != 0 ? MagickTrue : MagickFalse);
+  return(status);
 }
 
@@ -4211 +4208 @@
 %
 */
-
-static inline MagickBooleanType IsCacheSynchronized(const Image *image)
-{
-  CacheInfo
-    *cache_info;
-
-  MagickBooleanType
-    status;
-
-  cache_info=(CacheInfo *) image->cache;
-  status=(image->storage_class == cache_info->storage_class) &&
-    (image->colorspace == cache_info->colorspace) &&
-    (image->columns == cache_info->columns) &&
-    (image->rows == cache_info->rows) &&
-    (cache_info->number_views != 0) ? MagickTrue : MagickFalse;
-  return(status);
-}
-
 MagickExport PixelPacket *SetCacheNexus(Image *image,const long x,const long y,
   const unsigned long columns,const unsigned long rows,
@@ -4245 +4224 @@
     region;
 
-  assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
-  if (image->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  assert(image->cache != (Cache) NULL);
-  cache_info=(CacheInfo *) image->cache;
-  if ((cache_info->reference_count > 1) ||
-      (IsCacheSynchronized(image) == MagickFalse))
-    {
-      AcquireSemaphoreInfo(&cache_info->semaphore);
-      if (ModifyCache(image,nexus) == MagickFalse)
-        {
-          RelinquishSemaphoreInfo(cache_info->semaphore);
-          return((PixelPacket *) NULL);
-        }
-      if (SyncCache(image) == MagickFalse)
-        {
-          RelinquishSemaphoreInfo(cache_info->semaphore);
-          return((PixelPacket *) NULL);
-        }
-      RelinquishSemaphoreInfo(cache_info->semaphore);
-    }
   /*
     Validate pixel cache geometry.
   */
+  if (SyncImagePixelCache(image) == MagickFalse)
+    return((PixelPacket *) NULL);
   cache_info=(CacheInfo *) image->cache;
   offset=(MagickOffsetType) y*cache_info->columns+x;
@@ -4334 +4293 @@
   cache_info->virtual_pixel_method=virtual_pixel_method;
   return(method);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%   S y n c I m a g e P i x e l C a c h e                                     %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  SyncImagePixelCache() ensures that the pixel cache morphology matches that
+%  of the image, in particular, the image storage class, colorspace, width,
+%  and height.
+%
+%  The format of the SetPixelCache() method is:
+%
+%      MagickBooleanType SyncImagePixelCache(Image *image)
+%
+%  A description of each parameter follows:
+%
+%    o image: the image.
+%
+*/
+
+static inline MagickBooleanType IsCacheSynchronized(const Image *image)
+{
+  CacheInfo
+    *cache_info;
+
+  MagickBooleanType
+    status;
+
+  cache_info=(CacheInfo *) image->cache;
+  status=(image->storage_class == cache_info->storage_class) &&
+    (image->colorspace == cache_info->colorspace) &&
+    (image->columns == cache_info->columns) &&
+    (image->rows == cache_info->rows) &&
+    (cache_info->number_views != 0) ? MagickTrue : MagickFalse;
+  return(status);
+}
+
+MagickExport MagickBooleanType SyncImagePixelCache(Image *image)
+{
+  CacheInfo
+    *cache_info;
+
+  MagickBooleanType
+    status;
+
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(image->cache != (Cache) NULL);
+  status=MagickTrue;
+  cache_info=(CacheInfo *) image->cache;
+  if ((cache_info->reference_count > 1) ||
+      (IsCacheSynchronized(image) == MagickFalse))
+    {
+      AcquireSemaphoreInfo(&cache_info->semaphore);
+      if ((cache_info->reference_count > 1) ||
+          (IsCacheSynchronized(image) == MagickFalse))
+        {
+          status=ModifyCache(image);
+          if (status != MagickFalse)
+            status=SyncCache(image);
+        }
+      RelinquishSemaphoreInfo(cache_info->semaphore);
+    }
+  return(status);
 }
 
@@ -4594 +4626 @@
     *cache_info;
 
+  MagickBooleanType
+    status;
+
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
@@ -4603 +4638 @@
   if (IsCacheSynchronized(image) != MagickFalse)
     return(MagickTrue);
-  return(OpenCache(image,IOMode,&image->exception));
+  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);
 }
 

ImageMagick/trunk/magick/cache.h

@@ -36 +36 @@
   PersistCache(Image *,const char *,const MagickBooleanType,MagickOffsetType *,
     ExceptionInfo *),
-  SyncCacheNexus(Image *,const unsigned long);
+  SyncCacheNexus(Image *,const unsigned long),
+  SyncImagePixelCache(Image *);
 
 extern MagickExport PixelPacket

ImageMagick/trunk/magick/image.c

@@ -1159 +1159 @@
         clone_image->next->previous=clone_image;
     }
+  (void) SetImageExtent(clone_image,columns,rows);
   if (((columns == 0) && (rows == 0)) ||
       ((columns == image->columns) && (rows == image->rows)))
@@ -1173 +1174 @@
       return(clone_image);
     }
-  clone_image->columns=columns;
-  clone_image->rows=rows;
   scale=(MagickRealType) clone_image->columns/(MagickRealType) image->columns;
   clone_image->page.width=(unsigned long) (scale*image->page.width+0.5);
@@ -3283 +3282 @@
 {
   image->storage_class=storage_class;
-  return(SetImageExtent(image,0,0));
+  return(SyncImagePixelCache(image));
 }
 
@@ -3367 +3366 @@
   const unsigned long columns,const unsigned long rows)
 {
-  PixelPacket
-    *p;
-
   if ((columns != 0) || (rows != 0))
     {
@@ -3375 +3371 @@
       image->rows=rows;
     }
-  p=SetImagePixels(image,0,0,image->columns,1);
-  return(p != (PixelPacket *) NULL ? MagickTrue : MagickFalse);
+  return(SyncImagePixelCache(image));
 }
 
@@ -3578 +3573 @@
         format_type=ExplicitFormatType;
       i=0;
-      while ((format_type != MagickFalse) &&
+      while ((format_type != UndefinedFormatType) &&
              (format_type_formats[i] != (char *) NULL))
       {

ImageMagick/trunk/magick/resize.c

@@ -1697 +1697 @@
 #define ResizeImageTag  "Resize/Image"
 
+  ClassType
+    storage_class;
+
   ContributionInfo
     **contribution;
@@ -1722 +1725 @@
   scale=MagickMax(1.0/x_factor,1.0);
   support=scale*GetResizeFilterSupport(resize_filter);
-  resize_image->storage_class=image->storage_class;
-  if (support > 0.5)
-    {
-      if (SetImageStorageClass(resize_image,DirectClass) == MagickFalse)
-        {
-          InheritException(exception,&resize_image->exception);
-          return(MagickFalse);
-        }
-    }
-  else
+  storage_class=support > 0.5 ? DirectClass : image->storage_class;
+  if (SetImageStorageClass(resize_image,storage_class) == MagickFalse)
+    {
+      InheritException(exception,&resize_image->exception);
+      return(MagickFalse);
+    }
+  if (support < 0.5)
     {
       /*
@@ -1925 +1925 @@
   const MagickSizeType span,MagickOffsetType *quantum,ExceptionInfo *exception)
 {
+  ClassType
+    storage_class;
+
   ContributionInfo
     **contribution;
@@ -1951 +1954 @@
   scale=MagickMax(1.0/y_factor,1.0);
   support=scale*GetResizeFilterSupport(resize_filter);
-  resize_image->storage_class=image->storage_class;
-  if (support > 0.5)
-    {
-      if (SetImageStorageClass(resize_image,DirectClass) == MagickFalse)
-        {
-          InheritException(exception,&resize_image->exception);
-          return(MagickFalse);
-        }
-    }
-  else
+  storage_class=support > 0.5 ? DirectClass : image->storage_class;
+  if (SetImageStorageClass(resize_image,storage_class) == MagickFalse)
+    {
+      InheritException(exception,&resize_image->exception);
+      return(MagickFalse);
+    }
+  if (support < 0.5)
     {
       /*

ImageMagick/trunk/magick/shear.c

@@ -994 +994 @@
   if (rotate_image == (Image *) NULL)
     return((Image *) NULL);
-  if (SetImageExtent(rotate_image,0,0) == MagickFalse)
-    return(DestroyImage(rotate_image));
   /*
     Integral rotate the image.