diff --git a/config/Makefile.in b/config/Makefile.in index 1926a380..20dfddd6 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -71,7 +71,6 @@ samples: config/config.mk cd samples && $(MAKE) $(MAKECMDGOALS) tests: - cd test && $(MAKE) teste && cd .. cd test && $(MAKE) test teste testx testv: diff --git a/src/basicio.cpp b/src/basicio.cpp index df4b7c3d..65c75004 100644 --- a/src/basicio.cpp +++ b/src/basicio.cpp @@ -61,6 +61,8 @@ EXIV2_RCSID("@(#) $Id$") #endif #if EXV_USE_SSH == 1 #include "ssh.hpp" +#else +#define mode_t unsigned short #endif // Platform specific headers for handling extended attributes (xattr) @@ -69,10 +71,7 @@ EXIV2_RCSID("@(#) $Id$") #endif #if defined WIN32 && !defined __CYGWIN__ -// Windows doesn't provide mode_t, nlink_t -#ifndef EXV_USE_SSH -typedef unsigned short mode_t; -#endif +// Windows doesn't provide nlink_t typedef short nlink_t; # include @@ -124,12 +123,8 @@ namespace Exiv2 { // TYPES //! Simple struct stat wrapper for internal use struct StructStat { -#if EXV_USE_SSH == 1 StructStat() : st_mode(0), st_size(0), st_nlink(0) {} mode_t st_mode; //!< Permissions -#else - StructStat() : st_size(0), st_nlink(0) {} -#endif off_t st_size; //!< Size nlink_t st_nlink; //!< Number of hard links (broken on Windows, see winNumberOfLinks()) }; @@ -261,9 +256,7 @@ namespace Exiv2 { if (0 == ret) { buf.st_size = st.st_size; buf.st_nlink = st.st_nlink; -#if EXV_USE_SSH == 1 buf.st_mode = st.st_mode; -#endif } } return ret; @@ -688,9 +681,7 @@ namespace Exiv2 { close(); bool statOk = true; -#if EXV_USE_SSH == 1 mode_t origStMode = 0; -#endif std::string spf; char* pf = 0; #ifdef EXV_UNICODE_PATH @@ -720,9 +711,7 @@ namespace Exiv2 { EXV_WARNING << Error(2, pf, strError(), "::lstat") << "\n"; #endif } -#if EXV_USE_SSH == 1 origStMode = buf1.st_mode; -#endif DataBuf lbuf; // So that the allocated memory is freed. Must have same scope as pf // In case path() is a symlink, get the path of the linked-to file if (statOk && S_ISLNK(buf1.st_mode)) { @@ -739,18 +728,14 @@ namespace Exiv2 { EXV_WARNING << Error(2, pf, strError(), "::stat") << "\n"; #endif } -#if EXV_USE_SSH == 1 origStMode = buf1.st_mode; -#endif } #else // EXV_HAVE_LSTAT Impl::StructStat buf1; if (p_->stat(buf1) == -1) { statOk = false; } -#if EXV_USE_SSH == 1 origStMode = buf1.st_mode; -#endif #endif // !EXV_HAVE_LSTAT // MSVCRT rename that does not overwrite existing files @@ -874,7 +859,6 @@ namespace Exiv2 { EXV_WARNING << Error(2, pf, strError(), "::stat") << "\n"; #endif } -#if EXV_USE_SSH == 1 if (statOk && origStMode != buf2.st_mode) { // Set original file permissions if (::chmod(pf, origStMode) == -1) { @@ -883,7 +867,6 @@ namespace Exiv2 { #endif } } -#endif } } // if (fileIo) else { @@ -2371,7 +2354,6 @@ namespace Exiv2 { #endif - #if EXV_USE_SSH == 1 //! Internal Pimpl structure of class RemoteIo. class SshIo::SshImpl : public Impl { diff --git a/src/svn_version.sh b/src/svn_version.sh index d6c0a946..df91144b 100755 --- a/src/svn_version.sh +++ b/src/svn_version.sh @@ -5,8 +5,17 @@ ## svn_version_h=svn_version.h -svn_version=$(svn info .. 2>/dev/null | grep ^Revision | cut -f 2 -d' ') -if [ -z "$svn_version" ]; then svn_version=0 ; fi +svn_version=$(svn info .. 2>/dev/null) + +## +# from Jenkins, svn is almost always a disaster because +# Jenkins SVN Jenkins is 1.7 and the build machine is normally at least 1.8 +if [ $? == 0 ]; then + svn_version=$(echo $svn_version | grep ^Revision | cut -f 2 -d' ') + if [ -z "$svn_version" ]; then svn_version=0 ; fi +else + svn_version=0 +fi ## # report svn_version to output @@ -22,7 +31,7 @@ if [ -e "$svn_version_h" ]; then fi ## -# write svn_version to file if necessary +# write svn_version to file if [ ! -e "$svn_version_h" ]; then echo "#ifndef SVN_VERSION" > "$svn_version_h" echo "#define SVN_VERSION $svn_version" >> "$svn_version_h" diff --git a/test/Makefile b/test/Makefile index c5a4e0c2..e58a988c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -58,7 +58,7 @@ SHELL = /bin/sh ## # to save download time for simple build/test, we download video and eps data on demand -SVN = svn://dev.exiv2.org/svn/testdata/trunk +SVN = svn://dev.exiv2.org/svn/testdata/trunk ## # Add test drivers to this list @@ -79,11 +79,13 @@ TESTS = addmoddel.sh \ xmpparser-test.sh \ conversions.sh TESTV = video-test.sh -TESTE = eps-test.sh +TESTE = eps-test.sh \ + eps-preview-test.sh + TESTVW = write-video-test.sh -TESTX = httpiotest.sh \ - curliotest.sh \ - sshiotest.sh +TESTX = httpiotest.sh \ + curliotest.sh \ + sshiotest.sh tests: cd .. ; make tests diff --git a/test/data/preview/eps-preview-test.out b/test/data/preview/eps-preview-test.out new file mode 100644 index 00000000..7fb367c9 --- /dev/null +++ b/test/data/preview/eps-preview-test.out @@ -0,0 +1,522 @@ + +-----> eps-flat_coreldraw-x3-lev2.eps <----- + +Command: exiv2 -pp eps-flat_coreldraw-x3-lev2.eps +Preview 1: image/tiff, 1164x1054 pixels, 1229768 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_coreldraw-x3-lev2.eps +Exit code: 0 + +-----> eps-flat_coreldraw-x5-lev2.eps <----- + +Command: exiv2 -pp eps-flat_coreldraw-x5-lev2.eps +Preview 1: image/tiff, 422x348 pixels, 152914 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_coreldraw-x5-lev2.eps +Exit code: 0 + +-----> eps-flat_inkscape-epsi.eps <----- + +Command: exiv2 -pp eps-flat_inkscape-epsi.eps +Exiv2 exception in print action for file eps-flat_inkscape-epsi.eps: +eps-flat_inkscape-epsi.eps: The file contains data of an unknown image type +Exit code: 1 + +Command: exiv2 -f -ep eps-flat_inkscape-epsi.eps +Exiv2 exception in extract action for file eps-flat_inkscape-epsi.eps: +eps-flat_inkscape-epsi.eps: The file contains data of an unknown image type +Exit code: 1 + +-----> eps-flat_oodraw_ai-10-lev2.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-10-lev2.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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-8-lev3.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-8-lev3.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev3.eps +Exit code: 0 + +-----> eps-flat_oodraw_ai-9-lev2.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-9-lev2.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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-cs-lev2.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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_oodraw_ai-cs2-lev2.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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-pre.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-pre.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: image/tiff, 213x170 pixels, 37902 bytes +Preview 3: image/jpeg, 256x208 pixels, 3166 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-pre.eps +Exit code: 0 + +-----> eps-flat_oodraw_ai-cs5-lev3.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: 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_exiftool-8.56.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_exiftool-8.56.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_exiftool-8.56.eps +Exit code: 0 + +-----> eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps <----- + +Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps +Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes +Preview 2: image/jpeg, 256x208 pixels, 3166 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps +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-pre.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-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-pre.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-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 +Exit code: 0 + +-----> eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps <----- + +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-pre.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-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 +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 +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 +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 +Exit code: 0 + +-----> eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps <----- + +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 +Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560 +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 +Exit code: 0 + +-----> eps-flat_photoshop-e9-win-doseps.eps <----- + +Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps +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 +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 +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 +Exit code: 0 + +-----> eps-nested_noxmp_ai-8-lev2.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_ai-8-lev2.eps +Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_ai-8-lev2.eps +Exit code: 0 + +-----> eps-nested_noxmp_ai-8-lev3.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_ai-8-lev3.eps +Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_ai-8-lev3.eps +Exit code: 0 + +-----> eps-nested_noxmp_ai-cs5-lev2.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_ai-cs5-lev2.eps +Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes +Preview 2: image/jpeg, 176x256 pixels, 3555 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_ai-cs5-lev2.eps +Exit code: 0 + +-----> eps-nested_noxmp_ai-cs5-lev3.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_ai-cs5-lev3.eps +Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes +Preview 2: image/jpeg, 176x256 pixels, 3555 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_ai-cs5-lev3.eps +Exit code: 0 + +-----> eps-nested_noxmp_indesign-cs5-lev2-bin.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev2-bin.eps +Preview 1: image/tiff, 595x841 pixels, 8124 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev2-bin.eps +Exit code: 0 + +-----> eps-nested_noxmp_indesign-cs5-lev2.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev2.eps +Preview 1: image/tiff, 595x841 pixels, 8124 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev2.eps +Exit code: 0 + +-----> eps-nested_noxmp_indesign-cs5-lev3-bin.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev3-bin.eps +Preview 1: image/tiff, 595x841 pixels, 8124 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev3-bin.eps +Exit code: 0 + +-----> eps-nested_noxmp_indesign-cs5-lev3.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev3.eps +Preview 1: image/tiff, 595x841 pixels, 8124 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev3.eps +Exit code: 0 + +-----> eps-nested_noxmp_oodraw-lev2-epsi.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-epsi.eps +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-epsi.eps +Exit code: 0 + +-----> eps-nested_noxmp_oodraw-lev2-pre.eps <----- + +Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-pre.eps +Preview 1: image/tiff, 719x1048 pixels, 14236 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-pre.eps +Exit code: 0 + +-----> eps-nested_xmp_ai-3-lev3.eps <----- + +Command: exiv2 -pp eps-nested_xmp_ai-3-lev3.eps +Preview 1: image/tiff, 100x100 pixels, 11692 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_ai-3-lev3.eps +Exit code: 0 + +-----> eps-nested_xmp_ai-8-lev3.eps <----- + +Command: exiv2 -pp eps-nested_xmp_ai-8-lev3.eps +Preview 1: image/tiff, 100x100 pixels, 22300 bytes +Preview 2: image/x-portable-anymap, 128x128 pixels, 49167 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_ai-8-lev3.eps +Exit code: 0 + +-----> eps-nested_xmp_ai-cs5-lev3.eps <----- + +Command: exiv2 -pp eps-nested_xmp_ai-cs5-lev3.eps +Preview 1: image/tiff, 100x100 pixels, 22300 bytes +Preview 2: image/x-portable-anymap, 128x128 pixels, 49167 bytes +Preview 3: image/jpeg, 256x256 pixels, 4276 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_ai-cs5-lev3.eps +Exit code: 0 + +-----> eps-nested_xmp_indesign-cs5-lev3-bin.eps <----- + +Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3-bin.eps +Preview 1: image/tiff, 595x841 pixels, 8080 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3-bin.eps +Exit code: 0 + +-----> eps-nested_xmp_indesign-cs5-lev3.eps <----- + +Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3.eps +Preview 1: image/tiff, 595x841 pixels, 8080 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3.eps +Exit code: 0 + +-----> eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps <----- + +Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps +Warning: Unable to find XMP embedding trailer ending at position: 186519 +Preview 1: image/tiff, 595x841 pixels, 8076 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps +Warning: Unable to find XMP embedding trailer ending at position: 186519 +Exit code: 0 + +-----> eps-nested_xmp_oodraw-lev2-epsi.eps <----- + +Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-epsi.eps +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-epsi.eps +Exit code: 0 + +-----> eps-nested_xmp_oodraw-lev2-pre.eps <----- + +Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-pre.eps +Preview 1: image/tiff, 719x1048 pixels, 14476 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-pre.eps +Exit code: 0 + +-----> eps-old-r2872_01.eps <----- + +Command: exiv2 -pp eps-old-r2872_01.eps +Preview 1: image/jpeg, 37x47 pixels, 854 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-old-r2872_01.eps +Exit code: 0 + +-----> eps-old-r2872_02.eps <----- + +Command: exiv2 -pp eps-old-r2872_02.eps +Preview 1: image/jpeg, 37x47 pixels, 854 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-old-r2872_02.eps +Exit code: 0 + +-----> eps-old-r2872_03.eps <----- + +Command: exiv2 -pp eps-old-r2872_03.eps +Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396 +Preview 1: image/jpeg, 37x47 pixels, 854 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-old-r2872_03.eps +Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396 +Exit code: 0 + +-----> eps-old-r2872_04.eps <----- + +Command: exiv2 -pp eps-old-r2872_04.eps +Preview 1: image/jpeg, 160x120 pixels, 2252 bytes +Exit code: 0 + +Command: exiv2 -f -ep eps-old-r2872_04.eps +Exit code: 0 diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out index e3f05ae8..f7fe2d0b 100644 --- a/test/data/preview/preview-test.out +++ b/test/data/preview/preview-test.out @@ -1,526 +1,4 @@ ------> eps-flat_coreldraw-x3-lev2.eps <----- - -Command: exiv2 -pp eps-flat_coreldraw-x3-lev2.eps -Preview 1: image/tiff, 1164x1054 pixels, 1229768 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_coreldraw-x3-lev2.eps -Exit code: 0 - ------> eps-flat_coreldraw-x5-lev2.eps <----- - -Command: exiv2 -pp eps-flat_coreldraw-x5-lev2.eps -Preview 1: image/tiff, 422x348 pixels, 152914 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_coreldraw-x5-lev2.eps -Exit code: 0 - ------> eps-flat_inkscape-epsi.eps <----- - -Command: exiv2 -pp eps-flat_inkscape-epsi.eps -Exiv2 exception in print action for file eps-flat_inkscape-epsi.eps: -eps-flat_inkscape-epsi.eps: The file contains data of an unknown image type -Exit code: 1 - -Command: exiv2 -f -ep eps-flat_inkscape-epsi.eps -Exiv2 exception in extract action for file eps-flat_inkscape-epsi.eps: -eps-flat_inkscape-epsi.eps: The file contains data of an unknown image type -Exit code: 1 - ------> eps-flat_oodraw_ai-10-lev2.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-10-lev2.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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-8-lev3.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-8-lev3.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev3.eps -Exit code: 0 - ------> eps-flat_oodraw_ai-9-lev2.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-9-lev2.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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-cs-lev2.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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_oodraw_ai-cs2-lev2.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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-pre.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-pre.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: image/tiff, 213x170 pixels, 37902 bytes -Preview 3: image/jpeg, 256x208 pixels, 3166 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-pre.eps -Exit code: 0 - ------> eps-flat_oodraw_ai-cs5-lev3.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: 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_exiftool-8.56.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_exiftool-8.56.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_exiftool-8.56.eps -Exit code: 0 - ------> eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps <----- - -Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps -Preview 1: image/x-portable-anymap, 128x104 pixels, 39951 bytes -Preview 2: image/jpeg, 256x208 pixels, 3166 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_ns-xapGImg.eps -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-pre.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-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-pre.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-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 -Exit code: 0 - ------> eps-flat_photoshop-cs5-ascii_failure-bigxmp.eps <----- - -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-pre.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-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 -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 -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 -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 -Exit code: 0 - ------> eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps <----- - -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 -Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560 -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 -Exit code: 0 - ------> eps-flat_photoshop-e9-win-doseps.eps <----- - -Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps -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 -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 -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 -Exit code: 0 - ------> eps-nested_noxmp_ai-8-lev2.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_ai-8-lev2.eps -Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_ai-8-lev2.eps -Exit code: 0 - ------> eps-nested_noxmp_ai-8-lev3.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_ai-8-lev3.eps -Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_ai-8-lev3.eps -Exit code: 0 - ------> eps-nested_noxmp_ai-cs5-lev2.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_ai-cs5-lev2.eps -Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes -Preview 2: image/jpeg, 176x256 pixels, 3555 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_ai-cs5-lev2.eps -Exit code: 0 - ------> eps-nested_noxmp_ai-cs5-lev3.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_ai-cs5-lev3.eps -Preview 1: image/x-portable-anymap, 88x128 pixels, 33806 bytes -Preview 2: image/jpeg, 176x256 pixels, 3555 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_ai-cs5-lev3.eps -Exit code: 0 - ------> eps-nested_noxmp_indesign-cs5-lev2-bin.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev2-bin.eps -Preview 1: image/tiff, 595x841 pixels, 8124 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev2-bin.eps -Exit code: 0 - ------> eps-nested_noxmp_indesign-cs5-lev2.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev2.eps -Preview 1: image/tiff, 595x841 pixels, 8124 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev2.eps -Exit code: 0 - ------> eps-nested_noxmp_indesign-cs5-lev3-bin.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev3-bin.eps -Preview 1: image/tiff, 595x841 pixels, 8124 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev3-bin.eps -Exit code: 0 - ------> eps-nested_noxmp_indesign-cs5-lev3.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_indesign-cs5-lev3.eps -Preview 1: image/tiff, 595x841 pixels, 8124 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_indesign-cs5-lev3.eps -Exit code: 0 - ------> eps-nested_noxmp_oodraw-lev2-epsi.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-epsi.eps -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-epsi.eps -Exit code: 0 - ------> eps-nested_noxmp_oodraw-lev2-pre.eps <----- - -Command: exiv2 -pp eps-nested_noxmp_oodraw-lev2-pre.eps -Preview 1: image/tiff, 719x1048 pixels, 14236 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_noxmp_oodraw-lev2-pre.eps -Exit code: 0 - ------> eps-nested_xmp_ai-3-lev3.eps <----- - -Command: exiv2 -pp eps-nested_xmp_ai-3-lev3.eps -Preview 1: image/tiff, 100x100 pixels, 11692 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_ai-3-lev3.eps -Exit code: 0 - ------> eps-nested_xmp_ai-8-lev3.eps <----- - -Command: exiv2 -pp eps-nested_xmp_ai-8-lev3.eps -Preview 1: image/tiff, 100x100 pixels, 22300 bytes -Preview 2: image/x-portable-anymap, 128x128 pixels, 49167 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_ai-8-lev3.eps -Exit code: 0 - ------> eps-nested_xmp_ai-cs5-lev3.eps <----- - -Command: exiv2 -pp eps-nested_xmp_ai-cs5-lev3.eps -Preview 1: image/tiff, 100x100 pixels, 22300 bytes -Preview 2: image/x-portable-anymap, 128x128 pixels, 49167 bytes -Preview 3: image/jpeg, 256x256 pixels, 4276 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_ai-cs5-lev3.eps -Exit code: 0 - ------> eps-nested_xmp_indesign-cs5-lev3-bin.eps <----- - -Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3-bin.eps -Preview 1: image/tiff, 595x841 pixels, 8080 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3-bin.eps -Exit code: 0 - ------> eps-nested_xmp_indesign-cs5-lev3.eps <----- - -Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3.eps -Preview 1: image/tiff, 595x841 pixels, 8080 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3.eps -Exit code: 0 - ------> eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps <----- - -Command: exiv2 -pp eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps -Warning: Unable to find XMP embedding trailer ending at position: 186519 -Preview 1: image/tiff, 595x841 pixels, 8076 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps -Warning: Unable to find XMP embedding trailer ending at position: 186519 -Exit code: 0 - ------> eps-nested_xmp_oodraw-lev2-epsi.eps <----- - -Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-epsi.eps -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-epsi.eps -Exit code: 0 - ------> eps-nested_xmp_oodraw-lev2-pre.eps <----- - -Command: exiv2 -pp eps-nested_xmp_oodraw-lev2-pre.eps -Preview 1: image/tiff, 719x1048 pixels, 14476 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-nested_xmp_oodraw-lev2-pre.eps -Exit code: 0 - ------> eps-old-r2872_01.eps <----- - -Command: exiv2 -pp eps-old-r2872_01.eps -Preview 1: image/jpeg, 37x47 pixels, 854 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-old-r2872_01.eps -Exit code: 0 - ------> eps-old-r2872_02.eps <----- - -Command: exiv2 -pp eps-old-r2872_02.eps -Preview 1: image/jpeg, 37x47 pixels, 854 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-old-r2872_02.eps -Exit code: 0 - ------> eps-old-r2872_03.eps <----- - -Command: exiv2 -pp eps-old-r2872_03.eps -Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396 -Preview 1: image/jpeg, 37x47 pixels, 854 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-old-r2872_03.eps -Warning: Missing %begin_xml_packet in Photoshop EPS at position: 1396 -Exit code: 0 - ------> eps-old-r2872_04.eps <----- - -Command: exiv2 -pp eps-old-r2872_04.eps -Preview 1: image/jpeg, 160x120 pixels, 2252 bytes -Exit code: 0 - -Command: exiv2 -f -ep eps-old-r2872_04.eps -Exit code: 0 - -----> exiv2-bug443.jpg <----- Command: exiv2 -pp exiv2-bug443.jpg diff --git a/test/eps-preview-test.sh b/test/eps-preview-test.sh new file mode 100755 index 00000000..6fde07e3 --- /dev/null +++ b/test/eps-preview-test.sh @@ -0,0 +1,106 @@ +#!/bin/bash +# Test driver for previews + +source ./functions.source + +( cd "$testdir" + + images="eps/eps-flat_coreldraw-x3-lev2.eps \ + eps/eps-flat_coreldraw-x5-lev2.eps \ + eps/eps-flat_inkscape-epsi.eps \ + eps/eps-flat_oodraw_ai-10-lev2.eps \ + eps/eps-flat_oodraw_ai-8-lev2.eps \ + eps/eps-flat_oodraw_ai-8-lev3.eps \ + eps/eps-flat_oodraw_ai-9-lev2.eps \ + eps/eps-flat_oodraw_ai-cs-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-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-pre.eps \ + eps/eps-flat_photoshop-cs5-ascii.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-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 \ + eps/eps-flat_photoshop-cs5-binary_exiv2.eps \ + eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps \ + eps/eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps \ + eps/eps-flat_photoshop-e9-win-doseps.eps \ + eps/eps-flat_photoshop-e9-win.eps \ + eps/eps-flat_photoshop-e9-win_exiv2.eps \ + eps/eps-nested_noxmp_ai-8-lev2.eps \ + eps/eps-nested_noxmp_ai-8-lev3.eps \ + eps/eps-nested_noxmp_ai-cs5-lev2.eps \ + eps/eps-nested_noxmp_ai-cs5-lev3.eps \ + eps/eps-nested_noxmp_indesign-cs5-lev2-bin.eps \ + eps/eps-nested_noxmp_indesign-cs5-lev2.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-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 \ + eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps \ + eps/eps-nested_xmp_indesign-cs5-lev3.eps \ + eps/eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps \ + eps/eps-nested_xmp_oodraw-lev2-epsi.eps \ + eps/eps-nested_xmp_oodraw-lev2-pre.eps \ + eps/eps-old-r2872_01.eps \ + eps/eps-old-r2872_02.eps \ + eps/eps-old-r2872_03.eps \ + eps/eps-old-r2872_04.eps" + + 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" + runTest exiv2 -pp "$filename" + exitcode=$? + echo "Exit code: $exitcode" + + rm -f "$image-preview"* + + echo + echo "Command: exiv2 -f -ep $filename" + runTest exiv2 -f -ep "$filename" + echo "Exit code: $?" + + runTest exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do + diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."* + done + done + +) 3>&1 > "$testdir/eps-preview-test.out" 2>&1 + +echo "." + +# ---------------------------------------------------------------------- +# Result +if ! diff -q $diffargs "$testdir/$datadir/preview/eps-preview-test.out" "$testdir/eps-preview-test.out" ; then + diff -u $diffargs "$testdir/$datadir/preview/eps-preview-test.out" "$testdir/eps-preview-test.out" + exit 1 +fi +echo "All testcases passed." + +# That's all Folks! +## \ No newline at end of file diff --git a/test/eps-test.sh b/test/eps-test.sh index 85ff8efb..41909ea8 100755 --- a/test/eps-test.sh +++ b/test/eps-test.sh @@ -13,6 +13,10 @@ source ./functions.source echo "Error: Unable to determine Exiv2 version" exit 1 fi + if [ ! -d $datadir/eps/ ]; then + echo "Error: $datadir/eps/ does not exist" + exit 1 + fi ## # ensure that no data file is already stamped with the current version @@ -55,7 +59,7 @@ source ./functions.source # using perl instead of sed, because on some systems sed adds a line ending at EOF perl -pe "s,_Exiv2Version_,$exiv2version," < "$datadir/eps/$image.eps.delxmp" > "$image.eps.delxmp" - if ! diff -q "$image.eps.delxmp" "$image.eps" ; then + if ! diff -q $diffargs "$image.eps.delxmp" "$image.eps" ; then continue fi @@ -68,7 +72,7 @@ source ./functions.source runTest exiv2 -f -ex "$image.eps" echo "Exit code: $?" - if ! diff -q "$datadir/eps/eps-test-delxmp.exv" "$image.exv" ; then + if ! diff -q $diffargs "$datadir/eps/eps-test-delxmp.exv" "$image.exv" ; then continue fi fi @@ -82,7 +86,7 @@ source ./functions.source runTest exiv2 -f -eX "$image.eps" echo "Exit code: $?" - diff -q "$datadir/eps/$image.xmp" "$image.xmp" + diff -q $diffargs "$datadir/eps/$image.xmp" "$image.xmp" # Using "-ix" instead of "-iX" because the latter # executes writeMetadata() twice, making it hard to debug. @@ -102,7 +106,7 @@ source ./functions.source # using perl instead of sed, because on some systems sed adds a line ending at EOF perl -pe "s,_Exiv2Version_,$exiv2version," < "$datadir/eps/$image.eps.newxmp" > "$image.eps.newxmp" - if ! diff -q "$image.eps.newxmp" "$image.eps" ; then + if ! diff -q $diffargs "$image.eps.newxmp" "$image.eps" ; then continue fi @@ -111,7 +115,7 @@ source ./functions.source runTest exiv2 -ix "$image.eps" echo "Exit code: $?" - diff -q "$image.eps.newxmp" "$image.eps" + diff -q $diffargs "$image.eps.newxmp" "$image.eps" # Ensure that "exiv2 -ex" won't merge metadata into the # *.exv file generated by a previous run of the test suite. @@ -122,7 +126,7 @@ source ./functions.source runTest exiv2 -f -ex "$image.eps" echo "Exit code: $?" - diff -q "$datadir/eps/eps-test-newxmp.exv" "$image.exv" + diff -q $diffargs "$datadir/eps/eps-test-newxmp.exv" "$image.exv" done ) 3>&1 > "$testdir/eps-test.out" 2>&1 diff --git a/test/preview-test.sh b/test/preview-test.sh index cd6d0bd7..49ad58a1 100755 --- a/test/preview-test.sh +++ b/test/preview-test.sh @@ -5,62 +5,7 @@ source ./functions.source ( cd "$testdir" - images="eps/eps-flat_coreldraw-x3-lev2.eps \ - eps/eps-flat_coreldraw-x5-lev2.eps \ - eps/eps-flat_inkscape-epsi.eps \ - eps/eps-flat_oodraw_ai-10-lev2.eps \ - eps/eps-flat_oodraw_ai-8-lev2.eps \ - eps/eps-flat_oodraw_ai-8-lev3.eps \ - eps/eps-flat_oodraw_ai-9-lev2.eps \ - eps/eps-flat_oodraw_ai-cs-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-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-pre.eps \ - eps/eps-flat_photoshop-cs5-ascii.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-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 \ - eps/eps-flat_photoshop-cs5-binary_exiv2.eps \ - eps/eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps \ - eps/eps-flat_photoshop-cs5-binary_no-adocontainsxmp.eps \ - eps/eps-flat_photoshop-e9-win-doseps.eps \ - eps/eps-flat_photoshop-e9-win.eps \ - eps/eps-flat_photoshop-e9-win_exiv2.eps \ - eps/eps-nested_noxmp_ai-8-lev2.eps \ - eps/eps-nested_noxmp_ai-8-lev3.eps \ - eps/eps-nested_noxmp_ai-cs5-lev2.eps \ - eps/eps-nested_noxmp_ai-cs5-lev3.eps \ - eps/eps-nested_noxmp_indesign-cs5-lev2-bin.eps \ - eps/eps-nested_noxmp_indesign-cs5-lev2.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-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 \ - eps/eps-nested_xmp_indesign-cs5-lev3-bin.eps \ - eps/eps-nested_xmp_indesign-cs5-lev3.eps \ - eps/eps-nested_xmp_indesign-cs5-lev3_failure-exiftool-8.56.eps \ - eps/eps-nested_xmp_oodraw-lev2-epsi.eps \ - eps/eps-nested_xmp_oodraw-lev2-pre.eps \ - eps/eps-old-r2872_01.eps \ - eps/eps-old-r2872_02.eps \ - eps/eps-old-r2872_03.eps \ - eps/eps-old-r2872_04.eps \ - exiv2-bug443.jpg \ + images="exiv2-bug443.jpg \ exiv2-bug444.jpg \ exiv2-bug445.jpg \ exiv2-bug447.jpg \ @@ -122,7 +67,7 @@ source ./functions.source echo "Exit code: $?" runTest 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."* + diff $diffargs -q "../data/preview/$image-preview$preview."* "$image-preview$preview."* done done