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

The following commit has been merged in the master branch:
commit 7a45a9abdac46592beda9c4ec936004c2e58cfc9
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Thu Apr 22 10:47:48 2010 +0000

    compile
---
 src/sonymn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 11b23af..9c3b513 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -506,7 +506,7 @@ namespace Exiv2 {
     };
 
     //! Lookup table to translate Sony camera settings quality values to readable labels
-    extern const TagDetails sonyQuality[] = {
+    extern const TagDetails sonyQualityCS[] = {
         { 0,   N_("RAW ")       },
         { 2,   N_("CRAW ")      },
         { 16,  N_("Extra Fine") },
@@ -618,7 +618,7 @@ namespace Exiv2 {
                 sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyAspectRatio)),
         TagInfo(0x0086, "Quality", N_("Quality"),
                 N_("Quality"),
-                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(printValue)),
+                sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyQualityCS)),
         TagInfo(0x0088, "ExposureLevelIncrements", N_("Exposure Level Increments"),
                 N_("Exposure Level Increments"),
                 sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureLevelIncrements)),

-- 
exiv2 packaging