diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 14:16:10 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2015-02-09 14:17:36 +0100 |
| commit | f27e7424fc314e50f826036fd078ca64fe3f31ba (patch) | |
| tree | a72f68f47c1053fcf53f9204f3382955b2d29b57 /nxcomp | |
| parent | 48c82810715011513dc38dc1fd39d67134d899c5 (diff) | |
| download | nx-libs-f27e7424fc314e50f826036fd078ca64fe3f31ba.tar.gz nx-libs-f27e7424fc314e50f826036fd078ca64fe3f31ba.tar.bz2 nx-libs-f27e7424fc314e50f826036fd078ca64fe3f31ba.zip | |
Fix building against libpng 1.5 (006_nxcomp_libpng15.full+lite.patch).
From the libpng homepage...
The libpng 1.5.x series continues the evolution of the libpng API,
finally hiding the contents of the venerable and hoary png_struct and
png_info data structures inside private (i.e., non-installed) header
files. Instead of direct struct-access, applications should be using
the various png_get_xxx() and png_set_xxx() accessor functions, which
have existed for almost as long as libpng itself. (Apps that compiled
against libpng 1.4 without warnings about deprecated features should
happily compile against 1.5, too.
Patch origin: Fedora packagers of libXcomp3.
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/Pgn.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp index a68373441..af26724ef 100644 --- a/nxcomp/Pgn.cpp +++ b/nxcomp/Pgn.cpp @@ -414,7 +414,7 @@ int DecompressPng16(unsigned char *compressedData, int compressedLen, png_read_info(pngPtr, infoPtr); - if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) + if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) { png_set_expand(pngPtr); } @@ -565,7 +565,7 @@ int DecompressPng24(unsigned char *compressedData, int compressedLen, png_read_info( pngPtr, infoPtr ) ; - if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) + if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) { png_set_expand(pngPtr); } @@ -709,7 +709,7 @@ int DecompressPng32(unsigned char *compressedData, int compressedLen, png_read_info(pngPtr, infoPtr) ; - if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) + if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) { png_set_expand(pngPtr); } |