Test: Replace big_tree8.bmp and big_building16.ppm

These images were only used with tjbenchtest and tjexampletest, but I
was concerned about introducing additional licensing provisions into the
libjpeg-turbo source tree.  Thus, this commit replaces them with images
that I own and can thus make available under the libjpeg-turbo licenses
with no additional provisions.
This commit is contained in:
DRC 2024-09-03 15:26:52 -04:00
parent f5f8f5aadc
commit a5689cd45b
7 changed files with 6 additions and 31 deletions

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

View File

@ -1,25 +0,0 @@
libjpeg-turbo note: This image was extracted from the 8-bit big_tree image.
The original can be downloaded at the link below.
The New Image Compression Test Set - Jan 2008
http://www.imagecompression.info/test_images
The images historically used for compression research (lena, barbra, pepper etc...) have outlived their useful life and its about time they become a part of history only. They are too small, come from data sources too old and are available in only 8-bit precision.
These images have been carefully selected to aid in image compression algorithm research and evaluation. These are photographic images chosen to come from a wide variety of sources and each one picked to stress different aspects of algorithms. Images are available in 8-bit, 16-bit and 16-bit linear variations, RGB and gray.
Images are available without any prohibitive copyright restrictions.
These images are (c) there respective owners. You are granted full redistribution and publication rights on these images provided:
1. The origin of the pictures must not be misrepresented; you must not claim that you took the original pictures. If you use, publish or redistribute them, an acknowledgment would be appreciated but is not required.
2. Altered versions must be plainly marked as such, and must not be misinterpreted as being the originals.
3. No payment is required for distribution this material, it must be available freely under the conditions stated here. That is, it is prohibited to sell the material.
4. This notice may not be removed or altered from any distribution.
Acknowledgments: A lot of people contributed a lot of time and effort in making this test set possible. Thanks to everyone who voiced their opinion in any of the discussions online. Thanks to Axel Becker, Thomas Richter and Niels Fröhling for their extensive help in picking images, running all the various tests etc... Thanks to Pete Fraser, Tony Story, Wayne J. Cosshall, David Coffin, Bruce Lindbloom and raw.fotosite.pl for the images which make up this set.
Sachin Garg [India]
sachingarg@c10n.info
www.sachingarg.com | www.c10n.info | www.imagecompression.info

BIN
testimages/monkey16.ppm Normal file

Binary file not shown.

BIN
testimages/shira_bird8.bmp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

View File

@ -20,7 +20,7 @@ runme()
}
EXT=bmp
IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} big_tree8.${EXT}"
IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} shira_bird8.${EXT}"
IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX`
EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
@ -64,7 +64,7 @@ while [ $# -gt 0 ]; do
# each downsampled dimension is an odd number or is evenly divisible by the MCU
# width/height. This disagreement basically amounts to a round-off error, but
# there is no easy way around it, so for now, we just test the only image that
# works. (NOTE: big_tree8 does not suffer from the above issue, but it suffers
# works. (NOTE: shira_bird8 does not suffer from the above issue, but it suffers
# from an unrelated problem whereby the combination of tj3DecompressToYUV*()
# and tj3DecodeYUV*() do not produce bitwise-identical results to
# tj3Decompress*() if decompression scaling is enabled. This latter phenomenon
@ -110,7 +110,7 @@ while [ $# -gt 0 ]; do
PRECISION=$1
if [ $PRECISION != 8 ]; then
EXT=ppm
IMAGES="big_building16.${EXT}"
IMAGES="monkey16.${EXT}"
BMPARG=
fi
;;
@ -125,7 +125,7 @@ if [ $PRECISION = 8 -a "$YUVARG" = "" ]; then
IMAGES="vgl_6548_0026a.${EXT}"
elif [ "$ENTROPYARG" = "-arithmetic" -o \
"$ENTROPYARG" = "-progressive-arithmetic" ]; then
IMAGES="big_tree8.${EXT}"
IMAGES="shira_bird8.${EXT}"
fi
fi

View File

@ -19,7 +19,7 @@ runme()
$*
}
IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp big_tree8.bmp"
IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp shira_bird8.bmp"
IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages
OUTDIR=`mktemp -d /tmp/__tjexampletest_output.XXXXXX`
EXEDIR=@CMAKE_CURRENT_BINARY_DIR@
@ -39,7 +39,7 @@ while [ $# -gt 0 ]; do
JAVAARG=-java
TJEXAMPLE="$JAVA $JAVAARGS TJExample"
# The Java version of TJExample can't currently handle pixel density
# information, so it fails on big_tree8.bmp.
# information, so it fails on shira_bird8.bmp.
IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp"
;;
esac