From: Glenn Randers-Pehrson <glennrp@gmail.com>
Date: Sat, 28 Jan 2017 02:53:16 +0000 (-0500)
Subject: Fix CoderDecoderSeekableNonsense again.  Fix Coverity "Dead code" issue.
X-Git-Tag: 7.0.4-7~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a73dec3de870ad5d11fb30672cf98553446a093;p=imagemagick

Fix CoderDecoderSeekableNonsense again.  Fix Coverity "Dead code" issue.
---

diff --git a/coders/png.c b/coders/png.c
index 2ef45c546..5b5c1a55f 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1975,7 +1975,7 @@ int exif_inf(png_structp png_ptr, unsigned char *source,
 
     /* clean up and return */
     (void)inflateEnd(&strm);
-    return ret == Z_STREAM_END ? inflated_length : -1;
+    return (inflated_length);
 }
 #endif /* zxIf */
 
@@ -7946,7 +7946,7 @@ ModuleExport size_t RegisterPNGImage(void)
 #endif
 
   entry=AcquireMagickInfo("PNG","MNG","Multiple-image Network Graphics");
-  entry->flags|=CoderSeekableStreamFlag;  /* To do: eliminate this. */
+  entry->flags|=CoderDecoderSeekableStreamFlag;  /* To do: eliminate this. */
 
 #if defined(MAGICKCORE_PNG_DELEGATE)
   entry->decoder=(DecodeImageHandler *) ReadMNGImage;