[X2Go-Commits] [nx-libs] 09/29: Fix building against libpng 1.5 (006_nxcomp_libpng15.full+lite.patch). From the libpng homepage...
git-admin at x2go.org
git-admin at x2go.org
Tue Feb 10 05:21:41 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x
in repository nx-libs.
commit f27e7424fc314e50f826036fd078ca64fe3f31ba
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Feb 9 14:16:10 2015 +0100
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.
---
debian/patches/006_nxcomp_libpng15.full+lite.patch | 43 --------------------
debian/patches/series | 1 -
nxcomp/Pgn.cpp | 6 +--
3 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/debian/patches/006_nxcomp_libpng15.full+lite.patch b/debian/patches/006_nxcomp_libpng15.full+lite.patch
deleted file mode 100644
index a75c59b..0000000
--- a/debian/patches/006_nxcomp_libpng15.full+lite.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 2010-03-01 19:18:59.000000000 +0200
-+++ b/nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300
-@@ -414,7 +414,7 @@
-
- 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 @@
-
- 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 @@
- 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);
- }
diff --git a/debian/patches/series b/debian/patches/series
index 9779715..f82c87b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-006_nxcomp_libpng15.full+lite.patch
007_nxcompshad_clean-gch-files.full.patch
008_nxcomp_sa-restorer.full+lite.patch
009_nxproxy_add-man-page.full+lite.patch
diff --git a/nxcomp/Pgn.cpp b/nxcomp/Pgn.cpp
index a683734..af26724 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);
}
--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list