From f068ecea0a72f16044bfa3cb932d57576fa622d3 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 19 Jul 2015 21:06:42 -0400 Subject: [PATCH] Icon-O-Matic: Fix gcc4 build. - Add explicit casts to uint8 since gcc4 otherwise warns about a narrowing conversion. --- .../icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp | 3 ++- .../generic/gui/panel/color_picker/ColorSlider.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp index 30185cb0d7..30310fd3ac 100644 --- a/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp +++ b/src/apps/icon-o-matic/generic/gui/panel/color_picker/ColorField.cpp @@ -276,7 +276,8 @@ ColorField::SetModeAndValue(SelectedColorMode mode, float fixedValue) R *= 255.0; G *= 255.0; B *= 255.0; } - rgb_color color = { round(R), round(G), round(B), 255 }; + rgb_color color = { (uint8)round(R), (uint8)round(G), (uint8)round(B), + 255 }; if (fFixedValue != fixedValue || fMode != mode) { fFixedValue = fixedValue; 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 3f5c7aa130..27b28bf367 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 @@ -323,7 +323,8 @@ ColorSlider::SetModeAndValues(SelectedColorMode mode, B *= 255.0; } - rgb_color color = { round(R), round(G), round(B), 255 }; + rgb_color color = { (uint8)round(R), (uint8)round(G), (uint8)round(B), + 255 }; fMode = mode; SetOtherValues(value1, value2);