Added Nikon3 print function for ISO setting

This commit is contained in:
Andreas Huggel
2004-06-02 02:49:07 +00:00
parent 8b22804c22
commit cb6b2e197d
2 changed files with 20 additions and 5 deletions
+15 -2
View File
@@ -20,14 +20,14 @@
*/
/*
File: nikon1mn.cpp
Version: $Name: $ $Revision: 1.1 $
Version: $Name: $ $Revision: 1.2 $
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
History: 17-May-04, ahu: created
25-May-04, ahu: combined all Nikon formats in one component
*/
// *****************************************************************************
#include "rcsid.hpp"
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.1 $ $RCSfile: nikonmn.cpp,v $")
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.2 $ $RCSfile: nikonmn.cpp,v $")
// *****************************************************************************
// included header files
@@ -426,6 +426,7 @@ namespace Exiv2 {
const Value& value) const
{
switch (tag) {
case 0x0002: print0x0002(os, value); break;
case 0x0083: print0x0083(os, value); break;
case 0x0084: print0x0084(os, value); break;
case 0x0087: print0x0087(os, value); break;
@@ -438,6 +439,18 @@ namespace Exiv2 {
return os;
}
std::ostream& Nikon3MakerNote::print0x0002(std::ostream& os,
const Value& value)
{
if (value.count() > 1) {
os << value.toLong(1);
}
else {
os << "(" << value << ")";
}
return os;
}
std::ostream& Nikon3MakerNote::print0x0083(std::ostream& os,
const Value& value)
{
+5 -3
View File
@@ -28,7 +28,7 @@
<a href="http://park2.wakwak.com/%7Etsuruzoh/Computer/Digicams/exif-e.html">
Exif file format</a> by TsuruZoh Tachibanaya.<BR>
Format 3: "EXIFutils Field Reference Guide".
@version $Name: $ $Revision: 1.1 $
@version $Name: $ $Revision: 1.2 $
@author Andreas Huggel (ahu)
<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
@date 17-May-04, ahu: created
@@ -189,7 +189,7 @@ namespace Exiv2 {
const Value& value) const;
//@}
//! @name Print functions for Nikon1 %MakerNote tags
//! @name Print functions for Nikon2 %MakerNote tags
//@{
//! Print quality setting
static std::ostream& print0x0003(std::ostream& os, const Value& value);
@@ -243,8 +243,10 @@ namespace Exiv2 {
const Value& value) const;
//@}
//! @name Print functions for Nikon1 %MakerNote tags
//! @name Print functions for Nikon3 %MakerNote tags
//@{
//! Print ISO setting
static std::ostream& print0x0002(std::ostream& os, const Value& value);
//! Print lens type
static std::ostream& print0x0083(std::ostream& os, const Value& value);
//! Print lens information