From 2e1347b2bfc34f47f20174ae1112d7b4f774ae48 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Tue, 30 Apr 2013 13:16:25 +0900 Subject: [PATCH] Fix more GCC4 narrowing conversion warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Duval --- src/add-ons/screen_savers/message/Message.cpp | 3 ++- .../generic/gui/panel/color_picker/ColorSlider.cpp | 7 ++++--- src/apps/mediaplayer/media_node_framework/NodeManager.cpp | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/add-ons/screen_savers/message/Message.cpp b/src/add-ons/screen_savers/message/Message.cpp index f45643d430..3cbf41cc88 100644 --- a/src/add-ons/screen_savers/message/Message.cpp +++ b/src/add-ons/screen_savers/message/Message.cpp @@ -176,7 +176,8 @@ Message::Draw(BView *view, int32 frame) buffer.Lock(); // Set up the colors - rgb_color base_color = {rand() % 25, rand() % 25, rand() % 25}; + rgb_color base_color = {(uint8)(rand() % 25), (uint8)(rand() % 25), + (uint8)(rand() % 25)}; offscreen.SetHighColor(base_color); offscreen.SetLowColor(tint_color(base_color, 0.815F)); offscreen.FillRect(offscreen.Bounds(), kCheckered); 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 83aa2f4f8a..1a961399e8 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 @@ -439,7 +439,8 @@ ColorSlider::SetModeAndValues(selected_color_mode mode, 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 }; fMode = mode; SetOtherValues(value1, value2); @@ -638,7 +639,7 @@ void ColorSlider::_DrawColorLineY(BView *view, float y, int r, int g, int b) { - rgb_color color = { r, g, b, 255 }; + rgb_color color = {(uint8)r, (uint8)g, (uint8)b, 255 }; y = 255.0 - y; view->AddLine( BPoint(8.0, y + 5.0), BPoint(27.0, y + 5.0), color ); } @@ -648,7 +649,7 @@ void ColorSlider::_DrawColorLineX(BView *view, float x, int r, int g, int b) { - rgb_color color = { r, g, b, 255 }; + rgb_color color = {(uint8)r, (uint8)g, (uint8)b, 255 }; BRect bounds(view->Bounds()); x = (255.0 - x) * (bounds.Width() - 2.0) / 255.0 + 2.0; view->AddLine( BPoint(x, bounds.top + 2.0), BPoint(x, bounds.bottom - 2.0), color ); diff --git a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp index 0e976b617b..a6ec1417db 100644 --- a/src/apps/mediaplayer/media_node_framework/NodeManager.cpp +++ b/src/apps/mediaplayer/media_node_framework/NodeManager.cpp @@ -393,12 +393,12 @@ NodeManager::_SetUpVideoNodes(color_space preferredVideoFormat, format.type = B_MEDIA_RAW_VIDEO; media_raw_video_format videoFormat = { FramesPerSecond(), 1, 0, - fVideoBounds.IntegerWidth(), + (uint32)fVideoBounds.IntegerWidth(), B_VIDEO_TOP_LEFT_RIGHT, 1, 1, { preferredVideoFormat, - fVideoBounds.IntegerWidth() + 1, - fVideoBounds.IntegerHeight() + 1, + (uint32)(fVideoBounds.IntegerWidth() + 1), + (uint32)(fVideoBounds.IntegerHeight() + 1), 0, 0, 0 } };