Compare commits

...

7 Commits

Author SHA1 Message Date
Jean-Philippe Andre 265cd51c33 UI main loop: Fix indentation 8 years ago
Jean-Philippe Andre 07cf495fe5 Fix support of --count from command line 8 years ago
Cedric BAIL 8a307d6666 fix wrong ordering of report. 9 years ago
Cedric BAIL 7ed2a93323 disable font effect when building for 1.9 also. 9 years ago
Cedric BAIL 49659c2e31 fix left over warning. 9 years ago
Cedric BAIL 1f6220aeb2 fix build for 1.9. 9 years ago
Cedric BAIL 02be606b21 fix build on 1.8.x branch. 9 years ago
  1. 2
      src/bin/about.c
  2. 2
      src/bin/expedite-cmp
  3. 10
      src/bin/font_effect_blur_alpha.c
  4. 11
      src/bin/font_effect_blur_color.c
  5. 2
      src/bin/image_blend_border.c
  6. 2
      src/bin/image_blend_border_recolor.c
  7. 2
      src/bin/image_blend_fade_pow2_unscaled.c
  8. 2
      src/bin/image_blend_fade_unscaled.c
  9. 2
      src/bin/image_blend_many_smooth_same_scaled.c
  10. 2
      src/bin/image_blend_nearest_same_scaled.c
  11. 2
      src/bin/image_blend_nearest_scaled.c
  12. 2
      src/bin/image_blend_nearest_solid_same_scaled.c
  13. 2
      src/bin/image_blend_nearest_solid_scaled.c
  14. 2
      src/bin/image_blend_occlude1.c
  15. 2
      src/bin/image_blend_occlude1_few.c
  16. 2
      src/bin/image_blend_occlude1_many.c
  17. 2
      src/bin/image_blend_occlude1_very_many.c
  18. 2
      src/bin/image_blend_occlude2.c
  19. 2
      src/bin/image_blend_occlude2_few.c
  20. 2
      src/bin/image_blend_occlude2_many.c
  21. 2
      src/bin/image_blend_occlude2_very_many.c
  22. 2
      src/bin/image_blend_occlude3.c
  23. 2
      src/bin/image_blend_occlude3_few.c
  24. 2
      src/bin/image_blend_occlude3_many.c
  25. 2
      src/bin/image_blend_occlude3_very_many.c
  26. 2
      src/bin/image_blend_smooth_same_scaled.c
  27. 2
      src/bin/image_blend_smooth_scaled.c
  28. 2
      src/bin/image_blend_smooth_solid_same_scaled.c
  29. 2
      src/bin/image_blend_smooth_solid_scaled.c
  30. 2
      src/bin/image_blend_solid_border.c
  31. 2
      src/bin/image_blend_solid_fade_pow2_unscaled.c
  32. 2
      src/bin/image_blend_solid_fade_unscaled.c
  33. 2
      src/bin/image_blend_solid_middle_border.c
  34. 2
      src/bin/image_blend_solid_middle_unscaled.c
  35. 2
      src/bin/image_blend_solid_unscaled.c
  36. 2
      src/bin/image_blend_unscaled.c
  37. 4
      src/bin/image_crossfade.c
  38. 6
      src/bin/image_data_argb.c
  39. 8
      src/bin/image_data_argb_alpha.c
  40. 4
      src/bin/image_data_ycbcr601pl.c
  41. 4
      src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c
  42. 4
      src/bin/image_data_ycbcr601pl_map_solid_rotate.c
  43. 4
      src/bin/image_data_ycbcr601pl_wide_stride.c
  44. 2
      src/bin/image_map_3d_1.c
  45. 2
      src/bin/image_map_3d_2.c
  46. 2
      src/bin/image_map_3d_3.c
  47. 2
      src/bin/image_map_3d_4.c
  48. 2
      src/bin/image_map_3d_5.c
  49. 2
      src/bin/image_map_3d_6.c
  50. 4
      src/bin/image_map_3d_flow.c
  51. 2
      src/bin/image_map_color_alpha_nearest_rotate.c
  52. 2
      src/bin/image_map_color_alpha_nearest_solid_rotate.c
  53. 2
      src/bin/image_map_color_alpha_rotate.c
  54. 2
      src/bin/image_map_color_alpha_solid_rotate.c
  55. 2
      src/bin/image_map_color_nearest_rotate.c
  56. 2
      src/bin/image_map_color_nearest_solid_rotate.c
  57. 2
      src/bin/image_map_color_rotate.c
  58. 2
      src/bin/image_map_color_solid_rotate.c
  59. 2
      src/bin/image_map_nearest_rotate.c
  60. 2
      src/bin/image_map_nearest_solid_rotate.c
  61. 2
      src/bin/image_map_rotate.c
  62. 2
      src/bin/image_map_solid_rotate.c
  63. 2
      src/bin/image_quality_scale.c
  64. 2
      src/bin/line_blend.c
  65. 2
      src/bin/main.c
  66. 3
      src/bin/main.h
  67. 2
      src/bin/poly_blend.c
  68. 8
      src/bin/proxy_image.c
  69. 4
      src/bin/proxy_image_offscreen.c
  70. 10
      src/bin/proxy_text_fixed.c
  71. 12
      src/bin/proxy_text_random.c
  72. 2
      src/bin/rect_blend.c
  73. 2
      src/bin/rect_blend_few.c
  74. 2
      src/bin/rect_blend_pow2.c
  75. 2
      src/bin/rect_blend_pow2_few.c
  76. 2
      src/bin/rect_solid.c
  77. 2
      src/bin/rect_solid_few.c
  78. 4
      src/bin/text_basic.c
  79. 6
      src/bin/text_change.c
  80. 4
      src/bin/text_styles.c
  81. 4
      src/bin/text_styles_different_strings.c
  82. 2
      src/bin/textblock_auto_align.c
  83. 2
      src/bin/textblock_basic.c
  84. 2
      src/bin/textblock_intl.c
  85. 8
      src/bin/textblock_text_append.c
  86. 79
      src/bin/ui.c
  87. 6
      src/bin/widgets_file_icons.c
  88. 6
      src/bin/widgets_file_icons_2.c
  89. 6
      src/bin/widgets_file_icons_2_grouped.c
  90. 6
      src/bin/widgets_file_icons_2_same.c
  91. 6
      src/bin/widgets_file_icons_2_same_grouped.c
  92. 6
      src/bin/widgets_file_icons_3.c
  93. 6
      src/bin/widgets_file_icons_4.c
  94. 6
      src/bin/widgets_list_1.c
  95. 6
      src/bin/widgets_list_1_grouped.c
  96. 6
      src/bin/widgets_list_2.c
  97. 6
      src/bin/widgets_list_2_grouped.c
  98. 8
      src/bin/widgets_list_3.c
  99. 8
      src/bin/widgets_list_3_grouped.c
  100. 8
      src/bin/widgets_list_4.c
  101. Some files were not shown because too many files have changed in this diff Show More

