summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorHubert Figuière <hub@figuiere.net>2014-08-21 22:22:49 -0400
committerHubert Figuière <hub@figuiere.net>2014-08-21 22:22:49 -0400
commita91aeb1e894e3836e5c59c22801138836b5bed92 (patch)
tree2a2dab1fcef039deaaa894d200889be2723d1f99 /tools
parent4c381023e17ebf2af1a58f2df181f586ed11cb99 (diff)
ordiag will display UniqueCameraModel
Diffstat (limited to 'tools')
-rw-r--r--tools/ordiag.cpp26
1 files changed, 19 insertions, 7 deletions
diff --git a/tools/ordiag.cpp b/tools/ordiag.cpp
index 0e30dc8..f46ce9b 100644
--- a/tools/ordiag.cpp
+++ b/tools/ordiag.cpp
@@ -383,18 +383,30 @@ public:
else {
m_out << boost::format("\tType = %1% (%2%)\n") % rf->type()
% typeToString(rf->type());
- std::string typeId = str(boost::format("%1%, %2%")
- % OR_GET_FILE_TYPEID_VENDOR(rf->typeId())
- % OR_GET_FILE_TYPEID_CAMERA(rf->typeId()));
+ std::string typeId
+ = str(boost::format("%1%, %2%")
+ % OR_GET_FILE_TYPEID_VENDOR(rf->typeId())
+ % OR_GET_FILE_TYPEID_CAMERA(rf->typeId()));
m_out << boost::format("\tType ID = %1%\n") % typeId;
- const MetaValue* make = rf->getMetaValue(META_NS_TIFF | EXIF_TAG_MAKE);
+ const MetaValue* make
+ = rf->getMetaValue(META_NS_TIFF | EXIF_TAG_MAKE);
if (make) {
- m_out << boost::format("\tMake = %1%\n") % make->getString(0);
+ m_out << boost::format("\tMake = %1%\n")
+ % make->getString(0);
}
- const MetaValue* model = rf->getMetaValue(META_NS_TIFF | EXIF_TAG_MODEL);
+ const MetaValue* model
+ = rf->getMetaValue(META_NS_TIFF | EXIF_TAG_MODEL);
if (model) {
- m_out << boost::format("\tModel = %1%\n") % model->getString(0);
+ m_out << boost::format("\tModel = %1%\n")
+ % model->getString(0);
+ }
+ auto uniqueCameraModel
+ = rf->getMetaValue(META_NS_TIFF
+ | DNG_TAG_UNIQUE_CAMERA_MODEL);
+ if (uniqueCameraModel) {
+ m_out << boost::format("\tUnique Camera Model = %1%\n")
+ % uniqueCameraModel->getString(0);
}
dumpPreviews(rf);
dumpRawData(rf);