Fixing some undefined behaviour part 3, Issue 2277

This commit is contained in:
Ingo 2014-03-18 13:20:26 +01:00
parent 0f31ed3499
commit 35d0fe5ee6
5 changed files with 5 additions and 5 deletions

View File

@ -857,7 +857,7 @@ namespace rtengine {
C9=8.0f;C8=15.0f;C7=12.0f;C4=7.0f;C3=5.0f;C2=5.0f;C1=5.0f;
if (ciec) {
float HH;
float HH = 0.f;
bool doskin;
if ((float)hue>8.6f && (float)hue<=74.f ) {HH=(1.15f/65.4f)*(float)hue-0.0012f; doskin=true;}//H > 0.15 H<1.3
else if((float)hue>0.f && (float)hue<=8.6f ) {HH=(0.19f/8.6f )*(float)hue-0.04f; doskin=true;}//H>-0.04 H < 0.15

View File

@ -243,7 +243,7 @@ public:
static inline double huelab_to_huehsv2 (float HH){
//hr=translate Hue Lab value (-Pi +Pi) in approximative hr (hsv values) (0 1) [red 1/6 yellow 1/6 green 1/6 cyan 1/6 blue 1/6 magenta 1/6 ]
// with multi linear correspondances (I expect there is no error !!)
double hr;
double hr = 0.0;
//allways put h between 0 and 1
if (HH>=0.f && HH < 0.6f) hr=0.11666*(double) HH + 0.93; //hr 0.93 1. full red

View File

@ -82,7 +82,7 @@ ImProcCoordinator::ImProcCoordinator ()
pW(-1), pH(-1),
plistener(NULL), imageListener(NULL), aeListener(NULL), hListener(NULL),acListener(NULL), abwListener(NULL),
resultValid(false), changeSinceLast(0), updaterRunning(false), destroying(false),utili(false),autili(false),
butili(false),ccutili(false),cclutili(false),clcutili(false)
butili(false),ccutili(false),cclutili(false),clcutili(false),fullw(1),fullh(1)
{}

View File

@ -67,7 +67,7 @@ CropWindow::CropWindow (ImageArea* parent, rtengine::StagedImageProcessor* ipc_,
backColor(options.bgcolor), decorated(true), titleHeight(30),
sideBorderWidth(3), lowerBorderWidth(3), upperBorderWidth(1), sepWidth(2),
xpos(30), ypos(30), imgX(0), imgY(0), imgW(1), imgH(1), iarea(parent),
cropZoom(0), cropgl(NULL), pmlistener(NULL), observedCropWin(NULL) {
cropZoom(0), cropgl(NULL), pmlistener(NULL), observedCropWin(NULL), isFlawnOver(false) {
Glib::RefPtr<Pango::Context> context = parent->get_pango_context () ;
Pango::FontDescription fontd = context->get_font_description ();

View File

@ -23,7 +23,7 @@
using namespace rtengine;
using namespace rtengine::procparams;
Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100000) {
Resize::Resize () : Gtk::VBox(), FoldableToolPanel(this), maxw(100000), maxh(100000), lastEnabled(false) {
set_border_width(4);