liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make compilation unit rtengine/procparams.cc -Wextra clean, #4155

Browse Source
This commit is contained in:
heckflosse 2017-10-22 23:48:38 +02:00
parent 31c75864d4
commit 330ee9a91f
5 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rtengine/improccoordinator.cc
View File

@ -478,13 +478,7 @@ void ImProcCoordinator::updatePreviewImage (int todo, Crop* cropCall)
{wprof[1][0], wprof[1][1], wprof[1][2]}, {wprof[1][0], wprof[1][1], wprof[1][2]},
{wprof[2][0], wprof[2][1], wprof[2][2]} {wprof[2][0], wprof[2][1], wprof[2][2]}
}; };
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params.icm.working); params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, opautili);
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
{wiprof[2][0], wiprof[2][1], wiprof[2][2]}
};
params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, wip, opautili);
CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, scale == 1 ? 1 : 16); CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, scale == 1 ? 1 : 16);
CurveFactory::curveToning (params.colorToning.cl2curve, cl2Toningcurve, scale == 1 ? 1 : 16); CurveFactory::curveToning (params.colorToning.cl2curve, cl2Toningcurve, scale == 1 ? 1 : 16);
} }

6
rtengine/procparams.cc
View File

@ -18,7 +18,6 @@
*/ */
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include "procparams.h" #include "procparams.h"
#include "rt_math.h"
#include "curves.h" #include "curves.h"
#include "../rtgui/multilangmgr.h" #include "../rtgui/multilangmgr.h"
#include "../rtgui/version.h" #include "../rtgui/version.h"
@ -26,6 +25,7 @@
#include "../rtgui/paramsedited.h" #include "../rtgui/paramsedited.h"
#include "../rtgui/options.h" #include "../rtgui/options.h"
#include <locale.h> #include <locale.h>
#define APPVERSION RTVERSION #define APPVERSION RTVERSION
using namespace std; using namespace std;
@ -558,7 +558,7 @@ void ColorToningParams::slidersToCurve (std::vector<double> &colorCurve, std::ve
opacityCurve.at (8) = 0.35; opacityCurve.at (8) = 0.35;
} }
void ColorToningParams::getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const void ColorToningParams::getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], bool &opautili) const
{ {
float satur = 0.8f; float satur = 0.8f;
float lumin = 0.5f; //middle of luminance for optimization of gamut - no real importance...as we work in XYZ and gamut control float lumin = 0.5f; //middle of luminance for optimization of gamut - no real importance...as we work in XYZ and gamut control
@ -8829,7 +8829,7 @@ void PartialProfile::clearGeneral ()
} }
} }
const void PartialProfile::applyTo (ProcParams *destParams) const void PartialProfile::applyTo (ProcParams *destParams) const
{ {
if (destParams && pparams && pedited) { if (destParams && pparams && pedited) {
pedited->combine (*destParams, *pparams, true); pedited->combine (*destParams, *pparams, true);

4
rtengine/procparams.h
View File

@ -435,7 +435,7 @@ public:
/// @brief Specifically transform the sliders values to their curve equivalences /// @brief Specifically transform the sliders values to their curve equivalences
void slidersToCurve (std::vector<double> &colorCurve, std::vector<double> &opacityCurve) const; void slidersToCurve (std::vector<double> &colorCurve, std::vector<double> &opacityCurve) const;
/// @brief Fill the ColorGradientCurve and OpacityCurve LUTf from the control points curve or sliders value /// @brief Fill the ColorGradientCurve and OpacityCurve LUTf from the control points curve or sliders value
void getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], const double rgb_xyz[3][3], bool &opautili) const; void getCurves (ColorGradientCurve &colorCurveLUT, OpacityCurve &opacityCurveLUT, const double xyz_rgb[3][3], bool &opautili) const;
static void getDefaultColorCurve (std::vector<double> &curve); static void getDefaultColorCurve (std::vector<double> &curve);
static void getDefaultOpacityCurve (std::vector<double> &curve); static void getDefaultOpacityCurve (std::vector<double> &curve);
@ -1493,7 +1493,7 @@ public:
void clearGeneral (); void clearGeneral ();
int load (const Glib::ustring &fName); int load (const Glib::ustring &fName);
void set (bool v); void set (bool v);
const void applyTo (ProcParams *destParams) const ; void applyTo (ProcParams *destParams) const ;
}; };
/** /**

8
rtengine/rtthumbnail.cc
View File

@ -1172,13 +1172,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, eSensorT
{wprof[1][0], wprof[1][1], wprof[1][2]}, {wprof[1][0], wprof[1][1], wprof[1][2]},
{wprof[2][0], wprof[2][1], wprof[2][2]} {wprof[2][0], wprof[2][1], wprof[2][2]}
}; };
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params.icm.working); params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, opautili);
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
{wiprof[2][0], wiprof[2][1], wiprof[2][2]}
};
params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, wip, opautili);
clToningcurve (65536); clToningcurve (65536);
CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, scale == 1 ? 1 : 16); CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, scale == 1 ? 1 : 16);

8
rtengine/simpleprocess.cc
View File

@ -886,13 +886,7 @@ private:
{wprof[1][0], wprof[1][1], wprof[1][2]}, {wprof[1][0], wprof[1][1], wprof[1][2]},
{wprof[2][0], wprof[2][1], wprof[2][2]} {wprof[2][0], wprof[2][1], wprof[2][2]}
}; };
TMatrix wiprof = ICCStore::getInstance()->workingSpaceInverseMatrix (params.icm.working); params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, opautili);
double wip[3][3] = {
{wiprof[0][0], wiprof[0][1], wiprof[0][2]},
{wiprof[1][0], wiprof[1][1], wiprof[1][2]},
{wiprof[2][0], wiprof[2][1], wiprof[2][2]}
};
params.colorToning.getCurves (ctColorCurve, ctOpacityCurve, wp, wip, opautili);
clToningcurve (65536, 0); clToningcurve (65536, 0);
CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, 1); CurveFactory::curveToning (params.colorToning.clcurve, clToningcurve, 1);
cl2Toningcurve (65536, 0); cl2Toningcurve (65536, 0);