From 2e645debb440199fda1269c9922e9de4c9c8f839 Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Wed, 25 Oct 2017 17:09:46 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20two=20issues=20detected=20by=20Fl=C3=B6ss?=
 =?UTF-8?q?ie?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rtengine/imagedata.cc | 3 +--
 rtengine/labimage.cc  | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index d90053476..47688fca6 100644
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -857,8 +857,7 @@ bool FramesData::hasIPTC (unsigned int frame) const
 tm FramesData::getDateTime (unsigned int frame) const
 {
     if (frames.empty() || frame >= frames.size() ) {
-        tm emptytm = {0, 0, 0, 0, 0, 0, 0, 0, 0};
-        return emptytm;
+        return {};
     } else {
         return frames.at(frame)->getDateTime ();
     }
diff --git a/rtengine/labimage.cc b/rtengine/labimage.cc
index 4cd5ce31a..bcadda0ed 100644
--- a/rtengine/labimage.cc
+++ b/rtengine/labimage.cc
@@ -17,9 +17,11 @@
  *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "labimage.h"
+#include <cstring>
 #include <memory>
 
+#include "labimage.h"
+
 namespace rtengine
 {