[vlc-commits] Skins2: compability with C++11

Jean-Baptiste Kempf git at videolan.org
Sun Jul 29 20:37:47 CEST 2012


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jul 29 13:09:51 2012 +0200| [7ad93c294a6307c396648043cb08dc3a49ad0bc3] | committer: Jean-Baptiste Kempf

Skins2: compability with C++11

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7ad93c294a6307c396648043cb08dc3a49ad0bc3
---

 modules/gui/skins2/x11/x11_factory.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/skins2/x11/x11_factory.cpp b/modules/gui/skins2/x11/x11_factory.cpp
index 4e3e966..bfd5033 100644
--- a/modules/gui/skins2/x11/x11_factory.cpp
+++ b/modules/gui/skins2/x11/x11_factory.cpp
@@ -225,7 +225,7 @@ void X11Factory::getMonitorInfo( const GenericWindow &rWindow,
     if( info )
     {
         Region reg1 = XCreateRegion();
-        XRectangle rect1 = { x, y, w, h };
+        XRectangle rect1 = { (short)x, (short)y, (unsigned short)w, (unsigned short)h };
         XUnionRectWithRegion( &rect1, reg1, reg1 );
 
         unsigned int surface = 0;
@@ -233,7 +233,7 @@ void X11Factory::getMonitorInfo( const GenericWindow &rWindow,
         {
             Region reg2 = XCreateRegion();
             XRectangle rect2 = { info[i].x_org, info[i].y_org,
-                                 info[i].width, info[i].height };
+                                 (unsigned short)info[i].width, (unsigned short)info[i].height };
             XUnionRectWithRegion( &rect2, reg2, reg2 );
 
             Region reg = XCreateRegion();



More information about the vlc-commits mailing list