November 2012 - Gfxprim

[repo.or.cz] gfxprim.git branch master updated: 4e80095b3f5f7da3d999465f8989979a9c2e7595
by metan 30 Nov '12

30 Nov '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 4e80095b3f5f7da3d999465f8989979a9c2e7595 (commit) from ddf52c30001a3cdb93d0e6fda47e26648460e68e (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/4e80095b3f5f7da3d999465f8989979a9c2e… commit 4e80095b3f5f7da3d999465f8989979a9c2e7595 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 30 13:21:27 2012 +0100 gfx: Fix GP_Polygon.c compilation. Add _ISOC99_SOURCE so that fminf() fmaxf() and HUGE_VALF are exported even on older glibc. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 4bc9480..f2ea9cd 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -1,3 +1,28 @@ +/***************************************************************************** + * 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) 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#define _ISOC99_SOURCE + #include <stdlib.h> #include <stdio.h> #include <math.h> ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 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: ddf52c30001a3cdb93d0e6fda47e26648460e68e
by metan 26 Nov '12

26 Nov '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 ddf52c30001a3cdb93d0e6fda47e26648460e68e (commit) from 0965cb83090cad3e3f2785558f17dac09f8b2b55 (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/ddf52c30001a3cdb93d0e6fda47e26648460… commit ddf52c30001a3cdb93d0e6fda47e26648460e68e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 26 00:56:11 2012 +0100 Add README. diff --git a/README b/README new file mode 100644 index 0000000..ecff295 --- /dev/null +++ b/README @@ -0,0 +1,4 @@ +GFXprim is Open-source modular 2D bitmap graphics library with emphasis on +speed and correctness. + +See http://gfxprim.ucw.cz for details. ----------------------------------------------------------------------- Summary of changes: README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) create mode 100644 README 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: 0965cb83090cad3e3f2785558f17dac09f8b2b55
by metan 25 Nov '12

25 Nov '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 0965cb83090cad3e3f2785558f17dac09f8b2b55 (commit) from e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f (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/0965cb83090cad3e3f2785558f17dac09f8b… commit 0965cb83090cad3e3f2785558f17dac09f8b2b55 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Nov 26 00:46:08 2012 +0100 gfx: Fix 'no newline at the end of the file'. diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index c1d2288..4bc9480 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -121,4 +121,4 @@ void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, GP_HLine_Raw(context, intersections[i], intersections[i + 1], y, pixel); } } -} No newline at end of file +} ----------------------------------------------------------------------- Summary of changes: libs/gfx/GP_Polygon.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

[repo.or.cz] gfxprim.git branch master updated: e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f
by bluebear 25 Nov '12

