[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=0cf64e2

The following commit has been merged in the master branch:
commit 0cf64e2542d39fe517d73be54a1c19849181abff
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Apr 30 22:58:15 2015 +0000

    #922.  Better platform and endian detection.
---
 include/exiv2/config.h | 22 +++++++++++++++++++++-
 src/exiv2.cpp          |  6 ------
 src/tiffimage.cpp      |  6 +++---
 src/version.cpp        | 10 ----------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/include/exiv2/config.h b/include/exiv2/config.h
index 67249c1..169883b 100644
--- a/include/exiv2/config.h
+++ b/include/exiv2/config.h
@@ -1,3 +1,5 @@
+// config.h
+//
 #ifdef _MSC_VER
 # include "exv_msvc.h"
 #else
@@ -11,9 +13,27 @@
 #endif
 #endif
 
-// Don't know why MinGW refuses to link libregex
 #if defined(__MINGW32__) || defined(__MINGW64__)
+#ifndef __MING__
+#define __MING__ 1
+#endif
+// Don't know why MinGW refuses to link libregex
 #ifdef EXV_HAVE_REGEX
 #undef EXV_HAVE_REGEX
 #endif
 #endif
+
+#ifndef __CYGWIN__
+#if defined(__CYGWIN32__) || defined(__CYGWIN64__)
+#define __CYGWIN__ 1
+#endif
+#endif
+
+#ifndef __LITTLE_ENDIAN__
+#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW__)
+#define __LITTLE_ENDIAN__ 1
+#endif
+#endif
+
+// That's all Folks!
+////
\ No newline at end of file
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index d72870a..5b45d04 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -52,12 +52,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include <regex.h>
 #endif
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
-# ifndef  __MINGW__
-#  define __MINGW__
-# endif
-#endif
-
 
 // *****************************************************************************
 // local declarations
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 9cd286f..db96cce 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -451,10 +451,10 @@ namespace Exiv2 {
             // read header (we already know for certain that we have a Tiff file)
             io_->read(dir.pData_,  8);
             char c = (char) dir.pData_[0] ;
-#if __LITTLE_ENDIAN__ || defined(_MSC_VER)
-            bool      bSwap   = c == 'M';
+#if  __LITTLE_ENDIAN__
+            bool bSwap   = c == 'M';
 #else
-            bool      bSwap   = c == 'I';
+            bool bSwap   = c == 'I';
 #endif
             if ( option == kpsBasic ) {
                 out << stringFormat("STRUCTURE OF TIFF FILE (%c%c): ",c,c) << io_->path() << std::endl;
diff --git a/src/version.cpp b/src/version.cpp
index bd4998c..048070e 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -45,12 +45,6 @@ EXIV2_RCSID("@(#) $Id$")
 #include <curl/curl.h>
 #endif
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
-# ifndef  __MINGW__
-#  define __MINGW__
-# endif
-#endif
-
 #if defined(__CYGWIN__) || defined(__MINGW__)
 #include <windows.h>
 #endif
@@ -138,10 +132,6 @@ typedef string_v::iterator  string_i;
     void*    not_needed1;    /* Pointer to the dynamic section of the shared object */
     struct lmap *next, *prev;/* chain of loaded objects */
   };
-#elif defined(__MINGW32__) || defined(__MINGW64__)
-#ifndef __MINGW__
-#define __MINGW__
-#endif
 #endif
 
 static void output(std::ostream& os,const exv_grep_keys_t& greps,const char* name,const std::string& value)

-- 
exiv2 packaging