third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more A100 CS tags

Browse Source
This commit is contained in:
HumanDynamo 2010-04-24 04:48:35 +00:00
parent ac86a22f23
commit b28ecd93ad
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/minoltamn.cpp
View File

@ -1094,6 +1094,12 @@ namespace Exiv2 {
{ 2, N_("Spot") }
};
//! Lookup table to translate Sony A100 camera settings color space values to readable labels
extern const TagDetails sonyColorSpaceA100[] = {
{ 0, N_("sRGB") },
{ 5, N_("Adobe RGB") }
};
// Sony A100 Camera Settings Tag Info
const TagInfo MinoltaMakerNote::tagInfoCsA100_[] = {
TagInfo(0x0000, "ExposureMode", N_("Exposure Mode"),
@ -1147,14 +1153,29 @@ namespace Exiv2 {
TagInfo(0x0015, "DynamicRangeOptimizerMode", N_("Dynamic Range Optimizer Mode"),
N_("Dynamic range optimizer mode"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyDynamicRangeOptimizerMode),
/*
TagInfo(0x0031, "Contrast", N_("Contrast"),
TagInfo(0x0016, "ColorMode", N_("Color Mode"),
N_("Color mode"),
sony1MltCsA100IfdId, makerTags, unsignedLong, printMinoltaSonyColorMode),
TagInfo(0x0017, "ColorSpace", N_("Color Space"),
N_("Color space"),
sony1MltCsA100IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyColorSpaceA100)),
TagInfo(0x0018, "Sharpness", N_("Sharpness"),
N_("Sharpness"),
sony1CsIfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0019, "Contrast", N_("Contrast"),
N_("Contrast"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x0032, "Saturation", N_("Saturation"),
TagInfo(0x001A, "Saturation", N_("Saturation"),
N_("Saturation"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x001C, "FlashMetering", N_("Flash Metering"),
N_("Flash metering"),
sony1MltCsA100IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaFlashMeteringStd)),
TagInfo(0x001D, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
N_("Priority Setup Shutter Release"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyPrioritySetupShutterRelease),
/*
TagInfo(0x0035, "ExposureTime", N_("Exposure Time"),
N_("Exposure time"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),

13
src/minoltasonyvalues.cpp
View File

@ -415,4 +415,17 @@ namespace Exiv2 {
{
return EXV_PRINT_TAG(minoltaSonyDynamicRangeOptimizerMode)(os, value, metadata);
}
// ----------------------------------------------------------------------------------------------------
//! Lookup table to translate Sony camera settings priority setup shutter release values to readable labels
extern const TagDetails minoltaSonyPrioritySetupShutterRelease[] = {
{ 0, N_("AF") },
{ 1, N_("Release") },
};
std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream& os, const Value& value, const ExifData* metadata)
{
return EXV_PRINT_TAG(minoltaSonyPrioritySetupShutterRelease)(os, value, metadata);
}
} // namespace Exiv2

3
src/minoltasonyvalues.hpp
View File

@ -58,6 +58,9 @@ namespace Exiv2 {
//! Print Minolta/Sony dynamic range optimizer mode values to readable labels.
EXIV2API std::ostream& printMinoltaSonyDynamicRangeOptimizerMode(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony priority setup shutter release values to readable labels.
EXIV2API std::ostream& printMinoltaSonyPrioritySetupShutterRelease(std::ostream&, const Value&, const ExifData*);
// TODO: Added shared methods here.
} // namespace Exiv2

10
src/sonymn.cpp
View File

@ -333,7 +333,7 @@ namespace Exiv2 {
sony1IfdId, makerTags, undefined, printValue),
TagInfo(0xb029, "ColorMode", N_("Color Mode"),
N_("Color Mode"),
sony1IfdId, makerTags, unsignedLong, printMinoltaSonyBoolValue),
sony1IfdId, makerTags, unsignedLong, printMinoltaSonyColorMode),
TagInfo(0xb02b, "FullImageSize", N_("Full Image Size"),
N_("Full Image Size"),
sony1IfdId, makerTags, unsignedLong, printImageSize),
@ -436,12 +436,6 @@ namespace Exiv2 {
{ 1, N_("TTL") },
};
//! Lookup table to translate Sony camera settings priority setup shutter release values to readable labels
extern const TagDetails sonyPrioritySetupShutterRelease[] = {
{ 0, N_("AF") },
{ 1, N_("Release") },
};
//! Lookup table to translate Sony AF illuminator values to readable labels
extern const TagDetails sonyAFIlluminator[] = {
{ 0, N_("Auto") },
@ -571,7 +565,7 @@ namespace Exiv2 {
// NOTE: A700 only
TagInfo(0x0040, "PrioritySetupShutterRelease", N_("Priority Setup Shutter Release"),
N_("Priority Setup Shutter Release"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyPrioritySetupShutterRelease)),
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyPrioritySetupShutterRelease),
// NOTE: A700 only
TagInfo(0x0041, "AFIlluminator", N_("AF Illuminator"),
N_("AF Illuminator"),