25 Nov '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 e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f (commit) via c438a7976238a10cd9562cbf28580f0c05b1529f (commit) from 4128a845f099a7902414cfe3314a61bcff9b60c8 (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/e34e0ac5d46c12c6e2a3e7f14bb27138fb00… commit e34e0ac5d46c12c6e2a3e7f14bb27138fb005e1f Merge: c438a79 4128a84 Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Nov 25 23:03:22 2012 +0100 Merge branch 'master' of git://repo.or.cz/gfxprim http://repo.or.cz/w/gfxprim.git/commit/c438a7976238a10cd9562cbf28580f0c05b1… commit c438a7976238a10cd9562cbf28580f0c05b1529f Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Nov 25 22:59:33 2012 +0100 Finished initial implementation of generic polygon. diff --git a/demos/c_simple/randomshapetest.c b/demos/c_simple/randomshapetest.c index b699348..19fcae4 100644 --- a/demos/c_simple/randomshapetest.c +++ b/demos/c_simple/randomshapetest.c @@ -42,9 +42,10 @@ static int pause_flag = 0; #define SHAPE_ELLIPSE 2 #define SHAPE_TRIANGLE 3 #define SHAPE_RECTANGLE 4 -#define SHAPE_TETRAGON 5 -#define SHAPE_RECTANGLE_AA 6 -#define SHAPE_LAST 6 +#define SHAPE_TETRAGON 5 +#define SHAPE_POLYGON 6 +#define SHAPE_RECTANGLE_AA 7 +#define SHAPE_LAST 7 static int shape = SHAPE_FIRST; /* Draw outlines? */ @@ -142,6 +143,18 @@ void draw_random_tetragon(GP_Pixel pixel) GP_Tetragon(win->context, x0, y0, x1, y1, x2, y2, x3, y3, pixel); } +void draw_random_polygon(GP_Pixel pixel) +{ + GP_Coord xy[10]; + int i; + + for (i = 0; i < 5; i++) { + random_point(win->context, xy + 2*i, xy + 2*i + 1); + } + + GP_FillPolygon_Raw(win->context, 5, xy, pixel); +} + void draw_random_rectangle_AA(GP_Pixel pixel) { int x0, y0, x1, y1; @@ -188,6 +201,9 @@ void redraw_screen(void) case SHAPE_TETRAGON: draw_random_tetragon(pixel); break; + case SHAPE_POLYGON: + draw_random_polygon(pixel); + break; case SHAPE_RECTANGLE_AA: draw_random_rectangle_AA(pixel); break; @@ -203,7 +219,7 @@ void event_loop(void) case GP_EV_KEY: if (ev.code != GP_EV_KEY_DOWN) continue; - + switch (ev.val.key.key) { case GP_KEY_SPACE: shape++; @@ -243,7 +259,7 @@ void event_loop(void) int main(void) { const char *backend_opts = "X11"; - + win = GP_BackendInit(backend_opts, "Random Shape Test", stderr); if (win == NULL) { @@ -251,14 +267,14 @@ int main(void) backend_opts); return 1; } - + 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) diff --git a/libs/gfx/GP_Polygon.c b/libs/gfx/GP_Polygon.c index 328e7fa..c1d2288 100644 --- a/libs/gfx/GP_Polygon.c +++ b/libs/gfx/GP_Polygon.c @@ -1,193 +1,124 @@ -/***************************************************************************** - * 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-2011 Jiri "BlueBear" Dluhos * - * <jiri.bluebear.dluhos(a)gmail.com> * - * * - * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include "gfx/GP_Polygon.h" -#include "gfx/GP_HLine.h" - -#include <limits.h> #include <stdlib.h> +#include <stdio.h> +#include <math.h> -struct GP_PolygonEdge { - GP_Coord startx, starty; - GP_Coord endx, endy; - GP_Coord dx, dy; -}; +#include "GP_HLine.h" +#include "GP_Polygon.h" -struct GP_Polygon { - struct GP_PolygonEdge *edges; - GP_Coord edge_count; - GP_Coord ymin, ymax; +/* A single edge of the polygon. */ +struct GP_PolygonEdge { + float x1, y1, x2, y2; + float ymin, ymax; + float dx_by_dy; /* dx/dy (0 for horizontal edges) */ }; -#define GP_POLYGON_INITIALIZER { - .edges = NULL, - .edge_count = 0, - .ymin = INT_MAX, - .ymax = 0 -} +/* Threshod value for delta y; edges with dy smaller than this are considered horizontal. */ +const float GP_HORIZ_DY_THRESHOLD = 0.00001f; -static void GP_InitEdge(struct GP_PolygonEdge *edge, - GP_Coord x1, GP_Coord y1, GP_Coord x2, GP_Coord y2) +/* Initializes the polygon_edge structure. */ +static void GP_InitEdge(struct GP_PolygonEdge *edge, float x1, float y1, + float x2, float y2) { - if (y1 < y2) { /* coords are top-down, correct */ - edge->startx = x1; - edge->starty = y1; - edge->endx = x2; - edge->endy = y2; - } else { /* coords are bottom-up, flip them */ - edge->startx = x2; - edge->starty = y2; - edge->endx = x1; - edge->endy = y1; + edge->x1 = x1; + edge->y1 = y1; + edge->x2 = x2; + edge->y2 = y2; + edge->ymin = fminf(edge->y1, edge->y2); + edge->ymax = fmaxf(edge->y1, edge->y2); + + /* horizontal (or almost horizontal) edges are a special case */ + if ((edge->ymax - edge->ymin) < GP_HORIZ_DY_THRESHOLD) { + edge->dx_by_dy = 0.0; /* not meaningful */ + return; } - edge->dx = edge->endx - edge->startx; - edge->dy = edge->endy - edge->starty; + float dx = (edge->x2 - edge->x1); + float dy = (edge->y2 - edge->y1); + edge->dx_by_dy = dx / dy; } -static void GP_AddEdge(struct GP_Polygon *poly, GP_Coord x1, GP_Coord y1, - GP_Coord x2, GP_Coord y2) +/* Computes an intersection of the specified scanline with the given edge. + * If successful, returns 1 and stores the resulting X coordinate into result_x. + * If failed (the edge does not intersect), 0 is returned. + * Horizontal edges are considered to never intersect. + */ +static int GP_ComputeIntersection(float *result_x, struct GP_PolygonEdge *edge, float y) { - struct GP_PolygonEdge *edge = poly->edges + poly->edge_count; - - poly->edge_count++; + if (y<edge->ymin || y>edge->ymax) + return 0; /* outside the edge Y range */ + + if (edge->ymax - edge->ymin < GP_HORIZ_DY_THRESHOLD) + return 0; /* ignore horizontal edges */ - GP_InitEdge(edge, x1, y1, x2, y2); + *result_x = edge->x1 + (y-edge->y1)*edge->dx_by_dy; - poly->ymin = GP_MIN(poly->ymin, edge->starty); - poly->ymax = GP_MAX(poly->ymax, edge->endy); + return 1; } -static int GP_CompareEdges(const void *edge1, const void *edge2) +/* Sorting callback. Compares two floats and returns -1 if A<B, + * +1 if A>B, 0 if they are equal. + */ +static int GP_CompareFloats(const void *ptr_a, const void *ptr_b) { - struct GP_PolygonEdge *e1 = (struct GP_PolygonEdge *) edge1; - struct GP_PolygonEdge *e2 = (struct GP_PolygonEdge *) edge2; - - if (e1->starty > e2->starty) - return 1; - if (e1->starty > e2->starty) - return -1; - - if (e1->startx > e2->startx) - return 1; - if (e1->startx < e2->startx) - return -1; + float a = ((float *) ptr_a)[0]; + float b = ((float *) ptr_b)[0]; + if (a < b) return -1; + if (a > b) return 1; return 0; } -static void GP_LoadPolygon(struct GP_Polygon *poly, GP_Coord vertex_count, - const GP_Coord *xy) +/* Computes intersections of the y coordinate with all edges, + * writing the X coordinates of the intersections, sorted by X coordinate, + * into 'results'. + */ +static int GP_ComputeScanline(float *results, struct GP_PolygonEdge *edges, + size_t count, float y) { - poly->edge_count = 0; - poly->edges = calloc(sizeof(struct GP_PolygonEdge), - vertex_count); + unsigned int edge_index = 0; + int result_index = 0; - GP_Coord i; - GP_Coord coord_count = 2*vertex_count - 2; - for (i = 0; i < coord_count; i+=2) { + for (; edge_index<count; edge_index++) { - /* add the edge, unless it is horizontal */ - if (xy[i+1] != xy[i+3]) { - GP_AddEdge(poly, xy[i], xy[i+1], xy[i+2], xy[i+3]); + struct GP_PolygonEdge *edge = edges + edge_index; + float x; + + if (GP_ComputeIntersection(&x, edge, y)) { + results[result_index++] = x; } } - /* add the closing edge, unless it is horizontal */ - if (xy[1] != xy[i+1]) { - GP_AddEdge(poly, xy[i], xy[i+1], xy[0], xy[1]); - } + qsort(results, result_index, sizeof(float), GP_CompareFloats); - /* sort edges */ - qsort(poly->edges, poly->edge_count, sizeof(struct GP_PolygonEdge), - GP_CompareEdges); + return result_index; } -static void GP_ResetPolygon(struct GP_Polygon *poly) +void GP_FillPolygon_Raw(GP_Context *context, int vertex_count, + const GP_Coord *xy, GP_Pixel pixel) { - free(poly->edges); - poly->edges = NULL; - poly->edge_count = 0; - poly->ymin = INT_MAX; - poly->ymax = 0; -} - -/* - * Finds an X coordinate of an GP_Coordersection of the edge - * with the given Y line. - */ -static inline GP_Coord GP_FindIntersection(GP_Coord y, const struct GP_PolygonEdge *edge) -{ - GP_Coord edge_y = y - edge->starty; /* Y relative to the edge */ - GP_Coord x = edge->startx; - - if (edge->dx > 0) { - while (edge->startx*edge->dy + edge_y*edge->dx > x*edge->dy) - x++; - } else { - while (edge->startx*edge->dy + edge_y*edge->dx < x*edge->dy) - x--; + float ymin = HUGE_VALF, ymax = -HUGE_VALF; + struct GP_PolygonEdge *edge; + struct GP_PolygonEdge edges[vertex_count]; + + int i; + for (i = 0; i < vertex_count - 1; i++) { + edge = edges + i; + GP_InitEdge(edge, xy[2*i], xy[2*i + 1], + xy[2*i + 2], xy[2*i + 3]); + ymin = fminf(ymin, edge->ymin); + ymax = fmaxf(ymax, edge->ymax); } - return x; -} - -void GP_FillPolygon_Raw(GP_Context *context, GP_Coord vertex_count, - const GP_Coord *xy, GP_Pixel pixel) -{ - struct GP_Polygon poly = GP_POLYGON_INITIALIZER; - - GP_LoadPolygon(&poly, vertex_count, xy); - - GP_Coord y, startx, endx; - - for (y = poly.ymin; y <= poly.ymax; y++) { - startx = INT_MAX; - endx = 0; + /* the last edge (from the last point to the first one) */ + edge = edges + vertex_count - 1; + GP_InitEdge(edge, xy[2*i], xy[2*i + 1], xy[0], xy[1]); - GP_Coord i; - for (i = 0; i < poly.edge_count; i++) { - struct GP_PolygonEdge *edge = poly.edges + i; - - if (y < edge->starty || y > edge->endy) - continue; - - GP_Coord GP_Coorder = GP_FindIntersection(y, edge); - - startx = GP_MIN(startx, GP_Coorder); - endx = GP_MAX(endx, GP_Coorder); - - if (y != edge->endy) { - GP_Coorder = GP_FindIntersection(y + 1, edge); - startx = GP_MIN(startx, GP_Coorder); - endx = GP_MAX(endx, GP_Coorder); - } + float intersections[vertex_count]; + int y; + for (y = (int) ymin; y < (int) ymax; y++) { + int inter_count = GP_ComputeScanline(intersections, edges, vertex_count, y + 0.5f); + for (i = 0; i < inter_count; i+=2) { + GP_HLine_Raw(context, intersections[i], intersections[i + 1], y, pixel); } - - GP_HLine_Raw(context, startx, endx, y, pixel); } - - GP_ResetPolygon(&poly); -} +} No newline at end of file ----------------------------------------------------------------------- Summary of changes: demos/c_simple/randomshapetest.c | 32 ++++-- libs/gfx/GP_Polygon.c | 245 ++++++++++++++------------------------ 2 files changed, 112 insertions(+), 165 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: 4128a845f099a7902414cfe3314a61bcff9b60c8
by metan 25 Nov '12

