Added new test driver preview-test.sh, added preview PSD test file

test/Makefile

@@ -67,6 +67,7 @@ TESTS = addmoddel.sh      \
         iptctest.sh       \
         modify-test.sh    \
         path-test.sh      \
+        preview-test.sh   \
         stringto-test.sh  \
         tiff-test.sh      \
         write-test.sh     \

test/data/preview/preview-test.out

@@ -0,0 +1,474 @@
+
+-----> eps-flat_oodraw_ai-10-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-10-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-10-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-8-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-8-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-9-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-9-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-9-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs2-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs2-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs3-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs3-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs3-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs4-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs4-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs4-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Preview 1: image/tiff, 213x170 pixels, 37902 bytes
+Preview 2: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs-lev2.eps
+Exit code: 0
+
+-----> eps-flat_photoshop-e9-win-doseps.eps <-----
+
+Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps
+Preview 1: image/tiff, 454x340 pixels, 23782 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_photoshop-e9-win-doseps.eps
+Exit code: 0
+
+-----> exiv2-bug443.jpg <-----
+
+Command: exiv2 -pp exiv2-bug443.jpg
+Error: Directory Iop with 5233 entries considered invalid; not read.
+Preview 1: image/jpeg, 288x192 pixels, 33779 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug443.jpg
+Error: Directory Iop with 5233 entries considered invalid; not read.
+Exit code: 0
+
+-----> exiv2-bug444.jpg <-----
+
+Command: exiv2 -pp exiv2-bug444.jpg
+Preview 1: image/jpeg, 160x120 pixels, 4158 bytes
+Preview 2: image/jpeg, 320x240 pixels, 16993 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug444.jpg
+Exit code: 0
+
+-----> exiv2-bug445.jpg <-----
+
+Command: exiv2 -pp exiv2-bug445.jpg
+Preview 1: image/jpeg, 160x120 pixels, 5448 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug445.jpg
+Exit code: 0
+
+-----> exiv2-bug447.jpg <-----
+
+Command: exiv2 -pp exiv2-bug447.jpg
+Error: Directory NikonPreview with 8224 entries considered invalid; not read.
+Warning: Directory Photo, entry 0x9286 has unknown Exif (TIFF) type 14; setting type size 1.
+Preview 1: image/jpeg, 160x120 pixels, 4093 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug447.jpg
+Error: Directory NikonPreview with 8224 entries considered invalid; not read.
+Warning: Directory Photo, entry 0x9286 has unknown Exif (TIFF) type 14; setting type size 1.
+Exit code: 0
+
+-----> exiv2-bug501.jpg <-----
+
+Command: exiv2 -pp exiv2-bug501.jpg
+Warning: Unsupported time format
+Preview 1: image/jpeg, 120x160 pixels, 6179 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug501.jpg
+Warning: Unsupported time format
+Exit code: 0
+
+-----> exiv2-bug528.jpg <-----
+
+Command: exiv2 -pp exiv2-bug528.jpg
+Warning: Directory Canon, entry 0x0200 has unknown Exif (TIFF) type 768; setting type size 1.
+Preview 1: image/jpeg, 160x94 pixels, 4492 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug528.jpg
+Warning: Directory Canon, entry 0x0200 has unknown Exif (TIFF) type 768; setting type size 1.
+Exit code: 0
+
+-----> exiv2-canon-eos-20d.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-20d.jpg
+Error: Directory Canon: Next pointer is out of bounds; ignored.
+Preview 1: image/jpeg, 160x120 pixels, 6260 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-20d.jpg
+Error: Directory Canon: Next pointer is out of bounds; ignored.
+Exit code: 0
+
+-----> exiv2-canon-eos-300d.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-300d.jpg
+Preview 1: image/jpeg, 160x120 pixels, 9728 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-300d.jpg
+Exit code: 0
+
+-----> exiv2-canon-eos-d30.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-d30.jpg
+Preview 1: image/jpeg, 160x120 pixels, 13824 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-d30.jpg
+Exit code: 0
+
+-----> exiv2-canon-powershot-a520.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-powershot-a520.jpg
+Preview 1: image/jpeg, 160x120 pixels, 6137 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-powershot-a520.jpg
+Exit code: 0
+
+-----> exiv2-canon-powershot-s40.crw <-----
+
+Command: exiv2 -pp exiv2-canon-powershot-s40.crw
+Preview 1: image/jpeg, 160x120 pixels, 4418 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-powershot-s40.crw
+Exit code: 0
+
+-----> exiv2-fujifilm-finepix-s2pro.jpg <-----
+
+Command: exiv2 -pp exiv2-fujifilm-finepix-s2pro.jpg
+Preview 1: image/jpeg, 160x120 pixels, 9573 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-fujifilm-finepix-s2pro.jpg
+Exit code: 0
+
+-----> exiv2-gc.jpg <-----
+
+Command: exiv2 -pp exiv2-gc.jpg
+Preview 1: image/jpeg, 133x200 pixels, 6144 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-gc.jpg
+Exit code: 0
+
+-----> exiv2-kodak-dc210.jpg <-----
+
+Command: exiv2 -pp exiv2-kodak-dc210.jpg
+Preview 1: image/tiff, 96x72 pixels, 20736 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-kodak-dc210.jpg
+Exit code: 0
+
+-----> exiv2-nikon-d70.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-d70.jpg
+Preview 1: image/jpeg, 160x120 pixels, 8930 bytes
+Preview 2: image/jpeg, 564x372 pixels, 27773 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-d70.jpg
+Exit code: 0
+
+-----> exiv2-nikon-e950.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-e950.jpg
+Preview 1: image/jpeg, 160x120 pixels, 4662 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-e950.jpg
+Exit code: 0
+
+-----> exiv2-nikon-e990.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-e990.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7829 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-e990.jpg
+Exit code: 0
+
+-----> exiv2-olympus-c8080wz.jpg <-----
+
+Command: exiv2 -pp exiv2-olympus-c8080wz.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7306 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-olympus-c8080wz.jpg
+Exit code: 0
+
+-----> exiv2-panasonic-dmc-fz5.jpg <-----
+
+Command: exiv2 -pp exiv2-panasonic-dmc-fz5.jpg
+Preview 1: image/jpeg, 160x120 pixels, 10308 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-panasonic-dmc-fz5.jpg
+Exit code: 0
+
+-----> exiv2-photoshop.psd <-----
+
+Command: exiv2 -pp exiv2-photoshop.psd
+Preview 1: image/jpeg, 150x91 pixels, 4669 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-photoshop.psd
+Exit code: 0
+
+-----> exiv2-sigma-d10.jpg <-----
+
+Command: exiv2 -pp exiv2-sigma-d10.jpg
+Preview 1: image/jpeg, 160x106 pixels, 11998 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-sigma-d10.jpg
+Exit code: 0
+
+-----> exiv2-sony-dsc-w7.jpg <-----
+
+Command: exiv2 -pp exiv2-sony-dsc-w7.jpg
+Preview 1: image/jpeg, 160x120 pixels, 15605 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-sony-dsc-w7.jpg
+Exit code: 0
+
+-----> glider.exv <-----
+
+Command: exiv2 -pp glider.exv
+Preview 1: image/jpeg, 160x120 pixels, 5333 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep glider.exv
+Exit code: 0
+
+-----> imagemagick.pgf <-----
+
+Command: exiv2 -pp imagemagick.pgf
+Preview 1: image/jpeg, 160x105 pixels, 4363 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep imagemagick.pgf
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCbeg.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCbeg.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCbeg.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCend.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCend.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCend.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Exit code: 0
+
+-----> smiley2.jpg <-----
+
+Command: exiv2 -pp smiley2.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7289 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep smiley2.jpg
+Exit code: 0

