Added caNv, eXIf, and pHYs to the list of PNG chunks to be removed

[imagemagick] / MagickCore / cache.h

diff --git a/MagickCore/cache.h b/MagickCore/cache.h
index a511519c6e09cfe1908287145f22aed4474f758a..133c860cebc1b8fd4d842b5dcde57d1b38dda855 100644 (file)
--- a/MagickCore/cache.h
+++ b/MagickCore/cache.h
@@ -1,11 +1,11 @@
 /*
-  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2017 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
   obtain a copy of the License at
   
-    http://www.imagemagick.org/script/license.php
+    https://www.imagemagick.org/script/license.php
   
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,45 +15,56 @@
 
   MagickCore cache methods.
 */
-#ifndef _MAGICKCORE_CACHE_H
-#define _MAGICKCORE_CACHE_H
+#ifndef MAGICKCORE_CACHE_H
+#define MAGICKCORE_CACHE_H
+
+#include "MagickCore/blob.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
 #endif
 
-#include "MagickCore/blob.h"
+typedef enum
+{
+  UndefinedCache,
+  DiskCache,
+  DistributedCache,
+  MapCache,
+  MemoryCache,
+  PingCache
+} CacheType;
+
+extern MagickExport CacheType
+  GetImagePixelCacheType(const Image *);
 
 extern MagickExport const Quantum
   *GetVirtualPixels(const Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *),
-  *GetVirtualPixelQueue(const Image *);
+    const size_t,ExceptionInfo *) magick_hot_spot,
+  *GetVirtualPixelQueue(const Image *) magick_hot_spot;
 
 extern MagickExport const void
   *GetVirtualMetacontent(const Image *);
 
 extern MagickExport MagickBooleanType
-  GetOneVirtualMagickPixel(const Image *,const ssize_t,const ssize_t,
-    PixelInfo *,ExceptionInfo *),
-  GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,PixelPacket *,
+  GetOneAuthenticPixel(Image *,const ssize_t,const ssize_t,Quantum *,
     ExceptionInfo *),
-  GetOneVirtualMethodPixel(const Image *,const VirtualPixelMethod,const ssize_t,
-    const ssize_t,PixelPacket *,ExceptionInfo *),
-  GetOneAuthenticPixel(Image *,const ssize_t,const ssize_t,PixelPacket *,
+  GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,Quantum *,
     ExceptionInfo *),
+  GetOneVirtualPixelInfo(const Image *,const VirtualPixelMethod,
+    const ssize_t,const ssize_t,PixelInfo *,ExceptionInfo *),
   PersistPixelCache(Image *,const char *,const MagickBooleanType,
     MagickOffsetType *,ExceptionInfo *),
-  SyncAuthenticPixels(Image *,ExceptionInfo *);
+  SyncAuthenticPixels(Image *,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport MagickSizeType
   GetImageExtent(const Image *);
 
 extern MagickExport Quantum
   *GetAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *),
-  *GetAuthenticPixelQueue(const Image *),
+    const size_t,ExceptionInfo *) magick_hot_spot,
+  *GetAuthenticPixelQueue(const Image *) magick_hot_spot,
   *QueueAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
-    const size_t,ExceptionInfo *);
+    const size_t,ExceptionInfo *) magick_hot_spot;
 
 extern MagickExport void
   *GetAuthenticMetacontent(const Image *);