(no commit message)

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 8990852fc017bc0899f4b35b14f8dffdefdaca92..e76cd6688bd0f06124950f047b2eabdb4edb726a 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -23,7 +23,6 @@ extern "C" {
 #endif
 
 #include <time.h>
-#include "MagickCore/cache.h"
 #include "MagickCore/random_.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/semaphore.h"
@@ -37,6 +36,9 @@ typedef enum
   PingCache
 } CacheType;
 
+typedef void
+  *Cache;
+
 typedef MagickBooleanType
   (*GetOneAuthenticPixelFromHandler)(Image *,const ssize_t,const ssize_t,
     PixelPacket *,ExceptionInfo *),

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 5e0200ee5936ea9eb54c27b659ac8fd504812038..874c63055b12a724fe2cd906ccfc3baa6b6e3826 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1982,8 +1982,8 @@ static inline MagickBooleanType ValidatePixelCacheMorphology(const Image *image)
   return(MagickTrue);
 }
 
-MagickExport Cache GetImagePixelCache(Image *image,
-  const MagickBooleanType clone,ExceptionInfo *exception)
+static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
+  ExceptionInfo *exception)
 {
   CacheInfo
     *cache_info;

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index 1ef87110b43c12dc3065e2a4c83902e1979c4ec5..2b8ed2b77732c5df1f7018a4dafadd06da2cb73e 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -24,12 +24,6 @@ extern "C" {
 
 #include "MagickCore/blob.h"
 
-typedef void
-  *Cache;
-
-extern MagickExport Cache
-  GetImagePixelCache(Image *,const MagickBooleanType,ExceptionInfo *);
-
 extern MagickExport const Quantum
   *GetVirtualPixels(const Image *,const ssize_t,const ssize_t,const size_t,
     const size_t,ExceptionInfo *),

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 6468ae59c73216a995c224ab6ba7d5d9ee2557d3..ba130b0ab4aec0f3b01981011f026799c0f54d4f 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1192,12 +1192,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
 MagickExport MagickBooleanType SetImageColorspace(Image *image,
   const ColorspaceType colorspace,ExceptionInfo *exception)
 {
-  CacheInfo
-    *cache_info;
-
   image->colorspace=colorspace;
-  cache_info=GetImagePixelCache(image,MagickTrue,exception);
-  return(cache_info == (CacheInfo *) NULL ? MagickFalse : MagickTrue);
+  return(MagickFalse);
 }
 \f
 /*

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 8ba9c3869e58397f7f02bae104f50894b115632c..18d5ab0b81ff19bb3c779518e26d2750fe6d4e8e 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1574,9 +1574,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   MagickOffsetType
     progress;
 
-  PixelInfo
-    zero;
-
   MagickRealType
     amount,
     destination_dissolve,
@@ -1589,6 +1586,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   MagickStatusType
     flags;
 
+  PixelInfo
+    zero;
+
   ssize_t
     y;
 

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 257eb230010f2de7e80eda70bc6501106ebb5bbe..5a6dc37d740c96f1864474f2d458973acfef6c58 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2510,14 +2510,10 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
 %
 %    o exception: return any errors or warnings in this structure.
 %
-%
 */
 MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
   const AlphaChannelType alpha_type,ExceptionInfo *exception)
 {
-  CacheInfo
-    *cache_info;
-
   MagickBooleanType
     status;
 
@@ -2664,10 +2660,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
     case UndefinedAlphaChannel:
       break;
   }
-  if (status == MagickFalse)
-    return(status);
-  cache_info=GetImagePixelCache(image,MagickTrue,exception);
-  return(cache_info == (CacheInfo *) NULL ? MagickFalse : MagickTrue);
+  return(status);
 }
 \f
 /*
@@ -2877,12 +2870,8 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
 MagickExport MagickBooleanType SetImageStorageClass(Image *image,
   const ClassType storage_class,ExceptionInfo *exception)
 {
-  CacheInfo
-    *cache_info;
-
   image->storage_class=storage_class;
-  cache_info=GetImagePixelCache(image,MagickTrue,exception);
-  return(cache_info == (CacheInfo *) NULL ? MagickFalse : MagickTrue);
+  return(MagickTrue);
 }
 \f
 /*
@@ -2968,15 +2957,11 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image,
 MagickExport MagickBooleanType SetImageExtent(Image *image,const size_t columns,
   const size_t rows,ExceptionInfo *exception)
 {
-  CacheInfo
-    *cache_info;
-
   if ((columns == 0) || (rows == 0))
     return(MagickFalse);
   image->columns=columns;
   image->rows=rows;
-  cache_info=GetImagePixelCache(image,MagickTrue,exception);
-  return(cache_info == (CacheInfo *) NULL ? MagickFalse : MagickTrue);
+  return(MagickTrue);
 }
 \f
 /*

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 944361d1f0ea59376cec47721eb27d0d9119be89..c752338e8670452c8bfe6f9427c5dbb7741a0409 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -1110,7 +1110,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
               break;
             }
           for ( ; image; image=image->next)
-            (void) SetImageAlphaChannel(image,(AlphaChannelType) sp);
+            (void) SetImageAlphaChannel(image,(AlphaChannelType) sp,exception);
           break;
         }
       if (LocaleCompare(attribute,"antialias") == 0)