(no commit message)

diff --git a/MagickCore/quantum.c b/MagickCore/quantum.c
index 1400f0d041462fc88fab508a175df80e71ef85bb..f0422f8293de5a27f21fde54a5fe8052de4c1ca6 100644 (file)
--- a/MagickCore/quantum.c
+++ b/MagickCore/quantum.c
@@ -472,14 +472,15 @@ MagickExport void GetQuantumInfo(const ImageInfo *image_info,
 %
 %  The format of the GetQuantumPixels method is:
 %
-%      void *QuantumPixels GetQuantumPixels(const QuantumInfo *quantum_info)
+%      unsigned char *QuantumPixels GetQuantumPixels(
+%        const QuantumInfo *quantum_info)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
 */
-MagickExport void *GetQuantumPixels(const QuantumInfo *quantum_info)
+MagickExport unsigned char *GetQuantumPixels(const QuantumInfo *quantum_info)
 {
   const int
     id = GetOpenMPThreadId();

diff --git a/MagickCore/quantum.h b/MagickCore/quantum.h
index 77ebe8107426736743fbad75626fdfddec2a2611..57c858a7a4aa0f7f393880ed63bd6f4f3ab5964f 100644 (file)
--- a/MagickCore/quantum.h
+++ b/MagickCore/quantum.h
@@ -175,9 +175,11 @@ extern MagickExport size_t
   ImportQuantumPixels(const Image *,CacheView *,QuantumInfo *,const QuantumType,
     const unsigned char *restrict,ExceptionInfo *);
 
+extern MagickExport unsigned char
+  *GetQuantumPixels(const QuantumInfo *);
+
 extern MagickExport void
   GetQuantumInfo(const ImageInfo *,QuantumInfo *),
-  *GetQuantumPixels(const QuantumInfo *),
   SetQuantumAlphaType(QuantumInfo *,const QuantumAlphaType),
   SetQuantumImageType(Image *,const QuantumType),
   SetQuantumMinIsWhite(QuantumInfo *,const MagickBooleanType),

diff --git a/MagickCore/version.h b/MagickCore/version.h
index cffc2e19410d4dab2c7ec6640058926631021ca9..fb41b94e336920842d4fc6fab4920ce75d5f076f 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2015 ImageMagick Studio LLC"
-#define MagickSVNRevision  "18670:18687M"
+#define MagickSVNRevision  "18685M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  0,0,0

diff --git a/coders/pnm.c b/coders/pnm.c
index 607267dde986da7732dc8d3413ce6bda070f4a56..349d94e9d685cdcdc77fdd8eeccd8fdff5988937 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -564,7 +564,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         extent=GetQuantumExtent(image,quantum_info,quantum_type);
         for (y=0; y < (ssize_t) image->rows; y++)
         {
-          const void
+          const unsigned char
             *pixels;
 
           MagickBooleanType
@@ -582,8 +582,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           if (status == MagickFalse)
             continue;
-          pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info),
-            &count);
+          pixels=(unsigned char *) ReadBlobStream(image,extent,
+            GetQuantumPixels(quantum_info),&count);
           if (count != (ssize_t) extent)
             status=MagickFalse;
           if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
@@ -637,7 +637,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
         for (y=0; y < (ssize_t) image->rows; y++)
         {
-          const void
+          const unsigned char
             *pixels;
 
           MagickBooleanType
@@ -658,8 +658,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           if (status == MagickFalse)
             continue;
-          pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info),
-            &count);
+          pixels=(unsigned char *) ReadBlobStream(image,extent,
+            GetQuantumPixels(quantum_info),&count);
           if (count != (ssize_t) extent)
             status=MagickFalse;
           if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
@@ -754,7 +754,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         (void) SetQuantumEndian(image,quantum_info,MSBEndian);
         for (y=0; y < (ssize_t) image->rows; y++)
         {
-          const void
+          const unsigned char
             *pixels;
 
           MagickBooleanType
@@ -775,8 +775,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           if (status == MagickFalse)
             continue;
-          pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info),
-            &count);
+          pixels=(unsigned char *) ReadBlobStream(image,extent,
+            GetQuantumPixels(quantum_info),&count);
           if (count != (ssize_t) extent)
             status=MagickFalse;
           if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
@@ -954,7 +954,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
           ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
         for (y=0; y < (ssize_t) image->rows; y++)
         {
-          const void
+          const unsigned char
             *pixels;
 
           MagickBooleanType
@@ -975,8 +975,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           if (status == MagickFalse)
             continue;
-          pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info),
-            &count);
+          pixels=(unsigned char *) ReadBlobStream(image,extent,
+            GetQuantumPixels(quantum_info),&count);
           if (count != (ssize_t) extent)
             status=MagickFalse;
           if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
@@ -1276,7 +1276,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         extent=GetQuantumExtent(image,quantum_info,quantum_type);
         for (y=0; y < (ssize_t) image->rows; y++)
         {
-          const void
+          const unsigned char
             *pixels;
 
           MagickBooleanType
@@ -1294,8 +1294,8 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
           if (status == MagickFalse)
             continue;
-          pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info),
-            &count);
+          pixels=(unsigned char *) ReadBlobStream(image,extent,
+            GetQuantumPixels(quantum_info),&count);
           if ((size_t) count != extent)
             status=MagickFalse;
           if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
@@ -1736,7 +1736,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image,
             *q++=(unsigned char) (GetPixelLuma(image,p) >= (QuantumRange/2.0) ?
               '0' : '1');
             *q++=' ';
-            if ((q-pixels+1) >= sizeof(pixels))
+            if ((q-pixels+1) >= (ssize_t) sizeof(pixels))
               {
                 *q++='\n';
                 (void) WriteBlob(image,q-pixels,pixels);

diff --git a/coders/tiff.c b/coders/tiff.c
index 5f646bb9449dfecb386f33eb50f29b81d67add0f..80ccf076dd31ec484711ebe6db3b7c4c21f32bc6 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -982,7 +982,7 @@ static void TIFFReadPhotoshopLayers(Image* image,const ImageInfo *image_info,
       break;
   }
   i+=4;
-  if (i >= layer_info->length-8)
+  if (i >= (ssize_t) (layer_info->length-8))
     return;
   layers=CloneImage(image,image->columns,image->rows,MagickTrue,exception);
   RemoveImageProfile(layers,"tiff:37724");

diff --git a/configure b/configure
index 8cd94f6115484a6bcd9f830a36c6266057b073e5..84cc6f51e3f0a96a3c74475f5f8be037cafd6eb1 100755 (executable)
--- a/configure
+++ b/configure
@@ -4341,7 +4341,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18670:18687M
+MAGICK_SVN_REVISION=18685M
 
 
 # Substitute library versioning