From: Cristy Date: Mon, 6 Feb 2017 23:30:26 +0000 (-0500) Subject: https://github.com/ImageMagick/ImageMagick/pull/373 X-Git-Tag: 7.0.4-8~37 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=420d0eb782c3cce457b82eeae7b0005040e76ee0;p=imagemagick https://github.com/ImageMagick/ImageMagick/pull/373 --- diff --git a/ChangeLog b/ChangeLog index 2c56b88b9..8fd79fb16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-03-07 7.0.4-9 Cristy + * Unbreak build without JPEG support (reference + https://github.com/ImageMagick/ImageMagick/pull/373). + 2017-02-04 7.0.4-7 Cristy * Release ImageMagick version 7.0.4-7, GIT revision 19513:5783e57:20170204. diff --git a/coders/png.c b/coders/png.c index aebe59281..1328b1aab 100644 --- a/coders/png.c +++ b/coders/png.c @@ -1229,7 +1229,6 @@ static void PNGLong(png_bytep p,png_uint_32 value) *p++=(png_byte) (value & 0xff); } -#if defined(JNG_SUPPORTED) static void PNGsLong(png_bytep p,png_int_32 value) { *p++=(png_byte) ((value >> 24) & 0xff); @@ -1237,7 +1236,6 @@ static void PNGsLong(png_bytep p,png_int_32 value) *p++=(png_byte) ((value >> 8) & 0xff); *p++=(png_byte) (value & 0xff); } -#endif static void PNGShort(png_bytep p,png_uint_16 value) {