[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:36:23 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=f98f131
The following commit has been merged in the master branch:
commit f98f1312442dda86a3d9be7ecc31677a4d9d1193
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed May 26 01:59:07 2004 +0000
Added the makernote buffer to the arguments passed to the create function. This allows the makernote create function to determine the exact makernote needed based on its
content. The new concept is used to automatically determine which of the three Nikon makernotes to create.
---
src/Makefile | 5 +-
src/canonmn.cpp | 10 +-
src/canonmn.hpp | 17 +-
src/exif.cpp | 12 +-
src/fujimn.cpp | 10 +-
src/fujimn.hpp | 17 +-
src/makernote.cpp | 12 +-
src/makernote.hpp | 31 ++-
src/nikon1mn.cpp | 193 --------------
src/nikon1mn.hpp | 139 ----------
src/nikon2mn.cpp | 226 ----------------
src/nikon3mn.cpp | 219 ----------------
src/nikon3mn.hpp | 148 -----------
src/nikonmn.cpp | 531 ++++++++++++++++++++++++++++++++++++++
src/{nikon2mn.hpp => nikonmn.hpp} | 172 +++++++++---
src/sigmamn.cpp | 10 +-
src/sigmamn.hpp | 17 +-
src/taglist.cpp | 47 +++-
18 files changed, 815 insertions(+), 1001 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index baf155d..67f3f6a 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@
# 02111-1307, USA.
#
# File: Makefile
-# Version: $Name: $ $Revision: 1.23 $
+# Version: $Name: $ $Revision: 1.24 $
# Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
# History: 10-Dec-03, ahu: created
#
@@ -52,8 +52,7 @@ CCHDR = rcsid.hpp error.hpp
# Add library C++ source files to this list
CCSRC = canonmn.cpp exif.cpp fujimn.cpp ifd.cpp image.cpp makernote.cpp \
- nikon1mn.cpp nikon2mn.cpp nikon3mn.cpp sigmamn.cpp tags.cpp types.cpp \
- value.cpp
+ nikonmn.cpp sigmamn.cpp tags.cpp types.cpp value.cpp
# Add source files of simple applications to this list
BINSRC = addmoddel.cpp exifcomment.cpp exifprint.cpp makernote-test.cpp \
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index ad6b170..1d17aed 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -20,7 +20,7 @@
*/
/*
File: canonmn.cpp
- Version: $Name: $ $Revision: 1.8 $
+ Version: $Name: $ $Revision: 1.9 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 18-Feb-04, ahu: created
07-Mar-04, ahu: isolated as a separate component
@@ -30,7 +30,7 @@
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.8 $ $RCSfile: canonmn.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.9 $ $RCSfile: canonmn.cpp,v $")
// *****************************************************************************
// included header files
@@ -658,7 +658,11 @@ namespace Exiv2 {
// *****************************************************************************
// free functions
- MakerNote* createCanonMakerNote(bool alloc)
+ MakerNote* createCanonMakerNote(bool alloc,
+ const char* buf,
+ long len,
+ ByteOrder byteOrder,
+ long offset)
{
return new CanonMakerNote(alloc);
}
diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index 52bba46..c160ffd 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -23,7 +23,7 @@
@brief Canon MakerNote implemented according to the specification
<a href="http://www.burren.cx/david/canon.html">
EXIF MakerNote of Canon</a> by David Burren
- @version $Name: $ $Revision: 1.6 $
+ @version $Name: $ $Revision: 1.7 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
@date 18-Feb-04, ahu: created
@@ -62,8 +62,21 @@ namespace Exiv2 {
(true) or not (false). If false, only pointers to the buffer
provided to read() will be kept. See Ifd for more background on
this concept.
+ @param buf Pointer to the makernote character buffer (not used).
+ @param len Length of the makernote character buffer (not used).
+ @param byteOrder Byte order in which the Exif data (and possibly the
+ makernote) is encoded (not used).
+ @param offset Offset from the start of the TIFF header of the makernote
+ buffer (not used).
+
+ @return A pointer to a newly created empty MakerNote. The caller owns
+ this copy and is responsible to delete it!
*/
- MakerNote* createCanonMakerNote(bool alloc =true);
+ MakerNote* createCanonMakerNote(bool alloc,
+ const char* buf,
+ long len,
+ ByteOrder byteOrder,
+ long offset);
// *****************************************************************************
// class definitions
diff --git a/src/exif.cpp b/src/exif.cpp
index 8706c99..cd2d47f 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -20,14 +20,14 @@
*/
/*
File: exif.cpp
- Version: $Name: $ $Revision: 1.43 $
+ Version: $Name: $ $Revision: 1.44 $
Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
History: 26-Jan-04, ahu: created
11-Feb-04, ahu: isolated as a component
*/
// *****************************************************************************
#include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name: $ $Revision: 1.43 $ $RCSfile: exif.cpp,v $")
+EXIV2_RCSID("@(#) $Name: $ $Revision: 1.44 $ $RCSfile: exif.cpp,v $")
// Define DEBUG_MAKERNOTE to output debug information to std::cerr
#undef DEBUG_MAKERNOTE
@@ -581,7 +581,13 @@ namespace Exiv2 {
if (pos != exifIfd_.end() && make != ifd0_.end() && model != ifd0_.end()) {
MakerNoteFactory& mnf = MakerNoteFactory::instance();
// Todo: The conversion to string assumes that there is a
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list