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

The following commit has been merged in the master branch:
commit f88b91e8e19ff48910d878c2e46b2a8365e9a913
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Aug 21 15:45:57 2004 +0000

    -Added free function fileExists()
    -Undo use of tmpnam(0), use getpid workaround again (because of EXDEV errors)
---
 src/image.cpp | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index b2c7940..ceedae6 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      image.cpp
-  Version:   $Name:  $ $Revision: 1.23 $
+  Version:   $Name:  $ $Revision: 1.24 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              Brad Schick (brad) <schick at robotbattle.com>
   History:   26-Jan-04, ahu: created
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.23 $ $RCSfile: image.cpp,v $");
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.24 $ $RCSfile: image.cpp,v $");
 
 // *****************************************************************************
 // included header files
@@ -43,16 +43,17 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.23 $ $RCSfile: image.cpp,v $");
 #include <cstring>
 #include <cstdio>                               // for rename, remove
 #include <cassert>
+#include <sys/types.h>
+#include <sys/stat.h>
 #ifdef _MSC_VER
-#include <process.h>
-typedef int pid_t;
+# define S_ISREG(m)      (((m) & S_IFMT) == S_IFREG)
+# include <process.h>
+  typedef int pid_t;
 #else
-#include <sys/types.h>                          // for getpid
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>                             // for getpid
+# ifdef HAVE_UNISTD_H
+#  include <unistd.h>                           // for getpid, stat
+# endif
 #endif
-#endif
-
 
 // *****************************************************************************
 // class member definitions
@@ -359,7 +360,8 @@ namespace Exiv2 {
                 fread(buf.pData_, 1, size-2, fp_);
                 if (ferror(fp_) || feof(fp_)) return 1;
                 comment_.assign(reinterpret_cast<char*>(buf.pData_), size-2);
-                while (comment_.length() && comment_.at(comment_.length()-1) == '

-- 
exiv2 packaging