From d532c167d8f34f74676ebfb57aa951ebad510ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Sat, 5 May 2012 14:52:07 +0200 Subject: [PATCH] Fixed some compiler warnings. --- .../gui/panel/color_picker/ColorSlider.cpp | 50 +++++++++---------- .../icon-o-matic/generic/support/rgb_hsv.h | 3 ++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp index 652c426e5b..83aa2f4f8a 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp @@ -475,40 +475,38 @@ ColorSlider::GetOtherValues(float* value1, float* value2) const void ColorSlider::SetMarkerToColor(rgb_color color) { - float h, s, v; - if (fMode & (H_SELECTED | S_SELECTED | V_SELECTED)) { - RGB_to_HSV((float)color.red / 255.0, - (float)color.green / 255.0, - (float)color.blue / 255.0, - h, s, v); + float h = 0.0f; + float s = 0.0f; + float v = 0.0f; + if ((fMode & (H_SELECTED | S_SELECTED | V_SELECTED)) != 0) { + RGB_to_HSV((float)color.red / 255.0f, (float)color.green / 255.0f, + (float)color.blue / 255.0f, h, s, v); } switch (fMode) { - - case R_SELECTED: { - SetValue( 255 - color.red ); - } break; + case R_SELECTED: + SetValue(255 - color.red); + break; - case G_SELECTED: { - SetValue( 255 - color.green ); - } break; + case G_SELECTED: + SetValue(255 - color.green); + break; - case B_SELECTED: { - SetValue( 255 - color.blue ); - } break; + case B_SELECTED: + SetValue(255 - color.blue); + break; - case H_SELECTED: { - SetValue( 255.0 - round(h / 6.0 * 255.0) ); - } break; + case H_SELECTED: + SetValue(255.0 - round(h / 6.0 * 255.0)); + break; - case S_SELECTED: { - SetValue( 255.0 - round(s * 255.0) ); - } break; - - case V_SELECTED: { - SetValue( 255.0 - round(v * 255.0) ); - } break; + case S_SELECTED: + SetValue(255.0 - round(s * 255.0)); + break; + case V_SELECTED: + SetValue(255.0 - round(v * 255.0)); + break; } } diff --git a/src/apps/icon-o-matic/generic/support/rgb_hsv.h b/src/apps/icon-o-matic/generic/support/rgb_hsv.h index 4fdd50906a..dad5e834ab 100644 --- a/src/apps/icon-o-matic/generic/support/rgb_hsv.h +++ b/src/apps/icon-o-matic/generic/support/rgb_hsv.h @@ -98,6 +98,9 @@ HSV_to_RGB(float h, float s, float v, float& R, float& G, float& B) case 5: RETURN_RGB(v, m, n); + + default: + RETURN_RGB(0, 0, 0); } }