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

Revert "ImageData: Use terser emplace_back to add unique_ptr to vector"

Browse Source 
This reverts commit b4813273d2.
This commit is contained in:
George Hilliard
2018-11-08 09:57:02 -06:00
parent b4813273d2
commit 6cd50adc54
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rtengine/imagedata.cc
View File

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