From 8192df23fa04f5e380c602790f16f4b0bb9371f3 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 7 Jan 2020 23:41:26 +0100 Subject: [PATCH] test: add test for single-strip OJPEG file without RowsPerStrip tag (like in CR2 files) --- test/CMakeLists.txt | 6 ++++-- test/Makefile.am | 6 ++++-- .../ojpeg_single_strip_no_rowsperstrip.tiff | Bin 0 -> 8258 bytes ...ff2rgba-ojpeg_single_strip_no_rowsperstrip.sh | 7 +++++++ 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 test/images/ojpeg_single_strip_no_rowsperstrip.tiff create mode 100755 test/tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh 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 0000000000000000000000000000000000000000..61611b9d0ebea16cc4fd9d7c476d81046ec34d3d GIT binary patch literal 8258 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ΜJf;z zD^`z7_H%y-Kxhk^tvuBajr=&`OVy`ZTzm!eFJ4;UO0Iwb*5I!jfQBMnSPB!HkIiQy9neQLu>!yy!>9g_4iHT z5Eb&WZg(uMlW>7;NdbKqKRoR0C6kmkG%J6LS$0(EQMMgvfZVXp>prxm;Ck8dOe5hlouA`?-34zd2)A7;M^JzRiHJ!^$;ht(1mM3#f6Vho3?cykw`2f&9KP=| zeC`1VKwttwLNE~#5#C9lKztVfAq^2XF|8PagihD$hI=TzczkX(DUXs~JA;I^$LQkk zFf#J%j7-cdynHwL1q6j8rKDwK<>Zy`sUTI=)HU=C42_IU9-7+NKC!cRcS60{7u^YR4`v