October 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 1b12b87ffd658031b16cd398bbf7a38637d774ce
by metan 31 Oct '12

31 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 1b12b87ffd658031b16cd398bbf7a38637d774ce (commit) from 5fb7aa901f930330ad55c1441a96869424d3c3c7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/1b12b87ffd658031b16cd398bbf7a38637d7… commit 1b12b87ffd658031b16cd398bbf7a38637d774ce Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 19:38:02 2012 +0100 tests: gfx: Add very basic tests for Line. diff --git a/tests/gfx/Line.c b/tests/gfx/Line.c new file mode 100644 index 0000000..5821b25 --- /dev/null +++ b/tests/gfx/Line.c @@ -0,0 +1,133 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#include <core/GP_Context.h> +#include <gfx/GP_Line.h> + +#include "tst_test.h" + +#include "common.h" + +static const char line_5_5_5_5_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char line_1_5_9_5_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char line_0_0_10_10_11x11[] = { + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, +}; + +static int test_line(const char *pattern, GP_Size w, GP_Size h, + GP_Coord x0, GP_Coord y0, GP_Coord x1, GP_Coord y1) +{ + GP_Context *c; + int err; + + c = GP_ContextAlloc(w, h, GP_PIXEL_G8); + + if (c == NULL) { + tst_report(0, "Failed to allocate context"); + return TST_UNTESTED; + } + + /* zero the pixels buffer */ + memset(c->pixels, 0, c->w * c->h); + + GP_Line(c, x0, y0, x1, y1, 1); + + err = compare_buffers(pattern, c); + + if (err) { + tst_report(0, "Patterns are different"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +static int test_line_5_5_5_5(void) +{ + return test_line(line_5_5_5_5_11x11, 11, 11, 5, 5, 5, 5); +} + +static int test_line_1_5_9_5(void) +{ + return test_line(line_1_5_9_5_11x11, 11, 11, 1, 5, 9, 5); +} + +static int test_line_0_0_10_10(void) +{ + return test_line(line_0_0_10_10_11x11, 11, 11, 0, 0, 10, 10); +} + +static int test_line__1__1_11_11(void) +{ + return test_line(line_0_0_10_10_11x11, 11, 11, -1, -1, 11, 11); +} + +const struct tst_suite tst_suite = { + .suite_name = "GFX Line Testsuite", + .tests = { + {.name = "Line 5x5 - 5x5", .tst_fn = test_line_5_5_5_5}, + {.name = "Line 1x5 - 9x5", .tst_fn = test_line_1_5_9_5}, + {.name = "Line 0x0 - 10x10", .tst_fn = test_line_0_0_10_10}, + {.name = "Line -1x-1 - 11x11", .tst_fn = test_line__1__1_11_11}, + {.name = NULL} + } +}; diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index 4cbf36a..d3c9b0e 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,9 +3,10 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=gfx_benchmark Circle CircleSeg +APPS=gfx_benchmark Circle Line CircleSeg Circle: common.o +Line: common.o CircleSeg: common.o include ../tests.mk diff --git a/tests/gfx/runtest.sh b/tests/gfx/runtest.sh index e9ba8ef..bcef95e 100755 --- a/tests/gfx/runtest.sh +++ b/tests/gfx/runtest.sh @@ -11,4 +11,5 @@ export LIBC_FATAL_STDERR_=1 #LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./gfx_benchmark "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Circle "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Line "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./CircleSeg "$@" ----------------------------------------------------------------------- Summary of changes: tests/gfx/{Circle.c => Line.c} | 104 +++++++++++----------------------------- tests/gfx/Makefile | 3 +- tests/gfx/runtest.sh | 1 + 3 files changed, 32 insertions(+), 76 deletions(-) copy tests/gfx/{Circle.c => Line.c} (55%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 5fb7aa901f930330ad55c1441a96869424d3c3c7
by metan 31 Oct '12

