aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/0006_nxcomp_libpng15.full+lite.patch
blob: 0b305a7fb53aa564814a66331f14deb5be7e5538 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
Description: Fix building against libpng 1.5.
 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.
Forwarded: pending...
Author: Fedora packagers of NX
Last-Update: 2012-02-06
--- a/nxcomp/Pgn.cpp
+++ b/nxcomp/Pgn.cpp
@@ -414,7 +414,7 @@ int DecompressPng16(unsigned char *compr
 
   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 *compr
 
   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 *compr
   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);
   }