[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:27 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=45bf932
The following commit has been merged in the master branch:
commit 45bf932d2c725e19c7853fa82329fc25384267d4
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Wed Apr 21 13:37:07 2010 +0000
implement Sony Manernotes Camera Settings Version 2
Andreas, How to branch it into tiffimage.cpp as Nikon stuff ?
---
src/makernote_int.hpp | 1 +
src/sonymn.cpp | 79 +++++++++++++++++++++++++++++++++++++++++++++++++--
src/sonymn.hpp | 3 ++
src/tags.cpp | 1 +
src/tiffimage.cpp | 19 +++++++++++++
src/types.hpp | 1 +
6 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/src/makernote_int.hpp b/src/makernote_int.hpp
index 269cdad..2dfb00d 100644
--- a/src/makernote_int.hpp
+++ b/src/makernote_int.hpp
@@ -111,6 +111,7 @@ namespace Exiv2 {
const uint16_t canonfi = 320; //!< Canon File Info
const uint16_t sonymltmn = 330; //!< Sony Minolta Makernotes
const uint16_t sonycs = 331; //!< Sony Camera Settings
+ const uint16_t sonycs2 = 332; //!< Sony Camera Settings Version 2
}
// *****************************************************************************
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index a49cfa4..b2f7cff 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -387,8 +387,8 @@ namespace Exiv2 {
// NOTE: A700 only
TagInfo(0x0004, "DriveMode", N_("Drive Mode"),
- N_("Drive Mode"),
- sonyCsIfdId, makerTags, unsignedShort, printValue),
+ N_("Drive Mode"),
+ sonyCsIfdId, makerTags, unsignedShort, printValue),
// NOTE: A700 only
TagInfo(0x0006, "WhiteBalanceFineTune", N_("White Balance Fine Tune"),
@@ -516,4 +516,79 @@ namespace Exiv2 {
return tagInfoCs_;
}
+ // -- Sony camera settings ---------------------------------------------------------------
+
+ // Sony Camera Settings Tag Version 2 Info
+ // NOTE: all are for A330, A380 Sony model
+
+ const TagInfo SonyMakerNote::tagInfoCs2_[] = {
+
+ TagInfo(0x0016, "FocusMode", N_("Focus Mode"),
+ N_("Focus Mode"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0017, "AFAreaMode", N_("AF Area Mode"),
+ N_("AF Area Mode"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0018, "LocalAFAreaPoint", N_("Local AF Area Point"),
+ N_("Local AF Area Point"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0019, "MeteringMode", N_("Metering Mode"),
+ N_("Metering Mode"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0020, "ISOSetting", N_("ISO Setting"),
+ N_("ISO Setting"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0022, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
+ N_("Dynamic Range Optimizer Mode"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0023, "DynamicRangeOptimizerLevel", N_("Dynamic Range Optimizer Level"),
+ N_("Dynamic Range Optimizer Level"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0024, "CreativeStyle", N_("Creative Style"),
+ N_("Creative Style"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0025, "Sharpness", N_("Sharpness"),
+ N_("Sharpness"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0026, "Contrast", N_("Contrast"),
+ N_("Contrast"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+ TagInfo(0x0027, "Saturation", N_("Saturation"),
+ N_("Saturation"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0035, "FlashMode", N_("FlashMode"),
+ N_("FlashMode"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0060, "ExposureProgram", N_("Exposure Program"),
+ N_("Exposure Program"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0063, "Rotation", N_("Rotation"),
+ N_("Rotation"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
+ N_("Sony Image Size"),
+ sonyCs2IfdId, makerTags, unsignedShort, printValue),
+
+ // End of list marker
+ TagInfo(0xffff, "(UnknownSonyCsTag)", "(UnknownSonyCsTag)",
+ N_("Unknown Sony Camera Settings tag"),
+ sonyCs2IfdId, makerTags, invalidTypeId, printValue)
+ };
+
+ const TagInfo* SonyMakerNote::tagListCs2()
+ {
+ return tagInfoCs2_;
+ }
} // namespace Exiv2
diff --git a/src/sonymn.hpp b/src/sonymn.hpp
index 56480fc..ecf8675 100644
--- a/src/sonymn.hpp
+++ b/src/sonymn.hpp
@@ -57,6 +57,8 @@ namespace Exiv2 {
static const TagInfo* tagList();
//! Return read-only list of built-in Sony Standard Camera Settings tags
static const TagInfo* tagListCs();
+ //! Return read-only list of built-in Sony Standard Camera Settings version 2 tags
+ static const TagInfo* tagListCs2();
//! @name Print functions for Sony %MakerNote tags
//@{
@@ -69,6 +71,7 @@ namespace Exiv2 {
//! Tag information
static const TagInfo tagInfo_[];
static const TagInfo tagInfoCs_[];
+ static const TagInfo tagInfoCs2_[];
}; // class SonyMakerNote
} // namespace Exiv2
diff --git a/src/tags.cpp b/src/tags.cpp
index 6acf2dc..c50e064 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -173,6 +173,7 @@ namespace Exiv2 {
{ sonyIfdId, "Makernote", "Sony", SonyMakerNote::tagList },
{ sonyMltIfdId, "Makernote", "SonyMinolta", MinoltaMakerNote::tagList },
{ sonyCsIfdId, "Makernote", "SonyCs", SonyMakerNote::tagListCs },
+ { sonyCs2IfdId, "Makernote", "SonyCs2", SonyMakerNote::tagListCs2 },
{ lastIfdId, "(Last IFD info)", "(Last IFD item)", 0 }
};
diff --git a/src/tiffimage.cpp b/src/tiffimage.cpp
index 49d64ef..af2389e 100644
--- a/src/tiffimage.cpp
+++ b/src/tiffimage.cpp
@@ -811,6 +811,23 @@ namespace Exiv2 {
{ 10, ttSignedShort, 1 } // Exif.SonyCs.WhiteBalanceFineTune
};
+ //! Sony Camera Settings binary array - configuration
+ extern const ArrayCfg sonyCs2Cfg = {
+ Group::sonycs2, // Group for the elements
+ bigEndian, // Big endian
+ ttUndefined, // Type for array entry and size element
+ notEncrypted, // Not encrypted
+ false, // No size element
+ false, // No fillers
+ false, // Don't concatenate gaps
+ { 0, ttUnsignedShort, 1 }
+ };
+ //! Sony Camera Settings binary array - definition
+ extern const ArrayDef sonyCs2Def[] = {
+ { 6, ttUnsignedShort, 1 }, // Exif.SonyCs2.DriveMode
+ { 10, ttSignedShort, 1 } // Exif.SonyCs2.WhiteBalanceFineTune
+ };
+
/*
This table lists for each group in a tree, its parent group and tag.
Root identifies the root of a TIFF tree, as there is a need for multiple
@@ -1255,6 +1272,7 @@ namespace Exiv2 {
// Sony1 makernote
{ Tag::next, Group::sony1mn, newTiffDirectory<Group::ignr> },
{ 0x0114, Group::sony1mn, EXV_BINARY_ARRAY(sonyCsCfg, sonyCsDef) },
+ { 0x0114, Group::sony1mn, EXV_BINARY_ARRAY(sonyCs2Cfg, sonyCs2Def) },
{ 0xb028, Group::sony1mn, newTiffSubIfd<Group::sonymltmn> },
{ Tag::all, Group::sony1mn, newTiffEntry },
@@ -1264,6 +1282,7 @@ namespace Exiv2 {
// Sony2 makernote
{ Tag::next, Group::sony2mn, newTiffDirectory<Group::ignr> },
{ 0x0114, Group::sony2mn, EXV_BINARY_ARRAY(sonyCsCfg, sonyCsDef) },
+ { 0x0114, Group::sony2mn, EXV_BINARY_ARRAY(sonyCs2Cfg, sonyCs2Def) },
{ 0xb028, Group::sony2mn, newTiffSubIfd<Group::sonymltmn> },
{ Tag::all, Group::sony2mn, newTiffEntry },
diff --git a/src/types.hpp b/src/types.hpp
index 1b562e2..8b70010 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -226,6 +226,7 @@ namespace Exiv2 {
sonyIfdId,
sonyMltIfdId,
sonyCsIfdId,
+ sonyCs2IfdId,
lastIfdId
};
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list