From b8021f4517f604fa9a53bef53fad3c74463d3776 Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Thu, 22 Sep 2016 20:58:58 +0000 Subject: [PATCH] #1074 Correction to r4540. Rollback changes to actions.cpp which should not have been submitted. Resubmitted test/data/icc-test.out --- src/actions.cpp | 9 +-------- test/data/icc-test.out | 2 -- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/actions.cpp b/src/actions.cpp index e3376721..0e74e5cf 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -270,14 +270,7 @@ namespace Action { } Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(path_); assert(image.get() != 0); - if ( option == Exiv2::kpsIccProfile ) { - image->readMetadata(); - if ( image->iccProfileDefined() ) { - out.write((const char*)image->iccProfile()->pData_,image->iccProfile()->size_); - } - } else { - image->printStructure(out,option); - } + image->printStructure(out,option); return 0; } diff --git a/test/data/icc-test.out b/test/data/icc-test.out index fdb85de5..fdff3b12 100644 --- a/test/data/icc-test.out +++ b/test/data/icc-test.out @@ -813,8 +813,6 @@ Error: XMP Toolkit error 203: Duplicate property or field node Warning: Failed to decode XMP metadata. Error: XMP Toolkit error 203: Duplicate property or field node Warning: Failed to decode XMP metadata. -Error: XMP Toolkit error 203: Duplicate property or field node -Warning: Failed to decode XMP metadata. STRUCTURE OF JPEG FILE: ReaganLargeJpg.jpg address | marker | length | data 0 | 0xffd8 SOI