Add tiffcmyk test, improve ppmpat, tiff roundtrip test

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2935 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 12 insertions, 11 deletions

diff --git a/test/tiff-flate-lzw-roundtrip.test b/test/tiff-flate-lzw-roundtrip.test
index 7e28a899..59d4c483 100755
--- a/test/tiff-flate-lzw-roundtrip.test
+++ b/test/tiff-flate-lzw-roundtrip.test
@@ -1,6 +1,6 @@
 #! /bin/bash
 # This script tests: pamtotiff tifftopnm
-# Also requires: pnmquant
+# Also requires: ppmpat
 
 # Failure message
 ## If tiff-rountrip.test succeeds and this test fails, the likely
@@ -9,25 +9,26 @@
 
 tmpdir=${tmpdir:-/tmp}
 
-test40_ppm=${tmpdir}/testimg40.ppm
+tartan_ppm=${tmpdir}/testimg40.ppm
 
 # Make a test image with reduced colors which compresses better
-# cksum is 764594701 101484
- 
-pnmquant 40 testimg.ppm | tee ${test40_ppm} | cksum
-pamtotiff ${test40_ppm} | tifftopnm | cksum
+# cksum is 1079668603 10237
+
+ppmpat -tartan --color=rgb:32/0d/b7,rgb:31/58/a3,rgb:e9/5e/d4 71 48 | \
+  tee ${tartan_ppm} | cksum
+pamtotiff ${tartan_ppm} | tifftopnm | cksum
 
 # test flate compression
-pamtotiff -flate ${test40_ppm} | tifftopnm | cksum
+pamtotiff -flate ${tartan_ppm} | tifftopnm | cksum
 
 # test adobeflate compression
-pamtotiff -adobeflate ${test40_ppm} | tifftopnm | cksum
+pamtotiff -adobeflate ${tartan_ppm} | tifftopnm | cksum
 
 # test LZW compression
-pamtotiff -lzw ${test40_ppm} | tifftopnm | cksum
-pamtotiff -lzw -predictor=1 ${test40_ppm} | tifftopnm | cksum
+pamtotiff -lzw ${tartan_ppm} | tifftopnm | cksum
+pamtotiff -lzw -predictor=1 ${tartan_ppm} | tifftopnm | cksum
 
 # PBM image: test flate compression
 pamtotiff -flate testgrid.pbm | tifftopnm | cksum
 
-rm ${test40_ppm}
+rm ${tartan_ppm}