Fix some GCC 8 warnings (#4397)

This commit is contained in:
Flössie 2018-02-14 20:01:20 +01:00
parent 18c90efe25
commit 04cef998a2
3 changed files with 6 additions and 6 deletions

View File

@ -1270,7 +1270,7 @@ void ColorTemp::temp2mul (double temp, double green, double equal, double& rmul,
} }
if (settings->verbose) { if (settings->verbose) {
double correl_temp; double correl_temp = 0.0;
XYZtoCorColorTemp(Xwb, Ywb, Zwb, correl_temp); XYZtoCorColorTemp(Xwb, Ywb, Zwb, correl_temp);
printf("Correlated temperature (lamp)=%i\n", (int) correl_temp); //use only for lamp...otherwise It give an information!! printf("Correlated temperature (lamp)=%i\n", (int) correl_temp); //use only for lamp...otherwise It give an information!!
} }

View File

@ -1880,7 +1880,7 @@ void RawImageSource::lmmse_interpolate_omp(int winw, int winh, array2D<float> &r
gamtab->makeIdentity(); gamtab->makeIdentity();
} }
array2D<float> (*rgb[3]); array2D<float>* rgb[3];
rgb[0] = &red; rgb[0] = &red;
rgb[1] = &green; rgb[1] = &green;
rgb[2] = &blue; rgb[2] = &blue;
@ -2619,7 +2619,7 @@ void RawImageSource::ahd_demosaic()
static const int dir[4] = { -1, 1, -TS, TS }; static const int dir[4] = { -1, 1, -TS, TS };
float ldiff[2][4], abdiff[2][4], leps, abeps; float ldiff[2][4], abdiff[2][4], leps, abeps;
float xyz[3], xyz_cam[3][4]; float xyz[3], xyz_cam[3][4];
float (*cbrt); float* cbrt;
float (*rgb)[TS][TS][3]; float (*rgb)[TS][TS][3];
float (*lab)[TS][TS][3]; float (*lab)[TS][TS][3];
float (*lix)[3]; float (*lix)[3];
@ -3982,10 +3982,10 @@ void RawImageSource::rcd_demosaic()
//float V_Stat, H_Stat, P_Stat, Q_Stat; //float V_Stat, H_Stat, P_Stat, Q_Stat;
float VH_Central_Value, VH_Neighbour_Value, PQ_Central_Value, PQ_Neighbour_Value; float VH_Central_Value, VH_Neighbour_Value, PQ_Central_Value, PQ_Neighbour_Value;
*/ */
float ( *VH_Dir ), ( *PQ_Dir ); float *VH_Dir, *PQ_Dir;
//Low pass filter //Low pass filter
float ( *lpf ); float *lpf;
/** /**

View File

@ -1346,7 +1346,7 @@ int RawImageSource::findHotDeadPixels( PixelsMap &bpMap, float thresh, bool find
float varthresh = (20.0 * (thresh / 100.0) + 1.0 ) / 24.f; float varthresh = (20.0 * (thresh / 100.0) + 1.0 ) / 24.f;
// allocate temporary buffer // allocate temporary buffer
float (*cfablur); float* cfablur;
cfablur = (float (*)) malloc (H * W * sizeof * cfablur); cfablur = (float (*)) malloc (H * W * sizeof * cfablur);
// counter for dead or hot pixels // counter for dead or hot pixels