From a9145b99c8459dab1d9df439c36d3eace2177166 Mon Sep 17 00:00:00 2001
From: Savio Sena <savio.sena@acm.org>
Date: Sun, 24 Aug 2014 23:09:00 -0300
Subject: [PATCH] Fixed global variables.

---
 src/bin/cxx/image_blend_border.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index 86e7490..fe11d8c 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -13,9 +13,10 @@
 #include "main.h"
 
 #define EXPEDITE_CXX_TEST_IMPL
-#include "image_blend_border_cxx.h"
+#include "image_blend_border_cxx.c"
 
 efl::eina::list<evas::image> images;
+evas::canvas *canvas;
 
 /* standard var */
 static int done = 0;
@@ -25,15 +26,16 @@ static void _setup()
 {
    int i;
    Evas_Object *o;
-   evas::canvas canvas(G_evas);
+   canvas = new evas::canvas(::eo_ref(G_evas));
 
    for (i = 0; i < OBNUM; i++)
      {
-        evas::image o(efl::eo::parent = canvas);
+        evas::image o(efl::eo::parent = *canvas);
         images.push_back(o);
         o.file_set(::build_path("bar.png"), ""); // XXX
         o.border_set(6, 6, 6, 6);
         o.visibility_set(true);
+        canvas->render();
      }
    done = 0;
 }
@@ -42,6 +44,7 @@ static void _setup()
 static void _cleanup()
 {
    images.clear();
+   delete canvas;
 }
 
 /* loop - do things */
@@ -80,6 +83,3 @@ extern "C" void FNAME(void)
    _setup();
 }
 
-#undef FNAME
-#undef NAME
-#undef ICON