client: fix two narrowing conversion c++-11 warnings

Warnings are from initializing members of type int from uint32_t. Fix is
to change alt_image and red_icon height and width fields to ints.

Example warning fixed:
 res.cpp:58:1: error: narrowing conversion of ‘_red_icon.<anonymous
 struct>::width’ from ‘const uint32_t {aka const unsigned int}’ to ‘int’
 inside { } is ill-formed in C++11 [-Werror=narrowing]

Signed-off-by: Alon Levy <alevy@redhat.com>
This commit is contained in:
Alon Levy 2012-03-14 16:51:51 +02:00
parent 30f347e41a
commit da1b0ee3d2
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
static const struct {
uint32_t width;
uint32_t height;
int width;
int height;
uint8_t pixel_data[17496];
} _alt_image = { 81, 54, {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,

View File

@ -1,6 +1,6 @@
static const struct {
uint32_t width;
uint32_t height;
int width;
int height;
uint8_t pixmap[4096];
uint8_t mask[128];
} _red_icon = { 32, 32, {