xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor changes

Browse Source
v0.27.3
Andreas Huggel 22 years ago
parent 2db819ccb6
commit 491474f8e9
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File

7
src/makernote.cpp
Unescape Escape View File

@ -20,13 +20,13 @@
*/ */
/* /*
File: makernote.cpp File: makernote.cpp
Version: $Name: $ $Revision: 1.13 $ Version: $Name: $ $Revision: 1.14 $
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net> Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
History: 18-Feb-04, ahu: created History: 18-Feb-04, ahu: created
*/ */
// ***************************************************************************** // *****************************************************************************
#include "rcsid.hpp" #include "rcsid.hpp"
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.13 $ $RCSfile: makernote.cpp,v $") EXIV2_RCSID("@(#) $Name: $ $Revision: 1.14 $ $RCSfile: makernote.cpp,v $")
// Define DEBUG_MAKERNOTE to output debug information to std::cerr // Define DEBUG_MAKERNOTE to output debug information to std::cerr
#undef DEBUG_MAKERNOTE #undef DEBUG_MAKERNOTE
@ -127,7 +127,7 @@ namespace Exif {
if (!prefix_.empty()) { if (!prefix_.empty()) {
// Check if makernote is long enough and starts with prefix // Check if makernote is long enough and starts with prefix
if ( len <= static_cast<long>(prefix_.size()) if ( len <= static_cast<long>(prefix_.size())
|| prefix_ != std::string(buf, prefix_.size())) rc = 2; || prefix_ != std::string(buf, prefix_.size())) rc = 2;
} }
if (!absOffset_) { if (!absOffset_) {
// Use offsets relative to the start of the Makernote field // Use offsets relative to the start of the Makernote field
@ -152,6 +152,7 @@ namespace Exif {
#ifdef DEBUG_MAKERNOTE #ifdef DEBUG_MAKERNOTE
hexdump(std::cerr, buf, len, offset); hexdump(std::cerr, buf, len, offset);
if (rc == 0) ifd_.print(std::cerr); if (rc == 0) ifd_.print(std::cerr);
else std::cerr << "IfdMakerNote::read() failed, rc = " << rc << "\n";
#endif #endif
return rc; return rc;
} // IfdMakerNote::read } // IfdMakerNote::read

4
src/makernote.hpp
Unescape Escape View File

@ -22,7 +22,7 @@
@file makernote.hpp @file makernote.hpp
@brief Contains the %Exif %MakerNote interface, IFD %MakerNote and a @brief Contains the %Exif %MakerNote interface, IFD %MakerNote and a
MakerNote factory MakerNote factory
@version $Name: $ $Revision: 1.12 $ @version $Name: $ $Revision: 1.13 $
@author Andreas Huggel (ahu) @author Andreas Huggel (ahu)
<a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a> <a href="mailto:ahuggel@gmx.net">ahuggel@gmx.net</a>
@date 18-Feb-04, ahu: created @date 18-Feb-04, ahu: created
@ -264,7 +264,7 @@ namespace Exif {
protected: protected:
//! Prefix before the start of the IFD //! Prefix before the start of the IFD
std::string prefix_; std::string prefix_;
/*! /*!
True: Offsets are from start of the TIFF header True: Offsets are from start of the TIFF header
False: Offsets are from start of the makernote False: Offsets are from start of the makernote

Write Preview
Loading…
Cancel
Save