* test/tiffcp-lzw-compat.sh, test/images/quad-lzw-compat.tiff: new files

to test old-style LZW decompression
* test/common.sh, Makefile.am, CMakeList.txt: updated with above
This commit is contained in:
Even Rouault 2017-07-11 09:20:31 +00:00
parent 222083301a
commit abc862b594
7 changed files with 30 additions and 5 deletions

View File

@ -1,3 +1,9 @@
2017-07-11 Even Rouault <even.rouault at spatialys.com>
* test/tiffcp-lzw-compat.sh, test/images/quad-lzw-compat.tiff: new files
to test old-style LZW decompression
* test/common.sh, Makefile.am, CMakeList.txt: updated with above
2017-07-11 Even Rouault <even.rouault at spatialys.com>
* refresh autoconf/make stuff with what is on Ubuntu 16.04 (minor changes)

View File

@ -43,6 +43,7 @@ set(TESTSCRIPTS
tiffcp-g4.sh
tiffcp-logluv.sh
tiffcp-thumbnail.sh
tiffcp-lzw-compat.sh
tiffdump.sh
tiffinfo.sh
tiffcp-split.sh
@ -118,7 +119,8 @@ set(TIFFIMAGES
images/palette-1c-8b.tiff
images/rgb-3c-16b.tiff
images/rgb-3c-8b.tiff
images/quad-tile.jpg.tiff)
images/quad-tile.jpg.tiff
images/quad-lzw-compat.tiff)
set(BMPIMAGES
images/palette-1c-8b.bmp
@ -332,6 +334,7 @@ add_convert_test(tiffcp g31dfill "-c g3:1d:fill" "images/miniswhite-1c-1b.ti
add_convert_test(tiffcp g32d "-c g3:2d" "images/miniswhite-1c-1b.tiff" FALSE)
add_convert_test(tiffcp g32dfill "-c g3:2d:fill" "images/miniswhite-1c-1b.tiff" FALSE)
add_convert_test(tiffcp g4 "-c g4" "images/miniswhite-1c-1b.tiff" FALSE)
add_convert_test(tiffcp none "-c none" "images/quad-lzw-compat.tiff" FALSE)
add_convert_test_multi(tiffcp tiffcp "" logluv "-c none" "-c sgilog" ""
"images/logluv-3c-16b.tiff" FALSE)
add_convert_test_multi(tiffcp thumbnail "" thumbnail "g3:1d" "" ""

View File

@ -77,6 +77,7 @@ TESTSCRIPTS = \
tiffcp-g4.sh \
tiffcp-logluv.sh \
tiffcp-thumbnail.sh \
tiffcp-lzw-compat.sh \
tiffdump.sh \
tiffinfo.sh \
tiffcp-split.sh \

View File

@ -413,10 +413,10 @@ AM_RECURSIVE_TARGETS = check recheck
am__EXEEXT_3 = ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh \
tiffcp-g3.sh tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh \
tiffcp-g3-2d.sh tiffcp-g3-2d-fill.sh tiffcp-g4.sh \
tiffcp-logluv.sh tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh \
tiffcp-split.sh tiffcp-split-join.sh tiff2ps-PS1.sh \
tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.sh \
tiffcrop-doubleflip-logluv-3c-16b.sh \
tiffcp-logluv.sh tiffcp-thumbnail.sh tiffcp-lzw-compat.sh \
tiffdump.sh tiffinfo.sh tiffcp-split.sh tiffcp-split-join.sh \
tiff2ps-PS1.sh tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh \
tiff2pdf.sh tiffcrop-doubleflip-logluv-3c-16b.sh \
tiffcrop-doubleflip-minisblack-1c-16b.sh \
tiffcrop-doubleflip-minisblack-1c-8b.sh \
tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh \
@ -669,6 +669,7 @@ TESTSCRIPTS = \
tiffcp-g4.sh \
tiffcp-logluv.sh \
tiffcp-thumbnail.sh \
tiffcp-lzw-compat.sh \
tiffdump.sh \
tiffinfo.sh \
tiffcp-split.sh \
@ -1211,6 +1212,13 @@ tiffcp-thumbnail.sh.log: tiffcp-thumbnail.sh
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
tiffcp-lzw-compat.sh.log: tiffcp-lzw-compat.sh
@p='tiffcp-lzw-compat.sh'; \
b='tiffcp-lzw-compat.sh'; \
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
tiffdump.sh.log: tiffdump.sh
@p='tiffdump.sh'; \
b='tiffdump.sh'; \

View File

@ -40,6 +40,7 @@ IMG_PALETTE_1C_8B=${IMAGES}/palette-1c-8b.tiff
IMG_RGB_3C_16B=${IMAGES}/rgb-3c-16b.tiff
IMG_RGB_3C_8B=${IMAGES}/rgb-3c-8b.tiff
IMG_MINISBLACK_2C_8B_ALPHA=${IMAGES}/minisblack-2c-8b-alpha.tiff
IMG_QUAD_LZW_COMPAT=${IMAGES}/quad-lzw-compat.tiff
IMG_MINISWHITE_1C_1B_PBM=${IMAGES}/miniswhite-1c-1b.pbm
IMG_MINISBLACK_1C_8B_PGM=${IMAGES}/minisblack-1c-8b.pgm

Binary file not shown.

6
test/tiffcp-lzw-compat.sh Executable file
View File

@ -0,0 +1,6 @@
#!/bin/sh
#
# Basic sanity check for tiffcp with LZW Old-LZW decompression
#
. ${srcdir:-.}/common.sh
f_test_convert "${TIFFCP} -c none" "${IMG_QUAD_LZW_COMPAT}" "o-tiffcp-lzw-compat.tiff"