[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:46:45 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=600eb0d
The following commit has been merged in the master branch:
commit 600eb0d3dd4de9f3670cece4e1cbd8cfcaf2e19a
Author: draekko <draekko.software at gmail.com>
Date: Sat Aug 20 00:33:23 2016 +0000
#1199 Fixed issue with -ix, wasnt padding odd sized chunks for exif/xmp.
---
src/webpimage.cpp | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 5472a43..c2bd263 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -380,6 +380,11 @@ namespace Exiv2 {
{
throw Error(21);
}
+ if ((long)blob.size() % 2) {
+ byte c = 0;
+ if (outIo.write(&c, 1) != 1)
+ throw Error(21);
+ }
}
if (has_xmp) {
@@ -390,11 +395,17 @@ namespace Exiv2 {
if (outIo.write((const byte*)xmpPacket().data(), static_cast<long>(xmpPacket().size())) != (long)xmpPacket().size()) {
throw Error(21);
}
+ if ((long)xmpPacket().size() % 2) {
+ byte c = 0;
+ if (outIo.write(&c, 1) != 1)
+ throw Error(21);
+ }
}
// Fix File Size Payload Data
outIo.seek(0, BasicIo::beg);
filesize = outIo.size() - 8;
+ std::cout << "size " << filesize << std::endl;
outIo.seek(4, BasicIo::beg);
ul2Data(data, (uint32_t) filesize, littleEndian);
if (outIo.write(data, 4) != 4) throw Error(21);
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list