[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:28 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b4c90e4
The following commit has been merged in the master branch:
commit b4c90e44653a23d676bfc204d5d76113ecce4abe
Author: HumanDynamo <caulier.gilles at gmail.com>
Date: Thu Apr 22 05:55:43 2010 +0000
implement LocalAFAreaPoint codec
---
src/minoltasonyvalues.cpp | 22 ++++++++++++++++++++++
src/minoltasonyvalues.hpp | 3 +++
src/sonymn.cpp | 4 ++--
3 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp
index a1bba9c..ad01032 100644
--- a/src/minoltasonyvalues.cpp
+++ b/src/minoltasonyvalues.cpp
@@ -378,4 +378,26 @@ namespace Exiv2 {
return EXV_PRINT_TAG(minoltaSonyAFAreaMode)(os, value, metadata);
}
+ // ----------------------------------------------------------------------------------------------------
+
+ //! Lookup table to translate Sony camera settings Local AF Area Point values to readable labels
+ extern const TagDetails minoltaSonyLocalAFAreaPoint[] = {
+ { 1, N_("Center") },
+ { 2, N_("Top") },
+ { 3, N_("Top-Right") },
+ { 4, N_("Right") },
+ { 5, N_("Bottom-Right") },
+ { 6, N_("Bottom") },
+ { 7, N_("Bottom-Left") },
+ { 8, N_("Left") },
+ { 9, N_("Top-Left") },
+ { 10, N_("Far-Right") },
+ { 11, N_("Far-Left") }
+ };
+
+ std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream& os, const Value& value, const ExifData* metadata)
+ {
+ return EXV_PRINT_TAG(minoltaSonyLocalAFAreaPoint)(os, value, metadata);
+ }
+
} // namespace Exiv2
diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp
index 40f9279..6d29e52 100644
--- a/src/minoltasonyvalues.hpp
+++ b/src/minoltasonyvalues.hpp
@@ -52,6 +52,9 @@ namespace Exiv2 {
//! Print Minolta/Sony AF Area Mode values to readable labels.
EXIV2API std::ostream& printMinoltaSonyAFAreaMode(std::ostream&, const Value&, const ExifData*);
+ //! Print Minolta/Sony Local AF Area Point values to readable labels.
+ EXIV2API std::ostream& printMinoltaSonyLocalAFAreaPoint(std::ostream&, const Value&, const ExifData*);
+
// TODO: Added shared methods here.
} // namespace Exiv2
diff --git a/src/sonymn.cpp b/src/sonymn.cpp
index e4b6d05..3554f41 100644
--- a/src/sonymn.cpp
+++ b/src/sonymn.cpp
@@ -416,7 +416,7 @@ namespace Exiv2 {
TagInfo(0x0018, "LocalAFAreaPoint", N_("Local AF Area Point"),
N_("Local AF Area Point"),
- sony1CsIfdId, makerTags, unsignedShort, printValue),
+ sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint),
TagInfo(0x0021, "MeteringMode", N_("Metering Mode"),
N_("Metering Mode"),
@@ -544,7 +544,7 @@ namespace Exiv2 {
TagInfo(0x0018, "LocalAFAreaPoint", N_("Local AF Area Point"),
N_("Local AF Area Point"),
- sony1Cs2IfdId, makerTags, unsignedShort, printValue),
+ sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyLocalAFAreaPoint),
TagInfo(0x0019, "MeteringMode", N_("Metering Mode"),
N_("Metering Mode"),
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list