diff options
author | Chris Liddell <chris.liddell@artifex.com> | 2012-06-08 13:02:43 +0100 |
---|---|---|
committer | Chris Liddell <chris.liddell@artifex.com> | 2012-06-08 15:19:23 +0100 |
commit | d7d86ee955e58d18f4ff3071c0f41c4e3f75aaea (patch) | |
tree | d3d90c3b1270d6c8cf2bb0c43b3af89cd1d7ba3a /gs/libpng/contrib/gregbook/rpng-x.c | |
parent | a85db51fecf74ba66bada63afece1799d58681ce (diff) | |
download | ghostpdl-d7d86ee955e58d18f4ff3071c0f41c4e3f75aaea.tar.gz |
Update libpng to version 1.5.10
Minor build revisions to deal with new libpng version:
We copy the predefined pnglibconf.h into the build directory, and have
libpng include it from there (it's less invasive than running the libpng
configure script).
We have to use the same kind of compiler incantation as lcms.mak because
libpng 1.5.x suffers compatibility problems with /Za in Visual Studio
as lcms does.
Minor revision to XPS png reading code to cope with libpng 1.5.x API:
Primarily, the 1.5.x API has made the png_info data type opaque to the calling
code, so all access to the it contains *must* be done through function calls.
No cluster differences expected.
Diffstat (limited to 'gs/libpng/contrib/gregbook/rpng-x.c')
-rw-r--r-- | gs/libpng/contrib/gregbook/rpng-x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gs/libpng/contrib/gregbook/rpng-x.c b/gs/libpng/contrib/gregbook/rpng-x.c index 0a9817029..6d10e1b84 100644 --- a/gs/libpng/contrib/gregbook/rpng-x.c +++ b/gs/libpng/contrib/gregbook/rpng-x.c @@ -81,8 +81,8 @@ #define PROGNAME "rpng-x" #define LONGNAME "Simple PNG Viewer for X" #define VERSION "2.01 of 16 March 2008" -#define RESNAME "rpng" /* our X resource application name */ -#define RESCLASS "Rpng" /* our X resource class name */ +#define RESNAME "rpng" /* our X resource application name */ +#define RESCLASS "Rpng" /* our X resource class name */ #include <stdio.h> #include <stdlib.h> @@ -252,8 +252,8 @@ int main(int argc, char **argv) else { bgstr = *argv; if (strlen(bgstr) != 7 || bgstr[0] != '#') - ++error; - else + ++error; + else have_bg = TRUE; } } else { |