changed the name of the GOTO label
authorDae Young Ryu <karzia@samsung.com>
Thu, 27 Feb 2014 10:31:32 +0000 (19:31 +0900)
committerDae Young Ryu <karzia@samsung.com>
Thu, 27 Feb 2014 10:31:32 +0000 (19:31 +0900)
Change-Id: I4397e4fc4fdafed32a0583c6d974c76d67c7efad
Signed-off-by: Dae Young Ryu <karzia@samsung.com>
src/ui/animations/FUiAnim_GlVisualElementSurfaceImpl.cpp
src/ui/animations/FUiAnim_VisualElementSurfaceManager.cpp

index 7c6c0e9..8756656 100644 (file)
 #include "FUiAnim_GlVisualElementSurfaceImpl.h"
 #include "FUiAnim_VisualElementSurfaceManager.h"
 
+
+#ifdef _OSP_ARMEL_
+#define USE_EGL_IMAGE
+#endif
+
 //#define PRINT(...) fprintf(stderr, __VA_ARGS__)
 #define PRINT(...)
 
@@ -90,7 +95,7 @@ _GlVisualElementSurfaceImpl::_GlVisualElementSurfaceImpl(const FloatDimension& s
        }
        else
        {
-#ifdef _OSP_ARMEL_
+#ifdef USE_EGL_IMAGE
                __textureInfo.type = TEXTURE_EGL_IMAGE;
 #else
                __textureInfo.type = TEXTURE_NORMAL;
@@ -140,7 +145,7 @@ _GlVisualElementSurfaceImpl::_GlVisualElementSurfaceImpl(const Handle layer, con
        __textureInfo.pGlContext = (_GlContext*)__pLayer->GetContext();
 #endif
 
-#ifdef _OSP_ARMEL_
+#ifdef USE_EGL_IMAGE
        __textureInfo.type = TEXTURE_EGL_IMAGE;
 #else
        __textureInfo.type = TEXTURE_NORMAL;
@@ -174,7 +179,7 @@ _GlVisualElementSurfaceImpl::_GlVisualElementSurfaceImpl(const Bitmap& bitmap, c
        __textureInfo.pGlContext = (_GlContext*)__pLayer->GetContext();
 #endif
 
-#ifdef _OSP_ARMEL_
+#ifdef USE_EGL_IMAGE
        __textureInfo.type = TEXTURE_EGL_IMAGE;
 #else
        __textureInfo.type = TEXTURE_NORMAL;
@@ -260,6 +265,7 @@ result
 _GlVisualElementSurfaceImpl::SetImage(const String& fileName)
 {
 #ifndef BUILD_UI_CORE
+
        Tizen::Media::Image image;
        image.Construct();
 
index 1437220..6186ca3 100644 (file)
@@ -255,7 +255,8 @@ _VisualElementSurfaceManager::ThreadProc(void* pData)
                case COMMAND_EXIT:
                        PRINT("COMMAND_EXIT\n");
                        pThis->CommandHandlerFinalizeManager();
-                       goto exit_renderer;
+
+                       goto exit_thread;
                }
 
                if (needReply)
@@ -267,8 +268,7 @@ _VisualElementSurfaceManager::ThreadProc(void* pData)
                }
        }
 
-exit_renderer:
-
+exit_thread:
        delete pThis->__pGlContext;
 
        {