25 Nov '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 4128a845f099a7902414cfe3314a61bcff9b60c8 (commit) via feddd1c185068f220e394cc7ec34ff3f0e6b5801 (commit) via cd4e4016c7c2bd7293eec6d9cc99e3355cc8dd38 (commit) from 7064952e38373799deaae59b2ea67093d75b3709 (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/4128a845f099a7902414cfe3314a61bcff9b… commit 4128a845f099a7902414cfe3314a61bcff9b60c8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 25 22:33:29 2012 +0100 tests: Finally get rid of obsolete SDL tests. diff --git a/tests/Makefile b/tests/Makefile index 7a0ad0d..71b1004 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,7 +1,7 @@ TOPDIR=.. include $(TOPDIR)/pre.mk -SUBDIRS=core SDL drivers framework loaders gfx filters +SUBDIRS=core drivers framework loaders gfx filters loaders: framework gfx: framework diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile deleted file mode 100644 index ce12dcb..0000000 --- a/tests/SDL/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -TOPDIR=../.. -include $(TOPDIR)/pre.mk - -INCLUDE=core gfx SDL backends -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL - -ifeq ($(HAVE_LIBSDL),yes) -CSOURCES=$(shell echo *.c) - -APPS=textaligntest subcontext- mixpixeltest -endif - -include $(TOPDIR)/app.mk -include $(TOPDIR)/post.mk diff --git a/tests/SDL/mixpixeltest.c b/tests/SDL/mixpixeltest.c deleted file mode 100644 index 0f0d179..0000000 --- a/tests/SDL/mixpixeltest.c +++ /dev/null @@ -1,228 +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-2012 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 0; -} - -void draw_pixels(void) -{ - unsigned int i, j, k; - - GP_FillRect(&context, 0, 0, context.w, 120, white_pixel); - - unsigned int y = 20; - - for (i = 0; i <= 256; i++) { - GP_MixPixel_Raw(&context, i + 20, y + 0, 0, i); - GP_MixPixel_Raw(&context, i + 20, y + 1, 0, i); - GP_MixPixel_Raw(&context, i + 20, y + 2, 0, i); - GP_MixPixel_Raw(&context, i + 20, y + 3, 0, i); - GP_MixPixel_Raw(&context, i + 20, y + 4, 0, i); - - GP_MixPixel_Raw(&context, i + 20, y + 5, red_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 6, red_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 7, red_pixel, i); - - GP_MixPixel_Raw(&context, i + 20, y + 8, green_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 9, green_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 10, green_pixel, i); - - GP_MixPixel_Raw(&context, i + 20, y + 11, blue_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 12, blue_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 13, blue_pixel, i); - - - if (i % 16 == 0) - GP_PutPixel(&context, i + 20, y + 14, 0); - - if (i % 32 == 0) - GP_PutPixel(&context, i + 20, y + 15, 0); - - if (i % 64 == 0) { - GP_PutPixel(&context, i + 20, y + 16, 0); - GP_Print(&context, NULL, i + 20, y + 20, - GP_ALIGN_CENTER | GP_VALIGN_BELOW, - 0, 0, "%u", i); - } - - if (i % 128 == 0) - GP_PutPixel(&context, i + 20, y + 17, 0); - } - - for (i = 0; i < 7; i++) - for (j = 0; j < 32; j++) - for (k = 0; k < 32; k++) - GP_MixPixel_Raw(&context, (225 * i) / 6 + j + 20, - y + k + 40, 0, (255 * i) / 6); - - y = 140; - - for (i = 0; i <= 256; i++) { - GP_MixPixel_Raw(&context, i + 20, y + 0, white_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 1, white_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 2, white_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 3, white_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 4, white_pixel, i); - - GP_MixPixel_Raw(&context, i + 20, y + 5, red_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 6, red_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 7, red_pixel, i); - - GP_MixPixel_Raw(&context, i + 20, y + 8, green_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 9, green_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 10, green_pixel, i); - - GP_MixPixel_Raw(&context, i + 20, y + 11, blue_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 12, blue_pixel, i); - GP_MixPixel_Raw(&context, i + 20, y + 13, blue_pixel, i); - - if (i % 16 == 0) - GP_PutPixel(&context, i + 20, y + 14, white_pixel); - - if (i % 32 == 0) - GP_PutPixel(&context, i + 20, y + 15, white_pixel); - - if (i % 64 == 0) { - GP_PutPixel(&context, i + 20, y + 16, white_pixel); - GP_Print(&context, NULL, i + 20, y + 20, - GP_ALIGN_CENTER | GP_VALIGN_BELOW, - white_pixel, 0, "%u", i); - } - - if (i % 128 == 0) - GP_PutPixel(&context, i + 20, y + 17, white_pixel); - } - - for (i = 0; i < 7; i++) - for (j = 0; j < 32; j++) - for (k = 0; k < 32; k++) - GP_MixPixel_Raw(&context, (225 * i) / 6 + j + 20, - y + k + 40, white_pixel, (255 * i) / 6); - -} - -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; -} diff --git a/tests/SDL/runtest.sh b/tests/SDL/runtest.sh deleted file mode 100755 index 163c76c..0000000 --- a/tests/SDL/runtest.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -# Run dynamically linked test. -# - -PROG="$1" -shift - -echo "LD_LIBRARY_PATH=../../build/ ./$PROG $@" -LD_LIBRARY_PATH=../../build/ ./$PROG "$@" diff --git a/tests/SDL/subcontext.c b/tests/SDL/subcontext.c deleted file mode 100644 index a9348e6..0000000 --- a/tests/SDL/subcontext.c +++ /dev/null @@ -1,281 +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 <math.h> -#include <SDL/SDL.h> - -#include "GP.h" -#include "GP_SDL.h" - -static GP_Pixel black, white, gray; - -SDL_Surface *display = NULL; -GP_Context context, *sub_context; - -SDL_TimerID timer; - -SDL_UserEvent timer_event; - -static int pause_flag = 0; -static int draw_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 30; -} - -static void draw_line(GP_Context *dest, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Color col) -{ - GP_Coord x1, x2, y1, y2; - - x1 = random() % w + x; - y1 = random() % h + y; - x2 = random() % w + x; - y2 = random() % h + y; - - GP_Line(dest, x1, y1, x2, y2, col); -} - -static void draw_triangle(GP_Context *dest, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Color col, int flag) -{ - GP_Coord x1, x2, x3, y1, y2, y3; - - x1 = random() % w + x; - y1 = random() % h + y; - x2 = random() % w + x; - y2 = random() % h + y; - x3 = random() % w + x; - y3 = random() % h + y; - - if (flag) - GP_FillTriangle(dest, x1, y1, x2, y2, x3, y3, col); - else - GP_Triangle(dest, x1, y1, x2, y2, x3, y3, col); -} - -static void draw_rect(GP_Context *dest, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Color col, int flag) -{ - GP_Coord x1, x2, y1, y2; - - x1 = random() % w + x; - y1 = random() % h + y; - x2 = random() % w + x; - y2 = random() % h + y; - - if (flag) - GP_FillRect(dest, x1, y1, x2, y2, col); - else - GP_Rect(dest, x1, y1, x2, y2, col); -} - -static void draw_circle(GP_Context *dest, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Color col, int flag) -{ - GP_Coord x1, y1, r; - - r = random() % 150; - - x1 = random() % (w - 2*r) + x + r; - y1 = random() % (h - 2*r) + y + r; - - if (flag) - GP_FillCircle(dest, x1, y1, r, col); - else - GP_Circle(dest, x1, y1, r, col); -} - -#define TEXT "Lorem Ipsum Dolor Sit Amet" - -static void draw_text(GP_Context *dest, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h, GP_Color col) -{ - GP_Coord x1, y1; - GP_Size tw, th; - - tw = GP_TextWidth(NULL, TEXT); - th = GP_TextHeight(NULL); - - x1 = random() % (w - tw) + x; - y1 = random() % (h - th) + y; - - GP_Text(dest, NULL, x1, y1, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, col, black, TEXT); -} - -void redraw_screen(void) -{ - if (pause_flag) - return; - - SDL_LockSurface(display); - - uint8_t v = random() % 128 + 50; - GP_Color col; - if (sub_context->pixel_type == GP_PIXEL_P8) - col = random() % 256; - else - col = GP_RGBToContextPixel(v, v, 255, sub_context); - - /* frame around subcontext */ - GP_Rect(&context, 99, 99, context.w - 100, context.h - 100, white); - - switch (draw_flag) { - case 0: - draw_line(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col); - break; - case 1: - draw_triangle(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 0); - break; - case 2: - draw_triangle(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 1); - break; - case 3: - draw_rect(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 0); - break; - case 4: - draw_rect(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 1); - break; - case 5: - draw_circle(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 0); - break; - case 6: - draw_circle(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col, 1); - break; - case 7: - draw_text(sub_context, -100, -100, sub_context->w + 200, sub_context->h + 200, col); - break; - } - - SDL_Flip(display); - - SDL_UnlockSurface(display); -} - -void clear_screen(void) -{ - GP_Fill(&context, black); - GP_Fill(sub_context, gray); -} - -void event_loop(void) -{ - SDL_Event event; - - while (SDL_WaitEvent(&event) > 0) { - - switch (event.type) { - - case SDL_USEREVENT: - redraw_screen(); - break; - case SDL_KEYDOWN: - switch (event.key.keysym.sym) { - case SDLK_p: - pause_flag = !pause_flag; - break; - case SDLK_SPACE: - draw_flag = (draw_flag + 1) % 8; - clear_screen(); - break; - case SDLK_ESCAPE: - return; - - default: - break; - } - break; - case SDL_QUIT: - return; - default: - break; - } - } -} - -int main(int argc, char *argv[]) -{ - /* 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], "-8") == 0) { - display_bpp = 8; - } else 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; - } - } - - GP_SetDebugLevel(10); - - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - fprintf(stderr, "Could not initialize SDL: %sn", SDL_GetError()); - return 1; - } - - display = SDL_SetVideoMode(640, 480, display_bpp, SDL_SWSURFACE); - if (display == NULL) { - fprintf(stderr, "Could not open display: %sn", SDL_GetError()); - goto fail; - } - - GP_SDL_ContextFromSurface(&context, display); - - black = GP_ColorToContextPixel(GP_COL_BLACK, &context); - white = GP_ColorToContextPixel(GP_COL_WHITE, &context); - gray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); - - sub_context = GP_SubContextAlloc(&context, 100, 100, 440, 280); - GP_Fill(sub_context, gray); - - timer = SDL_AddTimer(60, timer_callback, NULL); - if (timer == 0) { - fprintf(stderr, "Could not set up timer: %sn", SDL_GetError()); - goto fail; - } - - event_loop(); - - SDL_Quit(); - return 0; - -fail: - SDL_Quit(); - return 1; -} - diff --git a/tests/SDL/textaligntest.c b/tests/SDL/textaligntest.c deleted file mode 100644 index a58e670..0000000 --- a/tests/SDL/textaligntest.c +++ /dev/null @@ -1,185 +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-2012 Cyril Hrubis <metan(a)ucw.cz> * - * * - *****************************************************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <SDL/SDL.h> - -#include "GP.h" -#include "GP_SDL.h" - -SDL_Surface *display = NULL; -GP_Context context; - -static GP_Pixel black_pixel, red_pixel, yellow_pixel, green_pixel, blue_pixel, - darkgray_pixel; - -static int font_flag = 0; - -static int X = 640; -static int Y = 480; - -GP_FontFace *font = NULL; - -void redraw_screen(void) -{ - SDL_LockSurface(display); - - GP_Fill(&context, black_pixel); - - /* draw axes intersecting in the middle, where text should be shown */ - GP_HLine(&context, 0, X, Y/2, darkgray_pixel); - GP_VLine(&context, X/2, 0, Y, darkgray_pixel); - - GP_TextStyle style = GP_DEFAULT_TEXT_STYLE; - - switch (font_flag) { - case 0: - style.font = &GP_DefaultProportionalFont; - break; - case 1: - style.font = &GP_DefaultConsoleFont; - break; - case 2: - style.font = font; - break; - } - - GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_BELOW, - yellow_pixel, black_pixel, "bottom left"); - GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, - red_pixel, black_pixel, "bottom right"); - GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_ABOVE, - blue_pixel, black_pixel, "top right"); - GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_ABOVE, - green_pixel, black_pixel, "top left"); - - SDL_UnlockSurface(display); -} - -void event_loop(void) -{ - SDL_Event event; - - while (SDL_WaitEvent(&event) > 0) { - switch (event.type) { - - case SDL_VIDEOEXPOSE: - redraw_screen(); - SDL_Flip(display); - break; - - case SDL_KEYDOWN: - switch (event.key.keysym.sym) { - case SDLK_SPACE: - font_flag += 1; - - if (font) { - if (font_flag >= 3) - font_flag = 0; - } else { - if (font_flag >= 2) - font_flag = 0; - } - break; - case SDLK_x: - context.x_swap = !context.x_swap; - break; - case SDLK_y: - context.y_swap = !context.y_swap; - break; - case SDLK_r: - context.axes_swap = !context.axes_swap; - GP_SWAP(X, Y); - break; - default: - break; - case SDLK_ESCAPE: - return; - } - redraw_screen(); - SDL_Flip(display); - break; - - case SDL_QUIT: - return; - } - } -} - -void print_instructions(void) -{ - printf("Use the following keys to control the test:n"); - printf(" Space ............... toggle proportional/nonproportional fontn"); - printf(" X ................... mirror Xn"); - printf(" Y ................... mirror Yn"); - printf(" R ................... reverse X and Yn"); -} - -int main(int argc, char *argv[]) -{ - GP_SetDebugLevel(10); - - if (argc > 1) - font = GP_FontFaceLoad(argv[1], 0, 16); - - if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_TIMER) != 0) { - fprintf(stderr, "Could not initialize SDL: %sn", SDL_GetError()); - return 1; - } - - display = SDL_SetVideoMode(X, Y, 0, SDL_SWSURFACE); - if (display == NULL) { - fprintf(stderr, "Could not open display: %sn", SDL_GetError()); - goto fail; - } - - print_instructions(); - - SDL_Rect clip_rect = {10, 10, X-10, Y-10}; - SDL_SetClipRect(display, &clip_rect); - - GP_SDL_ContextFromSurface(&context, display); - - black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &context); - red_pixel = GP_ColorToContextPixel(GP_COL_RED, &context); - blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, &context); - green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, &context); - yellow_pixel = GP_ColorToContextPixel(GP_COL_YELLOW, &context); - darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); - - redraw_screen(); - SDL_Flip(display); - - event_loop(); - - SDL_Quit(); - return 0; - -fail: - SDL_Quit(); - return 1; -} - http://repo.or.cz/w/gfxprim.git/commit/feddd1c185068f220e394cc7ec34ff3f0e6b… commit feddd1c185068f220e394cc7ec34ff3f0e6b5801 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 25 22:33:11 2012 +0100 tests: Port textaligntest to backends. diff --git a/demos/c_simple/Makefile b/demos/c_simple/Makefile index 708a3ca..b30fc23 100644 --- a/demos/c_simple/Makefile +++ b/demos/c_simple/Makefile @@ -9,7 +9,8 @@ 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 randomshapetest fonttest loaders_register blittest + fileview linetest randomshapetest fonttest loaders_register blittest+ textaligntest v4l2_show: LDLIBS+=-lGP_grabbers v4l2_grab: LDLIBS+=-lGP_grabbers diff --git a/demos/c_simple/textaligntest.c b/demos/c_simple/textaligntest.c new file mode 100644 index 0000000..0f1b4a3 --- /dev/null +++ b/demos/c_simple/textaligntest.c @@ -0,0 +1,167 @@ +/***************************************************************************** + * 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-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <GP.h> + +static GP_Pixel black_pixel, red_pixel, yellow_pixel, green_pixel, blue_pixel, + darkgray_pixel; + +static int font_flag = 0; + +static int X = 640; +static int Y = 480; + +static GP_FontFace *font = NULL; + +static GP_Backend *win; + +void redraw_screen(void) +{ + GP_Fill(win->context, black_pixel); + + /* draw axes intersecting in the middle, where text should be shown */ + GP_HLine(win->context, 0, X, Y/2, darkgray_pixel); + GP_VLine(win->context, X/2, 0, Y, darkgray_pixel); + + GP_TextStyle style = GP_DEFAULT_TEXT_STYLE; + + switch (font_flag) { + case 0: + style.font = &GP_DefaultProportionalFont; + break; + case 1: + style.font = &GP_DefaultConsoleFont; + break; + case 2: + style.font = font; + break; + } + + GP_Text(win->context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_BELOW, + yellow_pixel, black_pixel, "bottom left"); + GP_Text(win->context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, + red_pixel, black_pixel, "bottom right"); + GP_Text(win->context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_ABOVE, + blue_pixel, black_pixel, "top right"); + GP_Text(win->context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_ABOVE, + green_pixel, black_pixel, "top left"); +} + +static void event_loop(void) +{ + 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_X: + win->context->x_swap = !win->context->x_swap; + break; + case GP_KEY_Y: + win->context->y_swap = !win->context->y_swap; + break; + case GP_KEY_R: + win->context->axes_swap = !win->context->axes_swap; + GP_SWAP(X, Y); + break; + case GP_KEY_SPACE: + font_flag++; + + if (font) { + if (font_flag >= 3) + font_flag = 0; + } else { + if (font_flag >= 2) + font_flag = 0; + } + break; + case GP_KEY_ESC: + GP_BackendExit(win); + exit(0); + break; + } + break; + case GP_EV_SYS: + switch(ev.code) { + case GP_EV_SYS_QUIT: + GP_BackendExit(win); + exit(0); + break; + } + break; + } + + redraw_screen(); + GP_BackendFlip(win); + } +} + +void print_instructions(void) +{ + printf("Use the following keys to control the test:n"); + printf(" Space ........ toggle proportional/nonproportional fontn"); + printf(" X ............ mirror Xn"); + printf(" Y ............ mirror Yn"); + printf(" R ............ reverse X and Yn"); +} + +int main(int argc, char *argv[]) +{ + const char *backend_opts = "X11"; + + if (argc > 1) + font = GP_FontFaceLoad(argv[1], 0, 16); + + print_instructions(); + + win = GP_BackendInit(backend_opts, "Font Align Test", stderr); + + if (win == NULL) { + fprintf(stderr, "Failed to initalize backend '%s'n", + backend_opts); + return 1; + } + + black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, win->context); + red_pixel = GP_ColorToContextPixel(GP_COL_RED, win->context); + blue_pixel = GP_ColorToContextPixel(GP_COL_BLUE, win->context); + green_pixel = GP_ColorToContextPixel(GP_COL_GREEN, win->context); + yellow_pixel = GP_ColorToContextPixel(GP_COL_YELLOW, win->context); + darkgray_pixel = GP_ColorToContextPixel(GP_COL_GRAY_DARK, win->context); + + redraw_screen(); + + GP_BackendFlip(win); + + for (;;) { + GP_BackendWait(win); + event_loop(); + } +} + http://repo.or.cz/w/gfxprim.git/commit/cd4e4016c7c2bd7293eec6d9cc99e3355cc8… commit cd4e4016c7c2bd7293eec6d9cc99e3355cc8dd38 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 25 21:50:16 2012 +0100 tests: core: Add SubContext assertions. diff --git a/tests/core/Context.c b/tests/core/Context.c index 4e05306..af26656 100644 --- a/tests/core/Context.c +++ b/tests/core/Context.c @@ -96,11 +96,125 @@ static int Context_Alloc_Free(void) return TST_SUCCESS; } +/* + * Asserts that subcontext structure is initialized correctly + */ +static int subcontext_assert(const GP_Context *c, const GP_Context *sc, + GP_Size w, GP_Size h) +{ + if (c->bpp != sc->bpp) { + tst_msg("Context->bpp != SubContext->bpp"); + return TST_FAILED; + } + + if (c->bytes_per_row != sc->bytes_per_row) { + tst_msg("Context->bytes_per_row != SubContext->bytes_per_row"); + return TST_FAILED; + } + + if (sc->w != w) { + tst_msg("SubContext->w != %u (== %i)", w, sc->w); + return TST_FAILED; + } + + if (sc->h != h) { + tst_msg("SubContext->h != %u (== %i)", h, sc->h); + return TST_FAILED; + } + + if (sc->offset != 0) { + tst_msg("SubContext->offset != 0"); + return TST_FAILED; + } + + if (sc->pixel_type != GP_PIXEL_RGB888) { + tst_msg("SubContext->pixel_type != GP_PIXEL_RGB888"); + return TST_FAILED; + } + + if (sc->gamma != NULL) { + tst_msg("SubContext->gamma != NULL"); + return TST_FAILED; + } + + if (sc->axes_swap != 0 || sc->x_swap != 0 || sc->y_swap != 0) { + tst_msg("Wrong default orientation %i %i %i", + sc->axes_swap, sc->x_swap, sc->y_swap); + return TST_FAILED; + } + + /* access the start and end of the pixel buffer */ + *(char*)GP_PIXEL_ADDR(sc, 0, 0) = 0; + *(char*)GP_PIXEL_ADDR(sc, sc->w - 1, sc->h - 1) = 0; + + return 0; +} + +static int SubContext_Alloc_Free(void) +{ + GP_Context *c, *sc; + int ret; + + c = GP_ContextAlloc(300, 300, GP_PIXEL_RGB888); + + if (c == NULL) { + tst_msg("GP_ContextAlloc() failed"); + return TST_UNTESTED; + } + + sc = GP_SubContextAlloc(c, 100, 100, 100, 100); + + if (sc == NULL) { + GP_ContextFree(c); + return TST_FAILED; + } + + ret = subcontext_assert(c, sc, 100, 100); + + if (ret) + return ret; + + GP_ContextFree(c); + GP_ContextFree(sc); + + return TST_SUCCESS; +} + +static int SubContext_Create(void) +{ + GP_Context *c, sc; + int ret; + + c = GP_ContextAlloc(300, 300, GP_PIXEL_RGB888); + + if (c == NULL) { + tst_msg("GP_ContextAlloc() failed"); + return TST_UNTESTED; + } + + GP_SubContext(c, &sc, 100, 100, 100, 100); + + ret = subcontext_assert(c, &sc, 100, 100); + + if (ret) + return ret; + + GP_ContextFree(c); + + return TST_SUCCESS; +} + + const struct tst_suite tst_suite = { .suite_name = "Context Testsuite", .tests = { {.name = "Context Alloc Free", .tst_fn = Context_Alloc_Free, .flags = TST_CHECK_MALLOC}, + {.name = "SubContext Alloc Free", + .tst_fn = SubContext_Alloc_Free, + .flags = TST_CHECK_MALLOC}, + {.name = "SubContext Create", + .tst_fn = SubContext_Create}, {.name = NULL}, } }; ----------------------------------------------------------------------- Summary of changes: demos/c_simple/Makefile | 3 +- {tests/SDL => demos/c_simple}/textaligntest.c | 156 ++++++-------- tests/Makefile | 2 +- tests/SDL/Makefile | 15 -- tests/SDL/mixpixeltest.c | 228 -------------------- tests/SDL/runtest.sh | 10 - tests/SDL/subcontext.c | 281 ------------------------- tests/core/Context.c | 114 ++++++++++ 8 files changed, 186 insertions(+), 623 deletions(-) rename {tests/SDL => demos/c_simple}/textaligntest.c (57%) delete mode 100644 tests/SDL/Makefile delete mode 100644 tests/SDL/mixpixeltest.c delete mode 100755 tests/SDL/runtest.sh delete mode 100644 tests/SDL/subcontext.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: 7064952e38373799deaae59b2ea67093d75b3709
by metan 25 Nov '12

