about summary refs log tree commit diff
path: root/converter/other
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-09-03 15:34:36 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2009-09-03 15:34:36 +0000
commit5b6f108e18f64f5fb9c1f658386eaf947ae4bdee (patch)
treeec76fbd629c58bed9cba99b8c85e3866862dd573 /converter/other
parentd7252e2e0781b61583d8e33fd2dc1a5116eaa062 (diff)
downloadnetpbm-mirror-5b6f108e18f64f5fb9c1f658386eaf947ae4bdee.tar.gz
netpbm-mirror-5b6f108e18f64f5fb9c1f658386eaf947ae4bdee.tar.xz
netpbm-mirror-5b6f108e18f64f5fb9c1f658386eaf947ae4bdee.zip
Version 10.35.67
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@977 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r--converter/other/pngtopnm.c6
-rw-r--r--converter/other/pnmtopng.c7
2 files changed, 13 insertions, 0 deletions
diff --git a/converter/other/pngtopnm.c b/converter/other/pngtopnm.c
index c21420a7..0ee08ede 100644
--- a/converter/other/pngtopnm.c
+++ b/converter/other/pngtopnm.c
@@ -44,6 +44,12 @@
 #include "nstring.h"
 #include "shhopt.h"
 
+#if PNG_LIBPNG_VER >= 10400
+#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+#error You need either an older PNG library (older than 1.4)
+#error newer Netpbm source code (at least 10.48)
+#endif
+
 typedef struct _jmpbuf_wrapper {
   jmp_buf jmpbuf;
 } jmpbuf_wrapper;
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index 5fc0326b..ed074777 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -69,6 +69,13 @@
 #include "nstring.h"
 #include "version.h"
 
+#if PNG_LIBPNG_VER >= 10400
+#error Your PNG library (<png.h>) is incompatible with this Netpbm source code.
+#error You need either an older PNG library (older than 1.4)
+#error newer Netpbm source code (at least 10.48)
+#endif
+
+
 struct zlibCompression {
     /* These are parameters that describe a form of zlib compression.
        Values have the same meaning as the similarly named arguments to