minor bugfix patch for stability
authorMichael Schuldt <michael.schuldt@bmw-carit.de>
Wed, 15 Jun 2011 07:16:31 +0000 (09:16 +0200)
committermichael.schuldt <genivi@genivi.(none)>
Thu, 16 Jun 2011 07:29:10 +0000 (09:29 +0200)
CMakeLists.txt
LayerManagerClient/ilmClient/src/ilm_client.c
LayerManagerExamples/LayerManagerClientExample/src/LayermanagerClientTest.c
LayerManagerPlugins/Communicators/DBUSCommunicator/src/DBUSCommunicator.cpp
LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/renderer_frag.glslf
LayerManagerPlugins/Renderers/Platform/X11GLESRenderer/renderer_layer.glslf

index 163aaa9..36bd12a 100644 (file)
@@ -23,8 +23,8 @@ project (LayerManager)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
 
 SET( ${PROJECT_NAME}_MAJOR_VERSION 0 )
-SET( ${PROJECT_NAME}_MINOR_VERSION 3 )
-SET( ${PROJECT_NAME}_PATCH_LEVEL 0 )
+SET( ${PROJECT_NAME}_MINOR_VERSION 8 )
+SET( ${PROJECT_NAME}_PATCH_LEVEL 1 )
 set(VERSION ${${PROJECT_NAME}_MAJOR_VERSION}.${${PROJECT_NAME}_MINOR_VERSION}.${${PROJECT_NAME}_PATCH_LEVEL})
 
 set(LICENSE "APACHE 2.0")
index 51339db..c35dea2 100644 (file)
@@ -92,7 +92,7 @@ ilmErrorTypes ilm_getPropertiesOfSurface(t_ilm_uint surfaceID, struct ilmSurface
 
        /* Setup message to send */
        DBusMessage *message;
-       message = _ilm_dbus_method_call(g_ilm_client->dbus_connection,"GetPropertiesOfSurface",param,12);
+       message = _ilm_dbus_method_call(g_ilm_client->dbus_connection,"GetPropertiesOfSurface",param,1);
        if (!message)
        {
                  ILM_ERROR("ilm_getPropertiesOfSurface","IPC Method call not possible can't setup remote message\n");
@@ -132,7 +132,7 @@ ilmErrorTypes ilm_getPropertiesOfLayer(t_ilm_uint layerID, struct ilmLayerProper
 
        /* Setup message to send */
        DBusMessage *message;
-       message = _ilm_dbus_method_call(g_ilm_client->dbus_connection,"GetPropertiesOfLayer", param, 12);
+       message = _ilm_dbus_method_call(g_ilm_client->dbus_connection,"GetPropertiesOfLayer", param, 1);
        if (!message)
        {
                  ILM_ERROR("ilm_getPropertiesOfLayer","IPC Method call not possible can't setup remote message\n");
index 8601fbd..f71da4d 100644 (file)
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
 
           printf("Calling ilm_destroy ... \n");
           error = ilm_destroy();
-          if (error = ILM_SUCCESS)
+          if (error == ILM_SUCCESS)
           {
                   printf("Calling ilm_destroy successful, close\n");
           }
index f849148..5782582 100644 (file)
@@ -184,11 +184,20 @@ double getDoubleFromMessage(){
 }
 
 
-void appendBool(dbus_bool_t toAppend){
-  if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &toAppend)) {
-    LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
-    exit(1);
-  }
+void appendBool(bool toAppend)
+{
+    dbus_bool_t dbusBool = TRUE;
+    if (true == toAppend)  
+    {
+        dbusBool = TRUE;
+    } else {
+        dbusBool = FALSE;
+    }
+    if (!dbus_message_iter_append_basic(&iter, DBUS_TYPE_BOOLEAN, &dbusBool)) 
+    {
+        LOG_ERROR("DBUSCommunicator", "Out Of Memory!");
+        exit(1);
+    }
 }
 
 void appendUint(dbus_uint32_t toAppend){
index 57f2eff..d1368b1 100644 (file)
@@ -17,7 +17,7 @@
 *
 ****************************************************************************/
 // alpha value of the surfaces 
-uniform float uAlphaVal;
+uniform mediump float uAlphaVal;
 // textureunit which is accessed
 uniform mediump sampler2D uTexUnit;
 
index d958392..fd9a6a3 100644 (file)
@@ -17,7 +17,7 @@
 *
 ****************************************************************************/
 // alpha value of the surfaces 
-uniform float uAlphaVal;
+uniform mediump float uAlphaVal;
 
 void main()
 {