[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:37:29 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=41424cd
The following commit has been merged in the master branch:
commit 41424cdfd40d02728c1f281fdb3112e15b79dc2d
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Sat Apr 15 02:59:54 2006 +0000
TIFF parser (experimental): Distributed the code across multiple files, added Olympus makernote
---
src/Makefile | 13 +-
src/makernote2.cpp | 134 +++++++++
src/makernote2.hpp | 211 +++++++++++++++
src/tiffcomposite.cpp | 214 +++++++++++++++
src/tiffcomposite.hpp | 408 ++++++++++++++++++++++++++++
src/tiffparse.cpp | 8 +-
src/tiffparser.cpp | 263 +++---------------
src/tiffparser.hpp | 689 ++---------------------------------------------
src/tiffvisitor.cpp | 217 +++++++++++++++
src/tiffvisitor.hpp | 327 ++++++++++++++++++++++
src/tiffvisitor_tmpl.hpp | 277 +++++++++++++++++++
11 files changed, 1849 insertions(+), 912 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 3971b8d..080d296 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -47,14 +47,15 @@ include $(top_srcdir)/config/config.mk
# Source files
# Add standalone C++ header files to this list
-CCHDR = exv_conf.h exv_msvc.h mn.hpp rcsid.hpp
+CCHDR = exv_conf.h exv_msvc.h mn.hpp rcsid.hpp tiffvisitor_tmpl.hpp
# Add library C++ source files to this list
CCSRC = basicio.cpp canonmn.cpp crwimage.cpp datasets.cpp error.cpp exif.cpp \
- futils.cpp fujimn.cpp ifd.cpp image.cpp imgreg.cpp iptc.cpp jpgimage.cpp \
- makernote.cpp metadatum.cpp nikonmn.cpp olympusmn.cpp panasonicmn.cpp \
- sigmamn.cpp sonymn.cpp tags.cpp tiffimage.cpp tiffparser.cpp types.cpp \
- value.cpp
+ futils.cpp fujimn.cpp ifd.cpp image.cpp imgreg.cpp iptc.cpp \
+ jpgimage.cpp makernote.cpp makernote2.cpp metadatum.cpp nikonmn.cpp \
+ olympusmn.cpp panasonicmn.cpp sigmamn.cpp sonymn.cpp tags.cpp \
+ tiffcomposite.cpp tiffimage.cpp tiffparser.cpp tiffvisitor.cpp \
+ types.cpp value.cpp
# Add library C source files to this list
ifndef HAVE_TIMEGM
@@ -65,7 +66,7 @@ endif
BINSRC = addmoddel.cpp crwedit.cpp crwparse.cpp dataarea-test.cpp \
exifcomment.cpp exifdata-test.cpp exifprint.cpp ifd-test.cpp iotest.cpp \
iptceasy.cpp iptcprint.cpp iptctest.cpp key-test.cpp makernote-test.cpp \
- taglist.cpp write-test.cpp write2-test.cpp tiffparse.cpp
+ taglist.cpp write-test.cpp write2-test.cpp tiffparse.cpp
# Main source file of the Exiv2 application
EXIV2MAIN = exiv2.cpp
diff --git a/src/makernote2.cpp b/src/makernote2.cpp
new file mode 100644
index 0000000..9eca37a
--- /dev/null
+++ b/src/makernote2.cpp
@@ -0,0 +1,134 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2006 Andreas Huggel <ahuggel at gmx.net>
+ *
+ * This program is part of the Exiv2 distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+ File: makernote2.cpp
+ Version: $Rev$
+ Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
+ History: 11-Apr-06, ahu: created
+ */
+// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Id$");
+
+// Define DEBUG to output debug information to std::cerr, e.g, by calling make
+// like this: make DEFS=-DDEBUG makernote2.o
+//#define DEBUG
+
+// *****************************************************************************
+// included header files
+#ifdef _MSC_VER
+# include "exv_msvc.h"
+#else
+# include "exv_conf.h"
+#endif
+
+#include "makernote2.hpp"
+#include "tiffcomposite.hpp"
+#include "tiffvisitor.hpp"
+
+// + standard includes
+#include <string>
+#include <cstring>
+
+// *****************************************************************************
+// class member definitions
+namespace Exiv2 {
+
+ const TiffMnRegistry TiffMnCreator::registry_[] = {
+ { "OLYMPUS", newOlympusMn }
+ };
+
+ bool TiffMnRegistry::operator==(const TiffMnRegistry::Key& key) const
+ {
+ std::string make(make_);
+ return make == key.make_.substr(0, make.length());
+ }
+
+ TiffComponent* TiffMnCreator::create(uint16_t tag,
+ uint16_t group,
+ std::string make,
+ const byte* pData,
+ uint32_t size,
+ ByteOrder byteOrder)
+ {
+ TiffComponent* tc = 0;
+ const TiffMnRegistry* tmr = find(registry_, TiffMnRegistry::Key(make));
+ if (tmr) tc = tmr->newMnFct_(tag, group, pData, size, byteOrder);
+ return tc;
+ } // TiffMnCreator::create
+
+ const char* OlympusMnHeader::signature_ = "OLYMP
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list