(no commit message)

[imagemagick] / magick / cache-view.c

diff --git a/magick/cache-view.c b/magick/cache-view.c
index 8ebc0712b8d389d00a7572cd529929a6ff7141da..f770b2c5a15faa5fcc5bf9de1a592a3845fa38b8 100644 (file)
--- a/magick/cache-view.c
+++ b/magick/cache-view.c
@@ -67,7 +67,7 @@ struct _CacheView
   VirtualPixelMethod
     virtual_pixel_method;
 
-  unsigned long
+  size_t
     number_threads;
 
   NexusInfo
@@ -76,7 +76,7 @@ struct _CacheView
   MagickBooleanType
     debug;
 
-  unsigned long
+  size_t
     signature;
 };
 \f
@@ -303,12 +303,12 @@ MagickExport ExceptionInfo *GetCacheViewException(const CacheView *cache_view)
 */
 MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
 {
-  long
-    id;
-
   MagickSizeType
     extent;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
   if (cache_view->debug != MagickFalse)
@@ -316,7 +316,7 @@ MagickExport MagickSizeType GetCacheViewExtent(const CacheView *cache_view)
       cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   extent=GetPixelCacheNexusExtent(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(extent);
@@ -373,8 +373,8 @@ MagickExport ClassType GetCacheViewStorageClass(const CacheView *cache_view)
 %  The format of the GetCacheViewAuthenticPixels method is:
 %
 %      PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
-%        const long x,const long y,const unsigned long columns,
-%        const unsigned long rows,ExceptionInfo *exception)
+%        const ssize_t x,const ssize_t y,const size_t columns,
+%        const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -385,28 +385,25 @@ MagickExport ClassType GetCacheViewStorageClass(const CacheView *cache_view)
 %
 */
 MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
-  const long x,const long y,const unsigned long columns,
-  const unsigned long rows,ExceptionInfo *exception)
+  const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
+  ExceptionInfo *exception)
 {
   Cache
     cache;
 
-  long
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
   if (cache == (Cache) NULL)
     return((PixelPacket *) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
   return(pixels);
@@ -429,7 +426,7 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
 %  The format of the GetOneCacheViewAuthenticPixel method is:
 %
 %      MagickBooleaNType GetOneCacheViewAuthenticPixel(
-%        const CacheView *cache_view,const long x,const long y,
+%        const CacheView *cache_view,const ssize_t x,const ssize_t y,
 %        Pixelpacket *pixel,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -444,29 +441,26 @@ MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
 %
 */
 MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
-  const CacheView *cache_view,const long x,const long y,PixelPacket *pixel,
-  ExceptionInfo *exception)
+  const CacheView *cache_view,const ssize_t x,const ssize_t y,
+  PixelPacket *pixel,ExceptionInfo *exception)
 {
   Cache
     cache;
 
-  long
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   cache=GetImagePixelCache(cache_view->image,MagickTrue,exception);
   if (cache == (Cache) NULL)
     return(MagickFalse);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
     cache_view->nexus_info[id],exception);
   if (pixels == (const PixelPacket *) NULL)
@@ -504,17 +498,14 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
   IndexPacket
     *indexes;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   indexes=GetPixelCacheNexusIndexes(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(indexes);
@@ -547,20 +538,17 @@ MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
 */
 MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
 {
-  long
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetPixelCacheNexusPixels(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(pixels);
@@ -597,17 +585,14 @@ MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
   const IndexPacket
     *indexes;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   indexes=GetVirtualIndexesFromNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(indexes);
@@ -644,17 +629,14 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
   const PixelPacket
     *pixels;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (const CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   assert(cache_view->image->cache != (Cache) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetVirtualPixelsNexus(cache_view->image->cache,
     cache_view->nexus_info[id]);
   return(pixels);
@@ -679,9 +661,8 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
 %  The format of the GetCacheViewVirtualPixels method is:
 %
 %      const PixelPacket *GetCacheViewVirtualPixels(
-%        const CacheView *cache_view,const long x,const long y,
-%        const unsigned long columns,const unsigned long rows,
-%        ExceptionInfo *exception)
+%        const CacheView *cache_view,const ssize_t x,const ssize_t y,
+%        const size_t columns,const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -694,22 +675,19 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
 %
 */
 MagickExport const PixelPacket *GetCacheViewVirtualPixels(
-  const CacheView *cache_view,const long x,const long y,
-  const unsigned long columns,const unsigned long rows,ExceptionInfo *exception)
+  const CacheView *cache_view,const ssize_t x,const ssize_t y,
+  const size_t columns,const size_t rows,ExceptionInfo *exception)
 {
   const PixelPacket
     *pixels;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
@@ -734,7 +712,7 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixels(
 %  The format of the GetOneCacheViewVirtualPixel method is:
 %
 %      MagickBooleanType GetOneCacheViewVirtualPixel(
-%        const CacheView *cache_view,const long x,const long y,
+%        const CacheView *cache_view,const ssize_t x,const ssize_t y,
 %        PixelPacket *pixel,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -749,23 +727,20 @@ MagickExport const PixelPacket *GetCacheViewVirtualPixels(
 %
 */
 MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
-  const CacheView *cache_view,const long x,const long y,PixelPacket *pixel,
-  ExceptionInfo *exception)
+  const CacheView *cache_view,const ssize_t x,const ssize_t y,
+  PixelPacket *pixel,ExceptionInfo *exception)
 {
   const PixelPacket
     *pixels;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,
     cache_view->virtual_pixel_method,x,y,1,1,cache_view->nexus_info[id],
     exception);
@@ -795,8 +770,8 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
 %
 %      MagickBooleanType GetOneCacheViewVirtualMethodPixel(
 %        const CacheView *cache_view,
-%        const VirtualPixelMethod virtual_pixel_method,const long x,
-%        const long y,PixelPacket *pixel,ExceptionInfo *exception)
+%        const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
+%        const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -813,22 +788,19 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel(
 */
 MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
   const CacheView *cache_view,const VirtualPixelMethod virtual_pixel_method,
-  const long x,const long y,PixelPacket *pixel,ExceptionInfo *exception)
+  const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
 {
   const PixelPacket
     *pixels;
 
-  long
+  ssize_t
     id;
 
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   *pixel=cache_view->image->background_color;
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,
     1,cache_view->nexus_info[id],exception);
   if (pixels == (const PixelPacket *) NULL)
@@ -856,8 +828,8 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
 %  The format of the QueueCacheViewAuthenticPixels method is:
 %
 %      PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
-%        const long x,const long y,const unsigned long columns,
-%        const unsigned long rows,ExceptionInfo *exception)
+%        const ssize_t x,const ssize_t y,const size_t columns,
+%        const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -870,28 +842,25 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel(
 %
 */
 MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
-  const long x,const long y,const unsigned long columns,
-  const unsigned long rows,ExceptionInfo *exception)
+  const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
+  ExceptionInfo *exception)
 {
   Cache
     cache;
 
-  long
-    id;
-
   PixelPacket
     *pixels;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   cache=GetImagePixelCache(cache_view->image,MagickFalse,exception);
   if (cache == (Cache) NULL)
     return((PixelPacket *) NULL);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
     cache_view->nexus_info[id],exception);
   return(pixels);
@@ -1002,19 +971,16 @@ MagickExport MagickBooleanType SetCacheViewVirtualPixelMethod(
 MagickExport MagickBooleanType SyncCacheViewAuthenticPixels(
   CacheView *cache_view,ExceptionInfo *exception)
 {
-  long
-    id;
-
   MagickBooleanType
     status;
 
+  ssize_t
+    id;
+
   assert(cache_view != (CacheView *) NULL);
   assert(cache_view->signature == MagickSignature);
-  if (cache_view->debug != MagickFalse)
-    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
-      cache_view->image->filename);
   id=GetOpenMPThreadId();
-  assert(id < (long) cache_view->number_threads);
+  assert(id < (ssize_t) cache_view->number_threads);
   status=SyncAuthenticPixelCacheNexus(cache_view->image,
     cache_view->nexus_info[id],exception);
   return(status);