From 2111340785a815c7b3f3ba61f720ca925ad98f1a Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Thu, 6 Jul 2017 00:00:05 +0200 Subject: [PATCH] Fix compile with gcc 5.4.0. --- src/common/tv_filters/NTSCFilter.cxx | 4 ++++ src/common/tv_filters/NTSCFilter.hxx | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/common/tv_filters/NTSCFilter.cxx b/src/common/tv_filters/NTSCFilter.cxx index dec372845..f439a76b6 100644 --- a/src/common/tv_filters/NTSCFilter.cxx +++ b/src/common/tv_filters/NTSCFilter.cxx @@ -20,6 +20,10 @@ #include "NTSCFilter.hxx" +constexpr double scaleFrom100(double x) { return (x/50.0) - 1.0; } + +constexpr uInt32 scaleTo100(double x) { return uInt32(50*(x+1.0)); } + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - NTSCFilter::NTSCFilter() : mySetup(AtariNTSC::TV_Composite), diff --git a/src/common/tv_filters/NTSCFilter.hxx b/src/common/tv_filters/NTSCFilter.hxx index c23acf565..cb184337c 100644 --- a/src/common/tv_filters/NTSCFilter.hxx +++ b/src/common/tv_filters/NTSCFilter.hxx @@ -116,9 +116,6 @@ class NTSCFilter void convertToAdjustable(Adjustable& adjustable, const AtariNTSC::Setup& setup) const; - constexpr double scaleFrom100(double x) const { return (x/50.0) - 1.0; } - constexpr uInt32 scaleTo100(double x) const { return uInt32(50*(x+1.0)); } - private: // The NTSC object AtariNTSC myNTSC;