diff options
Diffstat (limited to 'LayerManagerPlugins/Renderers')
4 files changed, 8 insertions, 6 deletions
diff --git a/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11CopyGLES.h b/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11CopyGLES.h index 816a015..a923461 100644 --- a/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11CopyGLES.h +++ b/LayerManagerPlugins/Renderers/Graphic/include/TextureBinders/X11CopyGLES.h @@ -34,6 +34,8 @@ public: // TODO // pseudo require EGL to have been initialised // we dont really need the handle + // remove compiler Warning + eglDisplay = eglDisplay; }; void swapPixmap(unsigned char* src,unsigned char* dest,unsigned int width,unsigned int height,bool swaprgb,bool includeAlpha); bool bindSurfaceTexture(Surface* surface); diff --git a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLES.cpp b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLES.cpp index 90604c5..0a9f53a 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLES.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLES.cpp @@ -91,7 +91,7 @@ void X11CopyGLES::swapPixmap(unsigned char* src,unsigned char* dest, unsigned in if (swaprgb == false) { count = width*height; - for (int j=0;j<count; j++) { + for (uint j=0;j<count; j++) { dest[j*4]=src[j*4+2]; dest[j*4+1]=src[j*4+1]; dest[j*4+2]=src[j*4]; @@ -103,7 +103,7 @@ void X11CopyGLES::swapPixmap(unsigned char* src,unsigned char* dest, unsigned in } } else { count = width*height; - for (int j=0;j<count; j++) + for (uint j=0;j<count; j++) { dest[j*3]=src[j*3+2]; dest[j*3+1]=src[j*3+1]; diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp index 3f20749..33a8b08 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp @@ -80,7 +80,7 @@ XVisualInfo* X11WindowSystem::getDefaultVisual(Display *dpy) bool X11WindowSystem::OpenDisplayConnection() { - char* displayEnvironment = getenv("DISPLAY"); + const char* displayEnvironment = getenv("DISPLAY"); if (displayEnvironment == NULL ) { @@ -172,7 +172,7 @@ Window * getListOfAllTopLevelWindows (Display *disp, unsigned int *len) bool X11WindowSystem::isWindowValid(Window w) { // skip our own two windows - return (w!=NULL && w != CompositorWindow); + return (w!=None && w != CompositorWindow); } Surface* X11WindowSystem::getSurfaceForWindow(Window w) diff --git a/LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp b/LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp index 76aec11..11a0c07 100644 --- a/LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/tests/ViewportTransformTest.cpp @@ -966,8 +966,8 @@ TEST_F(ViewportTransformTest, completeExample7){ ASSERT_EQ(640u,surfacePOS.width); ASSERT_NEAR(0.3125,x1,0.01); ASSERT_NEAR(0.5625,x2,0.01); - ASSERT_EQ(0,surfacePOS.y); - ASSERT_EQ(480,surfacePOS.height); + ASSERT_EQ(0u,surfacePOS.y); + ASSERT_EQ(480u,surfacePOS.height); ASSERT_NEAR(0.0,y1,0.01); ASSERT_NEAR(1.0,y2,0.01); m_scene->removeSurface(surface); |