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

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 823a84d3d218e5355d73330b05bb189e011eda86
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri May 26 16:39:11 2006 +0000

    Added support for IPTC data found in an Exif Photoshop IRB tag of a TIFF/RAW image
---
 src/jpgimage.cpp    | 98 +++++++++++++++++++++++++++++------------------------
 src/jpgimage.hpp    | 33 ++++++++++++++++--
 src/mrwimage.cpp    |  8 ++---
 src/mrwimage.hpp    | 12 ++-----
 src/tiffimage.cpp   |  8 ++---
 src/tiffimage.hpp   | 12 ++-----
 src/tiffvisitor.cpp | 42 ++++++++++++++++++++---
 src/tiffvisitor.hpp |  2 ++
 8 files changed, 136 insertions(+), 79 deletions(-)

diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index db9a8c5..6211067 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -48,6 +48,7 @@ EXIV2_RCSID("@(#) $Id$");
 
 // *****************************************************************************
 // class member definitions
+
 namespace Exiv2 {
 
     const byte JpegBase::sos_    = 0xda;
@@ -56,11 +57,8 @@ namespace Exiv2 {
     const byte JpegBase::app1_   = 0xe1;
     const byte JpegBase::app13_  = 0xed;
     const byte JpegBase::com_    = 0xfe;
-    const uint16_t JpegBase::iptc_ = 0x0404;
     const char JpegBase::exifId_[] = "Exif

-- 
exiv2 packaging