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

The following commit has been merged in the master branch:
commit bd90c19219e8f32acc0524e2906973b2ff8d04e4
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Apr 11 16:02:44 2012 +0000

    #819: Fixed PentaxDng offsets so that they are relative to the beginning of the makernote, added support for the PentaxDng preview image.
---
 src/makernote.cpp     |  5 +++++
 src/makernote_int.hpp |  1 +
 src/preview.cpp       | 26 ++++++++++++++------------
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/makernote.cpp b/src/makernote.cpp
index b08efef..933d964 100644
--- a/src/makernote.cpp
+++ b/src/makernote.cpp
@@ -520,6 +520,11 @@ namespace Exiv2 {
         return header_.size_;
     }
 
+    uint32_t PentaxDngMnHeader::baseOffset(uint32_t mnOffset) const
+    {
+        return mnOffset;
+    }
+
     uint32_t PentaxDngMnHeader::ifdOffset() const
     {
         return sizeOfSignature();
diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp
index 3dbe514..cc69f30 100644
--- a/src/makernote_int.hpp
+++ b/src/makernote_int.hpp
@@ -382,6 +382,7 @@ namespace Exiv2 {
         virtual uint32_t size() const;
         virtual uint32_t write(IoWrapper& ioWrapper, ByteOrder byteOrder) const;
         virtual uint32_t ifdOffset() const;
+        virtual uint32_t baseOffset(uint32_t mnOffset) const;
         //@}
         static uint32_t sizeOfSignature();
 
diff --git a/src/preview.cpp b/src/preview.cpp
index caf39b8..8664c1f 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -321,8 +321,9 @@ namespace {
         { 0,                       createLoaderExifDataJpeg, 5 },
         { 0,                       createLoaderExifDataJpeg, 6 },
         { 0,                       createLoaderExifDataJpeg, 7 },
-        { "image/x-panasonic-rw2", createLoaderExifDataJpeg, 8 },
-        { 0,                       createLoaderExifDataJpeg, 9 },
+        { 0,                       createLoaderExifDataJpeg, 8 },
+        { "image/x-panasonic-rw2", createLoaderExifDataJpeg, 9 },
+        { 0,                       createLoaderExifDataJpeg,10 },
         { 0,                       createLoaderTiff,         0 },
         { 0,                       createLoaderTiff,         1 },
         { 0,                       createLoaderTiff,         2 },
@@ -356,16 +357,17 @@ namespace {
     };
 
     const LoaderExifDataJpeg::Param LoaderExifDataJpeg::param_[] = {
-        { "Exif.Thumbnail.JPEGInterchangeFormat",      "Exif.Thumbnail.JPEGInterchangeFormatLength"      }, // 0
-        { "Exif.NikonPreview.JPEGInterchangeFormat",   "Exif.NikonPreview.JPEGInterchangeFormatLength"   }, // 1
-        { "Exif.Pentax.PreviewOffset",                 "Exif.Pentax.PreviewLength"                       }, // 2
-        { "Exif.Minolta.ThumbnailOffset",              "Exif.Minolta.ThumbnailLength"                    }, // 3
-        { "Exif.SonyMinolta.ThumbnailOffset",          "Exif.SonyMinolta.ThumbnailLength"                }, // 4
-        { "Exif.Olympus.ThumbnailImage",               0                                                 }, // 5
-        { "Exif.Olympus2.ThumbnailImage",              0                                                 }, // 6
-        { "Exif.Minolta.Thumbnail",                    0                                                 }, // 7
-        { "Exif.PanasonicRaw.PreviewImage",            0                                                 }, // 8
-        { "Exif.SamsungPreview.JPEGInterchangeFormat", "Exif.SamsungPreview.JPEGInterchangeFormatLength" } // 9
+        { "Exif.Thumbnail.JPEGInterchangeFormat",      "Exif.Thumbnail.JPEGInterchangeFormatLength"      }, //  0
+        { "Exif.NikonPreview.JPEGInterchangeFormat",   "Exif.NikonPreview.JPEGInterchangeFormatLength"   }, //  1
+        { "Exif.Pentax.PreviewOffset",                 "Exif.Pentax.PreviewLength"                       }, //  2
+        { "Exif.PentaxDng.PreviewOffset",              "Exif.PentaxDng.PreviewLength"                    }, //  3
+        { "Exif.Minolta.ThumbnailOffset",              "Exif.Minolta.ThumbnailLength"                    }, //  4
+        { "Exif.SonyMinolta.ThumbnailOffset",          "Exif.SonyMinolta.ThumbnailLength"                }, //  5
+        { "Exif.Olympus.ThumbnailImage",               0                                                 }, //  6
+        { "Exif.Olympus2.ThumbnailImage",              0                                                 }, //  7
+        { "Exif.Minolta.Thumbnail",                    0                                                 }, //  8
+        { "Exif.PanasonicRaw.PreviewImage",            0                                                 }, //  9
+        { "Exif.SamsungPreview.JPEGInterchangeFormat", "Exif.SamsungPreview.JPEGInterchangeFormatLength" }  // 10
     };
 
     const LoaderTiff::Param LoaderTiff::param_[] = {

-- 
exiv2 packaging