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

The following commit has been merged in the master branch:
commit f13d076a7af5ec0b2651c5fd2922e0ae9126cbca
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Oct 19 08:31:58 2011 +0000

    Fixed g++ 4.6.1 (Debian) compiler warning.
---
 src/nikonmn.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nikonmn.cpp b/src/nikonmn.cpp
index d3b8b36..d7a4ab7 100644
--- a/src/nikonmn.cpp
+++ b/src/nikonmn.cpp
@@ -1542,7 +1542,7 @@ namespace Exiv2 {
             unsigned focusmetering = value.toLong(0);
             unsigned focuspoint = value.toLong(1);
             unsigned focusused = (value.toLong(2) << 8) + value.toLong(3);
-            enum {standard, wide} combination = standard;
+            // TODO: enum {standard, wide} combination = standard;
             const unsigned focuspoints =   sizeof(nikonFocuspoints)
                                          / sizeof(nikonFocuspoints[0]);
 
@@ -1561,8 +1561,8 @@ namespace Exiv2 {
             case 0x01: os << _("Dynamic area");         break; // D70, D200
             case 0x02: os << _("Closest subject");      break; // D70, D200
             case 0x03: os << _("Group dynamic-AF");     break; // D200
-            case 0x04: os << _("Single area (wide)");   combination = wide; break; // D200
-            case 0x05: os << _("Dynamic area (wide)");  combination = wide; break; // D200
+            case 0x04: os << _("Single area (wide)");   /* TODO: combination = wide; */ break; // D200
+            case 0x05: os << _("Dynamic area (wide)");  /* TODO: combination = wide; */ break; // D200
             default: os << "(" << focusmetering << ")"; break;
             }
 

-- 
exiv2 packaging