Identify: return consistent colorspace between IM6 and IM7

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index b0ce2811ee396bb256eaecbd41f9c45c65f588b0..0aebc6487aa19bbdbf8c50952d968eff1bcbf29f 100644 (file)
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -745,7 +745,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     Detail channel depth and extrema.
   */
   (void) FormatLocaleFile(file,"  Colorspace: %s\n",CommandOptionToMnemonic(
-    MagickColorspaceOptions,(ssize_t) image->colorspace));
+    MagickColorspaceOptions,(ssize_t) colorspace));
   channel_statistics=(ChannelStatistics *) NULL;
   channel_moments=(ChannelMoments *) NULL;
   channel_phash=(ChannelPerceptualHash *) NULL;

diff --git a/coders/png.c b/coders/png.c
index abafc5bd276291af6a0290fa6d709a60c58c76fa..dfd9e4b3cd0dfefc067b2883fef411d37b405802 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -3516,6 +3516,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
               break;
           }
       }
+      quantum_info=DestroyQuantumInfo(quantum_info);
     }
 
   else /* image->storage_class != DirectClass */
@@ -3598,7 +3599,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
             for (x=(ssize_t) image->columns-1; x >= 0; x--)
             {
 #if (MAGICKCORE_QUANTUM_DEPTH >= 16)
-              unsigned short
+              unsigned long
                 quantum;
 
               if (image->colors > 256)
@@ -14031,7 +14032,7 @@ static MagickBooleanType WriteMNGImage(const ImageInfo *image_info,
           previous_x,
           previous_y;
 
-        if (scene)
+        if (scene != 0)
           {
             previous_x=mng_info->page.x;
             previous_y=mng_info->page.y;

diff --git a/configure b/configure
index a5cd91ec29822d186256d02e472d78fb79e58078..a7a1f397ec5a498bbd909484e84d49a37aacbf41 100755 (executable)
--- a/configure
+++ b/configure
@@ -4559,7 +4559,7 @@ MAGICK_PATCHLEVEL_VERSION=15
 
 MAGICK_VERSION=7.0.7-15
 
-MAGICK_GIT_REVISION=21875:23d0d206f:20171208
+MAGICK_GIT_REVISION=21896:18b6989dc:20171215
 
 
 # Substitute library versioning