From db18b7ad71e61c096aa9d17685620011a8ce781e Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 14 Jun 2017 22:13:49 +0200 Subject: [PATCH] Fix some coverity issues --- rtengine/color.cc | 2 +- rtengine/ipwavelet.cc | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/rtengine/color.cc b/rtengine/color.cc index 0da74d1c0..0957ac71e 100644 --- a/rtengine/color.cc +++ b/rtengine/color.cc @@ -1531,7 +1531,7 @@ void Color::interpolateRGBColor (float realL, float iplow, float iphigh, int alg int toDo, const double xyz_rgb[3][3], const double rgb_xyz[3][3], float &ro, float &go, float &bo) { float X1, Y1, Z1, X2, Y2, Z2, X, Y, Z, XL, YL, ZL; - float L1 = 0.f, L2, LL, a_1 = 0.f, b_1 = 0.f, a_2, b_2, a_L, b_L; + float L1 = 0.f, L2, LL, a_1 = 0.f, b_1 = 0.f, a_2 = 0.f, b_2 = 0.f, a_L, b_L; // converting color 1 to Lab (image) Color::rgbxyz(r1, g1, b1, X1, Y1, Z1, xyz_rgb); diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc index 70b3be330..f5cb63b07 100644 --- a/rtengine/ipwavelet.cc +++ b/rtengine/ipwavelet.cc @@ -3404,14 +3404,18 @@ void ImProcFunctions::ContAllAB (LabImage * labco, int maxlvl, float ** varhue, } bool useOpacity; - float mulOpacity; + float mulOpacity = 0.f; if(useChannelA) { useOpacity = cp.opaRG; - mulOpacity = cp.mulopaRG[level]; + if(level < 9) { + mulOpacity = cp.mulopaRG[level]; + } } else { useOpacity = cp.opaBY; - mulOpacity = cp.mulopaBY[level]; + if(level < 9) { + mulOpacity = cp.mulopaBY[level]; + } } if((useOpacity && level < 9 && mulOpacity != 0.f) && cp.toningena) { //toning