package/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch

   1 From 5d0e9c53f49022df5154eb3c04900f48b1c6448e Mon Sep 17 00:00:00 2001
   2 From: Peter Korsgaard <peter@korsgaard.com>
   3 Date: Mon, 6 Feb 2017 17:39:31 +0100
   4 Subject: [PATCH] png.c: unbreak build without JPEG support
   5
   6 Since commit a9e228f8ac26 (Implemented a private PNG caNv (canvas) chunk),
   7 PNGsLong gets called unconditionally, but it is only defined if JPEG
   8 support is enabled (which defines JNG_SUPPORTED), breaking the build:
   9
  10 MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function `WriteOnePNGImage':
  11 png.c:(.text+0x748d): undefined reference to `PNGsLong'
  12 png.c:(.text+0x74b7): undefined reference to `PNGsLong'
  13
  14 For build log, see:
  15 http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log
  16
  17 Fix it by unconditionally defining the helper function.
  18
  19 Submitted-upstream: https://github.com/ImageMagick/ImageMagick/pull/373
  20 Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  21 ---
  22  coders/png.c | 2 --
  23  1 file changed, 2 deletions(-)
  24
  25 diff --git a/coders/png.c b/coders/png.c
  26 index aebe59281..1328b1aab 100644
  27 --- a/coders/png.c
  28 +++ b/coders/png.c
  29 @@ -1229,7 +1229,6 @@ static void PNGLong(png_bytep p,png_uint_32 value)
  30    *p++=(png_byte) (value & 0xff);
  31  }
  32
  33 -#if defined(JNG_SUPPORTED)
  34  static void PNGsLong(png_bytep p,png_int_32 value)
  35  {
  36    *p++=(png_byte) ((value >> 24) & 0xff);
  37 @@ -1237,7 +1236,6 @@ static void PNGsLong(png_bytep p,png_int_32 value)
  38    *p++=(png_byte) ((value >> 8) & 0xff);
  39    *p++=(png_byte) (value & 0xff);
  40  }
  41 -#endif
  42
  43  static void PNGShort(png_bytep p,png_uint_16 value)
  44  {
  45 --
  46 2.11.0
  47