[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

Maximiliano Curia maxy at moszumanska.debian.org
Thu Jul 13 17:46:39 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=a564e08

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

    Update Canon model ID to match ExifTool
---
 src/canonmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index bcabc25..a8da8f3 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -284,6 +284,7 @@ namespace Exiv2 {
         { (long int)0x3850000, "PowerShot G3 X" },
         { (long int)0x3860000, "PowerShot ELPH 165 HS / IXUS 165 / IXY 160" },
         { (long int)0x3870000, "PowerShot ELPH 160 / IXUS 160" },
+        { (long int)0x3880000, "PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640" },
         { (long int)0x3890000, "PowerShot ELPH 170 IS / IXUS 170" },
         { (long int)0x3910000, "PowerShot SX410 HS" },
         { (long int)0x3930000, "PowerShot G9 X" },
@@ -304,7 +305,7 @@ namespace Exiv2 {
         { (long int)0x4007d777, "DC50" },
         { (long int)0x4007d778, "HV20" },
         { (long int)0x4007d779, "DC211" },
-        { (long int)0x4007d77a, "HG10" },
+        { (long int)0x4007d77a,"HG10" },
         { (long int)0x4007d77b, "HR10" },
         { (long int)0x4007d77c, "MD255/ZR950" },
         { (long int)0x4007d81c, "HF11" },

-- 
exiv2 packaging



More information about the pkg-kde-commits mailing list