[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=f3a3e32

The following commit has been merged in the master branch:
commit f3a3e32ac2dc6cd03954911ac75beee077e13f95
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Feb 6 12:13:32 2004 +0000

    Implemented "non-intrusive write support", part 2 and JPEG file write support
---
 src/exif.cpp | 385 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
 src/exif.hpp | 253 ++++++++++++++++++++++++++++-----------
 2 files changed, 496 insertions(+), 142 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index b008693..cfbf9ac 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.16 $
+  Version:   $Name:  $ $Revision: 1.17 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
   History:   26-Jan-04, ahu: created
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.16 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.17 $ $RCSfile: exif.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -40,15 +40,20 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.16 $ $RCSfile: exif.cpp,v $")
 #include <fstream>
 #include <utility>
 #include <algorithm>
+#include <map>
 
 #include <cstring>
+#include <cstdio>                               // for rename
+
+#include <sys/types.h>                          // for getpid
+#include <unistd.h>                             // for getpid, unlink
 
 // *****************************************************************************
 // class member definitions
 namespace Exif {
 
     JpegImage::JpegImage()
-        : sizeExifData_(0), offsetExifData_(0), exifData_(0)
+        : sizeExifData_(0), exifData_(0)
     {
     }
 
@@ -58,8 +63,10 @@ namespace Exif {
     }
 
     const uint16 JpegImage::soi_    = 0xffd8;
+    const uint16 JpegImage::app0_   = 0xffe0;
     const uint16 JpegImage::app1_   = 0xffe1;
     const char JpegImage::exifId_[] = "Exif

-- 
exiv2 packaging