[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=5cb9ec4

The following commit has been merged in the master branch:
commit 5cb9ec44d23502d3122a5a694d522d6bce0a23dd
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Fri Apr 2 01:44:50 2004 +0000

    Added Sigma MakerNote
---
 src/Makefile                    |   4 +-
 src/sigmamn.cpp                 | 146 ++++++++++++++++++++++++++++++++++++++++
 src/{fujimn.hpp => sigmamn.hpp} |  57 ++++++----------
 3 files changed, 170 insertions(+), 37 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index 2ea1334..6389ba8 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -20,7 +20,7 @@
 # 02111-1307, USA.
 #
 # File:      Makefile
-# Version:   $Name:  $ $Revision: 1.18 $
+# Version:   $Name:  $ $Revision: 1.19 $
 # Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
 # History:   10-Dec-03, ahu: created
 #
@@ -52,7 +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 \
-        tags.cpp types.cpp value.cpp
+        sigmamn.cpp tags.cpp types.cpp value.cpp
 
 # Add source files of simple applications to this list
 BINSRC = addmoddel.cpp exifprint.cpp exiftest.cpp makernote-test.cpp \
diff --git a/src/sigmamn.cpp b/src/sigmamn.cpp
new file mode 100644
index 0000000..840fcbd
--- /dev/null
+++ b/src/sigmamn.cpp
@@ -0,0 +1,146 @@
+// ***************************************************************** -*- 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:      sigmamn.cpp
+  Version:   $Name:  $ $Revision: 1.1 $
+  Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
+  History:   02-Apr-04, ahu: created
+  Credits:   Sigma and Foveon MakerNote implemented according to the specification
+             in "SIGMA and FOVEON EXIF MakerNote Documentation" by Foveon.
+             <http://www.x3f.info/technotes/FileDocs/MakerNoteDoc.html>
+ */
+// *****************************************************************************
+#include "rcsid.hpp"
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.1 $ $RCSfile: sigmamn.cpp,v $")
+
+// *****************************************************************************
+// included header files
+#include "types.hpp"
+#include "sigmamn.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 SigmaMakerNote::RegisterMakerNote SigmaMakerNote::register_;
+
+    // Sigma (Foveon) MakerNote Tag Info
+    static const MakerNote::MnTagInfo sigmaMnTagInfo[] = {
+        MakerNote::MnTagInfo(0x0002, "SerialNumber", "Camera serial number"),
+        MakerNote::MnTagInfo(0x0003, "DriveMode", "Drive Mode"),
+        MakerNote::MnTagInfo(0x0004, "ResolutionMode", "Resolution Mode"),
+        MakerNote::MnTagInfo(0x0005, "AutofocusMode", "Autofocus mode"),
+        MakerNote::MnTagInfo(0x0006, "FocusSetting", "Foxus setting"),
+        MakerNote::MnTagInfo(0x0007, "WhiteBalance", "White balance"),
+        MakerNote::MnTagInfo(0x0008, "ExposureMode", "Exposure mode"),
+        MakerNote::MnTagInfo(0x0009, "MeteringMode", "Metering mode"),
+        MakerNote::MnTagInfo(0x000a, "LensRange", "Lens focal length range"),
+        MakerNote::MnTagInfo(0x000b, "ColorSpace", "Color space"),
+        MakerNote::MnTagInfo(0x000c, "Exposure", "Exposure"),
+        MakerNote::MnTagInfo(0x000d, "Contrast", "Contrast"),
+        MakerNote::MnTagInfo(0x000e, "Shadow", "Shadow"),
+        MakerNote::MnTagInfo(0x000f, "Highlight", "Highlight"),
+        MakerNote::MnTagInfo(0x0010, "Saturation", "Saturation"),
+        MakerNote::MnTagInfo(0x0011, "Sharpness", "Sharpness"),
+        MakerNote::MnTagInfo(0x0012, "FillLight", "X3 Fill light"),
+        MakerNote::MnTagInfo(0x0014, "ColorAdjustment", "Color adjustment"),
+        MakerNote::MnTagInfo(0x0015, "AdjustmentMode", "Adjustment mode"),
+        MakerNote::MnTagInfo(0x0016, "Quality", "Quality"),
+        MakerNote::MnTagInfo(0x0017, "Firmware", "Firmware"),
+        MakerNote::MnTagInfo(0x0018, "Software", "Software"),
+        MakerNote::MnTagInfo(0x0019, "AutoBracket", "Auto bracket"),
+        // End of list marker
+        MakerNote::MnTagInfo(0xffff, "(UnknownSigmaMakerNoteTag)", "Unknown SigmaMakerNote tag")
+    };
+
+    SigmaMakerNote::SigmaMakerNote(bool alloc)
+        : IfdMakerNote(sigmaMnTagInfo, alloc), sectionName_("Sigma")
+    {
+        // My one and only Sigma sample has two undocumented extra bytes 
+        // (0x01, 0x00) after the ID string and before the start of the
+        // Makernote IFD. Adding them to the ID string is a hack...
+        prefix_ = std::string("SIGMA

-- 
exiv2 packaging