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

The following commit has been merged in the master branch:
commit cb70876cdb75abcb289067217114e6c260f6adbc
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Wed Nov 5 04:32:40 2014 +0000

    Fix bug #965: Pentax K-3 MakerNote not recognized due to different maker tag. Thanks goes to Pascal de Bruijn for the patch. Beware that this will have to be changed if Ricoh makernote support is added.
---
 src/makernote.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index 32e23be..846cd00 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -70,6 +70,7 @@ namespace Exiv2 {
         { "OLYMPUS",        ifdIdNotSet, newOlympusMn,   0               }, // mnGroup_ is not used
         { "Panasonic",      panasonicId, newPanasonicMn, newPanasonicMn2 },
         { "PENTAX",         ifdIdNotSet, newPentaxMn,    0               }, // mnGroup_ is not used
+        { "RICOH",          ifdIdNotSet, newPentaxMn,    0               }, // mnGroup_ is not used
         { "SAMSUNG",        samsung2Id,  newSamsungMn,   newSamsungMn2   },
         { "SIGMA",          sigmaId,     newSigmaMn,     newSigmaMn2     },
         { "SONY",           ifdIdNotSet, newSonyMn,      0               }, // mnGroup_ is not used

-- 
exiv2 packaging