|
|
@ -20,14 +20,14 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
File: exif.cpp
|
|
|
|
File: exif.cpp
|
|
|
|
Version: $Name: $ $Revision: 1.42 $
|
|
|
|
Version: $Name: $ $Revision: 1.43 $
|
|
|
|
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
|
|
|
|
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
|
|
|
|
History: 26-Jan-04, ahu: created
|
|
|
|
History: 26-Jan-04, ahu: created
|
|
|
|
11-Feb-04, ahu: isolated as a component
|
|
|
|
11-Feb-04, ahu: isolated as a component
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
// *****************************************************************************
|
|
|
|
// *****************************************************************************
|
|
|
|
#include "rcsid.hpp"
|
|
|
|
#include "rcsid.hpp"
|
|
|
|
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.42 $ $RCSfile: exif.cpp,v $")
|
|
|
|
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.43 $ $RCSfile: exif.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
|
|
|
@ -590,6 +590,11 @@ namespace Exiv2 {
|
|
|
|
byteOrder(),
|
|
|
|
byteOrder(),
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
if (rc) {
|
|
|
|
if (rc) {
|
|
|
|
|
|
|
|
// Todo: How to handle debug output like this
|
|
|
|
|
|
|
|
std::cerr << "Warning: Failed to read "
|
|
|
|
|
|
|
|
<< pMakerNote_->sectionName(0)
|
|
|
|
|
|
|
|
<< " Makernote, rc = " << rc << "\n";
|
|
|
|
|
|
|
|
|
|
|
|
delete pMakerNote_;
|
|
|
|
delete pMakerNote_;
|
|
|
|
pMakerNote_ = 0;
|
|
|
|
pMakerNote_ = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|