[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:40:59 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=eca690a
The following commit has been merged in the master branch:
commit eca690a2fbef2d67d2c99dc55cb53eb4c69b438c
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Mon Dec 28 12:24:14 2009 +0000
#571: Add Iptc.Envelope.CharacterSet only if any other dataset is added, fixed tests.
---
src/convert.cpp | 8 ++++----
test/conversions.sh | 4 ++--
test/data/conversions.out | 16 +++++++++++++---
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/src/convert.cpp b/src/convert.cpp
index 9041aee..bcc560b 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -1119,13 +1119,14 @@ namespace Exiv2 {
#endif
return;
}
- // Todo: Escape non-ASCII characters in XMP text values
(*iptcData_)[to] = value;
+ (*iptcData_)["Iptc.Envelope.CharacterSet"] = "%G"; // indicate UTF-8 encoding
if (erase_) xmpData_->erase(pos);
return;
}
int count = pos->count();
+ bool added = false;
for (int i = 0; i < count; ++i) {
std::string value = pos->toString(i);
if (!pos->value().ok()) {
@@ -1134,12 +1135,13 @@ namespace Exiv2 {
#endif
continue;
}
- // Todo: Escape non-ASCII characters in XMP text values
IptcKey key(to);
Iptcdatum id(key);
id.setValue(value);
iptcData_->add(id);
+ added = true;
}
+ if (added) (*iptcData_)["Iptc.Envelope.CharacterSet"] = "%G"; // indicate UTF-8 encoding
if (erase_) xmpData_->erase(pos);
}
@@ -1304,7 +1306,6 @@ namespace Exiv2 {
{
Converter converter(iptcData, const_cast<XmpData&>(xmpData));
converter.cnvFromXmp();
- iptcData["Iptc.Envelope.CharacterSet"] = "%G"; // indicate UTF-8 encoding
}
void moveXmpToIptc(XmpData& xmpData, IptcData& iptcData)
@@ -1312,7 +1313,6 @@ namespace Exiv2 {
Converter converter(iptcData, const_cast<XmpData&>(xmpData));
converter.setErase();
converter.cnvFromXmp();
- iptcData["Iptc.Envelope.CharacterSet"] = "%G"; // indicate UTF-8 encoding
}
} // namespace Exiv2
diff --git a/test/conversions.sh b/test/conversions.sh
index 5eb856d..c836266 100755
--- a/test/conversions.sh
+++ b/test/conversions.sh
@@ -158,7 +158,7 @@ echo
echo Testcase 12
echo ===========
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list