Replace TJExample with IJG workalike programs

test/tjcomptest.in

@@ -0,0 +1,183 @@
+#/bin/bash
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+onexit()
+{
+	if [ -d $OUTDIR ]; then
+		rm -rf $OUTDIR
+	fi
+}
+
+runme()
+{
+	echo \*\*\* $*
+	"$@"
+}
+
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
+OUTDIR=`mktemp -d /tmp/__tjcomptest_output.XXXXXX`
+EXEDIR=@CMAKE_BINARY_DIR@
+JAVA="@Java_JAVA_EXECUTABLE@"
+JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
+TJCOMP=$EXEDIR/tjcomp
+JAVAARG=
+
+if [ -d $OUTDIR ]; then
+	rm -rf $OUTDIR
+fi
+mkdir -p $OUTDIR
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+	-java)
+		JAVAARG=-java
+		TJCOMP="$JAVA $JAVAARGS TJComp"
+		;;
+	esac
+	shift
+done
+
+exec >$EXEDIR/tjcomptest$JAVAARG.log
+
+SUBSAMPOPT=(444 422 440 420 411 441)
+SAMPOPT=(1x1 2x1 1x2 2x2 4x1 1x4)
+
+for precision in 8 12; do
+	if [ $precision -le 8 ]; then
+		RGBIMG=$IMGDIR/testorig.ppm
+		GRAYIMG=$IMGDIR/testorig.pgm
+	else
+		RGBIMG=$IMGDIR/big_building16.ppm
+		GRAYIMG=$IMGDIR/big_building16.pgm
+	fi
+	for restartarg in "" "-r 1" "-r 1b"; do
+		for ariarg in "" "-a"; do
+			for dctarg in "" "-dc fa"; do
+				for optarg in "" "-o"; do
+					if [ "$optarg" = "-o" ]; then
+						if [[ "$ariarg" = "-a" || $precision -eq 12 ]]; then
+							continue
+						fi
+					fi
+					for progarg in "" "-p"; do
+						if [[ "$progarg" = "-p" && "$optarg" = "-o" ]]; then
+							continue
+						fi
+						for qualarg in "" "-q 1" "-q 100"; do
+							blarg=
+							if [ "$qualarg" = "-q 1" ]; then
+								blarg=-baseline
+							fi
+							for sampi in {0..5}; do
+								basename=`basename $RGBIMG .ppm`
+								runme $TJCOMP -pre $precision $restartarg $ariarg $dctarg \
+									$optarg $progarg $qualarg -s ${SUBSAMPOPT[$sampi]} \
+									$RGBIMG $OUTDIR/${basename}-tjcomp.jpg
+								runme $EXEDIR/cjpeg -pre $precision $restartarg $ariarg \
+									$dctarg $optarg $progarg $qualarg $blarg \
+									-sa ${SAMPOPT[$sampi]} \
+									-outf $OUTDIR/${basename}-cjpeg.jpg $RGBIMG
+								$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								cmp $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+								echo
+
+								runme $TJCOMP -pre $precision $restartarg $ariarg $dctarg \
+									$optarg $progarg $qualarg -s ${SUBSAMPOPT[$sampi]} \
+									-g $RGBIMG $OUTDIR/${basename}-tjcomp.jpg
+								runme $EXEDIR/cjpeg -pre $precision $restartarg $ariarg \
+									$dctarg $optarg $progarg $qualarg $blarg \
+									-sa ${SAMPOPT[$sampi]} \
+									-gr -outf $OUTDIR/${basename}-cjpeg.jpg $RGBIMG
+								$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								cmp $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+								echo
+
+								runme $TJCOMP -pre $precision $restartarg $ariarg $dctarg \
+									$optarg $progarg $qualarg -s ${SUBSAMPOPT[$sampi]} \
+									-rg $RGBIMG $OUTDIR/${basename}-tjcomp.jpg
+								runme $EXEDIR/cjpeg -pre $precision $restartarg $ariarg \
+									$dctarg $optarg $progarg $qualarg $blarg \
+									-sa ${SAMPOPT[$sampi]} \
+									-rgb -outf $OUTDIR/${basename}-cjpeg.jpg $RGBIMG
+								$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								cmp $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+								echo
+
+								basename=`basename $GRAYIMG .pgm`
+								runme $TJCOMP -pre $precision $restartarg $ariarg $dctarg \
+									$optarg $progarg $qualarg -s ${SUBSAMPOPT[$sampi]} \
+									$GRAYIMG $OUTDIR/${basename}-tjcomp.jpg
+								runme $EXEDIR/cjpeg -pre $precision $restartarg $ariarg \
+									$dctarg $optarg $progarg $qualarg $blarg \
+									-sa ${SAMPOPT[$sampi]} \
+									-outf $OUTDIR/${basename}-cjpeg.jpg $GRAYIMG
+								$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								cmp $OUTDIR/${basename}-tjcomp.jpg \
+									$OUTDIR/${basename}-cjpeg.jpg
+								rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+								echo
+							done
+						done
+					done
+				done
+			done
+		done
+	done
+done
+
+for precision in {2..16}; do
+	if [ $precision -le 8 ]; then
+		RGBIMG=$IMGDIR/testorig.ppm
+		GRAYIMG=$IMGDIR/testorig.pgm
+	else
+		RGBIMG=$IMGDIR/big_building16.ppm
+		GRAYIMG=$IMGDIR/big_building16.pgm
+	fi
+	for psv in {1..7}; do
+		for pt in {0..15}; do
+			if [ $pt -ge $precision ]; then
+				continue
+			fi
+			for restartarg in "" "-r 1"; do
+				basename=`basename $RGBIMG .ppm`
+				runme $TJCOMP -pre $precision -l $psv,$pt $restartarg \
+					$RGBIMG $OUTDIR/${basename}-tjcomp.jpg
+				runme $EXEDIR/cjpeg -pre $precision -l $psv,$pt $restartarg \
+					-outf $OUTDIR/${basename}-cjpeg.jpg $RGBIMG
+				$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+					$OUTDIR/${basename}-cjpeg.jpg
+				cmp $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+				rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+				echo
+
+				basename=`basename $GRAYIMG .pgm`
+				runme $TJCOMP -pre $precision -l $psv,$pt $restartarg \
+					$GRAYIMG $OUTDIR/${basename}-tjcomp.jpg
+				runme $EXEDIR/cjpeg -pre $precision -l $psv,$pt $restartarg \
+					-outf $OUTDIR/${basename}-cjpeg.jpg $GRAYIMG
+				$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjcomp.jpg \
+					$OUTDIR/${basename}-cjpeg.jpg
+				cmp $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+				rm $OUTDIR/${basename}-tjcomp.jpg $OUTDIR/${basename}-cjpeg.jpg
+				echo
+			done
+		done
+	done
+done
+
+echo "GREAT SUCCESS!"

