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

update Sony makernotes

Browse Source
This commit is contained in:
HumanDynamo 2010-04-14 13:53:29 +00:00
parent 4e4c9f7898
commit c2281bca9f
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/sonymn.cpp
View File

@ -212,13 +212,13 @@ namespace Exiv2 {
TagInfo(0x3000, "ShotInfo", N_("Shot Info"),
N_("Shot Information"),
sonyIfdId, makerTags, undefined, printValue),
// TODO more tags here
TagInfo(0xb001, "SonyModelID", "Sony Model ID",
TagInfo(0xb000, "FileFormat", N_("File Format"),
N_("File Format"),
sonyIfdId, makerTags, unsignedByte, print0xb000),
TagInfo(0xb001, "SonyModelID", N_("Sony Model ID"),
N_("Sony Model ID"),
sonyIfdId, makerTags, unsignedShort, EXV_PRINT_TAG(sonyModelId)),
TagInfo(0xb020, "ColorReproduction", "Color Reproduction",
TagInfo(0xb020, "ColorReproduction", N_("Color Reproduction"),
N_("Color Reproduction"),
sonyIfdId, makerTags, asciiString, printValue),
TagInfo(0xb021, "ColorTemperature", N_("Color Temperature"),
@ -282,4 +282,17 @@ namespace Exiv2 {
return tagInfo_;
}
std::ostream& SonyMakerNote::print0xb000(std::ostream& os,
const Value& value,
const ExifData*)
{
std::string model = value.toString();
if (model == "0002") os << "JPEG";
else if (model == "1000") os << "SR2";
else if (model == "2000") os << "ARW 1.0";
else if (model == "3000") os << "ARW 2.0";
else if (model == "3100") os << "ARW 2.1";
else os << "(" << value << ")";
return os;
}
} // namespace Exiv2

5
src/sonymn.hpp
View File

@ -56,6 +56,11 @@ namespace Exiv2 {
//! Return read-only list of built-in Sony tags
static const TagInfo* tagList();
//! @name Print functions for Sony %MakerNote tags
//@{
//! Print Sony Model
static std::ostream& print0xb000(std::ostream& os, const Value& value, const ExifData*);
private:
//! Tag information
static const TagInfo tagInfo_[];