Added more image/C++ tests.

8 files changed, 433 insertions, 1 deletions

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1ce1509..c7c6ee4 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -40,10 +40,16 @@ cxx/image_blend_fade_unscaled.cc \
 cxx/image_blend_fade_unscaled_capi.h \
 image_blend_fade_pow2_unscaled.c \
 cxx/image_blend_fade_pow2_unscaled.cc \
-ocxx/image_blend_fade_pow2_unscaled_capi.h \
+cxx/image_blend_fade_pow2_unscaled_capi.h \
 image_blend_solid_unscaled.c \
+cxx/image_blend_solid_unscaled.cc \
+cxx/image_blend_solid_unscaled_capi.h \
 image_blend_solid_fade_unscaled.c \
+cxx/image_blend_solid_fade_unscaled.cc \
+cxx/image_blend_solid_fade_unscaled_capi.h \
 image_blend_solid_fade_pow2_unscaled.c \
+cxx/image_blend_solid_fade_pow2_unscaled.cc \
+cxx/image_blend_solid_fade_pow2_unscaled_capi.h \
 image_blend_nearest_scaled.c \
 image_blend_nearest_solid_scaled.c \
 image_blend_smooth_scaled.c \
@@ -60,6 +66,8 @@ cxx/image_blend_border_recolor.cc \
 cxx/image_blend_border_recolor_capi.h \
 image_blend_solid_middle_border.c \
 image_blend_solid_border.c \
+cxx/image_blend_solid_border.cc \
+cxx/image_blend_solid_border_acpi.h \
 image_map_rotate.c \
 image_map_solid_rotate.c \
 image_map_nearest_rotate.c \
diff --git a/src/bin/cxx/image_blend_solid_border.cc b/src/bin/cxx/image_blend_solid_border.cc
new file mode 100644
index 0000000..6b1f77e
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_border.cc
@@ -0,0 +1,106 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_solid_border_start
+#define NAME "Image Blend Solid Border"
+#define ICON "blend.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+static Evas_Object *o_images[OBNUM];
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < OBNUM; i++)
+     {
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
+        o_images[i] = o;
+        eo_do(o,
+              efl_file_set(build_path("frame.png"), NULL),
+              evas_obj_image_border_set(8, 8, 8, 8),
+              evas_obj_visibility_set(EINA_TRUE));
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h, w0, h0;
+   for (i = 0; i < OBNUM; i++)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW))) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW))) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+        eo_do(o_images[i],
+              evas_obj_position_set(x, y),
+              evas_obj_size_set(w, h),
+              evas_obj_image_fill_set(0, 0, w, h));
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/cxx/image_blend_solid_border_capi.h b/src/bin/cxx/image_blend_solid_border_capi.h
new file mode 100644
index 0000000..e8cae8c
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_border_capi.h
@@ -0,0 +1,34 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+
+/* metadata */
+#define FNAME image_blend_solid_border_cxx_start
+#define NAME "Image Blend Solid Border (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
diff --git a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
new file mode 100644
index 0000000..1967554
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled.cc
@@ -0,0 +1,108 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_solid_fade_pow2_unscaled_start
+#define NAME "Image Blend Solid Fade Power 2 Unscaled"
+#define ICON "blend.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+static Evas_Object *o_images[OBNUM];
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < OBNUM; i++)
+     {
+        int a;
+
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
+        o_images[i] = o;
+        eo_do(o,
+              efl_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160));
+        a = 256 - (1 << ((rnd() % 8) + 1));
+        if (a < 128) a = 128;
+        eo_do(o,
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h;
+   for (i = 0; i < OBNUM; i++)
+     {
+        w = 120;
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/cxx/image_blend_solid_fade_pow2_unscaled_capi.h b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled_capi.h
new file mode 100644
index 0000000..11203c8
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_fade_pow2_unscaled_capi.h
@@ -0,0 +1,33 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_solid_fade_pow2_unscaled_cxx_start
+#define NAME "Image Blend Solid Fade Power 2 Unscaled (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
+
diff --git a/src/bin/cxx/image_blend_solid_fade_unscaled.cc b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
new file mode 100644
index 0000000..bb09de2
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_fade_unscaled.cc
@@ -0,0 +1,107 @@
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_solid_fade_unscaled_start
+#define NAME "Image Blend Solid Fade Unscaled"
+#define ICON "blend.png"
+
+#ifndef PROTO
+# ifndef UI
+#  include "main.h"
+
+/* standard var */
+static int done = 0;
+/* private data */
+static Evas_Object *o_images[OBNUM];
+
+/* setup */
+static void _setup(void)
+{
+   int i;
+   Evas_Object *o;
+   for (i = 0; i < OBNUM; i++)
+     {
+        int a;
+
+        o = eo_add(EVAS_IMAGE_CLASS, G_evas);
+        o_images[i] = o;
+        eo_do(o,
+              efl_file_set(build_path("image.png"), NULL),
+              evas_obj_image_fill_set(0, 0, 120, 160),
+              evas_obj_size_set(120, 160));
+        a = rnd()&0xff;
+        eo_do(o,
+              evas_obj_color_set(a, a, a, a),
+              evas_obj_visibility_set(EINA_TRUE));
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   int i;
+   for (i = 0; i < OBNUM; i++) eo_del(o_images[i]);
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i;
+   Evas_Coord x, y, w, h;
+   for (i = 0; i < OBNUM; i++)
+     {
+        w = 120;
+        h = 160;
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h / 2);
+        eo_do(o_images[i], evas_obj_position_set(x, y));
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
+
+
+
+
+
+
+
+
+
+
+
+
+/* template stuff - ignore */
+# endif
+#endif
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef PROTO
+# ifndef UI
+void FNAME(void)
+{
+   ui_func_set(_key, _loop);
+   _setup();
+}
+# endif
+#endif
+#undef FNAME
+#undef NAME
+#undef ICON
diff --git a/src/bin/cxx/image_blend_solid_fade_unscaled_capi.h b/src/bin/cxx/image_blend_solid_fade_unscaled_capi.h
new file mode 100644
index 0000000..b2b4ee0
--- /dev/null
+++ b/src/bin/cxx/image_blend_solid_fade_unscaled_capi.h
@@ -0,0 +1,32 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_solid_fade_unscaled_cxx_start
+#define NAME "Image Blend Solid Fade Unscaled (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/bin/tests.h b/src/bin/tests.h
index 936bf46..22c39a9 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -9,6 +9,10 @@ extern "C" {
 #include "cxx/image_blend_border_capi.h"
 #include "cxx/image_blend_border_recolor_capi.h"
 
+#include "cxx/image_blend_solid_border_capi.h"
+#include "cxx/image_blend_solid_fade_pow2_unscaled_capi.h"
+#include "cxx/image_blend_solid_fade_unscaled_capi.h"
+
 // C tests
 /* #include "widgets_file_icons.c" */
 /* #include "widgets_file_icons_2.c" */