test/eps-test.sh

@@ -51,22 +51,6 @@ done
             continue
         fi
 
-        rm -f "$image-preview"*
-
-        echo
-        echo "Command: exiv2 -pp $image.eps"
-        $bin/exiv2 -pp "$image.eps"
-        echo "Exit code: $?"
-
-        echo
-        echo "Command: exiv2 -f -ep $image.eps"
-        $bin/exiv2 -f -ep "$image.eps"
-        echo "Exit code: $?"
-
-        $bin/exiv2 -pp "$image.eps" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
-            diff -q "../data/eps/$image-preview$preview."* "$image-preview$preview."*
-        done
-
         echo
         echo "Command: exiv2 -f -eX $image.eps"
         $bin/exiv2 -f -eX "$image.eps"

test/preview-test.sh

@@ -0,0 +1,112 @@
+#! /bin/sh
+# Test driver for previews
+
+# ----------------------------------------------------------------------
+# Setup
+export LC_ALL=C
+cd tmp/
+if [ -z "$EXIV2_BINDIR" ] ; then
+    bin="$VALGRIND ../../src"
+    samples="$VALGRIND ../../samples"
+else
+    bin="$VALGRIND $EXIV2_BINDIR"
+    samples="$VALGRIND $EXIV2_BINDIR"
+fi
+diffargs="--strip-trailing-cr"
+if ! diff -q $diffargs /dev/null /dev/null 2>/dev/null ; then
+    diffargs=""
+fi
+
+# ----------------------------------------------------------------------
+# Tests
+images="eps/eps-flat_oodraw_ai-10-lev2.eps \
+        eps/eps-flat_oodraw_ai-8-lev2.eps \
+        eps/eps-flat_oodraw_ai-9-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs2-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs3-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs4-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps \
+        eps/eps-flat_oodraw_ai-cs-lev2.eps \
+        eps/eps-flat_photoshop-e9-win-doseps.eps \
+        exiv2-bug443.jpg \
+        exiv2-bug444.jpg \
+        exiv2-bug445.jpg \
+        exiv2-bug447.jpg \
+        exiv2-bug501.jpg \
+        exiv2-bug528.jpg \
+        exiv2-canon-eos-20d.jpg \
+        exiv2-canon-eos-300d.jpg \
+        exiv2-canon-eos-d30.jpg \
+        exiv2-canon-powershot-a520.jpg \
+        exiv2-canon-powershot-s40.crw \
+        exiv2-fujifilm-finepix-s2pro.jpg \
+        exiv2-gc.jpg \
+        exiv2-kodak-dc210.jpg \
+        exiv2-nikon-d70.jpg \
+        exiv2-nikon-e950.jpg \
+        exiv2-nikon-e990.jpg \
+        exiv2-olympus-c8080wz.jpg \
+        exiv2-panasonic-dmc-fz5.jpg \
+        exiv2-photoshop.psd \
+        exiv2-sigma-d10.jpg \
+        exiv2-sony-dsc-w7.jpg \
+        glider.exv \
+        imagemagick.pgf \
+        iptc-psAPP13-noIPTC.jpg \
+        iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg \
+        iptc-psAPP13-wIPTCbeg.jpg \
+        iptc-psAPP13-wIPTCempty.jpg \
+        iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTCend.jpg \
+        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
+        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
+        iptc-psAPP13-wIPTCmid.jpg \
+        iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg \
+        smiley2.jpg"
+(
+    for filepath in $images; do
+        filename=`basename "$filepath"`
+        image=`echo "$filename" | sed 's,\.[^.]*$,,'`
+
+        printf "." >&3
+
+        echo
+        echo "-----> $filename <-----"
+
+        cp "../data/$filepath" ./
+
+        echo
+        echo "Command: exiv2 -pp $filename"
+        $bin/exiv2 -pp "$filename"
+        exitcode=$?
+        echo "Exit code: $exitcode"
+
+        rm -f "$image-preview"*
+
+        echo
+        echo "Command: exiv2 -f -ep $filename"
+        $bin/exiv2 -f -ep "$filename"
+        echo "Exit code: $?"
+
+        $bin/exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
+            diff -q "../data/preview/$image-preview$preview."* "$image-preview$preview."*
+        done
+    done
+) 3>&1 > "preview-test.out" 2>&1
+
+echo "."
+
+# ----------------------------------------------------------------------
+# Result
+if ! diff -q $diffargs "../data/preview/preview-test.out" "preview-test.out" ; then
+    diff -u $diffargs "../data/preview/preview-test.out" "preview-test.out"
+    exit 1
+fi
+echo "All testcases passed."