[Spice-commits] 2 commits - client/x11 server/smartcard.c

[Hans de Goede]

 client/x11/images/alt_image.c |    4 ++--
 client/x11/images/red_icon.c  |    4 ++--
 server/smartcard.c            |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 0ac13ecbc4c20d322b1c49935678c25e621a0a99
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jan 13 15:26:57 2012 +0100

    client-x11: Fix building with gcc-4.7
    
    Without this change gcc says:
    x11/res.cpp:31:1: error: narrowing conversion of ‘(((unsigned int)_alt_image.<anonymous struct>::width) * 4u)’ from ‘unsigned int’ to ‘int’ inside { } is ill-formed in C++11 [-Werror=narrowing]
    x11/res.cpp:61: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]
    x11/res.cpp:61:1: error: narrowing conversion of ‘_red_icon.<anonymous struct>::height’ from ‘const uint32_t {aka const unsigned int}’ to ‘int’ inside { } is ill-formed in C++11 [-Werror=narrowing]
    cc1plus: all warnings being treated as errors
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/client/x11/images/alt_image.c b/client/x11/images/alt_image.c
index 7968339..e11cf1f 100644
--- a/client/x11/images/alt_image.c
+++ b/client/x11/images/alt_image.c
@@ -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,
diff --git a/client/x11/images/red_icon.c b/client/x11/images/red_icon.c
index ce1a7d4..143d4e2 100644
--- a/client/x11/images/red_icon.c
+++ b/client/x11/images/red_icon.c
@@ -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, {
commit c6800dacf01e8d06b1fde3ca5893bf83d7fa270e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jan 13 15:14:37 2012 +0100

    smartcard handling: Fix compilation when ASSERT-s are turned on
    
    Signed-off-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/server/smartcard.c b/server/smartcard.c
index 08ba3da..43ca1ac 100644
--- a/server/smartcard.c
+++ b/server/smartcard.c
@@ -453,7 +453,7 @@ static int smartcard_channel_handle_message(RedChannelClient *rcc,
         return red_channel_client_handle_message(rcc, size, type, msg);
     }
 
-    ASSERT(header->size == vheader->length + sizeof(VSCMsgHeader));
+    ASSERT(size == vheader->length + sizeof(VSCMsgHeader));
     switch (vheader->type) {
         case VSC_ReaderAdd:
             smartcard_add_reader(rcc, msg + sizeof(VSCMsgHeader));