Merge lp:~robertcarr/mir/display-sizes-are-unsigned into lp:~mir-team/mir/trunk

[Robert Carr]

Change client library display sizes to unsigned.

Noticed in platform-api mirclient that an ugly cast had to be made!

Changed client library display sizes to unsigned. I think uint32_t should be enough ;)

[Alan Griffiths (alan-griffiths)]

LGTM

But maybe we need a team discussion about when to use signed vs unsigned types

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:714
http://jenkins.qa.ubuntu.com/job/mir-ci/683/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/840
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/722
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/168
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/168/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/683/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2013-05-02 00:11:18 +0000
+++ examples/eglapp.c	2013-06-06 16:46:32 +0000
@@ -111,7 +111,7 @@
     }
 }
 
-mir_eglapp_bool mir_eglapp_init(int *width, int *height)
+mir_eglapp_bool mir_eglapp_init(unsigned int *width, unsigned int *height)
 {
     EGLint ctxattribs[] =
     {

=== modified file 'examples/eglapp.h'
--- examples/eglapp.h	2013-03-08 07:48:28 +0000
+++ examples/eglapp.h	2013-06-06 16:46:32 +0000
@@ -25,7 +25,7 @@
 
 typedef int mir_eglapp_bool;
 
-mir_eglapp_bool mir_eglapp_init(int *width, int *height);
+mir_eglapp_bool mir_eglapp_init(unsigned int *width, unsigned int *height);
 void            mir_eglapp_swap_buffers(void);
 mir_eglapp_bool mir_eglapp_running(void);
 void            mir_eglapp_shutdown(void);

=== modified file 'examples/eglflash.c'
--- examples/eglflash.c	2013-03-08 09:13:54 +0000
+++ examples/eglflash.c	2013-06-06 16:46:32 +0000
@@ -25,7 +25,7 @@
 
 int main(void)
 {
-    int width = 0, height = 0;  /* Use the full display */
+    unsigned int width = 0, height = 0;
 
     if (!mir_eglapp_init(&width, &height))
     {

=== modified file 'examples/eglplasma.c'
--- examples/eglplasma.c	2013-04-24 05:22:20 +0000
+++ examples/eglplasma.c	2013-06-06 16:46:32 +0000
@@ -107,7 +107,7 @@
     };
     GLuint vshader, fshader, prog;
     GLint linked, low_color, high_color, vpos, theta;
-    int width = 0, height = 0;
+    unsigned int width = 0, height = 0;
     GLfloat angle = 0.0f;
 
     if (!mir_eglapp_init(&width, &height))

=== modified file 'examples/egltriangle.c'
--- examples/egltriangle.c	2013-03-08 09:13:54 +0000
+++ examples/egltriangle.c	2013-06-06 16:46:32 +0000
@@ -79,7 +79,7 @@
     };
     GLuint vshader, fshader, prog;
     GLint linked, col, vpos, theta;
-    int width = 512, height = 512;
+    unsigned int width = 512, height = 512;
     GLfloat angle = 0.0f;
 
     if (!mir_eglapp_init(&width, &height))

=== modified file 'include/shared/mir_toolkit/client_types.h'
--- include/shared/mir_toolkit/client_types.h	2013-06-06 08:36:17 +0000
+++ include/shared/mir_toolkit/client_types.h	2013-06-06 16:46:32 +0000
@@ -23,6 +23,8 @@
 
 #include <mir_toolkit/event.h>
 
+#include <stddef.h>
+
 #ifdef __cplusplus
 /**
  * \defgroup mir_toolkit MIR graphics tools API
@@ -158,8 +160,9 @@
  */
 typedef struct MirDisplayInfo
 {
-    int width;
-    int height;
+    uint32_t width;
+    uint32_t height;
+    
     int supported_pixel_format_items;
     MirPixelFormat supported_pixel_format[mir_supported_pixel_format_max];
 } MirDisplayInfo;

=== modified file 'src/shared/protobuf/mir_protobuf.proto'
--- src/shared/protobuf/mir_protobuf.proto	2013-05-30 03:50:54 +0000
+++ src/shared/protobuf/mir_protobuf.proto	2013-06-06 16:46:32 +0000
@@ -49,8 +49,8 @@
 // attributes or, in the case of an error, the error attribute. So the
 // attributes are all "optional" (or "repeated").
 message DisplayInfo {
-  required int32 width = 1;
-  required int32 height = 2;
+  required uint32 width = 1;
+  required uint32 height = 2;
   repeated uint32 supported_pixel_format = 3;
 }
 

=== modified file 'tests/acceptance-tests/test_client_library.cpp'
--- tests/acceptance-tests/test_client_library.cpp	2013-06-06 08:36:17 +0000
+++ tests/acceptance-tests/test_client_library.cpp	2013-06-06 16:46:32 +0000
@@ -627,7 +627,7 @@
 
 TEST_F(DefaultDisplayServerTestFixture, client_library_accesses_display_info)
 {
-    static const int default_display_width = 1600, default_display_height = 1600;
+    static const unsigned int default_display_width = 1600, default_display_height = 1600;
 
     struct ClientConfig : ClientConfigCommon
     {