Fix compiler warnings

This commit is contained in:
Lawrence Lee 2024-11-17 21:57:03 -08:00
parent cf20964b59
commit 721d664136
No known key found for this signature in database
GPG Key ID: F457B4971BE3C53C
3 changed files with 7 additions and 4 deletions

View File

@ -755,8 +755,8 @@ BENCHFUN
int min_numblox_W = ceil((static_cast<float>((MIN(imwidth, ((numtiles_W - 1) * tileWskip) + tilewidth)) - ((numtiles_W - 1) * tileWskip))) / (offset)) + 2 * blkrad; int min_numblox_W = ceil((static_cast<float>((MIN(imwidth, ((numtiles_W - 1) * tileWskip) + tilewidth)) - ((numtiles_W - 1) * tileWskip))) / (offset)) + 2 * blkrad;
// these are needed only for creation of the plans and will be freed before entering the parallel loop // these are needed only for creation of the plans and will be freed before entering the parallel loop
fftwf_plan plan_forward_blox[2]; fftwf_plan plan_forward_blox[2] = {};
fftwf_plan plan_backward_blox[2]; fftwf_plan plan_backward_blox[2] = {};
if (denoiseLuminance) { if (denoiseLuminance) {
float *Lbloxtmp = reinterpret_cast<float*>(fftwf_malloc(max_numblox_W * TS * TS * sizeof(float))); float *Lbloxtmp = reinterpret_cast<float*>(fftwf_malloc(max_numblox_W * TS * TS * sizeof(float)));

View File

@ -6728,7 +6728,8 @@ void ImProcFunctions::maskcalccol(bool invmask, bool pde, int bfw, int bfh, int
bdecomp.reconstruct(tmpab.b[0]); bdecomp.reconstruct(tmpab.b[0]);
} }
float meanfab1, fab1, maxfab1; float meanfab1, fab1;
float maxfab1 = 0.f;
std::unique_ptr<LabImage> buforig; std::unique_ptr<LabImage> buforig;
buforig.reset(new LabImage(bfw, bfh)); buforig.reset(new LabImage(bfw, bfh));
#ifdef _OPENMP #ifdef _OPENMP

View File

@ -224,7 +224,7 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
{wiprof[2][0], wiprof[2][1], wiprof[2][2]} {wiprof[2][0], wiprof[2][1], wiprof[2][2]}
}; };
const int imheight = lab->H, imwidth = lab->W; const int imheight = lab->H, imwidth = lab->W;
int levwavL; int levwavL = 0;
//Flat curve for H=f(H) in final touchup for guidedfilter //Flat curve for H=f(H) in final touchup for guidedfilter
FlatCurve* wavguidCurve = new FlatCurve(params->wavelet.wavguidcurve); //curve H=f(H) FlatCurve* wavguidCurve = new FlatCurve(params->wavelet.wavguidcurve); //curve H=f(H)
bool wavguidutili = false; bool wavguidutili = false;
@ -258,6 +258,8 @@ void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int kall, const
cp.complex = 0; cp.complex = 0;
} else if (params->wavelet.complexmethod == "expert") { } else if (params->wavelet.complexmethod == "expert") {
cp.complex = 1; cp.complex = 1;
} else {
cp.complex = 0;
} }