31 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 5fb7aa901f930330ad55c1441a96869424d3c3c7 (commit) via 1f78ab9179ac3d887fea911e05418de46be3bbfe (commit) via 8cc879f18c8ac80554a923ed3c4d7587402d974a (commit) from ff0706d61e00ba22fcb83e4902461b1832ab1023 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/5fb7aa901f930330ad55c1441a96869424d3… commit 5fb7aa901f930330ad55c1441a96869424d3c3c7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 19:18:00 2012 +0100 gfx: algo: Fix negative and zero radius for CircleSeg. diff --git a/libs/gfx/algo/CircleSeg.algo.h b/libs/gfx/algo/CircleSeg.algo.h index dc176a3..0b3931b 100644 --- a/libs/gfx/algo/CircleSeg.algo.h +++ b/libs/gfx/algo/CircleSeg.algo.h @@ -74,10 +74,21 @@ * FN_NAME - name of the function to be defined */ #define DEF_CIRCLE_SEG_FN(FN_NAME, CONTEXT_T, PIXVAL_T, PUTPIXEL) -void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, unsigned int r, +void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, int r, uint8_t seg_flags, PIXVAL_T pixval) { int x, y, error; ++ /* Special case for r == 0 */ + if (r == 0) { + if (seg_flags) + PUTPIXEL(context, xcenter, ycenter, pixval); + return; + } ++ /* Clip negative r */ + r = r < 0 ? -r : r; + for (x = 0, error = -r, y = r; y >= 0; y--) { /* Iterate X until we can pass to the next line. */ http://repo.or.cz/w/gfxprim.git/commit/1f78ab9179ac3d887fea911e05418de46be3… commit 1f78ab9179ac3d887fea911e05418de46be3bbfe Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 19:17:39 2012 +0100 tests: gfx: Add tests for CircleSeg. diff --git a/tests/gfx/CircleSeg.c b/tests/gfx/CircleSeg.c new file mode 100644 index 0000000..69767ec --- /dev/null +++ b/tests/gfx/CircleSeg.c @@ -0,0 +1,257 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#include <core/GP_Context.h> +#include <gfx/GP_CircleSeg.h> + +#include "tst_test.h" + +#include "common.h" + +static const char circle_empty_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_0_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_1_s_1_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_1_s_2_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_1_s_3_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_1_s_4_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_2_s_1_2_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_2_s_1_3_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_2_s_1_4_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static int test_circle(const char *pattern, GP_Size w, GP_Size h, + GP_Coord x, GP_Coord y, const int r, uint8_t seg_flag) +{ + GP_Context *c; + int err; + + c = GP_ContextAlloc(w, h, GP_PIXEL_G8); + + if (c == NULL) { + tst_report(0, "Failed to allocate context"); + return TST_UNTESTED; + } + + /* zero the pixels buffer */ + memset(c->pixels, 0, c->w * c->h); + + GP_CircleSeg(c, x, y, r, seg_flag, 1); + + err = compare_buffers(pattern, c); + + if (err) { + tst_report(0, "Patterns are different"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +static int test_circle_r_0_s_1(void) +{ + return test_circle(circle_r_0_11x11, 11, 11, 5, 5, 0, GP_CIRCLE_SEG1); +} + +static int test_circle_r_0_s_0(void) +{ + return test_circle(circle_empty_11x11, 11, 11, 5, 5, 0, 0); +} + +static int test_circle_r_1_s_1(void) +{ + return test_circle(circle_r_1_s_1_11x11, 11, 11, 5, 5, 1, GP_CIRCLE_SEG1); +} + +static int test_circle_r_1_s_2(void) +{ + return test_circle(circle_r_1_s_2_11x11, 11, 11, 5, 5, 1, GP_CIRCLE_SEG2); +} + +static int test_circle_r_1_s_3(void) +{ + return test_circle(circle_r_1_s_3_11x11, 11, 11, 5, 5, 1, GP_CIRCLE_SEG3); +} + +static int test_circle_r_1_s_4(void) +{ + return test_circle(circle_r_1_s_4_11x11, 11, 11, 5, 5, 1, GP_CIRCLE_SEG4); +} + +static int test_circle_r_2_s_1_2(void) +{ + return test_circle(circle_r_2_s_1_2_11x11, 11, 11, 5, 5, 2, + GP_CIRCLE_SEG1|GP_CIRCLE_SEG2); +} + +static int test_circle_r_2_s_1_3(void) +{ + return test_circle(circle_r_2_s_1_3_11x11, 11, 11, 5, 5, 2, + GP_CIRCLE_SEG1|GP_CIRCLE_SEG3); +} + +static int test_circle_r_2_s_1_4(void) +{ + return test_circle(circle_r_2_s_1_4_11x11, 11, 11, 5, 5, 2, + GP_CIRCLE_SEG1|GP_CIRCLE_SEG4); +} + +static int test_circle_r__2_s_1_3(void) +{ + return test_circle(circle_r_2_s_1_3_11x11, 11, 11, 5, 5, -2, + GP_CIRCLE_SEG1|GP_CIRCLE_SEG3); +} + +const struct tst_suite tst_suite = { + .suite_name = "GFX CircleSeg Testsuite", + .tests = { + {.name = "CircleSeg Seg0 r=0", .tst_fn = test_circle_r_0_s_0}, + {.name = "CircleSeg Seg1 r=0", .tst_fn = test_circle_r_0_s_1}, + {.name = "CircleSeg Seg1 r=1", .tst_fn = test_circle_r_1_s_1}, + {.name = "CircleSeg Seg2 r=1", .tst_fn = test_circle_r_1_s_2}, + {.name = "CircleSeg Seg3 r=1", .tst_fn = test_circle_r_1_s_3}, + {.name = "CircleSeg Seg4 r=1", .tst_fn = test_circle_r_1_s_4}, + {.name = "CircleSeg Seg1|2 r=2", .tst_fn = test_circle_r_2_s_1_2}, + {.name = "CircleSeg Seg1|3 r=2", .tst_fn = test_circle_r_2_s_1_3}, + {.name = "CircleSeg Seg1|4 r=2", .tst_fn = test_circle_r_2_s_1_4}, + {.name = "CircleSeg Seg1|3 r=-2", .tst_fn = test_circle_r__2_s_1_3}, + {.name = NULL} + } +}; diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index aa601b9..4cbf36a 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,9 +3,10 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=gfx_benchmark Circle +APPS=gfx_benchmark Circle CircleSeg Circle: common.o +CircleSeg: common.o include ../tests.mk diff --git a/tests/gfx/runtest.sh b/tests/gfx/runtest.sh index 6761955..e9ba8ef 100755 --- a/tests/gfx/runtest.sh +++ b/tests/gfx/runtest.sh @@ -11,3 +11,4 @@ export LIBC_FATAL_STDERR_=1 #LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./gfx_benchmark "$@" LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Circle "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./CircleSeg "$@" http://repo.or.cz/w/gfxprim.git/commit/8cc879f18c8ac80554a923ed3c4d7587402d… commit 8cc879f18c8ac80554a923ed3c4d7587402d974a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 18:46:33 2012 +0100 tests: gfx: Move common code to file. diff --git a/tests/gfx/Circle.c b/tests/gfx/Circle.c index 0482e99..d159632 100644 --- a/tests/gfx/Circle.c +++ b/tests/gfx/Circle.c @@ -29,6 +29,8 @@ #include "tst_test.h" +#include "common.h" + static const char circle_r_0_11x11[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -99,45 +101,6 @@ static const char circle_r_5_half_11x11[] = { 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, }; -static void dump_buffer(const char *pattern, int x, int y) -{ - int i, j; - - for (i = 0; i < y; i++) { - for (j = 0; j < x; j++) - printf("%2x ", pattern[j + i * y]); - printf("n"); - } -} - -static void dump_buffers(const char *pattern, const GP_Context *c) -{ - printf("Expected patternn"); - dump_buffer(pattern, c->w, c->h); - printf("Rendered patternn"); - dump_buffer((char*)c->pixels, c->w, c->h); -} - -static int compare_buffers(const char *pattern, const GP_Context *c) -{ - GP_Size x, y; - int err = 0; - - for (x = 0; x < c->w; x++) { - for (y = 0; y < c->h; y++) { - if (pattern[x + y * c->h] != - ((char*)c->pixels)[x + y * c->h]) { - err++; - } - } - } - - if (err) - dump_buffers(pattern, c); - - return err; -} - static int test_circle(const char *pattern, GP_Size w, GP_Size h, GP_Coord x, GP_Coord y, const int r) { diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index 15c1984..aa601b9 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -5,6 +5,8 @@ CSOURCES=$(shell echo *.c) APPS=gfx_benchmark Circle +Circle: common.o + include ../tests.mk include $(TOPDIR)/app.mk diff --git a/tests/gfx/common.c b/tests/gfx/common.c new file mode 100644 index 0000000..d261dfd --- /dev/null +++ b/tests/gfx/common.c @@ -0,0 +1,64 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <stdio.h> + +#include "common.h" + +static void dump_buffer(const char *pattern, int x, int y) +{ + int i, j; + + for (i = 0; i < y; i++) { + for (j = 0; j < x; j++) + printf("%2x ", pattern[j + i * y]); + printf("n"); + } +} + +void dump_buffers(const char *pattern, const GP_Context *c) +{ + printf("Expected patternn"); + dump_buffer(pattern, c->w, c->h); + printf("Rendered patternn"); + dump_buffer((char*)c->pixels, c->w, c->h); +} + +int compare_buffers(const char *pattern, const GP_Context *c) +{ + GP_Size x, y; + int err = 0; + + for (x = 0; x < c->w; x++) { + for (y = 0; y < c->h; y++) { + if (pattern[x + y * c->h] != + ((char*)c->pixels)[x + y * c->h]) { + err++; + } + } + } + + if (err) + dump_buffers(pattern, c); + + return err; +} diff --git a/tests/gfx/common.h b/tests/gfx/common.h new file mode 100644 index 0000000..65b9d19 --- /dev/null +++ b/tests/gfx/common.h @@ -0,0 +1,32 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#ifndef __COMMON_H__ +#define __COMMON_H__ + +#include <core/GP_Context.h> + +void dump_buffers(const char *pattern, const GP_Context *c); + +int compare_buffers(const char *pattern, const GP_Context *c); + +#endif /* __COMMON_H__ */ ----------------------------------------------------------------------- Summary of changes: libs/gfx/algo/CircleSeg.algo.h | 13 +- tests/gfx/Circle.c | 41 +--- tests/gfx/CircleSeg.c | 257 ++++++++++++++++++++ tests/gfx/Makefile | 5 +- .../loaders_example.c => tests/gfx/common.c | 59 +++--- include/input/GP_Input.h => tests/gfx/common.h | 15 +- tests/gfx/runtest.sh | 1 + 7 files changed, 315 insertions(+), 76 deletions(-) create mode 100644 tests/gfx/CircleSeg.c copy demos/c_simple/loaders_example.c => tests/gfx/common.c (70%) copy include/input/GP_Input.h => tests/gfx/common.h (88%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: ff0706d61e00ba22fcb83e4902461b1832ab1023
by metan 31 Oct '12

