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

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

Browse Source
This commit is contained in:
heckflosse
2017-10-25 13:11:15 +02:00
parent 87c109a10e
commit beb6347a48
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/expo_before_b.cc
View File

@@ -80,7 +80,7 @@ void RawImageSource::processRawWhitepoint(float expos, float preser, array2D<flo
if (ri->getSensorType() == ST_BAYER || ri->getSensorType() == ST_FUJI_XTRANS) {
// Demosaic to allow calculation of luminosity.
if(ri->getSensorType() == ST_BAYER) {
fast_demosaic (0, 0, W, H);
fast_demosaic();
} else {
fast_xtrans_interpolate();
}

2
rtengine/fast_demo.cc
View File

@@ -52,7 +52,7 @@ LUTf RawImageSource::initInvGrad()
#endif
//LUTf RawImageSource::invGrad = RawImageSource::initInvGrad();
SSEFUNCTION void RawImageSource::fast_demosaic(int winx, int winy, int winw, int winh)
SSEFUNCTION void RawImageSource::fast_demosaic()
{
double progress = 0.0;

2
rtengine/rawimagesource.cc
View File

@@ -2046,7 +2046,7 @@ void RawImageSource::demosaic(const RAWParams &raw)
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::lmmse]) {
lmmse_interpolate_omp(W, H, rawData, red, green, blue, raw.bayersensor.lmmse_iterations);
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::fast] ) {
fast_demosaic (0, 0, W, H);
fast_demosaic();
} else if (raw.bayersensor.method == RAWParams::BayerSensor::methodstring[RAWParams::BayerSensor::mono] ) {
nodemosaic(true);
} else {

2
rtengine/rawimagesource.h
View File

@@ -245,7 +245,7 @@ protected:
void igv_interpolate(int winw, int winh);
void lmmse_interpolate_omp(int winw, int winh, array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue, int iterations);
void amaze_demosaic_RT(int winx, int winy, int winw, int winh, array2D<float> &rawData, array2D<float> &red, array2D<float> &green, array2D<float> &blue);//Emil's code for AMaZE
void fast_demosaic(int winx, int winy, int winw, int winh );//Emil's code for fast demosaicing
void fast_demosaic();//Emil's code for fast demosaicing
void dcb_demosaic(int iterations, bool dcb_enhance);
void ahd_demosaic();
void border_interpolate(unsigned int border, float (*image)[4], unsigned int start = 0, unsigned int end = 0);