[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:38 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ea08a41
The following commit has been merged in the master branch:
commit ea08a415f2750623a7951f0891d02192364960d6
Author: Robin Mills <robin at clanmills.com>
Date: Sun Aug 14 06:37:24 2016 +0000
#1199. Fixing msvc/64 build breakers (more size/long/uintXX_t conflicts).
---
src/webpimage.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/webpimage.cpp b/src/webpimage.cpp
index 2b0a3b8..345ee99 100644
--- a/src/webpimage.cpp
+++ b/src/webpimage.cpp
@@ -373,14 +373,14 @@ namespace Exiv2 {
if (outIo.write((const byte*)header.data(), 4) != 4)
throw Error(21);
- us2Data(data, blob.size()+8, bigEndian);
+ us2Data(data, (uint16_t) blob.size()+8, bigEndian);
byte exifHeader[] = { 0xFF, 0xE1, 0x00, 0x00,
0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
exifHeader[2] = data[0];
exifHeader[3] = data[1];
std::string rawExif = std::string((char*)exifHeader, 10)
+ std::string((const char*)&blob[0], blob.size());
- ul2Data(data, rawExif.size(), littleEndian);
+ ul2Data(data, (uint32_t) rawExif.size(), littleEndian);
if (outIo.write(data, 4) != 4) throw Error(21);
if (outIo.write((const byte*)rawExif.data(), static_cast<long>(rawExif.size())) != (long)rawExif.size())
{
@@ -391,7 +391,7 @@ namespace Exiv2 {
if (has_xmp) {
std::string header = "XMP ";
if (outIo.write((const byte*)header.data(), TAG_SIZE) != TAG_SIZE) throw Error(21);
- ul2Data(data, xmpData.size(), littleEndian);
+ ul2Data(data, (uint32_t) xmpData.size(), littleEndian);
if (outIo.write(data, 4) != 4) throw Error(21);
if (outIo.write((const byte*)xmpData.data(), static_cast<long>(xmpData.size())) != (long)xmpData.size()) {
throw Error(21);
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list