Removed several warnings

diff --git a/LayerManagerExamples/GLXApplicationExample/include/glx_helper.h b/LayerManagerExamples/GLXApplicationExample/include/glx_helper.h
index f92d844..01c029a 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/include/glx_helper.h
+++ b/LayerManagerExamples/GLXApplicationExample/include/glx_helper.h
@@ -27,7 +27,7 @@
 
 t_ilm_uint GetTickCount();
 t_ilm_bool createX11Context(t_ilm_int width, t_ilm_int height);
-t_ilm_bool createGLXContext(t_ilm_int width, t_ilm_int height, t_ilm_int layerwidth,t_ilm_int layerheight );
+t_ilm_bool createGLXContext(t_ilm_int width, t_ilm_int height);
 void destroyGLXContext();
 void destroyX11Context();
 void swapBuffers();

diff --git a/LayerManagerExamples/GLXApplicationExample/src/gl2application.cpp b/LayerManagerExamples/GLXApplicationExample/src/gl2application.cpp
index 7f338af..9382246 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/src/gl2application.cpp
+++ b/LayerManagerExamples/GLXApplicationExample/src/gl2application.cpp
@@ -65,8 +65,6 @@ t_ilm_bool initGlApplication(GLuint width, GLuint height)
 {
     t_ilm_bool result = ILM_TRUE;
     GLfloat aspectratio = (GLfloat) width / GLfloat(height);
-    GLfloat fWidth = (GLfloat) width;
-    GLfloat fHeight = (GLfloat) height;
 
     glViewport(0, 0, width, height);
     glMatrixMode(GL_PROJECTION);
@@ -96,7 +94,6 @@ void draw(t_ilm_uint animTime)
     static t_ilm_uint startTime = 0;
     static t_ilm_uint currentTime = 0;
     static float angle = 0;
-    t_ilm_bool result = ILM_TRUE;
     IlmMatrix matrix;
 
     currentTime = GetTickCount();

diff --git a/LayerManagerExamples/GLXApplicationExample/src/glxX11_application.cpp b/LayerManagerExamples/GLXApplicationExample/src/glxX11_application.cpp
index 9aa8e93..25698ba 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/src/glxX11_application.cpp
+++ b/LayerManagerExamples/GLXApplicationExample/src/glxX11_application.cpp
@@ -38,7 +38,7 @@
 /****************************************************************************/
 
 
-int main(int argc, char **argv)
+int main()
 {
     printf("Starting demo GLX X11 Application Example\n");
 
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
         return -1;
     }
 
-    if (!createGLXContext(SURFACE_WIDTH, SURFACE_HEIGHT, LAYER_WIDTH, LAYER_HEIGHT))
+    if (!createGLXContext(SURFACE_WIDTH, SURFACE_HEIGHT))
     {
         printf("Can't Create EGL Context\n");
         return -1;

diff --git a/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp b/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
index 4426fc9..3544432 100644 (file)
--- a/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
+++ b/LayerManagerExamples/GLXApplicationExample/src/glx_helper.cpp
@@ -118,7 +118,7 @@ t_ilm_bool createX11Context(t_ilm_int width, t_ilm_int height)
     return result;
 }
 
-t_ilm_bool createGLXContext(t_ilm_int width, t_ilm_int height, t_ilm_int layerwidth, t_ilm_int layerheight)
+t_ilm_bool createGLXContext(t_ilm_int width, t_ilm_int height)
 {
     t_ilm_bool result = ILM_TRUE;
     int glxMajor;

diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
index 7e241a8..9c9c1d1 100644 (file)
--- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
+++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/X11WindowSystem.cpp
@@ -443,7 +443,7 @@ bool X11WindowSystem::CreateCompositorWindow()
 {
     LOG_DEBUG("X11WindowSystem", "Get root window");
     bool result = true;
-    CompositorWindow = NULL;
+    CompositorWindow = None;
     Window root = RootWindow(x11Display,0);
 
     LOG_DEBUG("X11WindowSystem", "Get default screen");
@@ -473,7 +473,7 @@ bool X11WindowSystem::CreateCompositorWindow()
     attr.override_redirect = True;
 
     Window compManager = XGetSelectionOwner(x11Display,XInternAtom(x11Display,"_NET_WM_CM_S0",0));
-    if ( 0 != compManager )
+    if ( None != compManager )
     {
         LOG_ERROR("X11WindowSystem", "Could not create compositor window, annother compisite manager is already running");
         return false;
@@ -492,7 +492,7 @@ bool X11WindowSystem::CreateCompositorWindow()
     //                                                             BlackPixelOfScreen(s),
     //                                                             WhitePixelOfScreen(s) );
     //
-    if (!CompositorWindow)
+    if (None == CompositorWindow)
     {
         LOG_ERROR("X11WindowSystem", "Could not create window");
         return false;

diff --git a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
index 9bede7d..7aeccc3 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/GLXRenderer/src/X11GLXRenderer.cpp
@@ -99,11 +99,16 @@ void X11GLXRenderer::doScreenShotOfSurface(std::string fileToSave, uint id, uint
 
 uint X11GLXRenderer::getNumberOfHardwareLayers(uint screenID)
 {
+    uint screen_id;
+    screen_id = screenID;
     return 0; // TODO
 }
 
 uint* X11GLXRenderer::getScreenResolution(uint screenID)
 {
+    uint screen_id;
+    screen_id = screenID;
+    
     uint * resolution = new uint[2];
     resolution[0] = m_width;
     resolution[1] = m_height;

diff --git a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
index a24444e..61627fc 100644 (file)
--- a/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
+++ b/LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/src/X11GLESRenderer.cpp
@@ -110,15 +110,16 @@ void X11GLESRenderer::doScreenShotOfSurface(std::string fileToSave, uint id, uin
 
 uint X11GLESRenderer::getNumberOfHardwareLayers(uint screenID)
 {
-    (void)screenID; // TODO: remove, only prevents warning
+    uint screen_id;
+    screen_id = screenID;
 
     return 0; // TODO provide real value here
 }
 
 uint* X11GLESRenderer::getScreenResolution(uint screenID)
 {
-    (void)screenID; // TODO: remove, only prevents warning
-
+    uint screen_id;
+    screen_id = screenID;   
     // TODO provide value of real screen here
     uint * resolution = new uint[2];
     resolution[0] = m_width;