summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2020-01-07 23:41:26 +0100
committerEven Rouault <even.rouault@spatialys.com>2020-01-07 23:41:26 +0100
commit8192df23fa04f5e380c602790f16f4b0bb9371f3 (patch)
tree4b672643ee3d44c32112dd1dbdfb49b2ef3a44a6
parent0a8245b7b81e4b2cf9841b81c6fcc252b8fe6162 (diff)
downloadlibtiff-git-8192df23fa04f5e380c602790f16f4b0bb9371f3.tar.gz
test: add test for single-strip OJPEG file without RowsPerStrip tag (like in CR2 files)
-rw-r--r--test/CMakeLists.txt6
-rw-r--r--test/Makefile.am6
-rw-r--r--test/images/ojpeg_single_strip_no_rowsperstrip.tiffbin0 -> 8258 bytes
-rwxr-xr-xtest/tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh7
4 files changed, 15 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c89bb824..23b678cf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -107,7 +107,8 @@ set(TESTSCRIPTS
tiff2rgba-rgb-3c-8b.sh
tiff2rgba-quad-tile.jpg.sh
tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh
- tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh)
+ tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh
+ tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh)
# This list should contain all of the TIFF files in the 'images'
# subdirectory which are intended to be used as input images for
@@ -127,7 +128,8 @@ set(TIFFIMAGES
images/quad-lzw-compat.tiff
images/lzw-single-strip.tiff
images/ojpeg_zackthecat_subsamp22_single_strip.tiff
- images/ojpeg_chewey_subsamp21_multi_strip.tiff)
+ images/ojpeg_chewey_subsamp21_multi_strip.tiff
+ images/ojpeg_single_strip_no_rowsperstrip.tiff)
set(BMPIMAGES
images/palette-1c-8b.bmp
diff --git a/test/Makefile.am b/test/Makefile.am
index 420d7523..e7d239bd 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -57,7 +57,8 @@ JPEG_DEPENDENT_CHECK_PROG=raw_decode
JPEG_DEPENDENT_TESTSCRIPTS=\
tiff2rgba-quad-tile.jpg.sh \
tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
- tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh
+ tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
+ tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
else
JPEG_DEPENDENT_CHECK_PROG=
@@ -176,7 +177,8 @@ TIFFIMAGES = \
images/quad-lzw-compat.tiff \
images/lzw-single-strip.tiff \
images/ojpeg_zackthecat_subsamp22_single_strip.tiff \
- images/ojpeg_chewey_subsamp21_multi_strip.tiff
+ images/ojpeg_chewey_subsamp21_multi_strip.tiff \
+ images/ojpeg_single_strip_no_rowsperstrip.tiff
PNMIMAGES = \
images/minisblack-1c-8b.pgm \
diff --git a/test/images/ojpeg_single_strip_no_rowsperstrip.tiff b/test/images/ojpeg_single_strip_no_rowsperstrip.tiff
new file mode 100644
index 00000000..61611b9d
--- /dev/null
+++ b/test/images/ojpeg_single_strip_no_rowsperstrip.tiff
Binary files differ
diff --git a/test/tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh b/test/tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
new file mode 100755
index 00000000..d69c99dc
--- /dev/null
+++ b/test/tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Generated file, master is Makefile.am
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/ojpeg_single_strip_no_rowsperstrip.tiff"
+outfile="o-tiff2rgba-ojpeg_single_strip_no_rowsperstrip.tiff"
+f_test_convert "$TIFF2RGBA" $infile $outfile
+f_tiffinfo_validate $outfile