25 Nov '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 7064952e38373799deaae59b2ea67093d75b3709 (commit) from d87921f9670a726993a5bfd756e3ae09a3ba83ed (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/7064952e38373799deaae59b2ea67093d75b… commit 7064952e38373799deaae59b2ea67093d75b3709 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Nov 25 20:26:58 2012 +0100 tests: framework: Create JSON log to HTML converter. Create JSON to HTML log converted and remove the C implementation. diff --git a/tests/framework/Makefile b/tests/framework/Makefile index a688952..44ed5e1 100644 --- a/tests/framework/Makefile +++ b/tests/framework/Makefile @@ -20,7 +20,7 @@ libtst_preload.so: tst_preload.o tst_alloc_barriers.o tst_preload_FILE.o libtst.a: tst_suite.o tst_job.o tst_msg.o tst_log.o tst_main.o tst_timespec.o ar rcs $@ $^ -CLEAN+=libtst_preload.so libtst.a log.html log.json +CLEAN+=libtst_preload.so libtst.a log.json include $(TOPDIR)/app.mk include $(TOPDIR)/post.mk diff --git a/tests/framework/json_parse.py b/tests/framework/json_parse.py deleted file mode 100755 index b3e0833..0000000 --- a/tests/framework/json_parse.py +++ /dev/null @@ -1,72 +0,0 @@ -#!/usr/bin/env python - -# -# Sample python code to print testsuite name and test results from the JSON logfile -# - -import json - -# -# Create classes from JSON dictionary -# -class TestResult: - def __init__(self, test_result): - self.name = test_result["Test Name"] - self.result = test_result["Test Result"] - self.reports = test_result["Test Reports"] - self.cpu_time = test_result["CPU Time"] - self.run_time = test_result["Run Time"] - - if ("Malloc Stats" in test_result): - self.malloc_stats = 1 - - def __str__(self): - return "Test '%s' ended with '%s' (CPU %is) (TIME %is)" % - (self.name, self.result, self.cpu_time, self.run_time) - - -class TestSuite: - def __init__(self, testsuite_result): - self.name = testsuite_result["Suite Name"] - self.test_results = [] - - for test_result in testsuite_result["Test Results"]: - self.test_results.append(TestResult(test_result)) - - def __str__(self): - ret = 'tt' + self.name + 'nn' - - max_len = 0 - for i in self.test_results: - max_len = max(max_len, len(i.name)) - - for i in self.test_results: - ret += i.name - - padds = (max_len - len(i.name)) - - while padds > 0: - ret += ' ' - padds-=1 - - ret += " | %.3fs/%.3fs | %sn" % - (i.cpu_time, i.run_time, i.result) - - for j in i.reports: - ret += " (%s)n" % j - - return ret - -def main(): - # parse JSON - f = open('log.json') - data = json.load(f) - f.close() - - # convert to python objects - test_suite = TestSuite(data) - - print(test_suite) - -if __name__ == '__main__': - main() diff --git a/tests/framework/log2html.py b/tests/framework/log2html.py new file mode 100755 index 0000000..c417daa --- /dev/null +++ b/tests/framework/log2html.py @@ -0,0 +1,289 @@ +#!/usr/bin/env python + +# +# Script to convert testsuite JSON log into html page +# + +import json + +# +# Test result to html color dict +# +html_colors = { + 'Success': '#008000', + 'Skipped': '#888888', + 'Untested': '#0000bb', + 'Internal Error': '#800000', + 'Segmentation Fault': '#e00000', + 'Timeout': '#800080', + 'Aborted': '#e00000', + 'FP Exception': '#e00000', + 'Memory Leak': '#a0a000', + 'Failed': '#e00000' +} + +# +# Convert bytes to human-readable string +# +def bytes_conv(size): + if (size < 512): + return "%iB" % (size) + + if (size < 1024 * 512): + return "%.2fkB" % (float(size) / 1024) + + if (size < 1024 * 1024 * 512): + return "%.2fMB" % (float(size) / 1024 / 1024) + + return "%.2fGB" % (float(size) / 1024 / 1024 / 1024) + +# +# Malloc statistics Class created from JSON dict +# +class MallocStats: + def __init__(self, malloc_stats): + self.total_size = malloc_stats["Total Size"] + self.total_chunks = malloc_stats["Total Chunks"] + self.max_size = malloc_stats["Max Size"] + self.max_chunks = malloc_stats["Max Chunks"] + self.lost_size = malloc_stats["Lost Size"] + self.lost_chunks = malloc_stats["Lost Chunks"] + + def html(self): + print(' <tr>') + print(' <td bgcolor="#ffffcc" colspan="3">') + print(' <center>') + print(' <table>') + + # Table header + print(' <tr>') + + print(' <td bgcolor="#ffffaa">') + print(' Total size') + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' Total chunks') + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' Max size') + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' Max chunks') + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' Lost size') + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' Lost chunks') + print(' </td>') + + print(' </tr>') + + # Malloc data + print(' <tr>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.total_size)) + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.total_chunks)) + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.max_size)) + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.max_chunks)) + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.lost_size)) + print(' </td>') + + print(' <td bgcolor="#ffffaa">') + print(' <center>%s</center>' % + bytes_conv(self.lost_chunks)) + print(' </td>') + + print(' </tr>') + + print(' </table>') + print(' </center>') + print(' </td>') + print(' </tr>') + +# +# Benchmark statistics Class created from JSON dict +# +class BenchmarkData: + def __init__(self, bench_data): + self.time_mean = bench_data["Time Mean"] + self.time_variance = bench_data["Time Variance"] + self.iterations = bench_data["Iterations"] + + def html(self): + print(' <tr>') + print(' <td bgcolor="#fd8" colspan="3">') + print(' <center>') + print(' <table>') + + # Table header + print(' <tr>') + + print(' <td colspan="2" bgcolor="#fb2">') + print(' <center>Benchmark data</center>') + print(' </td>') + + print(' </tr>') + + print(' <tr>') + + print(' <td bgcolor="#fc4">') + print(' <center>Iterations</center>') + print(' </td>') + + print(' <td bgcolor="#fc4">') + print(' <center>Mean ∓ Variance</center>') + print(' </td>') + + print(' </tr>') + + # Benchmark data + print(' <tr>') + + print(' <td bgcolor="#fc4">') + print(' %i' % (self.iterations)) + print(' </td>') + + print(' <td bgcolor="#fc4">') + print(' %.6fs ∓ %.6fs' % + (self.time_mean, self.time_variance)) + print(' </td>') + + print(' </tr>') + + print(' </table>') + print(' </center>') + print(' </td>') + print(' </tr>') + +# +# Test Result Class created from JSON dict +# +class TestResult: + def __init__(self, test_result): + self.name = test_result["Test Name"] + self.result = test_result["Test Result"] + self.reports = test_result["Test Reports"] + self.cpu_time = test_result["CPU Time"] + self.run_time = test_result["Run Time"] + self.test_reports = test_result["Test Reports"] + + if ("Malloc Stats" in test_result): + self.malloc_stats = MallocStats(test_result["Malloc Stats"]) + + if ("Benchmark" in test_result): + self.bench_data = BenchmarkData(test_result["Benchmark"]) + + def html(self, bg_color): + # Print test result + print(' <tr>') + + print(' <td bgcolor="%s">%s </td>' % (bg_color, self.name)) + + print(' <td bgcolor="%s">' % (bg_color)) + print(' <center>') + print(' %.3fs %.3fs' % (self.run_time, self.cpu_time)) + print(' </center>') + print(' </td>') + + print(' <td bgcolor="%s">' % (html_colors[self.result])) + print(' <center> %s </center>' % + (self.result)) + print(' </td>') + + print(' </tr>') + + # Add malloc statistics, if present + if (hasattr(self, 'malloc_stats')): + self.malloc_stats.html() + + # And benchmark data + if (hasattr(self, 'bench_data')): + self.bench_data.html() + + # And test messages + if (self.test_reports): + print(' <tr>') + print(' <td colspan="3" bgcolor="#eeeeee">') + + for msg in self.test_reports: + print('   %s ' % (msg)) + + if (self.test_reports): + print(' </td>') + print(' </tr>') + +class TestSuite: + def __init__(self, testsuite_result): + self.suite_name = testsuite_result["Suite Name"] + self.test_results = [] + + for test_result in testsuite_result["Test Results"]: + self.test_results.append(TestResult(test_result)) + + def html(self): + print('<html>') + print(' <head>') + print(' </head>') + print(' <body>') + + print(' <table bgcolor="#99a">') + print(' <tr>') + print(' <td colspan="3" bgcolor="#bbbbff">'); + print(' <center>%s</center>' % (self.suite_name)) + print(' </td>') + print(' </tr>') + + flag = False; + + for tst in self.test_results: + if (flag): + bg_color = '#ccccee' + else: + bg_color = '#ddddee' + + flag = not flag + + tst.html(bg_color) + + print(' </table>') + + print(' </body>') + print('</html>') + +def main(): + # parse JSON + f = open('log.json') + data = json.load(f) + f.close() + + # convert to python objects + test_suite = TestSuite(data) + + test_suite.html() + +if __name__ == '__main__': + main() diff --git a/tests/framework/tst_log.c b/tests/framework/tst_log.c index cc86b6f..a7cf9ec 100644 --- a/tests/framework/tst_log.c +++ b/tests/framework/tst_log.c @@ -30,36 +30,6 @@ #include "tst_timespec.h" #include "tst_log.h" -static const char *ret_to_bg_color(enum tst_ret ret) -{ - switch (ret) { - case TST_SUCCESS: - return "#008000"; - case TST_SKIPPED: - return "#888888"; - case TST_UNTESTED: - return "#0000bb"; - case TST_INTERR: - return "#800000"; - case TST_SIGSEGV: - return "#e00000"; - case TST_TIMEOUT: - return "#800080"; - case TST_ABORTED: - return "#e00000"; - case TST_FPE: - return "#e00000"; - case TST_MEMLEAK: - return "#a0a000"; - case TST_FAILED: - return "#e00000"; - case TST_MAX: - break; - } - - return "#000000"; -} - static const char *ret_to_str(enum tst_ret ret) { switch (ret) { @@ -90,210 +60,6 @@ static const char *ret_to_str(enum tst_ret ret) return "Unknown"; } -static void bytes_human_readable(FILE *f, size_t bytes) -{ - if (bytes < 512) { - fprintf(f, "%zuB", bytes); - return; - } - - if (bytes < 1024 * 512) { - fprintf(f, "%.2fkB", (float)bytes / 1024); - return; - } - - if (bytes < 1024 * 1024 * 512) { - fprintf(f, "%.2fMB", (float)bytes / 1024 / 1024); - return; - } - - fprintf(f, "%.2fGB", (float)bytes / 1024 / 1024 / 1024); -} - -static void malloc_stats_html(struct tst_job *job, FILE *f, const char *padd) -{ - /* Create innter table */ - fprintf(f, "%s<tr>n", padd); - fprintf(f, "%s <td bgcolor="#ffffcc" colspan="3">n", padd); - fprintf(f, "%s <center>n", padd); - fprintf(f, "%s <table>n", padd); - - /* Create header */ - fprintf(f, "%s <tr>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Total sizen", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Total chunksn", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Max sizen", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Max chunksn", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Lost sizen", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s Lost chunksn", padd); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s </tr>n", padd); - - /* Create data */ - fprintf(f, "%s <tr>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>", padd); - bytes_human_readable(f, job->malloc_stats.total_size); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>%u</center>n", - padd, job->malloc_stats.total_chunks); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>", padd); - bytes_human_readable(f, job->malloc_stats.max_size); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>%u</center>n", - padd, job->malloc_stats.max_chunks); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>", padd); - bytes_human_readable(f, job->malloc_stats.lost_size); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#ffffaa">n", padd); - fprintf(f, "%s <center>%u</center>n", - padd, job->malloc_stats.lost_chunks); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s </tr>n", padd); - - fprintf(f, "%s </table>n", padd); - fprintf(f, "%s </center>n", padd); - fprintf(f, "%s </td>n", padd); - fprintf(f, "%s</tr>n", padd); -} - -static void benchmark_stats_html(struct tst_job *job, FILE *f, const char *padd) -{ - /* Create innter table */ - fprintf(f, "%s<tr>n", padd); - fprintf(f, "%s <td bgcolor="#fd8" colspan="3">n", padd); - fprintf(f, "%s <center>n", padd); - fprintf(f, "%s <table>n", padd); - - /* Create header */ - fprintf(f, "%s <tr>n", padd); - - fprintf(f, "%s <td colspan="2" bgcolor="#fb2">n", padd); - fprintf(f, "%s <center>Benchmark data", padd); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s </tr>n", padd); - fprintf(f, "%s <tr>n", padd); - - fprintf(f, "%s <td bgcolor="#fc4">n", padd); - fprintf(f, "%s <center>Iterations", padd); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#fc4">n", padd); - fprintf(f, "%s <center>Mean ∓ Variance", padd); - fprintf(f, "</center>n"); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s </tr>n", padd); - - /* Create data */ - fprintf(f, "%s <tr>n", padd); - - fprintf(f, "%s <td bgcolor="#fc4">n", padd); - fprintf(f, "%s <center>%i</center>n", padd, job->bench_iter); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s <td bgcolor="#fc4">n", padd); - fprintf(f, "%s <center>%i.%06is ∓ %i.%06is</center>n", padd, - (int)job->bench_mean.tv_sec, (int)job->bench_mean.tv_nsec/1000, - (int)job->bench_var.tv_sec, (int)job->bench_var.tv_nsec/1000); - fprintf(f, "%s </td>n", padd); - - fprintf(f, "%s </tr>n", padd); - - fprintf(f, "%s </table>n", padd); - fprintf(f, "%s </center>n", padd); - fprintf(f, "%s </td>n", padd); - fprintf(f, "%s</tr>n", padd); -} - -static int append_html(struct tst_job *job, FILE *f) -{ - const char *padd = " "; - int sec, nsec; - static int hack_counter = 0; - const char *bgcol; - - timespec_diff(&sec, &nsec, &job->start_time, &job->stop_time); - - if (hack_counter) - bgcol = "#ccccee"; - else - bgcol = "#ddddee"; - - fprintf(f, "%s<tr>n", padd); - fprintf(f, "%s <td bgcolor="%s">%s </td>n", - padd, bgcol, job->test->name); - fprintf(f, "%s <td bgcolor="%s">n", padd, bgcol); - fprintf(f, "%s <center>%i.%03is %i.%03is" - "</center>n", padd, sec, nsec/1000000, - (int)job->cpu_time.tv_sec, (int)job->cpu_time.tv_nsec/1000000); - fprintf(f, "%s </td>n", padd); - fprintf(f, "%s <td bgcolor="%s"><center>" - " %s </td></center>n", padd, - ret_to_bg_color(job->result), ret_to_str(job->result)); - - struct tst_msg *msg; - - /* If calculated include malloc report */ - if (job->test->flags & TST_CHECK_MALLOC) - malloc_stats_html(job, f, padd); - - if (job->bench_iter) - benchmark_stats_html(job, f, padd); - - for (msg = job->store.first; msg != NULL; msg = msg->next) { - fprintf(f, "%s<tr>n", padd); - fprintf(f, "%s <td colspan="3" bgcolor="#eeeeee">n", padd); - fprintf(f, "%s   %sn", - padd, msg->msg); - fprintf(f, "%s </td>n", padd); - fprintf(f, "%s</tr>n", padd); - } - - fprintf(f, "%s</tr>n", padd); - - hack_counter = !hack_counter; - - return 0; -} - static int append_msg_json(struct tst_job *job, FILE *f) { struct tst_msg *msg; @@ -391,9 +157,6 @@ static int append_json(struct tst_job *job, FILE *f) int tst_log_append(struct tst_job *job, FILE *f, enum tst_log_fmt format) { switch (format) { - case TST_LOG_HTML: - return append_html(job, f); - break; case TST_LOG_JSON: return append_json(job, f); break; @@ -404,30 +167,6 @@ int tst_log_append(struct tst_job *job, FILE *f, enum tst_log_fmt format) return 1; } -FILE *open_html(const struct tst_suite *suite, const char *path) -{ - FILE *f; - - f = fopen(path, "w"); - - if (f == NULL) - return NULL; - - fprintf(f, "<html>n <head>n </head>n <body>n " - "<table bgcolor="#99a">n"); - - fprintf(f, " <tr><td colspan="3" bgcolor="#bbbbff"><center>%s" - "</center></td></tr>n", suite->suite_name); - - fprintf(f, " <tr>n"); - fprintf(f, " <td bgcolor="#eee"><center>Test Name</center></td>n"); - fprintf(f, " <td bgcolor="#eee"><center>Time/CPU</center></td>n"); - fprintf(f, " <td bgcolor="#eee"><center>Result</center></td>n"); - fprintf(f, " </tr>n"); - - return f; -} - static void write_system_info_json(FILE *f) { struct utsname buf; @@ -487,9 +226,6 @@ FILE *tst_log_open(const struct tst_suite *suite, const char *path, enum tst_log_fmt format) { switch (format) { - case TST_LOG_HTML: - return open_html(suite, path); - break; case TST_LOG_JSON: return open_json(suite, path); break; @@ -500,12 +236,6 @@ FILE *tst_log_open(const struct tst_suite *suite, const char *path, return NULL; } -static int close_html(FILE *f) -{ - fprintf(f, " </table>n </body>n</html>n"); - return fclose(f); -} - static int close_json(FILE *f) { fprintf(f, "nt]n}n"); @@ -515,9 +245,6 @@ static int close_json(FILE *f) int tst_log_close(FILE *f, enum tst_log_fmt format) { switch (format) { - case TST_LOG_HTML: - return close_html(f); - break; case TST_LOG_JSON: return close_json(f); break; diff --git a/tests/framework/tst_log.h b/tests/framework/tst_log.h index 413c854..28fecf1 100644 --- a/tests/framework/tst_log.h +++ b/tests/framework/tst_log.h @@ -35,7 +35,6 @@ struct tst_suite; struct tst_job; enum tst_log_fmt { - TST_LOG_HTML, TST_LOG_JSON, }; diff --git a/tests/framework/tst_suite.c b/tests/framework/tst_suite.c index 1c0440b..e929225 100644 --- a/tests/framework/tst_suite.c +++ b/tests/framework/tst_suite.c @@ -115,7 +115,7 @@ static void test_job_report(const struct tst_job *job) "------------------------- n"); } -static int run_test(const struct tst_test *test, FILE *html, FILE *json) +static int run_test(const struct tst_test *test, FILE *json) { struct tst_job job; @@ -127,7 +127,6 @@ static int run_test(const struct tst_test *test, FILE *html, FILE *json) * child and parent and the lines in the resulting * file would be repeated several times. */ - fflush(html); fflush(json); tst_job_run(&job); @@ -136,7 +135,6 @@ static int run_test(const struct tst_test *test, FILE *html, FILE *json) /* report result into stdout */ test_job_report(&job); - tst_log_append(&job, html, TST_LOG_HTML); tst_log_append(&job, json, TST_LOG_JSON); /* Free the test message store */ @@ -155,12 +153,11 @@ void tst_run_suite(const struct tst_suite *suite, const char *tst_name) fprintf(stderr, "Running e[1;37m%se[0mnn", suite->suite_name); //TODO: - FILE *html = tst_log_open(suite, "log.html", TST_LOG_HTML); FILE *json = tst_log_open(suite, "log.json", TST_LOG_JSON); for (i = 0; suite->tests[i].name != NULL; i++) { if (tst_name == NULL || !strcmp(tst_name, suite->tests[i].name)) { - ret = run_test(&suite->tests[i], html, json); + ret = run_test(&suite->tests[i], json); counters[ret]++; if (ret != TST_SKIPPED) @@ -168,7 +165,6 @@ void tst_run_suite(const struct tst_suite *suite, const char *tst_name) } } - tst_log_close(html, TST_LOG_HTML); tst_log_close(json, TST_LOG_JSON); float percents; ----------------------------------------------------------------------- Summary of changes: tests/framework/Makefile | 2 +- tests/framework/json_parse.py | 72 ---------- tests/framework/log2html.py | 289 +++++++++++++++++++++++++++++++++++++++++ tests/framework/tst_log.c | 273 -------------------------------------- tests/framework/tst_log.h | 1 - tests/framework/tst_suite.c | 8 +- 6 files changed, 292 insertions(+), 353 deletions(-) delete mode 100755 tests/framework/json_parse.py create mode 100755 tests/framework/log2html.py 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: d87921f9670a726993a5bfd756e3ae09a3ba83ed
by metan 22 Nov '12

