[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=136d517

The following commit has been merged in the master branch:
commit 136d5179291651eadb91b01867cd5819e0052569
Author: tbeu <mail at tbeu.de>
Date:   Tue Aug 16 20:41:20 2016 +0000

    Update Canon FileInfo RawJpgSize to match ExifTool
---
 src/canonmn.cpp | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index f0c33f1..470f247 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -1412,16 +1412,23 @@ namespace Exiv2 {
 
     //! RawJpgSize, tag 0x0007
     extern const TagDetails canonRawJpgSize[] = {
-        { 0,   N_("Large")        },
-        { 1,   N_("Medium")       },
-        { 2,   N_("Small")        },
-        { 5,   N_("Medium 1")     },
-        { 6,   N_("Medium 2")     },
-        { 7,   N_("Medium 3")     },
-        { 8,   N_("Postcard")     },
-        { 9,   N_("Widescreen")   },
-        { 129, N_("Medium Movie") },
-        { 130, N_("Small Movie")  }
+        {   0, N_("Large")             },
+        {   1, N_("Medium")            },
+        {   2, N_("Small")             },
+        {   5, N_("Medium 1")          },
+        {   6, N_("Medium 2")          },
+        {   7, N_("Medium 3")          },
+        {   8, N_("Postcard")          },
+        {   9, N_("Widescreen")        },
+        {  10, N_("Medium Widescreen") },
+        {  14, N_("Small 1")           },
+        {  15, N_("Small 2")           },
+        {  16, N_("Small 3")           },
+        { 128, N_("640x480 Movie")     },
+        { 129, N_("Medium Movie")      },
+        { 130, N_("Small Movie")       },
+        { 137, N_("1280x720 Movie")    },
+        { 142, N_("1920x1080 Movie")   }
     };
 
     //! NoiseReduction, tag 0x0008

-- 
exiv2 packaging