[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:41:58 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=5f5d089
The following commit has been merged in the master branch:
commit 5f5d089b0084139236386907c0860eef9a13f23e
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Tue Sep 28 17:05:23 2010 +0000
#726: Added support for Samsung2 makernote. (Pretty-print and easy-access functions not done yet.)
---
src/Makefile | 1 +
src/makernote.cpp | 46 ++++++++++++++
src/makernote_int.hpp | 38 ++++++++++-
src/preview.cpp | 4 +-
src/samsungmn.cpp | 97 +++++++++++++++++++++++++++++
src/{rw2image_int.hpp => samsungmn_int.hpp} | 42 ++++++-------
src/tags.cpp | 3 +
src/tags_int.hpp | 2 +
src/tiffimage.cpp | 13 ++++
9 files changed, 220 insertions(+), 26 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 620bb1d..7cbed7e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -100,6 +100,7 @@ CCSRC += preview.cpp \
psdimage.cpp \
rafimage.cpp \
rw2image.cpp \
+ samsungmn.cpp \
sigmamn.cpp \
pentaxmn.cpp \
sonymn.cpp \
diff --git a/src/makernote.cpp b/src/makernote.cpp
index 73b237c..034882d 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", pentaxId, newPentaxMn, newPentaxMn2 },
+ { "SAMSUNG", samsung2Id, newSamsungMn, newSamsungMn2 },
{ "SIGMA", sigmaId, newSigmaMn, newSigmaMn2 },
{ "SONY", ifdIdNotSet, newSonyMn, 0 }, // mnGroup_ is not used
// Entries below are only used for lookup by group
@@ -514,6 +515,34 @@ namespace Exiv2 {
return size_;
} // PentaxMnHeader::write
+ SamsungMnHeader::SamsungMnHeader()
+ {
+ read(0, 0, invalidByteOrder);
+ }
+
+ uint32_t SamsungMnHeader::size() const
+ {
+ return 0;
+ }
+
+ uint32_t SamsungMnHeader::baseOffset(uint32_t mnOffset) const
+ {
+ return mnOffset;
+ }
+
+ bool SamsungMnHeader::read(const byte* /*pData*/,
+ uint32_t /*size*/,
+ ByteOrder /*byteOrder*/)
+ {
+ return true;
+ } // SamsungMnHeader::read
+
+ uint32_t SamsungMnHeader::write(IoWrapper& /*ioWrapper*/,
+ ByteOrder /*byteOrder*/) const
+ {
+ return 0;
+ } // SamsungMnHeader::write
+
const byte SigmaMnHeader::signature1_[] = {
'S', 'I', 'G', 'M', 'A', '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list