png.c: unbreak build without JPEG support #373
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Since commit a9e228f (Implemented a private PNG caNv (canvas) chunk), PNGsLong gets called unconditionally, but it is only defined if JPEG support is enabled (which defines JNG_SUPPORTED), breaking the build: MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function `WriteOnePNGImage': png.c:(.text+0x748d): undefined reference to `PNGsLong' png.c:(.text+0x74b7): undefined reference to `PNGsLong' For build log, see: http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log Fix it by unconditionally defining the helper function. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
The patch looks fine to me, thanks. |
dlemstra
pushed a commit
that referenced
this pull request
Feb 6, 2017
dlemstra
pushed a commit
that referenced
this pull request
Feb 6, 2017
|
We manually merged your changes. Thanks for the patch. |
jsonn
pushed a commit
to jsonn/pkgsrc
that referenced
this pull request
Feb 20, 2017
2017-02-18 7.0.4-10 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.4-10, GIT revision 19608:fe757a2:20170218.
2017-02-18 7.0.4-10 Dirk Lemstra <dirk@lem.....org>
* Fixed fd leak for webp coder (reference
ImageMagick/ImageMagick#382)
2017-02-15 7.0.4-10 Cristy <quetzlzacatenango@image...>
* Prevent random pixel data for corrupt JPEG image (bug report from
Hirokazu Moriguchi, Sony).
* Restore -mattecolor option.
* Support pixel-cache and shred security policies.
* Bump Magick++ SO. Previously a global replace changed matteColor to
alphaColor.
2017-02-14 7.0.4-9 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.4-9, GIT revision 19580:d474b37:20170214.
2017-02-14 7.0.4-9 Cristy <quetzlzacatenango@image...>
* Revert patch that did not set update trait on alpha channel.
2017-02-13 7.0.4-8 Cristy <quetzlzacatenango@image...>
* Release ImageMagick version 7.0.4-8, GIT revision 19574:7642384:20170213.
2017-02-09 7.0.4-8 Dirk Lemstra <dirk@lem.....org>
* Fixed memory leak when creating nested exceptions in Magick++ (reference
https://www.imagemagick.org/discourse-server/viewtopic.php?f=23&p=142634)
2017-02-09 7.0.4-8 Cristy <quetzlzacatenango@image...>
* Unbreak build without JPEG support (reference
ImageMagick/ImageMagick#373).
* Document behavior change in the security policy (thanks to yoya @
https://blog.awm.jp/2017/02/09/imagemagick-en/).
* Return unbiased standard deviation for image statistics (reference
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31377).
* Don't set update trait on alpha channel (private e-mail concerning
-levels-colors option).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since commit a9e228f (Implemented a private PNG caNv (canvas) chunk),
PNGsLong gets called unconditionally, but it is only defined if JPEG
support is enabled (which defines JNG_SUPPORTED), breaking the build:
MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function
WriteOnePNGImage': png.c:(.text+0x748d): undefined reference toPNGsLong'png.c:(.text+0x74b7): undefined reference to `PNGsLong'
For build log, see:
http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log
Fix it by unconditionally defining the helper function.
Signed-off-by: Peter Korsgaard peter@korsgaard.com