more A100 CS tags

v0.27.3
HumanDynamo 15 years ago
parent aea6b4665d
commit f924b465f4

@ -1394,9 +1394,6 @@ namespace Exiv2 {
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue), sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolInverseValue),
/* /*
TagInfo(0x0050, "Rotation", N_("Rotation"),
N_("Rotation"),
sony1MltCsA100IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(minoltaRotation5D)),
TagInfo(0x0053, "ExposureCompensation", N_("Exposure Compensation"), TagInfo(0x0053, "ExposureCompensation", N_("Exposure Compensation"),
N_("Exposure compensation"), N_("Exposure compensation"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaExposureCompensation5D), sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaExposureCompensation5D),
@ -1412,10 +1409,22 @@ namespace Exiv2 {
TagInfo(0x00AE, "ImageNumber", N_("Image Number"), TagInfo(0x00AE, "ImageNumber", N_("Image Number"),
N_("Image number"), N_("Image number"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printValue), sony1MltCsA100IfdId, makerTags, unsignedShort, printValue),
TagInfo(0x00BD, "ImageStabilization", N_("Image Stabilization"), */
TagInfo(0x0057, "ImageStabilization", N_("Image Stabilization"),
N_("Image stabilization"), N_("Image stabilization"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
*/
TagInfo(0x005A, "Rotation", N_("Rotation"),
N_("Rotation"),
sony1MltCsA100IfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
TagInfo(0x005E, "ColorTemperature", N_("Color Temperature"),
N_("Color temperature"),
sony1MltCsA100IfdId, makerTags, unsignedLong, printValue),
TagInfo(0x005F, "ColorCompensationFilter", N_("Color Compensation Filter"),
N_("Color compensation filter: negative is green, positive is magenta"),
sony1MltCsA100IfdId, makerTags, unsignedLong, printValue),
// End of list marker // End of list marker
TagInfo(0xffff, "(UnknownSonyCsA100Tag)", "(UnknownSonyCsA100Tag)", TagInfo(0xffff, "(UnknownSonyCsA100Tag)", "(UnknownSonyCsA100Tag)",

@ -459,4 +459,18 @@ namespace Exiv2 {
{ {
return EXV_PRINT_TAG(minoltaSonyQualityCS)(os, value, metadata); return EXV_PRINT_TAG(minoltaSonyQualityCS)(os, value, metadata);
} }
// ----------------------------------------------------------------------------------------------------
//! Lookup table to translate Sony camera settings rotation values to readable labels
extern const TagDetails minoltaSonyRotation[] = {
{ 0, N_("Horizontal (normal)") },
{ 1, N_("Rotate 90 CW") },
{ 2, N_("Rotate 270 CW") }
};
std::ostream& printMinoltaSonyRotation(std::ostream& os, const Value& value, const ExifData* metadata)
{
return EXV_PRINT_TAG(minoltaSonyRotation)(os, value, metadata);
}
} // namespace Exiv2 } // namespace Exiv2

@ -67,6 +67,9 @@ namespace Exiv2 {
//! Print Minolta/Sony Quality values to readable labels. //! Print Minolta/Sony Quality values to readable labels.
EXIV2API std::ostream& printMinoltaSonyQualityCS(std::ostream&, const Value&, const ExifData*); EXIV2API std::ostream& printMinoltaSonyQualityCS(std::ostream&, const Value&, const ExifData*);
//! Print Minolta/Sony Rotation values to readable labels.
EXIV2API std::ostream& printMinoltaSonyRotation(std::ostream&, const Value&, const ExifData*);
// TODO: Added shared methods here. // TODO: Added shared methods here.
} // namespace Exiv2 } // namespace Exiv2

@ -390,13 +390,6 @@ namespace Exiv2 {
{ 19, N_("D-Range Optimizer Bracketing Low") } { 19, N_("D-Range Optimizer Bracketing Low") }
}; };
//! Lookup table to translate Sony camera settings rotation values to readable labels
extern const TagDetails sonyRotation[] = {
{ 0, N_("Horizontal (normal)") },
{ 1, N_("Rotate 90 CW") },
{ 2, N_("Rotate 270 CW") }
};
//! Lookup table to translate Sony camera settings focus mode values to readable labels //! Lookup table to translate Sony camera settings focus mode values to readable labels
extern const TagDetails sonyFocusMode[] = { extern const TagDetails sonyFocusMode[] = {
{ 0, N_("Manual") }, { 0, N_("Manual") },
@ -577,7 +570,7 @@ namespace Exiv2 {
sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue), sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyBoolValue),
TagInfo(0x0063, "Rotation", N_("Rotation"), TagInfo(0x0063, "Rotation", N_("Rotation"),
N_("Rotation"), N_("Rotation"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)), sony1CsIfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"), TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
N_("Sony Image Size"), N_("Sony Image Size"),
sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)), sony1CsIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)),
@ -649,7 +642,7 @@ namespace Exiv2 {
sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)), sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyExposureProgram)),
TagInfo(0x0063, "Rotation", N_("Rotation"), TagInfo(0x0063, "Rotation", N_("Rotation"),
N_("Rotation"), N_("Rotation"),
sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyRotation)), sony1Cs2IfdId, makerTags, unsignedShort, printMinoltaSonyRotation),
TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"), TagInfo(0x0084, "SonyImageSize", N_("Sony Image Size"),
N_("Sony Image Size"), N_("Sony Image Size"),
sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)), sony1Cs2IfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyImageSize)),

Loading…
Cancel
Save