diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp index c27ad423..7775adc3 100644 --- a/src/minoltamn.cpp +++ b/src/minoltamn.cpp @@ -131,7 +131,7 @@ namespace Exiv2 { TagInfo(0x0102, "Quality", N_("Image Quality"), N_("Image quality"), - minoltaIfdId, makerTags, unsignedLong, EXV_PRINT_TAG(minoltaImageQuality)), + minoltaIfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality), // TODO: Tag 0x0103 : quality or image size (see ExifTool doc). diff --git a/src/minoltasonyvalues.cpp b/src/minoltasonyvalues.cpp index 62f5dc73..26cd0194 100644 --- a/src/minoltasonyvalues.cpp +++ b/src/minoltasonyvalues.cpp @@ -492,9 +492,28 @@ namespace Exiv2 { { 17, N_("Night View/Portrait") } }; - std::ostream& printMinoltaSonySceneMode(std::ostream& os, const Value& value, const ExifData* metadata) { return EXV_PRINT_TAG(minoltaSonySceneMode)(os, value, metadata); } + + // ---------------------------------------------------------------------------------------------------- + + //! Lookup table to translate Sony image quality values to readable labels + extern const TagDetails minoltaSonyImageQuality[] = { + { 0, N_("Raw") }, + { 1, N_("Super Fine") }, + { 2, N_("Fine") }, + { 3, N_("Standard") }, + { 4, N_("Economy") }, + { 5, N_("Extra Fine") }, + { 6, N_("Raw + JPEG") }, + { 7, N_("Compressed Raw") }, + { 8, N_("Compressed Raw + JPEG") } + }; + + std::ostream& printMinoltaSonyImageQuality(std::ostream& os, const Value& value, const ExifData* metadata) + { + return EXV_PRINT_TAG(minoltaSonyImageQuality)(os, value, metadata); + } } // namespace Exiv2 diff --git a/src/minoltasonyvalues.hpp b/src/minoltasonyvalues.hpp index 9d641aac..3b97bd9d 100644 --- a/src/minoltasonyvalues.hpp +++ b/src/minoltasonyvalues.hpp @@ -73,6 +73,9 @@ namespace Exiv2 { //! Print Minolta/Sony Scene Mode values to readable labels. EXIV2API std::ostream& printMinoltaSonySceneMode(std::ostream&, const Value&, const ExifData*); + //! Print Minolta/Sony Image Quality values to readable labels. + std::ostream& printMinoltaSonyImageQuality(std::ostream&, const Value&, const ExifData*); + // TODO: Added shared methods here. } // namespace Exiv2 diff --git a/src/sonymn.cpp b/src/sonymn.cpp index 7b1d81cb..38c44c05 100644 --- a/src/sonymn.cpp +++ b/src/sonymn.cpp @@ -49,19 +49,6 @@ namespace Exiv2 { // -- Standard Sony Makernotes tags --------------------------------------------------------------- - //! Lookup table to translate Sony image quality values to readable labels - extern const TagDetails sonyImageQuality[] = { - { 0, N_("Raw") }, - { 1, N_("Super Fine") }, - { 2, N_("Fine") }, - { 3, N_("Standard") }, - { 4, N_("Economy") }, - { 5, N_("Extra Fine") }, - { 6, N_("Raw + JPEG") }, - { 7, N_("Compressed Raw") }, - { 8, N_("Compressed Raw + JPEG") } - }; - //! Lookup table to translate Sony teleconverter model values to readable labels extern const TagDetails sonyTeleconverterModel[] = { { 0x00, N_("None") }, @@ -224,7 +211,7 @@ namespace Exiv2 { const TagInfo SonyMakerNote::tagInfo_[] = { TagInfo(0x0102, "Quality", N_("Image Quality"), N_("Image quality"), - sony1IfdId, makerTags, unsignedLong, EXV_PRINT_TAG(sonyImageQuality)), + sony1IfdId, makerTags, unsignedLong, printMinoltaSonyImageQuality), TagInfo(0x0104, "FlashExposureComp", N_("Flash Exposure Compensation"), N_("Flash exposure compensation in EV"), sony1IfdId, makerTags, signedRational, printValue),