]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Sun, 6 Jan 2013 23:41:05 +0000 (23:41 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Sun, 6 Jan 2013 23:41:05 +0000 (23:41 +0000)
MagickCore/cache.c
MagickCore/cache.h

index 2dc1dbb83c04fe0ce2b17fc79a69005771161378..fbf3115136d2c762f074f1c78e6c6618fcdd9e1e 100644 (file)
@@ -1262,6 +1262,11 @@ static inline void RelinquishPixelCachePixels(CacheInfo *cache_info)
       RelinquishMagickResource(DiskResource,cache_info->length);
       break;
     }
+    case DistributedCache:
+    {
+      abort();
+      break;
+    }
     default:
       break;
   }
@@ -3861,6 +3866,8 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   status=AcquireMagickResource(DiskResource,cache_info->length);
   if (status == MagickFalse)
     {
+      if (0)
+        abort();  /* create distributed cache */
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
         "CacheResourcesExhausted","`%s'",image->filename);
       return(MagickFalse);
@@ -4455,6 +4462,11 @@ static MagickBooleanType ReadPixelCacheMetacontent(CacheInfo *cache_info,
         }
       break;
     }
+    case DistributedCache:
+    {
+      abort();
+      break;
+    }
     default:
       break;
   }
@@ -4589,6 +4601,11 @@ static MagickBooleanType ReadPixelCachePixels(CacheInfo *cache_info,
         }
       break;
     }
+    case DistributedCache:
+    {
+      abort();
+      break;
+    }
     default:
       break;
   }
@@ -5348,6 +5365,11 @@ static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info,
         }
       break;
     }
+    case DistributedCache:
+    {
+      abort();
+      break;
+    }
     default:
       break;
   }
@@ -5483,6 +5505,11 @@ static MagickBooleanType WritePixelCachePixels(CacheInfo *cache_info,
         }
       break;
     }
+    case DistributedCache:
+    {
+      abort();
+      break;
+    }
     default:
       break;
   }
index 214be8a337387e32718bf25d0171e76ad8a2ecee..8c2311c947799a50e71d7aff4b21bf7448ee0399 100644 (file)
@@ -27,9 +27,10 @@ extern "C" {
 typedef enum
 {
   UndefinedCache,
-  MemoryCache,
-  MapCache,
   DiskCache,
+  DistributedCache,
+  MapCache,
+  MemoryCache,
   PingCache
 } CacheType;