From 8e0a97a0a29e2fd8ca3180fa99022ed9691a0da6 Mon Sep 17 00:00:00 2001 From: vog Date: Mon, 18 Jul 2011 15:24:49 +0000 Subject: [PATCH] Added support for native Photoshop EPS previews, adjusted test suite --- src/epsimage.cpp | 27 ++++-- ...ps => eps-flat_oodraw_ai-cs5-lev3-pre.eps} | Bin ...ps-flat_oodraw_ai-cs5-lev3-pre.eps.delxmp} | Bin ...ps-flat_oodraw_ai-cs5-lev3-pre.eps.newxmp} | Bin ...mp => eps-flat_oodraw_ai-cs5-lev3-pre.xmp} | 0 ...s => eps-flat_photoshop-cs5-ascii-pre.eps} | 0 ...s-flat_photoshop-cs5-ascii-pre.eps.delxmp} | 0 ...s-flat_photoshop-cs5-ascii-pre.eps.newxmp} | 0 ...p => eps-flat_photoshop-cs5-ascii-pre.xmp} | 0 ...=> eps-flat_photoshop-cs5-ascii85-pre.eps} | 0 ...flat_photoshop-cs5-ascii85-pre.eps.delxmp} | 0 ...flat_photoshop-cs5-ascii85-pre.eps.newxmp} | 0 ...=> eps-flat_photoshop-cs5-ascii85-pre.xmp} | 0 ... => eps-flat_photoshop-cs5-binary-pre.eps} | 0 ...-flat_photoshop-cs5-binary-pre.eps.delxmp} | 0 ...-flat_photoshop-cs5-binary-pre.eps.newxmp} | 0 ... => eps-flat_photoshop-cs5-binary-pre.xmp} | 0 ...s => eps-nested_noxmp_oodraw-lev2-pre.eps} | Bin ...eps => eps-nested_xmp_oodraw-lev2-pre.eps} | Bin test/data/eps/eps-test.out | 84 +++++++++--------- ...review-in-xmp.xmp => exiv2-pre-in-xmp.xmp} | 0 ...-flat_oodraw_ai-cs5-lev3-pre-preview1.tif} | Bin ...-flat_oodraw_ai-cs5-lev3-pre-preview2.jpg} | Bin ...toshop-cs5-ascii-colorprofile-preview1.jpg | Bin 0 -> 854 bytes ...-flat_photoshop-cs5-ascii-pre-preview1.jpg | Bin 0 -> 854 bytes .../eps-flat_photoshop-cs5-ascii-preview1.jpg | Bin 0 -> 854 bytes ...lat_photoshop-cs5-ascii85-pre-preview1.jpg | Bin 0 -> 854 bytes ...ps-flat_photoshop-cs5-ascii85-preview1.jpg | Bin 0 -> 854 bytes ...shop-cs5-ascii_failure-bigxmp-preview1.jpg | Bin 0 -> 574 bytes ...flat_photoshop-cs5-binary-pre-preview1.jpg | Bin 0 -> 854 bytes ...eps-flat_photoshop-cs5-binary-preview1.jpg | Bin 0 -> 854 bytes ...shop-cs5-binary_exiftool-8.56-preview1.jpg | Bin 0 -> 854 bytes ...oshop-cs5-binary_exiv2-bigxmp-preview1.jpg | Bin 0 -> 854 bytes ...at_photoshop-cs5-binary_exiv2-preview1.jpg | Bin 0 -> 854 bytes ...s5-binary_exiv2_exiftool-8.56-preview1.jpg | Bin 0 -> 854 bytes ...xiv2_missing-begin-xml-packet-preview1.jpg | Bin 0 -> 854 bytes ...-cs5-binary_no-adocontainsxmp-preview1.jpg | Bin 0 -> 854 bytes ...-flat_photoshop-e9-win-doseps-preview1.jpg | Bin 0 -> 2252 bytes ...flat_photoshop-e9-win-doseps-preview2.tif} | Bin .../eps-flat_photoshop-e9-win-preview1.jpg | Bin 0 -> 2252 bytes ...s-flat_photoshop-e9-win_exiv2-preview1.jpg | Bin 0 -> 2252 bytes ...iew1.jpg => exiv2-pre-in-xmp-preview1.jpg} | Bin test/data/preview/preview-test.out | 69 ++++++++------ test/preview-test.sh | 14 +-- 44 files changed, 112 insertions(+), 82 deletions(-) rename test/data/eps/{eps-flat_oodraw_ai-cs5-lev3-preview.eps => eps-flat_oodraw_ai-cs5-lev3-pre.eps} (100%) rename test/data/eps/{eps-flat_oodraw_ai-cs5-lev3-preview.eps.delxmp => eps-flat_oodraw_ai-cs5-lev3-pre.eps.delxmp} (100%) rename test/data/eps/{eps-flat_oodraw_ai-cs5-lev3-preview.eps.newxmp => eps-flat_oodraw_ai-cs5-lev3-pre.eps.newxmp} (100%) rename test/data/eps/{eps-flat_oodraw_ai-cs5-lev3-preview.xmp => eps-flat_oodraw_ai-cs5-lev3-pre.xmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii-preview.eps => eps-flat_photoshop-cs5-ascii-pre.eps} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii-preview.eps.delxmp => eps-flat_photoshop-cs5-ascii-pre.eps.delxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii-preview.eps.newxmp => eps-flat_photoshop-cs5-ascii-pre.eps.newxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii-preview.xmp => eps-flat_photoshop-cs5-ascii-pre.xmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii85-preview.eps => eps-flat_photoshop-cs5-ascii85-pre.eps} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii85-preview.eps.delxmp => eps-flat_photoshop-cs5-ascii85-pre.eps.delxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii85-preview.eps.newxmp => eps-flat_photoshop-cs5-ascii85-pre.eps.newxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-ascii85-preview.xmp => eps-flat_photoshop-cs5-ascii85-pre.xmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-binary-preview.eps => eps-flat_photoshop-cs5-binary-pre.eps} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-binary-preview.eps.delxmp => eps-flat_photoshop-cs5-binary-pre.eps.delxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-binary-preview.eps.newxmp => eps-flat_photoshop-cs5-binary-pre.eps.newxmp} (100%) rename test/data/eps/{eps-flat_photoshop-cs5-binary-preview.xmp => eps-flat_photoshop-cs5-binary-pre.xmp} (100%) rename test/data/eps/{eps-nested_noxmp_oodraw-lev2-preview.eps => eps-nested_noxmp_oodraw-lev2-pre.eps} (100%) rename test/data/eps/{eps-nested_xmp_oodraw-lev2-preview.eps => eps-nested_xmp_oodraw-lev2-pre.eps} (100%) rename test/data/{exiv2-preview-in-xmp.xmp => exiv2-pre-in-xmp.xmp} (100%) rename test/data/preview/{eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif => eps-flat_oodraw_ai-cs5-lev3-pre-preview1.tif} (100%) rename test/data/preview/{eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg => eps-flat_oodraw_ai-cs5-lev3-pre-preview2.jpg} (100%) create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii-pre-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii85-pre-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii85-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-ascii_failure-bigxmp-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary-pre-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_exiftool-8.56-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_exiv2-bigxmp-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_exiv2-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_exiv2_exiftool-8.56-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-cs5-binary_no-adocontainsxmp-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.jpg rename test/data/preview/{eps-flat_photoshop-e9-win-doseps-preview1.tif => eps-flat_photoshop-e9-win-doseps-preview2.tif} (100%) create mode 100644 test/data/preview/eps-flat_photoshop-e9-win-preview1.jpg create mode 100644 test/data/preview/eps-flat_photoshop-e9-win_exiv2-preview1.jpg rename test/data/preview/{exiv2-preview-in-xmp-preview1.jpg => exiv2-pre-in-xmp-preview1.jpg} (100%) diff --git a/src/epsimage.cpp b/src/epsimage.cpp index c7a1d8ad..8b587021 100644 --- a/src/epsimage.cpp +++ b/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 > 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:")) { - photoshop = true; + } else if (posBeginPhotoshop == posEndEps && startsWith(line, "%BeginPhotoshop:")) { + 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(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(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); } diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps similarity index 100% rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps rename to test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps.delxmp b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps.delxmp similarity index 100% rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps.delxmp rename to test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps.delxmp diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps.newxmp b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps.newxmp similarity index 100% rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps.newxmp rename to test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.eps.newxmp diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.xmp b/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.xmp similarity index 100% rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview.xmp rename to test/data/eps/eps-flat_oodraw_ai-cs5-lev3-pre.xmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps b/test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps rename to test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps.delxmp b/test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps.delxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps.delxmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps.delxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps.newxmp b/test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps.newxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii-preview.eps.newxmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii-pre.eps.newxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii-preview.xmp b/test/data/eps/eps-flat_photoshop-cs5-ascii-pre.xmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii-preview.xmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii-pre.xmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps b/test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps rename to test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps.delxmp b/test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps.delxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps.delxmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps.delxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps.newxmp b/test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps.newxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.eps.newxmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.eps.newxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.xmp b/test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.xmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-ascii85-preview.xmp rename to test/data/eps/eps-flat_photoshop-cs5-ascii85-pre.xmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps b/test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps rename to test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps.delxmp b/test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps.delxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps.delxmp rename to test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps.delxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps.newxmp b/test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps.newxmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-binary-preview.eps.newxmp rename to test/data/eps/eps-flat_photoshop-cs5-binary-pre.eps.newxmp diff --git a/test/data/eps/eps-flat_photoshop-cs5-binary-preview.xmp b/test/data/eps/eps-flat_photoshop-cs5-binary-pre.xmp similarity index 100% rename from test/data/eps/eps-flat_photoshop-cs5-binary-preview.xmp rename to test/data/eps/eps-flat_photoshop-cs5-binary-pre.xmp diff --git a/test/data/eps/eps-nested_noxmp_oodraw-lev2-preview.eps b/test/data/eps/eps-nested_noxmp_oodraw-lev2-pre.eps similarity index 100% rename from test/data/eps/eps-nested_noxmp_oodraw-lev2-preview.eps rename to test/data/eps/eps-nested_noxmp_oodraw-lev2-pre.eps diff --git a/test/data/eps/eps-nested_xmp_oodraw-lev2-preview.eps b/test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps similarity index 100% rename from test/data/eps/eps-nested_xmp_oodraw-lev2-preview.eps rename to test/data/eps/eps-nested_xmp_oodraw-lev2-pre.eps diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out index dcb8bb56..162dcec2 100644 --- a/test/data/eps/eps-test.out +++ b/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 diff --git a/test/data/exiv2-preview-in-xmp.xmp b/test/data/exiv2-pre-in-xmp.xmp similarity index 100% rename from test/data/exiv2-preview-in-xmp.xmp rename to test/data/exiv2-pre-in-xmp.xmp diff --git a/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-pre-preview1.tif similarity index 100% rename from test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-pre-preview1.tif diff --git a/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-pre-preview2.jpg similarity index 100% rename from test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-pre-preview2.jpg diff --git a/test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg b/test/data/preview/eps-flat_photoshop-cs5-ascii-colorprofile-preview1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c242c3aaf53a7a2e319a05f9d2bbf25ba6aa3748 GIT binary patch literal 854 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 literal 0 HcmV?d00001 diff --git a/test/data/preview/eps-flat_photoshop-cs5-binary-pre-preview1.jpg b/test/data/preview/eps-flat_photoshop-cs5-binary-pre-preview1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c242c3aaf53a7a2e319a05f9d2bbf25ba6aa3748 GIT binary patch literal 854 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 literal 0 HcmV?d00001 diff --git a/test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.tif b/test/data/preview/eps-flat_photoshop-e9-win-doseps-preview2.tif similarity index 100% rename from test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.tif rename to test/data/preview/eps-flat_photoshop-e9-win-doseps-preview2.tif diff --git a/test/data/preview/eps-flat_photoshop-e9-win-preview1.jpg b/test/data/preview/eps-flat_photoshop-e9-win-preview1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a01f74530c4eb27a5bc352863e36d32662c7e0c2 GIT binary patch literal 2252 zcmbuA2~?BE7RM(E1TY~G0T)D~5TuHL$Rf6o2nYzMD7);>uv9@T2`XEPls@CLRw@*5 zD-nTEmS7PiER88>NXw=o2_VQ8C9JYY0>*^zMcVh?sps^(_VmsF(m@0$^|e4k#LcW&qkD;`H&zFsDNR2E7KD)d)nK2S5?`gD(MERaI3@6|JU* z#-i4susRxOw1&L`>tMqLww(bUFZFxu}OM*G(x*grD? z^b^3Uf<$l|0W$z_EDV8#K`($3SOYzR5fzlmuvJq4zc++pb4toc6;-u0DA=$+RLN24WMKC7WDmsUVfDR}r>atW{DF#2aWS z?@qs}{hpx7>*<^&{`d&_i!3K^9TLTA-U#^~KxLbCbC&|5aD9ZcuT4Va=zkIZn85gd z2+(tYMy#%h1wdW>QJg!R7wp$C+MU< zX^2XhJK4^tHto`XXU=>~>9r3l2qNy)u$)|4ZW&*eM2Cx6Vim70(UVcpkLinSU9z*d zcZSms0cWXmp~eM7rglmDDA#UY$VJ~u3DYP`)!TK9S9<#p;Zm09K{55@X+h|l%Y9V|CwN%!;Rk8HbFHpw6wUw7`!dX z^_s`%bZ?$ucM!%JctOz;n;o{q75_J!QO=_C8qsp2l-s>PraZWN=B9ez3){xX%1>?u z@{-rzYa=!%`%U*ni=>zGH6V~9n_a#u$2z96XW6m?V*V`BZqPFuQ%79>+#~GY5OQ~2|8Knt`6>qQGpJT|wtBb>)ooc28&K~VFy2Igi8+!JEHaH>VsyT(Qi7u_JKlnOZc}?xK z1Ss;EPa+dSTxBG=Pcx626M4Du{EhMAN+aG9)p5w3Gs8Z4Cal~ZRT0=P&E2%yl;otl z5Ui)GcD93GPrtRa<+$8kT6%G2aj_NkV=Qv0aR$jROR97-GYgKsKp}+c4`GOLwxY?= zx5ZP(9&S10S3E}KW*+SPxpR^jNI5p4w;<`-avlPHk855Av^2`rfB(GCUmkz7u{>cV zbH&>7P4d?dF4$IBaboD@-xq$`?;V>gR?fLD4w`&@)?;B|ZhNCauT8)_{wFkUG4L|M z_)03zBF_$QA!<&FM{lzWsFKj)~O@T@4j!9Gcu8gQ?xZ4ot+9MfM<3U>8h=z{dE@5?XUUMHV9Vd`|SW z*t3y^iH}XkPNeN7N;YjB=@vC>tQK)G<)crdp{l9yF|Cg!-VxPR$Qhdo|(ckKzzJCLxmlZSs literal 0 HcmV?d00001 diff --git a/test/data/preview/eps-flat_photoshop-e9-win_exiv2-preview1.jpg b/test/data/preview/eps-flat_photoshop-e9-win_exiv2-preview1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a01f74530c4eb27a5bc352863e36d32662c7e0c2 GIT binary patch literal 2252 zcmbuA2~?BE7RM(E1TY~G0T)D~5TuHL$Rf6o2nYzMD7);>uv9@T2`XEPls@CLRw@*5 zD-nTEmS7PiER88>NXw=o2_VQ8C9JYY0>*^zMcVh?sps^(_VmsF(m@0$^|e4k#LcW&qkD;`H&zFsDNR2E7KD)d)nK2S5?`gD(MERaI3@6|JU* z#-i4susRxOw1&L`>tMqLww(bUFZFxu}OM*G(x*grD? z^b^3Uf<$l|0W$z_EDV8#K`($3SOYzR5fzlmuvJq4zc++pb4toc6;-u0DA=$+RLN24WMKC7WDmsUVfDR}r>atW{DF#2aWS z?@qs}{hpx7>*<^&{`d&_i!3K^9TLTA-U#^~KxLbCbC&|5aD9ZcuT4Va=zkIZn85gd z2+(tYMy#%h1wdW>QJg!R7wp$C+MU< zX^2XhJK4^tHto`XXU=>~>9r3l2qNy)u$)|4ZW&*eM2Cx6Vim70(UVcpkLinSU9z*d zcZSms0cWXmp~eM7rglmDDA#UY$VJ~u3DYP`)!TK9S9<#p;Zm09K{55@X+h|l%Y9V|CwN%!;Rk8HbFHpw6wUw7`!dX z^_s`%bZ?$ucM!%JctOz;n;o{q75_J!QO=_C8qsp2l-s>PraZWN=B9ez3){xX%1>?u z@{-rzYa=!%`%U*ni=>zGH6V~9n_a#u$2z96XW6m?V*V`BZqPFuQ%79>+#~GY5OQ~2|8Knt`6>qQGpJT|wtBb>)ooc28&K~VFy2Igi8+!JEHaH>VsyT(Qi7u_JKlnOZc}?xK z1Ss;EPa+dSTxBG=Pcx626M4Du{EhMAN+aG9)p5w3Gs8Z4Cal~ZRT0=P&E2%yl;otl z5Ui)GcD93GPrtRa<+$8kT6%G2aj_NkV=Qv0aR$jROR97-GYgKsKp}+c4`GOLwxY?= zx5ZP(9&S10S3E}KW*+SPxpR^jNI5p4w;<`-avlPHk855Av^2`rfB(GCUmkz7u{>cV zbH&>7P4d?dF4$IBaboD@-xq$`?;V>gR?fLD4w`&@)?;B|ZhNCauT8)_{wFkUG4L|M z_)03zBF_$QA!<&FM{lzWsFKj)~O@T@4j!9Gcu8gQ?xZ4ot+9MfM<3U>8h=z{dE@5?XUUMHV9Vd`|SW z*t3y^iH}XkPNeN7N;YjB=@vC>tQK)G<)crdp{l9yF|Cg!-VxPR$Qhdo|(ckKzzJCLxmlZSs literal 0 HcmV?d00001 diff --git a/test/data/preview/exiv2-preview-in-xmp-preview1.jpg b/test/data/preview/exiv2-pre-in-xmp-preview1.jpg similarity index 100% rename from test/data/preview/exiv2-preview-in-xmp-preview1.jpg rename to test/data/preview/exiv2-pre-in-xmp-preview1.jpg diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out index 07683061..6cddcc15 100644 --- a/test/data/preview/preview-test.out +++ b/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 <----- diff --git a/test/preview-test.sh b/test/preview-test.sh index f763de18..15be03d5 100755 --- a/test/preview-test.sh +++ b/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 \