From 5d8db4b5af9bbab9346bf6f02a482b0cb4e73ac2 Mon Sep 17 00:00:00 2001
From: Lee Howard <[EMAIL REDACTED]>
Date: Wed, 22 May 2024 01:42:18 +0000
Subject: [PATCH] Add some basic sanity checks for tiffcp and tiffcrop
RGB->YCbCr JPEG conversions.
---
test/Makefile.am | 8 ++++++--
test/images/32bpp-None.tiff | Bin 0 -> 13222 bytes
test/tiff2rgba-32bpp-None-jpeg.sh | 7 +++++++
test/tiffcp-32bpp-None-jpeg.sh | 7 +++++++
test/tiffcrop-32bpp-None-jpeg.sh | 7 +++++++
5 files changed, 27 insertions(+), 2 deletions(-)
create mode 100644 test/images/32bpp-None.tiff
create mode 100755 test/tiff2rgba-32bpp-None-jpeg.sh
create mode 100755 test/tiffcp-32bpp-None-jpeg.sh
create mode 100755 test/tiffcrop-32bpp-None-jpeg.sh
diff --git a/test/Makefile.am b/test/Makefile.am
index 2829a032..63d72de8 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -61,7 +61,10 @@ JPEG_DEPENDENT_TESTSCRIPTS=\
tiff2rgba-quad-tile.jpg.sh \
tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
- tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
+ tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh \
+ tiff2rgba-32bpp-None-jpeg.sh \
+ tiffcp-32bpp-None-jpeg.sh \
+ tiffcrop-32bpp-None-jpeg.sh
endif
else
JPEG_DEPENDENT_CHECK_PROG=
@@ -211,7 +214,8 @@ TIFFIMAGES = \
images/testfax4.tiff \
images/deflate-last-strip-extra-data.tiff \
images/custom_dir_EXIF_GPS.tiff \
- images/testfax3_bug_513.tiff
+ images/testfax3_bug_513.tiff \
+ images/32bpp-None.tiff
PNMIMAGES = \
images/minisblack-1c-8b.pgm \
diff --git a/test/images/32bpp-None.tiff b/test/images/32bpp-None.tiff
new file mode 100644
index 0000000000000000000000000000000000000000..77f080fc0840497fe52be77bdc9afebf7d61dfb6
GIT binary patch
literal 13222
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
R#+>}4^M7#Eh3A}Y{{wcka?bz&
literal 0
HcmV?d00001
diff --git a/test/tiff2rgba-32bpp-None-jpeg.sh b/test/tiff2rgba-32bpp-None-jpeg.sh
new file mode 100755
index 00000000..d435ccb9
--- /dev/null
+++ b/test/tiff2rgba-32bpp-None-jpeg.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Generated file, master is Makefile.am
+. ${srcdir:-.}/common.sh
+infile="$srcdir/images/32bpp-None.tiff"
+outfile="o-tiff2rgba-32bpp-None-jpeg.tiff"
+f_test_convert "${TIFF2RGBA} -B 255 -n" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcp-32bpp-None-jpeg.sh b/test/tiffcp-32bpp-None-jpeg.sh
new file mode 100755
index 00000000..2aefa847
--- /dev/null
+++ b/test/tiffcp-32bpp-None-jpeg.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Generated file, master is Makefile.am
+. ${srcdir:-.}/common.sh
+infile="o-tiff2rgba-32bpp-None-jpeg.tiff"
+outfile="o-tiffcp-32bpp-None-jpeg-YCbCr.tiff"
+f_test_convert "${TIFFCP} -c jpeg" $infile $outfile
+f_tiffinfo_validate $outfile
diff --git a/test/tiffcrop-32bpp-None-jpeg.sh b/test/tiffcrop-32bpp-None-jpeg.sh
new file mode 100755
index 00000000..1a401285
--- /dev/null
+++ b/test/tiffcrop-32bpp-None-jpeg.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Generated file, master is Makefile.am
+. ${srcdir:-.}/common.sh
+infile="o-tiff2rgba-32bpp-None-jpeg.tiff"
+outfile="o-tiffcp-32bpp-None-jpeg-YCbCr.tiff"
+f_test_convert "${TIFFCROP} -c jpeg" $infile $outfile
+f_tiffinfo_validate $outfile