i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some compiler warnings.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorSlider.cpp
+24 -26
View File
@@ -475,40 +475,38 @@ ColorSlider::GetOtherValues(float* value1, float* value2) const
void void
ColorSlider::SetMarkerToColor(rgb_color color) ColorSlider::SetMarkerToColor(rgb_color color)
{ {
float h, s, v; float h = 0.0f;
if (fMode & (H_SELECTED | S_SELECTED | V_SELECTED)) { float s = 0.0f;
RGB_to_HSV((float)color.red / 255.0, float v = 0.0f;
(float)color.green / 255.0, if ((fMode & (H_SELECTED | S_SELECTED | V_SELECTED)) != 0) {
(float)color.blue / 255.0, RGB_to_HSV((float)color.red / 255.0f, (float)color.green / 255.0f,
h, s, v); (float)color.blue / 255.0f, h, s, v);
} }
switch (fMode) { switch (fMode) {
case R_SELECTED:
case R_SELECTED: { SetValue(255 - color.red);
SetValue( 255 - color.red ); break;
} break;
case G_SELECTED: { case G_SELECTED:
SetValue( 255 - color.green ); SetValue(255 - color.green);
} break; break;
case B_SELECTED: { case B_SELECTED:
SetValue( 255 - color.blue ); SetValue(255 - color.blue);
} break; break;
case H_SELECTED: { case H_SELECTED:
SetValue( 255.0 - round(h / 6.0 * 255.0) ); SetValue(255.0 - round(h / 6.0 * 255.0));
} break; break;
case S_SELECTED: { case S_SELECTED:
SetValue( 255.0 - round(s * 255.0) ); SetValue(255.0 - round(s * 255.0));
} break; break;
case V_SELECTED: {
SetValue( 255.0 - round(v * 255.0) );
} break;
case V_SELECTED:
SetValue(255.0 - round(v * 255.0));
break;
} }
} }
src/apps/icon-o-matic/generic/support/rgb_hsv.h
+3
View File
@@ -98,6 +98,9 @@ HSV_to_RGB(float h, float s, float v, float& R, float& G, float& B)
case 5: case 5:
RETURN_RGB(v, m, n); RETURN_RGB(v, m, n);
default:
RETURN_RGB(0, 0, 0);
} }
} }