[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=3662c29

The following commit has been merged in the master branch:
commit 3662c29f16f33fdd4abc5fea8af18cca2077c3aa
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 30 11:29:52 2009 +0000

    Pointer acrobatics to workaround MSVC 7.1 problem.
---
 src/tiffcomposite_int.hpp | 7 ++++---
 src/tiffimage.cpp         | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp
index 8e99d6d..2f2859e 100644
--- a/src/tiffcomposite_int.hpp
+++ b/src/tiffcomposite_int.hpp
@@ -1512,15 +1512,16 @@ namespace Exiv2 {
 
     //! Function to create and initialize a new binary array entry
     template<const ArrayCfg* arrayCfg, int N, const ArrayDef (&arrayDef)[N]>
-    TiffComponent::AutoPtr newTiffBinaryArray(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryArray0(uint16_t tag, uint16_t group)
     {
+        // *& acrobatics is a workaround for a MSVC 7.1 bug
         return TiffComponent::AutoPtr(
-            new TiffBinaryArray(tag, group, arrayCfg, arrayDef, N));
+            new TiffBinaryArray(tag, group, arrayCfg, *(&arrayDef), N));
     }
 
     //! Function to create and initialize a new simple binary array entry
     template<const ArrayCfg* arrayCfg>
-    TiffComponent::AutoPtr newTiffBinaryArray(uint16_t tag, uint16_t group)
+    TiffComponent::AutoPtr newTiffBinaryArray1(uint16_t tag, uint16_t group)
     {
         return TiffComponent::AutoPtr(
             new TiffBinaryArray(tag, group, arrayCfg, 0, 0));
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 7866aab..abb2347 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -271,8 +271,8 @@ namespace Exiv2 {
 }                                       // namespace Exiv2
 
 // Shortcuts for the newTiffBinaryArray templates.
-#define EXV_BINARY_ARRAY(arrayCfg, arrayDef) (newTiffBinaryArray<&arrayCfg, EXV_COUNTOF(arrayDef), arrayDef>)
-#define EXV_SIMPLE_BINARY_ARRAY(arrayCfg) (newTiffBinaryArray<&arrayCfg>)
+#define EXV_BINARY_ARRAY(arrayCfg, arrayDef) (newTiffBinaryArray0<&arrayCfg, EXV_COUNTOF(arrayDef), arrayDef>)
+#define EXV_SIMPLE_BINARY_ARRAY(arrayCfg) (newTiffBinaryArray1<&arrayCfg>)
 #define EXV_COMPLEX_BINARY_ARRAY(arraySet, cfgSelFct) (newTiffBinaryArray2<arraySet, EXV_COUNTOF(arraySet), cfgSelFct>)
 
 namespace Exiv2 {

-- 
exiv2 packaging