- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch generate updated: bdecc49ad74d5d50032ba686e53eb98c5bec913e
by metan 28 Aug '11

28 Aug '11

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, generate has been updated via bdecc49ad74d5d50032ba686e53eb98c5bec913e (commit) via f2727c95f0c8d87bb9ad90c581e36c3acfa55b91 (commit) from ce1f7e60318bc537190107fef5834338da94706d (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/bdecc49ad74d5d50032ba686e53eb98c5bec… commit bdecc49ad74d5d50032ba686e53eb98c5bec913e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Aug 28 11:19:33 2011 +0200 Added experimental subcontext support. * Works only for byte aligned pixels. * Clipping is broken on some primitives. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index 4c620b8..e5f62bf 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -50,6 +50,7 @@ typedef struct GP_Context { uint8_t x_swap:1; /* swap direction on x */ uint8_t y_swap:1; /* swap direction on y */ uint8_t bit_endian:1; /* GP_BIT_ENDIAN */ + uint8_t free_pixels:1; /* If set pixels are freed on GP_ContextFree */ } GP_Context; /* Returns the pixel type used by the context. */ @@ -88,7 +89,7 @@ static inline GP_PixelType GP_GetContextPixelType(const GP_Context *context) /* * Allocate context. */ -GP_Context *GP_ContextAlloc(uint32_t w, uint32_t h, GP_PixelType type); +GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); /* * If passed the pixels are copied to newly created context, otherwise @@ -102,6 +103,12 @@ GP_Context *GP_ContextAlloc(uint32_t w, uint32_t h, GP_PixelType type); GP_Context *GP_ContextCopy(GP_Context *context, int flag); /* + * Create subcontext. + */ +GP_Context *GP_ContextSubContext(GP_Context *context, GP_Coord x, GP_Coord y, + GP_Size w, GP_Size h); + +/* * Converts context to different pixel type. * * This is naive implementation that doesn't do any ditherings or error diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index af6ef26..fffabba 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -63,12 +63,14 @@ GP_Context *GP_ContextCopy(GP_Context *context, int flag) new->axes_swap = context->axes_swap; new->y_swap = context->y_swap; new->x_swap = context->x_swap; + + new->free_pixels = 1; return new; } -GP_Context *GP_ContextAlloc(uint32_t w, uint32_t h, GP_PixelType type) +GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) { GP_Context *context = malloc(sizeof(GP_Context)); uint32_t bpp = GP_PixelSize(type); @@ -96,6 +98,8 @@ GP_Context *GP_ContextAlloc(uint32_t w, uint32_t h, GP_PixelType type) context->axes_swap = 0; context->y_swap = 0; context->x_swap = 0; + + context->free_pixels = 1; return context; } @@ -114,10 +118,47 @@ GP_Context *GP_ContextConvert(const GP_Context *context, GP_PixelType res_type) void GP_ContextFree(GP_Context *context) { - free(context->pixels); + if (context == NULL) + return; + + if (context->free_pixels) + free(context->pixels); + free(context); } +GP_Context *GP_ContextSubContext(GP_Context *context, GP_Coord x, GP_Coord y, + GP_Size w, GP_Size h) +{ + GP_CHECK(context, "NULL context"); + GP_CHECK(context->w >= x + w, "Subcontext w out of original context."); + GP_CHECK(context->h >= y + h, "Subcontext h out of original context."); + + GP_Context *ret = malloc(sizeof(GP_Context)); + + if (ret == NULL) + return NULL; + + ret->bpp = context->bpp; + ret->bytes_per_row = context->bytes_per_row; + + ret->w = w; + ret->h = h; + + ret->pixel_type = context->pixel_type; + + /* rotation and mirroring */ + ret->axes_swap = context->axes_swap; + ret->y_swap = context->y_swap; + ret->x_swap = context->x_swap; + + ret->pixels = GP_PIXEL_ADDR(context, x, y); + + ret->free_pixels = 0; + + return ret; +} + GP_RetCode GP_ContextDump(GP_Context *context, const char *path) { FILE *f = fopen(path, "w"); diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 22292e5..d99fdb9 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -6,7 +6,7 @@ INCLUDE=core gfx SDL backends LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky- symbolstest textaligntest trianglefps input blittest + symbolstest textaligntest trianglefps input blittest subcontext include $(TOPDIR)/include.mk include $(TOPDIR)/app.mk diff --git a/tests/SDL/subcontext.c b/tests/SDL/subcontext.c new file mode 100644 index 0000000..963e8e8 --- /dev/null +++ b/tests/SDL/subcontext.c @@ -0,0 +1,277 @@ +/***************************************************************************** + * 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, red, green; + +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 10; +} + +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, TEXT, col); +} + +void redraw_screen(void) +{ + if (pause_flag) + return; + + SDL_LockSurface(display); + + uint8_t v = random() % 128 + 50; + GP_Color 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], "-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_ColorToPixel(&context, GP_COL_BLACK); + white = GP_ColorToPixel(&context, GP_COL_WHITE); + gray = GP_ColorToPixel(&context, GP_COL_GRAY_DARK); + red = GP_ColorToPixel(&context, GP_COL_RED); + green = GP_ColorToPixel(&context, GP_COL_GREEN); + + sub_context = GP_ContextSubContext(&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; +} + http://repo.or.cz/w/gfxprim.git/commit/f2727c95f0c8d87bb9ad90c581e36c3acfa5… commit f2727c95f0c8d87bb9ad90c581e36c3acfa55b91 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Aug 28 11:18:49 2011 +0200 Made the TextMetric use default style. diff --git a/libs/text/GP_Text.c b/libs/text/GP_Text.c index 073561d..65f025c 100644 --- a/libs/text/GP_Text.c +++ b/libs/text/GP_Text.c @@ -29,7 +29,7 @@ #include "core/GP_DefFnPerBpp.h" #include "GP_Text.h" -static GP_TextStyle DefaultStyle = GP_DEFAULT_TEXT_STYLE; +GP_TextStyle GP_DefaultStyle = GP_DEFAULT_TEXT_STYLE; /* Generate drawing functions for various bit depths. */ GP_DEF_FILL_FN_PER_BPP(GP_Text_Raw, DEF_TEXT_FN) @@ -44,7 +44,7 @@ GP_RetCode GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, return GP_ENULLPTR; if (style == NULL) - style = &DefaultStyle; + style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); @@ -100,7 +100,7 @@ GP_RetCode GP_Text(GP_Context *context, const GP_TextStyle *style, return GP_ENULLPTR; if (style == NULL) - style = &DefaultStyle; + style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); @@ -152,7 +152,7 @@ GP_RetCode GP_BoxCenteredText_Raw(GP_Context *context, const GP_TextStyle *style return GP_ENULLPTR; if (style == NULL) - style = &DefaultStyle; + style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); @@ -176,7 +176,7 @@ GP_RetCode GP_BoxCenteredText(GP_Context *context, const GP_TextStyle *style, return GP_ENULLPTR; if (style == NULL) - style = &DefaultStyle; + style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); diff --git a/libs/text/GP_TextMetric.c b/libs/text/GP_TextMetric.c index cac94cf..d22acc9 100644 --- a/libs/text/GP_TextMetric.c +++ b/libs/text/GP_TextMetric.c @@ -19,13 +19,15 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos(a)gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ #include "core/GP_Common.h" #include "GP_TextMetric.h" +extern GP_TextStyle GP_DefaultStyle; + static unsigned int SpaceWidth(const GP_TextStyle *style) { //TODO: Does space change with pixel_yspace? @@ -59,11 +61,15 @@ static unsigned int MaxCharsWidth(const GP_TextStyle *style, const char *str) unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) { - GP_CHECK_TEXT_STYLE(style); GP_CHECK(str, "NULL string specified"); unsigned int i, len = 0; - unsigned int space = SpaceWidth(style); + unsigned int space; + + if (style == NULL) + style = &GP_DefaultStyle; + + space = SpaceWidth(style); if (str[0] == '0') return 0; @@ -76,11 +82,14 @@ unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str) unsigned int GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) { - GP_CHECK_TEXT_STYLE(style); - unsigned int space_width = SpaceWidth(style); - unsigned int char_width = style->font->max_bounding_width - * (style->pixel_xmul + style->pixel_xspace); + unsigned int char_width; + + if (style == NULL) + style = &GP_DefaultStyle; + + char_width = style->font->max_bounding_width + * (style->pixel_xmul + style->pixel_xspace); if (len == 0) return 0; @@ -91,12 +100,16 @@ unsigned int GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len) unsigned int GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, unsigned int len) { - GP_CHECK_TEXT_STYLE(style); GP_CHECK(str, "NULL string specified"); - unsigned int space_width = SpaceWidth(style); + unsigned int space_width; unsigned int char_width; + if (style == NULL) + style = &GP_DefaultStyle; + + space_width = SpaceWidth(style); + if (len == 0) return 0; @@ -107,7 +120,8 @@ unsigned int GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, unsigned int GP_TextHeight(const GP_TextStyle *style) { - GP_CHECK_TEXT_STYLE(style); + if (style == NULL) + style = &GP_DefaultStyle; return style->font->height * style->pixel_ymul + (style->font->height - 1) * style->pixel_yspace; @@ -115,17 +129,25 @@ unsigned int GP_TextHeight(const GP_TextStyle *style) unsigned int GP_TextAscent(const GP_TextStyle *style) { - GP_CHECK_TEXT_STYLE(style); + unsigned int h; + + if (style == NULL) + style = &GP_DefaultStyle; - unsigned int h = style->font->height - style->font->baseline; + h = style->font->height - style->font->baseline; + return h * style->pixel_ymul + (h - 1) * style->pixel_yspace; } unsigned int GP_TextDescent(const GP_TextStyle *style) { - GP_CHECK_TEXT_STYLE(style); + unsigned int h; + + if (style == NULL) + style = &GP_DefaultStyle; - unsigned int h = style->font->baseline; + h = style->font->baseline; + return h * style->pixel_ymul + (h - 1) * style->pixel_yspace; } ----------------------------------------------------------------------- Summary of changes: include/core/GP_Context.h | 9 ++- libs/core/GP_Context.c | 45 ++++++++- libs/text/GP_Text.c | 10 +- libs/text/GP_TextMetric.c | 50 ++++++--- tests/SDL/Makefile | 2 +- tests/SDL/{blittest.c => subcontext.c} | 186 +++++++++++++++++++++---------- 6 files changed, 219 insertions(+), 83 deletions(-) copy tests/SDL/{blittest.c => subcontext.c} (53%) 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 generate-waf updated: 3d26fff40a37aee0793346004846b5911d901f3c
by gavento 26 Aug '11

