Fix build error when defining TEST_NEWBACKEND

Change-Id: I799fa341866e3a0f3012468a57a431c30d788216
Signed-off-by: Jihoon Kim <jihoon48.kim@samsung.com>

diff --git a/scl/gwes/efl/sclgraphics-efl.cpp b/scl/gwes/efl/sclgraphics-efl.cpp
index e661f92..ef43971 100644 (file)
--- a/scl/gwes/efl/sclgraphics-efl.cpp
+++ b/scl/gwes/efl/sclgraphics-efl.cpp
@@ -235,7 +235,7 @@ CSCLGraphicsImplEfl::draw_image(sclwindow window, const scldrawctx draw_ctx, scl
             sclint hashval = hash_string(image_path);
             /*for(std::list<ImageCache>::iterator iter = g_ImageCache.begin();
                 bFound && iter != g_ImageCache.end();std::advance(iter, 1)) {*/
-            for (sclint loop = 0;loop < g_ImageCache.size() && !bFound;loop++) {
+            for (sclint loop = 0;loop < (sclint)g_ImageCache.size() && !bFound;loop++) {
                 if (
                     /*  (*iter).used &&
                         window == (*iter).window &&
@@ -474,7 +474,7 @@ CSCLGraphicsImplEfl::draw_image(sclwindow window, const scldrawctx draw_ctx, scl
 
                 //g_ImageCache.insert(g_ImageCache.end(), cache);
                 sclboolean bInserted = FALSE;
-                for (sclint loop = 0;loop < g_ImageCache.size() && !bInserted;loop++) {
+                for (sclint loop = 0;loop < (sclint)g_ImageCache.size() && !bInserted;loop++) {
                     if (!g_ImageCache[loop].used) {
                         g_ImageCache[loop] = cache;
                     }
@@ -574,7 +574,7 @@ CSCLGraphicsImplEfl::draw_text(sclwindow window, const scldrawctx draw_ctx, cons
             sclint org_posy = pos_y;
             /*for(std::list<TextCache>::iterator iter = g_TextCache.begin();
                 bFound && iter != g_TextCache.end();std::advance(iter, 1)) {*/
-            for (sclint loop = 0;loop < g_TextCache.size() && !bFound;loop++) {
+            for (sclint loop = 0;loop < (sclint)g_TextCache.size() && !bFound;loop++) {
                     if (
                         /*
                         (*iter).used &&
@@ -830,7 +830,7 @@ CSCLGraphicsImplEfl::draw_text(sclwindow window, const scldrawctx draw_ctx, cons
 
                 //g_TextCache.insert(g_TextCache.end(), cache);
                 sclboolean bInserted = FALSE;
-                for (sclint loop = 0;loop < g_TextCache.size() && !bInserted;loop++) {
+                for (sclint loop = 0;loop < (sclint)g_TextCache.size() && !bInserted;loop++) {
                     if (!g_TextCache[loop].used) {
                         g_TextCache[loop] = cache;
                     }

diff --git a/scl/gwes/efl/sclgraphics-efl.h b/scl/gwes/efl/sclgraphics-efl.h
index 469273b..264f4a4 100644 (file)
--- a/scl/gwes/efl/sclgraphics-efl.h
+++ b/scl/gwes/efl/sclgraphics-efl.h
@@ -28,8 +28,11 @@
 /* Still an experimental feature.. Will be refined after being stabilized */
 //#define TEST_NEWBACKEND
 #ifdef TEST_NEWBACKEND
+using namespace scl;
+
 #include <Ecore_Evas.h>
 #include <Ecore.h>
+
 typedef struct {
     sclboolean used;
 

diff --git a/scl/gwes/efl/sclwindows-efl.cpp b/scl/gwes/efl/sclwindows-efl.cpp
index 66ea89e..41c5bf4 100644 (file)
--- a/scl/gwes/efl/sclwindows-efl.cpp
+++ b/scl/gwes/efl/sclwindows-efl.cpp
@@ -445,7 +445,7 @@ CSCLWindowsImplEfl::destroy_window(sclwindow window)
                                     evas_textblock_style_free(st);
                                 }
 #ifdef TEST_NEWBACKEND
-                                for (sclint loop = 0;loop < g_TextCache.size();loop++) {
+                                for (sclint loop = 0;loop < (sclint)g_TextCache.size();loop++) {
                                     if (g_TextCache[loop].text == object->object) {
                                         g_TextCache[loop].used = FALSE;
                                     }
@@ -453,7 +453,7 @@ CSCLWindowsImplEfl::destroy_window(sclwindow window)
 #endif
                             } else if (object->type == EFLOBJECT_IMAGE) {
 #ifdef TEST_NEWBACKEND
-                                for (sclint loop = 0;loop < g_ImageCache.size();loop++) {
+                                for (sclint loop = 0;loop < (sclint)g_ImageCache.size();loop++) {
                                     if (g_ImageCache[loop].image == object->object) {
                                         g_ImageCache[loop].used = FALSE;
                                     }
@@ -611,13 +611,13 @@ CSCLWindowsImplEfl::hide_window(const sclwindow window,  sclboolean fForce)
         if (window == windows->get_magnifier_window() || window == windows->get_dim_window()) {
             if (window_context) {
                 if (window_context->etc_info) {
+#ifdef TEST_NEWBACKEND
+#else
                     Eina_List *list = (Eina_List*)(window_context->etc_info);
                     Eina_List *iter = NULL;
                     Eina_List *iter_next = NULL;
                     void *data = NULL;
                     int iIndex = 0;
-#ifdef TEST_NEWBACKEND
-#else
                     EINA_LIST_FOREACH_SAFE(list, iter, iter_next, data) {
                         if (data) {
                             EFLObject *object = (EFLObject*)(data);
@@ -940,7 +940,7 @@ CSCLWindowsImplEfl::update_window(const sclwindow window, scl16 x, scl16 y, scl1
                                     evas_textblock_style_free(st);
                                 }
 #ifdef TEST_NEWBACKEND
-                                for sclint loop = 0;loop < g_TextCache.size();loop++) {
+                                for (sclint loop = 0;loop < g_TextCache.size();loop++) {
                                     if (g_TextCache[loop].text == object->object) {
                                         g_TextCache[loop].used = FALSE;
                                     }
@@ -1138,13 +1138,13 @@ void release_all(Evas_Object *win)
     SclWindowContext *window_context = windows->get_window_context(win);
         if (window_context && win) {
             if (window_context->etc_info) {
+#ifdef TEST_NEWBACKEND
+#else
                 Eina_List *list = (Eina_List*)(window_context->etc_info);
                 Eina_List *iter = NULL;
                 Eina_List *iter_next = NULL;
                 void *data = NULL;
                 int iIndex = 0;
-#ifdef TEST_NEWBACKEND
-#else
                 EINA_LIST_FOREACH_SAFE(list, iter, iter_next, data) {
                     if (data) {
                         EFLObject *object = (EFLObject*)(data);

diff --git a/scl/sclcontroller.cpp b/scl/sclcontroller.cpp
index 9d36e59..5c49bb3 100644 (file)
--- a/scl/sclcontroller.cpp
+++ b/scl/sclcontroller.cpp
@@ -247,12 +247,12 @@ CSCLController::process_input_mode_change(const sclbyte mode)
                             }
 
                             sclint loop;
-                            for (loop = 0;loop < g_ImageCache.size();loop++) {
+                            for (loop = 0;loop < (sclint)g_ImageCache.size();loop++) {
                                 if (g_ImageCache[loop].image == object->object) {
                                     g_ImageCache[loop].used = FALSE;
                                 }
                             }
-                            for (loop = 0;loop < g_TextCache.size();loop++) {
+                            for (loop = 0;loop < (sclint)g_TextCache.size();loop++) {
                                 if (g_TextCache[loop].text == object->object) {
                                     g_TextCache[loop].used = FALSE;
                                 }