From 6cd50adc54f744ff5d9702548107a27dbb796d20 Mon Sep 17 00:00:00 2001
From: George Hilliard <thirtythreeforty@gmail.com>
Date: Thu, 8 Nov 2018 09:57:02 -0600
Subject: [PATCH] Revert "ImageData: Use terser emplace_back to add unique_ptr
 to vector"

This reverts commit b4813273d21f991789749d30eeb2ac437cdcc698.
---
 rtengine/imagedata.cc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index 849a7199f..47bb0b490 100644
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -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);