[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:47:11 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=442b015

The following commit has been merged in the master branch:
commit 442b0155d0af43de53effae734e29cb2e0cc737d
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Oct 12 21:26:37 2016 +0000

    #1243 Added XMP and IPTC data to Reagan.jp2.  Corrected printStructure() appropriately.
    Will add jp2image::writeMetadata()/iccProfile tomorrow and update tests.
---
 src/jp2image.cpp     |   2 +-
 test/data/Reagan.jp2 | Bin 34043 -> 40609 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 1b1e36a..3f11325 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -478,7 +478,7 @@ namespace Exiv2
                             }
 
                             DataBuf rawData;
-                                    rawData.alloc(box.length);
+                                    rawData.alloc(box.length-sizeof(uuid)-sizeof(box));
                             long    bufRead = io_->read(rawData.pData_, rawData.size_);
                             if (io_->error()) throw Error(14);
                             if (bufRead != rawData.size_) throw Error(20);
diff --git a/test/data/Reagan.jp2 b/test/data/Reagan.jp2
index e23be8c..fb011b5 100644
Binary files a/test/data/Reagan.jp2 and b/test/data/Reagan.jp2 differ

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list