|
|
|
@ -20,14 +20,14 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
File: exif.cpp
|
|
|
|
File: exif.cpp
|
|
|
|
Version: $Name: $ $Revision: 1.64 $
|
|
|
|
Version: $Name: $ $Revision: 1.65 $
|
|
|
|
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.64 $ $RCSfile: exif.cpp,v $");
|
|
|
|
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.65 $ $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
|
|
|
|
@ -494,7 +494,7 @@ namespace Exiv2 {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
ExifData::ExifData()
|
|
|
|
ExifData::ExifData()
|
|
|
|
: pThumbnail_(0), pMakerNote_(0), ifd0_(ifd0Id, 0, false),
|
|
|
|
: pThumbnail_(0), ifd0_(ifd0Id, 0, false),
|
|
|
|
exifIfd_(exifIfdId, 0, false), iopIfd_(iopIfdId, 0, false),
|
|
|
|
exifIfd_(exifIfdId, 0, false), iopIfd_(iopIfdId, 0, false),
|
|
|
|
gpsIfd_(gpsIfdId, 0, false), ifd1_(ifd1Id, 0, false),
|
|
|
|
gpsIfd_(gpsIfdId, 0, false), ifd1_(ifd1Id, 0, false),
|
|
|
|
size_(0), pData_(0), compatible_(true)
|
|
|
|
size_(0), pData_(0), compatible_(true)
|
|
|
|
@ -503,7 +503,6 @@ namespace Exiv2 {
|
|
|
|
|
|
|
|
|
|
|
|
ExifData::~ExifData()
|
|
|
|
ExifData::~ExifData()
|
|
|
|
{
|
|
|
|
{
|
|
|
|
delete pMakerNote_;
|
|
|
|
|
|
|
|
delete pThumbnail_;
|
|
|
|
delete pThumbnail_;
|
|
|
|
delete[] pData_;
|
|
|
|
delete[] pData_;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -559,7 +558,7 @@ namespace Exiv2 {
|
|
|
|
MakerNoteFactory& mnf = MakerNoteFactory::instance();
|
|
|
|
MakerNoteFactory& mnf = MakerNoteFactory::instance();
|
|
|
|
// Todo: The conversion to string assumes that there is a \0 at the end
|
|
|
|
// Todo: The conversion to string assumes that there is a \0 at the end
|
|
|
|
// Todo: How to avoid the cast (is that a MSVC thing?)
|
|
|
|
// Todo: How to avoid the cast (is that a MSVC thing?)
|
|
|
|
pMakerNote_ = mnf.create(reinterpret_cast<const char*>(make->data()),
|
|
|
|
makerNote_ = mnf.create(reinterpret_cast<const char*>(make->data()),
|
|
|
|
reinterpret_cast<const char*>(model->data()),
|
|
|
|
reinterpret_cast<const char*>(model->data()),
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
pos->data(),
|
|
|
|
pos->data(),
|
|
|
|
@ -568,24 +567,23 @@ namespace Exiv2 {
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Read the MakerNote
|
|
|
|
// Read the MakerNote
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
rc = pMakerNote_->read(pos->data(),
|
|
|
|
rc = makerNote_->read(pos->data(),
|
|
|
|
pos->size(),
|
|
|
|
pos->size(),
|
|
|
|
byteOrder(),
|
|
|
|
byteOrder(),
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
exifIfd_.offset() + pos->offset());
|
|
|
|
if (rc) {
|
|
|
|
if (rc) {
|
|
|
|
// Todo: How to handle debug output like this
|
|
|
|
// Todo: How to handle debug output like this
|
|
|
|
std::cerr << "Warning: Failed to read "
|
|
|
|
std::cerr << "Warning: Failed to read "
|
|
|
|
<< pMakerNote_->ifdItem()
|
|
|
|
<< makerNote_->ifdItem()
|
|
|
|
<< " Makernote, rc = " << rc << "\n";
|
|
|
|
<< " Makernote, rc = " << rc << "\n";
|
|
|
|
|
|
|
|
|
|
|
|
delete pMakerNote_;
|
|
|
|
makerNote_.reset();
|
|
|
|
pMakerNote_ = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// If we successfully parsed the MakerNote, delete the raw MakerNote,
|
|
|
|
// If we successfully parsed the MakerNote, delete the raw MakerNote,
|
|
|
|
// the parsed MakerNote is the primary MakerNote from now on
|
|
|
|
// the parsed MakerNote is the primary MakerNote from now on
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
exifIfd_.erase(pos);
|
|
|
|
exifIfd_.erase(pos);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Find and read Interoperability IFD in ExifIFD
|
|
|
|
// Find and read Interoperability IFD in ExifIFD
|
|
|
|
@ -618,8 +616,8 @@ namespace Exiv2 {
|
|
|
|
exifMetadata_.clear();
|
|
|
|
exifMetadata_.clear();
|
|
|
|
add(ifd0_.begin(), ifd0_.end(), byteOrder());
|
|
|
|
add(ifd0_.begin(), ifd0_.end(), byteOrder());
|
|
|
|
add(exifIfd_.begin(), exifIfd_.end(), byteOrder());
|
|
|
|
add(exifIfd_.begin(), exifIfd_.end(), byteOrder());
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
add(pMakerNote_->begin(), pMakerNote_->end(), pMakerNote_->byteOrder());
|
|
|
|
add(makerNote_->begin(), makerNote_->end(), makerNote_->byteOrder());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
add(iopIfd_.begin(), iopIfd_.end(), byteOrder());
|
|
|
|
add(iopIfd_.begin(), iopIfd_.end(), byteOrder());
|
|
|
|
add(gpsIfd_.begin(), gpsIfd_.end(), byteOrder());
|
|
|
|
add(gpsIfd_.begin(), gpsIfd_.end(), byteOrder());
|
|
|
|
@ -699,17 +697,19 @@ namespace Exiv2 {
|
|
|
|
// Build Exif IFD from metadata
|
|
|
|
// Build Exif IFD from metadata
|
|
|
|
Ifd exifIfd(exifIfdId);
|
|
|
|
Ifd exifIfd(exifIfdId);
|
|
|
|
addToIfd(exifIfd, begin(), end(), byteOrder());
|
|
|
|
addToIfd(exifIfd, begin(), end(), byteOrder());
|
|
|
|
MakerNote* pMakerNote = 0;
|
|
|
|
MakerNote::AutoPtr makerNote;
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
// Build MakerNote from metadata
|
|
|
|
// Build MakerNote from metadata
|
|
|
|
pMakerNote = pMakerNote_->clone();
|
|
|
|
makerNote = makerNote_->clone();
|
|
|
|
addToMakerNote(pMakerNote, begin(), end(), pMakerNote_->byteOrder());
|
|
|
|
addToMakerNote(makerNote.get(),
|
|
|
|
|
|
|
|
begin(), end(),
|
|
|
|
|
|
|
|
makerNote_->byteOrder());
|
|
|
|
// Create a placeholder MakerNote entry of the correct size and
|
|
|
|
// Create a placeholder MakerNote entry of the correct size and
|
|
|
|
// add it to the Exif IFD (because we don't know the offset yet)
|
|
|
|
// add it to the Exif IFD (because we don't know the offset yet)
|
|
|
|
Entry e;
|
|
|
|
Entry e;
|
|
|
|
e.setIfdId(exifIfd.ifdId());
|
|
|
|
e.setIfdId(exifIfd.ifdId());
|
|
|
|
e.setTag(0x927c);
|
|
|
|
e.setTag(0x927c);
|
|
|
|
DataBuf buf(pMakerNote->size());
|
|
|
|
DataBuf buf(makerNote->size());
|
|
|
|
memset(buf.pData_, 0x0, buf.size_);
|
|
|
|
memset(buf.pData_, 0x0, buf.size_);
|
|
|
|
e.setValue(undefined, buf.size_, buf.pData_, buf.size_);
|
|
|
|
e.setValue(undefined, buf.size_, buf.pData_, buf.size_);
|
|
|
|
exifIfd.erase(0x927c);
|
|
|
|
exifIfd.erase(0x927c);
|
|
|
|
@ -787,17 +787,15 @@ namespace Exiv2 {
|
|
|
|
ifd0.copy(buf + ifd0Offset, byteOrder(), ifd0Offset);
|
|
|
|
ifd0.copy(buf + ifd0Offset, byteOrder(), ifd0Offset);
|
|
|
|
exifIfd.sortByTag();
|
|
|
|
exifIfd.sortByTag();
|
|
|
|
exifIfd.copy(buf + exifIfdOffset, byteOrder(), exifIfdOffset);
|
|
|
|
exifIfd.copy(buf + exifIfdOffset, byteOrder(), exifIfdOffset);
|
|
|
|
if (pMakerNote) {
|
|
|
|
if (makerNote.get() != 0) {
|
|
|
|
// Copy the MakerNote over the placeholder data
|
|
|
|
// Copy the MakerNote over the placeholder data
|
|
|
|
Entries::iterator mn = exifIfd.findTag(0x927c);
|
|
|
|
Entries::iterator mn = exifIfd.findTag(0x927c);
|
|
|
|
// Do _not_ sort the makernote; vendors (at least Canon), don't seem
|
|
|
|
// Do _not_ sort the makernote; vendors (at least Canon), don't seem
|
|
|
|
// to bother about this TIFF standard requirement, so writing the
|
|
|
|
// to bother about this TIFF standard requirement, so writing the
|
|
|
|
// makernote as is might result in fewer deviations from the original
|
|
|
|
// makernote as is might result in fewer deviations from the original
|
|
|
|
pMakerNote->copy(buf + exifIfdOffset + mn->offset(),
|
|
|
|
makerNote->copy(buf + exifIfdOffset + mn->offset(),
|
|
|
|
byteOrder(),
|
|
|
|
byteOrder(),
|
|
|
|
exifIfdOffset + mn->offset());
|
|
|
|
exifIfdOffset + mn->offset());
|
|
|
|
delete pMakerNote;
|
|
|
|
|
|
|
|
pMakerNote = 0;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
iopIfd.sortByTag();
|
|
|
|
iopIfd.sortByTag();
|
|
|
|
iopIfd.copy(buf + iopIfdOffset, byteOrder(), iopIfdOffset);
|
|
|
|
iopIfd.copy(buf + iopIfdOffset, byteOrder(), iopIfdOffset);
|
|
|
|
@ -878,13 +876,13 @@ namespace Exiv2 {
|
|
|
|
void ExifData::add(const Exifdatum& exifdatum)
|
|
|
|
void ExifData::add(const Exifdatum& exifdatum)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (exifdatum.ifdId() == makerIfdId) {
|
|
|
|
if (exifdatum.ifdId() == makerIfdId) {
|
|
|
|
if ( pMakerNote_
|
|
|
|
if ( makerNote_.get() != 0
|
|
|
|
&& pMakerNote_->ifdItem() != exifdatum.groupName()) {
|
|
|
|
&& makerNote_->ifdItem() != exifdatum.groupName()) {
|
|
|
|
throw Error("Inconsistent MakerNote");
|
|
|
|
throw Error("Inconsistent MakerNote");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!pMakerNote_) {
|
|
|
|
if (makerNote_.get() == 0) {
|
|
|
|
MakerNoteFactory& mnf = MakerNoteFactory::instance();
|
|
|
|
MakerNoteFactory& mnf = MakerNoteFactory::instance();
|
|
|
|
pMakerNote_ = mnf.create(exifdatum.groupName());
|
|
|
|
makerNote_ = mnf.create(exifdatum.groupName());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// allow duplicates
|
|
|
|
// allow duplicates
|
|
|
|
@ -980,9 +978,9 @@ namespace Exiv2 {
|
|
|
|
maxOffset = std::max(maxOffset, exifIfd_.offset());
|
|
|
|
maxOffset = std::max(maxOffset, exifIfd_.offset());
|
|
|
|
maxOffset = std::max(maxOffset, exifIfd_.dataOffset()
|
|
|
|
maxOffset = std::max(maxOffset, exifIfd_.dataOffset()
|
|
|
|
+ exifIfd_.dataSize());
|
|
|
|
+ exifIfd_.dataSize());
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
maxOffset = std::max(maxOffset, pMakerNote_->offset()
|
|
|
|
maxOffset = std::max(maxOffset, makerNote_->offset()
|
|
|
|
+ pMakerNote_->size());
|
|
|
|
+ makerNote_->size());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
maxOffset = std::max(maxOffset, iopIfd_.offset());
|
|
|
|
maxOffset = std::max(maxOffset, iopIfd_.offset());
|
|
|
|
maxOffset = std::max(maxOffset, iopIfd_.dataOffset()
|
|
|
|
maxOffset = std::max(maxOffset, iopIfd_.dataOffset()
|
|
|
|
@ -1030,10 +1028,10 @@ namespace Exiv2 {
|
|
|
|
bool compatible = true;
|
|
|
|
bool compatible = true;
|
|
|
|
compatible &= updateRange(ifd0_.begin(), ifd0_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(ifd0_.begin(), ifd0_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(exifIfd_.begin(), exifIfd_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(exifIfd_.begin(), exifIfd_.end(), byteOrder());
|
|
|
|
if (pMakerNote_) {
|
|
|
|
if (makerNote_.get() != 0) {
|
|
|
|
compatible &= updateRange(pMakerNote_->begin(),
|
|
|
|
compatible &= updateRange(makerNote_->begin(),
|
|
|
|
pMakerNote_->end(),
|
|
|
|
makerNote_->end(),
|
|
|
|
pMakerNote_->byteOrder());
|
|
|
|
makerNote_->byteOrder());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
compatible &= updateRange(iopIfd_.begin(), iopIfd_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(iopIfd_.begin(), iopIfd_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(gpsIfd_.begin(), gpsIfd_.end(), byteOrder());
|
|
|
|
compatible &= updateRange(gpsIfd_.begin(), gpsIfd_.end(), byteOrder());
|
|
|
|
@ -1105,9 +1103,9 @@ namespace Exiv2 {
|
|
|
|
Entries::const_iterator entry;
|
|
|
|
Entries::const_iterator entry;
|
|
|
|
std::pair<bool, Entries::const_iterator> rc(false, entry);
|
|
|
|
std::pair<bool, Entries::const_iterator> rc(false, entry);
|
|
|
|
|
|
|
|
|
|
|
|
if (ifdId == makerIfdId && pMakerNote_) {
|
|
|
|
if (ifdId == makerIfdId && makerNote_.get() != 0) {
|
|
|
|
entry = pMakerNote_->findIdx(idx);
|
|
|
|
entry = makerNote_->findIdx(idx);
|
|
|
|
if (entry != pMakerNote_->end()) {
|
|
|
|
if (entry != makerNote_->end()) {
|
|
|
|
rc.first = true;
|
|
|
|
rc.first = true;
|
|
|
|
rc.second = entry;
|
|
|
|
rc.second = entry;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Andreas Huggel
21 years ago