(no commit message)

diff --git a/magick/cache.c b/magick/cache.c
index 4e6fe165a294c9fecc903ccd1259d686b57886ad..182d43d0599a800d9a64125511a9d7b7f312cd99 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -3287,7 +3287,7 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   cache_info=(CacheInfo *) image->cache;
-  if ((cache_info->type == UndefinedCache) || (columns == 0) || (rows == 0))
+  if (cache_info->type == UndefinedCache)
     return((const PixelPacket *) NULL);
   region.x=x;
   region.y=y;
@@ -3311,7 +3311,6 @@ MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
         /*
           Pixel request is inside cache extents.
         */
-puts("a");
         if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
           return(pixels);
         status=ReadPixelCachePixels(cache_info,nexus_info,exception);

diff --git a/magick/quantum.h b/magick/quantum.h
index 2c65bc9d02577dbc30c99bb17a0dad6b1abdfc39..4818602ca348b5062d854b0cb1d4f353ffd0901f 100644 (file)
--- a/magick/quantum.h
+++ b/magick/quantum.h
@@ -101,7 +101,7 @@ static inline unsigned char ScaleQuantumToChar(const Quantum quantum)
   return((unsigned char) quantum);
 #else
   if (quantum <= 0.0)
-    return(0UL);
+    return(0);
   if (quantum >= 255.0)
     return(255);
   return((unsigned char) (quantum+0.5));