summaryrefslogtreecommitdiff
path: root/LayerManagerPlugins/Renderers/Graphic/src
diff options
context:
space:
mode:
Diffstat (limited to 'LayerManagerPlugins/Renderers/Graphic/src')
-rw-r--r--LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11CopyGLES.cpp4
-rw-r--r--LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp4
2 files changed, 4 insertions, 4 deletions
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)