summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSavio Sena <savio@expertisesolutions.com.br>2014-10-02 17:34:55 -0300
committerSavio Sena <savio@expertisesolutions.com.br>2014-10-02 17:34:55 -0300
commitf097281c9d906d27d5ece48a7b3b968aead62201 (patch)
tree737321be224d8175277f130b352446c1c93c0ff9
parent08f95c4bfe269305dcf31f7b2a03c3d405fb2510 (diff)
Use C++ style loops.
-rw-r--r--src/bin/cxx/image_blend_many_smooth_same_scaled.cc2
-rw-r--r--src/bin/cxx/image_blend_nearest_same_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_nearest_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_same_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_nearest_solid_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_occlude1.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude1_few.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude1_many.cc9
-rw-r--r--src/bin/cxx/image_blend_occlude1_very_many.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude2.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude2_few.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude2_many.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude2_very_many.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude3.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude3_few.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude3_many.cc7
-rw-r--r--src/bin/cxx/image_blend_occlude3_very_many.cc7
-rw-r--r--src/bin/cxx/image_blend_smooth_same_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_smooth_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_same_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_smooth_solid_scaled.cc11
-rw-r--r--src/bin/cxx/image_blend_solid_fade_unscaled.cc2
-rw-r--r--src/bin/cxx/image_blend_solid_middle_border.cc11
-rw-r--r--src/bin/cxx/image_blend_solid_middle_unscaled.cc7
-rw-r--r--src/bin/cxx/image_blend_unscaled.cc7
-rw-r--r--src/bin/cxx/image_data_argb.cc17
-rw-r--r--src/bin/cxx/image_data_argb_alpha.cc15
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl.cc11
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_nearest_solid_rotate.cc7
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc7
-rw-r--r--src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc17
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_alpha_nearest_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_alpha_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_alpha_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_nearest_rotate.cc5
-rw-r--r--src/bin/cxx/image_map_color_nearest_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_color_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_nearest_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_nearest_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_rotate.cc9
-rw-r--r--src/bin/cxx/image_map_solid_rotate.cc9
-rw-r--r--src/bin/cxx/image_quality_scale.cc9
-rw-r--r--src/bin/cxx/line_blend.cc9
-rw-r--r--src/bin/cxx/proxy_image.cc7
-rw-r--r--src/bin/cxx/rect_blend.cc7
-rw-r--r--src/bin/cxx/rect_blend_few.cc9
-rw-r--r--src/bin/cxx/rect_blend_pow2.cc9
-rw-r--r--src/bin/cxx/rect_blend_pow2_few.cc9
-rw-r--r--src/bin/cxx/rect_solid.cc9
-rw-r--r--src/bin/cxx/rect_solid_few.cc9
-rw-r--r--src/bin/cxx/text_basic.cc9
-rw-r--r--src/bin/cxx/text_change.cc5
-rw-r--r--src/bin/cxx/text_styles_different_strings.cc9
55 files changed, 258 insertions, 223 deletions
diff --git a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
index 96a3d25..5c5f076 100644
--- a/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_many_smooth_same_scaled.cc
@@ -33,7 +33,7 @@ static void _setup(void)
33 int n = rnd() % 100; 33 int n = rnd() % 100;
34 int w = 3 + ((n * (60 - 3)) / 100); 34 int w = 3 + ((n * (60 - 3)) / 100);
35 int h = 4 + ((n * (80 - 4)) / 100); 35 int h = 4 + ((n * (80 - 4)) / 100);
36 o.file_set(build_path("logo.png"), NULL); 36 o.file_set(build_path("logo.png"), "");
37 o.smooth_scale_set(1); 37 o.smooth_scale_set(1);
38 o.evas::object::size_set(w, h); 38 o.evas::object::size_set(w, h);
39 o.fill_set(0, 0, w, h); 39 o.fill_set(0, 0, w, h);
diff --git a/src/bin/cxx/image_blend_nearest_same_scaled.cc b/src/bin/cxx/image_blend_nearest_same_scaled.cc
index b74d2d0..4bb4353 100644
--- a/src/bin/cxx/image_blend_nearest_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_same_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_nearest_scaled.cc b/src/bin/cxx/image_blend_nearest_scaled.cc
index 191c2dd..8bf8b63 100644
--- a/src/bin/cxx/image_blend_nearest_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
index 76d466f..d5e620e 100644
--- a/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_same_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_nearest_solid_scaled.cc b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
index e745cf3..0739b35 100644
--- a/src/bin/cxx/image_blend_nearest_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_nearest_solid_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_occlude1.cc b/src/bin/cxx/image_blend_occlude1.cc
index 6fca663..7615e29 100644
--- a/src/bin/cxx/image_blend_occlude1.cc
+++ b/src/bin/cxx/image_blend_occlude1.cc
@@ -60,8 +60,8 @@ static void _cleanup()
60/* loop - do things */ 60/* loop - do things */
61static void _loop(double t, int f) 61static void _loop(double t, int f)
62{ 62{
63 auto itr = images.begin(); 63 int i = 0; // XXX
64 for (int i = 0; i < OBNUM; i++, ++itr) 64 for (evas::image& img : images)
65 { 65 {
66 if (i < (OBNUM / 2)) 66 if (i < (OBNUM / 2))
67 { 67 {
@@ -71,8 +71,9 @@ static void _loop(double t, int f)
71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 71 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
72 Evas_Coord y = (win_h / 2) - (h / 2); 72 Evas_Coord y = (win_h / 2) - (h / 2);
73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 73 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
74 (*itr).position_set(x, y); 74 img.position_set(x, y);
75 } 75 }
76 ++i;
76 } 77 }
77 FPS_STD(NAME); 78 FPS_STD(NAME);
78} 79}
diff --git a/src/bin/cxx/image_blend_occlude1_few.cc b/src/bin/cxx/image_blend_occlude1_few.cc
index 4c5eae5..6d88350 100644
--- a/src/bin/cxx/image_blend_occlude1_few.cc
+++ b/src/bin/cxx/image_blend_occlude1_few.cc
@@ -63,8 +63,8 @@ static void _cleanup()
63/* loop - do things */ 63/* loop - do things */
64static void _loop(double t, int f) 64static void _loop(double t, int f)
65{ 65{
66 auto itr = images.begin(); 66 int i = 0; // XXX
67 for (int i = 0; i < OBNUM; i++, ++itr) 67 for (evas::image& img : images)
68 { 68 {
69 if (i < (OBNUM / 2)) 69 if (i < (OBNUM / 2))
70 { 70 {
@@ -74,8 +74,9 @@ static void _loop(double t, int f)
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 75 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 (*itr).position_set(x, y); 77 img.position_set(x, y);
78 } 78 }
79 ++i;
79 } 80 }
80 FPS_STD(NAME); 81 FPS_STD(NAME);
81} 82}
diff --git a/src/bin/cxx/image_blend_occlude1_many.cc b/src/bin/cxx/image_blend_occlude1_many.cc
index 6c1c673..ca441ac 100644
--- a/src/bin/cxx/image_blend_occlude1_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_many.cc
@@ -41,7 +41,7 @@ static void _setup(void)
41 Evas_Coord x, y; 41 Evas_Coord x, y;
42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8); 42 x = (win_w / 4) + (((rnd() & 0xff) * ((win_w / 2) - 120)) >> 8);
43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8); 43 y = (win_h / 4) + (((rnd() & 0xff) * ((win_h / 2) - 120)) >> 8);
44 o.file_set(build_path("image.png"), NULL); 44 o.file_set(build_path("image.png"), "");
45 o.evas::object::position_set(x, y); 45 o.evas::object::position_set(x, y);
46 } 46 }
47 o.fill_set(0, 0, 120, 160); 47 o.fill_set(0, 0, 120, 160);
@@ -62,8 +62,8 @@ static void _cleanup()
62/* loop - do things */ 62/* loop - do things */
63static void _loop(double t, int f) 63static void _loop(double t, int f)
64{ 64{
65 auto itr = images.begin(); 65 int i = 0;
66 for (int i = 0; i < OBNUM; i++, itr++) 66 for (evas::image& img : images)
67 { 67 {
68 if (i < (OBNUM / 2)) 68 if (i < (OBNUM / 2))
69 { 69 {
@@ -73,8 +73,9 @@ static void _loop(double t, int f)
73 Evas_Coord y = (win_h / 2) - (h / 2); 73 Evas_Coord y = (win_h / 2) - (h / 2);
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 (*itr).position_set(x, y); 76 img.position_set(x, y);
77 } 77 }
78 ++i;
78 } 79 }
79 FPS_STD(NAME); 80 FPS_STD(NAME);
80} 81}
diff --git a/src/bin/cxx/image_blend_occlude1_very_many.cc b/src/bin/cxx/image_blend_occlude1_very_many.cc
index 72ba4eb..546ab20 100644
--- a/src/bin/cxx/image_blend_occlude1_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude1_very_many.cc
@@ -63,8 +63,8 @@ static void _cleanup()
63/* loop - do things */ 63/* loop - do things */
64static void _loop(double t, int f) 64static void _loop(double t, int f)
65{ 65{
66 auto itr = images.begin(); 66 int i = 0;
67 for (int i = 0; i < OBNUM; i++, ++itr) 67 for (evas::image& img : images)
68 { 68 {
69 if (i < (OBNUM / 2)) 69 if (i < (OBNUM / 2))
70 { 70 {
@@ -74,8 +74,9 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 (*itr).position_set(x, y); 77 img.position_set(x, y);
78 } 78 }
79 ++i;
79 } 80 }
80 FPS_STD(NAME); 81 FPS_STD(NAME);
81} 82}
diff --git a/src/bin/cxx/image_blend_occlude2.cc b/src/bin/cxx/image_blend_occlude2.cc
index 0d5fe22..eb59769 100644
--- a/src/bin/cxx/image_blend_occlude2.cc
+++ b/src/bin/cxx/image_blend_occlude2.cc
@@ -62,8 +62,8 @@ static void _cleanup()
62/* loop - do things */ 62/* loop - do things */
63static void _loop(double t, int f) 63static void _loop(double t, int f)
64{ 64{
65 auto itr = images.begin(); 65 int i = 0;
66 for (int i = 0; i < OBNUM; i++, ++itr) 66 for (evas::image& img : images)
67 { 67 {
68 if (i & 0x1) 68 if (i & 0x1)
69 { 69 {
@@ -73,8 +73,9 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 (*itr).position_set(x, y); 76 img.position_set(x, y);
77 } 77 }
78 ++i;
78 } 79 }
79 FPS_STD(NAME); 80 FPS_STD(NAME);
80} 81}
diff --git a/src/bin/cxx/image_blend_occlude2_few.cc b/src/bin/cxx/image_blend_occlude2_few.cc
index 03e2664..c2c458c 100644
--- a/src/bin/cxx/image_blend_occlude2_few.cc
+++ b/src/bin/cxx/image_blend_occlude2_few.cc
@@ -63,8 +63,8 @@ static void _cleanup()
63/* loop - do things */ 63/* loop - do things */
64static void _loop(double t, int f) 64static void _loop(double t, int f)
65{ 65{
66 auto itr = images.begin(); 66 int i = 0;
67 for (int i = 0; i < OBNUM; i++, ++itr) 67 for (evas::image& img : images)
68 { 68 {
69 if (i & 0x1) 69 if (i & 0x1)
70 { 70 {
@@ -74,8 +74,9 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 (*itr).position_set(x, y); 77 img.position_set(x, y);
78 } 78 }
79 ++i;
79 } 80 }
80 FPS_STD(NAME); 81 FPS_STD(NAME);
81} 82}
diff --git a/src/bin/cxx/image_blend_occlude2_many.cc b/src/bin/cxx/image_blend_occlude2_many.cc
index 1bbfc1a..b98f161 100644
--- a/src/bin/cxx/image_blend_occlude2_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_many.cc
@@ -65,8 +65,8 @@ static void _cleanup()
65/* loop - do things */ 65/* loop - do things */
66static void _loop(double t, int f) 66static void _loop(double t, int f)
67{ 67{
68 auto itr = images.begin(); 68 int i = 0;
69 for (int i = 0; i < OBNUM; i++, ++itr) 69 for (evas::image& img : images)
70 { 70 {
71 if (i & 0x1) 71 if (i & 0x1)
72 { 72 {
@@ -76,8 +76,9 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 Evas_Coord y = (win_h / 2) - (h / 2); 77 Evas_Coord y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 (*itr).position_set(x, y); 79 img.position_set(x, y);
80 } 80 }
81 ++i;
81 } 82 }
82 FPS_STD(NAME); 83 FPS_STD(NAME);
83} 84}
diff --git a/src/bin/cxx/image_blend_occlude2_very_many.cc b/src/bin/cxx/image_blend_occlude2_very_many.cc
index ad10aef..49ef504 100644
--- a/src/bin/cxx/image_blend_occlude2_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude2_very_many.cc
@@ -63,8 +63,8 @@ static void _cleanup()
63/* loop - do things */ 63/* loop - do things */
64static void _loop(double t, int f) 64static void _loop(double t, int f)
65{ 65{
66 auto itr = images.begin(); 66 int i = 0;
67 for (int i = 0; i < OBNUM; i++, ++itr) 67 for (evas::image& img : images)
68 { 68 {
69 if (i & 0x1) 69 if (i & 0x1)
70 { 70 {
@@ -74,8 +74,9 @@ static void _loop(double t, int f)
74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 74 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
75 Evas_Coord y = (win_h / 2) - (h / 2); 75 Evas_Coord y = (win_h / 2) - (h / 2);
76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 76 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
77 (*itr).position_set(x, y); 77 img.position_set(x, y);
78 } 78 }
79 ++i;
79 } 80 }
80 FPS_STD(NAME); 81 FPS_STD(NAME);
81} 82}
diff --git a/src/bin/cxx/image_blend_occlude3.cc b/src/bin/cxx/image_blend_occlude3.cc
index 392e8f2..22dd3d9 100644
--- a/src/bin/cxx/image_blend_occlude3.cc
+++ b/src/bin/cxx/image_blend_occlude3.cc
@@ -62,8 +62,8 @@ static void _cleanup()
62/* loop - do things */ 62/* loop - do things */
63static void _loop(double t, int f) 63static void _loop(double t, int f)
64{ 64{
65 auto itr = images.begin(); 65 int i = 0; // XXX
66 for (int i = 0; i < OBNUM; i++, ++itr) 66 for (evas::image& img : images)
67 { 67 {
68 if (i > (OBNUM / 2)) 68 if (i > (OBNUM / 2))
69 { 69 {
@@ -73,8 +73,9 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 (*itr).position_set(x, y); 76 img.position_set(x, y);
77 } 77 }
78 ++i;
78 } 79 }
79 FPS_STD(NAME); 80 FPS_STD(NAME);
80} 81}
diff --git a/src/bin/cxx/image_blend_occlude3_few.cc b/src/bin/cxx/image_blend_occlude3_few.cc
index 2099276..bfcbee3 100644
--- a/src/bin/cxx/image_blend_occlude3_few.cc
+++ b/src/bin/cxx/image_blend_occlude3_few.cc
@@ -65,8 +65,8 @@ static void _cleanup()
65/* loop - do things */ 65/* loop - do things */
66static void _loop(double t, int f) 66static void _loop(double t, int f)
67{ 67{
68 auto itr = images.begin(); 68 int i = 0;
69 for (int i = 0; i < OBNUM; i++) 69 for (evas::image& img : images)
70 { 70 {
71 if (i > (OBNUM / 2)) 71 if (i > (OBNUM / 2))
72 { 72 {
@@ -76,8 +76,9 @@ static void _loop(double t, int f)
76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 76 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
77 Evas_Coord y = (win_h / 2) - (h / 2); 77 Evas_Coord y = (win_h / 2) - (h / 2);
78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 78 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
79 (*itr).position_set(x, y); 79 img.position_set(x, y);
80 } 80 }
81 ++i;
81 } 82 }
82 FPS_STD(NAME); 83 FPS_STD(NAME);
83} 84}
diff --git a/src/bin/cxx/image_blend_occlude3_many.cc b/src/bin/cxx/image_blend_occlude3_many.cc
index 0c22848..b9a3df2 100644
--- a/src/bin/cxx/image_blend_occlude3_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_many.cc
@@ -61,8 +61,8 @@ static void _cleanup()
61/* loop - do things */ 61/* loop - do things */
62static void _loop(double t, int f) 62static void _loop(double t, int f)
63{ 63{
64 auto itr = images.begin(); 64 int i = 0;
65 for (int i = 0; i < OBNUM; i++, ++itr) 65 for (evas::image& img : images)
66 { 66 {
67 if (i > (OBNUM / 2)) 67 if (i > (OBNUM / 2))
68 { 68 {
@@ -72,8 +72,9 @@ static void _loop(double t, int f)
72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 72 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
73 Evas_Coord y = (win_h / 2) - (h / 2); 73 Evas_Coord y = (win_h / 2) - (h / 2);
74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 74 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
75 (*itr).position_set(x, y); 75 img.position_set(x, y);
76 } 76 }
77 ++i;
77 } 78 }
78 FPS_STD(NAME); 79 FPS_STD(NAME);
79} 80}
diff --git a/src/bin/cxx/image_blend_occlude3_very_many.cc b/src/bin/cxx/image_blend_occlude3_very_many.cc
index 8ee8f05..e2326f9 100644
--- a/src/bin/cxx/image_blend_occlude3_very_many.cc
+++ b/src/bin/cxx/image_blend_occlude3_very_many.cc
@@ -62,8 +62,8 @@ static void _cleanup()
62/* loop - do things */ 62/* loop - do things */
63static void _loop(double t, int f) 63static void _loop(double t, int f)
64{ 64{
65 auto itr = images.begin(); 65 int i = 0;
66 for (int i = 0; i < OBNUM; i++, ++itr) 66 for (evas::image& img : images)
67 { 67 {
68 if (i > (OBNUM / 2)) 68 if (i > (OBNUM / 2))
69 { 69 {
@@ -73,8 +73,9 @@ static void _loop(double t, int f)
73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 73 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
74 Evas_Coord y = (win_h / 2) - (h / 2); 74 Evas_Coord y = (win_h / 2) - (h / 2);
75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 75 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
76 (*itr).position_set(x, y); 76 img.position_set(x, y);
77 } 77 }
78 ++i;
78 } 79 }
79 FPS_STD(NAME); 80 FPS_STD(NAME);
80} 81}
diff --git a/src/bin/cxx/image_blend_smooth_same_scaled.cc b/src/bin/cxx/image_blend_smooth_same_scaled.cc
index 010151a..7f992b7 100644
--- a/src/bin/cxx/image_blend_smooth_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_same_scaled.cc
@@ -47,8 +47,8 @@ static void _cleanup()
47/* loop - do things */ 47/* loop - do things */
48static void _loop(double t, int f) 48static void _loop(double t, int f)
49{ 49{
50 auto itr = images.begin(); 50 int i = 0;
51 for (int i = 0; i < OBNUM; i++, ++itr) 51 for (evas::image& img : images)
52 { 52 {
53 Evas_Coord w0 = 80; 53 Evas_Coord w0 = 80;
54 Evas_Coord h0 = 80; 54 Evas_Coord h0 = 80;
@@ -58,9 +58,10 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 (*itr).position_set(x, y); 61 img.position_set(x, y);
62 (*itr).evas::object::size_set(w, h); 62 img.evas::object::size_set(w, h);
63 (*itr).fill_set(0, 0, w, h); 63 img.fill_set(0, 0, w, h);
64 ++i;
64 } 65 }
65 FPS_STD(NAME); 66 FPS_STD(NAME);
66} 67}
diff --git a/src/bin/cxx/image_blend_smooth_scaled.cc b/src/bin/cxx/image_blend_smooth_scaled.cc
index 7f2d9d9..e0ec1fd 100644
--- a/src/bin/cxx/image_blend_smooth_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).size_set(w, h); 61 img.size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
index f74d689..d9939d9 100644
--- a/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_same_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).size_set(w, h); 61 img.size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_smooth_solid_scaled.cc b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
index 01decdf..2322358 100644
--- a/src/bin/cxx/image_blend_smooth_solid_scaled.cc
+++ b/src/bin/cxx/image_blend_smooth_solid_scaled.cc
@@ -46,8 +46,8 @@ static void _cleanup()
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 auto itr = images.begin(); 49 int i = 0;
50 for (int i = 0; i < OBNUM; i++, ++itr) 50 for (evas::image& img : images)
51 { 51 {
52 Evas_Coord w0 = 80; 52 Evas_Coord w0 = 80;
53 Evas_Coord h0 = 80; 53 Evas_Coord h0 = 80;
@@ -57,9 +57,10 @@ static void _loop(double t, int f)
57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 57 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
58 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 59 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
60 (*itr).position_set(x, y); 60 img.position_set(x, y);
61 (*itr).size_set(w, h); 61 img.size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
63 ++i;
63 } 64 }
64 FPS_STD(NAME); 65 FPS_STD(NAME);
65} 66}
diff --git a/src/bin/cxx/image_blend_solid_fade_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
index 894def6..7fa3ea1 100644
--- a/src/bin/cxx/image_blend_solid_fade_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
@@ -29,7 +29,7 @@ static void _setup(void)
29 evas::image o(efl::eo::parent = canvas); 29 evas::image o(efl::eo::parent = canvas);
30 images.push_back(o); 30 images.push_back(o);
31 31
32 o.file_set(::build_path("image.png"), NULL); 32 o.file_set(::build_path("image.png"), "");
33 o.fill_set(0, 0, 120, 160); 33 o.fill_set(0, 0, 120, 160);
34 o.evas::object::size_set(120, 160); 34 o.evas::object::size_set(120, 160);
35 int a = rnd()&0xff; 35 int a = rnd()&0xff;
diff --git a/src/bin/cxx/image_blend_solid_middle_border.cc b/src/bin/cxx/image_blend_solid_middle_border.cc
index 04610c4..80db5cb 100644
--- a/src/bin/cxx/image_blend_solid_middle_border.cc
+++ b/src/bin/cxx/image_blend_solid_middle_border.cc
@@ -47,8 +47,8 @@ static void _cleanup()
47/* loop - do things */ 47/* loop - do things */
48static void _loop(double t, int f) 48static void _loop(double t, int f)
49{ 49{
50 auto itr = images.begin(); 50 int i = 0;
51 for (int i = 0; i < OBNUM; i++, ++itr) 51 for (evas::image& img : images)
52 { 52 {
53 Evas_Coord w0 = 80; 53 Evas_Coord w0 = 80;
54 Evas_Coord h0 = 80; 54 Evas_Coord h0 = 80;
@@ -58,9 +58,10 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
61 (*itr).position_set(x, y); 61 img.position_set(x, y);
62 (*itr).evas::object::size_set(w, h); 62 img.evas::object::size_set(w, h);
63 (*itr).fill_set(0, 0, w, h); 63 img.fill_set(0, 0, w, h);
64 ++i;
64 } 65 }
65 FPS_STD(NAME); 66 FPS_STD(NAME);
66} 67}
diff --git a/src/bin/cxx/image_blend_solid_middle_unscaled.cc b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
index 9d1f3ad..155d5cb 100644
--- a/src/bin/cxx/image_blend_solid_middle_unscaled.cc
+++ b/src/bin/cxx/image_blend_solid_middle_unscaled.cc
@@ -49,8 +49,8 @@ static void _cleanup()
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 auto itr = images.begin(); 52 int i = 0;
53 for (int i = 0; i < OBNUM; i++, ++itr) 53 for (evas::image& img : images)
54 { 54 {
55 Evas_Coord w = 120; 55 Evas_Coord w = 120;
56 Evas_Coord h = 160; 56 Evas_Coord h = 160;
@@ -58,7 +58,8 @@ static void _loop(double t, int f)
58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 58 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
61 (*itr).position_set(x, y); 61 img.position_set(x, y);
62 ++i;
62 } 63 }
63 FPS_STD(NAME); 64 FPS_STD(NAME);
64} 65}
diff --git a/src/bin/cxx/image_blend_unscaled.cc b/src/bin/cxx/image_blend_unscaled.cc
index d9c3be7..4d48e25 100644
--- a/src/bin/cxx/image_blend_unscaled.cc
+++ b/src/bin/cxx/image_blend_unscaled.cc
@@ -47,8 +47,8 @@ static void _cleanup()
47/* loop - do things */ 47/* loop - do things */
48static void _loop(double t, int f) 48static void _loop(double t, int f)
49{ 49{
50 auto itr = images.begin(); 50 int i = 0;
51 for (int i = 0; i < OBNUM; i++, ++itr) 51 for (evas::image& img : images)
52 { 52 {
53 Evas_Coord w = 120; 53 Evas_Coord w = 120;
54 Evas_Coord h = 160; 54 Evas_Coord h = 160;
@@ -56,7 +56,8 @@ static void _loop(double t, int f)
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
59 (*itr).position_set(x, y); 59 img.position_set(x, y);
60 ++i;
60 } 61 }
61 FPS_STD(NAME); 62 FPS_STD(NAME);
62} 63}
diff --git a/src/bin/cxx/image_data_argb.cc b/src/bin/cxx/image_data_argb.cc
index e666c8a..5ec5211 100644
--- a/src/bin/cxx/image_data_argb.cc
+++ b/src/bin/cxx/image_data_argb.cc
@@ -50,19 +50,18 @@ static void _cleanup(void)
50static void _loop(double t, int f) 50static void _loop(double t, int f)
51{ 51{
52 int st; 52 int st;
53 auto itr = images.begin(); 53 for (evas::image& img : images)
54 for (int i = 0; i < 1; i++, ++itr)
55 { 54 {
56 unsigned int *data, *p; 55 unsigned int *data, *p;
57 Evas_Coord w = 640; 56 Evas_Coord w = 640;
58 Evas_Coord h = 480; 57 Evas_Coord h = 480;
59 Evas_Coord x = (win_w / 2) - (w / 2); 58 Evas_Coord x = (win_w / 2) - (w / 2);
60 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
61 (*itr).position_set(x, y); 60 img.position_set(x, y);
62 (*itr).evas::object::size_set(w, h); 61 img.evas::object::size_set(w, h);
63 (*itr).fill_set(0, 0, w, h); 62 img.fill_set(0, 0, w, h);
64 data = static_cast<unsigned int*>((*itr).data_get(1)); 63 data = static_cast<unsigned int*>(img.data_get(1));
65 st = (*itr).stride_get(); // XXX 64 st = img.stride_get(); // XXX
66 st = st >> 2; 65 st = st >> 2;
67 p = data; 66 p = data;
68 for (y = 0; y < h; y++) 67 for (y = 0; y < h; y++)
@@ -74,8 +73,8 @@ static void _loop(double t, int f)
74 } 73 }
75 p += (st - w); 74 p += (st - w);
76 } 75 }
77 (*itr).data_set(data); 76 img.data_set(data);
78 (*itr).data_update_add( 0, 0, w, h); 77 img.data_update_add( 0, 0, w, h);
79 } 78 }
80 FPS_STD(NAME); 79 FPS_STD(NAME);
81} 80}
diff --git a/src/bin/cxx/image_data_argb_alpha.cc b/src/bin/cxx/image_data_argb_alpha.cc
index af4e5fc..98b1695 100644
--- a/src/bin/cxx/image_data_argb_alpha.cc
+++ b/src/bin/cxx/image_data_argb_alpha.cc
@@ -51,18 +51,17 @@ static void _cleanup(void)
51/* loop - do things */ 51/* loop - do things */
52static void _loop(double t, int f) 52static void _loop(double t, int f)
53{ 53{
54 auto itr = images.begin(); 54 for (evas::image& img : images)
55 for (int i = 0; i < 1; i++, ++itr)
56 { 55 {
57 int a, r, g, b; 56 int a, r, g, b;
58 Evas_Coord w = 640; 57 Evas_Coord w = 640;
59 Evas_Coord h = 480; 58 Evas_Coord h = 480;
60 Evas_Coord x = (win_w / 2) - (w / 2); 59 Evas_Coord x = (win_w / 2) - (w / 2);
61 Evas_Coord y = (win_h / 2) - (h / 2); 60 Evas_Coord y = (win_h / 2) - (h / 2);
62 (*itr).evas::object::position_set(x, y); 61 img.evas::object::position_set(x, y);
63 (*itr).evas::object::size_set(w, h); 62 img.evas::object::size_set(w, h);
64 (*itr).fill_set(0, 0, w, h); 63 img.fill_set(0, 0, w, h);
65 unsigned int *data = static_cast<unsigned int*>((*itr).data_get(1)); 64 unsigned int *data = static_cast<unsigned int*>(img.data_get(1));
66 int st = evas_obj_image_stride_get(); 65 int st = evas_obj_image_stride_get();
67 st = st >> 2; 66 st = st >> 2;
68 unsigned int *p = data; 67 unsigned int *p = data;
@@ -86,8 +85,8 @@ static void _loop(double t, int f)
86 } 85 }
87 p += (st - w); 86 p += (st - w);
88 } 87 }
89 (*itr).data_set(data); 88 img.data_set(data);
90 (*itr).data_update_add( 0, 0, w, h); 89 img.data_update_add( 0, 0, w, h);
91 } 90 }
92 FPS_STD(NAME); 91 FPS_STD(NAME);
93} 92}
diff --git a/src/bin/cxx/image_data_ycbcr601pl.cc b/src/bin/cxx/image_data_ycbcr601pl.cc
index 58c1ab6..59814bb 100644
--- a/src/bin/cxx/image_data_ycbcr601pl.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl.cc
@@ -84,17 +84,16 @@ static void _cleanup(void)
84/* loop - do things */ 84/* loop - do things */
85static void _loop(double t, int f) 85static void _loop(double t, int f)
86{ 86{
87 auto itr = images.begin(); 87 for (evas::image& img : images)
88 for (int i = 0; i < 1; i++, ++itr)
89 { 88 {
90 Evas_Coord w = 640; 89 Evas_Coord w = 640;
91 Evas_Coord h = 480; 90 Evas_Coord h = 480;
92 Evas_Coord x = (win_w / 2) - (w / 2); 91 Evas_Coord x = (win_w / 2) - (w / 2);
93 Evas_Coord y = (win_h / 2) - (h / 2); 92 Evas_Coord y = (win_h / 2) - (h / 2);
94 (*itr).position_set(x, y); 93 img.position_set(x, y);
95 (*itr).evas::object::size_set(w, h); 94 img.evas::object::size_set(w, h);
96 (*itr).fill_set(0, 0, w, h); 95 img.fill_set(0, 0, w, h);
97 (*itr).data_update_add( 0, 0, 640, 480); 96 img.data_update_add( 0, 0, 640, 480);
98 } 97 }
99 FPS_STD(NAME); 98 FPS_STD(NAME);
100} 99}
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 f3b6c75..4a21060 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
@@ -88,8 +88,7 @@ static void _loop(double t, int f)
88 static Evas_Map *m = NULL; 88 static Evas_Map *m = NULL;
89 if (!m) m = evas_map_new(4); 89 if (!m) m = evas_map_new(4);
90 evas_map_smooth_set(m, 0); 90 evas_map_smooth_set(m, 0);
91 auto itr = images.begin(); 91 for (evas::image& img : images)
92 for (int i = 0; i < 1; i++, ++itr)
93 { 92 {
94 Evas_Coord w = 640; 93 Evas_Coord w = 640;
95 Evas_Coord h = 480; 94 Evas_Coord h = 480;
@@ -97,8 +96,8 @@ static void _loop(double t, int f)
97 Evas_Coord y = (win_h / 2) - (h / 2); 96 Evas_Coord y = (win_h / 2) - (h / 2);
98 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 97 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
99 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 98 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
100 (*itr).map_enable_set(1); 99 img.map_enable_set(1);
101 (*itr).map_set(m); 100 img.map_set(m);
102 } 101 }
103 FPS_STD(NAME); 102 FPS_STD(NAME);
104} 103}
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 8e9b2c5..a672dc1 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_map_solid_rotate.cc
@@ -86,8 +86,7 @@ static void _loop(double t, int f)
86{ 86{
87 static Evas_Map *m = NULL; 87 static Evas_Map *m = NULL;
88 if (!m) m = evas_map_new(4); 88 if (!m) m = evas_map_new(4);
89 auto itr = images.begin(); 89 for (evas::image& img : images)
90 for (int i = 0; i < 1; i++, ++itr)
91 { 90 {
92 Evas_Coord w = 640; 91 Evas_Coord w = 640;
93 Evas_Coord h = 480; 92 Evas_Coord h = 480;
@@ -97,8 +96,8 @@ static void _loop(double t, int f)
97 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 96 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
98 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 97 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
99 98
100 (*itr).map_enable_set(1); 99 img.map_enable_set(1);
101 (*itr).map_set(m); 100 img.map_set(m);
102 } 101 }
103 FPS_STD(NAME); 102 FPS_STD(NAME);
104} 103}
diff --git a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
index 8e5c737..1d01693 100644
--- a/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
+++ b/src/bin/cxx/image_data_ycbcr601pl_wide_stride.cc
@@ -88,16 +88,15 @@ static void _cleanup(void)
88/* loop - do things */ 88/* loop - do things */
89static void _loop(double t, int f) 89static void _loop(double t, int f)
90{ 90{
91 auto itr = images.begin(); 91 for (evas::image& img : images)
92 for (int i = 0; i < 1; i++, ++itr)
93 { 92 {
94 Evas_Coord w = 640; 93 Evas_Coord w = 640;
95 Evas_Coord h = 480; 94 Evas_Coord h = 480;
96 Evas_Coord x = (win_w / 2) - (w / 2); 95 Evas_Coord x = (win_w / 2) - (w / 2);
97 Evas_Coord y = (win_h / 2) - (h / 2); 96 Evas_Coord y = (win_h / 2) - (h / 2);
98 (*itr).evas::object::position_set(x, y); 97 img.evas::object::position_set(x, y);
99 (*itr).evas::object::size_set(w, h); 98 img.evas::object::size_set(w, h);
100 (*itr).fill_set(0, 0, w, h); 99 img.fill_set(0, 0, w, h);
101 100
102 w = 320 - 16 + f; 101 w = 320 - 16 + f;
103 if (w < 1) w = 1; 102 if (w < 1) w = 1;
@@ -105,8 +104,8 @@ static void _loop(double t, int f)
105 104
106 w &= ~0x1; 105 w &= ~0x1;
107 106
108 (*itr).size_set(w, 480); 107 img.size_set(w, 480);
109 unsigned char **data = static_cast<unsigned char**>((*itr).data_get(1)); 108 unsigned char **data = static_cast<unsigned char**>(img.data_get(1));
110 if (data) 109 if (data)
111 { 110 {
112 unsigned char **lp = data; 111 unsigned char **lp = data;
@@ -125,8 +124,8 @@ static void _loop(double t, int f)
125 *lp = vp + (y * 320); 124 *lp = vp + (y * 320);
126 lp++; 125 lp++;
127 } 126 }
128 (*itr).data_set(data); 127 img.data_set(data);
129 (*itr).data_update_add(0, 0, w, 480); 128 img.data_update_add(0, 0, w, 480);
130 } 129 }
131 } 130 }
132 FPS_STD(NAME); 131 FPS_STD(NAME);
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 267ffab..6f9c403 100644
--- a/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_nearest_rotate.cc
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -71,8 +71,9 @@ static void _loop(double t, int f)
71 71
72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
73 73
74 (*itr).map_enable_set(1); 74 img.map_enable_set(1);
75 (*itr).map_set(m); 75 img.map_set(m);
76 ++i;
76 } 77 }
77 FPS_STD(NAME); 78 FPS_STD(NAME);
78} 79}
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 0d21c41..6ef910e 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
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -71,8 +71,9 @@ static void _loop(double t, int f)
71 71
72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
73 73
74 (*itr).map_enable_set(1); 74 img.map_enable_set(1);
75 (*itr).map_set(m); 75 img.map_set(m);
76 ++i;
76 } 77 }
77 FPS_STD(NAME); 78 FPS_STD(NAME);
78} 79}
diff --git a/src/bin/cxx/image_map_color_alpha_rotate.cc b/src/bin/cxx/image_map_color_alpha_rotate.cc
index 1251179..4fc4c88 100644
--- a/src/bin/cxx/image_map_color_alpha_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -69,8 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 (*itr).map_enable_set(1); 72 img.map_enable_set(1);
73 (*itr).map_set(m); 73 img.map_set(m);
74 ++i;
74 } 75 }
75 FPS_STD(NAME); 76 FPS_STD(NAME);
76} 77}
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 71fedf4..d8f0a1f 100644
--- a/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_alpha_solid_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0; // XXX
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -68,8 +68,9 @@ static void _loop(double t, int f)
68 evas_map_point_color_set(m, 3, 0, 0, 0, 0); 68 evas_map_point_color_set(m, 3, 0, 0, 0, 0);
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 (*itr).map_enable_set(1); 71 img.map_enable_set(1);
72 (*itr).map_set(m); 72 img.map_set(m);
73 ++i;
73 } 74 }
74 FPS_STD(NAME); 75 FPS_STD(NAME);
75} 76}
diff --git a/src/bin/cxx/image_map_color_nearest_rotate.cc b/src/bin/cxx/image_map_color_nearest_rotate.cc
index ba72f9e..28f3e7a 100644
--- a/src/bin/cxx/image_map_color_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_rotate.cc
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -73,6 +73,7 @@ static void _loop(double t, int f)
73 73
74 evas_obj_map_enable_set(1); 74 evas_obj_map_enable_set(1);
75 evas_obj_map_set(m); 75 evas_obj_map_set(m);
76 ++i;
76 } 77 }
77 FPS_STD(NAME); 78 FPS_STD(NAME);
78} 79}
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 6b99176..488414a 100644
--- a/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_nearest_solid_rotate.cc
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -71,8 +71,9 @@ static void _loop(double t, int f)
71 71
72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 72 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
73 73
74 (*itr).map_enable_set(1); 74 img.map_enable_set(1);
75 (*itr).map_set(m); 75 img.map_set(m);
76 ++i;
76 } 77 }
77 FPS_STD(NAME); 78 FPS_STD(NAME);
78} 79}
diff --git a/src/bin/cxx/image_map_color_rotate.cc b/src/bin/cxx/image_map_color_rotate.cc
index 8673d0d..23e906e 100644
--- a/src/bin/cxx/image_map_color_rotate.cc
+++ b/src/bin/cxx/image_map_color_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -69,8 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 (*itr).map_enable_set(1); 72 img.map_enable_set(1);
73 (*itr).map_set(m); 73 img.map_set(m);
74 ++i;
74 } 75 }
75 FPS_STD(NAME); 76 FPS_STD(NAME);
76} 77}
diff --git a/src/bin/cxx/image_map_color_solid_rotate.cc b/src/bin/cxx/image_map_color_solid_rotate.cc
index dbf86fd..8a30a41 100644
--- a/src/bin/cxx/image_map_color_solid_rotate.cc
+++ b/src/bin/cxx/image_map_color_solid_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < (OBNUM / 2); i++, itr++) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -69,8 +69,9 @@ static void _loop(double t, int f)
69 69
70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 70 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
71 71
72 (*itr).map_enable_set(1); 72 img.map_enable_set(1);
73 (*itr).map_set(m); 73 img.map_set(m);
74 ++i;
74 } 75 }
75 FPS_STD(NAME); 76 FPS_STD(NAME);
76} 77}
diff --git a/src/bin/cxx/image_map_nearest_rotate.cc b/src/bin/cxx/image_map_nearest_rotate.cc
index 6aa2887..92dd81c 100644
--- a/src/bin/cxx/image_map_nearest_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_rotate.cc
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -66,8 +66,9 @@ static void _loop(double t, int f)
66 66
67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 67 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
68 68
69 (*itr).map_enable_set(1); 69 img.map_enable_set(1);
70 (*itr).map_set(m); 70 img.map_set(m);
71 ++i;
71 } 72 }
72 FPS_STD(NAME); 73 FPS_STD(NAME);
73} 74}
diff --git a/src/bin/cxx/image_map_nearest_solid_rotate.cc b/src/bin/cxx/image_map_nearest_solid_rotate.cc
index e4d6452..f50eee7 100644
--- a/src/bin/cxx/image_map_nearest_solid_rotate.cc
+++ b/src/bin/cxx/image_map_nearest_solid_rotate.cc
@@ -52,8 +52,8 @@ static void _loop(double t, int f)
52 static Evas_Map *m = NULL; 52 static Evas_Map *m = NULL;
53 if (!m) m = evas_map_new(4); 53 if (!m) m = evas_map_new(4);
54 evas_map_smooth_set(m, 0); 54 evas_map_smooth_set(m, 0);
55 auto itr = images.begin(); 55 int i = 0;
56 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 56 for (evas::image& img : images)
57 { 57 {
58 Evas_Coord w = 120; 58 Evas_Coord w = 120;
59 Evas_Coord h = 160; 59 Evas_Coord h = 160;
@@ -65,8 +65,9 @@ static void _loop(double t, int f)
65 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0); 65 evas_map_util_points_populate_from_geometry(m, x, y, w, h, 0);
66 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 66 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
67 67
68 (*itr).map_enable_set(1); 68 img.map_enable_set(1);
69 (*itr).map_set(m); 69 img.map_set(m);
70 ++i;
70 } 71 }
71 FPS_STD(NAME); 72 FPS_STD(NAME);
72} 73}
diff --git a/src/bin/cxx/image_map_rotate.cc b/src/bin/cxx/image_map_rotate.cc
index 64c6569..527939e 100644
--- a/src/bin/cxx/image_map_rotate.cc
+++ b/src/bin/cxx/image_map_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -64,8 +64,9 @@ static void _loop(double t, int f)
64 64
65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2)); 65 evas_map_util_rotate(m, f, x + (w / 2), y + (h / 2));
66 66
67 (*itr).map_enable_set(1); 67 img.map_enable_set(1);
68 (*itr).map_set(m); 68 img.map_set(m);
69 ++i;
69 } 70 }
70 FPS_STD(NAME); 71 FPS_STD(NAME);
71} 72}
diff --git a/src/bin/cxx/image_map_solid_rotate.cc b/src/bin/cxx/image_map_solid_rotate.cc
index 3d2fdab..30eef29 100644
--- a/src/bin/cxx/image_map_solid_rotate.cc
+++ b/src/bin/cxx/image_map_solid_rotate.cc
@@ -50,8 +50,8 @@ static void _loop(double t, int f)
50{ 50{
51 static Evas_Map *m = NULL; 51 static Evas_Map *m = NULL;
52 if (!m) m = evas_map_new(4); 52 if (!m) m = evas_map_new(4);
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < (OBNUM / 2); i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w = 120; 56 Evas_Coord w = 120;
57 Evas_Coord h = 160; 57 Evas_Coord h = 160;
@@ -63,8 +63,9 @@ static void _loop(double t, int f)
63 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);
64 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));
65 65
66 (*itr).map_enable_set(1); 66 img.map_enable_set(1);
67 (*itr).map_set(m); 67 img.map_set(m);
68 ++i;
68 } 69 }
69 FPS_STD(NAME); 70 FPS_STD(NAME);
70} 71}
diff --git a/src/bin/cxx/image_quality_scale.cc b/src/bin/cxx/image_quality_scale.cc
index ee523aa..f3b42e9 100644
--- a/src/bin/cxx/image_quality_scale.cc
+++ b/src/bin/cxx/image_quality_scale.cc
@@ -48,8 +48,7 @@ static void _cleanup(void)
48/* loop - do things */ 48/* loop - do things */
49static void _loop(double t, int f) 49static void _loop(double t, int f)
50{ 50{
51 auto itr = images.begin(); 51 for (evas::image& img : images)
52 for (int i = 0; i < 1; i++, ++itr)
53 { 52 {
54 Evas_Coord w = 640; 53 Evas_Coord w = 640;
55 Evas_Coord h = 480; 54 Evas_Coord h = 480;
@@ -57,9 +56,9 @@ static void _loop(double t, int f)
57 h *= (f / 100.0) * 4.0; 56 h *= (f / 100.0) * 4.0;
58 Evas_Coord x = (win_w / 2) - (w / 2); 57 Evas_Coord x = (win_w / 2) - (w / 2);
59 Evas_Coord y = (win_h / 2) - (h / 2); 58 Evas_Coord y = (win_h / 2) - (h / 2);
60 (*itr).position_set(x, y); 59 img.position_set(x, y);
61 (*itr).size_set(w, h); 60 img.size_set(w, h);
62 (*itr).fill_set(0, 0, w, h); 61 img.fill_set(0, 0, w, h);
63 } 62 }
64 FPS_STD(NAME); 63 FPS_STD(NAME);
65} 64}
diff --git a/src/bin/cxx/line_blend.cc b/src/bin/cxx/line_blend.cc
index d491f62..5a71c0f 100644
--- a/src/bin/cxx/line_blend.cc
+++ b/src/bin/cxx/line_blend.cc
@@ -83,13 +83,14 @@ static void _loop(double t, int f)
83{ 83{
84 Evas_Coord ox1, oy1, ox2, oy2; 84 Evas_Coord ox1, oy1, ox2, oy2;
85 Evas_Object *o; 85 Evas_Object *o;
86 auto itr = lines.begin(); 86 int i = 0;
87 for (int i = 0; i < OBNUM; i++, ++itr) 87 for (evas::image& img : images)
88 { 88 {
89 (*itr).xy_get(&ox1, &oy1, &ox2, &oy2); 89 img.xy_get(&ox1, &oy1, &ox2, &oy2);
90 _rotate_point(&ox1, &oy1, i); 90 _rotate_point(&ox1, &oy1, i);
91 _rotate_point(&ox2, &oy2, i); 91 _rotate_point(&ox2, &oy2, i);
92 (*itr).xy_set(ox1, oy1, ox2, oy2); 92 img.xy_set(ox1, oy1, ox2, oy2);
93 ++i;
93 } 94 }
94 FPS_STD(NAME); 95 FPS_STD(NAME);
95} 96}
diff --git a/src/bin/cxx/proxy_image.cc b/src/bin/cxx/proxy_image.cc
index b16f513..c8582d1 100644
--- a/src/bin/cxx/proxy_image.cc
+++ b/src/bin/cxx/proxy_image.cc
@@ -53,8 +53,8 @@ static void _cleanup()
53/* loop - do things */ 53/* loop - do things */
54static void _loop(double t, int f) 54static void _loop(double t, int f)
55{ 55{
56 auto itr = images.begin(); 56 int i = 0;
57 for (int i = 0; i < OBNUM; i++, ++itr) 57 for (evas::image& img : images)
58 { 58 {
59 Evas_Coord w = 120; 59 Evas_Coord w = 120;
60 Evas_Coord h = 160; 60 Evas_Coord h = 160;
@@ -62,7 +62,8 @@ static void _loop(double t, int f)
62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 62 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
63 Evas_Coord y = (win_h / 2) - (h / 2); 63 Evas_Coord y = (win_h / 2) - (h / 2);
64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2); 64 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
65 (*itr).position_set(x, y); 65 img.position_set(x, y);
66 ++i;
66 } 67 }
67 FPS_STD(NAME); 68 FPS_STD(NAME);
68} 69}
diff --git a/src/bin/cxx/rect_blend.cc b/src/bin/cxx/rect_blend.cc
index ca34adc..09838f1 100644
--- a/src/bin/cxx/rect_blend.cc
+++ b/src/bin/cxx/rect_blend.cc
@@ -48,8 +48,7 @@ static void _cleanup()
48/* loop - do things */ 48/* loop - do things */
49static void _loop(double t, int f) 49static void _loop(double t, int f)
50{ 50{
51 auto itr = rectangles.begin(); 51 for (evas::image& img : images)
52 for (int i = 0; i < OBNUM; i++, ++itr)
53 { 52 {
54 Evas_Coord w0 = 80; 53 Evas_Coord w0 = 80;
55 Evas_Coord h0 = 80; 54 Evas_Coord h0 = 80;
@@ -60,8 +59,8 @@ static void _loop(double t, int f)
60 Evas_Coord y = (win_h / 2) - (h / 2); 59 Evas_Coord y = (win_h / 2) - (h / 2);
61 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 60 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
62 61
63 (*itr).evas::object::position_set(x, y); 62 img.evas::object::position_set(x, y);
64 (*itr).evas::object::size_set(w, h); 63 img.evas::object::size_set(w, h);
65 } 64 }
66 FPS_STD(NAME); 65 FPS_STD(NAME);
67} 66}
diff --git a/src/bin/cxx/rect_blend_few.cc b/src/bin/cxx/rect_blend_few.cc
index 6021616..18f4937 100644
--- a/src/bin/cxx/rect_blend_few.cc
+++ b/src/bin/cxx/rect_blend_few.cc
@@ -52,8 +52,8 @@ static void _cleanup(void)
52/* loop - do things */ 52/* loop - do things */
53static void _loop(double t, int f) 53static void _loop(double t, int f)
54{ 54{
55 auto itr = rectangles.begin(); 55 int i = 0;
56 for (int i = 0; i < OBNUM; i++, ++itr) 56 for (evas::rectangle& rec : rectangles)
57 { 57 {
58 Evas_Coord w0 = 80; 58 Evas_Coord w0 = 80;
59 Evas_Coord h0 = 80; 59 Evas_Coord h0 = 80;
@@ -63,8 +63,9 @@ static void _loop(double t, int f)
63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 63 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
64 Evas_Coord y = (win_h / 2) - (h / 2); 64 Evas_Coord y = (win_h / 2) - (h / 2);
65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 65 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
66 (*itr).evas::object::position_set(x, y); 66 rec.evas::object::position_set(x, y);
67 (*itr).evas::object::size_set(w, h); 67 rec.evas::object::size_set(w, h);
68 ++i;
68 } 69 }
69 FPS_STD(NAME); 70 FPS_STD(NAME);
70} 71}
diff --git a/src/bin/cxx/rect_blend_pow2.cc b/src/bin/cxx/rect_blend_pow2.cc
index cca68fb..9e7cf35 100644
--- a/src/bin/cxx/rect_blend_pow2.cc
+++ b/src/bin/cxx/rect_blend_pow2.cc
@@ -49,8 +49,8 @@ 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 auto itr = rectangles.begin(); 52 int i = 0;
53 for (int i = 0; i < OBNUM; i++, ++itr) 53 for (evas::image& img : images)
54 { 54 {
55 Evas_Coord w0 = 80; 55 Evas_Coord w0 = 80;
56 Evas_Coord h0 = 80; 56 Evas_Coord h0 = 80;
@@ -60,8 +60,9 @@ static void _loop(double t, int f)
60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 60 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
61 Evas_Coord y = (win_h / 2) - (h / 2); 61 Evas_Coord y = (win_h / 2) - (h / 2);
62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 62 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
63 (*itr).evas::object::position_set(x, y); 63 img.evas::object::position_set(x, y);
64 (*itr).evas::object::size_set(w, h); 64 img.evas::object::size_set(w, h);
65 ++i;
65 } 66 }
66 FPS_STD(NAME); 67 FPS_STD(NAME);
67} 68}
diff --git a/src/bin/cxx/rect_blend_pow2_few.cc b/src/bin/cxx/rect_blend_pow2_few.cc
index f514347..a81d57d 100644
--- a/src/bin/cxx/rect_blend_pow2_few.cc
+++ b/src/bin/cxx/rect_blend_pow2_few.cc
@@ -56,8 +56,8 @@ static void _cleanup(void)
56/* loop - do things */ 56/* loop - do things */
57static void _loop(double t, int f) 57static void _loop(double t, int f)
58{ 58{
59 auto itr = images.begin(); 59 int i = 0;
60 for (int i = 0; i < OBNUM; i++, ++itr) 60 for (evas::image& img : images)
61 { 61 {
62 Evas_Coord w0 = 80; 62 Evas_Coord w0 = 80;
63 Evas_Coord h0 = 80; 63 Evas_Coord h0 = 80;
@@ -67,8 +67,9 @@ static void _loop(double t, int f)
67 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 67 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
68 Evas_Coord y = (win_h / 2) - (h / 2); 68 Evas_Coord y = (win_h / 2) - (h / 2);
69 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 69 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
70 (*itr).evas::object::position_set(x, y); 70 img.evas::object::position_set(x, y);
71 (*itr).evas::object::size_set(w, h); 71 img.evas::object::size_set(w, h);
72 ++i;
72 } 73 }
73 FPS_STD(NAME); 74 FPS_STD(NAME);
74} 75}
diff --git a/src/bin/cxx/rect_solid.cc b/src/bin/cxx/rect_solid.cc
index 7f65d3f..05ddfaf 100644
--- a/src/bin/cxx/rect_solid.cc
+++ b/src/bin/cxx/rect_solid.cc
@@ -50,8 +50,8 @@ static void _cleanup(void)
50/* loop - do things */ 50/* loop - do things */
51static void _loop(double t, int f) 51static void _loop(double t, int f)
52{ 52{
53 auto itr = images.begin(); 53 int i = 0;
54 for (int i = 0; i < OBNUM; i++, ++itr) 54 for (evas::image& img : images)
55 { 55 {
56 Evas_Coord w0 = 80; 56 Evas_Coord w0 = 80;
57 Evas_Coord h0 = 80; 57 Evas_Coord h0 = 80;
@@ -61,8 +61,9 @@ static void _loop(double t, int f)
61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2); 61 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
62 Evas_Coord y = (win_h / 2) - (h / 2); 62 Evas_Coord y = (win_h / 2) - (h / 2);
63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2); 63 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
64 (*itr).evas::object::position_set(x, y); 64 img.evas::object::position_set(x, y);
65 (*itr).evas::object::size_set(w, h); 65 img.evas::object::size_set(w, h);
66 ++i;
66 } 67 }
67 FPS_STD(NAME); 68 FPS_STD(NAME);
68} 69}
diff --git a/src/bin/cxx/rect_solid_few.cc b/src/bin/cxx/rect_solid_few.cc
index 3e03e5d..47419d4 100644
--- a/src/bin/cxx/rect_solid_few.cc
+++ b/src/bin/cxx/rect_solid_few.cc
@@ -53,8 +53,8 @@ static void _cleanup(void)
53/* loop - do things */ 53/* loop - do things */
54static void _loop(double t, int f) 54static void _loop(double t, int f)
55{ 55{
56 auto itr = images.begin(); 56 int i = 0;
57 for (int i = 0; i < OBNUM; i++, ++itr) 57 for (evas::image& img : images)
58 { 58 {
59 Evas_Coord w0 = 80; 59 Evas_Coord w0 = 80;
60 Evas_Coord h0 = 80; 60 Evas_Coord h0 = 80;
@@ -64,8 +64,9 @@ static void _loop(double t, int f)
64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2); 64 x += sin((double)(f + (i * 113)) / (36.7 * SLOW)) * (w0 / 2);
65 Evas_Coord y = (win_h / 2) - (h / 2); 65 Evas_Coord y = (win_h / 2) - (h / 2);
66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2); 66 y += cos((double)(f + (i * 228)) / (43.8 * SLOW)) * (h0 / 2);
67 (*itr).evas::object::position_set(x, y); 67 img.evas::object::position_set(x, y);
68 (*itr).evas::object::size_set(w, h); 68 img.evas::object::size_set(w, h);
69 ++i;
69 } 70 }
70 FPS_STD(NAME); 71 FPS_STD(NAME);
71} 72}
diff --git a/src/bin/cxx/text_basic.cc b/src/bin/cxx/text_basic.cc
index 894e885..825e936 100644
--- a/src/bin/cxx/text_basic.cc
+++ b/src/bin/cxx/text_basic.cc
@@ -47,16 +47,17 @@ static void _cleanup(void)
47/* loop - do things */ 47/* loop - do things */
48static void _loop(double t, int f) 48static void _loop(double t, int f)
49{ 49{
50 auto itr = texts.begin(); 50 int i = 0;
51 for (int i = 0; i < OBNUM; i++, ++itr) 51 for (evas::text& text : texts)
52 { 52 {
53 Evas_Coord w = 0, h = 0; 53 Evas_Coord w = 0, h = 0;
54 (*itr).size_get(&w, &h); 54 text.size_get(&w, &h);
55 Evas_Coord x = (win_w / 2) - (w / 2); 55 Evas_Coord x = (win_w / 2) - (w / 2);
56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 56 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
57 Evas_Coord y = (win_h / 2) - (h / 2); 57 Evas_Coord y = (win_h / 2) - (h / 2);
58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 58 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
59 (*itr).evas::object::position_set(x, y); 59 text.evas::object::position_set(x, y);
60 ++i;
60 } 61 }
61 FPS_STD(NAME); 62 FPS_STD(NAME);
62} 63}
diff --git a/src/bin/cxx/text_change.cc b/src/bin/cxx/text_change.cc
index 53680b7..d7ae2f1 100644
--- a/src/bin/cxx/text_change.cc
+++ b/src/bin/cxx/text_change.cc
@@ -71,15 +71,14 @@ static void _loop(double t, int f)
71 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy", 71 "Am", "You", "Are", "Erogenous", "We", "Stick", "Wet", "Fishy",
72 "Fiddly", "Family", "Lair", "Monkeys", "Magazine" 72 "Fiddly", "Family", "Lair", "Monkeys", "Magazine"
73 }; 73 };
74 auto itr = texts.begin(); 74 for (evas::text& text : texts)
75 for (int i = 0; i < OBNUM; i++, ++itr)
76 { 75 {
77 snprintf(buf, sizeof(buf), "%s %s %s %s.", 76 snprintf(buf, sizeof(buf), "%s %s %s %s.",
78 strs[rnd() % (sizeof(strs) / sizeof(char *))], 77 strs[rnd() % (sizeof(strs) / sizeof(char *))],
79 strs[rnd() % (sizeof(strs) / sizeof(char *))], 78 strs[rnd() % (sizeof(strs) / sizeof(char *))],
80 strs[rnd() % (sizeof(strs) / sizeof(char *))], 79 strs[rnd() % (sizeof(strs) / sizeof(char *))],
81 strs[rnd() % (sizeof(strs) / sizeof(char *))]); 80 strs[rnd() % (sizeof(strs) / sizeof(char *))]);
82 (*itr).text_set(buf); 81 text.text_set(buf);
83 } 82 }
84 FPS_STD(NAME); 83 FPS_STD(NAME);
85} 84}
diff --git a/src/bin/cxx/text_styles_different_strings.cc b/src/bin/cxx/text_styles_different_strings.cc
index 21c303e..736c371 100644
--- a/src/bin/cxx/text_styles_different_strings.cc
+++ b/src/bin/cxx/text_styles_different_strings.cc
@@ -78,16 +78,17 @@ static void _cleanup(void)
78/* loop - do things */ 78/* loop - do things */
79static void _loop(double t, int f) 79static void _loop(double t, int f)
80{ 80{
81 auto itr = texts.begin(); 81 int i = 0;
82 for (int i = 0; i < OBNUM; i++, ++itr) 82 for (evas::text& text : texts)
83 { 83 {
84 Evas_Coord w, h; 84 Evas_Coord w, h;
85 (*itr).size_get(&w, &h); 85 text.size_get(&w, &h);
86 Evas_Coord x = (win_w / 2) - (w / 2); 86 Evas_Coord x = (win_w / 2) - (w / 2);
87 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2); 87 x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
88 Evas_Coord y = (win_h / 2) - (h / 2); 88 Evas_Coord y = (win_h / 2) - (h / 2);
89 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2); 89 y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (w / 2);
90 (*itr).evas::object::position_set(x, y); 90 text.evas::object::position_set(x, y);
91 ++i;
91 } 92 }
92 FPS_STD(NAME); 93 FPS_STD(NAME);
93} 94}