Fixed some compiler warnings.

This commit is contained in:
Stephan Aßmus
2012-05-05 14:52:07 +02:00
parent d72c055e90
commit d532c167d8
2 changed files with 27 additions and 26 deletions
@@ -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;
}
}
@@ -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);
}
}