diff --git a/rtengine/EdgePreservingDecomposition.cc b/rtengine/EdgePreservingDecomposition.cc index 85770826e..700181e1d 100644 --- a/rtengine/EdgePreservingDecomposition.cc +++ b/rtengine/EdgePreservingDecomposition.cc @@ -4,7 +4,7 @@ #ifdef _OPENMP #include #endif -#include "sleef.c" +#include "sleef.h" #define DIAGONALS 5 #define DIAGONALSP1 6 diff --git a/rtengine/FTblockDN.cc b/rtengine/FTblockDN.cc index 6e1ddf8b4..ea0565b21 100644 --- a/rtengine/FTblockDN.cc +++ b/rtengine/FTblockDN.cc @@ -42,7 +42,7 @@ #include "opthelper.h" #include "procparams.h" #include "rt_math.h" -#include "sleef.c" +#include "sleef.h" #include "../rtgui/threadutils.h" #include "../rtgui/options.h" diff --git a/rtengine/PF_correct_RT.cc b/rtengine/PF_correct_RT.cc index c851d3d09..9a95b8e2f 100644 --- a/rtengine/PF_correct_RT.cc +++ b/rtengine/PF_correct_RT.cc @@ -33,7 +33,7 @@ #include "color.h" #include "curves.h" #include "labimage.h" -#include "sleef.c" +#include "sleef.h" #include "curves.h" #include "rt_math.h" #include "opthelper.h" diff --git a/rtengine/amaze_demosaic_RT.cc b/rtengine/amaze_demosaic_RT.cc index 41c60d4ed..11ff1f5a0 100644 --- a/rtengine/amaze_demosaic_RT.cc +++ b/rtengine/amaze_demosaic_RT.cc @@ -30,7 +30,7 @@ #include "rawimagesource.h" #include "rt_math.h" #include "../rtgui/multilangmgr.h" -#include "sleef.c" +#include "sleef.h" #include "opthelper.h" #include "median.h" #include "StopWatch.h" diff --git a/rtengine/ciecam02.cc b/rtengine/ciecam02.cc index 0553c129e..8314e5e8f 100644 --- a/rtengine/ciecam02.cc +++ b/rtengine/ciecam02.cc @@ -20,7 +20,7 @@ #include "rt_math.h" #include "curves.h" #include -#include "sleef.c" +#include "sleef.h" #ifdef _DEBUG #include "settings.h" diff --git a/rtengine/color.cc b/rtengine/color.cc index 8437a36b1..8d20fb9ba 100644 --- a/rtengine/color.cc +++ b/rtengine/color.cc @@ -20,7 +20,7 @@ #include "rtengine.h" #include "color.h" #include "iccmatrices.h" -#include "sleef.c" +#include "sleef.h" #include "opthelper.h" #include "iccstore.h" diff --git a/rtengine/color.h b/rtengine/color.h index abe67d906..a89778157 100644 --- a/rtengine/color.h +++ b/rtengine/color.h @@ -26,7 +26,7 @@ #include "LUT.h" #include "iccmatrices.h" #include "lcms2.h" -#include "sleef.c" +#include "sleef.h" #define SAT(a,b,c) ((float)max(a,b,c)-(float)min(a,b,c))/(float)max(a,b,c) diff --git a/rtengine/colortemp.cc b/rtengine/colortemp.cc index 413880d49..02d3e0e6d 100644 --- a/rtengine/colortemp.cc +++ b/rtengine/colortemp.cc @@ -25,7 +25,7 @@ #include #include #include -#include "sleef.c" +#include "sleef.h" #include "settings.h" namespace rtengine diff --git a/rtengine/curves.h b/rtengine/curves.h index b8b72d0eb..bc8193b76 100644 --- a/rtengine/curves.h +++ b/rtengine/curves.h @@ -30,7 +30,7 @@ #include "pipettebuffer.h" #include "noncopyable.h" #include "LUT.h" -#include "sleef.c" +#include "sleef.h" #define CURVES_MIN_POLY_POINTS 1000 #include "rt_math.h" diff --git a/rtengine/demosaic_algos.cc b/rtengine/demosaic_algos.cc index 4058534da..45779fc9c 100644 --- a/rtengine/demosaic_algos.cc +++ b/rtengine/demosaic_algos.cc @@ -25,7 +25,7 @@ #include "rt_math.h" #include "color.h" #include "../rtgui/multilangmgr.h" -#include "sleef.c" +#include "sleef.h" #include "opthelper.h" #include "median.h" //#define BENCHMARK diff --git a/rtengine/filmnegativeproc.cc b/rtengine/filmnegativeproc.cc index 1ceff7e20..86bad00f7 100644 --- a/rtengine/filmnegativeproc.cc +++ b/rtengine/filmnegativeproc.cc @@ -28,7 +28,7 @@ #include "procparams.h" #include "rt_algo.h" #include "rtengine.h" -#include "sleef.c" +#include "sleef.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/filmnegativethumb.cc b/rtengine/filmnegativethumb.cc index fa50e93bf..b31432a55 100644 --- a/rtengine/filmnegativethumb.cc +++ b/rtengine/filmnegativethumb.cc @@ -22,7 +22,7 @@ #include "rtengine.h" #include "rtthumbnail.h" #include "opthelper.h" -#include "sleef.c" +#include "sleef.h" #include "rt_algo.h" #include "settings.h" #include "procparams.h" diff --git a/rtengine/impulse_denoise.cc b/rtengine/impulse_denoise.cc index c08f55700..20229e714 100644 --- a/rtengine/impulse_denoise.cc +++ b/rtengine/impulse_denoise.cc @@ -22,7 +22,7 @@ #include "labimage.h" #include "improcfun.h" #include "cieimage.h" -#include "sleef.c" +#include "sleef.h" #include "opthelper.h" #include "gauss.h" diff --git a/rtengine/iplabregions.cc b/rtengine/iplabregions.cc index e3755f0fc..1768101c8 100644 --- a/rtengine/iplabregions.cc +++ b/rtengine/iplabregions.cc @@ -25,8 +25,7 @@ #include "improcfun.h" #include "labimage.h" #include "procparams.h" - -#include "sleef.c" +#include "sleef.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/ipresize.cc b/rtengine/ipresize.cc index b31fcf864..b9e234b63 100644 --- a/rtengine/ipresize.cc +++ b/rtengine/ipresize.cc @@ -25,7 +25,7 @@ #include "opthelper.h" #include "rt_math.h" #include "procparams.h" -#include "sleef.c" +#include "sleef.h" //#define PROFILE diff --git a/rtengine/ipshadowshighlights.cc b/rtengine/ipshadowshighlights.cc index 45031da53..a602c5460 100644 --- a/rtengine/ipshadowshighlights.cc +++ b/rtengine/ipshadowshighlights.cc @@ -28,8 +28,7 @@ #include "labimage.h" #include "opthelper.h" #include "procparams.h" - -#include "sleef.c" +#include "sleef.h" namespace rtengine { diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index 0758011bb..a35476d3a 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -28,7 +28,7 @@ #include "rt_algo.h" #include "rt_math.h" #include "settings.h" -#include "sleef.c" +#include "sleef.h" //#define BENCHMARK #include "StopWatch.h" diff --git a/rtengine/iptransform.cc b/rtengine/iptransform.cc index b6ffcec1c..a4f304413 100644 --- a/rtengine/iptransform.cc +++ b/rtengine/iptransform.cc @@ -25,7 +25,7 @@ #include "rt_math.h" #include "rtengine.h" #include "rtlensfun.h" -#include "sleef.c" +#include "sleef.h" using namespace std; diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 08b317e4c..91c7d6c44 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -41,7 +41,7 @@ #include "procparams.h" #include "rt_math.h" #include "rtengine.h" -#include "sleef.c" +#include "sleef.h" #include "../rtgui/options.h" #ifdef _OPENMP diff --git a/rtengine/pixelshift.cc b/rtengine/pixelshift.cc index 7a6b6db41..0d83d7af3 100644 --- a/rtengine/pixelshift.cc +++ b/rtengine/pixelshift.cc @@ -28,7 +28,7 @@ #include "median.h" #include "procparams.h" #include "rawimagesource.h" -#include "sleef.c" +#include "sleef.h" #include "../rtgui/multilangmgr.h" #include "../rtgui/options.h" diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index aadbac7f7..b02e75461 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -31,7 +31,7 @@ #include "opthelper.h" #include "rt_algo.h" #include "rt_math.h" -#include "sleef.c" +#include "sleef.h" namespace { float calcBlendFactor(float val, float threshold) { diff --git a/rtengine/shmap.cc b/rtengine/shmap.cc index d0c34e925..44096d965 100644 --- a/rtengine/shmap.cc +++ b/rtengine/shmap.cc @@ -22,7 +22,7 @@ #include "rtengine.h" #include "rt_math.h" #include "rawimagesource.h" -#include "sleef.c" +#include "sleef.h" #include "jaggedarray.h" #undef THREAD_PRIORITY_NORMAL #include "opthelper.h" diff --git a/rtengine/sleef.c b/rtengine/sleef.h similarity index 99% rename from rtengine/sleef.c rename to rtengine/sleef.h index a01aef5b9..30c059010 100644 --- a/rtengine/sleef.c +++ b/rtengine/sleef.h @@ -6,9 +6,7 @@ // This version contains modifications made by Ingo Weyrich // //////////////////////////////////////////////////////////////// - -#ifndef _SLEEFC_ -#define _SLEEFC_ +#pragma once #include #include @@ -1275,5 +1273,3 @@ __inline float xlog2lin(float x, float base) constexpr float one(1); return (pow_F(base, x) - one) / (base - one); } - -#endif diff --git a/rtengine/tmo_fattal02.cc b/rtengine/tmo_fattal02.cc index 173171e0e..feba5c95f 100644 --- a/rtengine/tmo_fattal02.cc +++ b/rtengine/tmo_fattal02.cc @@ -75,7 +75,7 @@ #include "rescale.h" #include "rt_algo.h" #include "settings.h" -#include "sleef.c" +#include "sleef.h" #include "StopWatch.h" namespace rtengine