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

Added reg command to utility, fixed set command to wrok better with XMP arrays, modified LangAlt write method to write default first, fixed registerNs bug.

Browse Source
This commit is contained in:
Andreas Huggel 2007-10-15 10:07:39 +00:00
parent 0207c59c24
commit 595665be33
6 changed files with 62 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/actions.cpp
View File

@ -1268,8 +1268,11 @@ namespace Action {
case del:
delMetadatum(pImage, *i);
break;
case reg:
regNamespace(*i);
break;
case invalidCmdId:
// Todo: complain
assert(invalidCmdId == i->cmdId_);
break;
}
}
@ -1342,7 +1345,9 @@ namespace Action {
if (metadatum) {
value = metadatum->getValue();
}
if (modifyCmd.explicitType_ || value.get() == 0) {
if ( value.get() == 0
|| ( modifyCmd.explicitType_
&& modifyCmd.typeId_ != value->typeId())) {
value = Exiv2::Value::create(modifyCmd.typeId_);
}
if (0 == value->read(modifyCmd.value_)) {
@ -1402,6 +1407,15 @@ namespace Action {
}
}
void Modify::regNamespace(const ModifyCmd& modifyCmd)
{
if (Params::instance().verbose_) {
std::cout << _("Reg ") << modifyCmd.key_ << "=\""
<< modifyCmd.value_ << "\"" << std::endl;
}
Exiv2::XmpProperties::registerNs(modifyCmd.value_, modifyCmd.key_);
}
Modify::AutoPtr Modify::clone() const
{
return AutoPtr(clone_());

2
src/actions.hpp
View File

@ -339,6 +339,8 @@ namespace Action {
//! Delete a metadatum from \em pImage according to \em modifyCmd
static void delMetadatum(Exiv2::Image* pImage,
const ModifyCmd& modifyCmd);
//! Register an XMP namespace according to \em modifyCmd
static void regNamespace(const ModifyCmd& modifyCmd);
}; // class Modify

52
src/exiv2.cpp
View File

@ -60,6 +60,7 @@ namespace {
{ add, "add" },
{ set, "set" },
{ del, "del" },
{ reg, "reg" },
{ invalidCmdId, "invalidCmd" } // End of list marker
};
@ -886,35 +887,36 @@ namespace {
Exiv2::TypeId defaultType = Exiv2::invalidTypeId;
std::string key(line.substr(keyStart, keyEnd-keyStart));
MetadataId metadataId = invalidMetadataId;
try {
Exiv2::IptcKey iptcKey(key);
metadataId = iptc;
defaultType = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(),
iptcKey.record());
}
catch (const Exiv2::AnyError&) {}
if (metadataId == invalidMetadataId) {
if (cmdId != reg) {
try {
Exiv2::ExifKey exifKey(key);
metadataId = exif;
defaultType = Exiv2::ExifTags::tagType(exifKey.tag(),
exifKey.ifdId());
Exiv2::IptcKey iptcKey(key);
metadataId = iptc;
defaultType = Exiv2::IptcDataSets::dataSetType(iptcKey.tag(),
iptcKey.record());
}
catch (const Exiv2::AnyError&) {}
}
if (metadataId == invalidMetadataId) {
try {
Exiv2::XmpKey xmpKey(key);
metadataId = xmp;
defaultType = Exiv2::XmpProperties::propertyType(xmpKey);
if (metadataId == invalidMetadataId) {
try {
Exiv2::ExifKey exifKey(key);
metadataId = exif;
defaultType = Exiv2::ExifTags::tagType(exifKey.tag(),
exifKey.ifdId());
}
catch (const Exiv2::AnyError&) {}
}
if (metadataId == invalidMetadataId) {
try {
Exiv2::XmpKey xmpKey(key);
metadataId = xmp;
defaultType = Exiv2::XmpProperties::propertyType(xmpKey);
}
catch (const Exiv2::AnyError&) {}
}
if (metadataId == invalidMetadataId) {
throw Exiv2::Error(1, Exiv2::toString(num)
+ ": " + _("Invalid key") + " `" + key + "'");
}
catch (const Exiv2::AnyError&) {}
}
if (metadataId == invalidMetadataId) {
throw Exiv2::Error(1, Exiv2::toString(num)
+ ": " + _("Invalid key") + " `" + key + "'");
}
std::string value;
Exiv2::TypeId type = defaultType;
bool explicitType = false;
@ -934,7 +936,7 @@ namespace {
+ ": " + _("Invalid command line") + " " );
}
if (typeEnd != std::string::npos) {
if (cmdId != reg && typeEnd != std::string::npos) {
std::string typeStr(line.substr(typeStart, typeEnd-typeStart));
Exiv2::TypeId tmpType = Exiv2::TypeInfo::typeId(typeStr);
if (tmpType != Exiv2::invalidTypeId) {

2
src/exiv2.hpp
View File

@ -43,7 +43,7 @@
// class definitions
//! Command identifiers
enum CmdId { invalidCmdId, add, set, del };
enum CmdId { invalidCmdId, add, set, del, reg };
//! Metadata identifiers
enum MetadataId { invalidMetadataId, iptc, exif, xmp };
//! Structure for one parsed modification command

17
src/value.cpp
View File

@ -637,11 +637,18 @@ namespace Exiv2 {
std::ostream& LangAltValue::write(std::ostream& os) const
{
for (ValueType::const_iterator i = value_.begin();
i != value_.end(); ++i) {
if (i != value_.begin()) os << ", ";
os << "lang=\"" << i->first << "\" "
<< i->second;
bool first = true;
// Write the default entry first
ValueType::const_iterator i = value_.find("x-default");
if (i != value_.end()) {
os << "lang=\"" << i->first << "\" " << i->second;
first = false;
}
for (i = value_.begin(); i != value_.end(); ++i) {
if (i->first == "x-default") continue;
if (!first) os << ", ";
os << "lang=\"" << i->first << "\" " << i->second;
first = false;
}
return os;
}

5
src/xmp.cpp
View File

@ -381,7 +381,7 @@ namespace Exiv2 {
bool XmpParser::registerNs(const std::string& ns,
const std::string& prefix)
{
{ try {
initialize();
#ifdef EXV_HAVE_XMP_TOOLKIT
return SXMPMeta::RegisterNamespace(ns.c_str(), prefix.c_str(), 0);
@ -389,6 +389,9 @@ namespace Exiv2 {
return true;
#endif
}
catch (const XMP_Error& e) {
throw Error(40, e.GetID(), e.GetErrMsg());
}} // XmpParser::registerNs
#ifdef EXV_HAVE_XMP_TOOLKIT
int XmpParser::decode( XmpData& xmpData,