From a0190fce2302b8051f744c5cf38c1b334d77d11e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 23 Jan 2012 15:49:22 +0100 Subject: Fix various comparison between signed and unsigned integer expressions warnings These turn into errors because of our -Werror use, breaking the build. Signed-off-by: Hans de Goede --- client/gui/softrenderer.cpp | 2 +- client/x11/event_sources_p.cpp | 2 +- client/x11/platform.cpp | 12 ++++++------ client/x11/red_window.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/gui/softrenderer.cpp b/client/gui/softrenderer.cpp index 9f19e7b0..c888bc03 100644 --- a/client/gui/softrenderer.cpp +++ b/client/gui/softrenderer.cpp @@ -45,7 +45,7 @@ SoftRenderer::SoftRenderer(uint8_t* surface, uint width, uint height, uint strid , _image_codec_module (NULL) , _queueing(true) { - assert(stride == _width * 4); //for now + assert(stride == width * 4); //for now if (!_image_codec) { setupImageCodec(); } diff --git a/client/x11/event_sources_p.cpp b/client/x11/event_sources_p.cpp index 1958a04d..5f9f4523 100644 --- a/client/x11/event_sources_p.cpp +++ b/client/x11/event_sources_p.cpp @@ -119,7 +119,7 @@ bool EventSources::wait_events(int timeout_msec) return false; } - for (int i = 0; i < _events.size(); i++) { + for (unsigned int i = 0; i < _events.size(); i++) { if (FD_ISSET(_fds[i], &rfds)) { _events[i]->action(); /* The action may have removed / added event sources changing diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp index 416513e6..f535d6da 100644 --- a/client/x11/platform.cpp +++ b/client/x11/platform.cpp @@ -135,7 +135,7 @@ static struct clipboard_format_info clipboard_formats[] = { { VD_AGENT_CLIPBOARD_IMAGE_JPG, { "image/jpeg", NULL }, }, }; -#define clipboard_format_count (sizeof(clipboard_formats)/sizeof(clipboard_formats[0])) +#define clipboard_format_count ((int)(sizeof(clipboard_formats)/sizeof(clipboard_formats[0]))) struct selection_request { XEvent event; @@ -145,11 +145,11 @@ struct selection_request { static int expected_targets_notifies = 0; static bool waiting_for_property_notify = false; static uint8_t* clipboard_data = NULL; -static int32_t clipboard_data_size = 0; -static int32_t clipboard_data_space = 0; +static uint32_t clipboard_data_size = 0; +static uint32_t clipboard_data_space = 0; static Atom clipboard_request_target = None; static selection_request *next_selection_request = NULL; -static uint32_t clipboard_type_count = 0; +static int clipboard_type_count = 0; static uint32_t clipboard_agent_types[256]; static Atom clipboard_x11_targets[256]; static Mutex clipboard_lock; @@ -1242,7 +1242,7 @@ private: void update_position(); bool find_mode_in_outputs(RRMode mode, int start_index, XRRScreenResources* res); bool find_mode_in_clones(RRMode mode, XRRScreenResources* res); - XRRModeInfo* find_mode(int width, int height, XRRScreenResources* res); + XRRModeInfo* find_mode(unsigned int width, unsigned int height, XRRScreenResources* res); private: MultyMonScreen& _container; @@ -2181,7 +2181,7 @@ public: } }; -XRRModeInfo* XMonitor::find_mode(int width, int height, XRRScreenResources* res) +XRRModeInfo* XMonitor::find_mode(unsigned int width, unsigned int height, XRRScreenResources* res) { typedef std::set ModesSet; ModesSet modes_set; diff --git a/client/x11/red_window.cpp b/client/x11/red_window.cpp index e0b7d456..b16249ea 100644 --- a/client/x11/red_window.cpp +++ b/client/x11/red_window.cpp @@ -922,7 +922,7 @@ void RedWindow_p::win_proc(XEvent& event) case ClientMessage: if (event.xclient.message_type == wm_protocol_atom) { ASSERT(event.xclient.format == 32); - if (event.xclient.data.l[0] == wm_delete_window_atom) { + if ((Atom)event.xclient.data.l[0] == wm_delete_window_atom) { DBG(0, "wm_delete_window"); Platform::send_quit_request(); } -- cgit