@ -8,7 +8,7 @@ _setup(void)
Evas_Object *o;
Evas_Textblock_Style *st;
o = eo_add(EVAS_TEXTBLOCK_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXTBLOCK_CLASS, evas);
eo_do(o, evas_obj_position_set(10, 40),
evas_obj_size_set(win_w - 20, win_h - 50),
evas_obj_visibility_set(EINA_TRUE));

@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python2
import sys
import os

@ -1,3 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 10
#undef FNAME
#undef NAME
#undef ICON
@ -98,3 +106,5 @@ void FNAME(void)
#undef FNAME
#undef NAME
#undef ICON
#endif

@ -1,3 +1,11 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <Evas.h>
#if EVAS_VERSION_MAJOR >= 1 && EVAS_VERSION_MINOR >= 10
#undef FNAME
#undef NAME
#undef ICON
@ -100,3 +108,6 @@ void FNAME(void)
#undef FNAME
#undef NAME
#undef ICON
#endif

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("pan.png"), NULL),

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
for (i = 0; i < OBNUM; i++)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
a = rnd()&0xff;
eo_do(o,

@ -25,7 +25,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < MANYNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
n = rnd() % 100;
w = 3 + ((n * (60 - 3)) / 100);

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i < (OBNUM / 2))
{

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i & 0x1)
{

@ -24,7 +24,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

@ -27,7 +27,7 @@ static void _setup(void)
srnd();
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
if (i > (OBNUM / 2))
{

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("frame.png"), NULL),

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -25,7 +25,7 @@ static void _setup(void)
{
int a;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("bar.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -23,7 +23,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -22,7 +22,7 @@ static void _setup(void)
{
Evas_Object *o;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[0] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im1.png"), NULL),
@ -30,7 +30,7 @@ static void _setup(void)
evas_obj_size_set(720, 420),
evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[1] = o;
eo_do(o,
evas_obj_image_file_set(build_path("im2.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -62,8 +62,8 @@ static void _loop(double t, int f)
evas_obj_position_set(x, y),
evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h),
data = evas_obj_image_data_get(1),
st = evas_obj_image_stride_get());
evas_obj_image_data_get(1, (void**) &data),
evas_obj_image_stride_get(&st));
st = st >> 2;
p = data;
for (y = 0; y < h; y++)

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -62,8 +62,8 @@ static void _loop(double t, int f)
evas_obj_position_set(x, y),
evas_obj_size_set(w, h),
evas_obj_image_fill_set(0, 0, w, h),
data = evas_obj_image_data_get(1),
st = evas_obj_image_stride_get());
evas_obj_image_data_get(1, (void**) &data),
evas_obj_image_stride_get(&st));
st = st >> 2;
p = data;
for (y = 0; y < h; y++)
@ -87,7 +87,7 @@ static void _loop(double t, int f)
p += (st - w);
}
eo_do(o_images[i],
evas_obj_image_data_set(data),
evas_obj_image_data_set((void*) data),
evas_obj_image_data_update_add( 0, 0, w, h));
}
FPS_STD(NAME);

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -65,7 +65,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
eo_do(o_images[i], evas_obj_image_data_set(data));
eo_do(o_images[i], evas_obj_image_data_set((void*)data));
}
done = 0;
}

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -66,7 +66,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
eo_do(o_images[i], evas_obj_image_data_set(data));
eo_do(o_images[i], evas_obj_image_data_set((void*) data));
}
done = 0;
}

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -65,7 +65,7 @@ static void _setup(void)
*lp = vp + (y * 320);
lp++;
}
eo_do(o_images[i], evas_obj_image_data_set(data));
eo_do(o_images[i], evas_obj_image_data_set((void*) data));
}
done = 0;
}