26 Aug '11

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, generate-waf has been updated via 3d26fff40a37aee0793346004846b5911d901f3c (commit) from ee1abb0bacc0c86b382685d521ab6828efa4af0f (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/3d26fff40a37aee0793346004846b5911d90… commit 3d26fff40a37aee0793346004846b5911d901f3c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Aug 26 11:52:23 2011 +0200 Fix rebuilding diff --git a/wscript b/wscript index e2d1805..9d52c4a 100644 --- a/wscript +++ b/wscript @@ -40,7 +40,7 @@ def configure(cnf): def build(bld): # Generate all generated headers, regardless of the module include = bld.path.find_node('include') - bld.template(source=include.ant_glob('**/*.h.t'), in_src=True) + bld.template(source=include.ant_glob('**/*.h.t'), in_src=True, update_outputs=True) bld.add_group() # Recurse on modules uses = [] ----------------------------------------------------------------------- Summary of changes: wscript | 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 generate-waf updated: ee1abb0bacc0c86b382685d521ab6828efa4af0f
by gavento 26 Aug '11

26 Aug '11

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, generate-waf has been updated via ee1abb0bacc0c86b382685d521ab6828efa4af0f (commit) from bc6e962ae2c0418d82e47e7f10601352679a041f (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/ee1abb0bacc0c86b382685d521ab6828efa4… commit ee1abb0bacc0c86b382685d521ab6828efa4af0f Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Aug 26 11:35:57 2011 +0200 Fig parallel build diff --git a/wscript b/wscript index 25cae62..e2d1805 100644 --- a/wscript +++ b/wscript @@ -41,6 +41,7 @@ def build(bld): # Generate all generated headers, regardless of the module include = bld.path.find_node('include') bld.template(source=include.ant_glob('**/*.h.t'), in_src=True) + bld.add_group() # Recurse on modules uses = [] for mod in 'core gfx text loaders filters input backends SDL'.split(): diff --git a/wscript_lib.py b/wscript_lib.py index fa9c4df..1dc353e 100644 --- a/wscript_lib.py +++ b/wscript_lib.py @@ -84,9 +84,7 @@ class GitCheck(GitDist, DistCheck): ext_algo = {} def execute(self): self.recurse([os.path.dirname(Context.g_module.root_path)]) - Logs.info('A0') self.git_archive() - Logs.info('A1') self.check() ----------------------------------------------------------------------- Summary of changes: wscript | 1 + wscript_lib.py | 2 -- 2 files changed, 1 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 generate-waf created: bc6e962ae2c0418d82e47e7f10601352679a041f
by gavento 26 Aug '11

26 Aug '11

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, generate-waf has been created at bc6e962ae2c0418d82e47e7f10601352679a041f (commit) - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/bc6e962ae2c0418d82e47e7f10601352679a… commit bc6e962ae2c0418d82e47e7f10601352679a041f Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Fri Aug 26 11:13:15 2011 +0200 Experimental build overhaul with WAF Supports: * out-of-tree build (generated headers are in-tree for now and not getting cleaned) * configure, build, dist, install. try: ./waf configure build * not all modules have wscript (just a demo for now), no test building * gitdist, gitcheck (clean HEAD checkout for dist and clean build testing) diff --git a/libs/core/wscript b/libs/core/wscript index d10daa6..3e98adc 100644 --- a/libs/core/wscript +++ b/libs/core/wscript @@ -1,9 +1,5 @@ #! /usr/bin/env python +# encoding: utf-8 def build(bld): - sources = bld.path.ant_glob('*.c *.c.t') - includes=['../../include/core', '../../include'] - bld(name='core_objs', source=sources, includes=includes, features='c') - bld(target='GP_core', source='', use='core_objs', features='c cshlib') - bld(target='GP_core', source='', use='core_objs', features='c cstlib') - + bld.GP_std_module('core') diff --git a/libs/filters/wscript b/libs/filters/wscript new file mode 100644 index 0000000..4e255f4 --- /dev/null +++ b/libs/filters/wscript @@ -0,0 +1,5 @@ +#! /usr/bin/env python +# encoding: utf-8 + +def build(bld): + bld.GP_std_module('filters') diff --git a/libs/text/wscript b/libs/text/wscript new file mode 100644 index 0000000..7deed9b --- /dev/null +++ b/libs/text/wscript @@ -0,0 +1,5 @@ +#! /usr/bin/env python +# encoding: utf-8 + +def build(bld): + bld.GP_std_module('text') diff --git a/wscript b/wscript index caef639..25cae62 100644 --- a/wscript +++ b/wscript @@ -8,11 +8,11 @@ import datetime -from Utils import subst_vars +from wscript_lib import * +# Gobal settings top = '.' out = 'build' - APPNAME = 'gfxprim' VERSION = 'dev-' + datetime.datetime.utcnow().strftime("%Y%m%d%H%M") @@ -37,47 +37,36 @@ def configure(cnf): cnf.env['PYLIBSDIR'] = cnf.path.find_node('pylib').abspath() -def dist(ctx): - ctx.excl = ' **/.waf-* **/*~ **/*.pyc **/*.swp **/.lock-w* **/.git* **/virtualpy* **.tar.bz2' - - def build(bld): # Generate all generated headers, regardless of the module include = bld.path.find_node('include') - bld.template(source=include.ant_glob('**/*.h.t')) + bld.template(source=include.ant_glob('**/*.h.t'), in_src=True) # Recurse on modules - bld.recurse('libs/core') - bld.recurse('tests/core') - - - -### Template processing lib - -from waflib.Task import Task -from waflib.TaskGen import extension -from waflib.Configure import conf -from waflib.Utils import to_list - -@conf -def template(ctx, source=[], target=[], template_ext='.t', **kw): - "Task generator for Template processing. Only one of `source` and `target` need to be given." - src = to_list(source) - tgt = to_list(target) - assert len(src) + len(tgt) > 0 - if not src: - src = [i.change_ext(template_ext, ext_in='') for i in tgt] - if not tgt: - tgt = [i.change_ext('', ext_in=template_ext) for i in src] - if len(src) != len(tgt): - ctx.fatal('"template" task needs the same number of sources as targets!') - kw.setdefault('name', 'template') - for s, t in zip(src, tgt): - ctx(rule = 'PYTHONPATH=$PYTHONPATH:${PYLIBSDIR} ${PYTHON} ${TEMPLATER} -t ${TEMPLATE_DIR} ${SRC} ${TGT}', - source=s, target=t, color='CYAN', **kw) - -# Implicit .c.t -> .c rule - -@extension('.c.t') -def process_c_t(self, node): - self.bld.template(source = [node]) - self.source.append(node.change_ext('', ext_in='.t')) + uses = [] + for mod in 'core gfx text loaders filters input backends SDL'.split(): + bld.recurse('libs/' + mod, mandatory=False) + uses.append(mod + '_objs') + bld.recurse('tests/' + mod, mandatory=False) + # Create the global libraries + bld(target='GP', source='', features='c cshlib', use=uses, name='libGP_st') + bld(target='GP', source='', features='c cstlib', use=uses, name='libGP_sh') + + +def dist(ctx): + 'Distribute current tree contents as a package.' + ctx.excl = ' **/.waf-* **/*~ **/*.pyc **/*.swp **/.lock-w* **/.git* **/virtualpy* **.tar.bz2' + + +def gitdist(ctx): + 'Create an archive from a fresh git HEAD checkout.' + + +def gitcheck(ctx): + 'Try to compile a fresh git HEAD checkout.' + + +def gittest(ctx): + 'Compile and test a fresh git checkout.' + + + diff --git a/wscript_lib.py b/wscript_lib.py new file mode 100644 index 0000000..fa9c4df --- /dev/null +++ b/wscript_lib.py @@ -0,0 +1,93 @@ +### GP - specific Waf library + +from waflib.Task import Task +from waflib.TaskGen import extension +from waflib.Configure import conf +from waflib.Utils import to_list + +### Module library shorthand +# Roughly the same as: +# sources = bld.path.ant_glob('*.c *.c.t') +# includes=['../../include/core', '../../include'] +# bld(name='core_objs', source=sources, includes=includes, features='c') +# bld(target='GP_core', source='', use='core_objs', features='c cshlib') +# bld(target='GP_core', source='', use='core_objs', features='c cstlib') + +@conf +def GP_std_module(bld, name, extra_includes=[]): + sources = bld.path.ant_glob('*.c *.c.t') + includes = ['../../include/' + name, '../../include'] + includes.extend(extra_includes) + objs_name = name + '_objs' + lib_name = 'GP_' + name + bld(name=objs_name, source=sources, includes=includes, features='c') + bld(target=lib_name, source='', use=objs_name, features='c cshlib') + bld(target=lib_name, source='', use=objs_name, features='c cstlib') + +### Template processing lib + +@conf +def template(ctx, source=[], target=[], template_ext='.t', in_src=False, **kw): + """ + Task generator for Template processing. Only one of `source` and `target` need to be given. + Optionally create targets winthin souce tree. + """ + src = to_list(source) + tgt = to_list(target) + assert len(src) + len(tgt) > 0 + if not src: + src = [i.change_ext(template_ext, ext_in='') for i in tgt] + if not tgt: + tgt = [i.change_ext('', ext_in=template_ext) for i in src] + if len(src) != len(tgt): + ctx.fatal('"template" task needs the same number of sources as targets!') + kw.setdefault('name', 'template') + for s, t in zip(src, tgt): + if in_src: + t = t.get_src() + ctx(rule = 'PYTHONPATH=$PYTHONPATH:${PYLIBSDIR} ${PYTHON} ${TEMPLATER} -t ${TEMPLATE_DIR} ${SRC} ${TGT}', + source=s, target=t, color='CYAN', **kw) + +### Implicit .c.t -> .c rule + +@extension('.c.t') +def process_c_t(self, node): + self.bld.template(source = [node]) + self.source.append(node.change_ext('', ext_in='.t')) + +### git[dist,check] commands + +from Scripting import Dist, DistCheck +from waflib import Context, Node, Logs +import tempfile, os, shutil + +class GitDist(Dist): + cmd = 'gitdist' + fun = 'gitdist' + ext_algo = {} + def execute(self): + self.recurse([os.path.dirname(Context.g_module.root_path)]) + self.git_archive(self) + + def git_archive(self): + self.base_path = self.root.find_dir(tempfile.mkdtemp()) + Logs.info('Temporary git checkout dir: %s' % (self.base_path,)) + try: + self.exec_command(['git', '--work-tree', self.base_path.abspath(), 'checkout', '-f']) + self.archive() + finally: + shutil.rmtree(self.base_path.abspath()) + +class GitCheck(GitDist, DistCheck): + cmd = 'gitcheck' + fun = 'gitcheck' + ext_algo = {} + def execute(self): + self.recurse([os.path.dirname(Context.g_module.root_path)]) + Logs.info('A0') + self.git_archive() + Logs.info('A1') + self.check() + + + http://repo.or.cz/w/gfxprim.git/commit/1d41338f4422e5f7fc5fc4b40528f1aafcc1… commit 1d41338f4422e5f7fc5fc4b40528f1aafcc1aa9b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Aug 25 15:18:05 2011 +0200 Waf support for libs/core, the rest is WIP diff --git a/.gitignore b/.gitignore index d949366..1dd2a3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.pyc *.swp /.waf-* +/.lock-waf* /build diff --git a/app.mk b/app.mk deleted file mode 100644 index 4c90884..0000000 --- a/app.mk +++ /dev/null @@ -1,15 +0,0 @@ -ifndef APPS -$(error APPS not defined, fix your library Makefile) -endif - -all: $(APPS) - -CLEAN+=$(APPS) - -%: %.o -ifdef VERBOSE - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -else - @echo "LD $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -endif diff --git a/build/Makefile b/build/Makefile deleted file mode 100644 index 709dd08..0000000 --- a/build/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -LIB_OBJECTS=$(shell ./get_objs.sh) - -all: libGP.a libGP.so libGP.so.0 - -clean: -ifdef VERBOSE - rm -f libGP.a libGP.so libGP.so.0 -else - @echo "RM libGP.a libGP.so libGP.so.0" - @rm -f libGP.a libGP.so libGP.so.0 -endif - -libGP.a: - @. ./liblock.sh; spinlock . -ifdef VERBOSE - $(AR) rcs libGP.a $(LIB_OBJECTS) -else - @echo "AR libGP.a" - @$(AR) rcs libGP.a $(LIB_OBJECTS) -endif - @. ./liblock.sh; spinunlock . - -libGP.so: - @. ./liblock.sh; spinlock . -ifdef VERBOSE - $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so -else - @echo "LD libGP.so" - @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,libGP.so.0 $(LIB_OBJECTS) -o libGP.so -endif - @. ./liblock.sh; spinunlock . - -libGP.so.0: libGP.so - @. ./liblock.sh; spinlock . -ifdef VERBOSE - rm -f libGP.so.0 - ln -s libGP.so libGP.so.0 -else - @echo "LN libGP.so.0" - @rm -f libGP.so.0 - @ln -s libGP.so libGP.so.0 -endif - @. ./liblock.sh; spinunlock . diff --git a/build/get_objs.sh b/build/get_objs.sh deleted file mode 100755 index 834fd77..0000000 --- a/build/get_objs.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -TOPDIR=.. -LIBDIRS="core gfx text loaders filters backends input" - -for i in $LIBDIRS; do - OBJECTS=`echo $TOPDIR/libs/$i/*.o`; - - if [ "$OBJECTS" != "$TOPDIR/libs/$i/*.o" ]; then - echo "$OBJECTS" - fi -done diff --git a/build/liblock.sh b/build/liblock.sh deleted file mode 100644 index 2af11e4..0000000 --- a/build/liblock.sh +++ /dev/null @@ -1,25 +0,0 @@ -# -# Takes directory as parameter -# -spinlock() -{ - I=0 - #echo -n "Trying to acquire lock in '$1' ." - while ! `mkdir "$1/.lock" &> /dev/null`; do - sleep 1; - ((I=I+1)) - echo $I - if [ $I -gt 10 ]; then - echo "Failed to acquire lock '`pwd`/.lock'" - exit 1 - fi - # echo -n . - done - #echo " done" -} - -spinunlock() -{ - #echo "Removing lock in '$1'" - rmdir "$1/.lock" &> /dev/null -} diff --git a/config.mk b/config.mk deleted file mode 100644 index 962c414..0000000 --- a/config.mk +++ /dev/null @@ -1,14 +0,0 @@ -CFLAGS+=-W -Wall -Wextra -fPIC -ggdb -O2 -std=gnu99 -CFLAGS+=-I$(TOPDIR)/include/ -LDLIBS+=-ldl - -# path to local module directory -PYLIBSDIR=$(TOPDIR)/pylib - -# Python binary/version -PYTHON_BIN=python -# To test with other python versions (example): -#PYTHON_BIN=${TOPDIR}/virtualpy2.4/bin/python - -# Command to run Python with pylib/ modules -PYTHON=PYTHONPATH=$$PYTHONPATH:${PYLIBSDIR} ${PYTHON_BIN} -Werror diff --git a/gen.mk b/gen.mk deleted file mode 100644 index 41ad5f5..0000000 --- a/gen.mk +++ /dev/null @@ -1,60 +0,0 @@ -# -# This is makefile rule for generating C sources from python generators -# -ifndef LIBNAME -$(error LIBNAME not defined, fix your library Makefile) -endif - -ifndef GENHEADERS -GENHEADERS= -endif - -ifndef GENSOURCES -GENSOURCES= -endif - -# -# Headers go into include/core/ -# -INCLUDE_PREFIX=$(TOPDIR)/include/$(LIBNAME)/ -RGENHEADERS=$(addprefix $(INCLUDE_PREFIX),$(GENHEADERS)) - -# -# Generate genfiles for generated sources -# -CSOURCES+=$(GENSOURCES) - -# -# Make the genrated headers actually build -# -all: $(RGENHEADERS) -$(CSOURCES): $(RGENHEADERS) - -# -# Base common templates location -# -TEMPLATE_DIR=$(TOPDIR)/pylib/templates/ - -# -# ALL templates and potential generated files (not generated automatically) -# NOTE: Currently unused -# -ALL_TEMPLATES=$(shell find $(TOPDIR) -name '*.t') -ALL_GENERATED=$(basename $(ALL_TEMPLATES)) - -# -# And clean them -# -CLEAN+=$(GENSOURCES) $(RGENHEADERS) - -# -# Generated files depend on python generators and the template -# -$(GENSOURCES) $(RGENHEADERS): %: %.t $(PYTHON_FILES) -ifdef VERBOSE - ${PYTHON} ${TOPDIR}/pylib/bin/generate_file.py -t $(TEMPLATE_DIR) "$@.t" "$@" -else - @echo "GEN $@" - @${PYTHON} ${TOPDIR}/pylib/bin/generate_file.py -t $(TEMPLATE_DIR) "$@.t" "$@" -endif - diff --git a/include.mk b/include.mk deleted file mode 100644 index c8f8b18..0000000 --- a/include.mk +++ /dev/null @@ -1,113 +0,0 @@ -# -# Make no subdirs by default -# -ifndef SUBDIRS -SUBDIRS= -endif - -.PHONY: $(SUBDIRS) all clean help - -all: $(SUBDIRS) -clean: $(SUBDIRS) - -help: - @echo "*** Available targets ***" - @echo "" - @echo "help: prints this help" - @echo "" - @echo "clean: cleans current directory and all subdirectories" - @echo "" - @echo "all: make current directory and all subdirectories" - @echo "" - @echo "The default silent output could be turned off by defining" - @echo "'VERBOSE' shell variable as 'VERBOSE=1 make'" - @echo "" - -include $(TOPDIR)/config.mk - -# -# Determine mode (eg do not generate anything if not in compile mode -# -COMPILE=no - -ifeq ($(MAKECMDGOALS),all) -COMPILE=yes -endif - -ifeq ($(MAKECMDGOALS),) -COMPILE=yes -endif - -# -# Potential python dependencies for generated files and scripts -# -PYTHON_FILES=$(shell find "${PYLIBSDIR}" -name '*.py') - -# -# 1. Generate and include dependencies for all C sources -# 2. Generate OBJECTS list from CSOURCES list -# 3. Adds OBJECTS to CLEAN list -# -ifdef CSOURCES -DEPFILES=$(subst .c,.dep,$(CSOURCES)) -ifeq ($(COMPILE),yes) --include $(DEPFILES) -endif -CLEAN+=$(subst .c,.dep,$(CSOURCES)) -OBJECTS=$(CSOURCES:.c=.o) -CLEAN+=$(OBJECTS) -endif - -# -# Automatically include library headers -# -ifdef LIBNAME -INCLUDE+=$(LIBNAME) -endif - -# -# If there was anything in INCLUDE list, create CFLAGS for each entry -# -ifdef INCLUDE -CFLAGS+=$(addprefix -I$(TOPDIR)/include/, $(INCLUDE)) -endif - -# -# Walk trought SUBDIRS, this code works even for -jX -# -$(SUBDIRS): -ifdef VERBOSE - $(MAKE) -C $@ $(MAKECMDGOALS) -else - @export CURSUBDIR="$$CURSUBDIR/$@" && echo "DIR $$CURSUBDIR" &&- $(MAKE) --no-print-directory -C $@ $(MAKECMDGOALS) -endif - -# -# Actual make rules -# -$(DEPFILES): %.dep: %.c -ifdef VERBOSE - $(CC) -MM $(CFLAGS) $< -o $@ -else - @echo "DEP -I(include $(INCLUDE)) $@" - @$(CC) -MM $(CFLAGS) $< -o $@ -endif - -$(OBJECTS): %.o: %.c -ifdef VERBOSE - $(CC) $(CFLAGS) -c $< -o $@ -else - @echo "CC -I(include $(INCLUDE)) $@" - @$(CC) $(CFLAGS) -c $< -o $@ -endif - -ifdef CLEAN -clean: -ifdef VERBOSE - rm -f $(CLEAN) -else - @echo "RM $(CLEAN)" - @rm -f $(CLEAN) -endif -endif diff --git a/install.sh b/install.sh deleted file mode 100755 index ee5403f..0000000 --- a/install.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -INSTALL_PREFIX="$1" - -HEADER_LOC="$INSTALL_PREFIX/usr/include/" -LIB_LOC="$INSTALL_PREFIX/usr/lib/" - -# Headers -echo "INSTALL headers" -install -m 775 -d "${HEADER_LOC}GP" -for i in `ls include/`; do - if [ -d "include/$i" ]; then - echo " $i" - install -m 775 -d "${HEADER_LOC}GP/$i" - install -m 664 "include/$i/"*.h "${HEADER_LOC}GP/$i" - else - install -m 664 "include/$i" "${HEADER_LOC}GP/$i" - fi -done - -# Library -echo "INSTALL libraries" -install -m 775 -d "$LIB_LOC" -install -m 664 build/*.so build/*.so.0 build/*.a "$LIB_LOC" diff --git a/lib.mk b/lib.mk deleted file mode 100644 index 397515a..0000000 --- a/lib.mk +++ /dev/null @@ -1,48 +0,0 @@ -ifndef LIBNAME -$(error LIBNAME not defined, fix your library Makefile) -endif - -LIB=libGP_$(LIBNAME) -LIBP=$(TOPDIR)/build/ - -# -# If set to yes, builds single library for directory -# -ifeq ($(BUILDLIB),yes) -all: $(LIBP)$(LIB).so $(LIBP)$(LIB).a -endif - -ifeq ($(BUILDLIB),yes) -CLEAN+=$(LIBP)$(LIB).so $(LIBP)$(LIB).so.0 $(LIBP)$(LIB).a -endif - -# -# Trigger libGP.XX library rebuild -# -all: $(OBJECTS) - @$(MAKE) --no-print-directory -C $(TOPDIR)/build/ - -# -# Rules for single library -# -$(LIBP)$(LIB).so: $(OBJECTS) -ifdef VERBOSE - rm -f $(LIBP)$(LIB).so.0 - cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 - $(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ -else - @rm -f $(LIBP)$(LIB).so.0 - @cd $(LIBP) && ln -s $(LIB).so $(LIB).so.0 - @echo "LD $@" - @$(CC) -fPIC -dPIC --shared -Wl,-soname -Wl,$(LIB).so.0 $(OBJECTS) -o $@ -endif - -$(LIBP)$(LIB).a: $(OBJECTS) -ifdef VERBOSE - $(AR) rcs $@ $(OBJECTS) -else - @echo "AR $@" - @$(AR) rcs $@ $(OBJECTS) -endif - -CLEAN+=$(OBJECTS) diff --git a/libs/core/Makefile b/libs/core/Makefile deleted file mode 100644 index b8c7cf7..0000000 --- a/libs/core/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -TOPDIR=../.. -GENSOURCES=GP_Pixel.gen.c GP_Blit.gen.c GP_Convert.gen.c -GENHEADERS=GP_Convert_Scale.gen.h GP_Blit.gen.h GP_Pixel.gen.h GP_GetPutPixel.gen.h GP_Convert.gen.h -CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) -LIBNAME=core - -include $(TOPDIR)/gen.mk -include $(TOPDIR)/include.mk -include $(TOPDIR)/lib.mk diff --git a/libs/core/wscript b/libs/core/wscript new file mode 100644 index 0000000..d10daa6 --- /dev/null +++ b/libs/core/wscript @@ -0,0 +1,9 @@ +#! /usr/bin/env python + +def build(bld): + sources = bld.path.ant_glob('*.c *.c.t') + includes=['../../include/core', '../../include'] + bld(name='core_objs', source=sources, includes=includes, features='c') + bld(target='GP_core', source='', use='core_objs', features='c cshlib') + bld(target='GP_core', source='', use='core_objs', features='c cstlib') + diff --git a/waf-1.6.7.py b/pylib/waf-1.6.7.py similarity index 100% rename from waf-1.6.7.py rename to pylib/waf-1.6.7.py diff --git a/tests.mk b/tests.mk deleted file mode 100644 index 39f0835..0000000 --- a/tests.mk +++ /dev/null @@ -1,55 +0,0 @@ -.PHONY: tests runtests - -# -# List of test targets (testsuite incl. automatically) -# -ifndef TESTS -TESTS= -endif - -# -# Testsuite with automated collection of tests -# All .test.c files are scraped for GP_TEST definitions -# - -ifdef TESTSUITE -# a bit crude way to link with test minilibrary -GP_TESTLIB_SRCS=$(wildcard ${TOPDIR}/tests/common/*.c) -CSOURCES+=${GP_TESTLIB_SRCS} - -# generated suite creation code -TESTSUITE_GEN=collected_tests.gen.c # also fixed in the code generator -CLEAN+=${TESTSUITE_GEN} - -${TESTSUITE_GEN}: $(filter-out ${TESTSUITE_GEN},${GENSOURCES}) ${GENHEADERS} -ifdef VERBOSE - ${PYTHON} ${TOPDIR}/pylib/bin/generate_collected_tests.py -t $(TEMPLATE_DIR) "." "$@" -else - @echo "TSTS $@" - @${PYTHON} ${TOPDIR}/pylib/bin/generate_collected_tests.py -t $(TEMPLATE_DIR) "." "$@" -endif - - -TESTSUITE_SRCS=$(wildcard *.test.c) ${GENSOURCES} ${GENHEADERS} ${GP_TESTLIB_SRCS} ${TESTSUITE_GEN} -INCLUDE+=../tests/common -TESTSUITE_OBJS=$(patsubst %.c,%.o,$(TESTSUITE_SRCS)) -CLEAN+=${TESTSUITE} ${TESTSUITE_OBJS} -TESTS+=${TESTSUITE} - -${TESTSUITE}: ${TESTSUITE_OBJS} -ifdef VERBOSE - $(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -else - @echo "LD $@" - @$(CC) $(CFLAGS) $(LDFLAGS) -Wl,--start-group $(LDLIBS) $^ -Wl,--end-group -o $@ -endif # VERBOSE - -endif # TESTSUITE - -tests: $(TESTS) - -runtests: tests - for test in $(TESTS); do LD_LIBRARY_PATH=../../build ./"$$test"; done - -# WARN: avoid double includion? -include $(TOPDIR)/gen.mk diff --git a/tests/core/wscript b/tests/core/wscript new file mode 100644 index 0000000..9995a96 --- /dev/null +++ b/tests/core/wscript @@ -0,0 +1,4 @@ +#! /usr/bin/env python + +def build(bld): + pass diff --git a/waf b/waf index e6711aa..317b501 120000 --- a/waf +++ b/waf @@ -1 +1 @@ -waf-1.6.7.py No newline at end of file +pylib/waf-1.6.7.py No newline at end of file diff --git a/wscript b/wscript index cb76681..caef639 100644 --- a/wscript +++ b/wscript @@ -1,25 +1,83 @@ #! /usr/bin/env python # encoding: utf-8 +# Useful ENV params: +# PYTHON - python executable +# CC - gcc-like compiler +# CFLAGS - Additional C flags + + import datetime +from Utils import subst_vars top = '.' out = 'build' + APPNAME = 'gfxprim' VERSION = 'dev-' + datetime.datetime.utcnow().strftime("%Y%m%d%H%M") -def options(opts): - pass +def options(opt): + opt.load('compiler_c python') -def configure(ctx): - pass +def configure(cnf): + # Finds tools, sets basic options, reads CFLAGS from ENV, ... + cnf.load('compiler_c python') + cnf.check_python_version((2,4)) + # NOTE: remove/modify if jinja2 bundled with lib + cnf.check_python_module('jinja2') + # Set CFLAGS + cnf.env.prepend_value('CFLAGS', ['-W', '-Wall', '-Wextra', '-fPIC', '-ggdb', + '-O2', '-std=gnu99']) + #LDLIBS+=-ldl + # Set-up code generator options + cnf.env['TEMPLATE_DIR'] = cnf.path.find_node('pylib/templates').abspath() + cnf.env['TEMPLATER'] = cnf.path.find_node('/pylib/bin/generate_file.py').abspath() + cnf.env['PYLIBSDIR'] = cnf.path.find_node('pylib').abspath() def dist(ctx): - ctx.excl = ' **/.waf-* **/*~ **/*.pyc **/*.swp **/.lock-w*' + ctx.excl = ' **/.waf-* **/*~ **/*.pyc **/*.swp **/.lock-w* **/.git* **/virtualpy* **.tar.bz2' + + +def build(bld): + # Generate all generated headers, regardless of the module + include = bld.path.find_node('include') + bld.template(source=include.ant_glob('**/*.h.t')) + # Recurse on modules + bld.recurse('libs/core') + bld.recurse('tests/core') + + + +### Template processing lib + +from waflib.Task import Task +from waflib.TaskGen import extension +from waflib.Configure import conf +from waflib.Utils import to_list + +@conf +def template(ctx, source=[], target=[], template_ext='.t', **kw): + "Task generator for Template processing. Only one of `source` and `target` need to be given." + src = to_list(source) + tgt = to_list(target) + assert len(src) + len(tgt) > 0 + if not src: + src = [i.change_ext(template_ext, ext_in='') for i in tgt] + if not tgt: + tgt = [i.change_ext('', ext_in=template_ext) for i in src] + if len(src) != len(tgt): + ctx.fatal('"template" task needs the same number of sources as targets!') + kw.setdefault('name', 'template') + for s, t in zip(src, tgt): + ctx(rule = 'PYTHONPATH=$PYTHONPATH:${PYLIBSDIR} ${PYTHON} ${TEMPLATER} -t ${TEMPLATE_DIR} ${SRC} ${TGT}', + source=s, target=t, color='CYAN', **kw) +# Implicit .c.t -> .c rule -def build(ctx): - pass +@extension('.c.t') +def process_c_t(self, node): + self.bld.template(source = [node]) + self.source.append(node.change_ext('', ext_in='.t')) http://repo.or.cz/w/gfxprim.git/commit/8a83be73956286ed70b13d97abf326078b50… commit 8a83be73956286ed70b13d97abf326078b50e933 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Wed Aug 24 21:05:43 2011 +0200 Initial waf support and configuration diff --git a/.gitignore b/.gitignore index 1d500c6..d949366 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -*.o -*.dep *.pyc -*.gen.c -*.gen.h *.swp -libGP.so* -libGP.a - +/.waf-* +/build diff --git a/waf b/waf new file mode 120000 index 0000000..e6711aa --- /dev/null +++ b/waf @@ -0,0 +1 @@ +waf-1.6.7.py No newline at end of file diff --git a/waf-1.6.7.py b/waf-1.6.7.py new file mode 100755 index 0000000..f7c97d6 Binary files /dev/null and b/waf-1.6.7.py differ diff --git a/wscript b/wscript new file mode 100644 index 0000000..cb76681 --- /dev/null +++ b/wscript @@ -0,0 +1,25 @@ +#! /usr/bin/env python +# encoding: utf-8 + +import datetime + +top = '.' +out = 'build' +APPNAME = 'gfxprim' +VERSION = 'dev-' + datetime.datetime.utcnow().strftime("%Y%m%d%H%M") + + +def options(opts): + pass + + +def configure(ctx): + pass + + +def dist(ctx): + ctx.excl = ' **/.waf-* **/*~ **/*.pyc **/*.swp **/.lock-w*' + + +def build(ctx): + pass http://repo.or.cz/w/gfxprim.git/commit/97c40ce239774949579fd67651f5a602c22c… commit 97c40ce239774949579fd67651f5a602c22c69a8 Merge: a5fc0cc ce1f7e6 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Mon Aug 22 11:45:10 2011 +0200 Merge branch 'generate' of git://repo.or.cz/gfxprim into generate Conflicts: pylib/templates/collected_tests.c.t http://repo.or.cz/w/gfxprim.git/commit/a5fc0ccc8cd3f3204849a41f497c6f1c91ad… commit a5fc0ccc8cd3f3204849a41f497c6f1c91adb787 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Aug 18 21:01:26 2011 +0200 Remove a warning from pixel print diff --git a/libs/core/GP_Pixel.gen.c.t b/libs/core/GP_Pixel.gen.c.t index e0cf7c0..6f10425 100644 --- a/libs/core/GP_Pixel.gen.c.t +++ b/libs/core/GP_Pixel.gen.c.t @@ -37,7 +37,7 @@ const GP_PixelTypeDescription const GP_PixelTypes [] = { void GP_PixelSNPrint_{{ pt.name }}(char *buf, size_t len, GP_Pixel p) { snprintf(buf, len, "<{{ pt.name }} 0x%0{{ (pt.pixelsize.size+3)//4 }}x{% for c in pt.chanslist %} {{ c[0] }}=%d{% endfor %}>", - GP_GET_BITS(0, {{ pt.pixelsize.size }}, p){% for c in pt.chanslist %}, GP_GET_BITS({{ c[1] }}, {{ c[2] }}, p){% endfor %}); + GP_GET_BITS_CHECK(0, {{ pt.pixelsize.size }}, p){% for c in pt.chanslist %}, GP_GET_BITS_CHECK({{ c[1] }}, {{ c[2] }}, p){% endfor %}); } %% endif http://repo.or.cz/w/gfxprim.git/commit/e5756d9af1c5b495e136743368f7d36d6e18… commit e5756d9af1c5b495e136743368f7d36d6e181d98 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Aug 18 21:00:53 2011 +0200 Remove stray template comment. diff --git a/pylib/templates/collected_tests.c.t b/pylib/templates/collected_tests.c.t index cd24232..f3ae6f5 100644 --- a/pylib/templates/collected_tests.c.t +++ b/pylib/templates/collected_tests.c.t @@ -21,7 +21,7 @@ Code creating the tests and suites for tests collected from .test.c files. void GP_TEST_{{ t['name'] }}(int); -## TODO: Handle special test requirements (timing, fixture, ...) +{# TODO: Handle special test requirements (timing, fixture, ...) -#} TCase *GP_TC_{{ suite }}_{{ t['name'] }}() { TCase *tc = tcase_create("{{ t['name'] }}"); http://repo.or.cz/w/gfxprim.git/commit/4be94324decaaa508300a371010aa46537d3… commit 4be94324decaaa508300a371010aa46537d33111 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Aug 18 20:54:09 2011 +0200 Add CHECK variants of SET/GET_BITS diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index 23e5527..ac2bf3c 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -150,11 +150,18 @@ ( ( (val)>>(offset) ) & ( ((((typeof(val))1)<<(count)) - 1) ) ) /* - * Debugging version, evaluates args twice. + * Variant with checks for overflow and special case avoiding + * overflow warnings. + * The check may be slow, but should be optimized away for constant + * offset and count. */ -#define GP_GET_BITS_DBG(offset, count, val) - ( printf("GET_BITS(%d, %d, 0x%x)=%d", offset, count, val, - GP_GET_BITS(offset, count, val)), GP_GET_BITS(offset, count, val)) +#define GP_GET_BITS_CHECK(offset, count, val) ({ + GP_CHECK(sizeof(val) * 8 <= (count) + (offset)); + GP_CHECK((count) > 0); + GP_CHECK((offset) >= 0); + (((offset) == 0) && (sizeof(val) * 8 == (count))) ? (val) : + GP_GET_BITS((offset), (count), (val)); + }) /* * Set count bits of dest at ofset to val (shifted by offset) @@ -177,6 +184,20 @@ GP_SET_BITS_OR(offset, dest, val); } while (0) +/* + * Variant with checks for overflow and special cases (avoiding + * overflow warnings etc.). + * The check may be slow, but should be optimized away for constant + * offset and count. + */ +#define GP_SET_BITS_CHECK(offset, count, dest, val) do { + GP_CHECK(sizeof(dest) * 8 <= (count) + (offset)); + GP_CHECK((count) > 0); + GP_CHECK((offset) >= 0); + if (((offset) == 0) && (sizeof(dest) * 8 == (count))) (dest) = (val); + else GP_SET_BITS((offset), (count), (dest), (val)); + } while (0) + /* * Debugging version, evaluates args twice. */ ----------------------------------------------------------------------- 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 generate updated: ce1f7e60318bc537190107fef5834338da94706d
by metan 21 Aug '11

21 Aug '11

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, generate has been updated via ce1f7e60318bc537190107fef5834338da94706d (commit) from 8a3762309b457c34c0da176d12b3bc76e2f486e9 (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/ce1f7e60318bc537190107fef5834338da94… commit ce1f7e60318bc537190107fef5834338da94706d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Aug 21 12:03:08 2011 +0200 Small fixes for WritePixel test. diff --git a/tests/core/GP_WritePixel.test.gen.c.t b/tests/core/GP_WritePixel.test.gen.c.t index 902a8b7..2661371 100644 --- a/tests/core/GP_WritePixel.test.gen.c.t +++ b/tests/core/GP_WritePixel.test.gen.c.t @@ -11,12 +11,16 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) { unsigned int i; - printf("%s = {", name); + printf("%s:n{", name); for (i = 0; i < buf_len; i++) { - printf("0x%02x", buf[i]); + printf("%i", !!buf[i]); + if (i != buf_len - 1) printf(", "); + + if (i % 26 == 25) + printf("n "); } printf("}n"); @@ -25,7 +29,7 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) /* * Compares two statically defined buffers */ -#define COMPARE_BUFFERS(buf1, buf2) do { +#define COMPARE_BUFFERS(id, buf1, buf2) do { unsigned int buf1_len = sizeof(buf1)/sizeof(*buf1); unsigned int buf2_len = sizeof(buf2)/sizeof(*buf2); unsigned int i; @@ -33,21 +37,22 @@ static void dump_buffer(const char *name, char *buf, unsigned int buf_len) fail_unless(buf1_len == buf2_len); for (i = 0; i < buf1_len; i++) - if(buf1[i] != buf2[i]) { - dump_buffer("write", buf1, buf1_len); - dump_buffer("gen ", buf2, buf2_len); + if(buf1[i] != buf2[i]) { + printf("%sn", id); + dump_buffer("wrote", buf1, buf1_len); + dump_buffer("gen", buf2, buf2_len); fail("buffers are different"); } } while (0) %% for pixelsize in [8, 16, 24, 32] %% for offset in range(0, 4) -%% for len in range(0, 4) +%% for len in range(0, 6) %% for aligment in [0, 1] GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}, {{ ""offset=%i len=%i aligment=%i""|format(offset, len, aligment) }}) { - char write_buf[{{ 9 * pixelsize//8 }}] = {}; - char gen_buf[{{9 * pixelsize//8 }}] = {}; + char write_buf[{{ 25 * pixelsize//8 }}] = {}; + char gen_buf[{{ 25 * pixelsize//8 }}] = {}; /* * Fill the compare buffer @@ -60,7 +65,7 @@ GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) } GP_WritePixels{{ pixelsize }}bpp(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); - COMPARE_BUFFERS(write_buf, gen_buf); + COMPARE_BUFFERS({{""p=%i o=%i l=%i a=%i""|format(pixelsize, offset, len, aligment)}}, write_buf, gen_buf); } GP_ENDTEST %% endfor ----------------------------------------------------------------------- Summary of changes: tests/core/GP_WritePixel.test.gen.c.t | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 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 generate updated: 8a3762309b457c34c0da176d12b3bc76e2f486e9
by metan 21 Aug '11

21 Aug '11

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, generate has been updated via 8a3762309b457c34c0da176d12b3bc76e2f486e9 (commit) from 4d23481d197e7e0187bff3b2e9002d76d96497bb (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/8a3762309b457c34c0da176d12b3bc76e2f4… commit 8a3762309b457c34c0da176d12b3bc76e2f486e9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Aug 21 11:34:47 2011 +0200 Quick and dirty tests for GP_WritePixel (byte aligned pixels only). diff --git a/tests/core/GP_WritePixel.test.gen.c.t b/tests/core/GP_WritePixel.test.gen.c.t new file mode 100644 index 0000000..902a8b7 --- /dev/null +++ b/tests/core/GP_WritePixel.test.gen.c.t @@ -0,0 +1,71 @@ +%% extends "base.test.c.t" + +%% block body +#include "GP_Tests.h" +#include "GP_WritePixel.h" +#include "GP_TestingCore.h" + +GP_SUITE(GP_WritePixel) + +static void dump_buffer(const char *name, char *buf, unsigned int buf_len) +{ + unsigned int i; + + printf("%s = {", name); + + for (i = 0; i < buf_len; i++) { + printf("0x%02x", buf[i]); + if (i != buf_len - 1) + printf(", "); + } + + printf("}n"); +} + +/* + * Compares two statically defined buffers + */ +#define COMPARE_BUFFERS(buf1, buf2) do { + unsigned int buf1_len = sizeof(buf1)/sizeof(*buf1); + unsigned int buf2_len = sizeof(buf2)/sizeof(*buf2); + unsigned int i; + + fail_unless(buf1_len == buf2_len); + + for (i = 0; i < buf1_len; i++) + if(buf1[i] != buf2[i]) { + dump_buffer("write", buf1, buf1_len); + dump_buffer("gen ", buf2, buf2_len); + fail("buffers are different"); + } +} while (0) + +%% for pixelsize in [8, 16, 24, 32] +%% for offset in range(0, 4) +%% for len in range(0, 4) +%% for aligment in [0, 1] +GP_TEST(GP_WritePixel{{ "%i_%i_%i_%i"|format(pixelsize, offset, len, aligment) }}, {{ ""offset=%i len=%i aligment=%i""|format(offset, len, aligment) }}) +{ + char write_buf[{{ 9 * pixelsize//8 }}] = {}; + char gen_buf[{{9 * pixelsize//8 }}] = {}; + + /* + * Fill the compare buffer + */ +%% for i in range(0, len) +%% for j in range(0, pixelsize//8) + gen_buf[{{aligment + offset * pixelsize//8 + i * pixelsize//8 + j}}] = 0xff; +%% endfor +%% endfor + + GP_WritePixels{{ pixelsize }}bpp(write_buf + {{aligment + offset * pixelsize//8}}, {{ len }}, 0xffffffff>>{{32 - pixelsize}}); + + COMPARE_BUFFERS(write_buf, gen_buf); +} +GP_ENDTEST +%% endfor +%% endfor +%% endfor +%% endfor + +%% endblock body diff --git a/tests/core/Makefile b/tests/core/Makefile index c03633a..00e696e 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -3,7 +3,7 @@ TOPDIR=../.. LIBNAME=core TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -GENSOURCES+=GP_Convert.test.gen.c +GENSOURCES+=GP_Convert.test.gen.c GP_WritePixel.test.gen.c include $(TOPDIR)/tests.mk include $(TOPDIR)/include.mk ----------------------------------------------------------------------- Summary of changes: tests/core/GP_WritePixel.test.gen.c.t | 71 +++++++++++++++++++++++++++++++++ tests/core/Makefile | 2 +- 2 files changed, 72 insertions(+), 1 deletions(-) create mode 100644 tests/core/GP_WritePixel.test.gen.c.t 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 generate updated: 4d23481d197e7e0187bff3b2e9002d76d96497bb
by metan 21 Aug '11

21 Aug '11

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, generate has been updated via 4d23481d197e7e0187bff3b2e9002d76d96497bb (commit) from 01aaa35ef40df33f0153ec4431b683af7da56a2a (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/4d23481d197e7e0187bff3b2e9002d76d964… commit 4d23481d197e7e0187bff3b2e9002d76d96497bb Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Aug 21 01:11:17 2011 +0200 Added 8-8-4 palette colors. diff --git a/libs/core/GP_Color.c b/libs/core/GP_Color.c index 06a2791..672089e 100644 --- a/libs/core/GP_Color.c +++ b/libs/core/GP_Color.c @@ -58,11 +58,29 @@ static uint8_t rgb888_colors[][3] = { {0xff, 0xff, 0xff}, /* White */ }; +/* 8-8-4 RGB palette */ +static uint8_t p8_colors[] = { + 0x00, /* Black */ + 0xe0, /* Red */ + 0x1c, /* Green */ + 0x03, /* Blue */ + 0xfc, /* Yellow */ + 0x88, /* Brown */ + 0xf0, /* Orange */ + 0x49, /* DarkGray */ + 0x92, /* LightGray */ + 0x8a, /* Purple */ + 0xff, /* White */ +}; + GP_Pixel GP_ColorToPixel(GP_Context *context, GP_Color col) { GP_ASSERT(col < GP_COL_MAX); GP_ASSERT(col >= 0); + if (context->pixel_type == GP_PIXEL_P8) + return p8_colors[col]; + return GP_RGBToPixel(rgb888_colors[col][0], rgb888_colors[col][1], rgb888_colors[col][2], context->pixel_type); ----------------------------------------------------------------------- Summary of changes: libs/core/GP_Color.c | 18 ++++++++++++++++++ 1 files changed, 18 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 generate updated: 01aaa35ef40df33f0153ec4431b683af7da56a2a
by metan 20 Aug '11

20 Aug '11

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, generate has been updated via 01aaa35ef40df33f0153ec4431b683af7da56a2a (commit) from 9e8793ceec06e0c006747c33770bc6e4b19324a6 (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/01aaa35ef40df33f0153ec4431b683af7da5… commit 01aaa35ef40df33f0153ec4431b683af7da56a2a Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Aug 20 23:39:23 2011 +0200 Fixed WritePixels24(). diff --git a/libs/core/GP_WritePixel.c b/libs/core/GP_WritePixel.c index 182a42e..090cb5c 100644 --- a/libs/core/GP_WritePixel.c +++ b/libs/core/GP_WritePixel.c @@ -236,6 +236,7 @@ void GP_WritePixels24bpp(void *start, size_t count, uint32_t value) block[1] = bcab; block[2] = cabc; p = (uint32_t *)(bytep + 3); + i--; break; } @@ -262,11 +263,13 @@ void GP_WritePixels24bpp(void *start, size_t count, uint32_t value) case 2: bytep[0] = c; bytep++; + i--; break; case 3: bytep[0] = b; bytep[1] = c; bytep += 2; + i--; break; } ----------------------------------------------------------------------- Summary of changes: libs/core/GP_WritePixel.c | 3 +++ 1 files changed, 3 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 generate updated: 9e8793ceec06e0c006747c33770bc6e4b19324a6
by metan 20 Aug '11

20 Aug '11

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, generate has been updated via 9e8793ceec06e0c006747c33770bc6e4b19324a6 (commit) from 7fc258147bf9b322a730cd1bc426bee0b668f8f5 (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/9e8793ceec06e0c006747c33770bc6e4b193… commit 9e8793ceec06e0c006747c33770bc6e4b19324a6 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Aug 20 23:09:53 2011 +0200 Unbreak the testsuite. diff --git a/pylib/templates/collected_tests.c.t b/pylib/templates/collected_tests.c.t index cd24232..0241a28 100644 --- a/pylib/templates/collected_tests.c.t +++ b/pylib/templates/collected_tests.c.t @@ -21,7 +21,7 @@ Code creating the tests and suites for tests collected from .test.c files. void GP_TEST_{{ t['name'] }}(int); -## TODO: Handle special test requirements (timing, fixture, ...) +// TODO: Handle special test requirements (timing, fixture, ...) TCase *GP_TC_{{ suite }}_{{ t['name'] }}() { TCase *tc = tcase_create("{{ t['name'] }}"); diff --git a/tests/core/GP_Convert.test.c b/tests/core/GP_Convert.test.c index 19e8f9d..28bd28a 100644 --- a/tests/core/GP_Convert.test.c +++ b/tests/core/GP_Convert.test.c @@ -19,9 +19,9 @@ GP_TEST(BasicPixelConversions) fail_unless(p1 == 0x123456); GP_CHECK_EqualColors(p1, GP_PIXEL_RGB888, p1, GP_PIXEL_RGB888); - p1 = GP_RGB888ToPixel(GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888), GP_PIXEL_V4); - p2 = GP_RGBAToPixel(0x12, 0x34, 0x56, 0x78, GP_PIXEL_V2); - GP_CHECK_EqualColors(p1, GP_PIXEL_V4, p2, GP_PIXEL_V2); + p1 = GP_RGB888ToPixel(GP_RGBToPixel(0x12, 0x34, 0x56, GP_PIXEL_RGB888), GP_PIXEL_G4); + p2 = GP_RGBAToPixel(0x12, 0x34, 0x56, 0x78, GP_PIXEL_G2); + GP_CHECK_EqualColors(p1, GP_PIXEL_G4, p2, GP_PIXEL_G2); } GP_ENDTEST ----------------------------------------------------------------------- Summary of changes: pylib/templates/collected_tests.c.t | 2 +- tests/core/GP_Convert.test.c | 6 +++--- 2 files changed, 4 insertions(+), 4 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 generate updated: 7fc258147bf9b322a730cd1bc426bee0b668f8f5
by metan 20 Aug '11

20 Aug '11

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, generate has been updated via 7fc258147bf9b322a730cd1bc426bee0b668f8f5 (commit) from 3223defa8a39310a0b60f6ce933e0cca072068d8 (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/7fc258147bf9b322a730cd1bc426bee0b668… commit 7fc258147bf9b322a730cd1bc426bee0b668f8f5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Aug 20 20:45:43 2011 +0200 Changed the GP_PIXEL_Vx to GP_PIXEL_Gx. diff --git a/gfxprim_config.py b/gfxprim_config.py index 174f82d..97446ac 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -85,16 +85,16 @@ config = GfxPrimConfig( # Gray-only pixel types # - PixelType(name='V1', pixelsize=PS_1BPP_LE, chanslist=[ + PixelType(name='G1', pixelsize=PS_1BPP_LE, chanslist=[ ('V', 0, 1)]), - PixelType(name='V2', pixelsize=PS_2BPP_LE, chanslist=[ + PixelType(name='G2', pixelsize=PS_2BPP_LE, chanslist=[ ('V', 0, 2)]), - PixelType(name='V4', pixelsize=PS_4BPP_LE, chanslist=[ + PixelType(name='G4', pixelsize=PS_4BPP_LE, chanslist=[ ('V', 0, 4)]), - PixelType(name='V8', pixelsize=PS_8BPP, chanslist=[ + PixelType(name='G8', pixelsize=PS_8BPP, chanslist=[ ('V', 0, 8)]), # diff --git a/include/core/GP_Convert.gen.h.t b/include/core/GP_Convert.gen.h.t index 05a5606..56759ee 100644 --- a/include/core/GP_Convert.gen.h.t +++ b/include/core/GP_Convert.gen.h.t @@ -80,7 +80,7 @@ GP_Pixel GP_PixelTo{{ pt.name }}(GP_Pixel pixel, GP_PixelType type); /* Experimental macros testing generated scripts */ {{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGB565'], pixeltypes_dict['RGBA8888']) }} -{{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGBA8888'], pixeltypes_dict['V2']) }} +{{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['RGBA8888'], pixeltypes_dict['G2']) }} {{ GP_Pixel_TYPE_TO_TYPE(pixeltypes_dict['VA12'], pixeltypes_dict['RGBA8888']) }} %% endblock body diff --git a/libs/loaders/GP_PBM.c b/libs/loaders/GP_PBM.c index a90ed8b..5b09153 100644 --- a/libs/loaders/GP_PBM.c +++ b/libs/loaders/GP_PBM.c @@ -62,7 +62,7 @@ GP_RetCode GP_LoadPBM(const char *src_path, GP_Context **res) if (fscanf(f, "%"PRIu32"%"PRIu32, &w, &h) < 2) goto err1; - *res = GP_ContextAlloc(w, h, GP_PIXEL_V1); + *res = GP_ContextAlloc(w, h, GP_PIXEL_G1); if (*res == NULL) { fclose(f); @@ -85,7 +85,7 @@ GP_RetCode GP_SavePBM(const char *res_path, GP_Context *src) { FILE *f; - if (src->pixel_type != GP_PIXEL_V1) + if (src->pixel_type != GP_PIXEL_G1) return GP_ENOIMPL; f = fopen(res_path, "w"); diff --git a/libs/loaders/GP_PGM.c b/libs/loaders/GP_PGM.c index 6612e2a..1e0d10f 100644 --- a/libs/loaders/GP_PGM.c +++ b/libs/loaders/GP_PGM.c @@ -117,16 +117,16 @@ GP_RetCode GP_LoadPGM(const char *src_path, GP_Context **res) switch (gray) { case 1: - type = GP_PIXEL_V1; + type = GP_PIXEL_G1; break; case 3: - type = GP_PIXEL_V2; + type = GP_PIXEL_G2; break; case 15: - type = GP_PIXEL_V4; + type = GP_PIXEL_G4; break; case 255: - type = GP_PIXEL_V8; + type = GP_PIXEL_G8; break; default: goto err1; @@ -171,16 +171,16 @@ GP_RetCode GP_SavePGM(const char *res_path, GP_Context *src) uint32_t gray; switch (src->pixel_type) { - case GP_PIXEL_V1: + case GP_PIXEL_G1: gray = 1; break; - case GP_PIXEL_V2: + case GP_PIXEL_G2: gray = 3; break; - case GP_PIXEL_V4: + case GP_PIXEL_G4: gray = 15; break; - case GP_PIXEL_V8: + case GP_PIXEL_G8: gray = 255; break; default: ----------------------------------------------------------------------- Summary of changes: gfxprim_config.py | 8 ++++---- include/core/GP_Convert.gen.h.t | 2 +- libs/loaders/GP_PBM.c | 4 ++-- libs/loaders/GP_PGM.c | 16 ++++++++-------- 4 files changed, 15 insertions(+), 15 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