test/tjdecomptest.in

@@ -0,0 +1,200 @@
+#/bin/bash
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+onexit()
+{
+	if [ -d $OUTDIR ]; then
+		rm -rf $OUTDIR
+	fi
+}
+
+runme()
+{
+	echo \*\*\* $*
+	"$@"
+}
+
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
+OUTDIR=`mktemp -d /tmp/__tjdecomptest_output.XXXXXX`
+EXEDIR=@CMAKE_BINARY_DIR@
+JAVA="@Java_JAVA_EXECUTABLE@"
+JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
+TJDECOMP=$EXEDIR/tjdecomp
+JAVAARG=
+
+if [ -d $OUTDIR ]; then
+	rm -rf $OUTDIR
+fi
+mkdir -p $OUTDIR
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+	-java)
+		JAVAARG=-java
+		TJDECOMP="$JAVA $JAVAARGS TJDecomp"
+		;;
+	esac
+	shift
+done
+
+exec >$EXEDIR/tjdecomptest$JAVAARG.log
+
+SUBSAMPOPT=(444 422 440 420 411 441 410)
+SAMPOPT=(1x1 2x1 1x2 2x2 4x1 1x4 4x2)
+
+for precision in 8 12; do
+	if [ $precision -le 8 ]; then
+		RGBIMG=$IMGDIR/testorig.ppm
+		GRAYIMG=$IMGDIR/testorig.pgm
+	else
+		RGBIMG=$IMGDIR/big_building16.ppm
+		GRAYIMG=$IMGDIR/big_building16.pgm
+	fi
+
+	for sampi in {0..6}; do
+		runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} \
+			-outf $OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg $RGBIMG
+	done
+	runme $EXEDIR/cjpeg -pre $precision \
+		-outf $OUTDIR/`basename $GRAYIMG .pgm`-gray.jpg $GRAYIMG
+	echo
+
+	for subsamp in ${SUBSAMPOPT[*]} gray; do
+		for croparg in "" "-cr 14x14+23+23" "-cr 21x21+4+4" "-cr 18x18+13+13" \
+			"-cr 21x21+0+0" "-cr 24x26+20+18"; do
+			if [[ "$croparg" != "" && "$subsamp" = "410" ]]; then
+				continue
+			fi
+			for scalearg in "" "-s 16/8" "-s 15/8" "-s 14/8" "-s 13/8" "-s 12/8" \
+				"-s 11/8" "-s 10/8" "-s 9/8" "-s 7/8" "-s 6/8" "-s 5/8" "-s 4/8" \
+				"-s 3/8" "-s 2/8" "-s 1/8"; do
+				if [[ ("$scalearg" = "-s 1/8" || "$scalearg" = "-s 2/8" || \
+					"$scalearg" = "-s 3/8") && "$croparg" != "" ]]; then
+					continue
+				fi
+				for nsarg in "" "-nos"; do
+					if [[ "$nsarg" = "-nos" && "$subsamp" != "422" && \
+						"$subsamp" != "420" && "$subsamp" != "440" ]]; then
+						continue
+					fi
+					for dctarg in "" "-dc fa"; do
+						if [[ "$dctarg" = "-dc fa" && \
+							("$scalearg" != "-s 4/8" || \
+								("$subsamp" != "420" && "$subsamp" != "410")) && \
+							"$scalearg" != "" ]]; then
+							continue
+						fi
+						if [ "$subsamp" = "gray" ]; then
+							basename=`basename $GRAYIMG .pgm`
+							runme $TJDECOMP $croparg $dctarg $nsarg $scalearg \
+								$OUTDIR/${basename}-$subsamp.jpg \
+								$OUTDIR/${basename}-tjdecomp.pgm
+							runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg \
+								-outf $OUTDIR/${basename}-djpeg.pgm \
+								$OUTDIR/${basename}-$subsamp.jpg
+							$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.pgm \
+								$OUTDIR/${basename}-djpeg.pgm
+							cmp $OUTDIR/${basename}-tjdecomp.pgm \
+								$OUTDIR/${basename}-djpeg.pgm
+							rm $OUTDIR/${basename}-tjdecomp.pgm $OUTDIR/${basename}-djpeg.pgm
+							echo
+
+							runme $TJDECOMP $croparg $dctarg $nsarg $scalearg \
+								-r $OUTDIR/${basename}-$subsamp.jpg \
+								$OUTDIR/${basename}-tjdecomp.ppm
+							runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg \
+								-rg -outf $OUTDIR/${basename}-djpeg.ppm \
+								$OUTDIR/${basename}-$subsamp.jpg
+							$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.ppm \
+								$OUTDIR/${basename}-djpeg.ppm
+							cmp $OUTDIR/${basename}-tjdecomp.ppm \
+								$OUTDIR/${basename}-djpeg.ppm
+							rm $OUTDIR/${basename}-tjdecomp.ppm $OUTDIR/${basename}-djpeg.ppm
+							echo
+						else
+							basename=`basename $RGBIMG .ppm`
+							runme $TJDECOMP $croparg $dctarg $nsarg $scalearg \
+								$OUTDIR/${basename}-$subsamp.jpg \
+								$OUTDIR/${basename}-tjdecomp.ppm
+							runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg \
+								-outf $OUTDIR/${basename}-djpeg.ppm \
+								$OUTDIR/${basename}-$subsamp.jpg
+							$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.ppm \
+								$OUTDIR/${basename}-djpeg.ppm
+							cmp $OUTDIR/${basename}-tjdecomp.ppm \
+								$OUTDIR/${basename}-djpeg.ppm
+							rm $OUTDIR/${basename}-tjdecomp.ppm $OUTDIR/${basename}-djpeg.ppm
+							echo
+
+							if [[ "$nsarg" = "" ]]; then
+								runme $TJDECOMP $croparg $dctarg $nsarg $scalearg \
+									-g $OUTDIR/${basename}-$subsamp.jpg \
+									$OUTDIR/${basename}-tjdecomp.pgm
+								runme $EXEDIR/djpeg $croparg $dctarg $nsarg $scalearg \
+									-gr -outf $OUTDIR/${basename}-djpeg.pgm \
+									$OUTDIR/${basename}-$subsamp.jpg
+								$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.pgm \
+									$OUTDIR/${basename}-djpeg.pgm
+								cmp $OUTDIR/${basename}-tjdecomp.pgm \
+									$OUTDIR/${basename}-djpeg.pgm
+								rm $OUTDIR/${basename}-tjdecomp.pgm \
+									$OUTDIR/${basename}-djpeg.pgm
+								echo
+							fi
+						fi
+					done
+				done
+			done
+		done
+		rm $OUTDIR/${basename}-$subsamp.jpg
+	done
+done
+
+for precision in {2..16}; do
+	if [ $precision -le 8 ]; then
+		RGBIMG=$IMGDIR/testorig.ppm
+		GRAYIMG=$IMGDIR/testorig.pgm
+	else
+		RGBIMG=$IMGDIR/big_building16.ppm
+		GRAYIMG=$IMGDIR/big_building16.pgm
+	fi
+
+	basename=`basename $RGBIMG .ppm`
+	runme $EXEDIR/cjpeg -pre $precision -l 1 \
+		-outf $OUTDIR/${basename}-rgb.jpg $RGBIMG
+	echo
+
+	runme $TJDECOMP $OUTDIR/${basename}-rgb.jpg \
+		$OUTDIR/${basename}-tjdecomp.ppm
+	runme $EXEDIR/djpeg -outf $OUTDIR/${basename}-djpeg.ppm \
+		$OUTDIR/${basename}-rgb.jpg
+	$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.ppm \
+		$OUTDIR/${basename}-djpeg.ppm
+	cmp $OUTDIR/${basename}-tjdecomp.ppm $OUTDIR/${basename}-djpeg.ppm
+	rm $OUTDIR/${basename}-tjdecomp.ppm $OUTDIR/${basename}-djpeg.ppm
+	rm $OUTDIR/${basename}-rgb.jpg
+	echo
+
+	basename=`basename $GRAYIMG .pgm`
+	runme $EXEDIR/cjpeg -pre $precision -l 1 \
+		-outf $OUTDIR/${basename}-gray.jpg $GRAYIMG
+	echo
+
+	runme $TJDECOMP $OUTDIR/${basename}-gray.jpg \
+		$OUTDIR/${basename}-tjdecomp.pgm
+	runme $EXEDIR/djpeg -outf $OUTDIR/${basename}-djpeg.pgm \
+		$OUTDIR/${basename}-gray.jpg
+	$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjdecomp.pgm \
+		$OUTDIR/${basename}-djpeg.pgm
+	cmp $OUTDIR/${basename}-tjdecomp.pgm $OUTDIR/${basename}-djpeg.pgm
+	rm $OUTDIR/${basename}-tjdecomp.pgm $OUTDIR/${basename}-djpeg.pgm
+	rm $OUTDIR/${basename}-gray.jpg
+	echo
+done
+
+echo "GREAT SUCCESS!"

