[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=33ed349

The following commit has been merged in the master branch:
commit 33ed3499fc379e394d68716f8cc35ed55c1bf6af
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Mar 13 13:20:55 2007 +0000

    Fixed mapping of CRW rotation info to Exif orientation.
---
 src/crwimage.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 7d0530d..2afc614 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -65,12 +65,6 @@ EXIV2_RCSID("@(#) $Id$")
 // *****************************************************************************
 // local declarations
 namespace {
-    //! Helper structure for the mapping list
-    struct OmList {
-        uint16_t orientation; //!< Exif orientation value
-        int32_t  degrees;     //!< CRW Rotation degrees
-    };
-
     //! Helper class to map Exif orientation values to CRW rotation degrees
     class RotationMap {
     public:
@@ -79,6 +73,11 @@ namespace {
         //! Get the degree value for an orientation number
         static int32_t  degrees(uint16_t orientation);
     private:
+        //! Helper structure for the mapping list
+        struct OmList {
+            uint16_t orientation; //!< Exif orientation value
+            int32_t  degrees;     //!< CRW Rotation degrees
+        };
         // DATA
         static const OmList omList_[];
     }; // class RotationMap
@@ -1348,14 +1347,14 @@ namespace Exiv2 {
 // *****************************************************************************
 // local definitions
 namespace {
-    const OmList RotationMap::omList_[] = {
+    const RotationMap::OmList RotationMap::omList_[] = {
         { 1,    0 },
         { 3,  180 },
         { 3, -180 },
-        { 6,  270 },
-        { 6,  -90 },
-        { 8,   90 },
-        { 8, -270 },
+        { 6,   90 },
+        { 6, -270 },
+        { 8,  270 },
+        { 8,  -90 },
         // last entry
         { 0,    0 }
     };

-- 
exiv2 packaging