Added support for native Photoshop EPS previews, adjusted test suite

src/epsimage.cpp

@@ -417,6 +417,8 @@ namespace {
         size_t posExiv2Version = posEndEps;
         size_t posExiv2Website = posEndEps;
         size_t posEndComments = posEndEps;
+        size_t posBeginPhotoshop = posEndEps;
+        size_t posEndPhotoshop = posEndEps;
         size_t posPage = posEndEps;
         size_t posEndPageSetup = posEndEps;
         size_t posPageTrailer = posEndEps;
@@ -424,7 +426,6 @@ namespace {
         std::vector<std::pair<size_t, size_t> > removableEmbeddings;
         bool implicitPage = false;
         bool implicitPageTrailer = false;
-        bool photoshop = false;
         bool inDefaultsOrPrologOrSetup = false;
         bool inPageSetup = false;
         bool inRemovableEmbedding = false;
@@ -505,8 +506,10 @@ namespace {
                 posEndPageSetup = startPos;
             } else if (posPageTrailer == posEndEps && line == "%%PageTrailer") {
                 posPageTrailer = startPos;
-            } else if (startsWith(line, "%BeginPhotoshop:")) {
+            } else if (posBeginPhotoshop == posEndEps && startsWith(line, "%BeginPhotoshop:")) {
-                photoshop = true;
+                posBeginPhotoshop = pos;
+            } else if (posBeginPhotoshop != posEndEps && posEndPhotoshop == posEndEps && line == "%EndPhotoshop") {
+                posEndPhotoshop = startPos;
             } else if (!inRemovableEmbedding && line == "%Exiv2BeginXMP: Before %%EndPageSetup") {
                 inRemovableEmbedding = true;
                 removableEmbeddings.push_back(std::make_pair(startPos, startPos));
@@ -646,7 +649,7 @@ namespace {
                     xmpSize += (xmpPos - posBeginXmlPacket);
                     xmpPos = posBeginXmlPacket;
                 }
-            } else if (photoshop) {
+            } else if (posBeginPhotoshop != posEndEps) {
                 #ifndef SUPPRESS_WARNINGS
                 EXV_WARNING << "Missing %begin_xml_packet in Photoshop EPS at position: " << xmpPos << "\n";
                 #endif
@@ -683,6 +686,16 @@ namespace {
 
             // native previews
             nativePreviews.clear();
+            if (posEndPhotoshop != posEndEps) {
+                NativePreview nativePreview;
+                nativePreview.position_ = static_cast<long>(posBeginPhotoshop);
+                nativePreview.size_ = posEndPhotoshop - posBeginPhotoshop;
+                nativePreview.width_ = 0;
+                nativePreview.height_ = 0;
+                nativePreview.filter_ = "hex-irb";
+                nativePreview.mimeType_ = "image/jpeg";
+                nativePreviews.push_back(nativePreview);
+            }
             if (sizeWmf != 0) {
                 NativePreview nativePreview;
                 nativePreview.position_ = static_cast<long>(posWmf);
@@ -838,7 +851,7 @@ namespace {
                             writeTemp(*tempIo, "%%BeginPageSetup" + lineEnding);
                         }
                         writeTemp(*tempIo, "%Exiv2BeginXMP: Before %%EndPageSetup" + lineEnding);
-                        if (photoshop) {
+                        if (posBeginPhotoshop != posEndEps) {
                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding);
                             writeTemp(*tempIo, "%begin_xml_code" + lineEnding);
                         }
@@ -855,7 +868,7 @@ namespace {
                         writeTemp(*tempIo, "[{Exiv2_metadata_stream}" + lineEnding);
                         writeTemp(*tempIo, "    currentfile 0 (% &&end XMP packet marker&&)" + lineEnding);
                         writeTemp(*tempIo, "    /SubFileDecode filter Exiv2_metafile_pdfmark" + lineEnding);
-                        if (photoshop) {
+                        if (posBeginPhotoshop != posEndEps) {
                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop. "
                                                "Parameter must be exact size of XMP metadata." + lineEnding);
                             writeTemp(*tempIo, "%begin_xml_packet: " + toString(xmpPacket.size()) + lineEnding);
@@ -865,7 +878,7 @@ namespace {
                         writeTemp(*tempIo, "% &&end XMP packet marker&&" + lineEnding);
                         writeTemp(*tempIo, "[/Document 1 dict begin" + lineEnding);
                         writeTemp(*tempIo, "    /Metadata {Exiv2_metadata_stream} def currentdict end /BDC Exiv2_pdfmark" + lineEnding);
-                        if (photoshop) {
+                        if (posBeginPhotoshop != posEndEps) {
                             writeTemp(*tempIo, "%Exiv2Notice: The following line is needed by Photoshop." + lineEnding);
                             writeTemp(*tempIo, "%end_xml_code" + lineEnding);
                         }

test/data/eps/eps-test.out

@@ -2161,9 +2161,9 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
 Exit code: 0
 
------> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
+-----> eps-flat_oodraw_ai-cs5-lev3-pre.eps <-----
 
-Command: exiv2 -u -pa eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -u -pa eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Xmp.xmp.CreatorTool                          XmpText    21  Adobe Illustrator CS5
 Xmp.xmp.CreateDate                           XmpText    25  2011-03-25T16:09:09+01:00
 Xmp.xmp.MetadataDate                         XmpText    25  2011-03-25T16:09:09+01:00
@@ -2270,24 +2270,24 @@ Xmp.xmpMM.History[3]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[3]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -dx eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -dx eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
-Restore: eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Restore: eps-flat_oodraw_ai-cs5-lev3-pre.eps
 
-Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
-Command: exiv2 -ix eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -ix eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
-Command: (2) exiv2 -ix eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: (2) exiv2 -ix eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -f -ex eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
 -----> eps-flat_oodraw_ai-cs5-lev3.eps <-----
@@ -2597,9 +2597,9 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii-colorprofile.eps
 Exit code: 0
 
------> eps-flat_photoshop-cs5-ascii-preview.eps <-----
+-----> eps-flat_photoshop-cs5-ascii-pre.eps <-----
 
-Command: exiv2 -u -pa eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -u -pa eps-flat_photoshop-cs5-ascii-pre.eps
 Xmp.xmp.CreatorTool                          XmpText    29  Adobe Photoshop CS5 Macintosh
 Xmp.xmp.CreateDate                           XmpText    25  2011-03-25T17:23:38+01:00
 Xmp.xmp.MetadataDate                         XmpText    25  2011-03-25T17:25:23+01:00
@@ -2653,24 +2653,24 @@ Xmp.xmpMM.History[7]/stEvt:changed           XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -dx eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -dx eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
-Restore: eps-flat_photoshop-cs5-ascii-preview.eps
+Restore: eps-flat_photoshop-cs5-ascii-pre.eps
 
-Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
-Command: exiv2 -ix eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -ix eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
-Command: (2) exiv2 -ix eps-flat_photoshop-cs5-ascii-preview.eps
+Command: (2) exiv2 -ix eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-ascii.eps <-----
@@ -2737,9 +2737,9 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii.eps
 Exit code: 0
 
------> eps-flat_photoshop-cs5-ascii85-preview.eps <-----
+-----> eps-flat_photoshop-cs5-ascii85-pre.eps <-----
 
-Command: exiv2 -u -pa eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -u -pa eps-flat_photoshop-cs5-ascii85-pre.eps
 Xmp.xmp.CreatorTool                          XmpText    29  Adobe Photoshop CS5 Macintosh
 Xmp.xmp.CreateDate                           XmpText    25  2011-03-25T17:23:38+01:00
 Xmp.xmp.MetadataDate                         XmpText    25  2011-03-25T17:27:02+01:00
@@ -2841,24 +2841,24 @@ Xmp.xmpMM.History[15]/stEvt:changed          XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -dx eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -dx eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
-Restore: eps-flat_photoshop-cs5-ascii85-preview.eps
+Restore: eps-flat_photoshop-cs5-ascii85-pre.eps
 
-Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
-Command: exiv2 -ix eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -ix eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
-Command: (2) exiv2 -ix eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: (2) exiv2 -ix eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-ascii85.eps <-----
@@ -3004,9 +3004,9 @@ Exit code: 0
 Command: exiv2 -f -ex eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps
 Exit code: 0
 
------> eps-flat_photoshop-cs5-binary-preview.eps <-----
+-----> eps-flat_photoshop-cs5-binary-pre.eps <-----
 
-Command: exiv2 -u -pa eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -u -pa eps-flat_photoshop-cs5-binary-pre.eps
 Xmp.xmp.CreatorTool                          XmpText    29  Adobe Photoshop CS5 Macintosh
 Xmp.xmp.CreateDate                           XmpText    25  2011-03-25T17:23:38+01:00
 Xmp.xmp.MetadataDate                         XmpText    25  2011-03-25T17:26:30+01:00
@@ -3084,24 +3084,24 @@ Xmp.xmpMM.History[11]/stEvt:changed          XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -dx eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -dx eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
-Restore: eps-flat_photoshop-cs5-binary-preview.eps
+Restore: eps-flat_photoshop-cs5-binary-pre.eps
 
-Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
-Command: exiv2 -ix eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -ix eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
-Command: (2) exiv2 -ix eps-flat_photoshop-cs5-binary-preview.eps
+Command: (2) exiv2 -ix eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
-Command: exiv2 -f -ex eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -f -ex eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-binary.eps <-----
@@ -3702,11 +3702,11 @@ Exiv2 exception in print action for file eps-nested_noxmp_oodraw-lev2-epsi.eps:
 Failed to read image data
 Exit code: 1
 
------> eps-nested_noxmp_oodraw-lev2-preview.eps <-----
+-----> eps-nested_noxmp_oodraw-lev2-pre.eps <-----
 
-Command: exiv2 -u -pa eps-nested_noxmp_oodraw-lev2-preview.eps
+Command: exiv2 -u -pa eps-nested_noxmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16203
-Exiv2 exception in print action for file eps-nested_noxmp_oodraw-lev2-preview.eps:
+Exiv2 exception in print action for file eps-nested_noxmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 
@@ -3774,11 +3774,11 @@ Exiv2 exception in print action for file eps-nested_xmp_oodraw-lev2-epsi.eps:
 Failed to read image data
 Exit code: 1
 
------> eps-nested_xmp_oodraw-lev2-preview.eps <-----
+-----> eps-nested_xmp_oodraw-lev2-pre.eps <-----
 
-Command: exiv2 -u -pa eps-nested_xmp_oodraw-lev2-preview.eps
+Command: exiv2 -u -pa eps-nested_xmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16365
-Exiv2 exception in print action for file eps-nested_xmp_oodraw-lev2-preview.eps:
+Exiv2 exception in print action for file eps-nested_xmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 

test/data/preview/preview-test.out

@@ -100,14 +100,14 @@ Exit code: 0
 Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
 Exit code: 0
 
------> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
+-----> eps-flat_oodraw_ai-cs5-lev3-pre.eps <-----
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-pre.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
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-pre.eps
 Exit code: 0
 
 -----> eps-flat_oodraw_ai-cs5-lev3.eps <-----
@@ -139,38 +139,43 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-ascii-colorprofile.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-ascii-colorprofile.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii-colorprofile.eps
 Exit code: 0
 
------> eps-flat_photoshop-cs5-ascii-preview.eps <-----
+-----> eps-flat_photoshop-cs5-ascii-pre.eps <-----
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -pp eps-flat_photoshop-cs5-ascii-pre.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii-preview.eps
+Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-ascii.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-ascii.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii.eps
 Exit code: 0
 
------> eps-flat_photoshop-cs5-ascii85-preview.eps <-----
+-----> eps-flat_photoshop-cs5-ascii85-pre.eps <-----
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -pp eps-flat_photoshop-cs5-ascii85-pre.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii85-preview.eps
+Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii85-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-ascii85.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-ascii85.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii85.eps
@@ -180,23 +185,26 @@ Exit code: 0
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps
 Warning: Unable to find XMP metadata as announced at position: 291
+Preview 1: image/jpeg, 37x47 pixels, 574 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps
 Warning: Unable to find XMP metadata as announced at position: 291
 Exit code: 0
 
------> eps-flat_photoshop-cs5-binary-preview.eps <-----
+-----> eps-flat_photoshop-cs5-binary-pre.eps <-----
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -pp eps-flat_photoshop-cs5-binary-pre.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary-preview.eps
+Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary-pre.eps
 Exit code: 0
 
 -----> eps-flat_photoshop-cs5-binary.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary.eps
@@ -205,6 +213,7 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_exiftool-8.56.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiftool-8.56.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiftool-8.56.eps
@@ -213,6 +222,7 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
@@ -221,6 +231,7 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_exiv2.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2.eps
@@ -229,6 +240,7 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_exiv2_exiftool-8.56.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2_exiftool-8.56.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2_exiftool-8.56.eps
@@ -238,6 +250,7 @@ Exit code: 0
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
 Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
@@ -247,6 +260,7 @@ Exit code: 0
 -----> eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps
+Preview 1: image/jpeg, 37x47 pixels, 854 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps
@@ -255,7 +269,8 @@ 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
+Preview 1: image/jpeg, 160x120 pixels, 2252 bytes
+Preview 2: image/tiff, 454x340 pixels, 23782 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-e9-win-doseps.eps
@@ -264,6 +279,7 @@ Exit code: 0
 -----> eps-flat_photoshop-e9-win.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-e9-win.eps
+Preview 1: image/jpeg, 160x120 pixels, 2252 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-e9-win.eps
@@ -272,6 +288,7 @@ Exit code: 0
 -----> eps-flat_photoshop-e9-win_exiv2.eps <-----
 
 Command: exiv2 -pp eps-flat_photoshop-e9-win_exiv2.eps
+Preview 1: image/jpeg, 160x120 pixels, 2252 bytes
 Exit code: 0
 
 Command: exiv2 -f -ep eps-flat_photoshop-e9-win_exiv2.eps
@@ -403,17 +420,17 @@ Exiv2 exception in extract action for file eps-nested_noxmp_oodraw-lev2-epsi.eps
 Failed to read image data
 Exit code: 1
 
------> eps-nested_noxmp_oodraw-lev2-preview.eps <-----
+-----> eps-nested_noxmp_oodraw-lev2-pre.eps <-----
 
-Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-preview.eps
+Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16203
-Exiv2 exception in print action for file eps-nested_noxmp_oodraw-lev2-preview.eps:
+Exiv2 exception in print action for file eps-nested_noxmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 
-Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-preview.eps
+Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16203
-Exiv2 exception in extract action for file eps-nested_noxmp_oodraw-lev2-preview.eps:
+Exiv2 exception in extract action for file eps-nested_noxmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 
@@ -515,17 +532,17 @@ Exiv2 exception in extract action for file eps-nested_xmp_oodraw-lev2-epsi.eps:
 Failed to read image data
 Exit code: 1
 
------> eps-nested_xmp_oodraw-lev2-preview.eps <-----
+-----> eps-nested_xmp_oodraw-lev2-pre.eps <-----
 
-Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-preview.eps
+Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16365
-Exiv2 exception in print action for file eps-nested_xmp_oodraw-lev2-preview.eps:
+Exiv2 exception in print action for file eps-nested_xmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 
-Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-preview.eps
+Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-pre.eps
 Warning: Nested documents are currently not supported. Found nested document at position: 16365
-Exiv2 exception in extract action for file eps-nested_xmp_oodraw-lev2-preview.eps:
+Exiv2 exception in extract action for file eps-nested_xmp_oodraw-lev2-pre.eps:
 Failed to read image data
 Exit code: 1
 
@@ -723,13 +740,13 @@ Exit code: 0
 Command: exiv2 -f -ep exiv2-photoshop.psd
 Exit code: 0
 
------> exiv2-preview-in-xmp.xmp <-----
+-----> exiv2-pre-in-xmp.xmp <-----
 
-Command: exiv2 -pp exiv2-preview-in-xmp.xmp
+Command: exiv2 -pp exiv2-pre-in-xmp.xmp
 Preview 1: image/jpeg, 150x91 pixels, 4745 bytes
 Exit code: 0
 
-Command: exiv2 -f -ep exiv2-preview-in-xmp.xmp
+Command: exiv2 -f -ep exiv2-pre-in-xmp.xmp
 Exit code: 0
 
 -----> exiv2-sigma-d10.jpg <-----

test/preview-test.sh

@@ -30,17 +30,17 @@ images="eps/eps-flat_inkscape-epsi.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-preview.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3_exiftool-8.56.eps \
         eps/eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps \
         eps/eps-flat_photoshop-cs5-ascii-colorprofile.eps \
-        eps/eps-flat_photoshop-cs5-ascii-preview.eps \
+        eps/eps-flat_photoshop-cs5-ascii-pre.eps \
         eps/eps-flat_photoshop-cs5-ascii.eps \
-        eps/eps-flat_photoshop-cs5-ascii85-preview.eps \
+        eps/eps-flat_photoshop-cs5-ascii85-pre.eps \
         eps/eps-flat_photoshop-cs5-ascii85.eps \
         eps/eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps \
-        eps/eps-flat_photoshop-cs5-binary-preview.eps \
+        eps/eps-flat_photoshop-cs5-binary-pre.eps \
         eps/eps-flat_photoshop-cs5-binary.eps \
         eps/eps-flat_photoshop-cs5-binary_exiftool-8.56.eps \
         eps/eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps \
@@ -60,7 +60,7 @@ images="eps/eps-flat_inkscape-epsi.eps \
         eps/eps-nested_noxmp_indesign-cs5-lev3-bin.eps \
         eps/eps-nested_noxmp_indesign-cs5-lev3.eps \
         eps/eps-nested_noxmp_oodraw-lev2-epsi.eps \
-        eps/eps-nested_noxmp_oodraw-lev2-preview.eps \
+        eps/eps-nested_noxmp_oodraw-lev2-pre.eps \
         eps/eps-nested_xmp_ai-3-lev3.eps \
         eps/eps-nested_xmp_ai-8-lev3.eps \
         eps/eps-nested_xmp_ai-cs5-lev3.eps \
@@ -68,7 +68,7 @@ images="eps/eps-flat_inkscape-epsi.eps \
         eps/eps-nested_xmp_indesign-cs5-lev3.eps \
         eps/eps-nested_xmp_indesign-cs5-lev3_exiftool-8.56.eps \
         eps/eps-nested_xmp_oodraw-lev2-epsi.eps \
-        eps/eps-nested_xmp_oodraw-lev2-preview.eps \
+        eps/eps-nested_xmp_oodraw-lev2-pre.eps \
         exiv2-bug443.jpg \
         exiv2-bug444.jpg \
         exiv2-bug445.jpg \
@@ -89,7 +89,7 @@ images="eps/eps-flat_inkscape-epsi.eps \
         exiv2-olympus-c8080wz.jpg \
         exiv2-panasonic-dmc-fz5.jpg \
         exiv2-photoshop.psd \
-        exiv2-preview-in-xmp.xmp \
+        exiv2-pre-in-xmp.xmp \
         exiv2-sigma-d10.jpg \
         exiv2-sony-dsc-w7.jpg \
         glider.exv \