|
|
|
@ -727,9 +727,8 @@ namespace Exiv2 {
|
|
|
|
|
assert(object != 0);
|
|
|
|
|
|
|
|
|
|
byte* p = object->start() + 2;
|
|
|
|
|
for (TiffDirectory::Components::iterator i = object->components_.begin();
|
|
|
|
|
i != object->components_.end(); ++i) {
|
|
|
|
|
p += updateDirEntry(p, byteOrder(), *i);
|
|
|
|
|
for (auto&& component : object->components_) {
|
|
|
|
|
p += updateDirEntry(p, byteOrder(), component);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -794,8 +793,8 @@ namespace Exiv2 {
|
|
|
|
|
static const char* synthesizedTags[] = {
|
|
|
|
|
"Exif.MakerNote.Offset",
|
|
|
|
|
};
|
|
|
|
|
for (unsigned int i = 0; i < EXV_COUNTOF(synthesizedTags); ++i) {
|
|
|
|
|
pos = exifData_.findKey(ExifKey(synthesizedTags[i]));
|
|
|
|
|
for (auto&& synthesizedTag : synthesizedTags) {
|
|
|
|
|
pos = exifData_.findKey(ExifKey(synthesizedTag));
|
|
|
|
|
if (pos != exifData_.end()) exifData_.erase(pos);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -1293,8 +1292,8 @@ namespace Exiv2 {
|
|
|
|
|
{
|
|
|
|
|
setMnState(); // All components to be post-processed must be from the Makernote
|
|
|
|
|
postProc_ = true;
|
|
|
|
|
for (PostList::const_iterator pos = postList_.begin(); pos != postList_.end(); ++pos) {
|
|
|
|
|
(*pos)->accept(*this);
|
|
|
|
|
for (auto&& pos : postList_) {
|
|
|
|
|
pos->accept(*this);
|
|
|
|
|
}
|
|
|
|
|
postProc_ = false;
|
|
|
|
|
setOrigState();
|
|
|
|
|