Skip to content

Commit abc862b

Browse files
committedJul 11, 2017
* 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
1 parent 2220833 commit abc862b

7 files changed

+30
-5
lines changed
 

‎ChangeLog

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
2017-07-11 Even Rouault <even.rouault at spatialys.com>
2+
3+
* test/tiffcp-lzw-compat.sh, test/images/quad-lzw-compat.tiff: new files
4+
to test old-style LZW decompression
5+
* test/common.sh, Makefile.am, CMakeList.txt: updated with above
6+
17
2017-07-11 Even Rouault <even.rouault at spatialys.com>
28

39
* refresh autoconf/make stuff with what is on Ubuntu 16.04 (minor changes)

‎test/CMakeLists.txt

+4-1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ set(TESTSCRIPTS
4343
tiffcp-g4.sh
4444
tiffcp-logluv.sh
4545
tiffcp-thumbnail.sh
46+
tiffcp-lzw-compat.sh
4647
tiffdump.sh
4748
tiffinfo.sh
4849
tiffcp-split.sh
@@ -118,7 +119,8 @@ set(TIFFIMAGES
118119
images/palette-1c-8b.tiff
119120
images/rgb-3c-16b.tiff
120121
images/rgb-3c-8b.tiff
121-
images/quad-tile.jpg.tiff)
122+
images/quad-tile.jpg.tiff
123+
images/quad-lzw-compat.tiff)
122124

123125
set(BMPIMAGES
124126
images/palette-1c-8b.bmp
@@ -332,6 +334,7 @@ add_convert_test(tiffcp g31dfill "-c g3:1d:fill" "images/miniswhite-1c-1b.ti
332334
add_convert_test(tiffcp g32d "-c g3:2d" "images/miniswhite-1c-1b.tiff" FALSE)
333335
add_convert_test(tiffcp g32dfill "-c g3:2d:fill" "images/miniswhite-1c-1b.tiff" FALSE)
334336
add_convert_test(tiffcp g4 "-c g4" "images/miniswhite-1c-1b.tiff" FALSE)
337+
add_convert_test(tiffcp none "-c none" "images/quad-lzw-compat.tiff" FALSE)
335338
add_convert_test_multi(tiffcp tiffcp "" logluv "-c none" "-c sgilog" ""
336339
"images/logluv-3c-16b.tiff" FALSE)
337340
add_convert_test_multi(tiffcp thumbnail "" thumbnail "g3:1d" "" ""

‎test/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ TESTSCRIPTS = \
7777
tiffcp-g4.sh \
7878
tiffcp-logluv.sh \
7979
tiffcp-thumbnail.sh \
80+
tiffcp-lzw-compat.sh \
8081
tiffdump.sh \
8182
tiffinfo.sh \
8283
tiffcp-split.sh \

‎test/Makefile.in

+12-4
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,10 @@ AM_RECURSIVE_TARGETS = check recheck
413413
am__EXEEXT_3 = ppm2tiff_pbm.sh ppm2tiff_pgm.sh ppm2tiff_ppm.sh \
414414
tiffcp-g3.sh tiffcp-g3-1d.sh tiffcp-g3-1d-fill.sh \
415415
tiffcp-g3-2d.sh tiffcp-g3-2d-fill.sh tiffcp-g4.sh \
416-
tiffcp-logluv.sh tiffcp-thumbnail.sh tiffdump.sh tiffinfo.sh \
417-
tiffcp-split.sh tiffcp-split-join.sh tiff2ps-PS1.sh \
418-
tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh tiff2pdf.sh \
419-
tiffcrop-doubleflip-logluv-3c-16b.sh \
416+
tiffcp-logluv.sh tiffcp-thumbnail.sh tiffcp-lzw-compat.sh \
417+
tiffdump.sh tiffinfo.sh tiffcp-split.sh tiffcp-split-join.sh \
418+
tiff2ps-PS1.sh tiff2ps-PS2.sh tiff2ps-PS3.sh tiff2ps-EPS1.sh \
419+
tiff2pdf.sh tiffcrop-doubleflip-logluv-3c-16b.sh \
420420
tiffcrop-doubleflip-minisblack-1c-16b.sh \
421421
tiffcrop-doubleflip-minisblack-1c-8b.sh \
422422
tiffcrop-doubleflip-minisblack-2c-8b-alpha.sh \
@@ -669,6 +669,7 @@ TESTSCRIPTS = \
669669
tiffcp-g4.sh \
670670
tiffcp-logluv.sh \
671671
tiffcp-thumbnail.sh \
672+
tiffcp-lzw-compat.sh \
672673
tiffdump.sh \
673674
tiffinfo.sh \
674675
tiffcp-split.sh \
@@ -1211,6 +1212,13 @@ tiffcp-thumbnail.sh.log: tiffcp-thumbnail.sh
12111212
--log-file $$b.log --trs-file $$b.trs \
12121213
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
12131214
"$$tst" $(AM_TESTS_FD_REDIRECT)
1215+
tiffcp-lzw-compat.sh.log: tiffcp-lzw-compat.sh
1216+
@p='tiffcp-lzw-compat.sh'; \
1217+
b='tiffcp-lzw-compat.sh'; \
1218+
$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
1219+
--log-file $$b.log --trs-file $$b.trs \
1220+
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
1221+
"$$tst" $(AM_TESTS_FD_REDIRECT)
12141222
tiffdump.sh.log: tiffdump.sh
12151223
@p='tiffdump.sh'; \
12161224
b='tiffdump.sh'; \

‎test/common.sh

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ IMG_PALETTE_1C_8B=${IMAGES}/palette-1c-8b.tiff
4040
IMG_RGB_3C_16B=${IMAGES}/rgb-3c-16b.tiff
4141
IMG_RGB_3C_8B=${IMAGES}/rgb-3c-8b.tiff
4242
IMG_MINISBLACK_2C_8B_ALPHA=${IMAGES}/minisblack-2c-8b-alpha.tiff
43+
IMG_QUAD_LZW_COMPAT=${IMAGES}/quad-lzw-compat.tiff
4344

4445
IMG_MINISWHITE_1C_1B_PBM=${IMAGES}/miniswhite-1c-1b.pbm
4546
IMG_MINISBLACK_1C_8B_PGM=${IMAGES}/minisblack-1c-8b.pgm

‎test/images/quad-lzw-compat.tiff

209 KB
Binary file not shown.

‎test/tiffcp-lzw-compat.sh

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

0 commit comments

Comments
 (0)
Please sign in to comment.