#1074 Correction to r4540. Rollback changes to actions.cpp which should not have been submitted. Resubmitted test/data/icc-test.out

v0.27.3
Robin Mills 9 years ago
parent 88b3f77796
commit b8021f4517

@ -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;
}

@ -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

Loading…
Cancel
Save