[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=45db713

The following commit has been merged in the master branch:
commit 45db713002b9a0cbadafb4bbace0638dda3fa286
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Jan 25 04:16:58 2006 +0000

    Corrected SerialNumber to be in directory 0x3004
---
 doc/templates/__CrwMapping__ | 2 +-
 src/crwimage.cpp             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/templates/__CrwMapping__ b/doc/templates/__CrwMapping__
index ea42201..92cbc89 100644
--- a/doc/templates/__CrwMapping__
+++ b/doc/templates/__CrwMapping__
@@ -96,7 +96,7 @@ Exif.Photo.ExposureTime (not used on write)</td>
 <tr class="OddRow">
 <td>Exif.Canon.SerialNumber</td>
 <td>0x180b</td>
-<td>0x2807</td>
+<td>0x3004</td>
 </tr>
 <tr class="EvenRow">
 <td>Exif.Photo.DateTimeOriginal</td>
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index aa270cd..d8921d8 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -86,7 +86,7 @@ namespace Exiv2 {
         CrwMapping(0x10c0, 0x300b,   0, 0x00c0, canonIfdId,  decodeBasic,  encodeBasic),
         CrwMapping(0x10c1, 0x300b,   0, 0x00c1, canonIfdId,  decodeBasic,  encodeBasic),
         CrwMapping(0x1807, 0x3002,   0, 0x9206, exifIfdId,   decodeBasic,  encodeBasic),
-        CrwMapping(0x180b, 0x2807,   0, 0x000c, canonIfdId,  decodeBasic,  encodeBasic),
+        CrwMapping(0x180b, 0x3004,   0, 0x000c, canonIfdId,  decodeBasic,  encodeBasic),
         CrwMapping(0x180e, 0x300a,   0, 0x9003, exifIfdId,   decode0x180e, encode0x180e),
         CrwMapping(0x1810, 0x300a,   0, 0xa002, exifIfdId,   decode0x1810, encode0x1810),
         CrwMapping(0x1817, 0x300a,   4, 0x0008, canonIfdId,  decodeBasic,  encodeBasic),

-- 
exiv2 packaging