[devel] Revised pngvalid.c 16-to-8-big conversion tests

3 files changed, 13 insertions, 3 deletions

diff --git a/contrib/pngminim/decoder/pngusr.dfa b/contrib/pngminim/decoder/pngusr.dfa
index e6c6e3d66..d8cae2627 100644
--- a/contrib/pngminim/decoder/pngusr.dfa
+++ b/contrib/pngminim/decoder/pngusr.dfa
@@ -7,6 +7,7 @@
 # and license in png.h
 
 # First all the build options off:
+
 everything = off
 
 # All that is required is some read code. This example switches
@@ -31,7 +32,8 @@ option FLOATING_ARITHMETIC off
 # program here, pngm2pnm, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
+
 option SETJMP on
 option STDIO on
 option READ_EXPAND on
-option READ_16BIT on
+option READ_16_TO_8 on
diff --git a/contrib/pngminim/encoder/pngusr.dfa b/contrib/pngminim/encoder/pngusr.dfa
index f87317763..5a10474ab 100644
--- a/contrib/pngminim/encoder/pngusr.dfa
+++ b/contrib/pngminim/encoder/pngusr.dfa
@@ -7,26 +7,29 @@
 # and license in png.h
 
 # First all the build options off:
-everything = off
 
-option NO_16BIT on
+everything = off
 
 # Switch on the write code - this makes a minimalist encoder
+
 option WRITE on
 
 # You must choose fixed or floating point arithmetic:
 # option FLOATING_POINT on
+
 option FIXED_POINT on
 
 # You must chose the internal fixed point implementation or to
 # use the system floating point.  The latter is considerably
 # smaller (by about 1kbyte on an x86 system):
 # option FLOATING_ARITHMETIC on
+
 option FLOATING_ARITHMETIC off
 
 # Your program will probably need other options.  The example
 # program here, pnm2pngm, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
+
 option SETJMP on
 option STDIO on
diff --git a/contrib/pngminim/preader/pngusr.dfa b/contrib/pngminim/preader/pngusr.dfa
index 0ebcc30d4..780ed0cd1 100644
--- a/contrib/pngminim/preader/pngusr.dfa
+++ b/contrib/pngminim/preader/pngusr.dfa
@@ -7,18 +7,22 @@
 # and license in png.h
 
 # First all the build options off:
+
 everything = off
 
 # Just switch on the progressive read code
+
 option PROGRESSIVE_READ on
 
 # You may choose fixed or floating point APIs:
 # option FLOATING_POINT on
+
 option FIXED_POINT on
 
 # You must chose the internal fixed point implementation or to
 # use the system floating point.  The latter is considerably
 # smaller (by about 1kbyte on an x86 system):
+
 option FLOATING_ARITHMETIC on
 # option FLOATING_ARITHMETIC off
 
@@ -26,6 +30,7 @@ option FLOATING_ARITHMETIC on
 # program here, rpng2-x, requires the following.  Take a look
 # at pnglibconf.h to find out the full set of what has to be
 # enabled to make the following work.
+
 option SETJMP on
 option STDIO on
 option READ_bKGD on