direct initialize some structs

Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 2 years ago
parent 0dd06894b3
commit 233f404ac7

@ -759,33 +759,16 @@ void readWriteEpsMetadata(BasicIo& io, std::string& xmpPacket, NativePreviewList
} }
} }
if (posEndPhotoshop != posEndEps) { if (posEndPhotoshop != posEndEps) {
NativePreview nativePreview; auto sizePhotoshop = posEndPhotoshop - posBeginPhotoshop;
nativePreview.position_ = static_cast<long>(posBeginPhotoshop); NativePreview nativePreview{posBeginPhotoshop, sizePhotoshop, 0, 0, "hex-irb", "image/jpeg"};
nativePreview.size_ = static_cast<uint32_t>(posEndPhotoshop - posBeginPhotoshop);
nativePreview.width_ = 0;
nativePreview.height_ = 0;
nativePreview.filter_ = "hex-irb";
nativePreview.mimeType_ = "image/jpeg";
nativePreviews.push_back(std::move(nativePreview)); nativePreviews.push_back(std::move(nativePreview));
} }
if (sizeWmf != 0) { if (sizeWmf != 0) {
NativePreview nativePreview; NativePreview nativePreview{posWmf, sizeWmf, 0, 0, "", "image/x-wmf"};
nativePreview.position_ = static_cast<long>(posWmf);
nativePreview.size_ = sizeWmf;
nativePreview.width_ = 0;
nativePreview.height_ = 0;
nativePreview.filter_ = "";
nativePreview.mimeType_ = "image/x-wmf";
nativePreviews.push_back(std::move(nativePreview)); nativePreviews.push_back(std::move(nativePreview));
} }
if (sizeTiff != 0) { if (sizeTiff != 0) {
NativePreview nativePreview; NativePreview nativePreview{posTiff, sizeTiff, 0, 0, "", "image/tiff"};
nativePreview.position_ = static_cast<long>(posTiff);
nativePreview.size_ = sizeTiff;
nativePreview.width_ = 0;
nativePreview.height_ = 0;
nativePreview.filter_ = "";
nativePreview.mimeType_ = "image/tiff";
nativePreviews.push_back(std::move(nativePreview)); nativePreviews.push_back(std::move(nativePreview));
} }
} else { } else {

@ -292,13 +292,12 @@ void PsdImage::readResourceBlock(uint16_t resourceId, uint32_t resourceSize) {
if (io_->error() || io_->eof()) if (io_->error() || io_->eof())
throw Error(ErrorCode::kerFailedToReadImageData); throw Error(ErrorCode::kerFailedToReadImageData);
if (format == 1) { // unsupported format of native preview
nativePreview.filter_ = ""; if (format != 1)
nativePreview.mimeType_ = "image/jpeg"; break;
nativePreviews_.push_back(std::move(nativePreview)); nativePreview.filter_ = "";
} else { nativePreview.mimeType_ = "image/jpeg";
// unsupported format of native preview nativePreviews_.push_back(std::move(nativePreview));
}
} }
break; break;
} }

@ -422,7 +422,7 @@ Xmpdatum& XmpData::operator[](const std::string& key) {
XmpKey xmpKey(key); XmpKey xmpKey(key);
auto pos = findKey(xmpKey); auto pos = findKey(xmpKey);
if (pos == end()) { if (pos == end()) {
xmpMetadata_.push_back(Xmpdatum(xmpKey)); xmpMetadata_.emplace_back(xmpKey);
return xmpMetadata_.back(); return xmpMetadata_.back();
} }
return *pos; return *pos;

Loading…
Cancel
Save