[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:14 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=0641c3b
The following commit has been merged in the master branch:
commit 0641c3bd61618d196d080fa39a40df2f7282afb1
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Apr 1 02:46:02 2004 +0000
Skip JFIF APP0 segment in JpegImage::readExifData()
---
src/image.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/image.cpp b/src/image.cpp
index cad5733..282edf6 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,14 +20,14 @@
*/
/*
File: image.cpp
- Version: $Name: $ $Revision: 1.7 $
+ Version: $Name: $ $Revision: 1.8 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.7 $ $RCSfile: image.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.8 $ $RCSfile: image.cpp,v $")
// *****************************************************************************
// included header files
@@ -161,6 +161,15 @@ namespace Exif {
uint16 marker = getUShort(tmpbuf, bigEndian);
uint16 size = getUShort(tmpbuf + 2, bigEndian);
if (size < 8) return 3;
+ if (marker == app0_ && memcmp(tmpbuf + 4, jfifId_, 5) == 0) {
+ // Skip the remainder of the JFIF APP0 segment
+ is.seekg(size - 8, std::ios::cur);
+ // Read the beginning of the next segment
+ is.read(tmpbuf, 10);
+ if (!is.good()) return 1;
+ marker = getUShort(tmpbuf, bigEndian);
+ size = getUShort(tmpbuf + 2, bigEndian);
+ }
if (!(marker == app1_ && memcmp(tmpbuf + 4, exifId_, 6) == 0)) return 3;
// Read the rest of the APP1 field (Exif data)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list