Gfxprim November 2011

gfxprim@ucw.cz

3 participants
52 discussions

[repo.or.cz] gfxprim.git branch master updated: cc5f16de4ff693a60f55a5b335367b3a8ffd3a40
by gavento 26 Nov '11

26 Nov '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, master has been updated via cc5f16de4ff693a60f55a5b335367b3a8ffd3a40 (commit) via 4a0d49ee3217ef629843a671587ae0e4c1659564 (commit) from 268e020540d7c79ee472d75c1f959228f419b82b (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/cc5f16de4ff693a60f55a5b335367b3a8ffd… commit cc5f16de4ff693a60f55a5b335367b3a8ffd3a40 Merge: 4a0d49e 268e020 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 21:38:16 2011 +0100 Merge branch 'master' of git://repo.or.cz/gfxprim diff --cc demos/fbshow/fbshow.c index ead85bf,8c1a2e7..4510312 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@@ -109,9 -143,12 +143,12 @@@ static void *image_loader(void *ptr float rat = calc_img_size(img->w, img->h, w, h); + w = img->w; + h = img->h; + /* Workaround */ if (img->pixel_type != GP_PIXEL_RGB888) { - GP_Context *tmp = GP_ContextConvert(img, NULL, GP_PIXEL_RGB888); + GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); GP_ContextFree(img); img = tmp; } http://repo.or.cz/w/gfxprim.git/commit/4a0d49ee3217ef629843a671587ae0e4c165… commit 4a0d49ee3217ef629843a671587ae0e4c1659564 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 21:29:11 2011 +0100 Neuter GP_ContextConvert (always alloc) Make GP_ContextConvert always allocate a new GP_Context * Consistent allocation behavior (=> less leaks) * The other variant is just a blit (make another wrapper if required) * Easier wrapping Note: the variant was buggy anyway (direct use of context->w) diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index bf18f3f..ead85bf 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -111,7 +111,7 @@ static void *image_loader(void *ptr) /* Workaround */ if (img->pixel_type != GP_PIXEL_RGB888) { - GP_Context *tmp = GP_ContextConvert(img, NULL, GP_PIXEL_RGB888); + GP_Context *tmp = GP_ContextConvert(img, GP_PIXEL_RGB888); GP_ContextFree(img); img = tmp; } diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 2a9ec43..2defb20 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -443,7 +443,7 @@ static GP_RetCode dither(GP_Context **c, const char *params) //TODO: so far we convert the context back to RGB888 //(so we can do further work with it) - GP_ContextConvert(bw, *c, (*c)->pixel_type); + GP_Blit(bw, 0, 0, GP_ContextW(bw), GP_ContextH(bw), *c, 0, 0); GP_ContextFree(bw); diff --git a/doc/context.txt b/doc/context.txt index 2e102f1..a98d21a 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -147,8 +147,8 @@ GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, GP_PixelType dst_pixel_type); ------------------------------------------------------------------------------- -This provides basic context conversion functionality. If 'NULL' is passed as -dst, the context for result is allocated and returned. +Provides basic context conversion functionality. +A newly allocated context is returned. This fuction does no error distribution but only integer division/multiplication for each pixel channel. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index cbe3742..664f15b 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -115,16 +115,19 @@ GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, GP_Coord x, GP_Coord y, GP_Size w, GP_Size h); /* - * Converts context to different pixel type. + * Converts context to a different pixel type. + * Returns a newly allocated context. * * This is naive implementation that doesn't do any ditherings or error * diffusions. */ -GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, +GP_Context *GP_ContextConvert(const GP_Context *src, GP_PixelType dst_pixel_type); /* * Free context. + * + * If context->free_pixels, also free pixel data. */ void GP_ContextFree(GP_Context *context); diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 23ae77b..7079901 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -107,25 +107,14 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) return context; } -GP_Context *GP_ContextConvert(const GP_Context *src, GP_Context *dst, +GP_Context *GP_ContextConvert(const GP_Context *src, GP_PixelType dst_pixel_type) { - GP_Context *ret = dst; - - if (ret == NULL) { - ret = GP_ContextAlloc(src->w, src->h, dst_pixel_type); - - if (ret == NULL) - return NULL; - } else { - GP_ASSERT(dst->pixel_type == dst_pixel_type, - "Destination pixel type doesn't match"); - GP_ASSERT(src->w <= dst->w && src->h <= dst->h, - "Destination is not big enough"); - } + GP_Context *ret = GP_ContextAlloc(src->w, src->h, dst_pixel_type); + if (ret == NULL) + return NULL; GP_Blit_Naive(src, 0, 0, src->w, src->h, ret, 0, 0); - return ret; } diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index 1a4ed83..be39c83 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -184,7 +184,7 @@ int main(int argc, char *argv[]) GP_SDL_ContextFromSurface(&context, display); - bitmap_conv = GP_ContextConvert(bitmap_raw, NULL, context.pixel_type); + bitmap_conv = GP_ContextConvert(bitmap_raw, context.pixel_type); change_bitmap(); black = GP_ColorToContextPixel(GP_COL_BLACK, &context); ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 2 +- demos/grinder/grinder.c | 2 +- doc/context.txt | 4 ++-- include/core/GP_Context.h | 7 +++++-- libs/core/GP_Context.c | 19 ++++--------------- tests/SDL/blittest.c | 2 +- 6 files changed, 14 insertions(+), 22 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: 268e020540d7c79ee472d75c1f959228f419b82b
by metan 26 Nov '11

26 Nov '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, master has been updated via 268e020540d7c79ee472d75c1f959228f419b82b (commit) from cac343079cd56a28eac9e54ca3ab4aeee3fba683 (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/268e020540d7c79ee472d75c1f959228f419… commit 268e020540d7c79ee472d75c1f959228f419b82b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Nov 26 21:10:09 2011 +0100 filters: Fixed and edhanced bicubic interpolation. * Fixed the filter so it's stable (the image looks same after number of 1:1 interpolations) * Added integer version of the filter - slightly faster on PC, expected to rock on ARM diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 27af5e3..8c1a2e7 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -155,9 +155,9 @@ static void *image_loader(void *ptr) GP_Context *ret; - //callback.priv = "Blurring Image"; - //if (GP_FilterGaussianBlur(img, img, 0.25/rat, 0.25/rat, &callback) == NULL) - // return NULL; + callback.priv = "Blurring Image"; + if (GP_FilterGaussianBlur(img, img, 0.3/rat, 0.3/rat, &callback) == NULL) + return NULL; callback.priv = "Resampling Image"; ret = GP_FilterResize(img, NULL, GP_INTERP_CUBIC, img->w * rat, img->h * rat, &callback); diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 2a9ec43..09081c7 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -81,6 +81,7 @@ static void print_error(const char *error) static const char *resize_algs[] = { "nn", "cubic", + "cubic-int", NULL }; @@ -135,6 +136,7 @@ static GP_RetCode resize(GP_Context **c, const char *params) static const char *scale_algs[] = { "nn", "cubic", + "cubic-int", NULL }; diff --git a/include/filters/GP_Resize.h b/include/filters/GP_Resize.h index 692339c..fcae054 100644 --- a/include/filters/GP_Resize.h +++ b/include/filters/GP_Resize.h @@ -47,8 +47,9 @@ #include "GP_Filter.h" typedef enum GP_InterpolationType { - GP_INTERP_NN, /* Nearest Neighbour */ - GP_INTERP_CUBIC, /* Bicubic */ + GP_INTERP_NN, /* Nearest Neighbour */ + GP_INTERP_CUBIC, /* Bicubic */ + GP_INTERP_CUBIC_INT, /* Bicubic - integer arithmetics */ } GP_InterpolationType; /* diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index baf7db5..ac5ea0d 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -103,21 +103,21 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, 1.00 * dst->w / src->w, 1.00 * dst->h / src->h); for (i = 0; i < dst->w; i++) { - float x = (1.00 * i / dst->w) * (src->w - 4.5) + 2.5; + float x = (1.00 * i / dst->w) * src->w; v4f cvx; int xi = x - 1; - - cvx.f[0] = cubic(x - xi); - cvx.f[1] = cubic(x - xi - 1); - cvx.f[2] = cubic(x - xi - 2); - cvx.f[3] = cubic(x - xi - 3); if (xi < 0) xi = 0; if (xi > (int)src->w - 4) xi = src->w - 4; - + + cvx.f[0] = cubic(x - xi); + cvx.f[1] = cubic(x - xi - 1); + cvx.f[2] = cubic(x - xi - 2); + cvx.f[3] = cubic(x - xi - 3); + /* Generate interpolated column */ for (j = 0; j < src->h; j++) { v4f rv, gv, bv; @@ -154,22 +154,22 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, /* now interpolate column for new image */ for (j = 0; j < dst->h; j++) { - float y = (1.00 * j / dst->h) * (src->h - 4.5) + 2.5; + float y = (1.00 * j / dst->h) * src->h; v4f cvy, rv, gv, bv; float r, g, b; - int yi = y - 1; + int yi = y; - cvy.f[0] = cubic(y - yi); - cvy.f[1] = cubic(y - yi - 1); - cvy.f[2] = cubic(y - yi - 2); - cvy.f[3] = cubic(y - yi - 3); - if (yi < 0) yi = 0; if (yi > (int)src->h - 4) yi = src->h - 4; + cvy.f[0] = cubic(y - yi); + cvy.f[1] = cubic(y - yi - 1); + cvy.f[2] = cubic(y - yi - 2); + cvy.f[3] = cubic(y - yi - 3); + rv.f[0] = col_r[yi]; rv.f[1] = col_r[yi + 1]; rv.f[2] = col_r[yi + 2]; @@ -223,6 +223,150 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, return 0; } +#define MUL 2048 + +#define MUL_I(a, b) ({ + a[0] *= b[0]; + a[1] *= b[1]; + a[2] *= b[2]; + a[3] *= b[3]; +}) + +#define SUM_I(a) + ((a)[0] + (a)[1] + (a)[2] + (a)[3]) + +int GP_FilterInterpolate_CubicInt(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + int32_t col_r[src->h], col_g[src->h], col_b[src->h]; + uint32_t i, j; + + GP_DEBUG(1, "Scaling image %ux%u -> %ux%u %2.2f %2.2f", + src->w, src->h, dst->w, dst->h, + 1.00 * dst->w / src->w, 1.00 * dst->h / src->h); + + for (i = 0; i < dst->w; i++) { + float x = (1.00 * i / dst->w) * src->w; + int32_t cvx[4]; + int xi = x - 1; + + if (xi < 0) + xi = 0; + + if (xi > (int)src->w - 4) + xi = src->w - 4; + + cvx[0] = cubic(x - xi) * MUL + 0.5; + cvx[1] = cubic(x - xi - 1) * MUL + 0.5; + cvx[2] = cubic(x - xi - 2) * MUL + 0.5; + cvx[3] = cubic(x - xi - 3) * MUL + 0.5; + + /* Generate interpolated column */ + for (j = 0; j < src->h; j++) { + int32_t rv[4], gv[4], bv[4]; + GP_Pixel pix[4]; + + pix[0] = GP_GetPixel_Raw_24BPP(src, xi, j); + pix[1] = GP_GetPixel_Raw_24BPP(src, xi + 1, j); + pix[2] = GP_GetPixel_Raw_24BPP(src, xi + 2, j); + pix[3] = GP_GetPixel_Raw_24BPP(src, xi + 3, j); + + rv[0] = GP_Pixel_GET_R_RGB888(pix[0]); + rv[1] = GP_Pixel_GET_R_RGB888(pix[1]); + rv[2] = GP_Pixel_GET_R_RGB888(pix[2]); + rv[3] = GP_Pixel_GET_R_RGB888(pix[3]); + + gv[0] = GP_Pixel_GET_G_RGB888(pix[0]); + gv[1] = GP_Pixel_GET_G_RGB888(pix[1]); + gv[2] = GP_Pixel_GET_G_RGB888(pix[2]); + gv[3] = GP_Pixel_GET_G_RGB888(pix[3]); + + bv[0] = GP_Pixel_GET_B_RGB888(pix[0]); + bv[1] = GP_Pixel_GET_B_RGB888(pix[1]); + bv[2] = GP_Pixel_GET_B_RGB888(pix[2]); + bv[3] = GP_Pixel_GET_B_RGB888(pix[3]); + + MUL_I(rv, cvx); + MUL_I(gv, cvx); + MUL_I(bv, cvx); + + col_r[j] = SUM_I(rv); + col_g[j] = SUM_I(gv); + col_b[j] = SUM_I(bv); + } + + /* now interpolate column for new image */ + for (j = 0; j < dst->h; j++) { + float y = (1.00 * j / dst->h) * src->h; + int32_t cvy[4], rv[4], gv[4], bv[4]; + int32_t r, g, b; + int yi = y - 1; + + if (yi < 0) + yi = 0; + + if (yi > (int)src->h - 4) + yi = src->h - 4; + + cvy[0] = cubic(y - yi) * MUL + 0.5; + cvy[1] = cubic(y - yi - 1) * MUL + 0.5; + cvy[2] = cubic(y - yi - 2) * MUL + 0.5; + cvy[3] = cubic(y - yi - 3) * MUL + 0.5; + + rv[0] = col_r[yi]; + rv[1] = col_r[yi + 1]; + rv[2] = col_r[yi + 2]; + rv[3] = col_r[yi + 3]; + + gv[0] = col_g[yi]; + gv[1] = col_g[yi + 1]; + gv[2] = col_g[yi + 2]; + gv[3] = col_g[yi + 3]; + + bv[0] = col_b[yi]; + bv[1] = col_b[yi + 1]; + bv[2] = col_b[yi + 2]; + bv[3] = col_b[yi + 3]; + + MUL_I(rv, cvy); + MUL_I(gv, cvy); + MUL_I(bv, cvy); + + r = (SUM_I(rv) + MUL*MUL/2) / MUL / MUL; + g = (SUM_I(gv) + MUL*MUL/2) / MUL / MUL; + b = (SUM_I(bv) + MUL*MUL/2) / MUL / MUL; + + if (r > 255) + r = 255; + + if (r < 0) + r = 0; + + if (g > 255) + g = 255; + + if (g < 0) + g = 0; + + if (b > 255) + b = 255; + + if (b < 0) + b = 0; + + GP_Pixel pix = GP_Pixel_CREATE_RGB888((uint8_t)r, (uint8_t)g, (uint8_t)b); + GP_PutPixel_Raw_24BPP(dst, i, j, pix); + } + + if (GP_ProgressCallbackReport(callback, i, dst->w, dst->h)) + return 1; + } + + GP_ProgressCallbackDone(callback); + return 0; +} + + int GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, GP_InterpolationType type, GP_ProgressCallback *callback) @@ -232,6 +376,8 @@ int GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, return GP_FilterInterpolate_NN(src, dst, callback); case GP_INTERP_CUBIC: return GP_FilterInterpolate_Cubic(src, dst, callback); + case GP_INTERP_CUBIC_INT: + return GP_FilterInterpolate_CubicInt(src, dst, callback); } return 1; ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 6 +- demos/grinder/grinder.c | 2 + include/filters/GP_Resize.h | 5 +- libs/filters/GP_Resize.c | 174 +++++++++++++++++++++++++++++++++++++++---- 4 files changed, 168 insertions(+), 19 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 pywrap updated: d028c5b88bfbe818f650dac41671b7dc74fab584
by gavento 26 Nov '11

26 Nov '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, pywrap has been updated via d028c5b88bfbe818f650dac41671b7dc74fab584 (commit) via 133b310ce8ca4adc61f14648dee634a00d5cf077 (commit) via 75272ddef49127d165aa2e041fcb49f5bdf437dd (commit) via 3428c6433249fc771dc355438cd47d7d3abfd70d (commit) via 116c09aa2a1efd689e4c2a66ad11d55988374983 (commit) from 9fb8ec2881f24724d6fe71bbfecb7524e95053a7 (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/d028c5b88bfbe818f650dac41671b7dc74fa… commit d028c5b88bfbe818f650dac41671b7dc74fab584 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 20:28:53 2011 +0100 Update and move GP_Context wrapper docstring diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index 366067c..4cdb160 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -44,12 +44,10 @@ /* - * Context manipulation + * GP_Context wrapping */ -/* Rename accestors to GP_Context attributes to _attribute */ -/* would work in swig 2.0: - * %rename("_%s", regexmatch$name="^GP_Context::") ""; */ +/* Rename accesors to GP_Context attributes to "_attribute" */ %rename("_%s") "GP_Context::pixels"; %rename("_%s") "GP_Context::bpp"; %rename("_%s") "GP_Context::bytes_per_row"; @@ -62,8 +60,26 @@ %rename("_%s") "GP_Context::y_swap"; %rename("_%s") "GP_Context::bit_endian"; %rename("_%s") "GP_Context::free_pixels"; +/* This nice batch would work in swig 2.0, sigh: + * %rename("_%s", regexmatch$name="^GP_Context::") ""; */ + %rename("Context") "GP_Context"; +%feature("autodoc", "Proxy of C GP_Context struct + +You can pass this class to wrapped GP_DrawSomething(...) as GP_Context. +All attributes of GP_Context are accessible directly as _attribute +(self._w etc.), but it is reccomended to use redefined properties: + +self.w: Context width (transformed) +self.h: Context width (transformed) + +Some context-related methods are provided as class members for convenience. + +GP_Context memory allocation is handled by gfxprim, deallocation by GP_ContextFree(). +The wrapper can be used without owning the GP_Context struct by setting self.this +and self.thisown.") GP_Context; + %include "GP_Context.h" %extend GP_Context { @@ -74,6 +90,11 @@ } }; + +/* + * Context manipulation + */ + %include "GP_GetPutPixel.h" %import "GP_GetPutPixel.gen.h" %include "GP_WritePixel.h" diff --git a/pylib/context.py b/pylib/context.py index 32ed123..1837b23 100644 --- a/pylib/context.py +++ b/pylib/context.py @@ -33,23 +33,7 @@ def extend_context_class(_context_class = core.Context): Called on module inicialization. """ - type.__setattr__(_context_class, "__doc_2__", - """Proxy of C GP_Context struct - - You can pass this class to wrapped GP_DrawSomething(...) as GP_Context. - All attributes of GP_Context are accessible directly as "_attribute" - (self._w etc.), but it is reccomended to use redefined properties: - - self.w: Context width (transformed) - self.h: Context width (transformed) - - Some context methods are provided as class members for convenience. - - GP_Context memory allocation is handled completely by gfxprim. - You shoud NEVER even think about self.this - this pointer will point to - free memory after self.__del__ is called (in case of owned GP_Context). - """) - + # Add "parent" attribute extend(_context_class, name='parent')(None) @extend(_context_class, name='__str__') http://repo.or.cz/w/gfxprim.git/commit/133b310ce8ca4adc61f14648dee634a00d5c… commit 133b310ce8ca4adc61f14648dee634a00d5cf077 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 20:04:12 2011 +0100 Complete rewrite of the wrapper class Now extending the SWIG wrapper instead of delegation Decorating tools TODO: set docstring correctly diff --git a/pylib/context.py b/pylib/context.py index 1551c5c..32ed123 100644 --- a/pylib/context.py +++ b/pylib/context.py @@ -1,58 +1,84 @@ import gfxprim_core_c as core import gfxprim_loaders_c as loaders -class Context(object): - def __init__(self, context, owns_GP_Context, parent=None): - """Create new GP_Context wrapper. +def extend(cls, name=None): + def decf(method): + funname = name + if not funname: + funname = method.__name__ + type.__setattr__(cls, funname, method) + return method + return decf - The wrapper is just a (read-only) proxy with - some conveniently mapped context methods. - Direct access is possible through self.context. - """ - # GP_Context struct (pre-wrapped by SWIG) - self.context = context - # call GP_ContextFree on del? - self.owns_GP_Context = owns_GP_Context - # Parent Context of a subcontext (if any) - # It is important to hold a ref to parent because of GC - self.parent = parent - - def __del__(self): - print "Deleting %s (owns_GP_Context: %s)" % (self, self.owns_GP_Context) - if self.owns_GP_Context: - core.GP_ContextFree(self.context) - - @property - def w(self): - "Context width (transformed)" - return core.GP_ContextW(self.context) +def add_swig_getmethod(cls, name=None): + def decf(method): + propname = name + if not propname: + propname = method.__name__ + cls.__swig_getmethods__[propname] = method + return decf - @property - def h(self): - "Context height (transformed)" - return core.GP_ContextH(self.context) +def add_swig_setmethod(cls, name=None): + def decf(method): + propname = name + if not propname: + propname = method.__name__ + cls.__swig_setmethods__[propname] = method + return decf + + +def extend_context_class(_context_class = core.Context): + """ + Extends _context_class class with convenience methods. + Called on module inicialization. + """ + + type.__setattr__(_context_class, "__doc_2__", + """Proxy of C GP_Context struct + + You can pass this class to wrapped GP_DrawSomething(...) as GP_Context. + All attributes of GP_Context are accessible directly as "_attribute" + (self._w etc.), but it is reccomended to use redefined properties: + + self.w: Context width (transformed) + self.h: Context width (transformed) + + Some context methods are provided as class members for convenience. - @property - def bpp(self): - "Context bpp" - return self.context.bpp + GP_Context memory allocation is handled completely by gfxprim. + You shoud NEVER even think about self.this - this pointer will point to + free memory after self.__del__ is called (in case of owned GP_Context). + """) - def __str__(self): + extend(_context_class, name='parent')(None) + + @extend(_context_class, name='__str__') + @extend(_context_class, name='__repr__') + def context_str(self): return "<Context %dx%d, %dbpp, GP_Context %sowned, %s parent>" % ( - self.w, self.h, self.bpp, - "" if self.owns_GP_Context else "not ", - "with" if self.parent else "no") - __repr__ = __str__ + self.w, self.h, self._bpp, + "" if self.thisown else "not ", + "with" if self.parent else "no") + + @add_swig_getmethod(_context_class) + def w(self): + return core.GP_ContextW(self) + + @add_swig_getmethod(_context_class) + def h(self): + return core.GP_ContextH(self) + @extend(_context_class) def subcontext(self, x, y, w, h): "Create a subcontext (rectangular view)." - c = core.GP_ContextSubContext(self.context, None, x, y, w, h) - if not c: - raise Exception("Error creating subcontext") - return type(self)(c, owns_GP_Context=True, parent=self) + c = core.GP_ContextSubContext(self, None, x, y, w, h) + c.thisown = True # GP_Context IS owned (but not the pixel data) + c.parent = self + return c + @extend(_context_class) def save(self, filename, format=None): - """Save the image in given format (or guess by the extension) + """Save the image in given format (or guess it from the extension) Currently, JPG, PNG and P[BGP]M are supported, but not for all context pixel types. @@ -61,34 +87,40 @@ class Context(object): format = filename.rsplit('.', 1)[-1] format = format.lower() if format == 'jpg': - res = loaders.GP_SaveJPG(filename, self.context, None) + res = loaders.GP_SaveJPG(filename, self, None) elif format == 'png': - res = loaders.GP_SavePNG(filename, self.context, None) + res = loaders.GP_SavePNG(filename, self, None) elif format == 'pbm': - res = loaders.GP_SavePBM(filename, self.context, None) + res = loaders.GP_SavePBM(filename, self, None) elif format == 'pgm': - res = loaders.GP_SavePGM(filename, self.context, None) + res = loaders.GP_SavePGM(filename, self, None) elif format == 'ppm': - res = loaders.GP_SavePPM(filename, self.context, None) + res = loaders.GP_SavePPM(filename, self, None) else: raise Exception("Format %r not supported.", format) if res != 0: raise Exception("Error saving %r (code %d)", filename, res) - @classmethod - def create(cls, w, h, pixeltype): + @extend(_context_class, name='create') + @staticmethod + def create(w, h, pixeltype): "Allocate a new w*h bitmap of given type." pixeltype_no = pixeltype if isinstance(pixeltype, int) else 0 # !!! # TODO: actually accept a PixelType c = core.GP_ContextAlloc(w, h, pixeltype_no) - return cls(c, owns_GP_Context=True) + c.thisown = True + return c - @classmethod - def load(cls, filename): + @extend(_context_class, name='load') + @staticmethod + def load(filename): "Load image from given file, guess type." c = loaders.GP_LoadImage_SWIG(filename) - if not c: - raise Exception("Error loading %r", filename) - return cls(c, owns_GP_Context=True) + c.thisown = True + return c + + + +extend_context_class() http://repo.or.cz/w/gfxprim.git/commit/75272ddef49127d165aa2e041fcb49f5bdf4… commit 75272ddef49127d165aa2e041fcb49f5bdf437dd Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 20:02:11 2011 +0100 Prepare for (more) direct wrapping of GP_Context Add autodoc feature Rename attributes to "_*" Set GP_Context destructor diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index e9d68d1..366067c 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -8,6 +8,8 @@ %include <stdint.i> +%feature("autodoc"); + %nodefaultctor; /* @@ -45,8 +47,33 @@ * Context manipulation */ +/* Rename accestors to GP_Context attributes to _attribute */ +/* would work in swig 2.0: + * %rename("_%s", regexmatch$name="^GP_Context::") ""; */ +%rename("_%s") "GP_Context::pixels"; +%rename("_%s") "GP_Context::bpp"; +%rename("_%s") "GP_Context::bytes_per_row"; +%rename("_%s") "GP_Context::w"; +%rename("_%s") "GP_Context::h"; +%rename("_%s") "GP_Context::offset"; +%rename("_%s") "GP_Context::pixel_type"; +%rename("_%s") "GP_Context::axes_swap"; +%rename("_%s") "GP_Context::x_swap"; +%rename("_%s") "GP_Context::y_swap"; +%rename("_%s") "GP_Context::bit_endian"; +%rename("_%s") "GP_Context::free_pixels"; +%rename("Context") "GP_Context"; + %include "GP_Context.h" +%extend GP_Context { + ~GP_Context() { + GP_DEBUG(2, "[wrapper] GP_ContextFree (%dx%d raw, %dbpp, free_pixels:%d)", + $self->w, $self->h, $self->bpp, $self->free_pixels); + GP_ContextFree($self); + } +}; + %include "GP_GetPutPixel.h" %import "GP_GetPutPixel.gen.h" %include "GP_WritePixel.h" http://repo.or.cz/w/gfxprim.git/commit/3428c6433249fc771dc355438cd47d7d3abf… commit 3428c6433249fc771dc355438cd47d7d3abfd70d Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 10:39:00 2011 +0100 core SWIG cleanup, removed some internals diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index 2a96a71..e9d68d1 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -10,7 +10,9 @@ %nodefaultctor; -/* Basic types and common methods */ +/* + * Basic types and common methods + */ %include "GP_Common.h" %include "GP_Core.h" @@ -23,23 +25,31 @@ %include "GP_ProgressCallback.h" %include "GP_RetCode.h" -/* Color and pixel types */ + +/* + * Color and pixel types + */ %include "GP_Color.h" -%include "GP_Context.h" %include "GP_Pixel.h" -%include "GP_Pixel.gen.h" +%include "GP_Pixel.gen.h" /* Includes enum GP_PixelType definition */ %include "GP_Convert.h" -%include "GP_Convert.gen.h" -%include "GP_Convert_Scale.gen.h" -%include "GP_Blit.gen.h" +%import "GP_Convert.gen.h" +%import "GP_Convert_Scale.gen.h" + +%import "GP_FnPerBpp.h" +%import "GP_FnPerBpp.gen.h" + -/* Context manipulation */ +/* + * Context manipulation + */ %include "GP_Context.h" -%include "GP_Blit.h" -%include "GP_Blit.gen.h" -%include "GP_FnPerBpp.h" + %include "GP_GetPutPixel.h" +%import "GP_GetPutPixel.gen.h" %include "GP_WritePixel.h" +%include "GP_Blit.h" +%import "GP_Blit.gen.h" http://repo.or.cz/w/gfxprim.git/commit/116c09aa2a1efd689e4c2a66ad11d5598837… commit 116c09aa2a1efd689e4c2a66ad11d55988374983 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Sat Nov 26 10:37:44 2011 +0100 Add GP_WritePixels.h to GP_Core.h diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index 70c2c3f..93ce52b 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -50,7 +50,10 @@ /* Individual pixel access */ #include "core/GP_GetPutPixel.h" -/* blitting */ +/* Writing pixel blocks */ +#include "GP_WritePixel.h" + +/* Blitting */ #include "core/GP_Blit.h" /* Debug and debug level */ ----------------------------------------------------------------------- Summary of changes: include/core/GP_Core.h | 5 +- include/core/gfxprim_core.swig | 80 ++++++++++++++++++++++---- pylib/context.py | 126 ++++++++++++++++++++++----------------- 3 files changed, 144 insertions(+), 67 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: cac343079cd56a28eac9e54ca3ab4aeee3fba683
by metan 26 Nov '11

26 Nov '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, master has been updated via cac343079cd56a28eac9e54ca3ab4aeee3fba683 (commit) from 5e645909989e30e94ffe9eacf2177f441d44c2d6 (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/cac343079cd56a28eac9e54ca3ab4aeee3fb… commit cac343079cd56a28eac9e54ca3ab4aeee3fba683 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Nov 26 01:04:42 2011 +0100 fbshow: Some more work on fbshow. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 082c888..27af5e3 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -43,18 +43,43 @@ static GP_Framebuffer *fb = NULL; /* image loader thread */ static int abort_flag = 0; static int rotate = 0; +static int show_progress = 0; static int image_loader_callback(GP_ProgressCallback *self) { + static GP_Size size = 0; + if (abort_flag) return 1; - + + if (!show_progress) + return 0; + + char buf[100]; + + snprintf(buf, sizeof(buf), "%s ... %-3.1f%%", + (const char*)self->priv, self->percentage); + + GP_Context *c = &fb->context; + + int align = GP_ALIGN_CENTER|GP_VALIGN_ABOVE; + + GP_TextClear(c, NULL, c->w/2, c->h - 4, align, + black_pixel, GP_MAX(size, GP_TextWidth(NULL, buf))); + + GP_Text(c, NULL, c->w/2, c->h - 4, align, + white_pixel, black_pixel, buf); + + size = GP_TextWidth(NULL, buf); + return 0; } struct loader_params { const char *img_path; - int clear; + int show_progress; + int show_progress_once; + int show_info; }; static float calc_img_size(uint32_t img_w, uint32_t img_h, @@ -66,31 +91,40 @@ static float calc_img_size(uint32_t img_w, uint32_t img_h, return GP_MIN(w_rat, h_rat); } +static const char *img_name(const char *img_path) +{ + int i, len = strlen(img_path); + + for (i = len - 1; i > 0; i--) { + if (img_path[i] == '/') + return &img_path[i+1]; + } + + return NULL; +} + static void *image_loader(void *ptr) { struct loader_params *params = ptr; GP_ProgressCallback callback = {.callback = image_loader_callback}; - fprintf(stderr, "Loading '%s'n", params->img_path); + show_progress = params->show_progress || params->show_progress_once; + params->show_progress_once = 0; - if (params->clear) { - char buf[100]; - snprintf(buf, sizeof(buf), "Loading '%s'", params->img_path); - GP_Fill(&fb->context, black_pixel); - //GP_BoxCenteredText(&fb->context, NULL, 0, 0, - // fb->context.w, fb->context.h, - // buf, white_pixel); - } + fprintf(stderr, "Loading '%s'n", params->img_path); GP_Context *img = NULL; + callback.priv = "Loading image"; + if (GP_LoadImage(params->img_path, &img, &callback) != 0) { - // GP_BoxCenteredText(&fb->context, NULL, 0, 0, - // fb->context.w, fb->context.h, - // "Failed to load image", white_pixel); + GP_Fill(&fb->context, black_pixel); + GP_Text(&fb->context, NULL, fb->context.w/2, fb->context.h/2, + GP_ALIGN_CENTER|GP_VALIGN_CENTER, black_pixel, white_pixel, + "Failed to load image :("); return NULL; } - + GP_Size w, h; switch (rotate) { @@ -109,6 +143,9 @@ static void *image_loader(void *ptr) float rat = calc_img_size(img->w, img->h, w, h); + w = img->w; + h = img->h; + /* Workaround */ if (img->pixel_type != GP_PIXEL_RGB888) { GP_Context *tmp = GP_ContextConvert(img, NULL, GP_PIXEL_RGB888); @@ -116,11 +153,13 @@ static void *image_loader(void *ptr) img = tmp; } - GP_Context *ret; -// if (GP_FilterGaussianBlur(img, img, 0.7, 0.7, &callback)) -// return NULL; + //callback.priv = "Blurring Image"; + //if (GP_FilterGaussianBlur(img, img, 0.25/rat, 0.25/rat, &callback) == NULL) + // return NULL; + + callback.priv = "Resampling Image"; ret = GP_FilterResize(img, NULL, GP_INTERP_CUBIC, img->w * rat, img->h * rat, &callback); GP_ContextFree(img); @@ -131,12 +170,15 @@ static void *image_loader(void *ptr) case 0: break; case 90: + callback.priv = "Rotating image (90)"; img = GP_FilterRotate90(ret, NULL, &callback); break; case 180: + callback.priv = "Rotating image (180)"; img = GP_FilterRotate180(ret, NULL, &callback); break; case 270: + callback.priv = "Rotating image (270)"; img = GP_FilterRotate270(ret, NULL, &callback); break; } @@ -161,19 +203,38 @@ static void *image_loader(void *ptr) GP_FillRectXYWH(&fb->context, ret->w+cx, 0, cx, fb->context.h, black_pixel); GP_FillRectXYWH(&fb->context, 0, ret->h+cy, fb->context.w, cy, black_pixel); + if (!params->show_info) + return NULL; + + GP_Size th = GP_TextHeight(NULL); + + GP_Print(&fb->context, NULL, 11, 11, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + black_pixel, white_pixel, "%ux%u", w, h); + + GP_Print(&fb->context, NULL, 10, 10, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "%ux%u", w, h); + + GP_Print(&fb->context, NULL, 11, 13 + th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + black_pixel, white_pixel, "1:%3.3f", rat); + + GP_Print(&fb->context, NULL, 10, 12 + th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "1:%3.3f", rat); + + GP_Print(&fb->context, NULL, 11, 15 + 2 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + black_pixel, white_pixel, "%s", img_name(params->img_path)); + + GP_Print(&fb->context, NULL, 10, 14 + 2 * th, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white_pixel, black_pixel, "%s", img_name(params->img_path)); + return NULL; } static pthread_t loader_thread = (pthread_t)0; -static struct loader_params params; -static void show_image(const char *img_path, int clear) +static void show_image(struct loader_params *params) { int ret; - params.img_path = img_path; - params.clear = clear; - /* stop previous loader thread */ if (loader_thread) { abort_flag = 1; @@ -182,7 +243,7 @@ static void show_image(const char *img_path, int clear) abort_flag = 0; } - ret = pthread_create(&loader_thread, NULL, image_loader, (void*)&params); + ret = pthread_create(&loader_thread, NULL, image_loader, (void*)params); if (ret) { fprintf(stderr, "Failed to start thread: %sn", strerror(ret)); @@ -204,11 +265,17 @@ int main(int argc, char *argv[]) GP_InputDriverLinux *drv = NULL; char *input_dev = NULL; int sleep_sec = -1; - + struct loader_params params = {NULL, 0, 0, 0}; int opt; - while ((opt = getopt(argc, argv, "i:s:r:")) != -1) { + while ((opt = getopt(argc, argv, "Ii:Ps:r:")) != -1) { switch (opt) { + case 'I': + params.show_info = 1; + break; + case 'P': + params.show_progress = 1; + break; case 'i': input_dev = optarg; break; @@ -258,10 +325,14 @@ int main(int argc, char *argv[]) black_pixel = GP_ColorToContextPixel(GP_COL_BLACK, &fb->context); white_pixel = GP_ColorToContextPixel(GP_COL_WHITE, &fb->context); + GP_Fill(&fb->context, black_pixel); + int argf = optind; int argn = argf; - show_image(argv[argf], 1); + params.show_progress_once = 1; + params.img_path = argv[argf]; + show_image(&params); /* Initalize select */ fd_set rfds; @@ -288,7 +359,8 @@ int main(int argc, char *argv[]) if (argn >= argc) argn = argf; - show_image(argv[argn], 0); + params.img_path = argv[argn]; + show_image(&params); break; default: while (GP_InputDriverLinuxRead(drv)); @@ -302,7 +374,8 @@ int main(int argc, char *argv[]) if (argn >= argc) argn = argf; - show_image(argv[argn], 0); + params.img_path = argv[argn]; + show_image(&params); } /* Read and parse events */ @@ -318,11 +391,22 @@ int main(int argc, char *argv[]) continue; switch (ev.val.key.key) { + case GP_KEY_I: + params.show_info = !params.show_info; + + params.show_progress_once = 1; + show_image(&params); + break; + case GP_KEY_P: + params.show_progress = !params.show_progress; + break; case GP_KEY_R: rotate += 90; if (rotate > 270) rotate = 0; - show_image(argv[argn], 1); + + params.show_progress_once = 1; + show_image(&params); break; case GP_KEY_ESC: case GP_KEY_ENTER: @@ -330,20 +414,28 @@ int main(int argc, char *argv[]) GP_FramebufferExit(fb); return 0; break; + case GP_KEY_RIGHT: case GP_KEY_UP: case GP_KEY_SPACE: argn++; if (argn >= argc) argn = argf; - show_image(argv[argn], 1); + + params.show_progress_once = 1; + params.img_path = argv[argn]; + show_image(&params); break; + case GP_KEY_BACKSPACE: + case GP_KEY_LEFT: case GP_KEY_DOWN: argn--; if (argn < argf) argn = argc - 1; - show_image(argv[argn], 1); + params.show_progress_once = 1; + params.img_path = argv[argn]; + show_image(&params); break; } break; ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 156 +++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 124 insertions(+), 32 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: 5e645909989e30e94ffe9eacf2177f441d44c2d6
by metan 25 Nov '11

25 Nov '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, master has been updated via 5e645909989e30e94ffe9eacf2177f441d44c2d6 (commit) via 9655adbc1de7cf63dd3510bb57f6fec95248c010 (commit) via 761929b143cb585ace1dd3c97cbe2f6be2952b80 (commit) via a21a7b420ab39c6c833aa878898295f61978c909 (commit) from 31c18f79b0e5a2b49f3ad6315ab7605935b2fc56 (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/5e645909989e30e94ffe9eacf2177f441d44… commit 5e645909989e30e94ffe9eacf2177f441d44c2d6 Merge: 9655adb 31c18f7 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 25 23:52:18 2011 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/9655adbc1de7cf63dd3510bb57f6fec95248… commit 9655adbc1de7cf63dd3510bb57f6fec95248c010 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 25 19:17:49 2011 +0100 text: Starting on redoing the text interface. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index bf18f3f..082c888 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -77,17 +77,17 @@ static void *image_loader(void *ptr) char buf[100]; snprintf(buf, sizeof(buf), "Loading '%s'", params->img_path); GP_Fill(&fb->context, black_pixel); - GP_BoxCenteredText(&fb->context, NULL, 0, 0, - fb->context.w, fb->context.h, - buf, white_pixel); + //GP_BoxCenteredText(&fb->context, NULL, 0, 0, + // fb->context.w, fb->context.h, + // buf, white_pixel); } GP_Context *img = NULL; if (GP_LoadImage(params->img_path, &img, &callback) != 0) { - GP_BoxCenteredText(&fb->context, NULL, 0, 0, - fb->context.w, fb->context.h, - "Failed to load image", white_pixel); + // GP_BoxCenteredText(&fb->context, NULL, 0, 0, + // fb->context.w, fb->context.h, + // "Failed to load image", white_pixel); return NULL; } diff --git a/include/text/GP_Font.h b/include/text/GP_Font.h index e84d459..a3cd434 100644 --- a/include/text/GP_Font.h +++ b/include/text/GP_Font.h @@ -19,12 +19,12 @@ * 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> * * * *****************************************************************************/ -#ifndef GP_FONT_H -#define GP_FONT_H +#ifndef TEXT_GP_FONT_H +#define TEXT_GP_FONT_H #include <stdint.h> @@ -159,4 +159,4 @@ unsigned int GP_GetFontDataSize(const GP_Font *font); GP_RetCode GP_FontLoad(GP_Font **font, const char *filename); GP_RetCode GP_FontSave(const GP_Font *font, const char *filename); -#endif /* GP_FONT_H */ +#endif /* TEXT_GP_FONT_H */ diff --git a/include/text/GP_Text.h b/include/text/GP_Text.h index 2c0177e..9cfdb7d 100644 --- a/include/text/GP_Text.h +++ b/include/text/GP_Text.h @@ -23,8 +23,8 @@ * * *****************************************************************************/ -#ifndef GP_TEXT_H -#define GP_TEXT_H +#ifndef TEXT_GP_TEXT_H +#define TEXT_GP_TEXT_H #include "core/GP_Context.h" @@ -42,7 +42,7 @@ * - GP_VALIGN_BASELINE places the text baseline at the point * - GP_VALIGN_BELOW (or BOTTOM) draws the text below the point */ -typedef enum GP_TextAlign { +typedef enum GP_TextAttr { GP_ALIGN_LEFT = 0x01, GP_ALIGN_CENTER = 0x02, GP_ALIGN_RIGHT = 0x03, @@ -52,22 +52,44 @@ typedef enum GP_TextAlign { GP_VALIGN_BASELINE = 0x30, GP_VALIGN_BELOW = 0x40, GP_VALIGN_BOTTOM = GP_VALIGN_BELOW, -} GP_TextAlign; +} GP_TextAttr; -GP_RetCode GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, int align, - const char *str, GP_Pixel pixel); +void GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, const char *str); -GP_RetCode GP_Text(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, int align, - const char *str, GP_Pixel pixel); +/* + * Draws a string. + * + * The string is rendered to context (horizontally) with defined text style. + * The x and y coordinates determines point defined by aligment flags. + * + * The background color is ignored for 1bpp font formats. + */ +void GP_Text(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, const char *str); + +/* + * Same as above, but printf like and returns text width in pixels. + */ +GP_Size GP_Print(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, const char *fmt, ...) + __attribute__ ((format (printf, 8, 9))); -GP_RetCode GP_BoxCenteredText_Raw(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - const char *str, GP_Pixel pixel); +/* + * Clears rectangle that would be used to draw text of size pixels. + */ +void GP_TextClear(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel bg_color, GP_Size size); -GP_RetCode GP_BoxCenteredText(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - const char *str, GP_Pixel pixel); +/* + * Dtto, but with string. + */ +void GP_TextClearStr(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel bg_color, const char *str); -#endif /* GP_TEXT_H */ +#endif /* TEXT_GP_TEXT_H */ diff --git a/include/text/GP_TextMetric.h b/include/text/GP_TextMetric.h index d9f4ffb..16d44bc 100644 --- a/include/text/GP_TextMetric.h +++ b/include/text/GP_TextMetric.h @@ -19,44 +19,47 @@ * 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> * * * ****************************************************************************/ -#ifndef GP_TEXT_METRIC_H -#define GP_TEXT_METRIC_H +#ifndef TEXT_GP_TEXT_METRIC_H +#define TEXT_GP_TEXT_METRIC_H +#include "core/GP_Types.h" #include "GP_TextStyle.h" /* * Calculates the width of the string drawn in the given style, in pixels. */ -unsigned int GP_TextWidth(const GP_TextStyle *style, const char *str); +GP_Size GP_TextWidth(const GP_TextStyle *style, const char *str); /* * Maximal text width for string with len characters. */ -unsigned int GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len); +GP_Size GP_TextMaxWidth(const GP_TextStyle *style, unsigned int len); /* * Returns maximal width for text written with len characters from str. */ -unsigned int GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, - unsigned int len); +GP_Size GP_TextMaxStrWidth(const GP_TextStyle *style, const char *str, + unsigned int len); /* * Returns maximal text height, in pixels. */ -unsigned int GP_TextHeight(const GP_TextStyle *style); +GP_Size GP_TextHeight(const GP_TextStyle *style); -/* Returns the ascent (height from the baseline to the top of characters), +/* + * Returns the ascent (height from the baseline to the top of characters), * for the given text style. (Result is in pixels.) */ -unsigned int GP_TextAscent(const GP_TextStyle *style); +GP_Size GP_TextAscent(const GP_TextStyle *style); -/* Returns the descent (height from the baseline to the bottom of characters), +/* + * Returns the descent (height from the baseline to the bottom of characters), * for the given text style. (Result is in pixels.) */ -unsigned int GP_TextDescent(const GP_TextStyle *style); +GP_Size GP_TextDescent(const GP_TextStyle *style); -#endif /* GP_TEXT_METRIC_H */ +#endif /* TEXT_GP_TEXT_METRIC_H */ diff --git a/include/text/GP_TextStyle.h b/include/text/GP_TextStyle.h index d57e678..58b6886 100644 --- a/include/text/GP_TextStyle.h +++ b/include/text/GP_TextStyle.h @@ -23,8 +23,8 @@ * * *****************************************************************************/ -#ifndef GP_TEXTSTYLE_H -#define GP_TEXTSTYLE_H +#ifndef TEXT_GP_TEXTSTYLE_H +#define TEXT_GP_TEXTSTYLE_H #include "GP_Font.h" #include "core/GP_RetCode.h" @@ -68,4 +68,4 @@ void GP_DefaultTextStyle(GP_TextStyle *style); GP_CHECK_FONT(style->font); } while(0) -#endif /* GP_TEXTSTYLE_H */ +#endif /* TEXT_GP_TEXTSTYLE_H */ diff --git a/libs/text/GP_Text.c b/libs/text/GP_Text.c index c6fce34..56033d2 100644 --- a/libs/text/GP_Text.c +++ b/libs/text/GP_Text.c @@ -23,168 +23,153 @@ * * *****************************************************************************/ +#include <stdarg.h> #include "algo/Text.algo.h" #include "gfx/GP_Gfx.h" #include "core/GP_FnPerBpp.h" +#include "core/GP_Debug.h" #include "GP_Text.h" GP_TextStyle GP_DefaultStyle = GP_DEFAULT_TEXT_STYLE; +static int do_align(GP_Coord *topleft_x, GP_Coord *topleft_y, int align, + GP_Coord x, GP_Coord y, const GP_TextStyle *style, + GP_Size width) +{ + int height = GP_TextHeight(style); + + switch (align & 0x0f) { + case GP_ALIGN_LEFT: + *topleft_x = x - width + 1; + break; + case GP_ALIGN_RIGHT: + *topleft_x = x; + break; + case GP_ALIGN_CENTER: + *topleft_x = x - width/2; + break; + default: + GP_DEBUG(1, "ALIGN 0x%0xn", align); + return 1; + } + + switch (align & 0xf0) { + case GP_VALIGN_ABOVE: + *topleft_y = y - height + 1; + break; + case GP_VALIGN_CENTER: + *topleft_y = y - height/2; + break; + case GP_VALIGN_BASELINE: + *topleft_y = y - height + style->font->baseline; + break; + case GP_VALIGN_BELOW: + *topleft_y = y; + break; + default: + GP_DEBUG(1, "VALIGN 0x%0xn", align); + return 1; + } + + return 0; +} + /* Generate drawing functions for various bit depths. */ GP_DEF_FILL_FN_PER_BPP(GP_Text_Raw, DEF_TEXT_FN) -GP_RetCode GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, int align, - const char *str, GP_Pixel pixel) +void GP_Text_Raw(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, const char *str) { + (void) bg_color; + GP_CHECK_CONTEXT(context); if (str == NULL) - return GP_ENULLPTR; + return; if (style == NULL) style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); - int width = GP_TextWidth(style, str); - int height = GP_TextHeight(style); + GP_Coord topleft_x, topleft_y; + GP_Size w = GP_TextWidth(style, str); - int topleft_x, topleft_y; - switch (align & 0x0f) { - case GP_ALIGN_LEFT: - topleft_x = x - width + 1; - break; - case GP_ALIGN_RIGHT: - topleft_x = x; - break; - case GP_ALIGN_CENTER: - topleft_x = x - width/2; - break; - default: - return GP_EINVAL; - } - switch (align & 0xf0) { - case GP_VALIGN_ABOVE: - topleft_y = y - height + 1; - break; - case GP_VALIGN_CENTER: - topleft_y = y - height/2; - break; - case GP_VALIGN_BASELINE: - topleft_y = y - height + style->font->baseline; - break; - case GP_VALIGN_BELOW: - topleft_y = y; - break; - default: - return GP_EINVAL; - } + GP_ASSERT(do_align(&topleft_x, &topleft_y, align, x, y, style, w) == 0, + "Invalid aligment flags"); GP_FN_PER_BPP_CONTEXT(GP_Text_Raw, context, context, style, - topleft_x, topleft_y, str, pixel); - - return GP_ESUCCESS; + topleft_x, topleft_y, str, fg_color); } DEF_TEXT_FN(GP_Text_internal, GP_Context *, GP_Pixel, GP_HLine) -GP_RetCode GP_Text(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, int align, - const char *str, GP_Pixel pixel) +void GP_Text(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, + const char *str) { + (void) bg_color; + GP_CHECK_CONTEXT(context); - + if (str == NULL) - return GP_ENULLPTR; + return; if (style == NULL) style = &GP_DefaultStyle; GP_CHECK_TEXT_STYLE(style); + + GP_Coord topleft_x, topleft_y; + GP_Size w = GP_TextWidth(style, str); - int width = GP_TextWidth(style, str); - int height = GP_TextHeight(style); - - int topleft_x, topleft_y; - switch (align & 0x0f) { - case GP_ALIGN_LEFT: - topleft_x = x - width; - break; - case GP_ALIGN_RIGHT: - topleft_x = x; - break; - case GP_ALIGN_CENTER: - topleft_x = x - width/2; - break; - default: - return GP_EINVAL; - } - switch (align & 0xf0) { - case GP_VALIGN_ABOVE: - topleft_y = y - height; - break; - case GP_VALIGN_CENTER: - topleft_y = y - height/2; - break; - case GP_VALIGN_BASELINE: - topleft_y = y - height + style->font->baseline; - break; - case GP_VALIGN_BELOW: - topleft_y = y; - break; - default: - return GP_EINVAL; - } + GP_ASSERT(do_align(&topleft_x, &topleft_y, align, x, y, style, w) == 0, + "Invalid aligment flags"); - GP_Text_internal(context, style, topleft_x, topleft_y, str, pixel); - return GP_ESUCCESS; + GP_Text_internal(context, style, topleft_x, topleft_y, str, fg_color); } -GP_RetCode GP_BoxCenteredText_Raw(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - const char *str, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - if (str == NULL) - return GP_ENULLPTR; +GP_Size GP_Print(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel fg_color, GP_Pixel bg_color, const char *fmt, ...) +{ + va_list va, vac; + int size; - if (style == NULL) - style = &GP_DefaultStyle; - - GP_CHECK_TEXT_STYLE(style); + va_start(va, fmt); + va_copy(vac, va); + size = vsnprintf(NULL, 0, fmt, va); + va_end(va); + char buf[size+1]; + vsnprintf(buf, sizeof(buf), fmt, vac); + va_end(vac); - const int mid_x = x + w/2; - const int mid_y = y + h/2; - const int font_ascent = GP_TextAscent(style); + GP_Text(context, style, x, y, align, fg_color, bg_color, buf); - return GP_Text_Raw(context, style, mid_x, - mid_y + font_ascent/2, - GP_ALIGN_CENTER | GP_VALIGN_BASELINE, - str, pixel); + return GP_TextWidth(style, buf); } -GP_RetCode GP_BoxCenteredText(GP_Context *context, const GP_TextStyle *style, - GP_Coord x, GP_Coord y, GP_Size w, GP_Size h, - const char *str, GP_Pixel pixel) -{ - GP_CHECK_CONTEXT(context); - if (str == NULL) - return GP_ENULLPTR; +void GP_TextClear(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel bg_color, GP_Size size) +{ + GP_Coord topleft_x, topleft_y; - if (style == NULL) - style = &GP_DefaultStyle; - - GP_CHECK_TEXT_STYLE(style); + GP_ASSERT(do_align(&topleft_x, &topleft_y, align, x, y, style, size) == 0, + "Invalid aligment flags"); - const int mid_x = x + w/2; - const int mid_y = y + h/2; - const int font_ascent = GP_TextAscent(style); + GP_FillRectXYWH(context, topleft_x, topleft_y, + size, GP_TextHeight(style), bg_color); +} - return GP_Text(context, style, mid_x, - mid_y + font_ascent/2, - GP_ALIGN_CENTER | GP_VALIGN_BASELINE, - str, pixel); +void GP_TextClearStr(GP_Context *context, const GP_TextStyle *style, + GP_Coord x, GP_Coord y, int align, + GP_Pixel bg_color, const char *str) +{ + GP_TextClear(context, style, x, y, align, + bg_color, GP_TextWidth(style, str)); } diff --git a/tests/SDL/blittest.c b/tests/SDL/blittest.c index 1a4ed83..bfedaa7 100644 --- a/tests/SDL/blittest.c +++ b/tests/SDL/blittest.c @@ -85,7 +85,8 @@ void redraw_screen(void) SDL_LockSurface(display); - GP_Text(&context, NULL, 20, 20, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, text_buf, white); + GP_Text(&context, NULL, 20, 20, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, + white, black, text_buf); GP_Blit(bitmap, 0, 0, bitmap->w, bitmap->h, &context, bitmap_x, bitmap_y); SDL_UpdateRect(display, bitmap_x, bitmap_y, bitmap->w, bitmap->h); diff --git a/tests/SDL/fileview.c b/tests/SDL/fileview.c index c01a7fc..1899da9 100644 --- a/tests/SDL/fileview.c +++ b/tests/SDL/fileview.c @@ -92,7 +92,8 @@ void redraw_screen(void) for (i = 0; i < 30; i++) { if (line == NULL) break; - GP_Text(&context, &style, 16, 16*i + 16, align, line->text, black_pixel); + GP_Text(&context, &style, 16, 16*i + 16, align, + black_pixel, black_pixel, line->text); line = line->next; } diff --git a/tests/SDL/fonttest.c b/tests/SDL/fonttest.c index 602c526..4bfa945 100644 --- a/tests/SDL/fonttest.c +++ b/tests/SDL/fonttest.c @@ -98,20 +98,23 @@ void redraw_screen(void) style.font->height + 1, blue_pixel); - GP_Text(&context, &style, 16, 100*i + 16, align, test_string, white_pixel); + GP_Text(&context, &style, 16, 100*i + 16, align, + white_pixel, black_pixel, test_string); style.pixel_xmul = 2; style.pixel_ymul = 2; style.pixel_yspace = 1; - GP_Text(&context, &style, 34, 100*i + 38, align, test_string, gray_pixel); + GP_Text(&context, &style, 34, 100*i + 38, align, + white_pixel, black_pixel, test_string); style.pixel_xmul = 4; style.pixel_ymul = 2; style.pixel_xspace = 1; style.pixel_yspace = 1; - GP_Text(&context, &style, 64, 100*i + 72, align, test_string, dark_gray_pixel); + GP_Text(&context, &style, 64, 100*i + 72, align, + dark_gray_pixel, black_pixel, test_string); } SDL_UnlockSurface(display); @@ -188,7 +191,9 @@ void print_character_metadata(const GP_Font *font, int c) int main(int argc, char *argv[]) { print_instructions(); - + + GP_SetDebugLevel(10); + if (argc > 1) { GP_RetCode err; fprintf(stderr, "nLoading font '%s'n", argv[1]); diff --git a/tests/SDL/input.c b/tests/SDL/input.c index c420b09..c2b1cde 100644 --- a/tests/SDL/input.c +++ b/tests/SDL/input.c @@ -48,12 +48,17 @@ Uint32 timer_callback(__attribute__((unused)) Uint32 interval, static void draw_event(GP_Event *ev) { + static GP_Size size = 0; + if (ev->type != GP_EV_KEY) return; + + int align = GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM; - GP_FillRect(&context, 0, 0, 150, 35, black_pixel); - GP_Text(&context, NULL, 20, 20, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, - GP_EventKeyName(ev->val.key.key), white_pixel); + GP_TextClear(&context, NULL, 20, 20, align, black_pixel, size); + size = GP_Print(&context, NULL, 20, 20, align, + white_pixel, black_pixel, "Key=%s", + GP_EventKeyName(ev->val.key.key)); SDL_Flip(display); } @@ -94,12 +99,21 @@ static void event_loop(void) break; case GP_EV_REL: switch (ev.code) { + static int size = 0; case GP_EV_REL_POS: if (GP_EventGetKey(&ev, GP_BTN_LEFT)) { GP_PutPixel(&context, ev.cursor_x, ev.cursor_y, green_pixel); SDL_Flip(display); } + int align = GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM; + + GP_TextClear(&context, NULL, 20, 40, align, + black_pixel, size); + size = GP_Print(&context, NULL, 20, 40, align, + white_pixel, black_pixel, "X=%3u Y=%3u", + ev.cursor_x, ev.cursor_y); + SDL_Flip(display); break; } break; diff --git a/tests/SDL/shapetest.c b/tests/SDL/shapetest.c index d270528..8435e10 100644 --- a/tests/SDL/shapetest.c +++ b/tests/SDL/shapetest.c @@ -273,7 +273,7 @@ void redraw_screen(void) } GP_Text(&context, &style, 16, 16, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, - title, white); + white, black, title); SDL_UnlockSurface(display); } diff --git a/tests/SDL/subcontext.c b/tests/SDL/subcontext.c index 25db7fb..5147ddf 100644 --- a/tests/SDL/subcontext.c +++ b/tests/SDL/subcontext.c @@ -128,7 +128,7 @@ static void draw_text(GP_Context *dest, GP_Coord x, GP_Coord y, x1 = random() % (w - tw) + x; y1 = random() % (h - th) + y; - GP_Text(dest, NULL, x1, y1, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, TEXT, col); + GP_Text(dest, NULL, x1, y1, GP_ALIGN_RIGHT|GP_VALIGN_BOTTOM, col, black, TEXT); } void redraw_screen(void) diff --git a/tests/SDL/textaligntest.c b/tests/SDL/textaligntest.c index 507b560..b6ac351 100644 --- a/tests/SDL/textaligntest.c +++ b/tests/SDL/textaligntest.c @@ -65,20 +65,20 @@ void redraw_screen(void) style.pixel_xspace = 4; style.pixel_yspace = 4; - GP_BoxCenteredText(&context, &style, 0, 0, X, Y, - "Hello world!", darkgray_pixel); + //GP_BoxCenteredText(&context, &style, 0, 0, X, Y, + // "Hello world!", darkgray_pixel); style.pixel_xspace = 0; style.pixel_yspace = 0; GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_BELOW, - "bottom left", yellow_pixel); + yellow_pixel, black_pixel, "bottom left"); GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, - "bottom right", red_pixel); + red_pixel, black_pixel, "bottom right"); GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_RIGHT|GP_VALIGN_ABOVE, - "top right", blue_pixel); + blue_pixel, black_pixel, "top right"); GP_Text(&context, &style, X/2, Y/2, GP_ALIGN_LEFT|GP_VALIGN_ABOVE, - "top left", green_pixel); + green_pixel, black_pixel, "top left"); SDL_UnlockSurface(display); } diff --git a/tests/drivers/framebuffer_test.c b/tests/drivers/framebuffer_test.c index c5aceb9..c2595d2 100644 --- a/tests/drivers/framebuffer_test.c +++ b/tests/drivers/framebuffer_test.c @@ -77,7 +77,7 @@ int main(void) GP_Pixel gray, black; gray = GP_RGBToContextPixel(200, 200, 200, &fb->context); - black = GP_RGBToContextPixel( 0, 0, 0, &fb->context); + black = GP_RGBToContextPixel(0, 0, 0, &fb->context); const char *text = "Framebuffer test"; @@ -86,7 +86,7 @@ int main(void) GP_Line(&fb->context, 0, fb->context.h, fb->context.w, 0, black); GP_Text(&fb->context, &style, (fb->context.w - GP_TextWidth(&style, text))/2, - 16, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, text, black); + 16, GP_ALIGN_RIGHT|GP_VALIGN_BELOW, black, gray, text); draw(&fb->context, fb->context.w / 2, 2.00 * fb->context.h / 3, 60); http://repo.or.cz/w/gfxprim.git/commit/761929b143cb585ace1dd3c97cbe2f6be295… commit 761929b143cb585ace1dd3c97cbe2f6be2952b80 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 25 18:36:20 2011 +0100 filters: Complete filter param & fix tests. diff --git a/include/filters/GP_FilterParam.h b/include/filters/GP_FilterParam.h index d073305..f997ed5 100644 --- a/include/filters/GP_FilterParam.h +++ b/include/filters/GP_FilterParam.h @@ -84,6 +84,23 @@ int GP_FilterParamCheckChannels(GP_FilterParam params[], #define GP_FILTER_PARAMS(pixel_type, name) GP_FilterParam name[GP_PixelTypes[pixel_type].numchannels + 1]; GP_FilterParamInitChannels(name, pixel_type); + +#define GP_FILTER_PARAMS_INT(pixel_type, name, val) + GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParamSetIntAll(name, val); + +#define GP_FILTER_PARAMS_UINT(pixel_type, name, val) + GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParamSetUIntAll(name, val); + +#define GP_FILTER_PARAMS_FLOAT(pixel_type, name, val) + GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParamSetFloatAll(name, val); + +#define GP_FILTER_PARAMS_PTR(pixel_type, name, ptr) + GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParamSetPtrAll(name, ptr); + /* * Initalize param names and terminator. * @@ -116,4 +133,12 @@ void GP_FilterParamSetUIntAll(GP_FilterParam params[], void GP_FilterParamSetPtrAll(GP_FilterParam params[], void *ptr); +/* + * Functions to print the array. + */ +void GP_FilterParamPrintInt(GP_FilterParam params[]); +void GP_FilterParamPrintUInt(GP_FilterParam params[]); +void GP_FilterParamPrintFloat(GP_FilterParam params[]); +void GP_FilterParamPrintPtr(GP_FilterParam params[]); + #endif /* FILTERS_GP_FILTER_PARAM_H */ diff --git a/libs/filters/GP_FilterParam.c b/libs/filters/GP_FilterParam.c index c5ef345..a07b3de 100644 --- a/libs/filters/GP_FilterParam.c +++ b/libs/filters/GP_FilterParam.c @@ -141,3 +141,35 @@ void GP_FilterParamSetPtrAll(GP_FilterParam params[], for (i = 0; params[i].channel_name[0] != '0'; i++) params[i].val.ptr = ptr; } + +void GP_FilterParamPrintInt(GP_FilterParam params[]) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + printf("Chann '%s' = %in", params[i].channel_name, params[i].val.i); +} + +void GP_FilterParamPrintUInt(GP_FilterParam params[]) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + printf("Chann '%s' = %un", params[i].channel_name, params[i].val.ui); +} + +void GP_FilterParamPrintFloat(GP_FilterParam params[]) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + printf("Chann '%s' = %fn", params[i].channel_name, params[i].val.f); +} + +void GP_FilterParamPrintPtr(GP_FilterParam params[]) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + printf("Chann '%s' = %pn", params[i].channel_name, params[i].val.ptr); +} diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index 9df416d..b0f0839 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -47,17 +47,18 @@ void event_loop(void) return; case SDLK_UP: brightness+=2; - case SDLK_DOWN: + case SDLK_DOWN: { brightness-=1; - res = GP_FilterBrightness(bitmap, NULL, brightness, NULL); + GP_FILTER_PARAMS_INT(bitmap->pixel_type, param, brightness); + res = GP_FilterBrightness(bitmap, NULL, param, NULL); printf("brightness = %i %ux%un", brightness, res->w, res->h); GP_Blit(res, 0, 0, res->w, res->h, &context, 0, 0); SDL_Flip(display); GP_ContextFree(res); - break; + } break; default: break; } http://repo.or.cz/w/gfxprim.git/commit/a21a7b420ab39c6c833aa878898295f61978… commit a21a7b420ab39c6c833aa878898295f61978c909 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Fri Nov 25 18:32:09 2011 +0100 filters: Fix point filter template. diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index 750c448..88bd6c8 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -178,7 +178,7 @@ GP_Context *GP_Filter{{ name }}(const GP_Context *src, GP_Context *dst{{ maybe_o "Destination is not big enough"); } - if (GP_Filter{{ name }}_Raw(src, dst{{ maybe_opts(params) }}, callback)) { + if (GP_Filter{{ name }}_Raw(src, res{{ maybe_opts(params) }}, callback)) { GP_DEBUG(1, "Operation aborted"); if (dst == NULL) ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 12 +- include/filters/GP_FilterParam.h | 25 +++++ include/text/GP_Font.h | 8 +- include/text/GP_Text.h | 56 +++++++--- include/text/GP_TextMetric.h | 29 +++--- include/text/GP_TextStyle.h | 6 +- libs/filters/GP_FilterParam.c | 32 ++++++ libs/text/GP_Text.c | 215 ++++++++++++++++++-------------------- pylib/templates/filter.point.c.t | 2 +- tests/SDL/blittest.c | 3 +- tests/SDL/fileview.c | 3 +- tests/SDL/fonttest.c | 13 ++- tests/SDL/input.c | 20 +++- tests/SDL/shapetest.c | 2 +- tests/SDL/showimage.c | 7 +- tests/SDL/subcontext.c | 2 +- tests/SDL/textaligntest.c | 12 +- tests/drivers/framebuffer_test.c | 4 +- 18 files changed, 270 insertions(+), 181 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 pywrap updated: 9fb8ec2881f24724d6fe71bbfecb7524e95053a7
by gavento 24 Nov '11

24 Nov '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, pywrap has been updated via 9fb8ec2881f24724d6fe71bbfecb7524e95053a7 (commit) via 22d47ec8e304affafa567d890965992088bd08a6 (commit) via 64ec17d6274119e321accf352b452b0a4d664097 (commit) via 040d6abf67aeacd29d59f99b9c991ae60e1f664c (commit) from 3cca227bd9d97802da766c2feca0bb537c038b16 (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/9fb8ec2881f24724d6fe71bbfecb7524e950… commit 9fb8ec2881f24724d6fe71bbfecb7524e95053a7 Merge: 22d47ec 3cca227 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 23:26:08 2011 +0100 Merge branch 'pywrap' of git://repo.or.cz/gfxprim into pywrap Conflicts: include/core/swigify.sh include/loaders/swigify.sh http://repo.or.cz/w/gfxprim.git/commit/22d47ec8e304affafa567d890965992088bd… commit 22d47ec8e304affafa567d890965992088bd08a6 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 23:20:32 2011 +0100 Minimalistic "pythonic" GP_Context wrapper Placement is temporary Loads gfxprim_core_c and gfxprim_loaders_c as core, loaders Naive (but correct) error handling Supports both owned and non-owned GP_Contexts (could be screen, etc.) Supports subcontexts (with keeping ref. to parent to prevent GC) diff --git a/pylib/context.py b/pylib/context.py new file mode 100644 index 0000000..1551c5c --- /dev/null +++ b/pylib/context.py @@ -0,0 +1,94 @@ +import gfxprim_core_c as core +import gfxprim_loaders_c as loaders + +class Context(object): + def __init__(self, context, owns_GP_Context, parent=None): + """Create new GP_Context wrapper. + + The wrapper is just a (read-only) proxy with + some conveniently mapped context methods. + Direct access is possible through self.context. + """ + # GP_Context struct (pre-wrapped by SWIG) + self.context = context + # call GP_ContextFree on del? + self.owns_GP_Context = owns_GP_Context + # Parent Context of a subcontext (if any) + # It is important to hold a ref to parent because of GC + self.parent = parent + + def __del__(self): + print "Deleting %s (owns_GP_Context: %s)" % (self, self.owns_GP_Context) + if self.owns_GP_Context: + core.GP_ContextFree(self.context) + + @property + def w(self): + "Context width (transformed)" + return core.GP_ContextW(self.context) + + @property + def h(self): + "Context height (transformed)" + return core.GP_ContextH(self.context) + + @property + def bpp(self): + "Context bpp" + return self.context.bpp + + def __str__(self): + return "<Context %dx%d, %dbpp, GP_Context %sowned, %s parent>" % ( + self.w, self.h, self.bpp, + "" if self.owns_GP_Context else "not ", + "with" if self.parent else "no") + __repr__ = __str__ + + def subcontext(self, x, y, w, h): + "Create a subcontext (rectangular view)." + c = core.GP_ContextSubContext(self.context, None, x, y, w, h) + if not c: + raise Exception("Error creating subcontext") + return type(self)(c, owns_GP_Context=True, parent=self) + + def save(self, filename, format=None): + """Save the image in given format (or guess by the extension) + + Currently, JPG, PNG and P[BGP]M are supported, but not for all + context pixel types. + """ + if not format: + format = filename.rsplit('.', 1)[-1] + format = format.lower() + if format == 'jpg': + res = loaders.GP_SaveJPG(filename, self.context, None) + elif format == 'png': + res = loaders.GP_SavePNG(filename, self.context, None) + elif format == 'pbm': + res = loaders.GP_SavePBM(filename, self.context, None) + elif format == 'pgm': + res = loaders.GP_SavePGM(filename, self.context, None) + elif format == 'ppm': + res = loaders.GP_SavePPM(filename, self.context, None) + else: + raise Exception("Format %r not supported.", format) + if res != 0: + raise Exception("Error saving %r (code %d)", filename, res) + + @classmethod + def create(cls, w, h, pixeltype): + "Allocate a new w*h bitmap of given type." + + pixeltype_no = pixeltype if isinstance(pixeltype, int) else 0 # !!! + # TODO: actually accept a PixelType + c = core.GP_ContextAlloc(w, h, pixeltype_no) + return cls(c, owns_GP_Context=True) + + @classmethod + def load(cls, filename): + "Load image from given file, guess type." + c = loaders.GP_LoadImage_SWIG(filename) + if not c: + raise Exception("Error loading %r", filename) + return cls(c, owns_GP_Context=True) + http://repo.or.cz/w/gfxprim.git/commit/64ec17d6274119e321accf352b452b0a4d66… commit 64ec17d6274119e321accf352b452b0a4d664097 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 23:20:06 2011 +0100 C wrapper for GP_LoadImage diff --git a/include/loaders/gfxprim_loaders.swig b/include/loaders/gfxprim_loaders.swig index 6ac382c..5eb10e1 100644 --- a/include/loaders/gfxprim_loaders.swig +++ b/include/loaders/gfxprim_loaders.swig @@ -14,6 +14,19 @@ %nodefaultctor; %include "GP_Loaders.h" + +%{ +GP_Context *GP_LoadImage_SWIG(const char *src_path) +{ + GP_Context *c = NULL; + if (GP_LoadImage(src_path, &c, NULL) != 0) + return NULL; + return c; +} +%} + +GP_Context *GP_LoadImage_SWIG(const char *src_path); + %include "GP_JPG.h" %include "GP_PBM.h" %include "GP_PGM.h" http://repo.or.cz/w/gfxprim.git/commit/040d6abf67aeacd29d59f99b9c991ae60e1f… commit 040d6abf67aeacd29d59f99b9c991ae60e1f664c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 23:19:37 2011 +0100 Renaming wrappers around diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index d09d94f..2a96a71 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -1,4 +1,4 @@ -%module gfxprim_core +%module gfxprim_core_c %{ #include "core/GP_Core.h" @@ -8,6 +8,8 @@ %include <stdint.i> +%nodefaultctor; + /* Basic types and common methods */ %include "GP_Common.h" diff --git a/include/core/swigify.sh b/include/core/swigify.sh index a82e16e..d275dc4 100755 --- a/include/core/swigify.sh +++ b/include/core/swigify.sh @@ -2,8 +2,8 @@ set -e swig -python -Wall -I/usr/include/ gfxprim_core.swig gcc -shared gfxprim_core_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core.so -mv gfxprim_core.py ../../build/ + -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core_c.so +mv gfxprim_core_c.py ../../pylib/ rm gfxprim_core_wrap.c echo Swigified! diff --git a/include/loaders/gfxprim_loaders.swig b/include/loaders/gfxprim_loaders.swig index 28e57b4..6ac382c 100644 --- a/include/loaders/gfxprim_loaders.swig +++ b/include/loaders/gfxprim_loaders.swig @@ -1,4 +1,4 @@ -%module gfxprim_loaders +%module gfxprim_loaders_c %{ #include "core/GP_Core.h" @@ -11,6 +11,8 @@ %include <stdint.i> +%nodefaultctor; + %include "GP_Loaders.h" %include "GP_JPG.h" %include "GP_PBM.h" diff --git a/include/loaders/swigify.sh b/include/loaders/swigify.sh index 3308274..e0514ec 100755 --- a/include/loaders/swigify.sh +++ b/include/loaders/swigify.sh @@ -2,8 +2,8 @@ set -e swig -python -Wall -I/usr/include/ gfxprim_loaders.swig gcc -shared gfxprim_loaders_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders.so -mv gfxprim_loaders.py ../../build/ + -fPIC -Wall -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders_c.so +mv gfxprim_loaders_c.py ../../pylib/ rm gfxprim_loaders_wrap.c echo Swigified! diff --git a/pylib/_gfxprim_core_c.so b/pylib/_gfxprim_core_c.so new file mode 120000 index 0000000..b0aff10 --- /dev/null +++ b/pylib/_gfxprim_core_c.so @@ -0,0 +1 @@ +../build/_gfxprim_core_c.so No newline at end of file diff --git a/pylib/_gfxprim_loaders_c.so b/pylib/_gfxprim_loaders_c.so new file mode 120000 index 0000000..41a41f9 --- /dev/null +++ b/pylib/_gfxprim_loaders_c.so @@ -0,0 +1 @@ +../build/_gfxprim_loaders_c.so No newline at end of file ----------------------------------------------------------------------- Summary of changes: include/core/gfxprim_core.swig | 4 +- include/core/swigify.sh | 4 +- include/loaders/gfxprim_loaders.swig | 17 ++++++- include/loaders/swigify.sh | 4 +- pylib/_gfxprim_core_c.so | 1 + pylib/_gfxprim_loaders_c.so | 1 + pylib/context.py | 94 ++++++++++++++++++++++++++++++++++ 7 files changed, 119 insertions(+), 6 deletions(-) create mode 120000 pylib/_gfxprim_core_c.so create mode 120000 pylib/_gfxprim_loaders_c.so create mode 100644 pylib/context.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 pywrap updated: 3cca227bd9d97802da766c2feca0bb537c038b16
by metan 24 Nov '11

24 Nov '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, pywrap has been updated via 3cca227bd9d97802da766c2feca0bb537c038b16 (commit) from 2a44791a84f6aa540897532ea8a0e0d2e4e5ae10 (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/3cca227bd9d97802da766c2feca0bb537c03… commit 3cca227bd9d97802da766c2feca0bb537c038b16 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Thu Nov 24 22:35:34 2011 +0100 Add -fPIC to fix the compilation on x86_64. diff --git a/include/core/swigify.sh b/include/core/swigify.sh index a82e16e..53a8ce4 100755 --- a/include/core/swigify.sh +++ b/include/core/swigify.sh @@ -2,7 +2,7 @@ set -e swig -python -Wall -I/usr/include/ gfxprim_core.swig gcc -shared gfxprim_core_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core.so + -fPIC -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core.so mv gfxprim_core.py ../../build/ rm gfxprim_core_wrap.c diff --git a/include/loaders/swigify.sh b/include/loaders/swigify.sh index 3308274..eb985f1 100755 --- a/include/loaders/swigify.sh +++ b/include/loaders/swigify.sh @@ -2,7 +2,7 @@ set -e swig -python -Wall -I/usr/include/ gfxprim_loaders.swig gcc -shared gfxprim_loaders_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. - -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders.so + -fPIC -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders.so mv gfxprim_loaders.py ../../build/ rm gfxprim_loaders_wrap.c ----------------------------------------------------------------------- Summary of changes: include/core/swigify.sh | 2 +- include/loaders/swigify.sh | 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 pywrap created: 2a44791a84f6aa540897532ea8a0e0d2e4e5ae10
by gavento 24 Nov '11

24 Nov '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, pywrap has been created at 2a44791a84f6aa540897532ea8a0e0d2e4e5ae10 (commit) - Log ----------------------------------------------------------------- http://repo.or.cz/w/gfxprim.git/commit/2a44791a84f6aa540897532ea8a0e0d2e4e5… commit 2a44791a84f6aa540897532ea8a0e0d2e4e5ae10 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 19:11:15 2011 +0100 Working Python wrappers (sketch versions) to build: build the lib and run both ./swigify.sh (in their dir) change swigify.sh for python other than 2.6 to use: go to build and run: LD_LIBRARY_PATH=. python then: import gfxprim_core import gfxprim_loaders c=gfxprim_core.GP_ContextAlloc(100,42,3) #RGB888 print "Image %dx%d" % (c.w, c.h) print gfxprim_loaders.GP_SavePNG("a.png", c, None) diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index 867c770..14eee71 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -78,6 +78,7 @@ * (for assert and check) * * SWIG_exception is a dummy no-op that is used to raise an exception when wrapped. + * NOTE: Currently totally useless. Hrmmppff. */ void SWIG_exception(const char *msg); diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig index e4b0341..d09d94f 100644 --- a/include/core/gfxprim_core.swig +++ b/include/core/gfxprim_core.swig @@ -1,7 +1,7 @@ %module gfxprim_core %{ -#include "GP_Core.h" +#include "core/GP_Core.h" %} #define __attribute__(X) @@ -19,6 +19,7 @@ %include "GP_GetSetBits.h" %include "GP_Transform.h" %include "GP_ProgressCallback.h" +%include "GP_RetCode.h" /* Color and pixel types */ diff --git a/include/core/swigify.sh b/include/core/swigify.sh new file mode 100755 index 0000000..a82e16e --- /dev/null +++ b/include/core/swigify.sh @@ -0,0 +1,9 @@ +set -e + +swig -python -Wall -I/usr/include/ gfxprim_core.swig +gcc -shared gfxprim_core_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. + -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_core.so +mv gfxprim_core.py ../../build/ +rm gfxprim_core_wrap.c + +echo Swigified! diff --git a/include/loaders/gfxprim_loaders.swig b/include/loaders/gfxprim_loaders.swig new file mode 100644 index 0000000..28e57b4 --- /dev/null +++ b/include/loaders/gfxprim_loaders.swig @@ -0,0 +1,20 @@ +%module gfxprim_loaders + +%{ +#include "core/GP_Core.h" +#include "loaders/GP_Loaders.h" +%} + +#define __attribute__(X) + +%import ../core/gfxprim_core.swig + +%include <stdint.i> + +%include "GP_Loaders.h" +%include "GP_JPG.h" +%include "GP_PBM.h" +%include "GP_PGM.h" +%include "GP_PPM.h" +%include "GP_PNG.h" + diff --git a/include/loaders/swigify.sh b/include/loaders/swigify.sh new file mode 100755 index 0000000..3308274 --- /dev/null +++ b/include/loaders/swigify.sh @@ -0,0 +1,9 @@ +set -e + +swig -python -Wall -I/usr/include/ gfxprim_loaders.swig +gcc -shared gfxprim_loaders_wrap.c -L ../../build/ -I /usr/include/python2.6/ -I.. + -lGP -lpng -ljpeg -lm -ldl -o ../../build/_gfxprim_loaders.so +mv gfxprim_loaders.py ../../build/ +rm gfxprim_loaders_wrap.c + +echo Swigified! http://repo.or.cz/w/gfxprim.git/commit/7d61d1587e55d2634695e2f3b87e8a278e73… commit 7d61d1587e55d2634695e2f3b87e8a278e730b0c Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 18:33:46 2011 +0100 Fix missing 'static' at inline func def. diff --git a/include/core/GP_Counter.h b/include/core/GP_Counter.h index f9e501e..e501309 100644 --- a/include/core/GP_Counter.h +++ b/include/core/GP_Counter.h @@ -55,7 +55,7 @@ typedef GP_Counter_t *GP_Counter; * Increase a counter by 1. */ -static inline void GP_IncCounter(GP_Counter counter) +static inline void GP_IncCounter(GP_Counter counter) { #ifdef GP_IMPLEMENT_COUNTERS if (!counter) return; @@ -68,7 +68,7 @@ static inline void GP_IncCounter(GP_Counter counter) * No checks for underflow. */ -static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) +static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) { #ifdef GP_IMPLEMENT_COUNTERS if (!counter) return; @@ -80,7 +80,7 @@ static inline void GP_AddCounter(GP_Counter counter, GP_Counter_t delta) * Set counter to given value. */ -static inline void GP_SetCounter(GP_Counter counter, GP_Counter_t value) +static inline void GP_SetCounter(GP_Counter counter, GP_Counter_t value) { #ifdef GP_IMPLEMENT_COUNTERS if (!counter) return; @@ -92,7 +92,7 @@ static inline void GP_SetCounter(GP_Counter counter, GP_Counter_t value) * Return counter value */ -inline GP_Counter_t GP_CounterVal(GP_Counter counter) +static inline GP_Counter_t GP_CounterVal(GP_Counter counter) { #ifdef GP_IMPLEMENT_COUNTERS if (!counter) return 0; http://repo.or.cz/w/gfxprim.git/commit/6f26bf8d5bdee13bca518a15e5c22f6604ad… commit 6f26bf8d5bdee13bca518a15e5c22f6604adae78 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 18:25:17 2011 +0100 Initial libs/core SWIG Python wrapper diff --git a/include/core/gfxprim_core.swig b/include/core/gfxprim_core.swig new file mode 100644 index 0000000..e4b0341 --- /dev/null +++ b/include/core/gfxprim_core.swig @@ -0,0 +1,42 @@ +%module gfxprim_core + +%{ +#include "GP_Core.h" +%} + +#define __attribute__(X) + +%include <stdint.i> + +/* Basic types and common methods */ + +%include "GP_Common.h" +%include "GP_Core.h" +%include "GP_Debug.h" +%include "GP_Types.h" +%include "GP_Transform.h" +%include "GP_Counter.h" +%include "GP_GetSetBits.h" +%include "GP_Transform.h" +%include "GP_ProgressCallback.h" + +/* Color and pixel types */ + +%include "GP_Color.h" +%include "GP_Context.h" +%include "GP_Pixel.h" +%include "GP_Pixel.gen.h" +%include "GP_Convert.h" +%include "GP_Convert.gen.h" +%include "GP_Convert_Scale.gen.h" +%include "GP_Blit.gen.h" + +/* Context manipulation */ + +%include "GP_Context.h" +%include "GP_Blit.h" +%include "GP_Blit.gen.h" +%include "GP_FnPerBpp.h" +%include "GP_GetPutPixel.h" +%include "GP_WritePixel.h" + http://repo.or.cz/w/gfxprim.git/commit/1f50377122afb02f1e82197f29a309342856… commit 1f50377122afb02f1e82197f29a309342856e77b Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 18:24:48 2011 +0100 Add headers to GP_Core.h diff --git a/include/core/GP_Core.h b/include/core/GP_Core.h index 9bd927f..70c2c3f 100644 --- a/include/core/GP_Core.h +++ b/include/core/GP_Core.h @@ -59,4 +59,10 @@ /* Color */ #include "core/GP_Color.h" +/* Progress callback */ +#include "core/GP_ProgressCallback.h" + +/* Debug counters */ +#include "core/GP_Counter.h" + #endif /* GP_CORE_H */ http://repo.or.cz/w/gfxprim.git/commit/2393f81c77be4ef152fb92bdbb3c0afab32b… commit 2393f81c77be4ef152fb92bdbb3c0afab32b460f Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Thu Nov 24 18:23:02 2011 +0100 Prepare GP_INTERNAL_ABORT for exception throwing. Accumulate an error string instead of direct fprintf. diff --git a/include/core/GP_Common.h b/include/core/GP_Common.h index cae989e..867c770 100644 --- a/include/core/GP_Common.h +++ b/include/core/GP_Common.h @@ -76,16 +76,25 @@ * and prints message and calls abort(). * GP_GENERAL_CHECK is a check with specified message prefix * (for assert and check) + * + * SWIG_exception is a dummy no-op that is used to raise an exception when wrapped. */ +void SWIG_exception(const char *msg); + +#define GP_INTERNAL_ABORT_BUFSIZE 24 #define GP_INTERNAL_ABORT(str_abort_msg_, ...) do { - fprintf(stderr, "*** gfxprim: %s:%d: in %s: %s", + char bufstart[GP_INTERNAL_ABORT_BUFSIZE], *buf = bufstart; + char *bufend = buf + GP_INTERNAL_ABORT_BUFSIZE; + buf += snprintf(buf, bufend - buf, "*** gfxprim: %s:%d: in %s: %s", __FILE__, __LINE__, __FUNCTION__, str_abort_msg_); + if (buf > bufend) buf = bufend; if (! (#__VA_ARGS__ [0])) - fprintf(stderr, "abort()"); + buf += snprintf(buf, bufend - buf, "abort()"); else - fprintf(stderr, " " __VA_ARGS__); - fprintf(stderr, "n"); + buf += snprintf(buf, bufend - buf, " " __VA_ARGS__); + SWIG_exception(bufstart); + fprintf(stderr, "%sn", bufstart); abort(); } while (0) diff --git a/libs/core/GP_Common.c b/libs/core/GP_Common.c new file mode 100644 index 0000000..92ec868 --- /dev/null +++ b/libs/core/GP_Common.c @@ -0,0 +1,27 @@ +/***************************************************************************** + * 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) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "core/GP_Common.h" + +void SWIG_exception(const char *msg) +{ +} ----------------------------------------------------------------------- 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: 31c18f79b0e5a2b49f3ad6315ab7605935b2fc56
by gavento 22 Nov '11

22 Nov '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, master has been updated via 31c18f79b0e5a2b49f3ad6315ab7605935b2fc56 (commit) via 60a70cbf7bc06c6485f71f726ef1a5bb76469c05 (commit) from 8b760eccced962d0cb0549dee86778454483671a (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/31c18f79b0e5a2b49f3ad6315ab7605935b2… commit 31c18f79b0e5a2b49f3ad6315ab7605935b2fc56 Merge: 60a70cb 8b760ec Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 23:02:10 2011 +0100 Merge branch 'master' of git://repo.or.cz/gfxprim http://repo.or.cz/w/gfxprim.git/commit/60a70cbf7bc06c6485f71f726ef1a5bb7646… commit 60a70cbf7bc06c6485f71f726ef1a5bb76469c05 Author: Tomas Gavenciak <gavento(a)ucw.cz> Date: Tue Nov 22 23:01:41 2011 +0100 Add building core tests as a default dependency diff --git a/tests/core/Makefile b/tests/core/Makefile index 7199ad2..1ee793a 100644 --- a/tests/core/Makefile +++ b/tests/core/Makefile @@ -5,6 +5,8 @@ TESTSUITE=core_suite LDLIBS+=-lGP -L$(TOPDIR)/build/ -lcheck -lpng -ljpeg -lm -ldl GENSOURCES+=GP_Convert.test.gen.c GP_WritePixel.test.gen.c +all: $(TESTSUITE) + include $(TOPDIR)/tests.mk include $(TOPDIR)/include.mk ----------------------------------------------------------------------- Summary of changes: tests/core/Makefile | 2 ++ 1 files changed, 2 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: 8b760eccced962d0cb0549dee86778454483671a
by metan 22 Nov '11

22 Nov '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, master has been updated via 8b760eccced962d0cb0549dee86778454483671a (commit) via 4886a093e1a9d194c8f92da783afd21ec58c5940 (commit) via 8815a10ac7ad2cc177dfc732620c8b9dad31c559 (commit) via 80c1b9e8fa6cd34760429146757061a0b1884025 (commit) via 97642c5d7b2f345498d28ea7ce843bb7a3b9e838 (commit) from 2dd37fda71656537c85e16407173aec2ab2db70a (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/8b760eccced962d0cb0549dee86778454483… commit 8b760eccced962d0cb0549dee86778454483671a Merge: 4886a09 2dd37fd Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Nov 22 22:59:33 2011 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/4886a093e1a9d194c8f92da783afd21ec58c… commit 4886a093e1a9d194c8f92da783afd21ec58c5940 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Nov 22 22:55:59 2011 +0100 filters: Add general point (but slow) filter + fixes. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index e6ca749..2a9ec43 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -266,7 +266,7 @@ static GP_RetCode mirror(GP_Context **c, const char *params) static struct param bright_params[] = { {"inc", PARAM_INT, "brightness increment", NULL, NULL}, - {"chann", PARAM_STR, "channel name {R, G, B, A, V, ...}", NULL, NULL}, + {"chann", PARAM_STR, "Channel name {R, G, B, A, V, ...}", NULL, NULL}, {NULL, 0, NULL, NULL, NULL} }; @@ -291,7 +291,7 @@ static GP_RetCode bright(GP_Context **c, const char *params) GP_FilterParam *param = GP_FilterParamChannel(filter_params, chann); if (param == NULL) { - print_error("bright: invalid channel name"); + print_error("bright: Invalid channel name"); return GP_EINVAL; } @@ -308,7 +308,7 @@ static GP_RetCode bright(GP_Context **c, const char *params) static struct param contrast_params[] = { {"mul", PARAM_FLOAT, "contrast (1.5 = +50%, 0.5 = -50%)", NULL, NULL}, - {"chann", PARAM_STR, "channel name {R, G, B, A, V, ...}", NULL, NULL}, + {"chann", PARAM_STR, "Channel name {R, G, B, A, V, ...}", NULL, NULL}, {NULL, 0, NULL, NULL, NULL} }; @@ -333,7 +333,7 @@ static GP_RetCode contrast(GP_Context **c, const char *params) GP_FilterParam *param = GP_FilterParamChannel(filter_params, chann); if (param == NULL) { - print_error("contrast: invalid channel name"); + print_error("contrast: Invalid channel name"); return GP_EINVAL; } @@ -498,6 +498,68 @@ static GP_RetCode save_png(GP_Context **c, const char *params) return GP_ESUCCESS; } +static struct param add_noise_params[] = { + {"percents", PARAM_FLOAT, "Percents of noise to add", NULL, NULL}, + {"chann", PARAM_STR, "Channel name {R, G, B, A, V, ...}", NULL, NULL}, + {NULL, 0, NULL, NULL, NULL} +}; + +static uint32_t add_noise_op(uint32_t val, uint8_t bits, GP_FilterParam *param) +{ + float perc; + int max = (1<<bits) - 1; + int ret; + + perc = param->val.f; + + ret = val * (1 - perc) + (random() % max) * perc; + + if (ret < 0) + ret = 0; + + if (ret > max) + ret = max; + + return ret; +} + +static uint32_t no_op(uint32_t val) +{ + return val; +} + +static GP_RetCode add_noise(GP_Context **c, const char *params) +{ + float percents = 0; + char *chann = NULL; + + if (param_parse(params, add_noise_params, "add_noise", param_err, &percents, &chann)) + return GP_EINVAL; + + GP_FILTER_PARAMS((*c)->pixel_type, priv); + GP_FilterParamSetFloatAll(priv, percents/100); + GP_FILTER_PARAMS((*c)->pixel_type, op_callbacks); + + if (chann == NULL) { + GP_FilterParamSetPtrAll(op_callbacks, add_noise_op); + } else { + GP_FilterParam *param = GP_FilterParamChannel(op_callbacks, chann); + + if (param == NULL) { + print_error("add_noise: Invalid channel name"); + return GP_EINVAL; + } + + + GP_FilterParamSetPtrAll(op_callbacks, no_op); + param->val.ptr = add_noise_op; + } + + GP_FilterPoint(*c, *c, op_callbacks, priv, progress_callback); + + return GP_ESUCCESS; +} + /* filters */ struct filter { @@ -508,18 +570,19 @@ struct filter { }; static struct filter filter_table[] = { - {"rotate", "rotate image", rotate_params, rotate}, - {"mirror", "mirror vertically/horizontally", mirror_params, mirror}, - {"scale", "scale image to given width and height", scale_params, scale}, - {"resize", "resize image by given ratio", resize_params, resize}, - {"bright", "alter image brightness", bright_params, bright}, - {"contrast", "alter image contrast", contrast_params, contrast}, - {"invert", "inverts image", invert_params, invert}, - {"blur", "gaussian blur", blur_params, blur}, - {"dither", "dithers bitmap", dither_params, dither}, - {"jpg", "save jpg image", save_jpg_params, save_jpg}, - {"png", "save png image", save_png_params, save_png}, - {NULL, NULL, NULL, NULL} + {"rotate", "rotate image", rotate_params, rotate}, + {"mirror", "mirror vertically/horizontally", mirror_params, mirror}, + {"scale", "scale image to given width and height", scale_params, scale}, + {"resize", "resize image by given ratio", resize_params, resize}, + {"bright", "alter image brightness", bright_params, bright}, + {"contrast", "alter image contrast", contrast_params, contrast}, + {"invert", "inverts image", invert_params, invert}, + {"add_noise", "adds noise", add_noise_params, add_noise}, + {"blur", "gaussian blur", blur_params, blur}, + {"dither", "dithers bitmap", dither_params, dither}, + {"jpg", "save jpg image", save_jpg_params, save_jpg}, + {"png", "save png image", save_png_params, save_png}, + {NULL, NULL, NULL, NULL} }; static struct filter *get_filter(const char *name) diff --git a/include/filters/GP_FilterParam.h b/include/filters/GP_FilterParam.h index dbf9749..d073305 100644 --- a/include/filters/GP_FilterParam.h +++ b/include/filters/GP_FilterParam.h @@ -104,4 +104,16 @@ void GP_FilterParamSetIntAll(GP_FilterParam params[], void GP_FilterParamSetFloatAll(GP_FilterParam params[], float val); +/* + * Sets all values to unsigned integer value. + */ +void GP_FilterParamSetUIntAll(GP_FilterParam params[], + uint32_t val); + +/* + * Sets all values to pointer value. + */ +void GP_FilterParamSetPtrAll(GP_FilterParam params[], + void *ptr); + #endif /* FILTERS_GP_FILTER_PARAM_H */ diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index e6aaeda..1ab3756 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -71,4 +71,17 @@ int GP_FilterInvert_Raw(const GP_Context *src, GP_Context *dst, GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); +/* + * Generic slow point filter. + * + * The filter_callback[] is expected to be filled with pointers + * to functions of type uint32_t (*func)(uint32_t chan_val, uint8_t chan_size, GP_FilterParam *priv) + * + * The priv[] is free for your use and corresponding + */ +GP_Context *GP_FilterPoint(const GP_Context *src, GP_Context *dst, + GP_FilterParam filter_callback[], + GP_FilterParam priv[], + GP_ProgressCallback *callback); + #endif /* FILTERS_GP_POINT_H */ diff --git a/libs/filters/GP_Brightness.gen.c.t b/libs/filters/GP_Brightness.gen.c.t index adf0642..b0fa776 100644 --- a/libs/filters/GP_Brightness.gen.c.t +++ b/libs/filters/GP_Brightness.gen.c.t @@ -9,24 +9,24 @@ Brightness filters -- Increments color channel(s) by a fixed value. {{ filter_include() }} %% macro filter_op(chann_name, chann_size) -{{ chann_name }} = {{ chann_name }} + {{ chann_name }}_i; +{{ chann_name }} = {{ chann_name }} + {{ chann_name }}_inc; {{ filter_clamp_val(chann_name, chann_size) }} %% endmacro /* * Generated brightness filters. */ -%% call(pt) filter_point_per_channel('Brightness', 'GP_FilterParam params[]', filter_op) -{{ filter_params(pt, 'params', 'int32_t', 'i') }} +%% call(pt) filter_point_per_channel('Brightness', 'GP_FilterParam incs[]', filter_op) +{{ filter_params(pt, 'incs', 'int32_t ', '_inc', 'i') }} %% endcall /* * Generated constrast filters for pixels with one channel. */ -%% call(ps) filter_point_per_bpp('Brightness', 'GP_FilterParam params[]', filter_op) -{{ filter_param(ps, 'params', 'int32_t', 'i') }} +%% call(ps) filter_point_per_bpp('Brightness', 'GP_FilterParam incs[]', filter_op) +{{ filter_param(ps, 'incs', 'int32_t ', '_inc', 'i') }} %% endcall -{{ filter_functions('Brightness', 'GP_FilterParam params[]', 'params') }} +{{ filter_functions('Brightness', 'GP_FilterParam incs[]', 'incs') }} %% endblock body diff --git a/libs/filters/GP_Contrast.gen.c.t b/libs/filters/GP_Contrast.gen.c.t index abbb0c3..3153db2 100644 --- a/libs/filters/GP_Contrast.gen.c.t +++ b/libs/filters/GP_Contrast.gen.c.t @@ -9,24 +9,24 @@ Contrast filters -- Multiply color channel(s) by a fixed float value. {{ filter_include() }} %% macro filter_op(chan_name, chan_size) -{{ chan_name }} = {{ chan_name }} * {{ chan_name }}_f + 0.5; +{{ chan_name }} = {{ chan_name }} * {{ chan_name }}_mul + 0.5; {{ filter_clamp_val(chan_name, chan_size) }} %% endmacro /* * Generated contrast filters for pixels with several channels. */ -%% call(pt) filter_point_per_channel('Contrast', 'GP_FilterParam params[]', filter_op) -{{ filter_params(pt, 'params', 'float', 'f') }} +%% call(pt) filter_point_per_channel('Contrast', 'GP_FilterParam muls[]', filter_op) +{{ filter_params(pt, 'muls', 'float ', '_mul', 'f') }} %% endcall /* * Generated constrast filters for pixels with one channel. */ -%% call(ps) filter_point_per_bpp('Contrast', 'GP_FilterParam params[]', filter_op) -{{ filter_param(ps, 'params', 'float', 'f') }} +%% call(ps) filter_point_per_bpp('Contrast', 'GP_FilterParam muls[]', filter_op) +{{ filter_param(ps, 'muls', 'float ', '_mul', 'f') }} %% endcall -{{ filter_functions('Contrast', 'GP_FilterParam params[]', 'params') }} +{{ filter_functions('Contrast', 'GP_FilterParam muls[]', 'muls') }} %% endblock body diff --git a/libs/filters/GP_FilterParam.c b/libs/filters/GP_FilterParam.c index 4277df7..c5ef345 100644 --- a/libs/filters/GP_FilterParam.c +++ b/libs/filters/GP_FilterParam.c @@ -123,3 +123,21 @@ void GP_FilterParamSetFloatAll(GP_FilterParam params[], for (i = 0; params[i].channel_name[0] != '0'; i++) params[i].val.f = val; } + +void GP_FilterParamSetUIntAll(GP_FilterParam params[], + uint32_t val) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + params[i].val.ui = val; +} + +void GP_FilterParamSetPtrAll(GP_FilterParam params[], + void *ptr) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + params[i].val.ptr = ptr; +} diff --git a/libs/filters/GP_Point.gen.c.t b/libs/filters/GP_Point.gen.c.t new file mode 100644 index 0000000..bd41579 --- /dev/null +++ b/libs/filters/GP_Point.gen.c.t @@ -0,0 +1,35 @@ +%% extends "filter.point.c.t" + +%% block descr +Point filters -- General point filter. +%% endblock + +%% block body + +{{ filter_include() }} + +typedef uint32_t (*func)(uint32_t, uint8_t, GP_FilterParam *priv); + +%% macro filter_op(chan_name, chan_size) +{{ chan_name }} = {{ chan_name }}_func({{ chan_name }}, {{ chan_size }}, {{ chan_name }}_priv); +%% endmacro + +/* + * Generated point filters for pixels with several channels. + */ +%% call(pt) filter_point_per_channel('Point', 'GP_FilterParam filter_callbacks[], GP_FilterParam priv[]', filter_op) +{{ filter_params(pt, 'filter_callbacks', 'func ', '_func', 'ptr') }} +{{ filter_params_raw(pt, 'priv', '_priv') }} +%% endcall + +/* + * Generated point filters for pixels with one channel. + */ +%% call(ps) filter_point_per_bpp('Point', 'GP_FilterParam filter_callbacks[], GP_FilterParam priv[]', filter_op) +{{ filter_param(ps, 'filter_callbacks', 'func ', '_func', 'ptr') }} +{{ filter_param_raw(ps, 'priv', '_priv') }} +%% endcall + +{{ filter_functions('Point', 'GP_FilterParam filter_callbacks[], GP_FilterParam priv[]', 'filter_callbacks, priv') }} + +%% endblock body diff --git a/libs/filters/Makefile b/libs/filters/Makefile index 2b4cdb6..3188e17 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -1,5 +1,5 @@ TOPDIR=../.. -GENSOURCES=GP_Contrast.gen.c GP_Brightness.gen.c GP_Invert.gen.c +GENSOURCES=GP_Contrast.gen.c GP_Brightness.gen.c GP_Invert.gen.c GP_Point.gen.c GP_MirrorV.gen.c GP_Rotate.gen.c GP_Dither.gen.c GENHEADERS= CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index 02240ee..750c448 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -27,12 +27,21 @@ /* * Load parameters from params structure into variables */ -%% macro filter_params(pt, params, c_type, id) +%% macro filter_params(pt, params, c_type, suffix, id) GP_ASSERT(GP_FilterParamCheckPixelType({{ params }}, GP_PIXEL_{{ pt.name }}) == 0, "Invalid params channels for context pixel type"); %% for chann in pt.chanslist - {{ c_type }} {{ chann[0] }}_{{ id }} = (GP_FilterParamChannel({{ params }}, "{{ chann[0] }}"))->val.{{ id }}; + {{ c_type }}{{ chann[0] }}{{ suffix }} = (GP_FilterParamChannel({{ params }}, "{{ chann[0] }}"))->val.{{ id }}; + %% endfor +%% endmacro + +%% macro filter_params_raw(pt, params, suffix) + GP_ASSERT(GP_FilterParamCheckPixelType({{ params }}, GP_PIXEL_{{ pt.name }}) == 0, + "Invalid params channels for context pixel type"); + + %% for chann in pt.chanslist + GP_FilterParam *{{ chann[0] }}{{ suffix }} = GP_FilterParamChannel({{ params }}, "{{ chann[0] }}"); %% endfor %% endmacro @@ -42,7 +51,7 @@ %% macro filter_point_per_channel(name, opts="", filter_op) %% for pt in pixeltypes %% if not pt.is_unknown() and len(pt.chanslist) > 1 -int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst, +static int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst, {{ maybe_opts2(opts) }}GP_ProgressCallback *callback) { {{ caller(pt) }} @@ -79,11 +88,18 @@ int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst, /* * Load parameters from params structure into variable */ -%% macro filter_param(ps, params, c_type, val) +%% macro filter_param(ps, params, c_type, suffix, id) + GP_ASSERT(GP_FilterParamChannels({{ params }}) != 1, + "Expected only one channel"); + + {{ c_type }}pix{{ suffix }} = {{ params }}[0].val.{{ id }}; +%% endmacro + +%% macro filter_param_raw(ps, params, suffix) GP_ASSERT(GP_FilterParamChannels({{ params }}) != 1, "Expected only one channel"); - {{ c_type }} pix_{{ val }} = params[0].val.{{ val }}; + GP_FilterParam *pix{{ suffix }} = &{{ params }}[0]; %% endmacro /* @@ -92,7 +108,7 @@ int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst, %% macro filter_point_per_bpp(name, opts="", filter_op) %% for ps in pixelsizes %% if ps.size <= 8 and ps.size > 1 -int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, +static int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, {{ maybe_opts2(opts) }}GP_ProgressCallback *callback) { {{ caller(ps) }} @@ -132,6 +148,7 @@ int GP_Filter{{ name }}_Raw(const GP_Context *src, GP_Context *dst{{ maybe_opts( %% if pt.is_unknown() or pt.pixelsize.size < 2 return 1; %% elif len(pt.chanslist) == 1: + //TODO: BITENDIAN return GP_Filter{{ name }}_{{ pt.pixelsize.suffix }}(src, dst{{ maybe_opts(params) }}, callback); %% else return GP_Filter{{ name }}_{{ pt.name }}(src, dst{{ maybe_opts(params) }}, callback); http://repo.or.cz/w/gfxprim.git/commit/8815a10ac7ad2cc177dfc732620c8b9dad31… commit 8815a10ac7ad2cc177dfc732620c8b9dad31c559 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Nov 22 20:07:52 2011 +0100 grinder: Basic filter per channel support. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 97f8cd8..e6ca749 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -265,15 +265,17 @@ static GP_RetCode mirror(GP_Context **c, const char *params) /* brightness filter */ static struct param bright_params[] = { - {"inc", PARAM_INT, "brightness increment", NULL, NULL}, - {NULL, 0, NULL, NULL, NULL} + {"inc", PARAM_INT, "brightness increment", NULL, NULL}, + {"chann", PARAM_STR, "channel name {R, G, B, A, V, ...}", NULL, NULL}, + {NULL, 0, NULL, NULL, NULL} }; static GP_RetCode bright(GP_Context **c, const char *params) { int bright = 0; + char *chann = NULL; - if (param_parse(params, bright_params, "bright", param_err, &bright)) + if (param_parse(params, bright_params, "bright", param_err, &bright, &chann)) return GP_EINVAL; if (bright == 0) { @@ -282,7 +284,20 @@ static GP_RetCode bright(GP_Context **c, const char *params) } GP_FILTER_PARAMS((*c)->pixel_type, filter_params); - GP_FilterParamSetIntAll(filter_params, bright); + + if (chann == NULL) { + GP_FilterParamSetIntAll(filter_params, bright); + } else { + GP_FilterParam *param = GP_FilterParamChannel(filter_params, chann); + + if (param == NULL) { + print_error("bright: invalid channel name"); + return GP_EINVAL; + } + + GP_FilterParamSetIntAll(filter_params, 0); + param->val.i = bright; + } GP_FilterBrightness(*c, *c, filter_params, progress_callback); @@ -293,14 +308,16 @@ static GP_RetCode bright(GP_Context **c, const char *params) static struct param contrast_params[] = { {"mul", PARAM_FLOAT, "contrast (1.5 = +50%, 0.5 = -50%)", NULL, NULL}, + {"chann", PARAM_STR, "channel name {R, G, B, A, V, ...}", NULL, NULL}, {NULL, 0, NULL, NULL, NULL} }; static GP_RetCode contrast(GP_Context **c, const char *params) { float mul = 0; + char *chann = NULL; - if (param_parse(params, contrast_params, "contrast", param_err, &mul)) + if (param_parse(params, contrast_params, "contrast", param_err, &mul, &chann)) return GP_EINVAL; if (mul <= 0) { @@ -309,7 +326,20 @@ static GP_RetCode contrast(GP_Context **c, const char *params) } GP_FILTER_PARAMS((*c)->pixel_type, filter_params); - GP_FilterParamSetFloatAll(filter_params, mul); + + if (chann == NULL) { + GP_FilterParamSetFloatAll(filter_params, mul); + } else { + GP_FilterParam *param = GP_FilterParamChannel(filter_params, chann); + + if (param == NULL) { + print_error("contrast: invalid channel name"); + return GP_EINVAL; + } + + GP_FilterParamSetFloatAll(filter_params, 1); + param->val.f = mul; + } GP_FilterContrast(*c, *c, filter_params, progress_callback); http://repo.or.cz/w/gfxprim.git/commit/80c1b9e8fa6cd34760429146757061a0b188… commit 80c1b9e8fa6cd34760429146757061a0b1884025 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Nov 22 19:57:55 2011 +0100 build: Add more generated files into .gitignore diff --git a/.gitignore b/.gitignore index 1d500c6..52f0d89 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ *.swp libGP.so* libGP.a - +config.h +config.gen.mk http://repo.or.cz/w/gfxprim.git/commit/97642c5d7b2f345498d28ea7ce843bb7a3b9… commit 97642c5d7b2f345498d28ea7ce843bb7a3b9e838 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Tue Nov 22 19:56:56 2011 +0100 filters: Add per channel parameter passing support. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 6f86e69..97f8cd8 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -281,7 +281,10 @@ static GP_RetCode bright(GP_Context **c, const char *params) return GP_EINVAL; } - GP_FilterBrightness(*c, *c, bright, progress_callback); + GP_FILTER_PARAMS((*c)->pixel_type, filter_params); + GP_FilterParamSetIntAll(filter_params, bright); + + GP_FilterBrightness(*c, *c, filter_params, progress_callback); return GP_ESUCCESS; } @@ -304,8 +307,11 @@ static GP_RetCode contrast(GP_Context **c, const char *params) print_error("contrast: mul parameter must be >= 0"); return GP_EINVAL; } + + GP_FILTER_PARAMS((*c)->pixel_type, filter_params); + GP_FilterParamSetFloatAll(filter_params, mul); - GP_FilterContrast(*c, *c, mul, progress_callback); + GP_FilterContrast(*c, *c, filter_params, progress_callback); return GP_ESUCCESS; } diff --git a/include/filters/GP_Filter.h b/include/filters/GP_Filter.h index e986ae6..af02bd0 100644 --- a/include/filters/GP_Filter.h +++ b/include/filters/GP_Filter.h @@ -32,4 +32,6 @@ #include "core/GP_Context.h" #include "core/GP_ProgressCallback.h" +#include "GP_FilterParam.h" + #endif /* FILTERS_GP_FILTER_H */ diff --git a/include/filters/GP_FilterParam.h b/include/filters/GP_FilterParam.h new file mode 100644 index 0000000..dbf9749 --- /dev/null +++ b/include/filters/GP_FilterParam.h @@ -0,0 +1,107 @@ +/***************************************************************************** + * 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 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +/* + + Filter per channel parameter passing code. + + */ + +#ifndef FILTERS_GP_FILTER_PARAM_H +#define FILTERS_GP_FILTER_PARAM_H + +#include "core/GP_Pixel.h" + +#include <stdint.h> + +typedef union GP_FilterParamVal { + float f; + uint32_t ui; + int32_t i; + void *ptr; +} GP_FilterParamVal; + +/* + * Filter parameter structure for one channel. + * + * Filter takes, empty channel name terminated, arrray of these as parameter. + */ +typedef struct GP_FilterParam { + //TODO: this must be >= for maximal channel name (now it's 2) + char channel_name[2]; + union GP_FilterParamVal val; +} GP_FilterParam; + +/* + * Takes array of filter parameters and returns channel. + * + * Returns NULL if channel wasn't found. + */ +GP_FilterParam *GP_FilterParamChannel(GP_FilterParam params[], + const char *channel_name); + +/* + * Returns number of filter channels. + */ +uint32_t GP_FilterParamChannels(GP_FilterParam params[]); + +/* + * Compares param channels and pixel type channels. Returns zero if channels + * match. + */ +int GP_FilterParamCheckPixelType(GP_FilterParam params[], + GP_PixelType type); + +/* + * Returns zero only if params have exactly same channels as array of + * channel_names. + */ +int GP_FilterParamCheckChannels(GP_FilterParam params[], + const char *channel_names[]); + +/* + * Create and initalize the structure on the stack + */ +#define GP_FILTER_PARAMS(pixel_type, name) + GP_FilterParam name[GP_PixelTypes[pixel_type].numchannels + 1]; + GP_FilterParamInitChannels(name, pixel_type); +/* + * Initalize param names and terminator. + * + * Sets all values to 0. + */ +void GP_FilterParamInitChannels(GP_FilterParam params[], + GP_PixelType type); + +/* + * Sets all values to integer value. + */ +void GP_FilterParamSetIntAll(GP_FilterParam params[], + int32_t val); + +/* + * Sets all values to float value. + */ +void GP_FilterParamSetFloatAll(GP_FilterParam params[], + float val); + +#endif /* FILTERS_GP_FILTER_PARAM_H */ diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index 4a38cb6..f5cb848 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -32,6 +32,9 @@ #ifndef GP_FILTERS_H #define GP_FILTERS_H +/* Filter per channel parameter passing interface */ +#include "filters/GP_FilterParam.h" + /* Image rotations (90 180 270 grads) and mirroring */ #include "filters/GP_Rotate.h" diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index c5b53a8..e6aaeda 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -36,30 +36,37 @@ * * Increments each pixel channel by a given value. */ -void GP_FilterBrightness_Raw(const GP_Context *src, GP_Context *dst, - int32_t inc, GP_ProgressCallback *callback); +int GP_FilterBrightness_Raw(const GP_Context *src, GP_Context *dst, + GP_FilterParam params[], + GP_ProgressCallback *callback); GP_Context *GP_FilterBrightness(const GP_Context *src, GP_Context *dst, - int32_t inc, GP_ProgressCallback *callback); + GP_FilterParam params[], + GP_ProgressCallback *callback); /* * Contrast filter. * - * Multiplies each pixel channel by a given value. + * Multiplies each pixel channel by a given float value. + * + * The parameters should have the same pixel channels as + * source pixel type and are expected to be float numbers. */ -GP_Context *GP_FilterContrast_Raw(const GP_Context *src, GP_Context *dst, - float mul, GP_ProgressCallback *callback); +int GP_FilterContrast_Raw(const GP_Context *src, GP_Context *dst, + GP_FilterParam params[], + GP_ProgressCallback *callback); GP_Context *GP_FilterContrast(const GP_Context *src, GP_Context *dst, - float mul, GP_ProgressCallback *callback); + GP_FilterParam params[], + GP_ProgressCallback *callback); /* * Invert filter. * * Inverts each pixel channel (eg. val = max - val) */ -GP_Context *GP_FilterInvert_Raw(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback); +int GP_FilterInvert_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); diff --git a/libs/filters/GP_Brightness.gen.c.t b/libs/filters/GP_Brightness.gen.c.t index 1ba6fb9..adf0642 100644 --- a/libs/filters/GP_Brightness.gen.c.t +++ b/libs/filters/GP_Brightness.gen.c.t @@ -1,23 +1,32 @@ %% extends "filter.point.c.t" %% block descr -Brightness filters -- Increments all color channels by a fixed value. +Brightness filters -- Increments color channel(s) by a fixed value. %% endblock %% block body {{ filter_include() }} -%% call(ps) filter_per_pixel_size('Brightness', 'int32_t inc') -pix = pix + inc; -{{ filter_clamp_val('pix', ps.size) }} +%% macro filter_op(chann_name, chann_size) +{{ chann_name }} = {{ chann_name }} + {{ chann_name }}_i; +{{ filter_clamp_val(chann_name, chann_size) }} +%% endmacro + +/* + * Generated brightness filters. + */ +%% call(pt) filter_point_per_channel('Brightness', 'GP_FilterParam params[]', filter_op) +{{ filter_params(pt, 'params', 'int32_t', 'i') }} %% endcall -%% call(chan) filter_per_pixel_type('Brightness', 'int32_t inc') -{{ chan[0] }} = {{ chan[0] }} + inc; -{{ filter_clamp_val(chan[0], chan[2]) }} +/* + * Generated constrast filters for pixels with one channel. + */ +%% call(ps) filter_point_per_bpp('Brightness', 'GP_FilterParam params[]', filter_op) +{{ filter_param(ps, 'params', 'int32_t', 'i') }} %% endcall -{{ filter_functions('Brightness', 'int32_t inc', 'inc', "inc=%i") }} +{{ filter_functions('Brightness', 'GP_FilterParam params[]', 'params') }} %% endblock body diff --git a/libs/filters/GP_Contrast.gen.c.t b/libs/filters/GP_Contrast.gen.c.t index 3398d1a..abbb0c3 100644 --- a/libs/filters/GP_Contrast.gen.c.t +++ b/libs/filters/GP_Contrast.gen.c.t @@ -1,23 +1,32 @@ %% extends "filter.point.c.t" %% block descr -Contrast filters -- Multiply all color channels by a fixed value. +Contrast filters -- Multiply color channel(s) by a fixed float value. %% endblock %% block body {{ filter_include() }} -%% call(ps) filter_per_pixel_size('Contrast', 'float mul') -pix = 1.00 * pix * mul; -{{ filter_clamp_val('pix', ps.size) }} +%% macro filter_op(chan_name, chan_size) +{{ chan_name }} = {{ chan_name }} * {{ chan_name }}_f + 0.5; +{{ filter_clamp_val(chan_name, chan_size) }} +%% endmacro + +/* + * Generated contrast filters for pixels with several channels. + */ +%% call(pt) filter_point_per_channel('Contrast', 'GP_FilterParam params[]', filter_op) +{{ filter_params(pt, 'params', 'float', 'f') }} %% endcall -%% call(chan) filter_per_pixel_type('Contrast', 'float mul') -{{ chan[0] }} = mul * {{ chan[0] }} + 0.5; -{{ filter_clamp_val(chan[0], chan[2]) }} +/* + * Generated constrast filters for pixels with one channel. + */ +%% call(ps) filter_point_per_bpp('Contrast', 'GP_FilterParam params[]', filter_op) +{{ filter_param(ps, 'params', 'float', 'f') }} %% endcall -{{ filter_functions('Contrast', 'float mul', 'mul', "mul=%2.3f") }} +{{ filter_functions('Contrast', 'GP_FilterParam params[]', 'params') }} %% endblock body diff --git a/libs/filters/GP_FilterParam.c b/libs/filters/GP_FilterParam.c new file mode 100644 index 0000000..4277df7 --- /dev/null +++ b/libs/filters/GP_FilterParam.c @@ -0,0 +1,125 @@ +/***************************************************************************** + * 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 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include <string.h> + +#include <GP_Debug.h> + +#include "GP_FilterParam.h" + +static unsigned int count_channels(GP_FilterParam params[]) +{ + unsigned int i = 0; + + while (params[i].channel_name[0] != '0') + i++; + + return i; +} + +GP_FilterParam *GP_FilterParamChannel(GP_FilterParam params[], + const char *channel_name) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + if (!strcmp(params[i].channel_name, channel_name)) + return &params[i]; + + return NULL; +} + +uint32_t GP_FilterParamChannels(GP_FilterParam params[]) +{ + return count_channels(params); +} + +int GP_FilterParamCheckPixelType(GP_FilterParam params[], + GP_PixelType pixel_type) +{ + unsigned int i, num_channels; + const GP_PixelTypeChannel *channels; + + num_channels = GP_PixelTypes[pixel_type].numchannels; + channels = GP_PixelTypes[pixel_type].channels; + + i = count_channels(params); + + if (i != num_channels) + return 1; + + for (i = 0; i < num_channels; i++) + if (GP_FilterParamChannel(params, channels[i].name) == NULL) + return 1; + + return 0; +} + +int GP_FilterParamCheckChannels(GP_FilterParam params[], + const char *channel_names[]) +{ + unsigned int i; + + for (i = 0; channel_names[i] != NULL; i++) + if (GP_FilterParamChannel(params, channel_names[i]) == NULL) + return 1; + + if (i != count_channels(params)) + return 1; + + return 0; +} + +void GP_FilterParamInitChannels(GP_FilterParam params[], + GP_PixelType pixel_type) +{ + unsigned int i, num_channels; + const GP_PixelTypeChannel *channels; + + num_channels = GP_PixelTypes[pixel_type].numchannels; + channels = GP_PixelTypes[pixel_type].channels; + + for (i = 0; i < num_channels; i++) { + strcpy(params[i].channel_name, channels[i].name); + memset(&params[i].val, 0, sizeof(GP_FilterParamVal)); + } + + params[i].channel_name[0] = '0'; +} + +void GP_FilterParamSetIntAll(GP_FilterParam params[], + int32_t val) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + params[i].val.i = val; +} + +void GP_FilterParamSetFloatAll(GP_FilterParam params[], + float val) +{ + unsigned int i; + + for (i = 0; params[i].channel_name[0] != '0'; i++) + params[i].val.f = val; +} diff --git a/libs/filters/GP_Invert.gen.c.t b/libs/filters/GP_Invert.gen.c.t index 1c11b30..e6d4b24 100644 --- a/libs/filters/GP_Invert.gen.c.t +++ b/libs/filters/GP_Invert.gen.c.t @@ -8,12 +8,14 @@ Invert filters -- Invert image {{ filter_include() }} -%% call(ps) filter_per_pixel_size('Invert') -pix = {{ 2 ** ps.size - 1 }} - pix; +%% macro filter_op(chann_name, chann_size) +{{ chann_name }} = {{ 2 ** chann_size - 1 }} - {{ chann_name }}; +%% endmacro + +%% call(pt) filter_point_per_channel('Invert', '', filter_op) %% endcall -%% call(chan) filter_per_pixel_type('Invert') -{{ chan[0] }} = {{ 2 ** chan[2] - 1 }} - {{ chan[0] }}; +%% call(ps) filter_point_per_bpp('Invert', '', filter_op) %% endcall {{ filter_functions('Invert') }} diff --git a/libs/filters/Makefile b/libs/filters/Makefile index 1608647..2b4cdb6 100644 --- a/libs/filters/Makefile +++ b/libs/filters/Makefile @@ -1,5 +1,5 @@ TOPDIR=../.. -GENSOURCES=GP_Brightness.gen.c GP_Contrast.gen.c GP_Invert.gen.c+GENSOURCES=GP_Contrast.gen.c GP_Brightness.gen.c GP_Invert.gen.c GP_MirrorV.gen.c GP_Rotate.gen.c GP_Dither.gen.c GENHEADERS= CSOURCES=$(filter-out $(wildcard *.gen.c),$(wildcard *.c)) diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index 9a925cf..02240ee 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -2,52 +2,50 @@ {% macro maybe_opts(opts) %}{% if opts %}, {{ opts }}{% endif %}{% endmacro %} +{% macro maybe_opts2(opts) %}{% if opts %}{{ opts }}, {% endif %}{% endmacro %} + %% macro filter_include() #include "core/GP_Context.h" #include "core/GP_Pixel.h" #include "core/GP_GetPutPixel.h" #include "core/GP_Debug.h" +#include "GP_Point.h" #include "GP_Filter.h" %% endmacro /* - * Filter per pixel size, used for one channel images. + * Value clamping macro */ -%% macro filter_per_pixel_size(name, opts="") -%% for ps in pixelsizes -%% if ps.size <= 8 and ps.size > 1 -int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, - GP_ProgressCallback *callback) -{ - uint32_t x, y; +%% macro filter_clamp_val(var, size) + if ({{ var }} < 0) + {{ var }} = 0; - for (y = 0; y < src->h; y++) { - for (x = 0; x < src->w; x++) { - int32_t pix = GP_GetPixel_Raw_{{ ps.suffix }}(src, x, y); - {{ caller(ps) }} - GP_PutPixel_Raw_{{ ps.suffix }}(dst, x, y, pix); - } - - if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) - return 1; - } + if ({{ var }} > {{ 2 ** size - 1}}) + {{ var }} = {{ 2 ** size - 1}}; +%% endmacro - GP_ProgressCallbackDone(callback); - return 0; -} -%% endif -%% endfor +/* + * Load parameters from params structure into variables + */ +%% macro filter_params(pt, params, c_type, id) + GP_ASSERT(GP_FilterParamCheckPixelType({{ params }}, GP_PIXEL_{{ pt.name }}) == 0, + "Invalid params channels for context pixel type"); + + %% for chann in pt.chanslist + {{ c_type }} {{ chann[0] }}_{{ id }} = (GP_FilterParamChannel({{ params }}, "{{ chann[0] }}"))->val.{{ id }}; + %% endfor %% endmacro /* * Filter per pixel type, used for images with more than one channel per pixel */ -%% macro filter_per_pixel_type(name, opts="") +%% macro filter_point_per_channel(name, opts="", filter_op) %% for pt in pixeltypes %% if not pt.is_unknown() and len(pt.chanslist) > 1 -int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, - GP_ProgressCallback *callback) +int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst, + {{ maybe_opts2(opts) }}GP_ProgressCallback *callback) { +{{ caller(pt) }} uint32_t x, y; for (y = 0; y < src->h; y++) { @@ -58,11 +56,11 @@ int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst{{ m %% endfor %% for c in pt.chanslist - {{ caller(c) }} + {{ filter_op(c[0], c[2]) }} %% endfor pix = GP_Pixel_CREATE_{{ pt.name }}({{ pt.chanslist[0][0] }}{% for c in pt.chanslist[1:] %}, {{ c[0] }}{% endfor %}); - + GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, pix); } @@ -79,15 +77,45 @@ int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst{{ m %% endmacro /* - * Value clamping macro + * Load parameters from params structure into variable */ -%% macro filter_clamp_val(var, size) - if ({{ var }} < 0) - {{ var }} = 0; +%% macro filter_param(ps, params, c_type, val) + GP_ASSERT(GP_FilterParamChannels({{ params }}) != 1, + "Expected only one channel"); - if ({{ var }} > {{ 2 ** size - 1}}) - {{ var }} = {{ 2 ** size - 1}}; -%% endmacro + {{ c_type }} pix_{{ val }} = params[0].val.{{ val }}; +%% endmacro + +/* + * Point filter per bpp (used for 1 channel pixels to save space). + */ +%% macro filter_point_per_bpp(name, opts="", filter_op) +%% for ps in pixelsizes +%% if ps.size <= 8 and ps.size > 1 +int GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst, + {{ maybe_opts2(opts) }}GP_ProgressCallback *callback) +{ +{{ caller(ps) }} + uint32_t x, y; + + for (y = 0; y < src->h; y++) { + for (x = 0; x < src->w; x++) { + int32_t pix = GP_GetPixel_Raw_{{ ps.suffix }}(src, x, y); + {{ filter_op('pix', ps.size) }} + GP_PutPixel_Raw_{{ ps.suffix }}(dst, x, y, pix); + } + + if (GP_ProgressCallbackReport(callback, y, src->h, src->w)) + return 1; + } + + GP_ProgressCallbackDone(callback); + return 0; +} + +%% endif +%% endfor +%% endmacro /* * Switch per pixel sizes or pixel types. @@ -96,7 +124,7 @@ int GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst{{ m int GP_Filter{{ name }}_Raw(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, GP_ProgressCallback *callback) { - GP_DEBUG(1, "Running filter {{ name }} {{ fmt }}"{{ maybe_opts(params) }}); + GP_DEBUG(1, "Running filter {{ name }}"); switch (src->pixel_type) { %% for pt in pixeltypes @@ -145,4 +173,3 @@ GP_Context *GP_Filter{{ name }}(const GP_Context *src, GP_Context *dst{{ maybe_o return res; } %% endmacro - ----------------------------------------------------------------------- Summary of changes: .gitignore | 3 +- demos/grinder/grinder.c | 135 +++++++++++++++++++++++++++++----- include/filters/GP_Filter.h | 2 + include/filters/GP_FilterParam.h | 119 ++++++++++++++++++++++++++++++ include/filters/GP_Filters.h | 3 + include/filters/GP_Point.h | 38 +++++++-- libs/filters/GP_Brightness.gen.c.t | 25 ++++-- libs/filters/GP_Contrast.gen.c.t | 25 ++++-- libs/filters/GP_FilterParam.c | 143 ++++++++++++++++++++++++++++++++++++ libs/filters/GP_Invert.gen.c.t | 10 ++- libs/filters/GP_Point.gen.c.t | 35 +++++++++ libs/filters/Makefile | 2 +- pylib/templates/filter.point.c.t | 118 ++++++++++++++++++++--------- 13 files changed, 572 insertions(+), 86 deletions(-) create mode 100644 include/filters/GP_FilterParam.h create mode 100644 libs/filters/GP_FilterParam.c create mode 100644 libs/filters/GP_Point.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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim November 2011