31 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via ff0706d61e00ba22fcb83e4902461b1832ab1023 (commit) from d0453af494e305191b9d85f6f35fbc06b828d61d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/ff0706d61e00ba22fcb83e4902461b1832ab… commit ff0706d61e00ba22fcb83e4902461b1832ab1023 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 18:30:59 2012 +0100 gfx: algo: Fix negative and zero radius for Circle The gfx prototypes are not correct though. diff --git a/libs/gfx/algo/Circle.algo.h b/libs/gfx/algo/Circle.algo.h index f5f5acc..76deb83 100644 --- a/libs/gfx/algo/Circle.algo.h +++ b/libs/gfx/algo/Circle.algo.h @@ -74,10 +74,20 @@ * FN_NAME - name of the function to be defined */ #define DEF_CIRCLE_FN(FN_NAME, CONTEXT_T, PIXVAL_T, PUTPIXEL) -void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, unsigned int r, +void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, int r, PIXVAL_T pixval) { int x, y, error; ++ /* Special case for r == 0 */ + if (r == 0) { + PUTPIXEL(context, xcenter, ycenter, pixval); + return; + } ++ /* Clip negative r */ + r = r < 0 ? -r : r; + for (x = 0, error = -r, y = r; y >= 0; y--) { /* Iterate X until we can pass to the next line. */ ----------------------------------------------------------------------- Summary of changes: libs/gfx/algo/Circle.algo.h | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: d0453af494e305191b9d85f6f35fbc06b828d61d
by metan 31 Oct '12

31 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via d0453af494e305191b9d85f6f35fbc06b828d61d (commit) from a74fce450b62265d5dc4b80f43a89bfeb570e271 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/d0453af494e305191b9d85f6f35fbc06b828… commit d0453af494e305191b9d85f6f35fbc06b828d61d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Oct 31 18:13:50 2012 +0100 tests: gfx: Basic tests for a circle. diff --git a/tests/gfx/Circle.c b/tests/gfx/Circle.c new file mode 100644 index 0000000..0482e99 --- /dev/null +++ b/tests/gfx/Circle.c @@ -0,0 +1,216 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> +#include <errno.h> +#include <sys/stat.h> + +#include <core/GP_Context.h> +#include <gfx/GP_Circle.h> + +#include "tst_test.h" + +static const char circle_r_0_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_1_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_2_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_3_11x11[] = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, + 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static const char circle_r_5_half_11x11[] = { + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, +}; + +static void dump_buffer(const char *pattern, int x, int y) +{ + int i, j; + + for (i = 0; i < y; i++) { + for (j = 0; j < x; j++) + printf("%2x ", pattern[j + i * y]); + printf("n"); + } +} + +static void dump_buffers(const char *pattern, const GP_Context *c) +{ + printf("Expected patternn"); + dump_buffer(pattern, c->w, c->h); + printf("Rendered patternn"); + dump_buffer((char*)c->pixels, c->w, c->h); +} + +static int compare_buffers(const char *pattern, const GP_Context *c) +{ + GP_Size x, y; + int err = 0; + + for (x = 0; x < c->w; x++) { + for (y = 0; y < c->h; y++) { + if (pattern[x + y * c->h] != + ((char*)c->pixels)[x + y * c->h]) { + err++; + } + } + } + + if (err) + dump_buffers(pattern, c); + + return err; +} + +static int test_circle(const char *pattern, GP_Size w, GP_Size h, + GP_Coord x, GP_Coord y, const int r) +{ + GP_Context *c; + int err; + + c = GP_ContextAlloc(w, h, GP_PIXEL_G8); + + if (c == NULL) { + tst_report(0, "Failed to allocate context"); + return TST_UNTESTED; + } + + /* zero the pixels buffer */ + memset(c->pixels, 0, c->w * c->h); + + GP_Circle(c, x, y, r, 1); + + err = compare_buffers(pattern, c); + + if (err) { + tst_report(0, "Patterns are different"); + return TST_FAILED; + } + + return TST_SUCCESS; +} + +static int test_circle_r_0(void) +{ + return test_circle(circle_r_0_11x11, 11, 11, 5, 5, 0); +} + +static int test_circle_r_1(void) +{ + return test_circle(circle_r_1_11x11, 11, 11, 5, 5, 1); +} + +static int test_circle_r_2(void) +{ + return test_circle(circle_r_2_11x11, 11, 11, 5, 5, 2); +} + +static int test_circle_r_3(void) +{ + return test_circle(circle_r_3_11x11, 11, 11, 5, 5, 3); +} + +static int test_circle_r__1(void) +{ + return test_circle(circle_r_1_11x11, 11, 11, 5, 5, -1); +} + +static int test_circle_r__2(void) +{ + return test_circle(circle_r_2_11x11, 11, 11, 5, 5, -2); +} + +static int test_circle_r_5_half(void) +{ + return test_circle(circle_r_5_half_11x11, 11, 11, 0, 5, 5); +} + +const struct tst_suite tst_suite = { + .suite_name = "GFX Circle Testsuite", + .tests = { + {.name = "Circle r=0", .tst_fn = test_circle_r_0}, + {.name = "Circle r=1", .tst_fn = test_circle_r_1}, + {.name = "Circle r=2", .tst_fn = test_circle_r_2}, + {.name = "Circle r=3", .tst_fn = test_circle_r_3}, + {.name = "Circle r=5 half", .tst_fn = test_circle_r_5_half}, + {.name = "Circle r=-1", .tst_fn = test_circle_r__1}, + {.name = "Circle r=-2", .tst_fn = test_circle_r__2}, + {.name = NULL} + } +}; diff --git a/tests/gfx/Makefile b/tests/gfx/Makefile index 71e9223..15c1984 100644 --- a/tests/gfx/Makefile +++ b/tests/gfx/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/pre.mk CSOURCES=$(shell echo *.c) -APPS=gfx_benchmark +APPS=gfx_benchmark Circle include ../tests.mk diff --git a/tests/gfx/runtest.sh b/tests/gfx/runtest.sh index 71a411b..6761955 100755 --- a/tests/gfx/runtest.sh +++ b/tests/gfx/runtest.sh @@ -9,4 +9,5 @@ # export LIBC_FATAL_STDERR_=1 -LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./gfx_benchmark "$@" +#LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./gfx_benchmark "$@" +LD_PRELOAD=`pwd`/../framework/libtst_preload.so LD_LIBRARY_PATH=../../build/ ./Circle "$@" ----------------------------------------------------------------------- Summary of changes: tests/gfx/Circle.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++ tests/gfx/Makefile | 2 +- tests/gfx/runtest.sh | 3 +- 3 files changed, 219 insertions(+), 2 deletions(-) create mode 100644 tests/gfx/Circle.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: a74fce450b62265d5dc4b80f43a89bfeb570e271
by metan 30 Oct '12

