Update web pages

[imagemagick] / MagickCore / cache-view.c

diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index 874e86aa6ecccad19345f7cc209db677c65965ba..7453aee9bb9a6c439373f21bdf02be88fe61e0ae 100644 (file)
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -19,11 +19,11 @@
 %                        MagickCore Cache View Methods                        %
 %                                                                             %
 %                              Software Design                                %
-%                                John Cristy                                  %
+%                                   Cristy                                    %
 %                               February 2000                                 %
 %                                                                             %
 %                                                                             %
-%  Copyright 1999-2013 ImageMagick Studio LLC, a non-profit organization      %
+%  Copyright 1999-2015 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.  You may  %
@@ -113,7 +113,7 @@ MagickExport CacheView *AcquireAuthenticCacheView(const Image *image,
   ExceptionInfo *exception)
 {
   CacheView
-    *cache_view;
+    *restrict cache_view;
 
   cache_view=AcquireVirtualCacheView(image,exception);
   (void) SyncImagePixelCache(cache_view->image,exception);
@@ -151,10 +151,10 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
   ExceptionInfo *exception)
 {
   CacheView
-    *cache_view;
+    *restrict cache_view;
 
   assert(image != (Image *) NULL);
-  assert(image->signature == MagickSignature);
+  assert(image->signature == MagickCoreSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   (void) exception;
@@ -172,7 +172,7 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
   cache_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads);
   cache_view->virtual_pixel_method=GetImageVirtualPixelMethod(image);
   cache_view->debug=IsEventLogging();
-  cache_view->signature=MagickSignature;
+  cache_view->signature=MagickCoreSignature;
   if (cache_view->nexus_info == (NexusInfo **) NULL)
     ThrowFatalException(CacheFatalError,"UnableToAcquireCacheView");
   return(cache_view);
@@ -203,10 +203,10 @@ MagickExport CacheView *AcquireVirtualCacheView(const Image *image,
 MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
 {
   CacheView
-    *clone_view;
+    *restrict clone_view;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -220,7 +220,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
   clone_view->nexus_info=AcquirePixelCacheNexus(cache_view->number_threads);
   clone_view->virtual_pixel_method=cache_view->virtual_pixel_method;
   clone_view->debug=cache_view->debug;
-  clone_view->signature=MagickSignature;
+  clone_view->signature=MagickCoreSignature;
   return(clone_view);
 }
 \f
@@ -250,7 +250,7 @@ MagickExport CacheView *CloneCacheView(const CacheView *cache_view)
 MagickExport CacheView *DestroyCacheView(CacheView *cache_view)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -258,7 +258,7 @@ MagickExport CacheView *DestroyCacheView(CacheView *cache_view)
     cache_view->nexus_info=DestroyPixelCacheNexus(cache_view->nexus_info,
       cache_view->number_threads);
   cache_view->image=DestroyImage(cache_view->image);
-  cache_view->signature=(~MagickSignature);
+  cache_view->signature=(~MagickCoreSignature);
   cache_view=(CacheView *) RelinquishAlignedMemory(cache_view);
   return(cache_view);
 }
@@ -302,10 +302,10 @@ MagickExport Quantum *GetCacheViewAuthenticPixels(CacheView *cache_view,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *restrict pixels;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
@@ -343,7 +343,7 @@ MagickExport void *GetCacheViewAuthenticMetacontent(CacheView *cache_view)
     id = GetOpenMPThreadId();
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
   return(cache_view->nexus_info[id]->metacontent);
@@ -380,7 +380,7 @@ MagickExport Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
     id = GetOpenMPThreadId();
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
   return(cache_view->nexus_info[id]->pixels);
@@ -412,7 +412,7 @@ MagickExport Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 MagickExport ColorspaceType GetCacheViewColorspace(const CacheView *cache_view)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -452,7 +452,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
     extent;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -488,7 +488,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
 MagickExport const Image *GetCacheViewImage(const CacheView *cache_view)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -521,7 +521,7 @@ MagickExport const Image *GetCacheViewImage(const CacheView *cache_view)
 MagickExport ClassType GetCacheViewStorageClass(const CacheView *cache_view)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -560,10 +560,10 @@ MagickExport const void *GetCacheViewVirtualMetacontent(
     id = GetOpenMPThreadId();
 
   const void
-    *metacontent;
+    *restrict metacontent;
 
   assert(cache_view != (const CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
   metacontent=GetVirtualMetacontentFromNexus(cache_view->image->cache,
@@ -603,10 +603,10 @@ MagickExport const Quantum *GetCacheViewVirtualPixelQueue(
     id = GetOpenMPThreadId();
 
   const Quantum
-    *pixels;
+    *restrict pixels;
 
   assert(cache_view != (const CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(cache_view->image->cache != (Cache) NULL);
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsNexus(cache_view->image->cache,
@@ -654,10 +654,10 @@ MagickExport const Quantum *GetCacheViewVirtualPixels(
     id = GetOpenMPThreadId();
 
   const Quantum
-    *pixels;
+    *restrict pixels;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,columns,rows,
@@ -704,13 +704,13 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
     id = GetOpenMPThreadId();
 
   Quantum
-    *q;
+    *restrict q;
 
   register ssize_t
     i;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   (void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
   q=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
@@ -776,13 +776,13 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
     id = GetOpenMPThreadId();
 
   register const Quantum
-    *p;
+    *restrict p;
 
   register ssize_t
     i;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   (void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
   p=GetVirtualPixelsFromNexus(cache_view->image,
@@ -849,10 +849,10 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixelInfo(
     id = GetOpenMPThreadId();
 
   register const Quantum
-    *p;
+    *restrict p;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   GetPixelInfo(cache_view->image,pixel);
   p=GetVirtualPixelsFromNexus(cache_view->image,
@@ -908,13 +908,13 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
     id = GetOpenMPThreadId();
 
   const Quantum
-    *p;
+    *restrict p;
 
   register ssize_t
     i;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   (void) memset(pixel,0,MaxPixelChannels*sizeof(*pixel));
   p=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,1,
@@ -980,10 +980,10 @@ MagickExport Quantum *QueueCacheViewAuthenticPixels(CacheView *cache_view,
     id = GetOpenMPThreadId();
 
   Quantum
-    *pixels;
+    *restrict pixels;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   pixels=QueueAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
     MagickFalse,cache_view->nexus_info[id],exception);
@@ -1022,7 +1022,7 @@ MagickExport MagickBooleanType SetCacheViewStorageClass(CacheView *cache_view,
   const ClassType storage_class,ExceptionInfo *exception)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -1056,10 +1056,10 @@ MagickExport MagickBooleanType SetCacheViewStorageClass(CacheView *cache_view,
 %
 */
 MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
-  CacheView *cache_view,const VirtualPixelMethod virtual_pixel_method)
+  CacheView *restrict cache_view,const VirtualPixelMethod virtual_pixel_method)
 {
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   if (cache_view->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       cache_view->image->filename);
@@ -1095,7 +1095,7 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
 %
 */
 MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
-  CacheView *cache_view,ExceptionInfo *exception)
+  CacheView *restrict cache_view,ExceptionInfo *exception)
 {
   const int
     id = GetOpenMPThreadId();
@@ -1104,7 +1104,7 @@ MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
     status;
 
   assert(cache_view != (CacheView *) NULL);
-  assert(cache_view->signature == MagickSignature);
+  assert(cache_view->signature == MagickCoreSignature);
   assert(id < (int) cache_view->number_threads);
   status=SyncAuthenticPixelCacheNexus(cache_view->image,
     cache_view->nexus_info[id],exception);