liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ImageData: Use terser emplace_back to add unique_ptr to vector

Browse Source
This commit is contained in:
George Hilliard
2018-11-07 12:16:16 -06:00
parent a63cd8a87c
commit b4813273d2
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/imagedata.cc
View File

@@ -1113,7 +1113,8 @@ FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataL
// creating FrameData // creating FrameData
for (auto currFrame : exifManager.frames) { for (auto currFrame : exifManager.frames) {
frames.push_back(std::unique_ptr<FrameData>(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)))); // Note: could leak if emplace_back throws (below as well). Unlikely in practice.
frames.emplace_back(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)));
} }
for (auto currRoot : roots) { for (auto currRoot : roots) {
rtexif::Tag* t = currRoot->getTag(0x83BB); rtexif::Tag* t = currRoot->getTag(0x83BB);
@@ -1135,7 +1136,7 @@ FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataL
exifManager.parseJPEG (); exifManager.parseJPEG ();
roots = exifManager.roots; roots = exifManager.roots;
for (auto currFrame : exifManager.frames) { for (auto currFrame : exifManager.frames) {
frames.push_back(std::unique_ptr<FrameData>(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)))); frames.emplace_back(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)));
} }
rewind (exifManager.f); // Not sure this is necessary rewind (exifManager.f); // Not sure this is necessary
iptc = iptc_data_new_from_jpeg_file (exifManager.f); iptc = iptc_data_new_from_jpeg_file (exifManager.f);
@@ -1153,7 +1154,7 @@ FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr<RawMetaDataL
// creating FrameData // creating FrameData
for (auto currFrame : exifManager.frames) { for (auto currFrame : exifManager.frames) {
frames.push_back(std::unique_ptr<FrameData>(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)))); frames.emplace_back(new FrameData(currFrame, currFrame->getRoot(), roots.at(0)));
} }
for (auto currRoot : roots) { for (auto currRoot : roots) {
rtexif::Tag* t = currRoot->getTag(0x83BB); rtexif::Tag* t = currRoot->getTag(0x83BB);