test/tjexampletest.in

@@ -1,186 +0,0 @@
-#!/bin/bash
-
-set -u
-set -e
-trap onexit INT
-trap onexit TERM
-trap onexit EXIT
-
-onexit()
-{
-	if [ -d $OUTDIR ]; then
-		rm -rf $OUTDIR
-	fi
-}
-
-runme()
-{
-	echo \*\*\* $*
-	$*
-}
-
-IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp big_tree8.bmp"
-IMGDIR=@CMAKE_SOURCE_DIR@/testimages
-OUTDIR=`mktemp -d /tmp/__tjexampletest_output.XXXXXX`
-EXEDIR=@CMAKE_BINARY_DIR@
-JAVA="@Java_JAVA_EXECUTABLE@"
-JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
-TJEXAMPLE=$EXEDIR/tjexample
-JAVAARG=
-
-if [ -d $OUTDIR ]; then
-	rm -rf $OUTDIR
-fi
-mkdir -p $OUTDIR
-
-while [ $# -gt 0 ]; do
-	case "$1" in
-	-java)
-		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.
-		IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp"
-		;;
-	esac
-	shift
-done
-
-exec >$EXEDIR/tjexampletest$JAVAARG.log
-
-for image in $IMAGES; do
-
-	cp $IMGDIR/$image $OUTDIR
-	basename=`basename $image .bmp`
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -grayscale -outfile $OUTDIR/${basename}_GRAY_fast_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 -outfile $OUTDIR/${basename}_420_fast_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 -outfile $OUTDIR/${basename}_422_fast_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 -outfile $OUTDIR/${basename}_444_fast_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -grayscale -outfile $OUTDIR/${basename}_GRAY_accurate_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 2x2 -outfile $OUTDIR/${basename}_420_accurate_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 2x1 -outfile $OUTDIR/${basename}_422_accurate_cjpeg.jpg $IMGDIR/${basename}.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 1x1 -outfile $OUTDIR/${basename}_444_accurate_cjpeg.jpg $IMGDIR/${basename}.bmp
-	for samp in GRAY 420 422 444; do
-		runme $EXEDIR/djpeg -dct fast -rgb -bmp -outfile $OUTDIR/${basename}_${samp}_fast_djpeg.bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg
-		runme $EXEDIR/djpeg -dct int -rgb -bmp -outfile $OUTDIR/${basename}_${samp}_accurate_djpeg.bmp $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg
-	done
-	for samp in 420 422; do
-		runme $EXEDIR/djpeg -dct fast -nosmooth -bmp -outfile $OUTDIR/${basename}_${samp}_fast_nosmooth_djpeg.bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg
-		runme $EXEDIR/djpeg -dct int -nosmooth -bmp -outfile $OUTDIR/${basename}_${samp}_accurate_nosmooth_djpeg.bmp $OUTDIR/${basename}_${samp}_accurate_cjpeg.jpg
-	done
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -grayscale -outfile $OUTDIR/${basename}_GRAY_fast_cjpeg2.jpg $OUTDIR/${basename}_GRAY_fast_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x2 -outfile $OUTDIR/${basename}_420_fast_cjpeg2.jpg $OUTDIR/${basename}_420_fast_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 2x1 -outfile $OUTDIR/${basename}_422_fast_cjpeg2.jpg $OUTDIR/${basename}_422_fast_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct fast -sample 1x1 -outfile $OUTDIR/${basename}_444_fast_cjpeg2.jpg $OUTDIR/${basename}_444_fast_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -grayscale -outfile $OUTDIR/${basename}_GRAY_accurate_cjpeg2.jpg $OUTDIR/${basename}_GRAY_accurate_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 2x2 -outfile $OUTDIR/${basename}_420_accurate_cjpeg2.jpg $OUTDIR/${basename}_420_accurate_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 2x1 -outfile $OUTDIR/${basename}_422_accurate_cjpeg2.jpg $OUTDIR/${basename}_422_accurate_djpeg.bmp
-	runme $EXEDIR/cjpeg -quality 95 -dct int -sample 1x1 -outfile $OUTDIR/${basename}_444_accurate_cjpeg2.jpg $OUTDIR/${basename}_444_accurate_djpeg.bmp
-
-	# Compression
-	for dct in fast accurate; do
-		dctarg=
-		if [ "${dct}" = "fast" ]; then
-			dctarg=-fastdct
-		fi
-		for samp in GRAY 420 422 444; do
-			runme $TJEXAMPLE $OUTDIR/$image $OUTDIR/${basename}_${samp}_${dct}.jpg -q 95 -subsamp ${samp} ${dctarg}
-			runme cmp $OUTDIR/${basename}_${samp}_${dct}.jpg $OUTDIR/${basename}_${samp}_${dct}_cjpeg.jpg
-		done
-	done
-
-	# Recompression
-	for dct in fast accurate; do
-		dctarg=
-		if [ "${dct}" = "fast" ]; then
-			dctarg=-fastdct
-		fi
-		for samp in GRAY 420 422 444; do
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_${dct}.jpg $OUTDIR/${basename}_${samp}_${dct}_recomp.jpg -q 95 -subsamp ${samp} ${dctarg}
-			runme cmp $OUTDIR/${basename}_${samp}_${dct}_recomp.jpg $OUTDIR/${basename}_${samp}_${dct}_cjpeg2.jpg
-		done
-	done
-
-	# Decompression
-	for dct in fast accurate; do
-		dctarg=
-		if [ "${dct}" = "fast" ]; then
-			dctarg=-fastdct
-		fi
-		for samp in GRAY 420 422 444; do
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_${dct}.jpg $OUTDIR/${basename}_${samp}_${dct}.bmp ${dctarg}
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${dct}.bmp $OUTDIR/${basename}_${samp}_${dct}_djpeg.bmp
-			rm $OUTDIR/${basename}_${samp}_${dct}.bmp
-		done
-		for samp in 420 422; do
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_${dct}.jpg $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp -fastupsample ${dctarg}
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp $OUTDIR/${basename}_${samp}_${dct}_nosmooth_djpeg.bmp
-			rm $OUTDIR/${basename}_${samp}_${dct}_nosmooth.bmp
-		done
-	done
-
-	# Scaled decompression
-	for scale in 2_1 15_8 7_4 13_8 3_2 11_8 5_4 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8; do
-		scalearg=`echo $scale | sed 's/\_/\//g'`
-		for samp in GRAY 420 422 444; do
-			runme $EXEDIR/djpeg -rgb -bmp -scale ${scalearg} -outfile $OUTDIR/${basename}_${samp}_${scale}_djpeg.bmp $OUTDIR/${basename}_${samp}_fast_cjpeg.jpg
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${scale}.bmp -scale ${scalearg}
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${scale}.bmp $OUTDIR/${basename}_${samp}_${scale}_djpeg.bmp
-			rm $OUTDIR/${basename}_${samp}_${scale}.bmp
-		done
-	done
-
-	# Transforms
-	for samp in GRAY 420 422 444; do
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -flip horizontal -trim -outfile $OUTDIR/${basename}_${samp}_hflip_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -flip vertical -trim -outfile $OUTDIR/${basename}_${samp}_vflip_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -transpose -trim -outfile $OUTDIR/${basename}_${samp}_transpose_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -transverse -trim -outfile $OUTDIR/${basename}_${samp}_transverse_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 90 -trim -outfile $OUTDIR/${basename}_${samp}_rot90_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 180 -trim -outfile $OUTDIR/${basename}_${samp}_rot180_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-		runme $EXEDIR/jpegtran -crop 70x60+16+16 -rotate 270 -trim -outfile $OUTDIR/${basename}_${samp}_rot270_jpegtran.jpg $OUTDIR/${basename}_${samp}_fast.jpg
-	done
-	for xform in hflip vflip transpose transverse rot90 rot180 rot270; do
-		for samp in GRAY 420 422 444; do
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -crop 70x60+16+16
-			runme cmp $OUTDIR/${basename}_${samp}_${xform}.jpg $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg
-			runme $EXEDIR/djpeg -rgb -bmp -outfile $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -crop 70x60+16+16
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp
-			rm $OUTDIR/${basename}_${samp}_${xform}.bmp
-		done
-		for samp in 420 422; do
-			runme $EXEDIR/djpeg -nosmooth -rgb -bmp -outfile $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -crop 70x60+16+16 -fastupsample
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.bmp
-			rm $OUTDIR/${basename}_${samp}_${xform}.bmp
-		done
-	done
-
-	# Grayscale transform
-	for xform in hflip vflip transpose transverse rot90 rot180 rot270; do
-		for samp in GRAY 444 422 420; do
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.jpg -$xform -grayscale -crop 70x60+16+16
-			runme cmp $OUTDIR/${basename}_${samp}_${xform}.jpg $OUTDIR/${basename}_GRAY_${xform}_jpegtran.jpg
-			runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}.bmp -$xform -grayscale -crop 70x60+16+16
-			runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}.bmp $OUTDIR/${basename}_GRAY_${xform}_jpegtran.bmp
-			rm $OUTDIR/${basename}_${samp}_${xform}.bmp
-		done
-	done
-
-	# Transforms with scaling
-	for xform in hflip vflip transpose transverse rot90 rot180 rot270; do
-		for samp in GRAY 444 422 420; do
-			for scale in 2_1 15_8 7_4 13_8 3_2 11_8 5_4 9_8 7_8 3_4 5_8 1_2 3_8 1_4 1_8; do
-				scalearg=`echo $scale | sed 's/\_/\//g'`
-				runme $EXEDIR/djpeg -rgb -bmp -scale ${scalearg} -outfile $OUTDIR/${basename}_${samp}_${xform}_${scale}_jpegtran.bmp $OUTDIR/${basename}_${samp}_${xform}_jpegtran.jpg
-				runme $TJEXAMPLE $OUTDIR/${basename}_${samp}_fast.jpg $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp -$xform -scale ${scalearg} -crop 70x60+16+16
-				runme cmp -i 54:54 $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp $OUTDIR/${basename}_${samp}_${xform}_${scale}_jpegtran.bmp
-				rm $OUTDIR/${basename}_${samp}_${xform}_${scale}.bmp
-			done
-		done
-	done
-
-done
-
-echo SUCCESS!