30 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via a74fce450b62265d5dc4b80f43a89bfeb570e271 (commit) from 8701e8765185f90507ff6a02c03fcf0c22ae1e8f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/a74fce450b62265d5dc4b80f43a89bfeb570… commit a74fce450b62265d5dc4b80f43a89bfeb570e271 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Oct 30 22:25:02 2012 +0100 tests: Remove pixeltests. diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 6985861..35a76e1 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -7,7 +7,7 @@ LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL ifeq ($(HAVE_LIBSDL),yes) CSOURCES=$(shell echo *.c) -APPS=pixeltest fonttest+APPS=fonttest symbolstest textaligntest blittest subcontext aatest mixpixeltest endif diff --git a/tests/SDL/pixeltest.c b/tests/SDL/pixeltest.c deleted file mode 100644 index 6d7ccf0..0000000 --- a/tests/SDL/pixeltest.c +++ /dev/null @@ -1,169 +0,0 @@ -/***************************************************************************** - * This file is part of gfxprim library. * - * * - * Gfxprim is free software; you can redistribute it and/or * - * modify it under the terms of the GNU Lesser General Public * - * License as published by the Free Software Foundation; either * - * version 2.1 of the License, or (at your option) any later version. * - * * - * Gfxprim is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with gfxprim; if not, write to the Free Software * - * Foundation, Inc., 51 Franklin Street, Fifth Floor, * - * Boston, MA 02110-1301 USA * - * * - * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <SDL/SDL.h> - -#include "GP.h" -#include "GP_SDL.h" - -/* The surface used as a display (in fact it is a software surface). */ -SDL_Surface *display = NULL; -GP_Context context; - -/* Timer used for refreshing the display */ -SDL_TimerID timer; - -/* An event used for signaling that the timer was triggered. */ -SDL_UserEvent timer_event; - -/* Values for color pixels in display format. */ -GP_Pixel red_pixel, green_pixel, blue_pixel, white_pixel; - -Uint32 timer_callback(__attribute__((unused)) Uint32 interval, - __attribute__((unused)) void *param) -{ - timer_event.type = SDL_USEREVENT; - SDL_PushEvent((SDL_Event *) &timer_event); - return 30; -} - -void draw_pixel(void) -{ - GP_Pixel pixel; - int x = random() % 320; - int y = random() % 240; - - pixel = GP_GetPixel(&context, x, y); - - if (pixel == blue_pixel) { - GP_PutPixel(&context, x, y, green_pixel); - } - else if (pixel == red_pixel) { - GP_PutPixel(&context, x, y, white_pixel); - } - else { - if (x < 160) { - GP_PutPixel(&context, x, y, blue_pixel); - } else { - GP_PutPixel(&context, x, y, red_pixel); - } - } -} - -void draw_pixels(void) -{ - SDL_LockSurface(display); - - /* Draw some pixels (exact number is not important). */ - int i; - for (i = 0; i < 30; i++) - draw_pixel(); - - SDL_UnlockSurface(display); -} - -void event_loop(void) -{ - SDL_Event event; - - while (SDL_WaitEvent(&event) > 0) { - switch (event.type) { - case SDL_USEREVENT: - draw_pixels(); - SDL_Flip(display); - break; - case SDL_KEYDOWN: - case SDL_QUIT: - return; - } - } -} - -int main(int argc, char **argv) -{ - int display_bpp = 0; - - int i; - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-16") == 0) { - display_bpp = 16; - } else if (strcmp(argv[i], "-24") == 0) { - display_bpp = 24; - } - } - - /* Initialize SDL */ - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - fprintf(stderr, "Could not initialize SDL: %sn", SDL_GetError()); - return 1; - } - - /* Create a window with a software back surface */ - display = SDL_SetVideoMode(320, 240, display_bpp, SDL_SWSURFACE); - if (display == NULL) { - fprintf(stderr, "Could not open display: %sn", SDL_GetError()); - goto fail; - } - - - /* Print basic information about the surface */ - printf("Display surface properties:n"); - printf(" width: %4d, height: %4d, pitch: %4dn", - display->w, display->h, display->pitch); - printf(" bits per pixel: %2d, bytes per pixel: %2dn", - display->format->BitsPerPixel, display->format->BytesPerPixel); - - /* Set up a clipping rectangle to test proper clipping of pixels */ - SDL_Rect clip_rect = {10, 10, 300, 220}; - SDL_SetClipRect(display, &clip_rect); - - GP_SDL_ContextFromSurface(&context, display); - - /* Load pixel values compatible with the display. */ - red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); - green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, &context); - blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); - white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &context); - - /* Set up the refresh timer */ - timer = SDL_AddTimer(30, timer_callback, NULL); - if (timer == 0) { - fprintf(stderr, "Could not set up timer: %sn", SDL_GetError()); - goto fail; - } - - /* Enter the event loop */ - event_loop(); - - /* We're done */ - SDL_Quit(); - return 0; - -fail: - SDL_Quit(); - return 1; -} ----------------------------------------------------------------------- Summary of changes: tests/SDL/Makefile | 2 +- tests/SDL/pixeltest.c | 169 ------------------------------------------------- 2 files changed, 1 insertions(+), 170 deletions(-) delete mode 100644 tests/SDL/pixeltest.c repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 8701e8765185f90507ff6a02c03fcf0c22ae1e8f
by metan 30 Oct '12

30 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 8701e8765185f90507ff6a02c03fcf0c22ae1e8f (commit) from 3f35d87f9ab132a5e60d3c6d7d8324af2da43653 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/8701e8765185f90507ff6a02c03fcf0c22ae… commit 8701e8765185f90507ff6a02c03fcf0c22ae1e8f Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Oct 30 22:22:16 2012 +0100 tests, demos: Port randomshapetest to backends. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index f703dd1..042c208 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -9,7 +9,7 @@ LDLIBS+=-lrt `$(TOPDIR)/gfxprim-config --libs --libs-backends` APPS=backend_example loaders_example loaders filters_symmetry gfx_koch virtual_backend_example meta_data meta_data_dump tmp_file showimage v4l2_show v4l2_grab convolution weighted_median shapetest koch input- fileview linetest + fileview linetest randomshapetest v4l2_show: LDLIBS+=-lGP_grabbers v4l2_grab: LDLIBS+=-lGP_grabbers diff --git a/tests/SDL/randomshapetest.c b/demos/c_simple/randomshapetest.c similarity index 50% rename from tests/SDL/randomshapetest.c rename to demos/c_simple/randomshapetest.c index f7c8939..b699348 100644 --- a/tests/SDL/randomshapetest.c +++ b/demos/c_simple/randomshapetest.c @@ -19,40 +19,23 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ #include <stdio.h> #include <stdlib.h> -#include <SDL/SDL.h> -#include "GP_SDL.h" +#include <GP.h> -/* The surface used as a display (in fact it is a software surface). */ -SDL_Surface *display = NULL; -GP_Context context; - -/* Timer used for refreshing the display */ -SDL_TimerID timer; - -/* An event used for signaling that the timer was triggered. */ -SDL_UserEvent timer_event; +static GP_Backend *win; /* Globally used colors. */ -GP_Pixel white, black; +static GP_Pixel white, black; /* Holding flag (pauses drawing). */ static int pause_flag = 0; -Uint32 timer_callback(__attribute__((unused)) Uint32 interval, - __attribute__((unused)) void *param) -{ - timer_event.type = SDL_USEREVENT; - SDL_PushEvent((SDL_Event *) &timer_event); - return 60; -} - /* Shape to draw */ #define SHAPE_FIRST 1 #define SHAPE_CIRCLE 1 @@ -73,111 +56,110 @@ static int fill_flag = 1; /* Do a clipping test? */ static int cliptest_flag = 0; -void random_point(SDL_Surface *surf, int *x, int *y) +void random_point(const GP_Context *c, int *x, int *y) { if (cliptest_flag) { - *x = random() % (3*surf->w) - surf->w; - *y = random() % (3*surf->h) - surf->h; + *x = random() % (3*c->w) - c->w; + *y = random() % (3*c->h) - c->h; } else { - *x = random() % surf->w; - *y = random() % surf->h; + *x = random() % c->w; + *y = random() % c->h; } } -void random_point_AA(SDL_Surface *surf, int *x, int *y) +void random_point_AA(const GP_Context *c, int *x, int *y) { - *x = random() % (surf->w<<8); - *y = random() % (surf->h<<8); + *x = random() % (c->w<<8); + *y = random() % (c->h<<8); } void draw_random_circle(GP_Pixel pixel) { int x, y; - random_point(display, &x, &y); + random_point(win->context, &x, &y); int r = random() % 50; if (fill_flag) - GP_FillCircle(&context, x, y, r, pixel); + GP_FillCircle(win->context, x, y, r, pixel); if (outline_flag) - GP_Circle(&context, x, y, r, white); + GP_Circle(win->context, x, y, r, white); } void draw_random_ellipse(GP_Pixel pixel) { int x, y; - random_point(display, &x, &y); + random_point(win->context, &x, &y); int rx = random() % 50; int ry = random() % 50; if (fill_flag) - GP_FillEllipse(&context, x, y, rx, ry, pixel); + GP_FillEllipse(win->context, x, y, rx, ry, pixel); if (outline_flag) - GP_Ellipse(&context, x, y, rx, ry, white); + GP_Ellipse(win->context, x, y, rx, ry, white); } void draw_random_triangle(GP_Pixel pixel) { int x0, y0, x1, y1, x2, y2; - random_point(display, &x0, &y0); - random_point(display, &x1, &y1); - random_point(display, &x2, &y2); + random_point(win->context, &x0, &y0); + random_point(win->context, &x1, &y1); + random_point(win->context, &x2, &y2); if (fill_flag) - GP_FillTriangle(&context, x0, y0, x1, y1, x2, y2, pixel); + GP_FillTriangle(win->context, x0, y0, x1, y1, x2, y2, pixel); if (outline_flag) - GP_Triangle(&context, x0, y0, x1, y1, x2, y2, white); + GP_Triangle(win->context, x0, y0, x1, y1, x2, y2, white); } void draw_random_rectangle(GP_Pixel pixel) { int x0, y0, x1, y1; - random_point(display, &x0, &y0); - random_point(display, &x1, &y1); + random_point(win->context, &x0, &y0); + random_point(win->context, &x1, &y1); if (fill_flag) - GP_FillRect(&context, x0, y0, x1, y1, pixel); + GP_FillRect(win->context, x0, y0, x1, y1, pixel); if (outline_flag) - GP_Rect(&context, x0, y0, x1, y1, white); + GP_Rect(win->context, x0, y0, x1, y1, white); } void draw_random_tetragon(GP_Pixel pixel) { int x0, y0, x1, y1, x2, y2, x3, y3; - random_point(display, &x0, &y0); - random_point(display, &x1, &y1); - random_point(display, &x2, &y2); - random_point(display, &x3, &y3); + random_point(win->context, &x0, &y0); + random_point(win->context, &x1, &y1); + random_point(win->context, &x2, &y2); + random_point(win->context, &x3, &y3); if (fill_flag) - GP_FillTetragon(&context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); + GP_FillTetragon(win->context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); if (outline_flag) - GP_Tetragon(&context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); + GP_Tetragon(win->context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); } void draw_random_rectangle_AA(GP_Pixel pixel) { int x0, y0, x1, y1; - random_point_AA(display, &x0, &y0); - random_point_AA(display, &x1, &y1); + random_point_AA(win->context, &x0, &y0); + random_point_AA(win->context, &x1, &y1); // if (fill_flag) - GP_FillRect_AA(&context, x0, y0, x1, y1, pixel); + GP_FillRect_AA(win->context, x0, y0, x1, y1, pixel); // if (outline_flag) -// GP_Rect(&context, x0, y0, x1, y1, white); +// GP_Rect(win->context, x0, y0, x1, y1, white); } void clear_screen(void) { - SDL_LockSurface(display); - GP_Fill(&context, black); - SDL_UnlockSurface(display); + GP_Fill(win->context, black); + GP_BackendFlip(win); } void redraw_screen(void) @@ -185,12 +167,10 @@ void redraw_screen(void) if (pause_flag) return; - SDL_LockSurface(display); - /* Pick a random color for drawing. */ GP_Pixel pixel; pixel = GP_RGBToPixel(random() % 256, random() % 256, - random() % 256, context.pixel_type); + random() % 256, win->context->pixel_type); switch (shape) { case SHAPE_CIRCLE: @@ -212,133 +192,80 @@ void redraw_screen(void) draw_random_rectangle_AA(pixel); break; } - - SDL_UnlockSurface(display); } void event_loop(void) { - SDL_Event event; - - while (SDL_WaitEvent(&event) > 0) { - - switch (event.type) { - - case SDL_USEREVENT: - redraw_screen(); - SDL_Flip(display); - break; - - case SDL_KEYDOWN: - switch (event.key.keysym.sym) { - - case SDLK_SPACE: + GP_Event ev; + + while (GP_EventGet(&ev)) { + switch (ev.type) { + case GP_EV_KEY: + if (ev.code != GP_EV_KEY_DOWN) + continue; + + switch (ev.val.key.key) { + case GP_KEY_SPACE: shape++; if (shape > SHAPE_LAST) shape = SHAPE_FIRST; clear_screen(); - SDL_Flip(display); pause_flag = 0; - break; - - case SDLK_p: + break; + case GP_KEY_P: pause_flag = !pause_flag; - break; - - case SDLK_f: + break; + case GP_KEY_F: fill_flag = !fill_flag; - if (!fill_flag && !outline_flag) { + if (!fill_flag && !outline_flag) outline_flag = 1; - } - break; - - case SDLK_o: + break; + case GP_KEY_O: outline_flag = !outline_flag; - if (!fill_flag && !outline_flag) { + if (!fill_flag && !outline_flag) fill_flag = 1; - } - break; - - case SDLK_c: + break; + case GP_KEY_C: cliptest_flag = !cliptest_flag; - break; - - case SDLK_x: + break; + case GP_KEY_X: clear_screen(); - SDL_Flip(display); - break; - - case SDLK_ESCAPE: - return; - - default: - break; - } break; - case SDL_QUIT: - return; - default: + case GP_KEY_ESC: + GP_BackendExit(win); + exit(0); break; + } } } } -int main(int argc, char *argv[]) +int main(void) { - /* Bits per pixel to be set for the display surface. */ - int display_bpp = 0; - - int i; - for (i = 1; i < argc; i++) { - if (strcmp(argv[i], "-16") == 0) { - display_bpp = 16; - } - else if (strcmp(argv[i], "-24") == 0) { - display_bpp = 24; - } - else if (strcmp(argv[i], "-32") == 0) { - display_bpp = 32; - } - } + const char *backend_opts = "X11"; + + win = GP_BackendInit(backend_opts, "Random Shape Test", stderr); - /* Initialize SDL */ - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - fprintf(stderr, "Could not initialize SDL: %sn", SDL_GetError()); + if (win == NULL) { + fprintf(stderr, "Failed to initalize backend '%s'n", + backend_opts); return 1; } - - /* Create a window with a software back surface */ - display = SDL_SetVideoMode(640, 480, display_bpp, SDL_SWSURFACE); - if (display == NULL) { - fprintf(stderr, "Could not open display: %sn", SDL_GetError()); - goto fail; - } - - /* Set up a clipping rectangle to test proper clipping of pixels */ - SDL_Rect clip_rect = {10, 10, 620, 460}; - SDL_SetClipRect(display, &clip_rect); - - GP_SDL_ContextFromSurface(&context, display); - - white = GP_ColorToContextPixel(GP_COL_WHITE, &context); - black = GP_ColorToContextPixel(GP_COL_BLACK, &context); - - /* Set up the refresh timer */ - timer = SDL_AddTimer(60, timer_callback, NULL); - if (timer == 0) { - fprintf(stderr, "Could not set up timer: %sn", SDL_GetError()); - goto fail; + + white = GP_ColorToContextPixel(GP_COL_WHITE, win->context); + black = GP_ColorToContextPixel(GP_COL_BLACK, win->context); + + for (;;) { + GP_BackendPoll(win); + event_loop(); + + usleep(20000); + + if (pause_flag) + continue; + + redraw_screen(); + GP_BackendFlip(win); } - - /* Enter the event loop */ - event_loop(); - - /* We're done */ - SDL_Quit(); - return 0; - -fail: - SDL_Quit(); - return 1; } diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 1002fcb..6985861 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -7,7 +7,7 @@ LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL ifeq ($(HAVE_LIBSDL),yes) CSOURCES=$(shell echo *.c) -APPS=pixeltest fonttest randomshapetest+APPS=pixeltest fonttest symbolstest textaligntest blittest subcontext aatest mixpixeltest endif ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 2 +- {tests/SDL => demos/c_simple}/randomshapetest.c | 249 ++++++++--------------- tests/SDL/Makefile | 2 +- 3 files changed, 90 insertions(+), 163 deletions(-) rename {tests/SDL => demos/c_simple}/randomshapetest.c (50%) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 3f35d87f9ab132a5e60d3c6d7d8324af2da43653
by metan 20 Oct '12

20 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 3f35d87f9ab132a5e60d3c6d7d8324af2da43653 (commit) from 82d3a2388b9c9001295fbaf68efe9a11469dbf65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/3f35d87f9ab132a5e60d3c6d7d8324af2da4… commit 3f35d87f9ab132a5e60d3c6d7d8324af2da43653 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 20 12:46:32 2012 +0200 tests: loaders: More JPEG and PNG tests. diff --git a/tests/loaders/data/jpeg/valid/100x100-red.jpeg b/tests/loaders/data/jpeg/valid/100x100-red.jpeg new file mode 100644 index 0000000..0101283 Binary files /dev/null and b/tests/loaders/data/jpeg/valid/100x100-red.jpeg differ diff --git a/tests/loaders/data/png/valid/100x100-red-alpha.png b/tests/loaders/data/png/valid/100x100-red-alpha.png new file mode 100644 index 0000000..31ca1bc Binary files /dev/null and b/tests/loaders/data/png/valid/100x100-red-alpha.png differ diff --git a/tests/loaders/data/png/valid/100x100-red.png b/tests/loaders/data/png/valid/100x100-red.png new file mode 100644 index 0000000..4bf87f3 Binary files /dev/null and b/tests/loaders/data/png/valid/100x100-red.png differ diff --git a/tests/loaders/loaders_suite.c b/tests/loaders/loaders_suite.c index de84a8e..c87c6f9 100644 --- a/tests/loaders/loaders_suite.c +++ b/tests/loaders/loaders_suite.c @@ -561,6 +561,71 @@ static int test_load_BMP_8bpp_1x64000(void) return test_load_BMP("8bpp-1x64000.bmp"); } +static int test_load_PNG(const char *path) +{ + GP_Context *img; + + img = GP_LoadPNG(path, NULL); + + if (img == NULL) { + switch (errno) { + case ENOSYS: + tst_report(0, "Not Implemented"); + return TST_SKIPPED; + default: + tst_report(0, "Got %s", strerror(errno)); + return TST_FAILED; + } + } + + /* + * TODO: check correct data. + */ + GP_ContextFree(img); + + return TST_SUCCESS; +} + +static int test_load_PNG_100x100(void) +{ + return test_load_PNG("100x100-red.png"); +} + +static int test_load_PNG_100x100_alpha(void) +{ + return test_load_PNG("100x100-red-alpha.png"); +} + +static int test_load_JPEG(const char *path) +{ + GP_Context *img; + + img = GP_LoadJPG(path, NULL); + + if (img == NULL) { + switch (errno) { + case ENOSYS: + tst_report(0, "Not Implemented"); + return TST_SKIPPED; + default: + tst_report(0, "Got %s", strerror(errno)); + return TST_FAILED; + } + } + + /* + * TODO: check correct data. + */ + GP_ContextFree(img); + + return TST_SUCCESS; +} + +static int test_load_JPEG_100x100(void) +{ + return test_load_JPEG("100x100-red.jpeg"); +} + const struct tst_suite tst_suite = { .suite_name = "Image Loaders testsuite", .tests = { @@ -615,29 +680,60 @@ const struct tst_suite tst_suite = { .flags = TST_TMPDIR | TST_CHECK_MALLOC}, /* BPM loader tests */ - {.name = "BMP Load 1bpp 1x1", .tst_fn = test_load_BMP_1bpp_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/1bpp-1x1.bmp"}, + {.name = "BMP Load 1bpp 1x1", + .tst_fn = test_load_BMP_1bpp_1x1, + .res_path = "data/bmp/bitmaps/valid/1bpp-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP Load 4bpp 1x1", .tst_fn = test_load_BMP_4bpp_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/4bpp-1x1.bmp"}, + {.name = "BMP Load 4bpp 1x1", + .tst_fn = test_load_BMP_4bpp_1x1, + .res_path = "data/bmp/bitmaps/valid/4bpp-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP Load 8bpp 1x1", .tst_fn = test_load_BMP_8bpp_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/8bpp-1x1.bmp"}, + {.name = "BMP Load 8bpp 1x1", + .tst_fn = test_load_BMP_8bpp_1x1, + .res_path = "data/bmp/bitmaps/valid/8bpp-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP 24bpp 1x1", .tst_fn = test_load_BMP_24bpp_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/24bpp-1x1.bmp"}, + {.name = "BMP 24bpp 1x1", + .tst_fn = test_load_BMP_24bpp_1x1, + .res_path = "data/bmp/bitmaps/valid/24bpp-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP 32bpp 1x1", .tst_fn = test_load_BMP_32bpp_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/32bpp-1x1.bmp"}, + {.name = "BMP 32bpp 1x1", + .tst_fn = test_load_BMP_32bpp_1x1, + .res_path = "data/bmp/bitmaps/valid/32bpp-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP 555 1x1", .tst_fn = test_load_BMP_555_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/555-1x1.bmp"}, + {.name = "BMP 555 1x1", + .tst_fn = test_load_BMP_555_1x1, + .res_path = "data/bmp/bitmaps/valid/555-1x1.bmp", + .flags = TST_TMPDIR}, - {.name = "BMP 565 1x1", .tst_fn = test_load_BMP_565_1x1, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/565-1x1.bmp"}, + {.name = "BMP 565 1x1", + .tst_fn = test_load_BMP_565_1x1, + .res_path = "data/bmp/bitmaps/valid/565-1x1.bmp", + .flags = TST_TMPDIR}, + + {.name = "BMP 8bpp 1x64000", + .tst_fn = test_load_BMP_8bpp_1x64000, + .res_path = "data/bmp/bitmaps/valid/8bpp-1x64000.bmp", + .flags = TST_TMPDIR}, + + /* PNG loader tests */ + {.name = "PNG 100x100", .tst_fn = test_load_PNG_100x100, + .res_path = "data/png/valid/100x100-red.png", + .flags = TST_TMPDIR}, - {.name = "BMP 8bpp 1x64000", .tst_fn = test_load_BMP_8bpp_1x64000, - .flags = TST_TMPDIR, .res_path = "data/bmp/bitmaps/valid/8bpp-1x64000.bmp"}, + {.name = "PNG 100x100 50% alpha", + .tst_fn = test_load_PNG_100x100_alpha, + .res_path = "data/png/valid/100x100-red-alpha.png", + .flags = TST_TMPDIR}, + + /* JPEG loader tests */ + {.name = "JPEG 100x100", .tst_fn = test_load_JPEG_100x100, + .res_path = "data/jpeg/valid/100x100-red.jpeg", + .flags = TST_TMPDIR}, {.name = NULL}, } ----------------------------------------------------------------------- Summary of changes: tests/loaders/data/jpeg/valid/100x100-red.jpeg | Bin 0 -> 382 bytes tests/loaders/data/png/valid/100x100-red-alpha.png | Bin 0 -> 315 bytes tests/loaders/data/png/valid/100x100-red.png | Bin 0 -> 309 bytes tests/loaders/loaders_suite.c | 128 +++++++++++++++++--- 4 files changed, 112 insertions(+), 16 deletions(-) create mode 100644 tests/loaders/data/jpeg/valid/100x100-red.jpeg create mode 100644 tests/loaders/data/png/valid/100x100-red-alpha.png create mode 100644 tests/loaders/data/png/valid/100x100-red.png repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 82d3a2388b9c9001295fbaf68efe9a11469dbf65
by metan 20 Oct '12

20 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 82d3a2388b9c9001295fbaf68efe9a11469dbf65 (commit) from 101233f4b4f483e4633302fe978f051ee5c4e472 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/82d3a2388b9c9001295fbaf68efe9a11469d… commit 82d3a2388b9c9001295fbaf68efe9a11469dbf65 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 20 11:45:59 2012 +0200 tests: core: More cases for GetPutPixel. diff --git a/tests/core/GetPutPixel.gen.c.t b/tests/core/GetPutPixel.gen.c.t index b462bce..5f1354a 100644 --- a/tests/core/GetPutPixel.gen.c.t +++ b/tests/core/GetPutPixel.gen.c.t @@ -35,8 +35,8 @@ static void fill_context(GP_Context *c, GP_Pixel p) { GP_Coord x, y; - for (x = 0; x < c->w; x++) - for (y = 0; y < c->h; y++) + for (x = 0; x < (GP_Coord)c->w; x++) + for (y = 0; y < (GP_Coord)c->h; y++) GP_PutPixel(c, x, y, p); } @@ -47,8 +47,8 @@ static int check_filled(GP_Context *c) p = GP_GetPixel(c, 0, 0); - for (x = 0; x < c->w; x++) - for (y = 0; y < c->h; y++) + for (x = 0; x < (GP_Coord)c->w; x++) + for (y = 0; y < (GP_Coord)c->h; y++) if (p != GP_GetPixel(c, x, y)) { tst_report(0, "Pixels different %i %i", x, y); return 1; @@ -80,7 +80,7 @@ static int GetPutPixel_{{ pt.name }}(void) if (c == NULL) { tst_report(0, "GP_ContextAlloc() failed"); - return TST_FAILED; + return TST_UNTESTED; } if (try_pattern(c, 0x55555555 & {{ 2 ** pt.pixelsize.size - 1}})) @@ -105,6 +105,51 @@ static int GetPutPixel_{{ pt.name }}(void) %% endif %% endfor +%% for pt in pixeltypes +%% if not pt.is_unknown() +static int GetPutPixel_Clipping_{{ pt.name }}(void) +{ + GP_Context *c; + + c = GP_ContextAlloc(100, 100, GP_PIXEL_{{ pt.name }}); + + if (c == NULL) { + tst_report(0, "GP_ContextAlloc() failed"); + return TST_UNTESTED; + } + + fill_context(c, 0xffffffff); + + GP_Coord x, y; + int err = 0; + + for (x = -1000; x < 200; x++) { + for (y = -1000; y < 200; y++) { + if (x > 0 && x < 100 && y > 0 && y < 100) + continue; + + /* Must be no-op */ + GP_PutPixel(c, x, y, 0); + + /* Must return 0 */ + if (GP_GetPixel(c, x, y) != 0) { + tst_report(0, "GP_GetPixel returned non-zero " + "at %i %i", x, y); + err++; + } + } + } + + GP_ContextFree(c); + + if (err) + return TST_FAILED; + + return TST_SUCCESS; +} +%% endif +%% endfor + const struct tst_suite tst_suite = { .suite_name = "GetPutPixel Testsuite", .tests = { @@ -114,6 +159,13 @@ const struct tst_suite tst_suite = { .tst_fn = GetPutPixel_{{ pt.name }}}, %% endif %% endfor + +%% for pt in pixeltypes +%% if not pt.is_unknown() + {.name = "GetPutPixel Clipping {{ pt.name }}", + .tst_fn = GetPutPixel_Clipping_{{ pt.name }}}, +%% endif +%% endfor {.name = NULL} } ----------------------------------------------------------------------- Summary of changes: tests/core/GetPutPixel.gen.c.t | 62 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 57 insertions(+), 5 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 101233f4b4f483e4633302fe978f051ee5c4e472
by metan 20 Oct '12

20 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 101233f4b4f483e4633302fe978f051ee5c4e472 (commit) from 7d30cb21d991fc207b0cc99038494e647307a598 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/101233f4b4f483e4633302fe978f051ee5c4… commit 101233f4b4f483e4633302fe978f051ee5c4e472 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 20 11:13:41 2012 +0200 tests: framework: Add UNTESTED test status. diff --git a/tests/framework/test.c b/tests/framework/test.c index f4a8692..ccef65d 100644 --- a/tests/framework/test.c +++ b/tests/framework/test.c @@ -186,11 +186,25 @@ int fail_FILE(void) return TST_SUCCESS; } +/* + * This status is returned when the could not be started + * because of unsufficient configuration + */ static int skipped_fn(void) { return TST_SKIPPED; } +/* + * This status is returned when there was failure prior + * the actuall testing so we could not test the feature + * at all. + */ +static int untested_fn(void) +{ + return TST_UNTESTED; +} + static int res_fn(void) { if (access("test.c", R_OK) == 0) @@ -226,6 +240,7 @@ const struct tst_suite tst_suite = { .tests = { {.name = "Success test", .tst_fn = success_fn}, {.name = "Skipped test", .tst_fn = skipped_fn}, + {.name = "Untested test", .tst_fn = untested_fn}, {.name = "Sigsegv test", .tst_fn = sigsegv_fn}, {.name = "Failed test", .tst_fn = failed_fn}, {.name = "Stack overflow test", .tst_fn = stack_overflow_fn}, diff --git a/tests/framework/tst_job.c b/tests/framework/tst_job.c index a1f7272..8a0789b 100644 --- a/tests/framework/tst_job.c +++ b/tests/framework/tst_job.c @@ -77,6 +77,9 @@ static void stop_test(struct tst_job *job) case TST_SKIPPED: result = "[ e[1;30mSKIPPEDe[0m ]"; break; + case TST_UNTESTED: + result = "[ e[1;34mUNTESTEDe[0m ]"; + break; case TST_INTERR: result = "[ e[1;31mINTERNAL ERRORe[0m ]"; break; diff --git a/tests/framework/tst_log.c b/tests/framework/tst_log.c index 772b20b..a70f8c0 100644 --- a/tests/framework/tst_log.c +++ b/tests/framework/tst_log.c @@ -36,6 +36,8 @@ static const char *ret_to_bg_color(enum tst_ret ret) return "#008000"; case TST_SKIPPED: return "#888888"; + case TST_UNTESTED: + return "#0000bb"; case TST_INTERR: return "#800000"; case TST_SIGSEGV: @@ -64,6 +66,8 @@ static const char *ret_to_str(enum tst_ret ret) return "Success"; case TST_SKIPPED: return "Skipped"; + case TST_UNTESTED: + return "Untested"; case TST_INTERR: return "Internal Error"; case TST_SIGSEGV: diff --git a/tests/framework/tst_test.h b/tests/framework/tst_test.h index b9a0c17..c6ef4fe 100644 --- a/tests/framework/tst_test.h +++ b/tests/framework/tst_test.h @@ -24,15 +24,16 @@ #define TST_TEST_H enum tst_ret { - TST_SUCCESS, /* Test succedded */ - TST_SKIPPED, /* Test skipped due to not enough memory, ENOSYS ... */ - TST_INTERR, /* Test framework error */ - TST_SIGSEGV, /* Test ended with SIGSEGV */ - TST_TIMEOUT, /* Test hasn't finished in time */ - TST_ABORTED, /* The abort() was called (possible double free) */ - TST_FPE, /* Floating point exception */ - TST_MEMLEAK, /* Memory leak was detected */ - TST_FAILED, /* Test failed */ + TST_SUCCESS, /* Test succedded */ + TST_SKIPPED, /* Test skipped due to not enough memory, ENOSYS ... */ + TST_UNTESTED, /* Test not finished because of failure */ + TST_INTERR, /* Test framework error */ + TST_SIGSEGV, /* Test ended with SIGSEGV */ + TST_TIMEOUT, /* Test hasn't finished in time */ + TST_ABORTED, /* The abort() was called (possible double free) */ + TST_FPE, /* Floating point exception */ + TST_MEMLEAK, /* Memory leak was detected */ + TST_FAILED, /* Test failed */ TST_MAX = TST_FAILED+1, }; ----------------------------------------------------------------------- Summary of changes: tests/framework/test.c | 15 +++++++++++++++ tests/framework/tst_job.c | 3 +++ tests/framework/tst_log.c | 4 ++++ tests/framework/tst_test.h | 19 ++++++++++--------- 4 files changed, 32 insertions(+), 9 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 7d30cb21d991fc207b0cc99038494e647307a598
by metan 20 Oct '12

20 Oct '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 7d30cb21d991fc207b0cc99038494e647307a598 (commit) from f5e28f46785b6f44488672e5a1a6a878137a44be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/7d30cb21d991fc207b0cc99038494e647307… commit 7d30cb21d991fc207b0cc99038494e647307a598 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Oct 20 00:17:14 2012 +0200 tests: framework: Fix benchmark JSON output. diff --git a/tests/framework/tst_log.c b/tests/framework/tst_log.c index b1e43b8..772b20b 100644 --- a/tests/framework/tst_log.c +++ b/tests/framework/tst_log.c @@ -341,7 +341,7 @@ static void append_benchmark_json(struct tst_job *job, FILE *f) fprintf(f, "tttt"Iterations": %in", job->bench_iter); - fprintf(f, "ttt}n"); + fprintf(f, "ttt},n"); } static int hack_json_start = 0; ----------------------------------------------------------------------- Summary of changes: tests/framework/tst_log.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0