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 f7289bd299e2a2414ab8b69f692f6e36f701a2e3 (commit) via d200a400aa94a961bec59b76e73979dfd6f22709 (commit) via 16295ba207ab7fc7e05031ff3319b87a07884f5d (commit) from f4f99af5bd7efbf8214eaf84a95dab162f763179 (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/f7289bd299e2a2414ab8b69f692f6e36f701a... commit f7289bd299e2a2414ab8b69f692f6e36f701a2e3 Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Jul 17 15:53:42 2011 +0200 Fixed GP_Color and Pixel so that SDL demos compile. diff --git a/include/core/GP_Color.h b/include/core/GP_Color.h index 3f13f95..1fddae9 100644 --- a/include/core/GP_Color.h +++ b/include/core/GP_Color.h @@ -19,13 +19,16 @@ * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * * <jiri.bluebear.dluhos@gmail.com> * * * - * Copyright (C) 2009-2010 Cyril Hrubis <metan@ucw.cz> * + * Copyright (C) 2009-2011 Cyril Hrubis <metan@ucw.cz> * * * *****************************************************************************/ #ifndef GP_COLOR_H #define GP_COLOR_H +#include "GP_Context.h" +#include "GP_Pixel.h" + typedef enum GP_ColorName { GP_COL_BLACK, GP_COL_RED, @@ -41,4 +44,6 @@ typedef enum GP_ColorName { GP_COL_MAX, } GP_ColorName; +GP_Pixel GP_ColorNameToPixel(GP_Context *context, GP_ColorName name); + #endif /* GP_COLOR_H */ diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index 6d45291..f4d8e46 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -44,6 +44,9 @@ /* Pixeltypes */ #include "core/GP_Pixel.h" +/* Pixel conversions */ +#include "core/GP_Convert.h" + /* Individual pixel access */ #include "core/GP_GetPutPixel.h" diff --git a/include/core/GP_GetPutPixel.h b/include/core/GP_GetPutPixel.h index 4f7a146..12e9af4 100644 --- a/include/core/GP_GetPutPixel.h +++ b/include/core/GP_GetPutPixel.h @@ -25,6 +25,7 @@ #define CORE_GP_GETPUTPIXEL_H #include "GP_Context.h" +#include "GP_Transform.h" #include "GP_FnPerBpp.h" #include "GP_Pixel.h" @@ -56,6 +57,14 @@ static inline GP_Pixel GP_GetPixel_Raw(const GP_Context *context, int x, int y) */ void GP_PutPixel(GP_Context *context, int x, int y, GP_Pixel p); +static inline void GP_TPutPixel(GP_Context *context, GP_Coord x, GP_Coord y, + GP_Pixel p) +{ + GP_TRANSFORM_POINT(context, x, y); + + GP_PutPixel(context, x, y, p); +} + /* * Version of PutPixel without transformations nor border checking. */ diff --git a/include/core/GP_Pixel.h b/include/core/GP_Pixel.h index 6282bf1..de2b4a5 100644 --- a/include/core/GP_Pixel.h +++ b/include/core/GP_Pixel.h @@ -31,7 +31,6 @@ #include <stdbool.h> #include <stdint.h> -#include "GP_Color.h" #include "GP_Common.h" #include "GP_RetCode.h" #include "GP_FnPerBpp.h" @@ -158,12 +157,13 @@ static inline void GP_PixelPrint(GP_Pixel pixel, GP_PixelType type) } /* - * Match pixel type to known pixel types. + * Match pixel type to known pixel types, pixel_size is in bits. * * Returns either valid PixelType or GP_PIXEL_UNKNOWN */ GP_PixelType GP_PixelRGBMatch(GP_Pixel rmask, GP_Pixel gmask, - GP_Pixel bmask, GP_Pixel amask); + GP_Pixel bmask, GP_Pixel amask, + uint8_t pixel_size); #endif /* GP_PIXEL_H */ diff --git a/libs/SDL/GP_SDL_Context.c b/libs/SDL/GP_SDL_Context.c index 021b6e6..e8b7500 100644 --- a/libs/SDL/GP_SDL_Context.c +++ b/libs/SDL/GP_SDL_Context.c @@ -38,7 +38,8 @@ GP_RetCode GP_SDL_ContextFromSurface(GP_Context *context, SDL_Surface *surf) enum GP_PixelType pixeltype = GP_PixelRGBMatch(surf->format->Rmask, surf->format->Gmask, surf->format->Bmask, - surf->format->Ashift); + surf->format->Ashift, + surf->format->BitsPerPixel); if (pixeltype == GP_PIXEL_UNKNOWN) return GP_ENOIMPL; diff --git a/libs/backends/GP_Backend_SDL.c b/libs/backends/GP_Backend_SDL.c index aac4a32..c3fd9ac 100644 --- a/libs/backends/GP_Backend_SDL.c +++ b/libs/backends/GP_Backend_SDL.c @@ -58,7 +58,8 @@ inline GP_RetCode GP_SDL_ContextFromSurface( enum GP_PixelType pixeltype = GP_PixelRGBMatch(surf->format->Rmask, surf->format->Gmask, surf->format->Bmask, - surf->format->Ashift); + surf->format->Ashift, + surf->format->BitsPerPixel); if (pixeltype == GP_PIXEL_UNKNOWN) return GP_ENOIMPL; diff --git a/libs/core/GP_Color.c b/libs/core/GP_Color.c index e6f2c53..19906e3 100644 --- a/libs/core/GP_Color.c +++ b/libs/core/GP_Color.c @@ -23,6 +23,10 @@ * * *****************************************************************************/ +#include "GP_Convert.h" + +#include "GP_Color.h" + #include <stdint.h> static char *color_names[] = { @@ -53,3 +57,11 @@ static uint8_t rgb888_colors[][3] = { {0xff, 0xff, 0xff}, /* white */ }; +GP_Pixel GP_ColorNameToPixel(GP_Context *context, GP_ColorName name) +{ + GP_ASSERT(name < GP_COL_MAX); + + return GP_RGBToPixel(rgb888_colors[name][0], + rgb888_colors[name][1], + rgb888_colors[name][2], context->pixel_type); +} diff --git a/libs/core/GP_Pixel.c b/libs/core/GP_Pixel.c index d6553b1..0132c7a 100644 --- a/libs/core/GP_Pixel.c +++ b/libs/core/GP_Pixel.c @@ -41,19 +41,24 @@ static const GP_PixelTypeChannel *get_channel(const GP_PixelTypeDescription *des static int match(const GP_PixelTypeChannel *channel, GP_Pixel mask) { - if (channel == NULL) + if (channel == NULL) { + printf("%s gen %08x pass %08xn", channel->name, 0, mask); return !mask; + } GP_Pixel chmask = ~0; chmask >>= (GP_PIXEL_BITS - channel->size); chmask <<= channel->offset; + + printf("%s gen %08x pass %08xn", channel->name, chmask, mask); return (chmask == mask); } GP_PixelType GP_PixelRGBMatch(GP_Pixel rmask, GP_Pixel gmask, - GP_Pixel bmask, GP_Pixel amask) + GP_Pixel bmask, GP_Pixel amask, + uint8_t pixel_size) { unsigned int i; @@ -62,10 +67,27 @@ GP_PixelType GP_PixelRGBMatch(GP_Pixel rmask, GP_Pixel gmask, const GP_PixelTypeChannel *r, *g, *b, *a; + if (GP_PixelTypes[i].size != pixel_size) + continue; + r = get_channel(&GP_PixelTypes[i], "R"); g = get_channel(&GP_PixelTypes[i], "G"); b = get_channel(&GP_PixelTypes[i], "B"); a = get_channel(&GP_PixelTypes[i], "A"); + + printf("------------------------ %s %un", GP_PixelTypes[i].name, pixel_size); + + if (r) + printf("Matching R %i %in", r->size, r->offset); + + if (g) + printf("Matching G %i %in", g->size, g->offset); + + if (b) + printf("Matching B %i %in", b->size, b->offset); + + if (a) + printf("Matching A %i %in", a->size, a->offset); res = match(r, rmask) && match(g, gmask) && match(b, bmask) && match(a, amask); diff --git a/tests/Makefile b/tests/Makefile index 83de916..e002663 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,3 +1,3 @@ TOPDIR=.. -SUBDIRS=filters core SDL #loaders +SUBDIRS=core SDL #loaders filters include $(TOPDIR)/include.mk diff --git a/tests/SDL/fileview.c b/tests/SDL/fileview.c index c1660a0..d7eead9 100644 --- a/tests/SDL/fileview.c +++ b/tests/SDL/fileview.c @@ -237,12 +237,12 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white_pixel); - GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT, &gray_pixel); - GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK, &dark_gray_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black_pixel); - GP_ColorNameToPixel(&context, GP_COL_RED, &red_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue_pixel); + white_pixel = GP_ColorNameToPixel(&context, GP_COL_WHITE); + gray_pixel = GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT); + dark_gray_pixel = GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK); + black_pixel = GP_ColorNameToPixel(&context, GP_COL_BLACK); + red_pixel = GP_ColorNameToPixel(&context, GP_COL_RED); + blue_pixel = GP_ColorNameToPixel(&context, GP_COL_BLUE); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/fonttest.c b/tests/SDL/fonttest.c index 756f01d..788f652 100644 --- a/tests/SDL/fonttest.c +++ b/tests/SDL/fonttest.c @@ -231,12 +231,12 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white_pixel); - GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT, &gray_pixel); - GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK, &dark_gray_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black_pixel); - GP_ColorNameToPixel(&context, GP_COL_RED, &red_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue_pixel); + white_pixel = GP_ColorNameToPixel(&context, GP_COL_WHITE); + gray_pixel = GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT); + dark_gray_pixel = GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK); + black_pixel = GP_ColorNameToPixel(&context, GP_COL_BLACK); + red_pixel = GP_ColorNameToPixel(&context, GP_COL_RED); + blue_pixel = GP_ColorNameToPixel(&context, GP_COL_BLUE); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/linetest.c b/tests/SDL/linetest.c index d9925c8..7012804 100644 --- a/tests/SDL/linetest.c +++ b/tests/SDL/linetest.c @@ -72,7 +72,7 @@ void redraw_screen(void) Uint8 b = 127.0 + 127.0 * sin(start_angle + angle); GP_Pixel pixel; - GP_RGBToPixel(&context, r, 0, b, &pixel); + pixel = GP_RGBToPixel(r, 0, b, context.pixel_type); /* * Draw the line forth and back to detect any pixel change @@ -124,8 +124,8 @@ int main(int argc, char **argv) GP_SDL_ContextFromSurface(&context, display); /* Load colors in display format */ - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white); + black = GP_ColorNameToPixel(&context, GP_COL_BLACK); + white = GP_ColorNameToPixel(&context, GP_COL_WHITE); /* Set up the refresh timer */ timer = SDL_AddTimer(30, timer_callback, NULL); diff --git a/tests/SDL/pixeltest.c b/tests/SDL/pixeltest.c index 7b3ffe5..5ea47a1 100644 --- a/tests/SDL/pixeltest.c +++ b/tests/SDL/pixeltest.c @@ -53,7 +53,7 @@ Uint32 timer_callback(__attribute__((unused)) Uint32 interval, void draw_pixel(void) { - GP_Color pixel, conv; +// GP_Color pixel, conv; int x = random() % 320; int y = random() % 240; @@ -156,10 +156,10 @@ int main(int argc, char **argv) GP_SDL_ContextFromSurface(&context, display); /* Load pixel values compatible with the display. */ - GP_ColorNameToPixel(&context, GP_COL_RED, &red_pixel); - GP_ColorNameToPixel(&context, GP_COL_GREEN, &green_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue_pixel); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white_pixel); + red_pixel = GP_ColorNameToPixel(&context, GP_COL_RED); + green_pixel = GP_ColorNameToPixel(&context, GP_COL_GREEN); + blue_pixel = GP_ColorNameToPixel(&context, GP_COL_BLUE); + white_pixel = GP_ColorNameToPixel(&context, GP_COL_WHITE); /* Set up the refresh timer */ timer = SDL_AddTimer(30, timer_callback, NULL); diff --git a/tests/SDL/randomshapetest.c b/tests/SDL/randomshapetest.c index b46125d..61c9f6f 100644 --- a/tests/SDL/randomshapetest.c +++ b/tests/SDL/randomshapetest.c @@ -178,7 +178,7 @@ void redraw_screen(void) /* Pick a random color for drawing. */ GP_Pixel pixel; - GP_RGBToPixel(&context, random() % 256, random() % 256, random() % 256, &pixel); + pixel = GP_RGBToPixel(&context, random() % 256, random() % 256, random() % 256); switch (shape) { case SHAPE_CIRCLE: @@ -309,8 +309,8 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); + white = GP_ColorNameToPixel(&context, GP_COL_WHITE); + black = GP_ColorNameToPixel(&context, GP_COL_BLACK); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/shapetest.c b/tests/SDL/shapetest.c index fb85b2e..44f04cf 100644 --- a/tests/SDL/shapetest.c +++ b/tests/SDL/shapetest.c @@ -463,13 +463,13 @@ int main(int argc, char ** argv) GP_SDL_ContextFromSurface(&context, display); /* Load colors compatible with the display */ - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white); - GP_ColorNameToPixel(&context, GP_COL_YELLOW, &yellow); - GP_ColorNameToPixel(&context, GP_COL_GREEN, &green); - GP_ColorNameToPixel(&context, GP_COL_RED, &red); - GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT, &gray); - GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK, &darkgray); + black = GP_ColorNameToPixel(&context, GP_COL_BLACK); + white = GP_ColorNameToPixel(&context, GP_COL_WHITE); + yellow = GP_ColorNameToPixel(&context, GP_COL_YELLOW); + green = GP_ColorNameToPixel(&context, GP_COL_GREEN); + red = GP_ColorNameToPixel(&context, GP_COL_RED); + gray = GP_ColorNameToPixel(&context, GP_COL_GRAY_LIGHT); + darkgray = GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK); /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); diff --git a/tests/SDL/sierpinsky.c b/tests/SDL/sierpinsky.c index 1136a45..333107f 100644 --- a/tests/SDL/sierpinsky.c +++ b/tests/SDL/sierpinsky.c @@ -55,7 +55,7 @@ static void sierpinsky(double x1, double y1, double x4, double y4, int iter) { double x2, y2, x3, y3, x5, y5; GP_Pixel pixel; - GP_RGBToPixel(context, 0, 0, 255-16*iter, &pixel); + pixel = GP_RGBToPixel(context, 0, 0, 255-16*iter); if (iter <= 0) { if (draw_edge) @@ -162,10 +162,10 @@ int main(void) display = SDL_GetVideoSurface(); context = GP_GetBackendVideoContext(); - GP_ColorNameToPixel(context, GP_COL_BLACK, &black); - GP_ColorNameToPixel(context, GP_COL_BLUE, &blue); - GP_ColorNameToPixel(context, GP_COL_GRAY_LIGHT, &gray); - GP_ColorNameToPixel(context, GP_COL_RED, &red); + black = GP_ColorNameToPixel(context, GP_COL_BLACK); + blue = GP_ColorNameToPixel(context, GP_COL_BLUE); + gray = GP_ColorNameToPixel(context, GP_COL_GRAY_LIGHT); + red = GP_ColorNameToPixel(context, GP_COL_RED); iter = 0; draw(display->w/2, display->h/2, l, iter); diff --git a/tests/SDL/symbolstest.c b/tests/SDL/symbolstest.c index 57a9722..532c13a 100644 --- a/tests/SDL/symbolstest.c +++ b/tests/SDL/symbolstest.c @@ -29,6 +29,8 @@ #include "GP_SDL.h" +static GP_Pixel black; + /* The surface used as a display (in fact it is a software surface). */ SDL_Surface *display = NULL; GP_Context context; @@ -39,9 +41,6 @@ SDL_TimerID timer; /* An event used for signaling that the timer was triggered. */ SDL_UserEvent timer_event; -/* Globally used colors. */ -GP_Pixel white, black; - static int pause_flag = 0; static int fill_flag = 0; @@ -85,18 +84,14 @@ void clear_screen(void) void redraw_screen(void) { - /* Random color. */ - GP_Color color = GP_RGB888_PACK(random() % 256, - random() % 256, - random() % 256); - if (pause_flag) return; SDL_LockSurface(display); GP_Pixel pixel; - GP_ColorToPixel(&context, color, &pixel); + pixel = GP_RGBToPixel(random() % 256, random() % 256, + random() % 256, context.pixel_type); draw_random_symbol(pixel); @@ -177,9 +172,8 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); - + black = GP_ColorNameToPixel(&context, GP_COL_BLACK); + /* Set up the refresh timer */ timer = SDL_AddTimer(60, timer_callback, NULL); if (timer == 0) { diff --git a/tests/SDL/textaligntest.c b/tests/SDL/textaligntest.c index 7731860..348eab7 100644 --- a/tests/SDL/textaligntest.c +++ b/tests/SDL/textaligntest.c @@ -159,12 +159,9 @@ int main(void) GP_SDL_ContextFromSurface(&context, display); /* Load colors suitable for the display */ - GP_ColorNameToPixel(&context, GP_COL_YELLOW, &yellow_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLUE, &blue_pixel); - GP_ColorNameToPixel(&context, GP_COL_RED, &red_pixel); - GP_ColorNameToPixel(&context, GP_COL_GREEN, &green_pixel); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black_pixel); - GP_ColorNameToPixel(&context, GP_COL_GRAY_DARK, &darkgray_pixel); + black_pixel = GP_ColorNameToPixel(&context, GP_COL_BLACK); + red_pixel = GP_ColorNameToPixel(&context, GP_COL_RED); + blue_pixel = GP_ColorNameToPixel(&context, GP_COL_BLUE); redraw_screen(); SDL_Flip(display); diff --git a/tests/SDL/trianglefps.c b/tests/SDL/trianglefps.c index 8204521..17c0604 100644 --- a/tests/SDL/trianglefps.c +++ b/tests/SDL/trianglefps.c @@ -70,16 +70,15 @@ void draw_frame(void) int y1 = random() % display->h; int x2 = display->w/2; int y2 = random() % display->h; - GP_Color color = GP_RGB888_PACK(random() % 255, random() % 255, random() % 255); GP_Pixel pixel; - GP_ColorToPixel(&context, color, &pixel); - - if (filled) { + pixel = GP_RGBToPixel(random() % 255, random() % 255, + random() % 255, context.pixel_type); + + if (filled) GP_FillTriangle(&context, x0, y0, x1, y1, x2, y2, pixel); - } else { + else GP_Triangle(&context, x0, y0, x1, y1, x2, y2, pixel); - } } void event_loop(void) @@ -160,8 +159,8 @@ int main(int argc, char ** argv) GP_SDL_ContextFromSurface(&context, display); - GP_ColorNameToPixel(&context, GP_COL_WHITE, &white); - GP_ColorNameToPixel(&context, GP_COL_BLACK, &black); + white = GP_ColorNameToPixel(&context, GP_COL_WHITE); + black = GP_ColorNameToPixel(&context, GP_COL_BLACK); /* Set up the timer */ timer = SDL_AddTimer(1000, timer_callback, NULL); http://repo.or.cz/w/gfxprim.git/commit/d200a400aa94a961bec59b76e73979dfd6f22... commit d200a400aa94a961bec59b76e73979dfd6f22709 Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Jul 17 15:41:30 2011 +0200 Fix the default types, offsets was backwards. diff --git a/pylib/pixeltypes.py b/pylib/pixeltypes.py index 4762255..b035b6a 100644 --- a/pylib/pixeltypes.py +++ b/pylib/pixeltypes.py @@ -4,6 +4,7 @@ # # 2011 - Tomas Gavenciak <gavento@ucw.cz> +# 2011 - Cyril Hrubis <metan@ucw.cz> # # Every call to PixelType defines one new GP_PixelType, order defines # the numbering. Undefined type is defined automatically. @@ -19,28 +20,28 @@ # PixelType(name='RGBx8888', size=32, chanslist=[ - ('R', 0, 8), + ('R', 16, 8), ('G', 8, 8), - ('B', 16, 8)]) + ('B', 0, 8)]) PixelType(name='RGBA8888', size=32, chanslist=[ - ('R', 0, 8), - ('G', 8, 8), - ('B', 16, 8), - ('A', 24, 8)]) + ('R', 24, 8), + ('G', 16, 8), + ('B', 8, 8), + ('A', 0, 8)]) PixelType(name='RGB888', size=24, chanslist=[ - ('R', 0, 8), + ('R', 16, 8), ('G', 8, 8), - ('B', 16, 8)]) + ('B', 0, 8)]) PixelType(name='RGB565', size=16, chanslist=[ - ('R', 0, 5), + ('R', 11, 5), ('G', 5, 6), - ('B', 11, 5)]) + ('B', 0, 5)]) # # Palette types http://repo.or.cz/w/gfxprim.git/commit/16295ba207ab7fc7e05031ff3319b87a07884... commit 16295ba207ab7fc7e05031ff3319b87a07884f5d Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Jul 17 15:37:45 2011 +0200 Delete debug lines. diff --git a/pylib/Makefile b/pylib/Makefile index af75868..2d01e96 100644 --- a/pylib/Makefile +++ b/pylib/Makefile @@ -8,7 +8,4 @@ CLEAN+=$(patsubst %.py, %.pyc, ${PYTHON_FILES}) include $(TOPDIR)/include.mk all: - ls $(PYLIBSDIR) - echo $(PYTHON_FILES) - echo $(CLEAN) @true ----------------------------------------------------------------------- Summary of changes: include/core/GP_Color.h | 7 ++++++- include/core/GP_Core.h | 3 +++ include/core/GP_GetPutPixel.h | 9 +++++++++ include/core/GP_Pixel.h | 6 +++--- libs/SDL/GP_SDL_Context.c | 3 ++- libs/backends/GP_Backend_SDL.c | 3 ++- libs/core/GP_Color.c | 12 ++++++++++++ libs/core/GP_Pixel.c | 26 ++++++++++++++++++++++++-- pylib/Makefile | 3 --- pylib/pixeltypes.py | 21 +++++++++++---------- tests/Makefile | 2 +- tests/SDL/fileview.c | 12 ++++++------ tests/SDL/fonttest.c | 12 ++++++------ tests/SDL/linetest.c | 6 +++--- tests/SDL/pixeltest.c | 10 +++++----- tests/SDL/randomshapetest.c | 6 +++--- tests/SDL/shapetest.c | 14 +++++++------- tests/SDL/sierpinsky.c | 10 +++++----- tests/SDL/symbolstest.c | 18 ++++++------------ tests/SDL/textaligntest.c | 9 +++------ tests/SDL/trianglefps.c | 15 +++++++-------- 21 files changed, 124 insertions(+), 83 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")