test/tjtrantest.in

@@ -0,0 +1,153 @@
+#/bin/bash
+
+set -u
+set -e
+trap onexit INT
+trap onexit TERM
+trap onexit EXIT
+
+onexit()
+{
+	if [ -d $OUTDIR ]; then
+		rm -rf $OUTDIR
+	fi
+}
+
+runme()
+{
+	echo \*\*\* $*
+	"$@"
+}
+
+IMGDIR=@CMAKE_SOURCE_DIR@/testimages
+OUTDIR=`mktemp -d /tmp/__tjtrantest_output.XXXXXX`
+EXEDIR=@CMAKE_BINARY_DIR@
+JAVA="@Java_JAVA_EXECUTABLE@"
+JAVAARGS="-cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR"
+TJTRAN=$EXEDIR/tjtran
+JAVAARG=
+
+if [ -d $OUTDIR ]; then
+	rm -rf $OUTDIR
+fi
+mkdir -p $OUTDIR
+
+while [ $# -gt 0 ]; do
+	case "$1" in
+	-java)
+		JAVAARG=-java
+		TJTRAN="$JAVA $JAVAARGS TJTran"
+		;;
+	esac
+	shift
+done
+
+exec >$EXEDIR/tjtrantest$JAVAARG.log
+
+SUBSAMPOPT=(444 422 440 420 411 441 410)
+SAMPOPT=(1x1 2x1 1x2 2x2 4x1 1x4 4x2)
+
+for precision in 8 12; do
+	if [ $precision -le 8 ]; then
+		RGBIMG=$IMGDIR/testorig.ppm
+		GRAYIMG=$IMGDIR/testorig.pgm
+	else
+		RGBIMG=$IMGDIR/big_building16.ppm
+		GRAYIMG=$IMGDIR/big_building16.pgm
+	fi
+
+	for sampi in {0..6}; do
+		EXTRA_ARGS=
+		if [ $sampi = 1 ]; then
+			EXTRA_ARGS=-p
+		elif [ $sampi = 2 ]; then
+			EXTRA_ARGS=-a
+		elif [ $sampi = 3 ]; then
+			EXTRA_ARGS=-o
+		fi
+		runme $EXEDIR/cjpeg -pre $precision -sa ${SAMPOPT[$sampi]} $EXTRA_ARGS \
+			-outf $OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg $RGBIMG
+		if [ $sampi = 4 ]; then
+			$EXEDIR/wrjpgcom -comment "This is a test" \
+				$OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg \
+				>$OUTDIR/temp.jpg
+			mv $OUTDIR/temp.jpg \
+				$OUTDIR/`basename $RGBIMG .ppm`-${SUBSAMPOPT[$sampi]}.jpg
+		fi
+	done
+	runme $EXEDIR/cjpeg -pre $precision \
+		-outf $OUTDIR/`basename $GRAYIMG .pgm`-gray.jpg $GRAYIMG
+	echo
+
+	for subsamp in ${SUBSAMPOPT[*]} gray; do
+		if [ "$subsamp" = "gray" ]; then
+			basename=`basename $GRAYIMG .pgm`
+		else
+			basename=`basename $RGBIMG .ppm`
+		fi
+		for ariarg in "" "-a"; do
+			for copyarg in "" "-c n"; do
+				if [[ "$copyarg" = "-c n" && "$subsamp" != "411" ]]; then
+					continue
+				fi
+				for croparg in "" "-cr 14x14+23+23" "-cr 21x21+4+4" "-cr 18x18+13+13" \
+					"-cr 21x21+0+0" "-cr 24x26+20+18"; do
+					for xformarg in "" "-f h" "-f v" "-ro 90" "-ro 180" "-ro 270" "-t" \
+						"-transv"; do
+						for grayarg in "" "-g"; do
+							if [ "$grayarg" = "" ]; then
+								if [[ "$subsamp" = "410" && "$croparg" != "" ]]; then
+									continue
+								fi
+							else
+								if [ "$subsamp" = "gray" ]; then
+									continue
+								fi
+							fi
+							for optarg in "" "-o"; do
+								if [ "$optarg" = "-o" ]; then
+									if [[ "$ariarg" = "-a" || $precision -eq 12 ]]; then
+										continue
+									fi
+								fi
+								for progarg in "" "-p"; do
+									if [[ "$progarg" = "-p" && "$optarg" = "-o" ]]; then
+										continue
+									fi
+									for trimarg in "" "-tri"; do
+										if [ "$trimarg" = "-tri" ]; then
+											if [[ "$xformarg" = "-t" || "$xformarg" = "" ]]; then
+												continue
+											fi
+											if [ "$croparg" != "" ]; then
+												continue
+											fi
+										fi
+										runme $TJTRAN $ariarg $copyarg $croparg $xformarg \
+											$grayarg $optarg $progarg $trimarg \
+											$OUTDIR/${basename}-$subsamp.jpg \
+											$OUTDIR/${basename}-tjtran.jpg
+										runme $EXEDIR/jpegtran $ariarg $copyarg $croparg \
+											$xformarg $grayarg $optarg $progarg $trimarg \
+											-outf $OUTDIR/${basename}-jpegtran.jpg \
+											$OUTDIR/${basename}-$subsamp.jpg
+										$EXEDIR/src/md5/md5sum $OUTDIR/${basename}-tjtran.jpg \
+											$OUTDIR/${basename}-jpegtran.jpg
+										cmp $OUTDIR/${basename}-tjtran.jpg \
+											$OUTDIR/${basename}-jpegtran.jpg
+										rm $OUTDIR/${basename}-tjtran.jpg \
+											$OUTDIR/${basename}-jpegtran.jpg
+										echo
+									done
+								done
+							done
+						done
+					done
+				done
+			done
+		done
+		rm $OUTDIR/${basename}-$subsamp.jpg
+	done
+done
+
+echo "GREAT SUCCESS!"