- Gfxprim - ucw.cz

[repo.or.cz] gfxprim.git branch generate updated: 3e26bede0b9f2319e6f69367ed84be575112022b
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 3e26bede0b9f2319e6f69367ed84be575112022b (commit) from e9cc5c1ae7cc5eff7b688fb8659de8ce7d4cc250 (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/3e26bede0b9f2319e6f69367ed84be575112… commit 3e26bede0b9f2319e6f69367ed84be575112022b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 22:15:20 2011 +0100 Fix typo in previous commit. diff --git a/gfxprim_config.py b/gfxprim_config.py index d603e53..d0de8d1 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -72,7 +72,7 @@ config = GfxPrimConfig( ('G', 6, 6), ('B', 0, 6)]), - PixelType(name='xRGB4666', pixelsize=PS_32BPP, chanslist=[ + PixelType(name='xRGB14666', pixelsize=PS_32BPP, chanslist=[ ('R', 12, 6), ('G', 6, 6), ('B', 0, 6)]), ----------------------------------------------------------------------- Summary of changes: gfxprim_config.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: e9cc5c1ae7cc5eff7b688fb8659de8ce7d4cc250
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via e9cc5c1ae7cc5eff7b688fb8659de8ce7d4cc250 (commit) from 1ffba0f0fa47f6abe46ab253d786833f512fa79c (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/e9cc5c1ae7cc5eff7b688fb8659de8ce7d4c… commit e9cc5c1ae7cc5eff7b688fb8659de8ce7d4cc250 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 22:07:10 2011 +0100 Add pixel type for voipac. diff --git a/gfxprim_config.py b/gfxprim_config.py index 15b06e7..d603e53 100644 --- a/gfxprim_config.py +++ b/gfxprim_config.py @@ -46,7 +46,7 @@ config = GfxPrimConfig( # Standard RGB types # - PixelType(name='RGBx8888', pixelsize=PS_32BPP, chanslist=[ + PixelType(name='xRGB8888', pixelsize=PS_32BPP, chanslist=[ ('R', 16, 8), ('G', 8, 8), ('B', 0, 8)]), @@ -71,10 +71,14 @@ config = GfxPrimConfig( ('R', 12, 6), ('G', 6, 6), ('B', 0, 6)]), + + PixelType(name='xRGB4666', pixelsize=PS_32BPP, chanslist=[ + ('R', 12, 6), + ('G', 6, 6), + ('B', 0, 6)]), # # Palette types # - PixelType(name='P2', pixelsize=PS_2BPP_LE, chanslist=[ ('P', 0, 2)]), @@ -87,7 +91,6 @@ config = GfxPrimConfig( # # Gray-only pixel types # - PixelType(name='G1', pixelsize=PS_1BPP_LE, chanslist=[ ('V', 0, 1)]), ----------------------------------------------------------------------- Summary of changes: gfxprim_config.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 1ffba0f0fa47f6abe46ab253d786833f512fa79c
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 1ffba0f0fa47f6abe46ab253d786833f512fa79c (commit) from b6c9637eb54c10672ea89dd044cde74a4ddb4afe (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/1ffba0f0fa47f6abe46ab253d786833f512f… commit 1ffba0f0fa47f6abe46ab253d786833f512fa79c Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 21:51:58 2011 +0100 Add SIGSEGV and SIGBUS too. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 77e84d1..d15bdbc 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -135,6 +135,8 @@ int main(int argc, char *argv[]) } signal(SIGINT, sighandler); + signal(SIGSEGV, sighandler); + signal(SIGBUS, sighandler); fb = GP_FramebufferInit("/dev/fb0"); ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 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 generate updated: b6c9637eb54c10672ea89dd044cde74a4ddb4afe
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via b6c9637eb54c10672ea89dd044cde74a4ddb4afe (commit) from fad5c36eca3675087d21df061b8994f6865299f8 (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/b6c9637eb54c10672ea89dd044cde74a4ddb… commit b6c9637eb54c10672ea89dd044cde74a4ddb4afe Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 21:34:41 2011 +0100 fbshow: fix the keys. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 3b8fb50..77e84d1 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -208,13 +208,13 @@ int main(int argc, char *argv[]) continue; switch (ev.val.key.key) { + case GP_KEY_ESC: case GP_KEY_ENTER: + case GP_KEY_Q: GP_FramebufferExit(fb); return 0; break; - case GP_KEY_ESC: case GP_KEY_SPACE: - case GP_KEY_Q: argn++; if (argn >= argc) argn = argf; ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 4 ++-- 1 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 generate updated: fad5c36eca3675087d21df061b8994f6865299f8
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via fad5c36eca3675087d21df061b8994f6865299f8 (commit) via 4999384b7137ca992be35c87855121fe5f3e4982 (commit) from 83ea42ee07c41ffa84e4af2cc12dad89d8eb7096 (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/fad5c36eca3675087d21df061b8994f68652… commit fad5c36eca3675087d21df061b8994f6865299f8 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 29 09:23:44 2000 +0000 Use at least _Raw get/put pixel in naive blit. diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index ced7d54..1aa1e7e 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -67,9 +67,9 @@ void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP for (i = 0; i < w; i++) for (j = 0; j < h; j++) { - GP_Pixel p = GP_GetPixel(c1, x1 + i, y1 + j); + GP_Pixel p = GP_GetPixel_Raw(c1, x1 + i, y1 + j); if (c1->pixel_type != c2->pixel_type) p = GP_ConvertContextPixel(p, c1, c2); - GP_PutPixel(c2, x2 + i, y2 + j, p); + GP_PutPixel_Raw(c2, x2 + i, y2 + j, p); } } http://repo.or.cz/w/gfxprim.git/commit/4999384b7137ca992be35c87855121fe5f3e… commit 4999384b7137ca992be35c87855121fe5f3e4982 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 29 09:22:09 2000 +0000 Reset the framebuffer on ctrl+c. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index ffa2c6a..3b8fb50 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -26,6 +26,7 @@ */ +#include <signal.h> #include <unistd.h> #include <GP.h> @@ -35,6 +36,17 @@ static GP_Pixel black_pixel; static GP_Pixel white_pixel; + +static GP_Framebuffer *fb = NULL; + +static void sighandler(int signo __attribute__((unused))) +{ + if (fb != NULL) + GP_FramebufferExit(fb); + + exit(1); +} + static float calc_img_size(uint32_t img_w, uint32_t img_h, uint32_t src_w, uint32_t src_h) { @@ -48,6 +60,8 @@ static GP_Context *image_to_display(GP_Context *img, uint32_t w, uint32_t h) { float rat = calc_img_size(img->w, img->h, w, h); +// GP_FilterGaussianBlur(img, img, 1, 1, NULL); + return GP_FilterResize(img, NULL, GP_INTERP_CUBIC, img->w * rat, img->h * rat, NULL); } @@ -87,7 +101,6 @@ static int show_image(GP_Framebuffer *fb, const char *img_path, int clear) int main(int argc, char *argv[]) { - GP_Framebuffer *fb; GP_InputDriverLinux *drv = NULL; char *input_dev = NULL; int sleep_sec = 0; @@ -121,6 +134,8 @@ int main(int argc, char *argv[]) } } + signal(SIGINT, sighandler); + fb = GP_FramebufferInit("/dev/fb0"); if (fb == NULL) { ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 17 ++++++++++++++++- libs/core/GP_Blit.c | 4 ++-- 2 files changed, 18 insertions(+), 3 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 83ea42ee07c41ffa84e4af2cc12dad89d8eb7096
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 83ea42ee07c41ffa84e4af2cc12dad89d8eb7096 (commit) from 9be6758838682bf96a52cf189f94b81f18441e80 (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/83ea42ee07c41ffa84e4af2cc12dad89d8eb… commit 83ea42ee07c41ffa84e4af2cc12dad89d8eb7096 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 16:23:11 2011 +0100 Context docs, yay! diff --git a/doc/context.txt b/doc/context.txt index 42c9f8c..89cf55d 100644 --- a/doc/context.txt +++ b/doc/context.txt @@ -9,97 +9,130 @@ Data Structure [source,c] ------------------------------------------------------------------------------- typedef struct GP_Context { - uint8_t *pixels; /* Pointer to array of pixels */ - uint8_t bpp; /* Bits per pixel, always be power of two */ - uint32_t bytes_per_row; /* Bytes per row, rows are padded to bytes */ - uint32_t w; /* Width in pixels */ - uint32_t h; /* Height in pixels */ - - GP_PixelType pixel_type; /* Enum, bitmap pixel type id */ - - int axes_swap:1; /* Context rotation and mirroring */ - int x_swap:1; - int y_swap:1; + uint8_t *pixels; /* pointer to image pixels */ + uint8_t bpp; /* pixel length in bits */ + uint32_t bytes_per_row; + uint32_t w; /* width in pixels */ + uint32_t h; /* height in pixels */ + /* + * Row bit offset. The offset is ignored for byte aligned pixels. + * Basically it's used for non aligned pixels with combination + * with subcontextes. + */ + uint8_t offset; + + GP_PixelType pixel_type; /* pixel format enum */ + + uint8_t axes_swap:1; /* swap axes */ + uint8_t x_swap:1; /* mirror x */ + uint8_t y_swap:1; /* mirror y */ + uint8_t free_pixels:1; /* if set GP_ContextFree() calls free on context->pixels */ } GP_Context; ------------------------------------------------------------------------------- -The 'GP_Context' holds meta-data needed for bitmaps. The values of pixels -are stored as bitmap lines (aligned to bytes) in one dimensional array. -The address of pixel could be determined by GP_PIXEL_ADDRESS(context, x, y) -which returns byte aligned address for the pixel. +The 'GP_Context' holds meta-data needed for bitmap drawing. The bitmap is +stored in one dimensional array in byte-aligned lines. Rotation ^^^^^^^^ -All gfx functions does honor rotation and mirroring. If you really need drawing -primitives without it use variants with _Raw suffix. -So GP_Line() is equal to GP_Line_Raw(), when all axes_swap, x_swap and y_swap -are set to zero. +The orientation flags affects the gfx and text drawing functions. If some of +the flags is changed the origin and direction of the drawing is changed. Note +that the image pixels are not affected by this at all only the coordinates +passed to drawing functions are transformed accordingly. -There are various macros for transforming coordinates and sizes in -'core/GP_Transform.h'. +If you don't need this functionality just don't touch these flags the as +overhead of these transformations is not measurable. -* *GP_TRANSFORM_POINT(x, y)* -* *GP_TRANSFORM_RECT(x, y, w, h)* -* *GP_RETRANSFORM_POINT(x, y)* +If you really need drawing primitives that do not use the orientation flags, +you could use variants with _Raw suffix (altghoug this is not recommended). -Functions -~~~~~~~~~ +There are various helper macros for transforming coordinates and sizes in +'core/GP_Transform.h'. And helper functions to "rotate" the context flags +clock wise and counter clock wise as well as functions to get the context size +when taking into the accout the widht and height. [source,c] ------------------------------------------------------------------------------- -#include <GP.h> +/* Transforms point user coordinates to bitmap coordinates */ +GP_TRANSFORM_POINT(context, x, y) -uint32_t GP_ContextW(struct GP_Context *context); -uint32_t GP_ContextH(struct GP_Context *context); -------------------------------------------------------------------------------- +/* Transforms rectangular area coordinates and size */ +GP_TRANSFORM_RECT(context, x, y, w, h) -Functions to get context width and height that do honor rotation flags (swaps -W and H if axes_swap is set). +/* Inverse transformation, bitmap coordinates to user coordinates */ +GP_RETRANSFORM_POINT(context, x, y) +------------------------------------------------------------------------------- [source,c] ------------------------------------------------------------------------------- -#include <GP.h> - -void GP_ContextFlagsRotateCW(struct GP_Context *context); -void GP_ContextFlagsRotateCCW(struct GP_Context *context); +/* + * Rotate context flags clock wise. + */ +void GP_ContextFlagsRotateCW(GP_Context *context); + +/* + * Rotate context flags counter clock wise. + */ +void GP_ContextFlagsRotateCCW(GP_Context *context); + +/* + * Returns context W and H taking the rotation flags into the account. + */ +GP_Size GP_ContextW(const GP_Context *context); +GP_Size GP_ContextH(const GP_Context *context); ------------------------------------------------------------------------------- -Rotate context flags (x_swap, y_swap and axes_swap) clock wise, respectively -counter clock wise. +Context base functions +~~~~~~~~~~~~~~~~~~~~~~ [source,c] ------------------------------------------------------------------------------- #include <GP.h> -GP_Context *GP_ContextAlloc(uint32_t w, uint32_t h, GP_PixelType type); +GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); + +GP_Context *GP_ContextCopy(const GP_Context *src, int flag); + +void GP_ContextFree(GP_Context *context); ------------------------------------------------------------------------------- -Allocates and initializes the 'GP_Context' structure. The size for pixels is -computed from width, height and pixel type. Moreover the rotation flags are -set to zero and clipping rectangle is set to whole bitmap. +The 'GP_ContextAlloc()' allocates context and initalizes the context +structure. The orientation flags are all set to 0 and the rest of the metadata +are calculated accordingly to width, height and pixel_type. The bitmap +(context->pixels) is not initalized. -The newly allocated context should be later freed with 'GP_ContextFree()'. +The 'GP_ContextCopy()' allocates and initalizes a copy of the context passed +as argument. If 'flag' is not zero, the bitmap (context->pixels) is copied +otherwise it's left uninitalized. -[source,c] -------------------------------------------------------------------------------- -#include <GP.h> +In both cases the resulting context should later be freed with +'GP_ContextFree()'. -void GP_ContextFree(GP_Context *context); -------------------------------------------------------------------------------- +Subcontext +~~~~~~~~~~ -Free the context allocated memory. +Given a rectangular area inside of any context subcontext could be created. +The resulting context could be used for all context operations (including +subcontext creation). The only difference between allocated context and +subcontext of such context is that the 'GP_ContextFree()' doesn't call +'free()' on subcontext pixels (which as a matter of a fact is a pointer that +points somewhere into to allocated area). [source,c] ------------------------------------------------------------------------------- #include <GP.h> -GP_Context *GP_ContextCopy(GP_Context *context, int flag); +GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, + GP_Coord x, GP_Coord y, GP_Size w, GP_Size h); ------------------------------------------------------------------------------- -Copy a context. Allocates and initializes a 'GP_Context'. If flag is set to -GP_CONTEXT_WITH_PIXELS, the actual bitmap is copied from context to newly -allocated context, otherwise only context meta-data are copied. +Creates subcontext of a context. The rectangular area must fit into the context. + +If subcontext pointer is 'NULL' the context structure is allocated otherwise +the metadata are filled into the context structure pointed by subcontext +pointer. -The newly created context should be later freed with 'GP_ContextFree()'. +In both cases pointer to subcontext or NULL (in case of 'malloc(2)' failure) is +returned. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index ef2940e..d6b0f6a 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -133,15 +133,19 @@ void GP_ContextFree(GP_Context *context); GP_RetCode GP_ContextDump(GP_Context *context, const char *path); /* - * Rotates context flags. + * Rotates context flags clock wise. */ void GP_ContextFlagsRotateCW(GP_Context *context); + +/* + * Rotates context flags counter clock wise. + */ void GP_ContextFlagsRotateCCW(GP_Context *context); /* - * Returns context width and height. + * Returns context width and height taking the rotation flags into a account. */ -static inline uint32_t GP_ContextW(const GP_Context *context) +static inline GP_Size GP_ContextW(const GP_Context *context) { if (context->axes_swap) return context->h; @@ -149,7 +153,7 @@ static inline uint32_t GP_ContextW(const GP_Context *context) return context->w; } -static inline uint32_t GP_ContextH(const GP_Context *context) +static inline GP_Size GP_ContextH(const GP_Context *context) { if (context->axes_swap) return context->w; ----------------------------------------------------------------------- Summary of changes: doc/context.txt | 141 ++++++++++++++++++++++++++++----------------- include/core/GP_Context.h | 12 +++- 2 files changed, 95 insertions(+), 58 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 9be6758838682bf96a52cf189f94b81f18441e80
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 9be6758838682bf96a52cf189f94b81f18441e80 (commit) via 5309636e9487a4547fe4fe1f4bf798c0174ab575 (commit) from aa8f80b7334e88d72171f325bb37cfc4b2245d0e (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/9be6758838682bf96a52cf189f94b81f1844… commit 9be6758838682bf96a52cf189f94b81f18441e80 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 15:15:31 2011 +0100 More docs for filters. diff --git a/doc/filters.txt b/doc/filters.txt index 0f54e7a..d806786 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -84,9 +84,48 @@ void GP_FilterFoo_Raw(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Rotation and Symmetries +Point operation filters ~~~~~~~~~~~~~~~~~~~~~~~ +Point operations are filters that works with pixels as with independent values +(the value of destination pixel depends only on the pixel on the same +coodrdinates in source image). All of these filters works 'in-place' and the +result has always the same size as the source. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterBrightness(const GP_Context *src, GP_Context *dst, + int32_t inc, GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Brightness filter, increments all pixel channels by a fixed value. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterContrast(const GP_Context *src, GP_Context *dst, + float mul, GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Constrast filter, multiplies all pixel channels by a fixed value. + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Inverts the image, for each channel the result value is computed as "chan_max +- val". + +Rotation and Symmetry filters +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + [source,c] ------------------------------------------------------------------------------- #include <GP_Filters.h> @@ -200,3 +239,49 @@ Works 'in-place'. 'TODO:' this filter is implemented for RGB888 only. + +Interpolation filters +~~~~~~~~~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +typedef enum GP_InterpolationType { + GP_INTERP_NN, /* Nearest Neighbour */ + GP_INTERP_CUBIC, /* Bicubic */ +} GP_InterpolationType; + +GP_Context *GP_FilterResize(const GP_Context *src, GP_Context *dst, + GP_InterpolationType type, + GP_Size w, GP_Size h, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Interpolate (resize) the context. + +Doesn't work 'in-place' (this is quite impossible as the size of the bitmap is +changed by the filter). + +If the filter destination is non 'NULL' and the 'w' and 'h' is smaller than the +destination size the source image is interpolated into subcontext of +destination defined by 'w' and 'h'. + +'TODO:' this filter is implemented for RGB888 only. + +Nearest Neighbour Interpolation +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Fast, but produces "pixelated" images may however work better for images with +sharp edges mostly consisting of big one colour regions (eg. doesn't blur the +result on upscaling). + +Bicubic Interpolation +^^^^^^^^^^^^^^^^^^^^^ + +Works well as is on image upscaling. To get decent result on downscaling +low-pass filter (gaussian blur) must be used on original image before actuall +downscaling. To do this reasonably fast we could cheat a little first resize +big images a little without the low-past filter, then apply low-pass filter and +finally downscale it to desired size. + http://repo.or.cz/w/gfxprim.git/commit/5309636e9487a4547fe4fe1f4bf798c0174a… commit 5309636e9487a4547fe4fe1f4bf798c0174ab575 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 15:06:55 2011 +0100 Fixed the point filters API. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 3582c38..51c362b 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -279,7 +279,7 @@ static GP_RetCode bright(GP_Context **c, const char *params) return GP_EINVAL; } - GP_FilterBrightness_Raw(*c, *c, bright); + GP_FilterBrightness(*c, *c, bright, progress_callback); return GP_ESUCCESS; } @@ -303,7 +303,7 @@ static GP_RetCode contrast(GP_Context **c, const char *params) return GP_EINVAL; } - GP_FilterContrast_Raw(*c, *c, mul); + GP_FilterContrast(*c, *c, mul, progress_callback); return GP_ESUCCESS; } @@ -319,7 +319,7 @@ static GP_RetCode invert(GP_Context **c, const char *params) if (param_parse(params, invert_params, "invert", param_err)) return GP_EINVAL; - GP_FilterInvert_Raw(*c, *c); + GP_FilterInvert(*c, *c, progress_callback); return GP_ESUCCESS; } diff --git a/include/SDL/GP_SDL.h b/include/SDL/GP_SDL.h index a5967c2..d01bd1e 100644 --- a/include/SDL/GP_SDL.h +++ b/include/SDL/GP_SDL.h @@ -19,7 +19,7 @@ * 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> * * * *****************************************************************************/ @@ -28,7 +28,6 @@ #include <SDL/SDL.h> -#include "GP.h" #include "GP_SDL_Context.h" #include "GP_SDL_VideoInit.h" diff --git a/include/filters/GP_Filter.h b/include/filters/GP_Filter.h index cc9918d..20d323c 100644 --- a/include/filters/GP_Filter.h +++ b/include/filters/GP_Filter.h @@ -26,8 +26,8 @@ */ -#ifndef GP_FILTER_H -#define GP_FILTER_H +#ifndef GP_FILTERS_FILTER_H +#define GP_FILTERS_FILTER_H #include "core/GP_Context.h" @@ -55,4 +55,4 @@ static inline void GP_ProgressCallbackDone(GP_ProgressCallback *callback) GP_ProgressCallbackReport(callback, 100); } -#endif /* GP_FILTER_H */ +#endif /* FILTERS_GP_FILTER_H */ diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index b5e7d50..c5b53a8 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -26,32 +26,42 @@ */ -#ifndef GP_POINT_H -#define GP_POINT_H +#ifndef FILTERS_GP_POINT_H +#define FILTERS_GP_POINT_H -#include "core/GP_Context.h" +#include "GP_Filter.h" /* * Brightness filter. + * + * Increments each pixel channel by a given value. */ -void GP_FilterBrightness_Raw(const GP_Context *src, GP_Context *res, - int32_t inc); +void GP_FilterBrightness_Raw(const GP_Context *src, GP_Context *dst, + int32_t inc, GP_ProgressCallback *callback); -GP_Context *GP_FilterBrightness(const GP_Context *src, int32_t inc); +GP_Context *GP_FilterBrightness(const GP_Context *src, GP_Context *dst, + int32_t inc, GP_ProgressCallback *callback); /* * Contrast filter. + * + * Multiplies each pixel channel by a given value. */ -GP_Context *GP_FilterContrast_Raw(const GP_Context *src, GP_Context *res, - float mul); +GP_Context *GP_FilterContrast_Raw(const GP_Context *src, GP_Context *dst, + float mul, GP_ProgressCallback *callback); -GP_Context *GP_FilterContrast(const GP_Context *src, float mul); +GP_Context *GP_FilterContrast(const GP_Context *src, GP_Context *dst, + float mul, GP_ProgressCallback *callback); /* * Invert filter. + * + * Inverts each pixel channel (eg. val = max - val) */ -GP_Context *GP_FilterInvert_Raw(const GP_Context *src, GP_Context *res); +GP_Context *GP_FilterInvert_Raw(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); -GP_Context *GP_FilterInvert(const GP_Context *src); +GP_Context *GP_FilterInvert(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); -#endif /* GP_POINT_H */ +#endif /* FILTERS_GP_POINT_H */ diff --git a/pylib/templates/filter.point.c.t b/pylib/templates/filter.point.c.t index 271418c..4c3bdaa 100644 --- a/pylib/templates/filter.point.c.t +++ b/pylib/templates/filter.point.c.t @@ -3,10 +3,11 @@ {% macro maybe_opts(opts) %}{% if opts %}, {{ opts }}{% endif %}{% endmacro %} %% macro filter_include() -#include <GP_Context.h> -#include <GP_Pixel.h> -#include <GP_GetPutPixel.h> -#include <GP_Debug.h> +#include "core/GP_Context.h" +#include "core/GP_Pixel.h" +#include "core/GP_GetPutPixel.h" +#include "core/GP_Debug.h" +#include "GP_Filter.h" %% endmacro /* @@ -15,7 +16,8 @@ %% macro filter_per_pixel_size(name, opts="") %% for ps in pixelsizes %% if ps.size <= 8 and ps.size > 1 -void GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *res{{ maybe_opts(opts) }}) +void GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, + GP_ProgressCallback *callback) { uint32_t x, y; @@ -23,9 +25,14 @@ void GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *res{ 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 }}(res, x, y, pix); + GP_PutPixel_Raw_{{ ps.suffix }}(dst, x, y, pix); } + + if (callback != NULL && y % 100 == 0) + GP_ProgressCallbackReport(callback, 100.00 * y/src->h); } + + GP_ProgressCallbackDone(callback); } %% endif %% endfor @@ -37,11 +44,12 @@ void GP_Filter{{ name }}_{{ ps.suffix }}(const GP_Context *src, GP_Context *res{ %% macro filter_per_pixel_type(name, opts="") %% for pt in pixeltypes %% if not pt.is_unknown() and len(pt.chanslist) > 1 -void GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *res{{ maybe_opts(opts) }}) +void GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, + GP_ProgressCallback *callback) { uint32_t x, y; - for (y = 0; y < src->h; y++) + for (y = 0; y < src->h; y++) { for (x = 0; x < src->w; x++) { GP_Pixel pix = GP_GetPixel_Raw_{{ pt.pixelsize.suffix }}(src, x, y); %% for c in pt.chanslist @@ -54,8 +62,14 @@ void GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *res{{ 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 }}(res, x, y, pix); + GP_PutPixel_Raw_{{ pt.pixelsize.suffix }}(dst, x, y, pix); } + + if (callback != NULL && y % 100 == 0) + GP_ProgressCallbackReport(callback, 100.00 * y/src->h); + } + + GP_ProgressCallbackDone(callback); } %% endif @@ -77,7 +91,8 @@ void GP_Filter{{ name }}_{{ pt.name }}(const GP_Context *src, GP_Context *res{{ * Switch per pixel sizes or pixel types. */ %% macro filter_functions(name, opts="", params="", fmt="") -void GP_Filter{{ name }}_Raw(const GP_Context *src, GP_Context *res{{ maybe_opts(opts) }}) +void 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) }}); @@ -87,9 +102,9 @@ void GP_Filter{{ name }}_Raw(const GP_Context *src, GP_Context *res{{ maybe_opts %% if pt.is_unknown() or pt.pixelsize.size < 2 return; %% elif len(pt.chanslist) == 1: - GP_Filter{{ name }}_{{ pt.pixelsize.suffix }}(src, res{{ maybe_opts(params) }}); + GP_Filter{{ name }}_{{ pt.pixelsize.suffix }}(src, dst{{ maybe_opts(params) }}, callback); %% else - GP_Filter{{ name }}_{{ pt.name }}(src, res{{ maybe_opts(params) }}); + GP_Filter{{ name }}_{{ pt.name }}(src, dst{{ maybe_opts(params) }}, callback); %% endif break; %% endfor @@ -98,18 +113,25 @@ void GP_Filter{{ name }}_Raw(const GP_Context *src, GP_Context *res{{ maybe_opts } } -GP_Context *GP_Filter{{ name }}(const GP_Context *src{{ maybe_opts(opts) }}) +GP_Context *GP_Filter{{ name }}(const GP_Context *src, GP_Context *dst{{ maybe_opts(opts) }}, + GP_ProgressCallback *callback) { - GP_Context *res; - res = GP_ContextCopy(src, 0); + if (dst == NULL) { + dst = GP_ContextCopy(src, 0); - if (res == NULL) - return NULL; + if (dst == NULL) + return NULL; + } else { + GP_ASSERT(src->pixel_type == dst->pixel_type, + "The src and dst pixel types must match"); + GP_ASSERT(src->w <= dst->w && src->h <= dst->h, + "Destination is not big enough"); + } - GP_Filter{{ name }}_Raw(src, res{{ maybe_opts(params) }}); + GP_Filter{{ name }}_Raw(src, dst{{ maybe_opts(params) }}, callback); - return res; + return dst; } %% endmacro diff --git a/tests/SDL/showimage.c b/tests/SDL/showimage.c index b043b72..134f8f9 100644 --- a/tests/SDL/showimage.c +++ b/tests/SDL/showimage.c @@ -50,7 +50,7 @@ void event_loop(void) case SDLK_DOWN: brightness-=1; - res = GP_FilterBrightness(bitmap, brightness); + res = GP_FilterBrightness(bitmap, NULL, brightness, NULL); printf("brightness = %i %ux%un", brightness, res->w, res->h); ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 6 +- doc/filters.txt | 87 +++++++++++++++++++++++++++++++++++++- include/SDL/GP_SDL.h | 3 +- include/filters/GP_Filter.h | 6 +- include/filters/GP_Point.h | 34 ++++++++++----- pylib/templates/filter.point.c.t | 60 ++++++++++++++++++-------- tests/SDL/showimage.c | 2 +- 7 files changed, 157 insertions(+), 41 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: aa8f80b7334e88d72171f325bb37cfc4b2245d0e
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via aa8f80b7334e88d72171f325bb37cfc4b2245d0e (commit) via 473d31d4feafd632b9cd7c668fb7548a6855ce03 (commit) via 8c0a1d4f59d6c69dfbffa2817236b6b18d7f261b (commit) from 4061392c7024e648dc2bcfde720ce11e0f70dedb (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/aa8f80b7334e88d72171f325bb37cfc4b224… commit aa8f80b7334e88d72171f325bb37cfc4b2245d0e Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 14:22:24 2011 +0100 Fixed the interpolation filters api. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 76dcb99..ffa2c6a 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -48,7 +48,7 @@ static GP_Context *image_to_display(GP_Context *img, uint32_t w, uint32_t h) { float rat = calc_img_size(img->w, img->h, w, h); - return GP_FilterResize(img, NULL, GP_INTERP_CUBIC, img->w * rat, img->h * rat); + return GP_FilterResize(img, NULL, GP_INTERP_CUBIC, img->w * rat, img->h * rat, NULL); } static int show_image(GP_Framebuffer *fb, const char *img_path, int clear) diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index 27d8ded..3582c38 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -117,7 +117,7 @@ static GP_RetCode resize(GP_Context **c, const char *params) GP_Size h = ratio * (*c)->h; GP_Context *res = NULL; - res = GP_FilterResize(*c, progress_callback, alg, w, h); + res = GP_FilterResize(*c, NULL, alg, w, h, progress_callback); if (res == NULL) return GP_EINVAL; @@ -177,7 +177,7 @@ static GP_RetCode scale(GP_Context **c, const char *params) GP_Context *res = NULL; - res = GP_FilterResize(*c, progress_callback, alg, w, h); + res = GP_FilterResize(*c, NULL, alg, w, h, progress_callback); if (res == NULL) return GP_EINVAL; diff --git a/include/filters/GP_Filters.h b/include/filters/GP_Filters.h index 90f63b3..8e2d84d 100644 --- a/include/filters/GP_Filters.h +++ b/include/filters/GP_Filters.h @@ -38,10 +38,10 @@ /* Point filters, brightness, contrast ... */ #include "filters/GP_Point.h" -/* Linear convolution base filters (mostly blurs) */ +/* Linear convolution based filters (mostly blurs) */ #include "filters/GP_Linear.h" -/* Image scaling */ +/* Image scaling (resampling) */ #include "filters/GP_Resize.h" #endif /* GP_FILTERS_H */ diff --git a/include/filters/GP_Linear.h b/include/filters/GP_Linear.h index ae028fc..3c0d1e9 100644 --- a/include/filters/GP_Linear.h +++ b/include/filters/GP_Linear.h @@ -63,7 +63,8 @@ GP_Context *GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, /* * Linear convolution. * - * The kernel is array of kw * kh floats and is indexed as two directional array. + * The kernel is array of kw * kh floats and is indexed as two directional + * array. * * To define 3x3 average filter * diff --git a/include/filters/GP_Resize.h b/include/filters/GP_Resize.h index 05f80c7..63a6143 100644 --- a/include/filters/GP_Resize.h +++ b/include/filters/GP_Resize.h @@ -41,8 +41,8 @@ */ -#ifndef GP_RESIZE_H -#define GP_RESIZE_H +#ifndef FILTERS_GP_RESIZE_H +#define FILTERS_GP_RESIZE_H #include "GP_Filter.h" @@ -51,11 +51,26 @@ typedef enum GP_InterpolationType { GP_INTERP_CUBIC, /* Bicubic */ } GP_InterpolationType; -void GP_FilterResize_Raw(GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - GP_InterpolationType type); +/* + * Just interpolate the source context into destination context. + */ +void GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, + GP_InterpolationType type, + GP_ProgressCallback *callback); -GP_Context *GP_FilterResize(GP_Context *src, GP_ProgressCallback *callback, - GP_InterpolationType type, GP_Size w, GP_Size h); +/* + * If destination is non NULL, the w and h are used to create subcontext from + * destination which is then used to interpolate the image to. + * + * Otherwise if destination is NULL, the context of size w and h is allocated + * and returned. + * + * In both cases the pointer to destination or NULL in case of failure is + * returned. + */ +GP_Context *GP_FilterResize(const GP_Context *src, GP_Context *dst, + GP_InterpolationType type, + GP_Size w, GP_Size h, + GP_ProgressCallback *callback); -#endif /* GP_RESIZE_H */ +#endif /* FILTERS_GP_RESIZE_H */ diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index 192d5f5..eb42478 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -27,27 +27,27 @@ #include <GP_Resize.h> -void GP_FilterInterpolate_NN(GP_Context *src, GP_Context *res, +void GP_FilterInterpolate_NN(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { GP_Coord x, y; GP_DEBUG(1, "Scaling image %ux%u -> %ux%u %2.2f %2.2f", - src->w, src->h, res->w, res->h, - 1.00 * res->w / src->w, 1.00 * res->h / src->h); + src->w, src->h, dst->w, dst->h, + 1.00 * dst->w / src->w, 1.00 * dst->h / src->h); - for (y = 0; y < (GP_Coord)res->h; y++) { - for (x = 0; x < (GP_Coord)res->w; x++) { - GP_Coord xi = (1.00 * x / res->w) * src->w; - GP_Coord yi = (1.00 * y / res->h) * src->h; + for (y = 0; y < (GP_Coord)dst->h; y++) { + for (x = 0; x < (GP_Coord)dst->w; x++) { + GP_Coord xi = (1.00 * x / dst->w) * src->w; + GP_Coord yi = (1.00 * y / dst->h) * src->h; GP_Pixel pix = GP_GetPixel_Raw_24BPP(src, xi, yi); - GP_PutPixel_Raw_24BPP(res, x, y, pix); + GP_PutPixel_Raw_24BPP(dst, x, y, pix); } if (callback != NULL && y % 100 == 0) - GP_ProgressCallbackReport(callback, 100.00 * y/res->h); + GP_ProgressCallbackReport(callback, 100.00 * y/dst->h); } GP_ProgressCallbackDone(callback); @@ -79,18 +79,18 @@ typedef union v4f { #define MUL_V4SF(a, b) ((union v4f)((a).v * (b).v)) #define SUM_V4SF(a) ((a).f[0] + (a).f[1] + (a).f[2] + (a).f[3]) -void GP_FilterInterpolate_Cubic(GP_Context *src, GP_Context *res, +void GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { float 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, res->w, res->h, - 1.00 * res->w / src->w, 1.00 * res->h / src->h); + src->w, src->h, dst->w, dst->h, + 1.00 * dst->w / src->w, 1.00 * dst->h / src->h); - for (i = 0; i < res->w; i++) { - float x = (1.00 * i / res->w) * (src->w - 4.5) + 2.5; + for (i = 0; i < dst->w; i++) { + float x = (1.00 * i / dst->w) * (src->w - 4.5) + 2.5; v4f cvx; int xi = x - 1; @@ -140,8 +140,8 @@ void GP_FilterInterpolate_Cubic(GP_Context *src, GP_Context *res, } /* now interpolate column for new image */ - for (j = 0; j < res->h; j++) { - float y = (1.00 * j / res->h) * (src->h - 4.5) + 2.5; + for (j = 0; j < dst->h; j++) { + float y = (1.00 * j / dst->h) * (src->h - 4.5) + 2.5; v4f cvy, rv, gv, bv; float r, g, b; int yi = y - 1; @@ -199,46 +199,58 @@ void GP_FilterInterpolate_Cubic(GP_Context *src, GP_Context *res, b = 0; GP_Pixel pix = GP_Pixel_CREATE_RGB888((uint8_t)r, (uint8_t)g, (uint8_t)b); - GP_PutPixel_Raw_24BPP(res, i, j, pix); + GP_PutPixel_Raw_24BPP(dst, i, j, pix); } if (callback != NULL && i % 100 == 0) - GP_ProgressCallbackReport(callback, 100.00 * i/res->w); + GP_ProgressCallbackReport(callback, 100.00 * i/dst->w); } GP_ProgressCallbackDone(callback); } -void GP_FilterResize_Raw(GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - GP_InterpolationType type) +void GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, + GP_InterpolationType type, + GP_ProgressCallback *callback) { switch (type) { case GP_INTERP_NN: - GP_FilterInterpolate_NN(src, res, callback); + GP_FilterInterpolate_NN(src, dst, callback); break; case GP_INTERP_CUBIC: - GP_FilterInterpolate_Cubic(src, res, callback); + GP_FilterInterpolate_Cubic(src, dst, callback); break; } } -GP_Context *GP_FilterResize(GP_Context *src, GP_ProgressCallback *callback, - GP_InterpolationType type, GP_Size w, GP_Size h) +GP_Context *GP_FilterResize(const GP_Context *src, GP_Context *dst, + GP_InterpolationType type, + GP_Size w, GP_Size h, + GP_ProgressCallback *callback) { - GP_Context *res; - + GP_Context sub, *res; + + /* TODO: Templatize */ if (src->pixel_type != GP_PIXEL_RGB888) return NULL; - - res = GP_ContextAlloc(w, h, GP_PIXEL_RGB888); - - if (res == NULL) { - GP_DEBUG(1, "Malloc failed :("); - return NULL; + + if (dst == NULL) { + dst = GP_ContextAlloc(w, h, src->pixel_type); + + if (dst == NULL) + return NULL; + + res = dst; + } else { + GP_ASSERT(src->pixel_type == dst->pixel_type, + "The src and dst pixel types must match"); + /* + * The size of w and h is asserted in subcontext initalization + */ + res = GP_ContextSubContext(dst, &sub, 0, 0, w, h); } - GP_FilterResize_Raw(src, res, callback, type); + GP_FilterResize_Raw(src, res, type, callback); - return res; + return dst; } http://repo.or.cz/w/gfxprim.git/commit/473d31d4feafd632b9cd7c668fb7548a6855… commit 473d31d4feafd632b9cd7c668fb7548a6855ce03 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 14:05:32 2011 +0100 Remove the redundant linker flags. diff --git a/demos/fbshow/Makefile b/demos/fbshow/Makefile index 2ca7439..0a8147c 100644 --- a/demos/fbshow/Makefile +++ b/demos/fbshow/Makefile @@ -3,7 +3,7 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE= -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lpng +LDLIBS+=-lGP -L$(TOPDIR)/build/ APPS=fbshow diff --git a/demos/grinder/Makefile b/demos/grinder/Makefile index 7cf1e72..a984bd9 100644 --- a/demos/grinder/Makefile +++ b/demos/grinder/Makefile @@ -3,7 +3,7 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE=core gfx SDL backends -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lpng +LDLIBS+=-lGP -L$(TOPDIR)/build/ APPS=grinder diff --git a/tests/SDL/Makefile b/tests/SDL/Makefile index 8c02ba1..123889b 100644 --- a/tests/SDL/Makefile +++ b/tests/SDL/Makefile @@ -3,7 +3,7 @@ TOPDIR=../.. CSOURCES=$(shell echo *.c) INCLUDE=core gfx SDL backends -LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL -lpng +LDLIBS+=-lGP -L$(TOPDIR)/build/ -lGP_SDL -lSDL APPS=pixeltest fileview fonttest linetest randomshapetest shapetest sierpinsky symbolstest textaligntest trianglefps input blittest subcontext showimage http://repo.or.cz/w/gfxprim.git/commit/8c0a1d4f59d6c69dfbffa2817236b6b18d7f… commit 8c0a1d4f59d6c69dfbffa2817236b6b18d7f261b Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 13:57:09 2011 +0100 Allow GP_ContextSubContext() to inialized given buffer. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index 80794d9..ef2940e 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -104,9 +104,15 @@ GP_Context *GP_ContextCopy(const GP_Context *src, int flag); /* * Create subcontext. + * + * If pointer to subcontext is NULL, new context is allocated + * otherwise context pointed by subcontext pointer is initalized. + * + * The free_pixels flag is set to 0 upon subcontext initalization so the + * GP_ContextFree() would not call free() upon the subcontext->pixels pointer. */ -GP_Context *GP_ContextSubContext(GP_Context *context, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h); +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. diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 83c9f73..67aca4f 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -127,17 +127,21 @@ void GP_ContextFree(GP_Context *context) free(context); } -GP_Context *GP_ContextSubContext(GP_Context *context, GP_Coord x, GP_Coord y, - GP_Size w, GP_Size h) +GP_Context *GP_ContextSubContext(GP_Context *context, GP_Context *subcontext, + GP_Coord x, GP_Coord y, GP_Size w, GP_Size h) { GP_CHECK(context, "NULL context"); GP_CHECK(context->w >= x + w, "Subcontext w out of original context."); GP_CHECK(context->h >= y + h, "Subcontext h out of original context."); + + GP_Context *ret = subcontext; - GP_Context *ret = malloc(sizeof(GP_Context)); + if (ret == NULL) { + GP_Context *ret = malloc(sizeof(GP_Context)); - if (ret == NULL) - return NULL; + if (ret == NULL) + return NULL; + } ret->bpp = context->bpp; ret->bytes_per_row = context->bytes_per_row; diff --git a/tests/SDL/subcontext.c b/tests/SDL/subcontext.c index bbdfeae..25db7fb 100644 --- a/tests/SDL/subcontext.c +++ b/tests/SDL/subcontext.c @@ -260,7 +260,7 @@ int main(int argc, char *argv[]) white = GP_ColorToContextPixel(GP_COL_WHITE, &context); gray = GP_ColorToContextPixel(GP_COL_GRAY_DARK, &context); - sub_context = GP_ContextSubContext(&context, 100, 100, 440, 280); + sub_context = GP_ContextSubContext(&context, NULL, 100, 100, 440, 280); GP_Fill(sub_context, gray); timer = SDL_AddTimer(60, timer_callback, NULL); ----------------------------------------------------------------------- Summary of changes: demos/fbshow/Makefile | 2 +- demos/fbshow/fbshow.c | 2 +- demos/grinder/Makefile | 2 +- demos/grinder/grinder.c | 4 +- include/core/GP_Context.h | 10 ++++- include/filters/GP_Filters.h | 4 +- include/filters/GP_Linear.h | 3 +- include/filters/GP_Resize.h | 31 ++++++++++++---- libs/core/GP_Context.c | 14 +++++--- libs/filters/GP_Resize.c | 82 ++++++++++++++++++++++++------------------ tests/SDL/Makefile | 2 +- tests/SDL/subcontext.c | 2 +- 12 files changed, 98 insertions(+), 60 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: 4061392c7024e648dc2bcfde720ce11e0f70dedb
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via 4061392c7024e648dc2bcfde720ce11e0f70dedb (commit) via f7f55767a6e8855d5e70a7220a5c9c1511251de5 (commit) from a47b50d43100a1e3314a818f5bcdf37bf560d8d0 (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/4061392c7024e648dc2bcfde720ce11e0f70… commit 4061392c7024e648dc2bcfde720ce11e0f70dedb Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 13:42:26 2011 +0100 Update filters docs, more to come. diff --git a/doc/filters.txt b/doc/filters.txt index d741abb..0f54e7a 100644 --- a/doc/filters.txt +++ b/doc/filters.txt @@ -1,44 +1,202 @@ Context filters --------------- -Pixel filters for 'GP_Context'. The context filter is basially an function that modifies context somehow (may even allocate new context to store result). +Pixel filters for 'GP_Context'. -Rotation -~~~~~~~~ +The context filter is basially an function that operates on context pixels. +The result may be stored into a new bitmap or placed to bitmap passed as +argument or, in some cases, the filter could be used 'in place' so the result +is stored into the same context as the one passed as filter source. + +Progress Callback +~~~~~~~~~~~~~~~~~ + +Progress callback is a structure that stores user-defined callback function, +pointer to store location of user data and percentage. + +[source,c] +------------------------------------------------------------------------------- +typdedef struct GP_ProgressCallback { + float percentage; + void (*callback)(struct GP_ProgressCallback *self); + void *priv; +} GP_ProgressCallback; +------------------------------------------------------------------------------- + +If non 'NULL' progress callback structure is passed to a filter function, the +callback function is periodically called and the percentage is updated. + +The callback is, if supported, the last parameter of the filter function. + +Common filter API +~~~~~~~~~~~~~~~~~ + +The filters have, for your convinience unified API. + +* Each filter returns pointer to destination context or 'NULL' on failure +* The first two arguments are source and destination +* The last argument is progress callback + +Each filter function could be used in two modes. + +By passing non 'NULL' argument as filter destination user requests result to +be stored into the destination context. The context must have correct pixel +type and the context size must be big enough to store the result. + +For filters that works 'in-place' (which is explicitly said for each filter) +the source and the destination could be the same context. Note that this is +not expected to work if you do several overlaping subcontextes and pass these +as arguments. + +When 'NULL' is passed as destination new context for storing the result is +allocated and returned. + +The return value is either pointer to destination context or 'NULL' either +when malloc(2) has failed or if the filter is not implemented for such +pixel_type, parameters, etc... + +[source,c] +------------------------------------------------------------------------------- +/* + * Filter common api. + */ +GP_Context *GP_FilterFoo(const GP_Context *src, GP_Context *dst, + foo params ..., + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + + +Filters also exists in _Raw variant (that just takes source context, +destination context, filters parameters and progress callback). These filter +APIs are used for internal implementation and shouldn't be called by user as +the destination is expected to be crafted exactly for storing the filter +result and there are 'NO' sanity checks in place. + +'You could use these at your own risk' + +[source,c] +------------------------------------------------------------------------------- +/* + * Raw filter common api. + */ +void GP_FilterFoo_Raw(const GP_Context *src, GP_Context *dst, + foo params ..., + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Rotation and Symmetries +~~~~~~~~~~~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterMirrorH(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Mirrors context horizontally. + +Works 'in-place'. + +The destination has to have the same pixel type and the destination size must +be at least as big as source. [source,c] ------------------------------------------------------------------------------- #include <GP_Filters.h> -GP_RetCode GP_MirrorH(GP_Context *context); +GP_Context *GP_FilterMirrorV(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Mirrors context pixels horizontaly and updates the context metadata. +Mirrors context vertically. + +Works 'in-place'. + +the destination has to have the same pixel type and the destination size must +be at least as big as source. [source,c] ------------------------------------------------------------------------------- #include <GP_Filters.h> -GP_RetCode GP_MirrorV(GP_Context *context); +GP_Context *GP_FilterRotate90(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Mirrors context pixels verticaly and updates the context metadata. +Rotate context by 90 degrees. + +Doesn't work 'in-place' (yet). + +The destinatoin has to have the same pixel type and destination size must be +big enough to fit rotated context (eg. W and H are swapped). [source,c] ------------------------------------------------------------------------------- #include <GP_Filters.h> -GP_RetCode GP_RotateCW(GP_Context *context); +GP_Context *GP_FilterRotate180(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Rotates context clock wise and updates the context metadata. +Rotate context by 180 degrees. + +Doesn't work 'in-place' (yet). + +the destination has to have the same pixel type and the destination size must +be at least as big as source. [source,c] ------------------------------------------------------------------------------- #include <GP_Filters.h> -GP_RetCode GP_RotateCCW(GP_Context *context); +GP_Context *GP_FilterRotate270(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback); ------------------------------------------------------------------------------- -Rotates context counter clock wise and updates the context metadata. +Rotate context by 270 degrees. + +Doesn't work 'in-place' (yet). + +The destinatoin has to have the same pixel type and destination size must be +big enough to fit rotated context (eg. W and H are swapped). + +[source,c] +------------------------------------------------------------------------------- +typedef enum GP_FilterSymmetries { + GP_ROTATE_90, + GP_ROTATE_CW = GP_ROTATE_90, + GP_ROTATE_180, + GP_ROTATE_270, + GP_ROTATE_CCW = GP_ROTATE_270, + GP_MIRROR_H, + GP_MIRROR_V, +} GP_FilterSymmetries; + +GP_Context *GP_FilterSymmetry(const GP_Context *src, GP_Context *dst, + GP_FilterSymmetries symmetry, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Catch all function for symmetry filters. + + +Linear filters +~~~~~~~~~~~~~~ + +[source,c] +------------------------------------------------------------------------------- +#include <GP_Filters.h> + +GP_Context *GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, + float sigma_x, float sigma_y, + GP_ProgressCallback *callback); +------------------------------------------------------------------------------- + +Gaussian blur filter. + +Works 'in-place'. + +'TODO:' this filter is implemented for RGB888 only. http://repo.or.cz/w/gfxprim.git/commit/f7f55767a6e8855d5e70a7220a5c9c151125… commit f7f55767a6e8855d5e70a7220a5c9c1511251de5 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 13:41:20 2011 +0100 Remove unused accessor. diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index 00138df..80794d9 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -23,8 +23,8 @@ * * *****************************************************************************/ -#ifndef GP_CONTEXT_H -#define GP_CONTEXT_H +#ifndef CORE_GP_CONTEXT_H +#define CORE_GP_CONTEXT_H #include <stdint.h> #include <unistd.h> @@ -59,12 +59,6 @@ typedef struct GP_Context { uint8_t free_pixels:1; /* If set pixels are freed on GP_ContextFree */ } GP_Context; -/* Returns the pixel type used by the context. */ -static inline GP_PixelType GP_GetContextPixelType(const GP_Context *context) -{ - return context->pixel_type; -} - /* Determines the address of a pixel within the context's image. * Rows and columns are specified in the image's orientation * (i.e. they might not be XY if the image is rotated). @@ -157,4 +151,4 @@ static inline uint32_t GP_ContextH(const GP_Context *context) return context->h; } -#endif /* GP_CONTEXT_H */ +#endif /* CORE_GP_CONTEXT_H */ ----------------------------------------------------------------------- Summary of changes: doc/filters.txt | 180 ++++++++++++++++++++++++++++++++++++++++++--- include/core/GP_Context.h | 12 +-- 2 files changed, 172 insertions(+), 20 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch generate updated: a47b50d43100a1e3314a818f5bcdf37bf560d8d0
by metan 31 Oct '11

31 Oct '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, generate has been updated via a47b50d43100a1e3314a818f5bcdf37bf560d8d0 (commit) via e62510c49073237e02238eede6c52f04ef9acac3 (commit) from 71f1574977b03a901b7381fb3aca1c6d0c3ed33d (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/a47b50d43100a1e3314a818f5bcdf37bf560… commit a47b50d43100a1e3314a818f5bcdf37bf560d8d0 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 12:17:36 2011 +0100 The 18BPP needs an offset. diff --git a/include/core/GP_WritePixel.h b/include/core/GP_WritePixel.h index 9295835..26d072c 100644 --- a/include/core/GP_WritePixel.h +++ b/include/core/GP_WritePixel.h @@ -40,10 +40,10 @@ void GP_WritePixels1bpp(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); void GP_WritePixels2bpp(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); void GP_WritePixels4bpp(uint8_t *start, uint8_t off, size_t cnt, uint8_t val); +void GP_WritePixels18bpp(void *start, uint8_t off, size_t count, uint32_t value); void GP_WritePixels8bpp(void *start, size_t count, uint8_t value); void GP_WritePixels16bpp(void *start, size_t count, uint16_t value); -void GP_WritePixels18bpp(void *start, size_t count, uint32_t value); void GP_WritePixels24bpp(void *start, size_t count, uint32_t value); void GP_WritePixels32bpp(void *start, size_t count, uint32_t value); diff --git a/libs/core/GP_WritePixel.c b/libs/core/GP_WritePixel.c index 5638ca5..c35b7ec 100644 --- a/libs/core/GP_WritePixel.c +++ b/libs/core/GP_WritePixel.c @@ -162,7 +162,7 @@ void GP_WritePixels16bpp(void *start, size_t count, uint16_t value) } } -void GP_WritePixels18bpp(void *start, size_t count, uint32_t value) +void GP_WritePixels18bpp(void *start, uint8_t off, size_t count, uint32_t value) { #warning TODO } diff --git a/libs/gfx/GP_HLine.c b/libs/gfx/GP_HLine.c index c249f49..38200d5 100644 --- a/libs/gfx/GP_HLine.c +++ b/libs/gfx/GP_HLine.c @@ -36,10 +36,10 @@ DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_W DEF_HLINE_BU_FN(GP_HLine_Raw_2BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels2bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_LE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) DEF_HLINE_BU_FN(GP_HLine_Raw_4BPP_BE, GP_Context*, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels4bpp) +DEF_HLINE_BU_FN(GP_HLine_Raw_18BPP_LE, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels18bpp) DEF_HLINE_FN(GP_HLine_Raw_8BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels8bpp) DEF_HLINE_FN(GP_HLine_Raw_16BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels16bpp) -DEF_HLINE_FN(GP_HLine_Raw_18BPP_LE, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels18bpp) DEF_HLINE_FN(GP_HLine_Raw_24BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels24bpp) DEF_HLINE_FN(GP_HLine_Raw_32BPP, GP_Context *, GP_Pixel, GP_PIXEL_ADDR, GP_WritePixels32bpp) http://repo.or.cz/w/gfxprim.git/commit/e62510c49073237e02238eede6c52f04ef9a… commit e62510c49073237e02238eede6c52f04ef9acac3 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Oct 31 12:16:38 2011 +0100 More work on unifying the filter API. diff --git a/demos/grinder/grinder.c b/demos/grinder/grinder.c index beb69e2..27d8ded 100644 --- a/demos/grinder/grinder.c +++ b/demos/grinder/grinder.c @@ -350,7 +350,7 @@ static GP_RetCode blur(GP_Context **c, const char *params) return GP_EINVAL; } - GP_FilterGaussianBlur_Raw(*c, *c, progress_callback, sigma_x, sigma_y); + GP_FilterGaussianBlur_Raw(*c, *c, sigma_x, sigma_y, progress_callback); return GP_ESUCCESS; } diff --git a/include/filters/GP_Linear.h b/include/filters/GP_Linear.h index 3194cb8..ae028fc 100644 --- a/include/filters/GP_Linear.h +++ b/include/filters/GP_Linear.h @@ -26,8 +26,8 @@ */ -#ifndef GP_LINEAR_H -#define GP_LINEAR_H +#ifndef FILTERS_GP_LINEAR_H +#define FILTERS_GP_LINEAR_H #include "GP_Filter.h" @@ -44,13 +44,21 @@ * * GP_FilterGaussianBlur_Raw(context, context, ...); */ -void GP_FilterGaussianBlur_Raw(GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float sigma_x, float sigma_y); - -GP_Context *GP_FilterGaussianBlur(GP_Context *src, - GP_ProgressCallback *callback, - float sigma_x, float sigma_y); +void GP_FilterGaussianBlur_Raw(const GP_Context *src, GP_Context *dst, + float sigma_x, float sigma_y, + GP_ProgressCallback *callback); +/* + * Gaussian blur. + * + * If dst is NULL, new bitmap is allocated. + * + * This variant could work in-place. + * + * Returns pointer to destination bitmap or NULL if allocation failed. + */ +GP_Context *GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, + float sigma_x, float sigma_y, + GP_ProgressCallback *callback); /* * Linear convolution. @@ -69,24 +77,26 @@ GP_Context *GP_FilterGaussianBlur(GP_Context *src, * * This function works also in-place. */ -void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kw, uint32_t kh); +void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kw, uint32_t kh, + GP_ProgressCallback *callback); /* * Special cases for convolution only in horizontal/vertical direction. * * These are about 10-30% faster than the generic implementation (depending on * the kernel size, bigger kernel == more savings). - * + * + * These are two are a base for bilinear filters. + * * Both works also in-place. */ -void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kw); +void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kw, + GP_ProgressCallback *callback); -void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kh); +void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kh, + GP_ProgressCallback *callback); -#endif /* GP_LINEAR_H */ +#endif /* FILTERS_GP_LINEAR_H */ diff --git a/libs/filters/GP_Linear.c b/libs/filters/GP_Linear.c index 8f7c2a3..b0148c9 100644 --- a/libs/filters/GP_Linear.c +++ b/libs/filters/GP_Linear.c @@ -59,9 +59,9 @@ static void gaussian_callback_2(GP_ProgressCallback *self) GP_ProgressCallbackReport(self->priv, self->percentage/2 + 50); } -void GP_FilterGaussianBlur_Raw(GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float sigma_x, float sigma_y) +void GP_FilterGaussianBlur_Raw(const GP_Context *src, GP_Context *dst, + float sigma_x, float sigma_y, + GP_ProgressCallback *callback) { unsigned int size_x = gaussian_kernel_size(sigma_x); unsigned int size_y = gaussian_kernel_size(sigma_y); @@ -84,8 +84,8 @@ void GP_FilterGaussianBlur_Raw(GP_Context *src, GP_Context *res, float kernel_x[size_x]; gaussian_kernel_init(sigma_x, kernel_x); - GP_FilterHLinearConvolution_Raw(src, res, new_callback, - kernel_x, size_x); + GP_FilterHLinearConvolution_Raw(src, dst, kernel_x, size_x, + new_callback); } if (new_callback != NULL) @@ -96,37 +96,41 @@ void GP_FilterGaussianBlur_Raw(GP_Context *src, GP_Context *res, float kernel_y[size_y]; gaussian_kernel_init(sigma_y, kernel_y); - GP_FilterVLinearConvolution_Raw(res, res, new_callback, - kernel_y, size_y); + GP_FilterVLinearConvolution_Raw(dst, dst, kernel_y, size_y, + new_callback); } GP_ProgressCallbackDone(callback); } -GP_Context *GP_FilterGaussianBlur(GP_Context *src, - GP_ProgressCallback *callback, - float sigma_x, float sigma_y) +GP_Context *GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, + float sigma_x, float sigma_y, + GP_ProgressCallback *callback) { - GP_Context *res; - + /* TODO: templatetize */ if (src->pixel_type != GP_PIXEL_RGB888) return NULL; - - res = GP_ContextCopy(src, 0); - - if (res == NULL) { - GP_DEBUG(1, "Malloc failed :("); - return NULL; + + if (dst == NULL) { + dst = GP_ContextCopy(src, 0); + + if (dst == NULL) + return NULL; + } else { + GP_ASSERT(src->pixel_type == dst->pixel_type, + "The src and dst pixel types must match"); + GP_ASSERT(src->w <= dst->w && src->h <= dst->h, + "Destination is not big enough"); } - GP_FilterGaussianBlur_Raw(src, res, callback, sigma_x, sigma_y); + GP_FilterGaussianBlur_Raw(src, dst, sigma_x, sigma_y, callback); - return res; + return dst; } -void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kw) +void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kw, + GP_ProgressCallback *callback) { float kernel_sum = 0; GP_Coord x, y; @@ -140,7 +144,7 @@ void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, kernel_sum += kernel[i]; /* do linear convolution */ - for (y = 0; y < (GP_Coord)res->h; y++) { + for (y = 0; y < (GP_Coord)dst->h; y++) { GP_Pixel pix; uint32_t R[kw], G[kw], B[kw]; @@ -160,7 +164,7 @@ void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, int idx = kw - 1; - for (x = 0; x < (GP_Coord)res->w; x++) { + for (x = 0; x < (GP_Coord)dst->w; x++) { float r = 0, g = 0, b = 0; int cx = x + kw/2; @@ -209,7 +213,7 @@ void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, pix = GP_Pixel_CREATE_RGB888((uint32_t)r, (uint32_t)g, (uint32_t)b); - GP_PutPixel_Raw_24BPP(res, x, y, pix); + GP_PutPixel_Raw_24BPP(dst, x, y, pix); idx++; @@ -218,7 +222,7 @@ void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, } if (callback != NULL && y % 100 == 0) - GP_ProgressCallbackReport(callback, 100.00 * y/res->h); + GP_ProgressCallbackReport(callback, 100.00 * y/dst->h); } GP_ProgressCallbackDone(callback); @@ -229,9 +233,9 @@ void GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *res, * * Can be used in-place. */ -void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kh) +void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kh, + GP_ProgressCallback *callback) { float kernel_sum = 0; GP_Coord x, y; @@ -245,7 +249,7 @@ void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, kernel_sum += kernel[i]; /* do linear convolution */ - for (x = 0; x < (GP_Coord)res->w; x++) { + for (x = 0; x < (GP_Coord)dst->w; x++) { GP_Pixel pix; uint32_t R[kh], G[kh], B[kh]; @@ -265,7 +269,7 @@ void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, int idx = kh - 1; - for (y = 0; y < (GP_Coord)res->h; y++) { + for (y = 0; y < (GP_Coord)dst->h; y++) { float r = 0, g = 0, b = 0; int cy = y + kh/2; @@ -314,7 +318,7 @@ void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, pix = GP_Pixel_CREATE_RGB888((uint32_t)r, (uint32_t)g, (uint32_t)b); - GP_PutPixel_Raw_24BPP(res, x, y, pix); + GP_PutPixel_Raw_24BPP(dst, x, y, pix); idx++; @@ -323,7 +327,7 @@ void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, } if (callback != NULL && x % 100 == 0) - GP_ProgressCallbackReport(callback, 100.00 * x/res->w); + GP_ProgressCallbackReport(callback, 100.00 * x/dst->w); } GP_ProgressCallbackDone(callback); @@ -335,9 +339,9 @@ void GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *res, * * Can be used in-place. */ -void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, - GP_ProgressCallback *callback, - float kernel[], uint32_t kw, uint32_t kh) +void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kw, uint32_t kh, + GP_ProgressCallback *callback) { float kernel_sum = 0; GP_Coord x, y; @@ -351,7 +355,7 @@ void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, kernel_sum += kernel[i]; /* do linear convolution */ - for (y = 0; y < (GP_Coord)res->h; y++) { + for (y = 0; y < (GP_Coord)dst->h; y++) { GP_Pixel pix; uint32_t R[kw][kh], G[kw][kh], B[kw][kh]; @@ -380,7 +384,7 @@ void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, int idx = kw - 1; - for (x = 0; x < (GP_Coord)res->w; x++) { + for (x = 0; x < (GP_Coord)dst->w; x++) { float r = 0, g = 0, b = 0; for (j = 0; j < kh; j++) { @@ -440,7 +444,7 @@ void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, pix = GP_Pixel_CREATE_RGB888((uint32_t)r, (uint32_t)g, (uint32_t)b); - GP_PutPixel_Raw_24BPP(res, x, y, pix); + GP_PutPixel_Raw_24BPP(dst, x, y, pix); idx++; @@ -449,7 +453,7 @@ void GP_FilterLinearConvolution_Raw(const GP_Context *src, GP_Context *res, } if (callback != NULL && y % 100 == 0) - GP_ProgressCallbackReport(callback, 100.00 * y/res->h); + GP_ProgressCallbackReport(callback, 100.00 * y/dst->h); } GP_ProgressCallbackDone(callback); ----------------------------------------------------------------------- Summary of changes: demos/grinder/grinder.c | 2 +- include/core/GP_WritePixel.h | 2 +- include/filters/GP_Linear.h | 50 ++++++++++++++---------- libs/core/GP_WritePixel.c | 2 +- libs/filters/GP_Linear.c | 86 ++++++++++++++++++++++-------------------- libs/gfx/GP_HLine.c | 2 +- 6 files changed, 79 insertions(+), 65 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