22 Nov '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 d87921f9670a726993a5bfd756e3ae09a3ba83ed (commit) from 75851e6234cc1c67c2c0bf730ef434ebf43227fe (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/d87921f9670a726993a5bfd756e3ae09a3ba… commit d87921f9670a726993a5bfd756e3ae09a3ba83ed Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Nov 22 17:38:24 2012 +0100 loaders: Avoid further work when loader issued ENOSYS. diff --git a/libs/loaders/GP_Loader.c b/libs/loaders/GP_Loader.c index 3d626a6..4966757 100644 --- a/libs/loaders/GP_Loader.c +++ b/libs/loaders/GP_Loader.c @@ -255,6 +255,13 @@ GP_Context *GP_LoadImage(const char *src_path, GP_ProgressCallback *callback) return img; } + /* + * Avoid further work if signature was correct but the loader issued + * ENOSYS. + */ + if (errno == ENOSYS) + return NULL; + sig_load = loader_by_signature(src_path); if (ext_load && sig_load) { ----------------------------------------------------------------------- Summary of changes: libs/loaders/GP_Loader.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 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: 75851e6234cc1c67c2c0bf730ef434ebf43227fe
by metan 21 Nov '12

21 Nov '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 75851e6234cc1c67c2c0bf730ef434ebf43227fe (commit) from 9d337186e86fbed784c7a616d9a41c969c079e61 (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/75851e6234cc1c67c2c0bf730ef434ebf432… commit 75851e6234cc1c67c2c0bf730ef434ebf43227fe Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Nov 21 23:43:54 2012 +0100 gfx: Fix "no newline at the end of file" warnings. diff --git a/include/gfx/GP_AngleUtils.h b/include/gfx/GP_AngleUtils.h index f896b37..6d8bd67 100644 --- a/include/gfx/GP_AngleUtils.h +++ b/include/gfx/GP_AngleUtils.h @@ -27,4 +27,4 @@ double GP_NormalizeAngle(double phi); int GP_AngleInRange(double angle, double start, double end); -#endif No newline at end of file +#endif diff --git a/libs/gfx/GP_AngleUtils.c b/libs/gfx/GP_AngleUtils.c index f1c279b..67911b4 100644 --- a/libs/gfx/GP_AngleUtils.c +++ b/libs/gfx/GP_AngleUtils.c @@ -46,4 +46,4 @@ int GP_AngleInRange(double angle, double start, double end) return (angle >= start && angle <= 2*M_PI) || (angle >= 0 && angle <= end); } -} No newline at end of file +} ----------------------------------------------------------------------- Summary of changes: include/gfx/GP_AngleUtils.h | 2 +- libs/gfx/GP_AngleUtils.c | 2 +- 2 files changed, 2 insertions(+), 2 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: 9d337186e86fbed784c7a616d9a41c969c079e61
by metan 21 Nov '12

