summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio.sena@acm.org>2014-09-24 04:13:41 -0300
committerSavio Sena <savio.sena@acm.org>2014-09-24 04:29:44 -0300
commitd810de418ec98f7c33c10628b65acc8fb14cbdea (patch)
tree56a72e04ba5cc94c59c60ce97f5c018f548c7611
parenta67e3ea4b999978a0d40ef158dd7887ec2b01263 (diff)
Fixed some casts.
-rw-r--r--src/bin/cxx/image_data_argb.cc2
-rw-r--r--src/bin/cxx/image_data_argb_alpha.cc10
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc8
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc8
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc42
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc13
-rw-r--r--src/bin/cxx/image_map_3d_3.cc2
-rw-r--r--src/bin/cxx/image_map_3d_4.cc2
-rw-r--r--src/bin/cxx/image_map_3d_5.cc2
-rw-r--r--src/bin/cxx/image_map_3d_6.cc4
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc13
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc2
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc31
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc29
-rw-r--r--src/bin/cxx/image_quality_scale.cc32
-rw-r--r--src/bin/cxx/widgets_file_icons_2.cc8
19 files changed, 98 insertions, 116 deletions
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index 3041200..e666c8a 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -61,7 +61,7 @@ static void _loop(double t, int f)
61 (*itr).position_set(x, y); 61 (*itr).position_set(x, y);
62 (*itr).evas::object::size_set(w, h); 62 (*itr).evas::object::size_set(w, h);
63 (*itr).fill_set(0, 0, w, h); 63 (*itr).fill_set(0, 0, w, h);
64 data = (*itr).data_get(1); 64 data = static_cast<unsigned int*>((*itr).data_get(1));
65 st = (*itr).stride_get(); // XXX 65 st = (*itr).stride_get(); // XXX
66 st = st >> 2; 66 st = st >> 2;
67 p = data; 67 p = data;
diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc
index 1f230d5..4db9f6c 100644
--- a/src/bin/cxx/image_data_argb_alpha.cc
+++ b/src/bin/cxx/image_data_argb_alpha.cc
@@ -49,11 +49,9 @@ static void _cleanup(void)
49/* loop - do things */ 49/* loop - do things */
50static void _loop(double t, int f) 50static void _loop(double t, int f)
51{ 51{
52 int st;
53 auto itr = images.begin(); 52 auto itr = images.begin();
54 for (i = 0; i < 1; i++, ++itr) 53 for (int i = 0; i < 1; i++, ++itr)
55 { 54 {
56 unsigned int *data, *p;
57 int a, r, g, b; 55 int a, r, g, b;
58 Evas_Coord w = 640; 56 Evas_Coord w = 640;
59 Evas_Coord h = 480; 57 Evas_Coord h = 480;
@@ -62,10 +60,10 @@ static void _loop(double t, int f)
62 (*itr).evas::object::position_set(x, y); 60 (*itr).evas::object::position_set(x, y);
63 (*itr).evas::object::size_set(w, h); 61 (*itr).evas::object::size_set(w, h);
64 (*itr).fill_set(0, 0, w, h); 62 (*itr).fill_set(0, 0, w, h);
65 data = (*itr).data_get(1); 63 unsigned int *data = static_cast<unsigned int*>((*itr).data_get(1));
66 st = evas_obj_image_stride_get(); 64 int st = evas_obj_image_stride_get();
67 st = st >> 2; 65 st = st >> 2;
68 p = data; 66 unsigned int *p = data;
69 for (y = 0; y < h; y++) 67 for (y = 0; y < h; y++)
70 { 68 {
71 for (x = 0; x < w; x++) 69 for (x = 0; x < w; x++)
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index 1c38578..79353b9 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -37,9 +37,9 @@ static void _setup(void)
37 o.fill_set(0, 0, 640, 480); 37 o.fill_set(0, 0, 640, 480);
38 o.evas::object::size_set(640, 480); 38 o.evas::object::size_set(640, 480);
39 o.visibility_set(true); 39 o.visibility_set(true);
40 yp = malloc(640 * 480); 40 yp = static_cast<unsigned char*>(malloc(640 * 480));
41 up = malloc(320 * 240); 41 up = static_cast<unsigned char*>(malloc(320 * 240));
42 vp = malloc(320 * 240); 42 vp = static_cast<unsigned char*>(malloc(320 * 240));
43 FILE *f = fopen(build_path("tp.yuv"), "rb"); 43 FILE *f = fopen(build_path("tp.yuv"), "rb");
44 if (f) 44 if (f)
45 { 45 {
@@ -48,7 +48,7 @@ static void _setup(void)
48 fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
49 fclose(f); 49 fclose(f);
50 } 50 }
51 unsigned char **data = evas_object_image_data_get(images[i], 1); 51 unsigned char **data = static_cast<unsigned char**>(o.data_get(1));
52 unsigned char **lp = data; 52 unsigned char **lp = data;
53 for (int y = 0; y < 480; y++) 53 for (int y = 0; y < 480; y++)
54 { 54 {
diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
index 1da65f6..ffd96b9 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc
@@ -38,9 +38,9 @@ static void _setup(void)
38 o.evas::object::size_set(640, 480); 38 o.evas::object::size_set(640, 480);
39 o.smooth_scale_set(0); 39 o.smooth_scale_set(0);
40 o.visibility_set(true); 40 o.visibility_set(true);
41 yp = malloc(640 * 480); 41 yp = static_cast<unsigned char*>(malloc(640 * 480));
42 up = malloc(320 * 240); 42 up = static_cast<unsigned char*>(malloc(320 * 240));
43 vp = malloc(320 * 240); 43 vp = static_cast<unsigned char*>(malloc(320 * 240));
44 FILE *f = fopen(build_path("tp.yuv"), "rb"); 44 FILE *f = fopen(build_path("tp.yuv"), "rb");
45 if (f) 45 if (f)
46 { 46 {
@@ -49,7 +49,7 @@ static void _setup(void)
49 fread(vp, 320 * 240, 1, f); 49 fread(vp, 320 * 240, 1, f);
50 fclose(f); 50 fclose(f);
51 } 51 }
52 unsigned char **data = o.data_get(1); // XXX 52 unsigned char **data = static_cast<unsigned char**>(o.data_get(1)); // XXX
53 unsigned char **lp = data; 53 unsigned char **lp = data;
54 for (int y = 0; y < 480; y++) 54 for (int y = 0; y < 480; y++)
55 { 55 {
diff --git a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
index ecc482b..3387844 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -25,26 +25,22 @@ static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
25/* setup */ 25/* setup */
26static void _setup(void) 26static void _setup(void)
27{ 27{
28 int i, y;
29 FILE *f;
30 unsigned char **data, **lp;
31 evas::canvas canvas(::eo_ref(G_evas)); 28 evas::canvas canvas(::eo_ref(G_evas));
32 for (i = 0; i < 1; i++) 29 for (int i = 0; i < 1; i++)
33 { 30 {
34 evas::image o(efl::eo::parent = canvas); 31 evas::image o(efl::eo::parent = canvas);
35 images.push_back(o); 32 images.push_back(o);
36 eo_do(o, 33 o.content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC);
37 evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC), 34 o.colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL);
38 evas_obj_image_colorspace_set(EVAS_COLORSPACE_YCBCR422P601_PL), 35 o.size_set(640, 480);
39 evas_obj_image_size_set(640, 480), 36 o.alpha_set(0);
40 evas_obj_image_alpha_set(0), 37 o.fill_set(0, 0, 640, 480);
41 evas_obj_image_fill_set(0, 0, 640, 480), 38 o.evas::object::size_set(640, 480);
42 evas_obj_size_set(640, 480), 39 o.evas::object::visibility_set(true);
43 evas_obj_visibility_set(EINA_TRUE)); 40 yp = static_cast<unsigned char*>(malloc(640 * 480));
44 yp = malloc(640 * 480); 41 up = static_cast<unsigned char*>(malloc(320 * 240));
45 up = malloc(320 * 240); 42 vp = static_cast<unsigned char*>(malloc(320 * 240));
46 vp = malloc(320 * 240); 43 FILE *f = fopen(build_path("tp.yuv"), "rb");
47 f = fopen(build_path("tp.yuv"), "rb");
48 if (f) 44 if (f)
49 { 45 {
50 fread(yp, 640 * 480, 1, f); 46 fread(yp, 640 * 480, 1, f);
@@ -52,24 +48,24 @@ static void _setup(void)
52 fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
53 fclose(f); 49 fclose(f);
54 } 50 }
55 data = evas_object_image_data_get(images[i], 1); 51 unsigned char **data = static_cast<unsigned char**>(o.data_get(1));
56 lp = data; 52 unsigned char **lp = data;
57 for (y = 0; y < 480; y++) 53 for (int y = 0; y < 480; y++)
58 { 54 {
59 *lp = yp + (y * 640); 55 *lp = yp + (y * 640);
60 lp++; 56 lp++;
61 } 57 }
62 for (y = 0; y < 240; y++) 58 for (int y = 0; y < 240; y++)
63 { 59 {
64 *lp = up + (y * 320); 60 *lp = up + (y * 320);
65 lp++; 61 lp++;
66 } 62 }
67 for (y = 0; y < 240; y++) 63 for (int y = 0; y < 240; y++)
68 { 64 {
69 *lp = vp + (y * 320); 65 *lp = vp + (y * 320);
70 lp++; 66 lp++;
71 } 67 }
72 eo_do(images[i], evas_obj_image_data_set(data)); 68 o.data_set(data);
73 } 69 }
74 done = 0; 70 done = 0;
75} 71}
@@ -77,7 +73,7 @@ static void _setup(void)
77/* cleanup */ 73/* cleanup */
78static void _cleanup(void) 74static void _cleanup(void)
79{ 75{
80 for (int i = 0; i < 1; i++) eo_del(images[i]); 76 images.clear();
81 free(yp); 77 free(yp);
82 free(up); 78 free(up);
83 free(vp); 79 free(vp);
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index 540ee97..e7ffcb5 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -25,7 +25,6 @@ static unsigned char *yp = NULL, *up = NULL, *vp = NULL;
25/* setup */ 25/* setup */
26static void _setup(void) 26static void _setup(void)
27{ 27{
28 unsigned char **data, **lp;
29 evas::canvas canvas(::eo_ref(G_evas)); 28 evas::canvas canvas(::eo_ref(G_evas));
30 for (int i = 0; i < 1; i++) 29 for (int i = 0; i < 1; i++)
31 { 30 {
@@ -38,9 +37,9 @@ static void _setup(void)
38 o.fill_set(0, 0, 640, 480); 37 o.fill_set(0, 0, 640, 480);
39 o.evas::object::size_set(640, 480); 38 o.evas::object::size_set(640, 480);
40 o.evas::object::visibility_set(true); 39 o.evas::object::visibility_set(true);
41 yp = malloc(640 * 480); 40 yp = static_cast<unsigned char*>(malloc(640 * 480));
42 up = malloc(320 * 240); 41 up = static_cast<unsigned char*>(malloc(320 * 240));
43 vp = malloc(320 * 240); 42 vp = static_cast<unsigned char*>(malloc(320 * 240));
44 FILE *f = fopen(build_path("tp.yuv"), "rb"); 43 FILE *f = fopen(build_path("tp.yuv"), "rb");
45 if (f) 44 if (f)
46 { 45 {
@@ -49,10 +48,10 @@ static void _setup(void)
49 fread(vp, 320 * 240, 1, f); 48 fread(vp, 320 * 240, 1, f);
50 fclose(f); 49 fclose(f);
51 } 50 }
52 data = o.data_get(1); 51 unsigned char **data = static_cast<unsigned char**>(o.data_get(1));
53 if (data) 52 if (data)
54 { 53 {
55 lp = data; 54 unsigned char **lp = data;
56 for (int y = 0; y < 480; y++) 55 for (int y = 0; y < 480; y++)
57 { 56 {
58 *lp = yp + (y * 640); 57 *lp = yp + (y * 640);
@@ -105,7 +104,7 @@ static void _loop(double t, int f)
105 w &= ~0x1; 104 w &= ~0x1;
106 105
107 (*itr).size_set(w, 480); 106 (*itr).size_set(w, 480);
108 unsigned char **data = (*itr).data_get(1); 107 unsigned char **data = static_cast<unsigned char*>((*itr).data_get(1));
109 if (data) 108 if (data)
110 { 109 {
111 unsigned char **lp = data; 110 unsigned char **lp = data;
diff --git a/src/bin/cxx/image_map_3d_3.cc b/src/bin/cxx/image_map_3d_3.cc
index 9e1b899..3812c6d 100644
--- a/src/bin/cxx/image_map_3d_3.cc
+++ b/src/bin/cxx/image_map_3d_3.cc
@@ -52,7 +52,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
52 w -= (w / 2); 52 w -= (w / 2);
53 h -= (h / 2); 53 h -= (h / 2);
54 d -= (d / 2); 54 d -= (d / 2);
55 c = calloc(1, sizeof(Cube)); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o; 58 Evas_Object *o;
diff --git a/src/bin/cxx/image_map_3d_4.cc b/src/bin/cxx/image_map_3d_4.cc
index 2786510..5e48a19 100644
--- a/src/bin/cxx/image_map_3d_4.cc
+++ b/src/bin/cxx/image_map_3d_4.cc
@@ -52,7 +52,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
52 w -= (w / 2); 52 w -= (w / 2);
53 h -= (h / 2); 53 h -= (h / 2);
54 d -= (d / 2); 54 d -= (d / 2);
55 c = calloc(1, sizeof(Cube)); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o; 58 Evas_Object *o;
diff --git a/src/bin/cxx/image_map_3d_5.cc b/src/bin/cxx/image_map_3d_5.cc
index bd5752f..fadb253 100644
--- a/src/bin/cxx/image_map_3d_5.cc
+++ b/src/bin/cxx/image_map_3d_5.cc
@@ -52,7 +52,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
52 w -= (w / 2); 52 w -= (w / 2);
53 h -= (h / 2); 53 h -= (h / 2);
54 d -= (d / 2); 54 d -= (d / 2);
55 c = calloc(1, sizeof(Cube)); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o; 58 Evas_Object *o;
diff --git a/src/bin/cxx/image_map_3d_6.cc b/src/bin/cxx/image_map_3d_6.cc
index e399993..fe5f671 100644
--- a/src/bin/cxx/image_map_3d_6.cc
+++ b/src/bin/cxx/image_map_3d_6.cc
@@ -52,10 +52,10 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
52 w -= (w / 2); 52 w -= (w / 2);
53 h -= (h / 2); 53 h -= (h / 2);
54 d -= (d / 2); 54 d -= (d / 2);
55 c = calloc(1, sizeof(Cube)); 55 c = static_cast<Cube*>(calloc(1, sizeof(Cube)));
56 for (int i = 0; i < 6; i++) 56 for (int i = 0; i < 6; i++)
57 { 57 {
58 Evas_Object *o; 58 Evas_Object *o; // XXX
59 char buf[256]; 59 char buf[256];
60 o = eo_add(EVAS_IMAGE_CLASS, G_evas); 60 o = eo_add(EVAS_IMAGE_CLASS, G_evas);
61 c->side[i].o = o; 61 c->side[i].o = o;
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
index 23ab039..1771efb 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -29,12 +29,11 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 eo_do(o, 32 o.file_set(build_path("logo.png"), "");
33 efl_file_set(build_path("logo.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.smooth_scale_set(0);
36 efl_image_smooth_scale_set(0), 36 o.visibility_set(true);
37 evas_obj_visibility_set(EINA_TRUE));
38 } 37 }
39 done = 0; 38 done = 0;
40} 39}
@@ -42,7 +41,7 @@ static void _setup(void)
42/* cleanup */ 41/* cleanup */
43static void _cleanup(void) 42static void _cleanup(void)
44{ 43{
45 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 44 images.clear();
46} 45}
47 46
48/* loop - do things */ 47/* loop - do things */
diff --git a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
index 3e0d93f..edbb713 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc
@@ -42,7 +42,7 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 45 images.clear();
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
index 3fd18d0..57e203f 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -41,7 +41,7 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 44 images.clear();
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
diff --git a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
index eb13110..71f6648 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -42,7 +42,7 @@ static void _setup(void)
42/* cleanup */ 42/* cleanup */
43static void _cleanup(void) 43static void _cleanup(void)
44{ 44{
45 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 45 images.clear();
46} 46}
47 47
48/* loop - do things */ 48/* loop - do things */
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index 04a21f9..3a2ade0 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -41,7 +41,7 @@ static void _setup(void)
41/* cleanup */ 41/* cleanup */
42static void _cleanup(void) 42static void _cleanup(void)
43{ 43{
44 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 44 images.clear();
45} 45}
46 46
47/* loop - do things */ 47/* loop - do things */
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index 0404691..7f38ce9 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -29,12 +29,11 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.smooth_scale_set(0);
36 efl_image_smooth_scale_set(0), 36 o.visibility_set(true);
37 evas_obj_visibility_set(EINA_TRUE));
38 } 37 }
39 done = 0; 38 done = 0;
40} 39}
@@ -42,32 +41,30 @@ static void _setup(void)
42/* cleanup */ 41/* cleanup */
43static void _cleanup(void) 42static void _cleanup(void)
44{ 43{
45 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 44 images.clear();
46} 45}
47 46
48/* loop - do things */ 47/* loop - do things */
49static void _loop(double t, int f) 48static void _loop(double t, int f)
50{ 49{
51 static Evas_Map *m = NULL; 50 static Evas_Map *m = NULL;
52 Evas_Coord x, y, w, h;
53 if (!m) m = evas_map_new(4); 51 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 52 evas_map_smooth_set(m, 0);
55 for (int i = 0; i < (OBNUM / 2); i++) 53 auto itr = images.begin();
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
56 { 55 {
57 w = 120; 56 Evas_Coord w = 120;
58 h = 160; 57 Evas_Coord h = 160;
59 x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 59 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
61 y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
63 62
64 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 63 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
65
66 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
67 65
68 eo_do(images[i], 66 (*itr).map_enable_set(1);
69 evas_obj_map_enable_set(1), 67 (*itr).map_set(m));
70 evas_obj_map_set(m));
71 } 68 }
72 FPS_STD(NAME); 69 FPS_STD(NAME);
73} 70}
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index 3516c71..03761ba 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -29,11 +29,10 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 eo_do(o, 32 o.file_set(build_path("image.png"), "");
33 efl_file_set(build_path("image.png"), NULL), 33 o.fill_set(0, 0, 120, 160);
34 evas_obj_image_fill_set(0, 0, 120, 160), 34 o.evas::object::size_set(120, 160);
35 evas_obj_size_set(120, 160), 35 o.evas::object::visibility_set(EINA_TRUE);
36 evas_obj_visibility_set(EINA_TRUE));
37 } 36 }
38 done = 0; 37 done = 0;
39} 38}
@@ -41,31 +40,29 @@ static void _setup(void)
41/* cleanup */ 40/* cleanup */
42static void _cleanup(void) 41static void _cleanup(void)
43{ 42{
44 for (int i = 0; i < (OBNUM / 2); i++) eo_del(images[i]); 43 images.clear();
45} 44}
46 45
47/* loop - do things */ 46/* loop - do things */
48static void _loop(double t, int f) 47static void _loop(double t, int f)
49{ 48{
50 static Evas_Map *m = NULL; 49 static Evas_Map *m = NULL;
51 Evas_Coord x, y, w, h;
52 if (!m) m = evas_map_new(4); 50 if (!m) m = evas_map_new(4);
53 for (int i = 0; i < (OBNUM / 2); i++) 51 auto itr = images.begin();
52 for (int i = 0; i < (OBNUM / 2); i++, ++itr)
54 { 53 {
55 w = 120; 54 Evas_Coord w = 120;
56 h = 160; 55 Evas_Coord h = 160;
57 x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 60
62 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 61 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
63
64 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 62 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
65 63
66 eo_do(images[i], 64 (*itr).map_enable_set(1);
67 evas_obj_map_enable_set(1), 65 (*itr).map_set(m);
68 evas_obj_map_set(m));
69 } 66 }
70 FPS_STD(NAME); 67 FPS_STD(NAME);
71} 68}
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index 0772ddb..2be2af4 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -29,10 +29,10 @@ static void _setup(void)
29 { 29 {
30 evas::image o(efl::eo::parent = canvas); 30 evas::image o(efl::eo::parent = canvas);
31 images.push_back(o); 31 images.push_back(o);
32 eo_do(o, efl_file_set(build_path("tp.png"), NULL), 32 o.file_set(build_path("tp.png"), "");
33 evas_obj_image_fill_set(0, 0, 640, 480), 33 o.fill_set(0, 0, 640, 480);
34 evas_obj_size_set(640, 480), 34 o.evas::object::size_set(640, 480);
35 evas_obj_visibility_set(EINA_TRUE)); 35 o.visibility_set(true);
36 } 36 }
37 done = 0; 37 done = 0;
38} 38}
@@ -40,24 +40,24 @@ static void _setup(void)
40/* cleanup */ 40/* cleanup */
41static void _cleanup(void) 41static void _cleanup(void)
42{ 42{
43 for (int i = 0; i < 1; i++) eo_del(images[i]); 43 images.clear();
44} 44}
45 45
46/* loop - do things */ 46/* loop - do things */
47static void _loop(double t, int f) 47static void _loop(double t, int f)
48{ 48{
49 Evas_Coord x, y, w, h; 49 auto itr = images.begin();
50 for (int i = 0; i < 1; i++) 50 for (int i = 0; i < 1; i++, ++itr)
51 { 51 {
52 w = 640; 52 Evas_Coord w = 640;
53 h = 480; 53 Evas_Coord h = 480;
54 w *= (f / 100.0) * 4.0; 54 Evas_Coord w *= (f / 100.0) * 4.0;
55 h *= (f / 100.0) * 4.0; 55 Evas_Coord h *= (f / 100.0) * 4.0;
56 x = (win_w / 2) - (w / 2); 56 Evas_Coord x = (win_w / 2) - (w / 2);
57 y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 eo_do(images[i], evas_obj_position_set(x, y), 58 (*itr).position_set(x, y);
59 evas_obj_size_set(w, h), 59 (*itr).msize_set(w, h);
60 evas_obj_image_fill_set(0, 0, w, h)); 60 (*itr).fill_set(0, 0, w, h);
61 } 61 }
62 FPS_STD(NAME); 62 FPS_STD(NAME);
63} 63}
diff --git a/src/bin/cxx/widgets_file_icons_2.cc b/src/bin/cxx/widgets_file_icons_2.cc
index 7ad890f..867b364 100644
--- a/src/bin/cxx/widgets_file_icons_2.cc
+++ b/src/bin/cxx/widgets_file_icons_2.cc
@@ -66,12 +66,8 @@ static void _setup(void)
66/* cleanup */ 66/* cleanup */
67static void _cleanup(void) 67static void _cleanup(void)
68{ 68{
69 int i; 69 images.clear();
70 for (i = 0; i < NUM; i++) 70 texts.clear();
71 {
72 eo_del(images[i]);
73 eo_del(o_texts[i]);
74 }
75} 71}
76static void _key(char *key) 72static void _key(char *key)
77{ 73{