@ -27,7 +27,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_content_hint_set(EVAS_IMAGE_CONTENT_HINT_DYNAMIC),
@ -68,7 +68,7 @@ static void _setup(void)
lp++;
}
eo_do(o_images[i],
evas_obj_image_data_set(data),
evas_obj_image_data_set((void*)data),
evas_obj_image_data_update_add( 0, 0, 320, 480));
}
}

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "cube%i.png", i + 1);
eo_do(o,

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,

@ -54,7 +54,7 @@ _cube_new(Evas_Coord w, Evas_Coord h, Evas_Coord d)
{
Evas_Object *o;
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
c->side[i].o = o;
snprintf(buf, sizeof(buf), "im%i.png", (i % 2) + 1);
eo_do(o,

@ -29,7 +29,7 @@ static void _setup(void)
{
char buf[256];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,
@ -39,7 +39,7 @@ static void _setup(void)
evas_obj_image_smooth_scale_set(0),
evas_obj_visibility_set(EINA_TRUE));
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_reflec[i] = o;
snprintf(buf, sizeof(buf), "cube%i.png", (i % 6) + 1);
eo_do(o,

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < (OBNUM / 2); i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_file_set(build_path("image.png"), NULL),

@ -24,7 +24,7 @@ static void _setup(void)
Evas_Object *o;
for (i = 0; i < 1; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_file_set(build_path("tp.png"), NULL),
evas_obj_image_fill_set(0, 0, 640, 480),

@ -26,7 +26,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_LINE_CLASS, evas);
o = eo_add(EVAS_OBJ_LINE_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;

@ -9,6 +9,7 @@ const char *profile = "n800";
const char *choosen_engine = NULL;
int win_w = 720, win_h = 420;
int loops = LOOPS;
int one_test = 0;
Eina_Bool fullscreen = EINA_FALSE;
Eina_Bool cmp_report = EINA_FALSE;
@ -1322,6 +1323,7 @@ main(int argc, char **argv)
}
else if (test > 0)
{
one_test = 1;
ui_num(test);
}

@ -47,6 +47,7 @@ extern "C"
extern Evas *evas;
extern int win_w, win_h;
extern int loops;
extern int one_test;
extern const char *choosen_engine;
extern Eina_Bool fullscreen;
extern Eina_Bool cmp_report;
@ -92,8 +93,8 @@ int engine_abort(void);
{ \
double fps; \
fps = (double)f / t; \
ui_fps(fps); \
printf("%4.2f , %s\n", fps, x); \
ui_fps(fps); \
done = 1; \
}

@ -73,7 +73,7 @@ static void _setup(void)
{
int r, g, b, a;
o = eo_add(EVAS_POLYGON_CLASS, evas);
o = eo_add(EVAS_OBJ_POLYGON_CLASS, evas);
o_images[i] = o;
a = (rnd()&0xff) / 2;
r = ((rnd()&0xff) * a) / 255;

@ -22,7 +22,7 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o,
evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
@ -33,10 +33,12 @@ static void _setup(void)
for (i = 1; i < OBNUM; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
Eina_Bool tmp;
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o,
evas_obj_image_source_set(src),
evas_obj_image_source_set(src, &tmp),
evas_obj_size_set(120, 160),
evas_obj_image_fill_set(0,0,120,160),
evas_obj_visibility_set(EINA_TRUE));

@ -26,7 +26,7 @@ static void _setup(void)
int i;
Evas_Object *o,*src;
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
eo_do(o, evas_obj_image_file_set(build_path("logo.png"), NULL),
evas_obj_image_fill_set(0, 0, 120, 160),
evas_obj_size_set(120, 160),
@ -35,7 +35,7 @@ static void _setup(void)
for (i = 0; i < OBNUM / 2; i++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_images[i] = o;
eo_do(o, evas_obj_image_source_set(src, NULL),
evas_obj_size_set(120, 160),

@ -27,11 +27,11 @@ static void _setup(void)
st = EVAS_TEXT_STYLE_SHADOW;
for (i = 0; st <= EVAS_TEXT_STYLE_FAR_SOFT_SHADOW; i++)
{
o = eo_add(EVAS_TEXT_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[i] = o;
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set("This is a test string"),
evas_obj_text_text_set("This is a test string"),
evas_obj_text_style_set(st),
evas_obj_color_set(255, 255, 255, 255),
evas_obj_text_shadow_color_set(0, 0, 0, 24),
@ -45,10 +45,12 @@ static void _setup(void)
for ( ; i < OBNUM ; i ++)
{
Eina_Bool result;
s = o_texts[i % st];
o = eo_add(EVAS_IMAGE_CLASS, evas);
o = eo_add(EVAS_OBJ_IMAGE_CLASS, evas);
o_texts[i] = o;
eo_do(o, evas_obj_image_source_set(s));
eo_do(o, evas_obj_image_source_set(s, &result));
/* FIXME s == NULL*/
eo_do(s, evas_obj_size_get(&w, &h));
eo_do(o,

@ -30,7 +30,7 @@ static void _setup(void)
"Fiddly", "Family", "Lair", "Monkeys", "Magazine"
};
srnd();
o = eo_add(EVAS_TEXT_CLASS, evas);
o = eo_add(EVAS_OBJ_TEXT_CLASS, evas);
o_texts[0] = o;
snprintf(buf, sizeof(buf), "%s %s %s %s.",
strs[rnd() % (sizeof(strs) / sizeof(char *))],
@ -40,7 +40,7 @@ static void _setup(void)
eo_do(o,
evas_obj_text_font_set("Vera-Bold", 20),
evas_obj_text_set(buf),
evas_obj_text_text_set(buf),
evas_obj_color_set(0, 0, 0, 255),
evas_obj_size_get(&w, &h));
x = (win_w / 2) - (w / 2);
@ -52,10 +52,12 @@ static void _setup(void)
evas_obj_visibility_set(EINA_TRUE));
for (i = 1 ; i < OBNUM ; i ++)
{
o = eo_add(EVAS_IMAGE_CLASS, evas);
Eina_Bool result;