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

The following commit has been merged in the master branch:
commit a080a79cac781e102fa78e7cb550a7770ab514de
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Mar 18 16:11:19 2004 +0000

    Added FUJIFILM MakerNote
---
 src/Makefile                    |  10 +-
 src/fujimn.cpp                  | 234 ++++++++++++++++++++++++++++++++++++++++
 src/{canonmn.hpp => fujimn.hpp} |  66 ++++++------
 3 files changed, 276 insertions(+), 34 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index f09fce2..e3b8e39 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 #
 # File:      Makefile
-# Version:   $Name:  $ $Revision: 1.15 $
+# Version:   $Name:  $ $Revision: 1.16 $
 # Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
 # History:   10-Dec-03, ahu: created
 #
@@ -51,8 +51,8 @@ include $(top_srcdir)/config.mk
 CCHDR = rcsid.hpp error.hpp
 
 # Add library C++ source files to this list
-CCSRC = canonmn.cpp exif.cpp ifd.cpp image.cpp makernote.cpp tags.cpp \
-        types.cpp value.cpp
+CCSRC = canonmn.cpp exif.cpp fujimn.cpp ifd.cpp image.cpp makernote.cpp \
+        tags.cpp types.cpp value.cpp
 
 # Add source files of simple applications to this list
 BINSRC = example1.cpp taglist.cpp exifprint.cpp exiftest.cpp makernote-test.cpp \
@@ -267,8 +267,8 @@ check:
 mostlyclean:
 	$(RM) core
 	$(RM) $(CCSRC:.cpp=.ii)
-	$(RM) .mn.d mn.cpp mn.o
 	$(RM) $(OBJ) $(SOBJ) $(BINOBJ) $(EXIV2OBJ)
+	$(RM) mn.o
 	@if test -n "$(CXX_REPOSITORY)"; then \
 	    echo "rm -rf $(CXX_REPOSITORY)"; \
 	    rm -rf $(CXX_REPOSITORY); \
@@ -283,8 +283,10 @@ clean: mostlyclean
 distclean: clean
 	$(RM) tags TAGS
 	$(RM) $(DEP)
+	$(RM) .mn.d
 	$(RM) *~ *#
 
 # This command is intended for maintainers to use; it deletes files
 # that may need special tools to rebuild.
 maintainer-clean: uninstall uninstall-lib distclean
+	$(RM) mn.cpp
diff --git a/src/fujimn.cpp b/src/fujimn.cpp
new file mode 100644
index 0000000..b35c6ad
--- /dev/null
+++ b/src/fujimn.cpp
@@ -0,0 +1,234 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+/*
+  File:      fujimn.cpp
+  Version:   $Name:  $ $Revision: 1.1 $
+  Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
+  History:   18-Feb-04, ahu: created
+             07-Mar-04, ahu: isolated as a separate component
+  Credits:   Fujifilm MakerNote implemented according to the specification
+             in "Appendix 4: Makernote of Fujifilm" of the document 
+             "Exif file format" by TsuruZoh Tachibanaya
+             <http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html>
+ */
+// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.1 $ $RCSfile: fujimn.cpp,v $")
+
+// *****************************************************************************
+// included header files
+#include "types.hpp"
+#include "fujimn.hpp"
+#include "makernote.hpp"
+#include "value.hpp"
+
+// + standard includes
+#include <string>
+#include <sstream>
+#include <iomanip>
+
+// Define DEBUG_MAKERNOTE to output debug information to std::cerr
+#undef DEBUG_MAKERNOTE
+
+// *****************************************************************************
+// class member definitions
+namespace Exif {
+
+    const FujiMakerNote::RegisterMakerNote FujiMakerNote::register_;
+
+    // Fujifilm MakerNote Tag Info
+    static const MakerNote::MnTagInfo fujiMnTagInfo[] = {
+        MakerNote::MnTagInfo(0x0000, "Version", "Fujifilm Makernote version"),
+        MakerNote::MnTagInfo(0x1000, "Quality", "Image quality setting"),
+        MakerNote::MnTagInfo(0x1001, "Sharpness", "Sharpness setting"),
+        MakerNote::MnTagInfo(0x1002, "WhiteBalance", "White balance setting"),
+        MakerNote::MnTagInfo(0x1003, "Color", "Chroma saturation setting"),
+        MakerNote::MnTagInfo(0x1004, "Tone", "Contrast setting"),
+        MakerNote::MnTagInfo(0x1010, "FlashMode", "Flash firing mode setting"),
+        MakerNote::MnTagInfo(0x1011, "FlashStrength", "Flash firing strength compensation setting"),
+        MakerNote::MnTagInfo(0x1020, "Macro", "Macro mode setting"),
+        MakerNote::MnTagInfo(0x1021, "FocusMode", "Focusing mode setting"),
+        MakerNote::MnTagInfo(0x1030, "SlowSync", "Slow synchro mode setting"),
+        MakerNote::MnTagInfo(0x1031, "PictureMode", "Picture mode setting"),
+        MakerNote::MnTagInfo(0x1100, "Continuous", "Continuous shooting or auto bracketing setting"),
+        MakerNote::MnTagInfo(0x1300, "BlurWarning", "Blur warning status"),
+        MakerNote::MnTagInfo(0x1301, "FoxusWarning", "Auto Focus warning status"),
+        MakerNote::MnTagInfo(0x1302, "AeWarning", "Auto Exposure warning status"),
+        // End of list marker
+        MakerNote::MnTagInfo(0xffff, "(UnknownFujiMakerNoteTag)", "Unknown FujiMakerNote tag")
+    };
+
+    FujiMakerNote::FujiMakerNote(bool alloc)
+        : IfdMakerNote(fujiMnTagInfo, alloc), sectionName_("Fujifilm")
+    {
+        setByteOrder(littleEndian);
+        prefix_ = std::string("FUJIFILM\xc

-- 
exiv2 packaging