From 80b23e7168a7a66a39a5f3284e3cd5e1eaabaa21 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 23 Oct 2017 20:59:47 +0200 Subject: [PATCH] Make compilation unit rtengine/imagedata.cc -Wextra clean, #4155 --- rtengine/imagedata.cc | 4 ++-- rtengine/imagedata.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc index b498f69f1..d90053476 100644 --- a/rtengine/imagedata.cc +++ b/rtengine/imagedata.cc @@ -24,7 +24,7 @@ #include "iptcpairs.h" #include "imagesource.h" #include "rt_math.h" - +#pragma GCC diagnostic warning "-Wextra" #define PRINT_HDR_PS_DETECTION 0 using namespace rtengine; @@ -1041,7 +1041,7 @@ failure: } -FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr rml, bool firstFrameOnly, bool loadAll) : +FramesData::FramesData (const Glib::ustring& fname, std::unique_ptr rml, bool firstFrameOnly) : iptc(nullptr), dcrawFrameCount (0) { if (rml && (rml->exifBase >= 0 || rml->ciffBase >= 0)) { diff --git a/rtengine/imagedata.h b/rtengine/imagedata.h index 2da97a5d1..b9f955611 100644 --- a/rtengine/imagedata.h +++ b/rtengine/imagedata.h @@ -95,7 +95,7 @@ private: unsigned int dcrawFrameCount; public: - FramesData (const Glib::ustring& fname, std::unique_ptr rml = nullptr, bool firstFrameOnly = false, bool loadAll = false); + FramesData (const Glib::ustring& fname, std::unique_ptr rml = nullptr, bool firstFrameOnly = false); ~FramesData (); void setDCRawFrameCount (unsigned int frameCount);