third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revision to PR#557. Restored XmpData::erase() and added XmpData::eraseFamily(). Restored and augumented conversions.sh

Browse Source
This commit is contained in:
Robin Mills 2018-11-21 16:52:25 +00:00 committed by Luis Díaz Más
parent ccd708df24
commit 1b136f0657
6 changed files with 54 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/exiv2/xmp_exiv2.hpp
View File

@ -208,10 +208,21 @@ namespace Exiv2 {
@return 0 if successful.
*/
int add(const Xmpdatum& xmpdatum);
/*
@brief Delete the Xmpdatum at iterator position pos, return the
position of the next Xmpdatum.
@note Iterators into the metadata, including pos, are potentially
invalidated by this call.
@brief Delete the Xmpdatum at iterator position pos and update pos
*/
iterator erase(XmpData::iterator pos);
/*!
@brief Delete the Xmpdatum at iterator position pos and update pos
eraseFamily erases data from the same family
See: https://github.com/Exiv2/exiv2/issues/521
*/
void erase(iterator& pos);
void eraseFamily(iterator &pos);
//! Delete all Xmpdatum instances resulting in an empty container.
void clear();
//! Sort metadata by key

2
src/actions.cpp
View File

@ -1616,7 +1616,7 @@ namespace Action {
Exiv2::XmpData::iterator pos;
Exiv2::XmpKey xmpKey = Exiv2::XmpKey(modifyCmd.key_);
while((pos = xmpData.findKey(xmpKey)) != xmpData.end()) {
xmpData.erase(pos);
xmpData.eraseFamily(pos);
}
}
}

8
src/xmp.cpp
View File

@ -382,14 +382,18 @@ namespace Exiv2 {
return xmpMetadata_.end();
}
void XmpData::erase(XmpData::iterator& pos)
XmpData::iterator XmpData::erase(XmpData::iterator pos) {
return xmpMetadata_.erase(pos);
}
void XmpData::eraseFamily(XmpData::iterator &pos)
{
// https://github.com/Exiv2/exiv2/issues/521
// delete 'children' of XMP composites (XmpSeq and XmpBag)
std::string key = pos->key();
while ( pos != end() ) {
if ( pos->key().find(key)==0 ) {
xmpMetadata_.erase(pos);
erase(pos);
} else {
break ;
}

9
test/conversions.sh
View File

@ -206,6 +206,15 @@ fi
runTest exiv2 -PEkycv v.jpg
runTest exiv2 -pi v.jpg
# 16) https://github.com/Exiv2/exiv2/issues/521
echo
echo Testcase 16
echo ===========
copyTestFile DSC_3079.jpg
runTest exiv2 -px DSC_3079.jpg
runTest exiv2 -M"del Xmp.mwg-rs.Regions" DSC_3079.jpg
runTest exiv2 -px DSC_3079.jpg
) > $results 2>&1
# ----------------------------------------------------------------------

BIN
test/data/DSC_3079.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 116 KiB

28
test/data/conversions.out
View File

@ -149,18 +149,18 @@ Iptc.Envelope.CharacterSet String 3 %G
Testcase 15
===========
Xmp.xmp.ModifyDate XmpText 20 2015-04-17T18:10:22Z
Xmp.exif.ExifVersion XmpText 4 2.21
Xmp.exif.GPSVersionID XmpText 7 2.2.0.1
Xmp.exif.GPSLatitude XmpText 12 3,8.4955752N
Xmp.exif.GPSTimeStamp XmpText 29 2003-12-14T01:02:00.999999999
Xmp.exif.ComponentsConfiguration XmpSeq 4 YCbCr
Xmp.exif.Flash XmpText 0 type="Struct"
Xmp.exif.Flash/exif:Fired XmpText 4 True
Xmp.exif.Flash/exif:Return XmpText 1 0
Xmp.exif.Flash/exif:Mode XmpText 1 1
Xmp.exif.Flash/exif:Function XmpText 5 False
Xmp.exif.Flash/exif:RedEyeMode XmpText 4 True
Xmp.exif.ComponentsConfiguration XmpSeq 4 YCbCr
Xmp.xmp.ModifyDate XmpText 20 2015-04-17T18:10:22Z
Xmp.photoshop.DateCreated XmpText 29 2003-12-14T12:01:44.999999999
Exif.Image.DateTime Ascii 20 2015:04:18 02:10:22
Exif.Image.ExifTag Long 1 70
@ -177,3 +177,27 @@ Exif.GPSInfo.GPSTimeStamp Rational 3 1/1 2/1 999999999/10
Exif.GPSInfo.GPSDateStamp Ascii 11 2003:12:14
Iptc.Envelope.CharacterSet String 3 %G
Iptc.Application2.DateCreated Date 8 2003-12-14
Testcase 16
===========
Xmp.MY.DateConfidence XmpText 4 Full
Xmp.exifEX.PhotographicSensitivity XmpText 2 64
Xmp.mwg-rs.Regions XmpText 0 type="Struct"
Xmp.mwg-rs.Regions/mwg-rs:AppliedToDimensions XmpText 0 type="Struct"
Xmp.mwg-rs.Regions/mwg-rs:AppliedToDimensions/stDim:w XmpText 3 540
Xmp.mwg-rs.Regions/mwg-rs:AppliedToDimensions/stDim:h XmpText 3 960
Xmp.mwg-rs.Regions/mwg-rs:AppliedToDimensions/stDim:unit XmpText 5 pixel
Xmp.mwg-rs.Regions/mwg-rs:RegionList XmpText 0 type="Seq"
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1] XmpText 0 type="Struct"
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Type XmpText 4 Face
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Name XmpText 7 America
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area XmpText 0 type="Struct"
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area/stArea:x XmpText 8 0.825794
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area/stArea:y XmpText 8 0.379665
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area/stArea:w XmpText 8 0.110064
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area/stArea:h XmpText 8 0.077389
Xmp.mwg-rs.Regions/mwg-rs:RegionList[1]/mwg-rs:Area/stArea:unit XmpText 10 normalized
Xmp.dc.subject XmpBag 1 America
Xmp.MY.DateConfidence XmpText 4 Full
Xmp.exifEX.PhotographicSensitivity XmpText 2 64
Xmp.dc.subject XmpBag 1 America