From: Timo Lotterbach Date: Wed, 27 Mar 2013 11:56:39 +0000 (+0100) Subject: LayerManagement: fixed style warnings triggered by style script update X-Git-Tag: 1_0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Ftags%2Ffoton_release;p=profile%2Fivi%2Flayer-management.git LayerManagement: fixed style warnings triggered by style script update Signed-off-by: Timo Lotterbach --- diff --git a/LayerManagerControl/src/common.cpp b/LayerManagerControl/src/common.cpp index 02d39da..8bfe376 100644 --- a/LayerManagerControl/src/common.cpp +++ b/LayerManagerControl/src/common.cpp @@ -55,7 +55,7 @@ tuple4 getSurfaceScreenCoordinates(ilmSurfaceProperties targetSurfaceProperties, t_ilm_float targetX2 = targetX1 + horizontalScale * targetSurfaceProperties.destWidth; t_ilm_float verticalScale = targetLayerProperties.sourceHeight ? - 1.0 * targetLayerProperties.destHeight/ targetLayerProperties.sourceHeight : 0; + 1.0 * targetLayerProperties.destHeight / targetLayerProperties.sourceHeight : 0; t_ilm_float targetY1 = targetLayerProperties.destY + verticalScale * (targetSurfaceProperties.destY - targetLayerProperties.sourceY); @@ -148,7 +148,8 @@ void captureSceneData(t_scene_data* pScene) t_scene_data& scene = *pScene; //get screen information - t_ilm_uint screenWidth = 0, screenHeight = 0; + t_ilm_uint screenWidth = 0; + t_ilm_uint screenHeight = 0; ilmErrorTypes callResult = ilm_getScreenResolution(0, &screenWidth, &screenHeight); if (ILM_SUCCESS != callResult) diff --git a/LayerManagerControl/src/control.cpp b/LayerManagerControl/src/control.cpp index 68c4a2f..7404b2a 100644 --- a/LayerManagerControl/src/control.cpp +++ b/LayerManagerControl/src/control.cpp @@ -80,7 +80,7 @@ void getCommunicatorPerformance() signal(SIGALRM, SIG_DFL); - cout << (runs/runtimeInSec) << " transactions/second\n"; + cout << (runs / runtimeInSec) << " transactions/second\n"; } void setSurfaceKeyboardFocus(t_ilm_surface surface) diff --git a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/DrmGLESGraphicSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/DrmGLESGraphicSystem.cpp index 4a54fa9..3b84406 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/DrmGLESGraphicSystem.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/DrmGLESGraphicSystem.cpp @@ -348,7 +348,8 @@ bool DrmGLESGraphicSystem::createOutputs() drmModeConnector* connector; drmModeRes* resources; - int x = 0, y = 0; + int x = 0; + int y = 0; resources = drmModeGetResources(m_fdDev); if (!resources) diff --git a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLESGraphicSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLESGraphicSystem.cpp index 6b0dcfd..83fc460 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLESGraphicSystem.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLESGraphicSystem.cpp @@ -1554,7 +1554,7 @@ void GLESGraphicsystem::renderTempTexture() uniforms.x = layerDestinationRegion.x / m_displayWidth; uniforms.y = 1.0f - (layerDestinationRegion.y + layerDestinationRegion.height) / m_displayHeight; - uniforms.width = layerDestinationRegion.width / m_displayWidth; + uniforms.width = layerDestinationRegion.width / m_displayWidth; uniforms.height = layerDestinationRegion.height / m_displayHeight; uniforms.opacity[0] = m_currentLayer->getOpacity(); uniforms.texRange[0][0] = textureCoordinates[2] - textureCoordinates[0]; @@ -1570,9 +1570,9 @@ void GLESGraphicsystem::renderTempTexture() unsigned char green = 0; unsigned char blue = 0; m_currentLayer->getChromaKey(red, green, blue); - uniforms.chromaKey[0] = (float)red / 255.0f; + uniforms.chromaKey[0] = (float)red / 255.0f; uniforms.chromaKey[1] = (float)green / 255.0f; - uniforms.chromaKey[2] = (float)blue / 255.0f; + uniforms.chromaKey[2] = (float)blue / 255.0f; } glEnable(GL_BLEND); diff --git a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLXGraphicSystem.cpp b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLXGraphicSystem.cpp index c19c37d..de3e7d7 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLXGraphicSystem.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/GraphicSystems/GLXGraphicSystem.cpp @@ -399,7 +399,7 @@ void GLXGraphicsystem::renderSurface(Surface* currentSurface) // top left glTexCoord2f(textureCoordinates[0], textureCoordinates[1]); - glVertex2d((float)targetSurfaceDestination.x/m_windowWidth * 2 - 1, 1 - (float)targetSurfaceDestination.y / m_windowHeight * 2); + glVertex2d((float)targetSurfaceDestination.x / m_windowWidth * 2 - 1, 1 - (float)targetSurfaceDestination.y / m_windowHeight * 2); glEnd(); m_binder->unbindSurfaceTexture(currentSurface); diff --git a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp index ff15396..7cd6452 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/TextureBinders/X11EglImage.cpp @@ -72,7 +72,9 @@ void X11EglImage::createClientBuffer(Surface* surface) if (windowPixmap == 0) { LOG_ERROR("X11EglImage", "didnt create pixmap!"); - } else { + } + else + { nativeSurface->pixmap = windowPixmap; } @@ -125,7 +127,7 @@ void X11EglImage::destroyClientBuffer(Surface* surface) nativeSurface->texture = 0; } // We have to clean up the XServer side pixmap too - if (nativeSurface && nativeSurface->pixmap ) + if (nativeSurface && nativeSurface->pixmap) { XFreePixmap(m_x11display, nativeSurface->pixmap); nativeSurface->pixmap = None; diff --git a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandEvdevInputEvent.cpp b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandEvdevInputEvent.cpp index 92fcecc..33f1547 100644 --- a/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandEvdevInputEvent.cpp +++ b/LayerManagerPlugins/Renderers/Graphic/src/WindowSystems/WaylandEvdevInputEvent.cpp @@ -153,8 +153,8 @@ configureTouchpadPressure(struct touchpad_dispatch *touchpad, touchpad->pressure.touch_high = pressure_min + 1; break; default: - touchpad->pressure.touch_low = pressure_min + range * (25.0/256.0); - touchpad->pressure.touch_high = pressure_min + range * (30.0/256.0); + touchpad->pressure.touch_low = pressure_min + range * (25.0 / 256.0); + touchpad->pressure.touch_high = pressure_min + range * (30.0 / 256.0); break; } @@ -909,7 +909,8 @@ WaylandEvdevInputEvent::notifyKeyboardFocus() { struct evdev_input_device *device; struct wl_array keys; - char evdev_keys[(KEY_CNT + 7) / 8], all_keys[(KEY_CNT + 7) / 8]; + char evdev_keys[(KEY_CNT + 7) / 8]; + char all_keys[(KEY_CNT + 7) / 8]; uint32_t *k; unsigned int i, set; int ret;