21 Nov '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 9d337186e86fbed784c7a616d9a41c969c079e61 (commit) from 253ef469ede882b4b2bea7d25661d50fdda8d767 (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/9d337186e86fbed784c7a616d9a41c969c07… commit 9d337186e86fbed784c7a616d9a41c969c079e61 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Nov 21 23:39:49 2012 +0100 tests: framework: Silence stderr when lscpu is not found. diff --git a/tests/framework/tst_log.c b/tests/framework/tst_log.c index 9daec17..cc86b6f 100644 --- a/tests/framework/tst_log.c +++ b/tests/framework/tst_log.c @@ -444,7 +444,7 @@ static void write_system_info_json(FILE *f) fprintf(f, "tt"CPU": {"); /* lscpu is part of reasonably new util-linux */ - FILE *cmd = popen("lscpu", "r"); + FILE *cmd = popen("lscpu 2> /dev/null", "r"); if (cmd != NULL) { char id[256], val[1024]; ----------------------------------------------------------------------- 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

[repo.or.cz] gfxprim.git branch master updated: 253ef469ede882b4b2bea7d25661d50fdda8d767
by metan 21 Nov '12

21 Nov '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 253ef469ede882b4b2bea7d25661d50fdda8d767 (commit) from 22301c3c370f269b10b84582ee524b46abf70019 (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/253ef469ede882b4b2bea7d25661d50fdda8… commit 253ef469ede882b4b2bea7d25661d50fdda8d767 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Wed Nov 21 23:32:14 2012 +0100 tests: Remove forgotten -lSDL diff --git a/tests/drivers/Makefile b/tests/drivers/Makefile index c2d2679..3a028d8 100644 --- a/tests/drivers/Makefile +++ b/tests/drivers/Makefile @@ -2,7 +2,7 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) -LDLIBS+=-lGP -lGP_backends -lSDL -L$(TOPDIR)/build/ +LDLIBS+=-lGP -lGP_backends -L$(TOPDIR)/build/ APPS=$(CSOURCES:.c=) ----------------------------------------------------------------------- Summary of changes: tests/drivers/Makefile | 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