[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:57 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=1b46e4e
The following commit has been merged in the master branch:
commit 1b46e4e9f8fb92d3ed8295bd259d6710b858af9d
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Oct 15 09:42:48 2008 +0000
Added support for Exif.Minolta.Thumbnail preview image (Vladimir).
---
src/preview.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/preview.cpp b/src/preview.cpp
index ea80467..0c89de7 100644
--- a/src/preview.cpp
+++ b/src/preview.cpp
@@ -250,6 +250,7 @@ namespace Exiv2 {
{ 0, createLoaderExifDataJpeg, 3 },
{ 0, createLoaderExifDataJpeg, 4 },
{ 0, createLoaderExifDataJpeg, 5 },
+ { 0, createLoaderExifDataJpeg, 6 },
{ 0, createLoaderTiff, 0 },
{ 0, createLoaderTiff, 1 },
{ 0, createLoaderTiff, 2 },
@@ -283,7 +284,8 @@ namespace Exiv2 {
{ "Exif.Pentax.PreviewOffset", "Exif.Pentax.PreviewLength" }, // 2
{ "Exif.Minolta.ThumbnailOffset", "Exif.Minolta.ThumbnailLength" }, // 3
{ "Exif.Olympus.ThumbnailImage", 0 }, // 4
- { "Exif.Olympus2.ThumbnailImage", 0 } // 5
+ { "Exif.Olympus2.ThumbnailImage", 0 }, // 5
+ { "Exif.Minolta.Thumbnail", 0 } // 6
};
const LoaderTiff::Param LoaderTiff::param_[] = {
@@ -353,7 +355,7 @@ namespace Exiv2 {
uint32_t PreviewImage::size() const
{
- return properties_.size_;
+ return size_;
}
Loader::AutoPtr Loader::create(PreviewId id, const Image &image)
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list