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

The following commit has been merged in the master branch:
commit 0c83629519fba8580a4e5a910909f6a7aa6eb96b
Author: tbeu <mail at tbeu.de>
Date:   Mon Aug 15 18:18:43 2016 +0000

    refs #1208: Update Sony file format list to match ExifTool
    
    Patch provided by Mihail Zenkov
---
 src/sonymn.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index 5417c10..a74eabf 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -224,7 +224,7 @@ namespace Exiv2 {
         { 8,  N_("Cool White Fluorescent")     },
         { 9,  N_("Day White Fluorescent")      },
         { 10, N_("Incandescent2")              },
-        { 11, N_("Warm White Fluorescent")     }, 
+        { 11, N_("Warm White Fluorescent")     },
         { 14, N_("Incandescent")               },
         { 15, N_("Flash")                      },
         { 17, N_("Underwater 1 (Blue Water)")  },
@@ -312,6 +312,9 @@ namespace Exiv2 {
             else if (val == "3000") os << "ARW 2.0";
             else if (val == "3100") os << "ARW 2.1";
             else if (val == "3200") os << "ARW 2.2";
+            else if (val == "3300") os << "ARW 2.3";
+            else if (val == "3310") os << "ARW 2.3.1";
+            else if (val == "3320") os << "ARW 2.3.2";
             else                    os << "(" << value << ")";
         }
         return os;

-- 
exiv2 packaging