[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:10 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=ed63a11
The following commit has been merged in the master branch:
commit ed63a113e1e7a88fa4dd6c8729797e52105dad28
Author: Robin Mills <robin at clanmills.com>
Date: Tue Oct 11 21:04:54 2016 +0000
#1242 Work in progress. Fixing src/jp2image.cpp. Added test file. Test suite to be updated to use Reagan.jp2 (and hopefully additional test files)
---
src/jp2image.cpp | 45 +++++++++++++++++++--------------------------
test/data/Reagan.jp2 | Bin 0 -> 34043 bytes
2 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index c157820..b36e61f 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -21,9 +21,6 @@
/*
File: jp2image.cpp
Version: $Rev$
- Author(s): Marco Piovanelli, Ovolab (marco)
- Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
- History: 12-Mar-2007, marco: created
*/
// *****************************************************************************
#include "rcsid_int.hpp"
@@ -230,14 +227,15 @@ namespace Exiv2
{
DataBuf rawData;
long bufRead;
+ bool bExif = memcmp(uuid.uuid, kJp2UuidExif, sizeof(uuid))==0;
+ bool bIptc = memcmp(uuid.uuid, kJp2UuidIptc, sizeof(uuid))==0;
+ bool bXMP = memcmp(uuid.uuid, kJp2UuidXmp , sizeof(uuid))==0;
- if(memcmp(uuid.uuid, kJp2UuidExif, sizeof(uuid)) == 0)
+ if(bExif)
{
#ifdef DEBUG
std::cout << "Exiv2::Jp2Image::readMetadata: Exif data found
";
#endif
-
- // we've hit an embedded Exif block
rawData.alloc(box.boxLength - (sizeof(box) + sizeof(uuid)));
bufRead = io_->read(rawData.pData_, rawData.size_);
if (io_->error()) throw Error(14);
@@ -246,27 +244,26 @@ namespace Exiv2
if (rawData.size_ > 0)
{
// Find the position of Exif header in bytes array.
+ long pos = ( (rawData.pData_[0] == rawData.pData_[1])
+ && (rawData.pData_[0]=='I' || rawData.pData_[0]=='M')
+ ) ? 0 : -1;
+ // #1242 Forgive having Exif
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list