(no commit message)

[imagemagick] / MagickCore / cache-private.h

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index e5b6bf337a1d5635dad73f410a84e9de1a0fc57d..e27142aabc9de62aba2fa667ea637b4ae3e56c26 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 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.
@@ -18,17 +18,17 @@
 #ifndef _MAGICKCORE_CACHE_PRIVATE_H
 #define _MAGICKCORE_CACHE_PRIVATE_H
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#include <time.h>
 #include "MagickCore/cache.h"
+#include "MagickCore/distribute-cache.h"
 #include "MagickCore/pixel.h"
 #include "MagickCore/random_.h"
 #include "MagickCore/thread-private.h"
 #include "MagickCore/semaphore.h"
 
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
 typedef void
   *Cache;
 
@@ -101,7 +101,29 @@ typedef struct _CacheMethods
 } CacheMethods;
 
 typedef struct _NexusInfo
-   NexusInfo;
+{
+  MagickBooleanType
+    mapped;
+
+  RectangleInfo
+    region;
+
+  MagickSizeType
+    length;
+
+  Quantum
+    *cache,
+    *pixels;
+
+  MagickBooleanType
+    authentic_pixel_cache;
+
+  void
+    *metacontent;
+
+  size_t
+    signature;
+} NexusInfo;
 
 typedef struct _CacheInfo
 {
@@ -115,7 +137,8 @@ typedef struct _CacheInfo
     alpha_trait;
 
   MagickBooleanType
-    mask;
+    read_mask,
+    write_mask;
 
   size_t
     columns,
@@ -174,6 +197,9 @@ typedef struct _CacheInfo
   RandomInfo
     *random_info;
 
+  void
+    *server_info;
+
   MagickBooleanType
     synchronize,
     debug;
@@ -233,7 +259,6 @@ extern MagickPrivate NexusInfo
 extern MagickPrivate Quantum
   *GetAuthenticPixelCacheNexus(Image *,const ssize_t,const ssize_t,
     const size_t,const size_t,NexusInfo *,ExceptionInfo *) magick_hot_spot,
-  *GetPixelCacheNexusPixels(const Cache,NexusInfo *),
   *QueueAuthenticPixelCacheNexus(Image *,const ssize_t,const ssize_t,
     const size_t,const size_t,const MagickBooleanType,NexusInfo *,
     ExceptionInfo *) magick_hot_spot;
@@ -248,7 +273,6 @@ extern MagickPrivate VirtualPixelMethod
 extern MagickPrivate void
   CacheComponentTerminus(void),
   ClonePixelCacheMethods(Cache,const Cache),
-  *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *) magick_hot_spot,
   *GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *),
   GetPixelCacheTileSize(const Image *,size_t *,size_t *),
   GetPixelCacheMethods(CacheMethods *),