|
|
|
@ -92,9 +92,6 @@ TiffBinaryArray::TiffBinaryArray(uint16_t tag, IfdId group, const ArraySet* arra
|
|
|
|
// We'll figure out the correct cfg later
|
|
|
|
// We'll figure out the correct cfg later
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TiffDirectory::~TiffDirectory() {
|
|
|
|
TiffDirectory::~TiffDirectory() {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
delete component;
|
|
|
|
delete component;
|
|
|
|
@ -207,8 +204,7 @@ void TiffEntryBase::setData(byte* pData, size_t size, std::shared_ptr<DataBuf> s
|
|
|
|
void TiffEntryBase::updateValue(Value::UniquePtr value, ByteOrder byteOrder) {
|
|
|
|
void TiffEntryBase::updateValue(Value::UniquePtr value, ByteOrder byteOrder) {
|
|
|
|
if (!value)
|
|
|
|
if (!value)
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
size_t newSize = value->size();
|
|
|
|
if (size_t newSize = value->size(); newSize > size_) {
|
|
|
|
if (newSize > size_) {
|
|
|
|
|
|
|
|
auto d = std::make_shared<DataBuf>(newSize);
|
|
|
|
auto d = std::make_shared<DataBuf>(newSize);
|
|
|
|
setData(std::move(d));
|
|
|
|
setData(std::move(d));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -488,19 +484,19 @@ TiffComponent* TiffSubIfd::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffCompo
|
|
|
|
const TiffPathItem tpi2 = tiffPath.top();
|
|
|
|
const TiffPathItem tpi2 = tiffPath.top();
|
|
|
|
tiffPath.push(tpi1);
|
|
|
|
tiffPath.push(tpi1);
|
|
|
|
auto it = std::find_if(ifds_.begin(), ifds_.end(), [&](auto&& ifd) { return ifd->group() == tpi2.group(); });
|
|
|
|
auto it = std::find_if(ifds_.begin(), ifds_.end(), [&](auto&& ifd) { return ifd->group() == tpi2.group(); });
|
|
|
|
if (it != ifds_.end())
|
|
|
|
if (it == ifds_.end()) {
|
|
|
|
return (*it)->addPath(tag, tiffPath, pRoot, std::move(object));
|
|
|
|
auto tc = [&] {
|
|
|
|
|
|
|
|
if (tiffPath.size() == 1 && object) {
|
|
|
|
auto tc = [&] {
|
|
|
|
TiffComponent::UniquePtr tempObject;
|
|
|
|
if (tiffPath.size() == 1 && object) {
|
|
|
|
std::swap(object, tempObject);
|
|
|
|
TiffComponent::UniquePtr tempObject;
|
|
|
|
return addChild(std::move(tempObject));
|
|
|
|
std::swap(object, tempObject);
|
|
|
|
}
|
|
|
|
return addChild(std::move(tempObject));
|
|
|
|
return addChild(std::make_unique<TiffDirectory>(tpi1.tag(), tpi2.group()));
|
|
|
|
}
|
|
|
|
}();
|
|
|
|
return addChild(std::make_unique<TiffDirectory>(tpi1.tag(), tpi2.group()));
|
|
|
|
setCount(ifds_.size());
|
|
|
|
}();
|
|
|
|
return tc->addPath(tag, tiffPath, pRoot, std::move(object));
|
|
|
|
setCount(ifds_.size());
|
|
|
|
}
|
|
|
|
return tc->addPath(tag, tiffPath, pRoot, std::move(object));
|
|
|
|
return (*it)->addPath(tag, tiffPath, pRoot, std::move(object));
|
|
|
|
} // TiffSubIfd::doAddPath
|
|
|
|
} // TiffSubIfd::doAddPath
|
|
|
|
|
|
|
|
|
|
|
|
TiffComponent* TiffMnEntry::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* pRoot,
|
|
|
|
TiffComponent* TiffMnEntry::doAddPath(uint16_t tag, TiffPath& tiffPath, TiffComponent* pRoot,
|
|
|
|
@ -844,8 +840,7 @@ size_t TiffDirectory::doWrite(IoWrapper& ioWrapper, ByteOrder byteOrder, size_t
|
|
|
|
size_t sizeValue = 0;
|
|
|
|
size_t sizeValue = 0;
|
|
|
|
size_t sizeData = 0;
|
|
|
|
size_t sizeData = 0;
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
size_t sv = component->size();
|
|
|
|
if (size_t sv = component->size(); sv > 4) {
|
|
|
|
if (sv > 4) {
|
|
|
|
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
sizeValue += sv;
|
|
|
|
sizeValue += sv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -873,8 +868,7 @@ size_t TiffDirectory::doWrite(IoWrapper& ioWrapper, ByteOrder byteOrder, size_t
|
|
|
|
// b) Directory entries - may contain pointers to the value or data
|
|
|
|
// b) Directory entries - may contain pointers to the value or data
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
idx += writeDirEntry(ioWrapper, byteOrder, offset, component, valueIdx, dataIdx, imageIdx);
|
|
|
|
idx += writeDirEntry(ioWrapper, byteOrder, offset, component, valueIdx, dataIdx, imageIdx);
|
|
|
|
size_t sv = component->size();
|
|
|
|
if (size_t sv = component->size(); sv > 4) {
|
|
|
|
if (sv > 4) {
|
|
|
|
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
valueIdx += sv;
|
|
|
|
valueIdx += sv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -896,8 +890,7 @@ size_t TiffDirectory::doWrite(IoWrapper& ioWrapper, ByteOrder byteOrder, size_t
|
|
|
|
valueIdx = sizeDir;
|
|
|
|
valueIdx = sizeDir;
|
|
|
|
dataIdx = sizeDir + sizeValue;
|
|
|
|
dataIdx = sizeDir + sizeValue;
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
size_t sv = component->size();
|
|
|
|
if (size_t sv = component->size(); sv > 4) {
|
|
|
|
if (sv > 4) {
|
|
|
|
|
|
|
|
size_t d = component->write(ioWrapper, byteOrder, offset, valueIdx, dataIdx, imageIdx);
|
|
|
|
size_t d = component->write(ioWrapper, byteOrder, offset, valueIdx, dataIdx, imageIdx);
|
|
|
|
enforce(sv == d, ErrorCode::kerImageWriteFailed);
|
|
|
|
enforce(sv == d, ErrorCode::kerImageWriteFailed);
|
|
|
|
if ((sv & 1) == 1) {
|
|
|
|
if ((sv & 1) == 1) {
|
|
|
|
@ -1291,8 +1284,7 @@ size_t TiffDirectory::doSize() const {
|
|
|
|
size_t len = 2 + 12 * compCount + (hasNext_ ? 4 : 0);
|
|
|
|
size_t len = 2 + 12 * compCount + (hasNext_ ? 4 : 0);
|
|
|
|
// Size of IFD values and data
|
|
|
|
// Size of IFD values and data
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
for (auto&& component : components_) {
|
|
|
|
size_t sv = component->size();
|
|
|
|
if (size_t sv = component->size(); sv > 4) {
|
|
|
|
if (sv > 4) {
|
|
|
|
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
sv += sv & 1; // Align value to word boundary
|
|
|
|
len += sv;
|
|
|
|
len += sv;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -1459,11 +1451,12 @@ static const TagInfo* findTagInfo(uint16_t tag, IfdId group) {
|
|
|
|
return Internal::gpsTagList();
|
|
|
|
return Internal::gpsTagList();
|
|
|
|
return group == IfdId::exifId ? Internal::exifTagList() : nullptr;
|
|
|
|
return group == IfdId::exifId ? Internal::exifTagList() : nullptr;
|
|
|
|
}();
|
|
|
|
}();
|
|
|
|
if (tags) {
|
|
|
|
if (!tags)
|
|
|
|
for (size_t idx = 0; !result && tags[idx].tag_ != 0xffff; ++idx) {
|
|
|
|
return result;
|
|
|
|
if (tags[idx].tag_ == tag) {
|
|
|
|
|
|
|
|
result = tags + idx;
|
|
|
|
for (size_t idx = 0; !result && tags[idx].tag_ != 0xffff; ++idx) {
|
|
|
|
}
|
|
|
|
if (tags[idx].tag_ == tag) {
|
|
|
|
|
|
|
|
result = tags + idx;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
return result;
|
|
|
|
|
Rosen Penev
2 years ago