[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=735bb60

The following commit has been merged in the master branch:
commit 735bb609859ea2431ff4ab9db0249c5617895215
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jul 26 14:41:45 2004 +0000

    Removed obsolete includes
---
 src/exif.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/exif.cpp b/src/exif.cpp
index 0b7dc98..51bd7e5 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      exif.cpp
-  Version:   $Name:  $ $Revision: 1.49 $
+  Version:   $Name:  $ $Revision: 1.50 $
   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.49 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.50 $ $RCSfile: exif.cpp,v $")
 
 // Define DEBUG_MAKERNOTE to output debug information to std::cerr
 #undef DEBUG_MAKERNOTE
@@ -45,9 +45,7 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.49 $ $RCSfile: exif.cpp,v $")
 
 // + standard includes
 #include <iostream>
-#include <iomanip>
 #include <sstream>
-#include <fstream>
 #include <utility>
 #include <algorithm>
 #include <map>
@@ -536,7 +534,6 @@ namespace Exiv2 {
     int ExifData::read(const std::string& path)
     {
         Image* pImage = ImageFactory::instance().open(path);
-        // Todo: if (!pImage) return -1;
         if (pImage) {
             int rc = pImage->readMetadata();
             if (rc == 0 && pImage->sizeExifData() > 0 ) {

-- 
exiv2 packaging