[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:48 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7afb76c
The following commit has been merged in the master branch:
commit 7afb76c263956a828293fdc2abcfb2427b9b0aa2
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Thu Jul 27 16:30:09 2006 +0000
Changed Canon makernote to use EXV_PRINT_TAG. Fixed duplicate Cs1 FocusMode bug
---
src/canonmn.cpp | 518 +++++++++++++++++---------------------------
src/canonmn.hpp | 37 ----
test/data/bugfixes-test.out | 2 +-
test/data/crw-test.out | Bin 29642 -> 29642 bytes
test/data/exifdata-test.out | 8 +-
test/data/exiv2-test.out | 30 +--
6 files changed, 216 insertions(+), 379 deletions(-)
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 88cc6eb..2bcbd87 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -97,28 +97,172 @@ namespace Exiv2 {
TagInfo(0xffff, "(UnknownCanonMakerNoteTag)", "(UnknownCanonMakerNoteTag)", "Unknown CanonMakerNote tag", canonIfdId, makerTags, invalidTypeId, printValue)
};
+ //! Macro, tag 0x0001
+ extern const TagDetails canonCs1Macro[] = {
+ { 1, "On" },
+ { 2, "Off" }
+ };
+
+ //! Quality, tag 0x0003
+ extern const TagDetails canonCs1Quality[] = {
+ { 2, "Normal" },
+ { 3, "Fine" },
+ { 4, "Raw" },
+ { 5, "Superfine" }
+ };
+
+ //! FlashMode, tag 0x0004
+ extern const TagDetails canonCs1FlashMode[] = {
+ { 0, "Off" },
+ { 1, "Auto" },
+ { 2, "On" },
+ { 3, "Red-eye" },
+ { 4, "Slow sync" },
+ { 5, "Auto + red-eye" },
+ { 6, "On + red-eye" },
+ { 16, "External" }
+ };
+
+ //! DriveMode, tag 0x0005
+ extern const TagDetails canonCs1DriveMode[] = {
+ { 0, "Single / timer" },
+ { 1, "Continuous" }
+ };
+
+ //! FocusMode, tag 0x0007
+ extern const TagDetails canonCs1FocusMode[] = {
+ { 0, "One shot" },
+ { 1, "AI servo" },
+ { 2, "AI focus" },
+ { 3, "MF" },
+ { 4, "Single" },
+ { 5, "Continuous" },
+ { 6, "MF" }
+ };
+
+ //! ImageSize, tag 0x000a
+ extern const TagDetails canonCs1ImageSize[] = {
+ { 0, "Large" },
+ { 1, "Medium" },
+ { 2, "Small" }
+ };
+
+ //! EasyMode, tag 0x000b
+ extern const TagDetails canonCs1EasyMode[] = {
+ { 0, "Full auto" },
+ { 1, "Manual" },
+ { 2, "Landscape" },
+ { 3, "Fast shutter" },
+ { 4, "Slow shutter" },
+ { 5, "Night Scene" },
+ { 6, "B&W" },
+ { 7, "Sepia" },
+ { 8, "Portrait" },
+ { 9, "Sports" },
+ { 10, "Macro / close-up" },
+ { 11, "Pan focus" },
+ { 18, "Foliage" },
+ { 19, "Indoor" },
+ { 20, "Fireworks" },
+ { 21, "Beach" },
+ { 23, "Snow" },
+ { 25, "Night SnapShot" },
+ { 27, "My Colors" },
+ { 28, "Movie" }
+ };
+
+ //! DigitalZoom, tag 0x000c
+ extern const TagDetails canonCs1DigitalZoom[] = {
+ { 0, "None" },
+ { 1, "2x" },
+ { 2, "4x" }
+ };
+
+ //! Contrast, Saturation Sharpness, tags 0x000d, 0x000e, 0x000f
+ extern const TagDetails canonCs1Lnh[] = {
+ { 0xffff, "Low" },
+ { 0x0000, "Normal" },
+ { 0x0001, "High" }
+ };
+
+ //! ISOSpeeds, tag 0x0010
+ extern const TagDetails canonCs1ISOSpeed[] = {
+ { 0, "n/a" },
+ { 15, "Auto" },
+ { 16, "50" },
+ { 17, "100" },
+ { 18, "200" },
+ { 19, "400" }
+ };
+
+ //! MeteringMode, tag 0x0011
+ extern const TagDetails canonCs1MeteringMode[] = {
+ { 3, "Evaluative" },
+ { 4, "Partial" },
+ { 5, "Center weighted" }
+ };
+
+ //! FocusType, tag 0x0012
+ extern const TagDetails canonCs1FocusType[] = {
+ { 0, "Manual" },
+ { 1, "Auto" },
+ { 3, "Close-up (macro)" },
+ { 8, "Locked (pan mode)" }
+ };
+
+ //! AFPoint, tag 0x0013
+ extern const TagDetails canonCs1AfPoint[] = {
+ { 0x3000, "None (MF)" },
+ { 0x3001, "Auto-selected" },
+ { 0x3002, "Right" },
+ { 0x3003, "Center" },
+ { 0x3004, "Left" }
+ };
+
+ //! ExposureProgram, tag 0x0014
+ extern const TagDetails canonCs1ExposureProgram[] = {
+ { 0, "Easy shooting (Auto)" },
+ { 1, "Program (P)" },
+ { 2, "Shutter priority (Tv)" },
+ { 3, "Aperture priority (Av)" },
+ { 4, "Manual (M)" },
+ { 5, "A-DEP" }
+ };
+
+ //! FlashActivity, tag 0x001c
+ extern const TagDetails canonCs1FlashActivity[] = {
+ { 0, "Did not fire" },
+ { 1, "Fired" }
+ };
+
+ //! FocusContinuous, tag 0x0020
+ extern const TagDetails canonCs1FocusContinuous[] = {
+ { 0, "Single" },
+ { 1, "Continuous" }
+ };
+
// Canon Camera Settings 1 Tag Info
const TagInfo CanonMakerNote::tagInfoCs1_[] = {
- TagInfo(0x0001, "Macro", "Macro", "Macro mode", canonCs1IfdId, makerTags, unsignedShort, printCs10x0001),
+ TagInfo(0x0001, "Macro", "Macro", "Macro mode", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1Macro)),
TagInfo(0x0002, "Selftimer", "Selftimer", "Self timer", canonCs1IfdId, makerTags, unsignedShort, printCs10x0002),
- TagInfo(0x0003, "Quality", "Quality", "Quality", canonCs1IfdId, makerTags, unsignedShort, printCs10x0003),
- TagInfo(0x0004, "FlashMode", "Flash Mode", "Flash mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0004),
- TagInfo(0x0005, "DriveMode", "Drive Mode", "Drive mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0005),
+ TagInfo(0x0003, "Quality", "Quality", "Quality", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1Quality)),
+ TagInfo(0x0004, "FlashMode", "Flash Mode", "Flash mode setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1FlashMode)),
+ TagInfo(0x0005, "DriveMode", "Drive Mode", "Drive mode setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1DriveMode)),
TagInfo(0x0006, "0x0006", "0x0006", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0007, "FocusMode", "Focus Mode", "Focus mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0007),
+ TagInfo(0x0007, "FocusMode", "Focus Mode", "Focus mode setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1FocusMode)),
TagInfo(0x0008, "0x0008", "0x0008", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0009, "0x0009", "0x0009", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x000a, "ImageSize", "Image Size", "Image size", canonCs1IfdId, makerTags, unsignedShort, printCs10x000a),
- TagInfo(0x000b, "EasyMode", "Easy Mode", "Easy shooting mode", canonCs1IfdId, makerTags, unsignedShort, printCs10x000b),
- TagInfo(0x000c, "DigitalZoom", "Digital Zoom", "Digital zoom", canonCs1IfdId, makerTags, unsignedShort, printCs10x000c),
- TagInfo(0x000d, "Contrast", "Contrast", "Contrast setting", canonCs1IfdId, makerTags, unsignedShort, printCs1Lnh),
- TagInfo(0x000e, "Saturation", "Saturation", "Saturation setting", canonCs1IfdId, makerTags, unsignedShort, printCs1Lnh),
- TagInfo(0x000f, "Sharpness", "Sharpness", "Sharpness setting", canonCs1IfdId, makerTags, unsignedShort, printCs1Lnh),
- TagInfo(0x0010, "ISOSpeed", "ISO Speed Mode", "ISO speed setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0010),
- TagInfo(0x0011, "MeteringMode", "Metering Mode", "Metering mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0011),
- TagInfo(0x0012, "FocusType", "Focus Type", "Focus type setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0012),
- TagInfo(0x0013, "AFPoint", "AFPoint", "AF point selected", canonCs1IfdId, makerTags, unsignedShort, printCs10x0013),
- TagInfo(0x0014, "ExposureProgram", "Exposure Program", "Exposure mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0014),
+ TagInfo(0x000a, "ImageSize", "Image Size", "Image size", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1ImageSize)),
+ TagInfo(0x000b, "EasyMode", "Easy Mode", "Easy shooting mode", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1EasyMode)),
+ TagInfo(0x000c, "DigitalZoom", "Digital Zoom", "Digital zoom", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1DigitalZoom)),
+ TagInfo(0x000d, "Contrast", "Contrast", "Contrast setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1Lnh)),
+ TagInfo(0x000e, "Saturation", "Saturation", "Saturation setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1Lnh)),
+ TagInfo(0x000f, "Sharpness", "Sharpness", "Sharpness setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1Lnh)),
+ TagInfo(0x0010, "ISOSpeed", "ISO Speed Mode", "ISO speed setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1ISOSpeed)),
+ TagInfo(0x0011, "MeteringMode", "Metering Mode", "Metering mode setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1MeteringMode)),
+ TagInfo(0x0012, "FocusType", "Focus Type", "Focus type setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1FocusType)),
+ TagInfo(0x0013, "AFPoint", "AFPoint", "AF point selected", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1AfPoint)),
+ TagInfo(0x0014, "ExposureProgram", "Exposure Program", "Exposure mode setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1ExposureProgram)),
TagInfo(0x0015, "0x0015", "0x0015", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0016, "0x0016", "0x0016", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0017, "Lens", "Lens", "'long' and 'short' focal length of lens (in 'focal units') and 'focal units' per mm", canonCs1IfdId, makerTags, unsignedShort, printCs1Lens),
@@ -126,11 +270,11 @@ namespace Exiv2 {
TagInfo(0x0019, "0x0019", "0x0019", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001a, "0x001a", "0x001a", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001b, "0x001b", "0x001b", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x001c, "FlashActivity", "FlashActivity", "Flash activity", canonCs1IfdId, makerTags, unsignedShort, printCs10x001c),
+ TagInfo(0x001c, "FlashActivity", "FlashActivity", "Flash activity", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1FlashActivity)),
TagInfo(0x001d, "FlashDetails", "FlashDetails", "Flash details", canonCs1IfdId, makerTags, unsignedShort, printCs10x001d),
TagInfo(0x001e, "0x001e", "0x001e", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001f, "0x001f", "0x001f", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0020, "FocusMode", "FocusMode", "Focus mode setting", canonCs1IfdId, makerTags, unsignedShort, printCs10x0020),
+ TagInfo(0x0020, "FocusContinuous", "Focus Continuous", "Focus continuous setting", canonCs1IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs1FocusContinuous)),
TagInfo(0x0021, "0x0021", "0x0021", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0022, "0x0022", "0x0022", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0023, "0x0023", "0x0023", "Unknown", canonCs1IfdId, makerTags, unsignedShort, printValue),
@@ -142,6 +286,38 @@ namespace Exiv2 {
TagInfo(0xffff, "(UnknownCanonCs1Tag)", "(UnknownCanonCs1Tag)", "Unknown Canon Camera Settings 1 tag", canonCs1IfdId, makerTags, invalidTypeId, printValue)
};
+ //! WhiteBalance, tag 0x0007
+ extern const TagDetails canonCs2WhiteBalance[] = {
+ { 0, "Auto" },
+ { 1, "Sunny" },
+ { 2, "Cloudy" },
+ { 3, "Tungsten" },
+ { 4, "Fluorescent" },
+ { 5, "Flash" },
+ { 6, "Custom" }
+ };
+
+ //! FlashBias, tag 0x000f
+ extern const TagDetails canonCs2FlashBias[] = {
+ { 0xffc0, "-2 EV" },
+ { 0xffcc, "-1.67 EV" },
+ { 0xffd0, "-1.50 EV" },
+ { 0xffd4, "-1.33 EV" },
+ { 0xffe0, "-1 EV" },
+ { 0xffec, "-0.67 EV" },
+ { 0xfff0, "-0.50 EV" },
+ { 0xfff4, "-0.33 EV" },
+ { 0x0000, "0 EV" },
+ { 0x000c, "0.33 EV" },
+ { 0x0010, "0.50 EV" },
+ { 0x0014, "0.67 EV" },
+ { 0x0020, "1 EV" },
+ { 0x002c, "1.33 EV" },
+ { 0x0030, "1.50 EV" },
+ { 0x0034, "1.67 EV" },
+ { 0x0040, "2 EV" }
+ };
+
// Canon Camera Settings 2 Tag Info
const TagInfo CanonMakerNote::tagInfoCs2_[] = {
TagInfo(0x0001, "0x0001", "0x0001", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
@@ -150,7 +326,7 @@ namespace Exiv2 {
TagInfo(0x0004, "TargetAperture", "TargetAperture", "Target Aperture", canonCs2IfdId, makerTags, unsignedShort, printCs20x0015),
TagInfo(0x0005, "TargetShutterSpeed", "TargetShutterSpeed", "Target shutter speed", canonCs2IfdId, makerTags, unsignedShort, printCs20x0016),
TagInfo(0x0006, "0x0006", "0x0006", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
- TagInfo(0x0007, "WhiteBalance", "WhiteBalance", "White balance setting", canonCs2IfdId, makerTags, unsignedShort, printCs20x0007),
+ TagInfo(0x0007, "WhiteBalance", "WhiteBalance", "White balance setting", canonCs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs2WhiteBalance)),
TagInfo(0x0008, "0x0008", "0x0008", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0009, "Sequence", "Sequence", "Sequence number (if in a continuous burst)", canonCs2IfdId, makerTags, unsignedShort, printCs20x0009),
TagInfo(0x000a, "0x000a", "0x000a", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
@@ -158,7 +334,7 @@ namespace Exiv2 {
TagInfo(0x000c, "0x000c", "0x000c", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x000d, "0x000d", "0x000d", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x000e, "AFPointUsed", "AFPointUsed", "AF point used", canonCs2IfdId, makerTags, unsignedShort, printCs20x000e),
- TagInfo(0x000f, "FlashBias", "FlashBias", "Flash bias", canonCs2IfdId, makerTags, unsignedShort, printCs20x000f),
+ TagInfo(0x000f, "FlashBias", "FlashBias", "Flash bias", canonCs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(canonCs2FlashBias)),
TagInfo(0x0010, "0x0010", "0x0010", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0011, "0x0011", "0x0011", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0012, "0x0012", "0x0012", "Unknown", canonCs2IfdId, makerTags, unsignedShort, printValue),
@@ -453,19 +629,6 @@ namespace Exiv2 {
<< (l & 0x0000ffff);
}
- std::ostream& CanonMakerNote::printCs10x0001(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 1: os << "On"; break;
- case 2: os << "Off"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
std::ostream& CanonMakerNote::printCs10x0002(std::ostream& os,
const Value& value)
{
@@ -480,236 +643,6 @@ namespace Exiv2 {
return os;
}
- std::ostream& CanonMakerNote::printCs10x0003(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 2: os << "Normal"; break;
- case 3: os << "Fine"; break;
- case 4: os << "Raw"; break;
- case 5: os << "Superfine"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0004(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Off"; break;
- case 1: os << "Auto"; break;
- case 2: os << "On"; break;
- case 3: os << "Red-eye"; break;
- case 4: os << "Slow sync"; break;
- case 5: os << "Auto + red-eye"; break;
- case 6: os << "On + red-eye"; break;
- case 16: os << "External"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0005(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Single / timer"; break;
- case 1: os << "Continuous"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0007(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "One shot"; break;
- case 1: os << "AI servo"; break;
- case 2: os << "AI Focus"; break;
- case 3: os << "MF"; break;
- case 4: os << "Single"; break;
- case 5: os << "Continuous"; break;
- case 6: os << "MF"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x000a(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Large"; break;
- case 1: os << "Medium"; break;
- case 2: os << "Small"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x000b(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Full auto"; break;
- case 1: os << "Manual"; break;
- case 2: os << "Landscape"; break;
- case 3: os << "Fast shutter"; break;
- case 4: os << "Slow shutter"; break;
- case 5: os << "Night Scene"; break;
- case 6: os << "B&W"; break;
- case 7: os << "Sepia"; break;
- case 8: os << "Portrait"; break;
- case 9: os << "Sports"; break;
- case 10: os << "Macro / close-up"; break;
- case 11: os << "Pan focus"; break;
- case 18: os << "Foliage"; break;
- case 19: os << "Indoor"; break;
- case 20: os << "Fireworks"; break;
- case 21: os << "Beach"; break;
- case 23: os << "Snow"; break;
- case 25: os << "Night SnapShot"; break;
- case 27: os << "My Colors"; break;
- case 28: os << "Movie"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x000c(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "None"; break;
- case 1: os << "2x"; break;
- case 2: os << "4x"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs1Lnh(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0xffff: os << "Low"; break;
- case 0x0000: os << "Normal"; break;
- case 0x0001: os << "High"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0010(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "n/a"; break;
- case 15: os << "Auto"; break;
- case 16: os << "50"; break;
- case 17: os << "100"; break;
- case 18: os << "200"; break;
- case 19: os << "400"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0011(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 3: os << "Evaluative"; break;
- case 4: os << "Partial"; break;
- case 5: os << "Center weighted"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0012(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Manual"; break;
- case 1: os << "Auto"; break;
- case 3: os << "Close-up (macro)"; break;
- case 8: os << "Locked (pan mode)"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0013(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0x3000: os << "None (MF)"; break;
- case 0x3001: os << "Auto-selected"; break;
- case 0x3002: os << "Right"; break;
- case 0x3003: os << "Center"; break;
- case 0x3004: os << "Left"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x0014(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Easy shooting (Auto)"; break;
- case 1: os << "Program (P)"; break;
- case 2: os << "Shutter priority (Tv)"; break;
- case 3: os << "Aperture priority (Av)"; break;
- case 4: os << "Manual (M)"; break;
- case 5: os << "A-DEP"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
- std::ostream& CanonMakerNote::printCs10x001c(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Did not fire"; break;
- case 1: os << "Fired"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
std::ostream& CanonMakerNote::printCs10x001d(std::ostream& os,
const Value& value)
{
@@ -744,19 +677,6 @@ namespace Exiv2 {
return os;
}
- std::ostream& CanonMakerNote::printCs10x0020(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Single"; break;
- case 1: os << "Continuous"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
std::ostream& CanonMakerNote::printCs1Lens(std::ostream& os,
const Value& value)
{
@@ -782,24 +702,6 @@ namespace Exiv2 {
return os << exp(canonEv(value.toLong()) * log(2.0)) * 100.0 / 32.0;
}
- std::ostream& CanonMakerNote::printCs20x0007(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0: os << "Auto"; break;
- case 1: os << "Sunny"; break;
- case 2: os << "Cloudy"; break;
- case 3: os << "Tungsten"; break;
- case 4: os << "Fluorescent"; break;
- case 5: os << "Flash"; break;
- case 6: os << "Custom"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
std::ostream& CanonMakerNote::printCs20x0009(std::ostream& os,
const Value& value)
{
@@ -843,34 +745,6 @@ namespace Exiv2 {
return os;
}
- std::ostream& CanonMakerNote::printCs20x000f(std::ostream& os,
- const Value& value)
- {
- if (value.typeId() != unsignedShort) return os << value;
- long l = value.toLong();
- switch (l) {
- case 0xffc0: os << "-2 EV"; break;
- case 0xffcc: os << "-1.67 EV"; break;
- case 0xffd0: os << "-1.50 EV"; break;
- case 0xffd4: os << "-1.33 EV"; break;
- case 0xffe0: os << "-1 EV"; break;
- case 0xffec: os << "-0.67 EV"; break;
- case 0xfff0: os << "-0.50 EV"; break;
- case 0xfff4: os << "-0.33 EV"; break;
- case 0x0000: os << "0 EV"; break;
- case 0x000c: os << "0.33 EV"; break;
- case 0x0010: os << "0.50 EV"; break;
- case 0x0014: os << "0.67 EV"; break;
- case 0x0020: os << "1 EV"; break;
- case 0x002c: os << "1.33 EV"; break;
- case 0x0030: os << "1.50 EV"; break;
- case 0x0034: os << "1.67 EV"; break;
- case 0x0040: os << "2 EV"; break;
- default: os << "(" << l << ")"; break;
- }
- return os;
- }
-
std::ostream& CanonMakerNote::printCs20x0013(std::ostream& os,
const Value& value)
{
diff --git a/src/canonmn.hpp b/src/canonmn.hpp
index 53a8025..7f29833 100644
--- a/src/canonmn.hpp
+++ b/src/canonmn.hpp
@@ -137,55 +137,18 @@ namespace Exiv2 {
static std::ostream& print0x0008(std::ostream& os, const Value& value);
//! Print the serial number of the camera
static std::ostream& print0x000c(std::ostream& os, const Value& value);
-
- //! Macro mode
- static std::ostream& printCs10x0001(std::ostream& os, const Value& value);
//! Self timer
static std::ostream& printCs10x0002(std::ostream& os, const Value& value);
- //! Quality
- static std::ostream& printCs10x0003(std::ostream& os, const Value& value);
- //! Flash mode
- static std::ostream& printCs10x0004(std::ostream& os, const Value& value);
- //! Drive mode
- static std::ostream& printCs10x0005(std::ostream& os, const Value& value);
- //! Focus mode (G1 seems to use field 32 in preference to this)
- static std::ostream& printCs10x0007(std::ostream& os, const Value& value);
- //! Image size
- static std::ostream& printCs10x000a(std::ostream& os, const Value& value);
- //! Easy shooting
- static std::ostream& printCs10x000b(std::ostream& os, const Value& value);
- //! Digital zoom
- static std::ostream& printCs10x000c(std::ostream& os, const Value& value);
- //! ISO
- static std::ostream& printCs10x0010(std::ostream& os, const Value& value);
- //! Metering mode
- static std::ostream& printCs10x0011(std::ostream& os, const Value& value);
- //! Focus type
- static std::ostream& printCs10x0012(std::ostream& os, const Value& value);
- //! AF point selected
- static std::ostream& printCs10x0013(std::ostream& os, const Value& value);
- //! Exposure mode
- static std::ostream& printCs10x0014(std::ostream& os, const Value& value);
- //! Flash activity
- static std::ostream& printCs10x001c(std::ostream& os, const Value& value);
//! Flash details
static std::ostream& printCs10x001d(std::ostream& os, const Value& value);
- //! Focus mode (G1 seems to use this in preference to field 7)
- static std::ostream& printCs10x0020(std::ostream& os, const Value& value);
- //! Low, normal, high print function
- static std::ostream& printCs1Lnh(std::ostream& os, const Value& value);
//! Camera lens information
static std::ostream& printCs1Lens(std::ostream& os, const Value& value);
//! ISO speed used
static std::ostream& printCs20x0002(std::ostream& os, const Value& value);
- //! White balance
- static std::ostream& printCs20x0007(std::ostream& os, const Value& value);
//! Sequence number
static std::ostream& printCs20x0009(std::ostream& os, const Value& value);
//! AF point used
static std::ostream& printCs20x000e(std::ostream& os, const Value& value);
- //! Flash bias
- static std::ostream& printCs20x000f(std::ostream& os, const Value& value);
//! Subject distance
static std::ostream& printCs20x0013(std::ostream& os, const Value& value);
//! Aperture
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index c5c8355..e46a183 100644
--- a/test/data/bugfixes-test.out
+++ b/test/data/bugfixes-test.out
@@ -157,7 +157,7 @@ Exif.CanonCs1.FlashActivity Short 1 Did not fire
Exif.CanonCs1.FlashDetails Short 1
Exif.CanonCs1.0x001e Short 1 0
Exif.CanonCs1.0x001f Short 1 0
-Exif.CanonCs1.FocusMode Short 1 Single
+Exif.CanonCs1.FocusContinuous Short 1 Single
Exif.CanonCs1.0x0021 Short 1 0
Exif.CanonCs1.0x0022 Short 1 65535
Exif.CanonCs1.0x0023 Short 1 49
diff --git a/test/data/crw-test.out b/test/data/crw-test.out
index 6e26a6d..51e0a98 100644
Binary files a/test/data/crw-test.out and b/test/data/crw-test.out differ
diff --git a/test/data/exifdata-test.out b/test/data/exifdata-test.out
index 5bf8b90..62d4775 100644
--- a/test/data/exifdata-test.out
+++ b/test/data/exifdata-test.out
@@ -244,7 +244,7 @@ Exif.CanonCs1.FlashActivity 0x001c Makernote Short 1
Exif.CanonCs1.FlashDetails 0x001d Makernote Short 1 0
Exif.CanonCs1.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs1.0x001f 0x001f Makernote Short 1 0
-Exif.CanonCs1.FocusMode 0x0020 Makernote Short 1 0
+Exif.CanonCs1.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs1.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs1.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs1.0x0023 0x0023 Makernote Short 1 49
@@ -368,7 +368,7 @@ Exif.CanonCs1.FlashActivity 0x001c Makernote Short 1
Exif.CanonCs1.FlashDetails 0x001d Makernote Short 1 0
Exif.CanonCs1.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs1.0x001f 0x001f Makernote Short 1 0
-Exif.CanonCs1.FocusMode 0x0020 Makernote Short 1 0
+Exif.CanonCs1.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs1.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs1.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs1.0x0023 0x0023 Makernote Short 1 49
@@ -493,7 +493,7 @@ Exif.CanonCs1.FlashActivity 0x001c Makernote Short 1
Exif.CanonCs1.FlashDetails 0x001d Makernote Short 1 0
Exif.CanonCs1.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs1.0x001f 0x001f Makernote Short 1 0
-Exif.CanonCs1.FocusMode 0x0020 Makernote Short 1 0
+Exif.CanonCs1.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs1.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs1.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs1.0x0023 0x0023 Makernote Short 1 49
@@ -617,7 +617,7 @@ Exif.CanonCs1.FlashActivity 0x001c Makernote Short 1
Exif.CanonCs1.FlashDetails 0x001d Makernote Short 1 0
Exif.CanonCs1.0x001e 0x001e Makernote Short 1 0
Exif.CanonCs1.0x001f 0x001f Makernote Short 1 0
-Exif.CanonCs1.FocusMode 0x0020 Makernote Short 1 0
+Exif.CanonCs1.FocusContinuous 0x0020 Makernote Short 1 0
Exif.CanonCs1.0x0021 0x0021 Makernote Short 1 0
Exif.CanonCs1.0x0022 0x0022 Makernote Short 1 65535
Exif.CanonCs1.0x0023 0x0023 Makernote Short 1 49
diff --git a/test/data/exiv2-test.out b/test/data/exiv2-test.out
index 320f5ae..c8f2ca0 100644
--- a/test/data/exiv2-test.out
+++ b/test/data/exiv2-test.out
@@ -529,7 +529,7 @@ File 2/12: 20031214_000043.jpg
20031214_000043.jpg Exif.CanonCs1.FlashDetails Short 1
20031214_000043.jpg Exif.CanonCs1.0x001e Short 1 0
20031214_000043.jpg Exif.CanonCs1.0x001f Short 1 0
-20031214_000043.jpg Exif.CanonCs1.FocusMode Short 1 Single
+20031214_000043.jpg Exif.CanonCs1.FocusContinuous Short 1 Single
20031214_000043.jpg Exif.CanonCs1.0x0021 Short 1 0
20031214_000043.jpg Exif.CanonCs1.0x0022 Short 1 65535
20031214_000043.jpg Exif.CanonCs1.0x0023 Short 1 49
@@ -860,7 +860,7 @@ File 6/12: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs1.FlashMode Short 1 Off
20030925_201850.jpg Exif.CanonCs1.DriveMode Short 1 Single / timer
20030925_201850.jpg Exif.CanonCs1.0x0006 Short 1 0
-20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI Focus
+20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI focus
20030925_201850.jpg Exif.CanonCs1.0x0008 Short 1 0
20030925_201850.jpg Exif.CanonCs1.0x0009 Short 1 1
20030925_201850.jpg Exif.CanonCs1.ImageSize Short 1 Large
@@ -883,7 +883,7 @@ File 6/12: 20030925_201850.jpg
20030925_201850.jpg Exif.CanonCs1.FlashDetails Short 1
20030925_201850.jpg Exif.CanonCs1.0x001e Short 1 0
20030925_201850.jpg Exif.CanonCs1.0x001f Short 1 0
-20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 (65535)
+20030925_201850.jpg Exif.CanonCs1.FocusContinuous Short 1 (65535)
20030925_201850.jpg Exif.CanonCs1.0x0021 Short 1 65535
20030925_201850.jpg Exif.CanonCs1.0x0022 Short 1 65535
20030925_201850.jpg Exif.CanonCs1.0x0023 Short 1 0
@@ -1470,7 +1470,7 @@ Compare image data and extracted data ------------------------------------
< 20031214_000043.jpg Exif.CanonCs1.FlashDetails Short 1
< 20031214_000043.jpg Exif.CanonCs1.0x001e Short 1 0
< 20031214_000043.jpg Exif.CanonCs1.0x001f Short 1 0
-< 20031214_000043.jpg Exif.CanonCs1.FocusMode Short 1 Single
+< 20031214_000043.jpg Exif.CanonCs1.FocusContinuous Short 1 Single
< 20031214_000043.jpg Exif.CanonCs1.0x0021 Short 1 0
< 20031214_000043.jpg Exif.CanonCs1.0x0022 Short 1 65535
< 20031214_000043.jpg Exif.CanonCs1.0x0023 Short 1 49
@@ -1801,7 +1801,7 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonCs1.FlashMode Short 1 Off
< 20030925_201850.jpg Exif.CanonCs1.DriveMode Short 1 Single / timer
< 20030925_201850.jpg Exif.CanonCs1.0x0006 Short 1 0
-< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI Focus
+< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI focus
< 20030925_201850.jpg Exif.CanonCs1.0x0008 Short 1 0
< 20030925_201850.jpg Exif.CanonCs1.0x0009 Short 1 1
< 20030925_201850.jpg Exif.CanonCs1.ImageSize Short 1 Large
@@ -1824,7 +1824,7 @@ Compare image data and extracted data ------------------------------------
< 20030925_201850.jpg Exif.CanonCs1.FlashDetails Short 1
< 20030925_201850.jpg Exif.CanonCs1.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonCs1.0x001f Short 1 0
-< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 (65535)
+< 20030925_201850.jpg Exif.CanonCs1.FocusContinuous Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs1.0x0021 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs1.0x0022 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs1.0x0023 Short 1 0
@@ -2355,7 +2355,7 @@ Compare image data and extracted data ------------------------------------
> 20031214_000043.exv Exif.CanonCs1.FlashDetails Short 1
> 20031214_000043.exv Exif.CanonCs1.0x001e Short 1 0
> 20031214_000043.exv Exif.CanonCs1.0x001f Short 1 0
-> 20031214_000043.exv Exif.CanonCs1.FocusMode Short 1 Single
+> 20031214_000043.exv Exif.CanonCs1.FocusContinuous Short 1 Single
> 20031214_000043.exv Exif.CanonCs1.0x0021 Short 1 0
> 20031214_000043.exv Exif.CanonCs1.0x0022 Short 1 65535
> 20031214_000043.exv Exif.CanonCs1.0x0023 Short 1 49
@@ -2686,7 +2686,7 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonCs1.FlashMode Short 1 Off
> 20030925_201850.exv Exif.CanonCs1.DriveMode Short 1 Single / timer
> 20030925_201850.exv Exif.CanonCs1.0x0006 Short 1 0
-> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 AI Focus
+> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 AI focus
> 20030925_201850.exv Exif.CanonCs1.0x0008 Short 1 0
> 20030925_201850.exv Exif.CanonCs1.0x0009 Short 1 1
> 20030925_201850.exv Exif.CanonCs1.ImageSize Short 1 Large
@@ -2709,7 +2709,7 @@ Compare image data and extracted data ------------------------------------
> 20030925_201850.exv Exif.CanonCs1.FlashDetails Short 1
> 20030925_201850.exv Exif.CanonCs1.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonCs1.0x001f Short 1 0
-> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 (65535)
+> 20030925_201850.exv Exif.CanonCs1.FocusContinuous Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs1.0x0021 Short 1 65535
> 20030925_201850.exv Exif.CanonCs1.0x0022 Short 1 65535
> 20030925_201850.exv Exif.CanonCs1.0x0023 Short 1 0
@@ -3368,7 +3368,7 @@ Compare original and inserted image data ---------------------------------
< 20031214_000043.jpg Exif.CanonCs1.FlashDetails Short 1
< 20031214_000043.jpg Exif.CanonCs1.0x001e Short 1 0
< 20031214_000043.jpg Exif.CanonCs1.0x001f Short 1 0
-< 20031214_000043.jpg Exif.CanonCs1.FocusMode Short 1 Single
+< 20031214_000043.jpg Exif.CanonCs1.FocusContinuous Short 1 Single
< 20031214_000043.jpg Exif.CanonCs1.0x0021 Short 1 0
< 20031214_000043.jpg Exif.CanonCs1.0x0022 Short 1 65535
< 20031214_000043.jpg Exif.CanonCs1.0x0023 Short 1 49
@@ -3699,7 +3699,7 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonCs1.FlashMode Short 1 Off
< 20030925_201850.jpg Exif.CanonCs1.DriveMode Short 1 Single / timer
< 20030925_201850.jpg Exif.CanonCs1.0x0006 Short 1 0
-< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI Focus
+< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 AI focus
< 20030925_201850.jpg Exif.CanonCs1.0x0008 Short 1 0
< 20030925_201850.jpg Exif.CanonCs1.0x0009 Short 1 1
< 20030925_201850.jpg Exif.CanonCs1.ImageSize Short 1 Large
@@ -3722,7 +3722,7 @@ Compare original and inserted image data ---------------------------------
< 20030925_201850.jpg Exif.CanonCs1.FlashDetails Short 1
< 20030925_201850.jpg Exif.CanonCs1.0x001e Short 1 0
< 20030925_201850.jpg Exif.CanonCs1.0x001f Short 1 0
-< 20030925_201850.jpg Exif.CanonCs1.FocusMode Short 1 (65535)
+< 20030925_201850.jpg Exif.CanonCs1.FocusContinuous Short 1 (65535)
< 20030925_201850.jpg Exif.CanonCs1.0x0021 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs1.0x0022 Short 1 65535
< 20030925_201850.jpg Exif.CanonCs1.0x0023 Short 1 0
@@ -4253,7 +4253,7 @@ Compare original and inserted image data ---------------------------------
> 20031214_000043.exv Exif.CanonCs1.FlashDetails Short 1
> 20031214_000043.exv Exif.CanonCs1.0x001e Short 1 0
> 20031214_000043.exv Exif.CanonCs1.0x001f Short 1 0
-> 20031214_000043.exv Exif.CanonCs1.FocusMode Short 1 Single
+> 20031214_000043.exv Exif.CanonCs1.FocusContinuous Short 1 Single
> 20031214_000043.exv Exif.CanonCs1.0x0021 Short 1 0
> 20031214_000043.exv Exif.CanonCs1.0x0022 Short 1 65535
> 20031214_000043.exv Exif.CanonCs1.0x0023 Short 1 49
@@ -4584,7 +4584,7 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonCs1.FlashMode Short 1 Off
> 20030925_201850.exv Exif.CanonCs1.DriveMode Short 1 Single / timer
> 20030925_201850.exv Exif.CanonCs1.0x0006 Short 1 0
-> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 AI Focus
+> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 AI focus
> 20030925_201850.exv Exif.CanonCs1.0x0008 Short 1 0
> 20030925_201850.exv Exif.CanonCs1.0x0009 Short 1 1
> 20030925_201850.exv Exif.CanonCs1.ImageSize Short 1 Large
@@ -4607,7 +4607,7 @@ Compare original and inserted image data ---------------------------------
> 20030925_201850.exv Exif.CanonCs1.FlashDetails Short 1
> 20030925_201850.exv Exif.CanonCs1.0x001e Short 1 0
> 20030925_201850.exv Exif.CanonCs1.0x001f Short 1 0
-> 20030925_201850.exv Exif.CanonCs1.FocusMode Short 1 (65535)
+> 20030925_201850.exv Exif.CanonCs1.FocusContinuous Short 1 (65535)
> 20030925_201850.exv Exif.CanonCs1.0x0021 Short 1 65535
> 20030925_201850.exv Exif.CanonCs1.0x0022 Short 1 65535
> 20030925_201850.exv Exif.CanonCs1.0x0023 Short 1 0
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list