Gfxprim January 2012

gfxprim@ucw.cz

2 participants
41 discussions

[repo.or.cz] gfxprim.git branch master updated: 89d86e0b6926dd8f6a5f650a89920e104ea52b00
by metan 30 Jan '12

30 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 89d86e0b6926dd8f6a5f650a89920e104ea52b00 (commit) via 995986f457f6cc5d2ea615622cb6d3a310f51e9d (commit) from 9b6212e7e083c6a78dca9cf322553c27baea66b2 (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/89d86e0b6926dd8f6a5f650a89920e104ea5… commit 89d86e0b6926dd8f6a5f650a89920e104ea52b00 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 30 20:35:31 2012 +0100 core: Fix the Blit to honor rotations, added Blit_Raw. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index f6187f8..5e3e06d 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -211,7 +211,7 @@ static void *image_loader(void *ptr) uint32_t cx = (context->w - ret->w)/2; uint32_t cy = (context->h - ret->h)/2; - GP_Blit(ret, 0, 0, ret->w, ret->h, context, cx, cy); + GP_Blit_Raw(ret, 0, 0, ret->w, ret->h, context, cx, cy); GP_ContextFree(ret); /* clean up the rest of the display */ diff --git a/include/core/GP_Blit.h b/include/core/GP_Blit.h index 3c9ec54..f772ce0 100644 --- a/include/core/GP_Blit.h +++ b/include/core/GP_Blit.h @@ -17,7 +17,7 @@ * Boston, MA 02110-1301 USA * * * * Copyright (C) 2011 Tomas Gavenciak <gavento(a)ucw.cz> * - * Copyright (C) 2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2011,2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ @@ -30,6 +30,12 @@ void GP_Blit(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, GP_Context *c2, GP_Coord x2, GP_Coord y2); +/* + * Doesn't respect rotations. Most of the time faster. + */ +void GP_Blit_Raw(const GP_Context *c1, GP_Coord x1, GP_Coord y1, + GP_Size w, GP_Size h, GP_Context *c2, GP_Coord x2, GP_Coord y2); + /* * Very naive blit, no optimalizations whatsoever - keep it that way. diff --git a/libs/core/GP_Blit.c b/libs/core/GP_Blit.c index 1aa1e7e..9bcb80e 100644 --- a/libs/core/GP_Blit.c +++ b/libs/core/GP_Blit.c @@ -51,8 +51,8 @@ void GP_Blit_Naive(const GP_Context *c1, int x1, int y1, int w, int h, } */ -void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, - GP_Context *c2, GP_Coord x2, GP_Coord y2) +void GP_Blit_Naive_Raw(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + GP_Context *c2, GP_Coord x2, GP_Coord y2) { GP_CHECK(x1 >= 0); GP_CHECK(y1 >= 0); @@ -73,3 +73,33 @@ void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP GP_PutPixel_Raw(c2, x2 + i, y2 + j, p); } } + +void GP_Blit_Raw(const GP_Context *c1, GP_Coord x1, GP_Coord y1, + GP_Size w, GP_Size h, GP_Context *c2, GP_Coord x2, GP_Coord y2) +{ + // Ultimate TODO: effective processing + GP_Blit_Naive_Raw(c1, x1, y1, w, h, c2, x2, y2); +} + +void GP_Blit_Naive(const GP_Context *c1, GP_Coord x1, GP_Coord y1, GP_Size w, GP_Size h, + GP_Context *c2, GP_Coord x2, GP_Coord y2) +{ + GP_CHECK(x1 >= 0); + GP_CHECK(y1 >= 0); + GP_CHECK(x1 + w <= GP_ContextW(c1)); + GP_CHECK(y1 + h <= GP_ContextH(c1)); + GP_CHECK(x2 >= 0); + GP_CHECK(y2 >= 0); + GP_CHECK(x2 + w <= GP_ContextW(c2)); + GP_CHECK(y2 + h <= GP_ContextH(c2)); + + GP_Size i, j; + + for (i = 0; i < w; i++) + for (j = 0; j < h; j++) { + GP_Pixel p = GP_GetPixel(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); + } +} http://repo.or.cz/w/gfxprim.git/commit/995986f457f6cc5d2ea615622cb6d3a310f5… commit 995986f457f6cc5d2ea615622cb6d3a310f51e9d Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 30 19:57:08 2012 +0100 core: Added GP_ContextInit(). diff --git a/include/core/GP_Context.h b/include/core/GP_Context.h index 664f15b..d91e54d 100644 --- a/include/core/GP_Context.h +++ b/include/core/GP_Context.h @@ -92,6 +92,12 @@ typedef struct GP_Context { GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type); /* + * Initalize context. + */ +void GP_ContextInit(GP_Context *context, GP_Size w, GP_Size h, + GP_PixelType type, void *pixels); + +/* * If passed the pixels are copied to newly created context, otherwise * the pixels are allocated but uninitalized. */ diff --git a/libs/core/GP_Context.c b/libs/core/GP_Context.c index 73e926e..157fc82 100644 --- a/libs/core/GP_Context.c +++ b/libs/core/GP_Context.c @@ -107,6 +107,31 @@ GP_Context *GP_ContextAlloc(GP_Size w, GP_Size h, GP_PixelType type) return context; } +void GP_ContextInit(GP_Context *context, GP_Size w, GP_Size h, + GP_PixelType type, void *pixels) +{ + uint32_t bpp = GP_PixelSize(type); + uint32_t bpr = (bpp * w) / 8 + !!((bpp * w) % 8); + + context->pixels = pixels; + context->bpp = bpp; + context->bytes_per_row = bpr; + context->offset = 0; + + context->w = w; + context->h = h; + + context->pixel_type = type; + context->bit_endian = 0; + + /* rotation and mirroring */ + context->axes_swap = 0; + context->y_swap = 0; + context->x_swap = 0; + + context->free_pixels = 0; +} + GP_Context *GP_ContextConvert(const GP_Context *src, GP_PixelType dst_pixel_type) { ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 2 +- include/core/GP_Blit.h | 8 +++++++- include/core/GP_Context.h | 6 ++++++ libs/core/GP_Blit.c | 34 ++++++++++++++++++++++++++++++++-- libs/core/GP_Context.c | 25 +++++++++++++++++++++++++ 5 files changed, 71 insertions(+), 4 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos(a)gmail.com if you want to unsubscribe, or site admin admin(a)repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")

1 0

[repo.or.cz] gfxprim.git branch master updated: 9b6212e7e083c6a78dca9cf322553c27baea66b2
by metan 23 Jan '12

23 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 9b6212e7e083c6a78dca9cf322553c27baea66b2 (commit) from d17743a7cfa2617c5f50d47f801f8722480553fc (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/9b6212e7e083c6a78dca9cf322553c27baea… commit 9b6212e7e083c6a78dca9cf322553c27baea66b2 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Mon Jan 23 22:10:20 2012 +0100 filters: Add fast Bilinear + low pass filter. diff --git a/demos/fbshow/fbshow.c b/demos/fbshow/fbshow.c index 4d9f6bc..f6187f8 100644 --- a/demos/fbshow/fbshow.c +++ b/demos/fbshow/fbshow.c @@ -166,17 +166,17 @@ static void *image_loader(void *ptr) GP_Context *ret; - if (rat < 1) { +/* if (rat < 1) { cpu_timer_start(&timer, "Blur"); callback.priv = "Blurring Image"; if (GP_FilterGaussianBlur(img, img, 0.5/rat, 0.5/rat, &callback) == NULL) return NULL; cpu_timer_stop(&timer); - } + } */ cpu_timer_start(&timer, "Resampling"); callback.priv = "Resampling Image"; - ret = GP_FilterResize(img, NULL, GP_INTERP_CUBIC_INT, img->w * rat, img->h * rat, &callback); + ret = GP_FilterResize(img, NULL, GP_INTERP_LINEAR_LF_INT, img->w * rat, img->h * rat, &callback); GP_ContextFree(img); cpu_timer_stop(&timer); diff --git a/include/filters/GP_Resize.h b/include/filters/GP_Resize.h index 53cca92..fe6afbf 100644 --- a/include/filters/GP_Resize.h +++ b/include/filters/GP_Resize.h @@ -36,6 +36,12 @@ Faster than Bicubic, but less precise. + Bilinear LF + ~~~~~~~~~~~ + + Bilinear with low-pass filter on downscaling, this is the best choice for + fast up and downscaling. + Bicubic ~~~~~~~ @@ -51,10 +57,11 @@ #include "GP_Filter.h" typedef enum GP_InterpolationType { - GP_INTERP_NN, /* Nearest Neighbour */ - GP_INTERP_LINEAR_INT, /* Bilinear - fixed point arithmetics */ - GP_INTERP_CUBIC, /* Bicubic */ - GP_INTERP_CUBIC_INT, /* Bicubic - fixed point arithmetics */ + GP_INTERP_NN, /* Nearest Neighbour */ + GP_INTERP_LINEAR_INT, /* Bilinear - fixed point arithmetics */ + GP_INTERP_LINEAR_LF_INT, /* Bilinear + low pass filter on downscaling */ + GP_INTERP_CUBIC, /* Bicubic */ + GP_INTERP_CUBIC_INT, /* Bicubic - fixed point arithmetics */ } GP_InterpolationType; /* diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index a812599..76d1621 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -391,6 +391,171 @@ int GP_FilterInterpolate_CubicInt(const GP_Context *src, GP_Context *dst, return 0; } +/* + * Sample row. + * + * The x and y are starting coordinates in source image. + * + * The xpix_dist is distance of two sampled pixels in source image coordinates. + * + * The xoff is offset of the first pixel. + * + * The r, g, b are used to store resulting values. + */ +static inline void linear_lp_sample_x(const GP_Context *src, + uint32_t x, uint32_t y, + uint32_t xpix_dist, uint32_t xoff, + uint32_t *r, uint32_t *g, uint32_t *b) +{ + GP_Pixel pix; + uint32_t i; + + pix = GP_GetPixel_Raw_24BPP(src, x, y); + + *r = (GP_Pixel_GET_R_RGB888(pix) * xoff) >> 9; + *g = (GP_Pixel_GET_G_RGB888(pix) * xoff) >> 9; + *b = (GP_Pixel_GET_B_RGB888(pix) * xoff) >> 9; + + for (i = (1<<14) - xoff; i > xpix_dist; i -= xpix_dist) { + if (x < src->w - 1) + x++; + + pix = GP_GetPixel_Raw_24BPP(src, x, y); + + *r += (GP_Pixel_GET_R_RGB888(pix) * xpix_dist) >> 9; + *g += (GP_Pixel_GET_G_RGB888(pix) * xpix_dist) >> 9; + *b += (GP_Pixel_GET_B_RGB888(pix) * xpix_dist) >> 9; + } + + if (i > 0) { + if (x < src->w - 1) + x++; + + pix = GP_GetPixel_Raw_24BPP(src, x, y); + + *r += (GP_Pixel_GET_R_RGB888(pix) * i) >> 9; + *g += (GP_Pixel_GET_G_RGB888(pix) * i) >> 9; + *b += (GP_Pixel_GET_B_RGB888(pix) * i) >> 9; + } +} + +/* + * Linear interpolation with low-pass filtering, used for fast downscaling + * on both x and y. + * + * Basically we do weighted arithmetic mean of the pixels: + * + * [x, y], [x + 1, y], [x + 2, y] ... [x + k, y] + * [x, y + 1] + * [x, y + 2] . + * . . . + * . . . + * . . + * [x, y + l] .... [x + k, y + l] + * + * + * The parameter k respectively l is determined by the distance between + * sampled coordinates on x respectively y. + * + * The pixels are weighted by how much they are 'hit' by the rectangle defined + * by the sampled pixel. + * + * The implementation is inspired by imlib2 downscaling algorithm. + */ +static int interpolate_linear_lp_xy(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + uint32_t xmap[dst->w + 1]; + uint32_t ymap[dst->h + 1]; + uint16_t xoff[dst->w + 1]; + uint16_t yoff[dst->h + 1]; + uint32_t x, y; + uint32_t i, j; + + /* Pre-compute mapping for interpolation */ + uint32_t xstep = (src->w << 16) / dst->w; + uint32_t xpix_dist = (dst->w << 14) / src->w; + + for (i = 0; i < dst->w + 1; i++) { + uint32_t val = i * xstep; + xmap[i] = val >> 16; + xoff[i] = ((255 - ((val >> 8) & 0xff)) * xpix_dist)>>8; + } + + uint32_t ystep = (src->h << 16) / dst->h; + uint32_t ypix_dist = (dst->h << 14) / src->h; + + for (i = 0; i < dst->h + 1; i++) { + uint32_t val = i * ystep; + ymap[i] = val >> 16; + yoff[i] = ((255 - ((val >> 8) & 0xff)) * ypix_dist)>>8; + } + + /* Interpolate */ + for (y = 0; y < dst->h; y++) { + for (x = 0; x < dst->w; x++) { + uint32_t r, g, b; + uint32_t r1, g1, b1; + uint32_t x0, y0; + + x0 = xmap[x]; + y0 = ymap[y]; + + linear_lp_sample_x(src, x0, y0, + xpix_dist, xoff[x], + &r, &g, &b); + + r = (r * yoff[y]) >> 14; + g = (g * yoff[y]) >> 14; + b = (b * yoff[y]) >> 14; + + for (j = (1<<14) - yoff[y]; j > ypix_dist; j -= ypix_dist) { + + x0 = xmap[x]; + + if (y0 < src->h - 1) + y0++; + + linear_lp_sample_x(src, x0, y0, + xpix_dist, xoff[x], + &r1, &g1, &b1); + + r += (r1 * ypix_dist) >> 14; + g += (g1 * ypix_dist) >> 14; + b += (b1 * ypix_dist) >> 14; + } + + if (j > 0) { + x0 = xmap[x]; + + if (y0 < src->h - 1) + y0++; + + linear_lp_sample_x(src, x0, y0, + xpix_dist, xoff[x], + &r1, &g1, &b1); + + r += (r1 * j) >> 14; + g += (g1 * j) >> 14; + b += (b1 * j) >> 14; + } + + r = (r + (1<<4))>>5; + g = (g + (1<<4))>>5; + b = (b + (1<<4))>>5; + + GP_PutPixel_Raw_24BPP(dst, x, y, + GP_Pixel_CREATE_RGB888(r, g, b)); + } + + if (GP_ProgressCallbackReport(callback, y, dst->h, dst->w)) + return 1; + } + + GP_ProgressCallbackDone(callback); + return 0; +} + int GP_FilterInterpolate_LinearInt(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { @@ -398,7 +563,7 @@ int GP_FilterInterpolate_LinearInt(const GP_Context *src, GP_Context *dst, uint32_t ymap[dst->h + 1]; uint8_t xoff[dst->w + 1]; uint8_t yoff[dst->h + 1]; - uint32_t i, j; + uint32_t x, y, i; GP_DEBUG(1, "Scaling image %ux%u -> %ux%u %2.2f %2.2f", src->w, src->h, dst->w, dst->h, @@ -422,20 +587,20 @@ int GP_FilterInterpolate_LinearInt(const GP_Context *src, GP_Context *dst, } /* Interpolate */ - for (i = 0; i < dst->h; i++) { - for (j = 0; j < dst->w; j++) { + for (y = 0; y < dst->h; y++) { + for (x = 0; x < dst->w; x++) { GP_Pixel pix00, pix01, pix10, pix11; uint32_t r0, r1, g0, g1, b0, b1; GP_Coord x0, x1, y0, y1; - x0 = xmap[j]; - x1 = xmap[j] + 1; + x0 = xmap[x]; + x1 = xmap[x] + 1; if (x1 >= (GP_Coord)src->w) x1 = src->w - 1; - y0 = ymap[i]; - y1 = ymap[i] + 1; + y0 = ymap[y]; + y1 = ymap[y] + 1; if (y1 >= (GP_Coord)src->h) y1 = src->h - 1; @@ -445,31 +610,31 @@ int GP_FilterInterpolate_LinearInt(const GP_Context *src, GP_Context *dst, pix01 = GP_GetPixel_Raw_24BPP(src, x0, y1); pix11 = GP_GetPixel_Raw_24BPP(src, x1, y1); - r0 = GP_Pixel_GET_R_RGB888(pix00) * (255 - xoff[j]); - g0 = GP_Pixel_GET_G_RGB888(pix00) * (255 - xoff[j]); - b0 = GP_Pixel_GET_B_RGB888(pix00) * (255 - xoff[j]); + r0 = GP_Pixel_GET_R_RGB888(pix00) * (255 - xoff[x]); + g0 = GP_Pixel_GET_G_RGB888(pix00) * (255 - xoff[x]); + b0 = GP_Pixel_GET_B_RGB888(pix00) * (255 - xoff[x]); - r0 += GP_Pixel_GET_R_RGB888(pix10) * xoff[j]; - g0 += GP_Pixel_GET_G_RGB888(pix10) * xoff[j]; - b0 += GP_Pixel_GET_B_RGB888(pix10) * xoff[j]; + r0 += GP_Pixel_GET_R_RGB888(pix10) * xoff[x]; + g0 += GP_Pixel_GET_G_RGB888(pix10) * xoff[x]; + b0 += GP_Pixel_GET_B_RGB888(pix10) * xoff[x]; - r1 = GP_Pixel_GET_R_RGB888(pix01) * (255 - xoff[j]); - g1 = GP_Pixel_GET_G_RGB888(pix01) * (255 - xoff[j]); - b1 = GP_Pixel_GET_B_RGB888(pix01) * (255 - xoff[j]); + r1 = GP_Pixel_GET_R_RGB888(pix01) * (255 - xoff[x]); + g1 = GP_Pixel_GET_G_RGB888(pix01) * (255 - xoff[x]); + b1 = GP_Pixel_GET_B_RGB888(pix01) * (255 - xoff[x]); - r1 += GP_Pixel_GET_R_RGB888(pix11) * xoff[j]; - g1 += GP_Pixel_GET_G_RGB888(pix11) * xoff[j]; - b1 += GP_Pixel_GET_B_RGB888(pix11) * xoff[j]; + r1 += GP_Pixel_GET_R_RGB888(pix11) * xoff[x]; + g1 += GP_Pixel_GET_G_RGB888(pix11) * xoff[x]; + b1 += GP_Pixel_GET_B_RGB888(pix11) * xoff[x]; - r0 = (r1 * yoff[i] + r0 * (255 - yoff[i])) >> 16; - g0 = (g1 * yoff[i] + g0 * (255 - yoff[i])) >> 16; - b0 = (b1 * yoff[i] + b0 * (255 - yoff[i])) >> 16; + r0 = (r1 * yoff[y] + r0 * (255 - yoff[y]) + (1<<15)) >> 16; + g0 = (g1 * yoff[y] + g0 * (255 - yoff[y]) + (1<<15)) >> 16; + b0 = (b1 * yoff[y] + b0 * (255 - yoff[y]) + (1<<15)) >> 16; - GP_PutPixel_Raw_24BPP(dst, j, i, + GP_PutPixel_Raw_24BPP(dst, x, y, GP_Pixel_CREATE_RGB888(r0, g0, b0)); } - if (GP_ProgressCallbackReport(callback, i, dst->h, dst->w)) + if (GP_ProgressCallbackReport(callback, y, dst->h, dst->w)) return 1; } @@ -477,6 +642,24 @@ int GP_FilterInterpolate_LinearInt(const GP_Context *src, GP_Context *dst, return 0; } +int GP_FilterInterpolate_LinearLFInt(const GP_Context *src, GP_Context *dst, + GP_ProgressCallback *callback) +{ + float x_rat = 1.00 * dst->w / src->w; + float y_rat = 1.00 * dst->h / src->h; + + if (x_rat < 1.00 && y_rat < 1.00) { + GP_DEBUG(1, "Downscaling image %ux%u -> %ux%u %2.2f %2.2f", + src->w, src->h, dst->w, dst->h, x_rat, y_rat); + return interpolate_linear_lp_xy(src, dst, callback); + } + + //TODO: x_rat > 1.00 && y_rat < 1.00 + //TODO: x_rat < 1.00 && y_rat > 1.00 + + return GP_FilterInterpolate_LinearInt(src, dst, callback); +} + int GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, GP_InterpolationType type, GP_ProgressCallback *callback) @@ -486,6 +669,8 @@ int GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, return GP_FilterInterpolate_NN(src, dst, callback); case GP_INTERP_LINEAR_INT: return GP_FilterInterpolate_LinearInt(src, dst, callback); + case GP_INTERP_LINEAR_LF_INT: + return GP_FilterInterpolate_LinearLFInt(src, dst, callback); case GP_INTERP_CUBIC: return GP_FilterInterpolate_Cubic(src, dst, callback); case GP_INTERP_CUBIC_INT: ----------------------------------------------------------------------- Summary of changes: demos/fbshow/fbshow.c | 6 +- include/filters/GP_Resize.h | 15 ++- libs/filters/GP_Resize.c | 233 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 223 insertions(+), 31 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: d17743a7cfa2617c5f50d47f801f8722480553fc
by metan 23 Jan '12

23 Jan '12

1 0

[repo.or.cz] gfxprim.git branch master updated: 66cbe1a3b25ba7d4c3361d420fa9de364c02557e
by bluebear 22 Jan '12

22 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 66cbe1a3b25ba7d4c3361d420fa9de364c02557e (commit) from 446922190513e6535202e8f45ab897bc622390ee (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/66cbe1a3b25ba7d4c3361d420fa9de364c02… commit 66cbe1a3b25ba7d4c3361d420fa9de364c02557e Author: Jiri BlueBear Dluhos <jiri.bluebear.dluhos(a)gmail.com> Date: Sun Jan 22 19:46:51 2012 +0100 First implementation of partial ellipse (plus some angle-related utils). diff --git a/include/core/GP_AngleUtils.h b/include/core/GP_AngleUtils.h new file mode 100644 index 0000000..f896b37 --- /dev/null +++ b/include/core/GP_AngleUtils.h @@ -0,0 +1,30 @@ +/***************************************************************************** + * 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> * + * Copyright (c) 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * + * * + *****************************************************************************/ + +#ifndef GP_ANGLE_UTILS_H +#define GP_ANGLE_UTILS_H + +double GP_NormalizeAngle(double phi); +int GP_AngleInRange(double angle, double start, double end); + +#endif No newline at end of file diff --git a/libs/core/GP_AngleUtils.c b/libs/core/GP_AngleUtils.c new file mode 100644 index 0000000..f1c279b --- /dev/null +++ b/libs/core/GP_AngleUtils.c @@ -0,0 +1,49 @@ +/***************************************************************************** + * 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> * + * Copyright (C) 2012 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2012 Jiri Dluhos <jiri.bluebear.dluhos(a)gmail.com> * + * * + *****************************************************************************/ + +#include "GP_AngleUtils.h" + +#include <math.h> + +double GP_NormalizeAngle(double phi) +{ + // clamp angle to <-2*pi, 2*pi> + double phi2 = fmod(phi, 2*M_PI); + + // clamp angle to <0, 2*pi> + if (phi2 < 0) + phi2 += 2*M_PI; + + return phi2; +} + +int GP_AngleInRange(double angle, double start, double end) +{ + if (start < end) { + return (angle >= start && angle <= end); + } else { + return (angle >= start && angle <= 2*M_PI) + || (angle >= 0 && angle <= end); + } +} No newline at end of file diff --git a/libs/gfx/GP_PartialEllipse.c b/libs/gfx/GP_PartialEllipse.c new file mode 100644 index 0000000..5415a58 --- /dev/null +++ b/libs/gfx/GP_PartialEllipse.c @@ -0,0 +1,53 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2012 Jiri "BlueBear" Dluhos * + * <jiri.bluebear.dluhos(a)gmail.com> * + * * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "GP_Gfx.h" +#include "core/GP_FnPerBpp.h" + +#include "algo/PartialEllipse.algo.h" + +/* Generate drawing functions for various bit depths. */ +GP_DEF_DRAW_FN_PER_BPP(GP_PartialEllipse_Raw, DEF_PARTIAL_ELLIPSE_FN) + +void GP_PartialEllipse_Raw(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size a, GP_Size b, int start, int end, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + GP_FN_PER_BPP_CONTEXT(GP_PartialEllipse_Raw, context, context, + xcenter, ycenter, a, b, start, end, pixel); +} + +void GP_PartialEllipse(GP_Context *context, GP_Coord xcenter, GP_Coord ycenter, + GP_Size a, GP_Size b, int start, int end, GP_Pixel pixel) +{ + GP_CHECK_CONTEXT(context); + + /* recalculate center point and swap a and b when axes are swapped */ + GP_TRANSFORM_POINT(context, xcenter, ycenter); + GP_TRANSFORM_SWAP(context, a, b); + + GP_PartialEllipse_Raw(context, xcenter, ycenter, a, b, start, end, pixel); +} No newline at end of file diff --git a/libs/gfx/algo/PartialEllipse.algo.h b/libs/gfx/algo/PartialEllipse.algo.h new file mode 100644 index 0000000..b87826e --- /dev/null +++ b/libs/gfx/algo/PartialEllipse.algo.h @@ -0,0 +1,68 @@ +/***************************************************************************** + * This file is part of gfxprim library. * + * * + * Gfxprim is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * Gfxprim is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with gfxprim; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin Street, Fifth Floor, * + * Boston, MA 02110-1301 USA * + * * + * Copyright (C) 2009-2010 Jiri "BlueBear" Dluhos * + * <jiri.bluebear.dluhos(a)gmail.com> * + * * + * Copyright (C) 2009-2010 Cyril Hrubis <metan(a)ucw.cz> * + * * + *****************************************************************************/ + +#include "core/GP_AngleUtils.h" + +#include <math.h> + +/* + * This macro defines a partial ellipse drawing function. + * Arguments: + * CONTEXT_T - user-defined type of drawing context (passed to PUTPIXEL) + * PIXVAL_T - user-defined pixel value type (passed to PUTPIXEL) + * PUTPIXEL - a pixel drawing function f(context, x, y, pixval) + * FN_NAME - name of the function to be defined + */ +#define DEF_PARTIAL_ELLIPSE_FN(FN_NAME, CONTEXT_T, PIXVAL_T, PUTPIXEL) +void FN_NAME(CONTEXT_T context, int xcenter, int ycenter, int a, int b, + int start, int end, PIXVAL_T pixval) +{ + double startAngle = GP_NormalizeAngle(2*M_PI*(start / 360000.0)); + double endAngle = GP_NormalizeAngle(2*M_PI*(end / 360000.0)); ++ int x; + for (x = -a; x <= a; x++) { + double angle = acos(((double) x) / a); + double y = floor(b*sin(angle)); + if (GP_AngleInRange(angle, startAngle, endAngle)) { + PUTPIXEL(context, xcenter+x, ycenter-y, pixval); + } + if (GP_AngleInRange(2*M_PI - angle, startAngle, endAngle)) { + PUTPIXEL(context, xcenter+x, ycenter+y, pixval); + } + } ++ int y; + for (y = -b; y <= b; y++) { + double angle = asin(((double) y) / b); + double x = floor(a*cos(angle)); + if (GP_AngleInRange(angle, startAngle, endAngle)) { + PUTPIXEL(context, xcenter+x, ycenter-y, pixval); + } + if (GP_AngleInRange(M_PI - angle, startAngle, endAngle)) { + PUTPIXEL(context, x center-x, ycenter-y, pixval); + } + } +} No newline at end of file ----------------------------------------------------------------------- Summary of changes: .../GP_DefaultFont.h => core/GP_AngleUtils.h} | 14 ++-- libs/core/{GP_GetPutPixel.c => GP_AngleUtils.c} | 38 ++++++----- libs/gfx/{GP_Arc.c => GP_PartialEllipse.c} | 34 ++++------ .../algo/{Line.algo.h => PartialEllipse.algo.h} | 72 ++++++++------------ 4 files changed, 69 insertions(+), 89 deletions(-) copy include/{text/GP_DefaultFont.h => core/GP_AngleUtils.h} (87%) copy libs/core/{GP_GetPutPixel.c => GP_AngleUtils.c} (74%) copy libs/gfx/{GP_Arc.c => GP_PartialEllipse.c} (73%) copy libs/gfx/algo/{Line.algo.h => PartialEllipse.algo.h} (66%) 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: 446922190513e6535202e8f45ab897bc622390ee
by metan 22 Jan '12

22 Jan '12

1 0

[repo.or.cz] gfxprim.git branch master updated: 09241d96413a6376d399b4e81219fdf2d9fb1462
by metan 22 Jan '12

22 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 09241d96413a6376d399b4e81219fdf2d9fb1462 (commit) from 1d97b3f64cb80fea14245d253f6c7db64b8495b2 (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/09241d96413a6376d399b4e81219fdf2d9fb… commit 09241d96413a6376d399b4e81219fdf2d9fb1462 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sun Jan 22 18:09:25 2012 +0100 filters: BiCubic now the coordinate mapping is right. diff --git a/libs/filters/GP_Linear.c b/libs/filters/GP_Linear.c index 7101472..447e805 100644 --- a/libs/filters/GP_Linear.c +++ b/libs/filters/GP_Linear.c @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ diff --git a/libs/filters/GP_Resize.c b/libs/filters/GP_Resize.c index 7b26eaa..a29ec0d 100644 --- a/libs/filters/GP_Resize.c +++ b/libs/filters/GP_Resize.c @@ -16,10 +16,12 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * * Boston, MA 02110-1301 USA * * * - * Copyright (C) 2009-2011 Cyril Hrubis <metan(a)ucw.cz> * + * Copyright (C) 2009-2012 Cyril Hrubis <metan(a)ucw.cz> * * * *****************************************************************************/ +#include <math.h> + #include <GP_Context.h> #include <GP_GetPutPixel.h> @@ -92,6 +94,13 @@ typedef union v4f { #define SUM_V4SF(a) ((a).f[0] + (a).f[1] + (a).f[2] + (a).f[3]) +#define CLAMP(val) do { + if (val < 0) + val = 0; + if (val > 255) + val = 255; +} while (0) + int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, GP_ProgressCallback *callback) { @@ -105,28 +114,36 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, for (i = 0; i < dst->w; i++) { float x = (1.00 * i / dst->w) * src->w; v4f cvx; - int xi = x - 1; + int xi[4]; + + xi[0] = floor(x - 1); + xi[1] = x; + xi[2] = x + 1; + xi[3] = x + 2; + + cvx.f[0] = cubic(xi[0] - x); + cvx.f[1] = cubic(xi[1] - x); + cvx.f[2] = cubic(xi[2] - x); + cvx.f[3] = cubic(xi[3] - x); - if (xi < 0) - xi = 0; + if (xi[0] < 0) + xi[0] = 0; - if (xi > (int)src->w - 4) - xi = src->w - 4; + if (xi[2] >= (int)src->w) + xi[2] = src->w - 1; - cvx.f[0] = cubic(xi - x); - cvx.f[1] = cubic(xi + 1 - x); - cvx.f[2] = cubic(xi + 2 - x); - cvx.f[3] = cubic(xi + 3 - x); + if (xi[3] >= (int)src->w) + xi[3] = src->w - 1; /* Generate interpolated column */ for (j = 0; j < src->h; j++) { v4f rv, gv, bv; 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); + pix[0] = GP_GetPixel_Raw_24BPP(src, xi[0], 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.f[0] = GP_Pixel_GET_R_RGB888(pix[0]); rv.f[1] = GP_Pixel_GET_R_RGB888(pix[1]); @@ -157,33 +174,41 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, float y = (1.00 * j / dst->h) * src->h; v4f cvy, rv, gv, bv; float r, g, b; - int yi = y - 1; - - if (yi < 0) - yi = 0; - - if (yi > (int)src->h - 4) - yi = src->h - 4; + int yi[4]; + + yi[0] = floor(y - 1); + yi[1] = y; + yi[2] = y + 1; + yi[3] = y + 2; + + cvy.f[0] = cubic(yi[0] - y); + cvy.f[1] = cubic(yi[1] - y); + cvy.f[2] = cubic(yi[2] - y); + cvy.f[3] = cubic(yi[3] - y); + + if (yi[0] < 0) + yi[0] = 0; + + if (yi[2] >= (int)src->h) + yi[2] = src->h - 1; + + if (yi[3] >= (int)src->h) + yi[3] = src->h - 1; - cvy.f[0] = cubic(yi - y); - cvy.f[1] = cubic(yi + 1 - y); - cvy.f[2] = cubic(yi + 2 - y); - cvy.f[3] = cubic(yi + 3 - y); - - rv.f[0] = col_r[yi]; - rv.f[1] = col_r[yi + 1]; - rv.f[2] = col_r[yi + 2]; - rv.f[3] = col_r[yi + 3]; + rv.f[0] = col_r[yi[0]]; + rv.f[1] = col_r[yi[1]]; + rv.f[2] = col_r[yi[2]]; + rv.f[3] = col_r[yi[3]]; - gv.f[0] = col_g[yi]; - gv.f[1] = col_g[yi + 1]; - gv.f[2] = col_g[yi + 2]; - gv.f[3] = col_g[yi + 3]; + gv.f[0] = col_g[yi[0]]; + gv.f[1] = col_g[yi[1]]; + gv.f[2] = col_g[yi[2]]; + gv.f[3] = col_g[yi[3]]; - bv.f[0] = col_b[yi]; - bv.f[1] = col_b[yi + 1]; - bv.f[2] = col_b[yi + 2]; - bv.f[3] = col_b[yi + 3]; + bv.f[0] = col_b[yi[0]]; + bv.f[1] = col_b[yi[1]]; + bv.f[2] = col_b[yi[2]]; + bv.f[3] = col_b[yi[3]]; rv = MUL_V4SF(rv, cvy); gv = MUL_V4SF(gv, cvy); @@ -193,24 +218,10 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, g = SUM_V4SF(gv); b = SUM_V4SF(bv); - 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; - + CLAMP(r); + CLAMP(g); + CLAMP(b); + GP_Pixel pix = GP_Pixel_CREATE_RGB888((uint8_t)r, (uint8_t)g, (uint8_t)b); GP_PutPixel_Raw_24BPP(dst, i, j, pix); } @@ -238,137 +249,6 @@ int GP_FilterInterpolate_Cubic(const GP_Context *src, GP_Context *dst, 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(xi - x) * MUL + 0.5; - cvx[1] = cubic(xi + 1 - x) * MUL + 0.5; - cvx[2] = cubic(xi + 2 - x) * MUL + 0.5; - cvx[3] = cubic(xi + 3 - x) * 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(yi - y) * MUL + 0.5; - cvy[1] = cubic(yi + 1 - y) * MUL + 0.5; - cvy[2] = cubic(yi + 2 - y) * MUL + 0.5; - cvy[3] = cubic(yi + 3 - y) * 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_FilterInterpolate_CubicInt2(const GP_Context *src, GP_Context *dst, - GP_ProgressCallback *callback) -{ int32_t col_r[src->w], col_g[src->w], col_b[src->w]; uint32_t i, j; @@ -379,28 +259,36 @@ int GP_FilterInterpolate_CubicInt2(const GP_Context *src, GP_Context *dst, for (i = 0; i < dst->h; i++) { float y = (1.00 * i / dst->h) * src->h; int32_t cvy[4]; - int yi = y - 1; + int yi[4]; - if (yi < 0) - yi = 0; - - if (yi > (int)src->h - 4) - yi = src->h - 4; + yi[0] = floor(y - 1); + yi[1] = y; + yi[2] = y + 1; + yi[3] = y + 2; - cvy[0] = cubic(yi - y) * MUL + 0.5; - cvy[1] = cubic(yi + 1 - y) * MUL + 0.5; - cvy[2] = cubic(yi + 2 - y) * MUL + 0.5; - cvy[3] = cubic(yi + 3 - y) * MUL + 0.5; + cvy[0] = cubic(yi[0] - y) * MUL + 0.5; + cvy[1] = cubic(yi[1] - y) * MUL + 0.5; + cvy[2] = cubic(yi[2] - y) * MUL + 0.5; + cvy[3] = cubic(yi[3] - y) * MUL + 0.5; + if (yi[0] < 0) + yi[0] = 0; + + if (yi[2] >= (int)src->h) + yi[2] = src->h - 1; + + if (yi[3] >= (int)src->h) + yi[3] = src->h - 1; + /* Generate interpolated row */ for (j = 0; j < src->w; j++) { int32_t rv[4], gv[4], bv[4]; GP_Pixel pix[4]; - pix[0] = GP_GetPixel_Raw_24BPP(src, j, yi); - pix[1] = GP_GetPixel_Raw_24BPP(src, j, yi + 1); - pix[2] = GP_GetPixel_Raw_24BPP(src, j, yi + 2); - pix[3] = GP_GetPixel_Raw_24BPP(src, j, yi + 3); + pix[0] = GP_GetPixel_Raw_24BPP(src, j, yi[0]); + pix[1] = GP_GetPixel_Raw_24BPP(src, j, yi[1]); + pix[2] = GP_GetPixel_Raw_24BPP(src, j, yi[2]); + pix[3] = GP_GetPixel_Raw_24BPP(src, j, yi[3]); rv[0] = GP_Pixel_GET_R_RGB888(pix[0]); rv[1] = GP_Pixel_GET_R_RGB888(pix[1]); @@ -416,7 +304,7 @@ int GP_FilterInterpolate_CubicInt2(const GP_Context *src, GP_Context *dst, 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, cvy); MUL_I(gv, cvy); MUL_I(bv, cvy); @@ -431,33 +319,41 @@ int GP_FilterInterpolate_CubicInt2(const GP_Context *src, GP_Context *dst, float x = (1.00 * j / dst->w) * src->w; int32_t cvx[4], rv[4], gv[4], bv[4]; int32_t r, g, b; - int xi = x - 1; + int xi[4]; + + xi[0] = floor(x - 1); + xi[1] = x; + xi[2] = x + 1; + xi[3] = x + 2; - if (xi < 0) - xi = 0; - - if (xi > (int)src->w - 4) - xi = src->w - 4; + cvx[0] = cubic(xi[0] - x) * MUL + 0.5; + cvx[1] = cubic(xi[1] - x) * MUL + 0.5; + cvx[2] = cubic(xi[2] - x) * MUL + 0.5; + cvx[3] = cubic(xi[3] - x) * MUL + 0.5; - cvx[0] = cubic(xi - x) * MUL + 0.5; - cvx[1] = cubic(xi + 1 - x) * MUL + 0.5; - cvx[2] = cubic(xi + 2 - x) * MUL + 0.5; - cvx[3] = cubic(xi + 3 - x) * MUL + 0.5; + if (xi[0] < 0) + xi[0] = 0; + + if (xi[2] >= (int)src->w) + xi[2] = src->w - 1; - rv[0] = col_r[xi]; - rv[1] = col_r[xi + 1]; - rv[2] = col_r[xi + 2]; - rv[3] = col_r[xi + 3]; + if (xi[3] >= (int)src->w) + xi[3] = src->w - 1; + + rv[0] = col_r[xi[0]]; + rv[1] = col_r[xi[1]]; + rv[2] = col_r[xi[2]]; + rv[3] = col_r[xi[3]]; - gv[0] = col_g[xi]; - gv[1] = col_g[xi + 1]; - gv[2] = col_g[xi + 2]; - gv[3] = col_g[xi + 3]; + gv[0] = col_g[xi[0]]; + gv[1] = col_g[xi[1]]; + gv[2] = col_g[xi[2]]; + gv[3] = col_g[xi[3]]; - bv[0] = col_b[xi]; - bv[1] = col_b[xi + 1]; - bv[2] = col_b[xi + 2]; - bv[3] = col_b[xi + 3]; + bv[0] = col_b[xi[0]]; + bv[1] = col_b[xi[1]]; + bv[2] = col_b[xi[2]]; + bv[3] = col_b[xi[3]]; MUL_I(rv, cvx); MUL_I(gv, cvx); @@ -467,23 +363,9 @@ int GP_FilterInterpolate_CubicInt2(const GP_Context *src, GP_Context *dst, 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; + CLAMP(r); + CLAMP(g); + CLAMP(b); GP_Pixel pix = GP_Pixel_CREATE_RGB888((uint8_t)r, (uint8_t)g, (uint8_t)b); GP_PutPixel_Raw_24BPP(dst, j, i, pix); @@ -507,7 +389,7 @@ int GP_FilterResize_Raw(const GP_Context *src, GP_Context *dst, case GP_INTERP_CUBIC: return GP_FilterInterpolate_Cubic(src, dst, callback); case GP_INTERP_CUBIC_INT: - return GP_FilterInterpolate_CubicInt2(src, dst, callback); + return GP_FilterInterpolate_CubicInt(src, dst, callback); } return 1; ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_Linear.c | 2 +- libs/filters/GP_Resize.c | 366 ++++++++++++++++------------------------------ 2 files changed, 125 insertions(+), 243 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: 1d97b3f64cb80fea14245d253f6c7db64b8495b2
by metan 22 Jan '12

22 Jan '12

1 0

[repo.or.cz] gfxprim.git branch master updated: f6d646faac5ebf7a3f0831af73a79709fae9d36a
by metan 22 Jan '12

22 Jan '12

1 0

[repo.or.cz] gfxprim.git branch master updated: 47b078113632ec8cf3e760af0dce2e0bf0c01c92
by metan 21 Jan '12

21 Jan '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project gfxprim.git. The branch, master has been updated via 47b078113632ec8cf3e760af0dce2e0bf0c01c92 (commit) via 7850ea0241dc2bef8cd4d45d3c22697206788cc9 (commit) from d093866437ca8adc100d6bc2a40011a26c26e813 (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/47b078113632ec8cf3e760af0dce2e0bf0c0… commit 47b078113632ec8cf3e760af0dce2e0bf0c01c92 Merge: 7850ea0 d093866 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 21 23:17:46 2012 +0100 Merge ssh://repo.or.cz/srv/git/gfxprim http://repo.or.cz/w/gfxprim.git/commit/7850ea0241dc2bef8cd4d45d3c2269720678… commit 7850ea0241dc2bef8cd4d45d3c22697206788cc9 Author: Cyril Hrubis <metan(a)ucw.cz> Date: Sat Jan 21 23:17:03 2012 +0100 filters: Some more fixes for blur. diff --git a/libs/filters/GP_Linear.c b/libs/filters/GP_Linear.c index 06145f6..7101472 100644 --- a/libs/filters/GP_Linear.c +++ b/libs/filters/GP_Linear.c @@ -90,7 +90,7 @@ int GP_FilterGaussianBlur_Raw(const GP_Context *src, GP_Context *dst, float kernel_x[size_x]; gaussian_kernel_init(sigma_x, kernel_x); - if (GP_FilterHLinearConvolutionInt_Raw(src, dst, kernel_x, size_x, + if (GP_FilterHLinearConvolution_Raw(src, dst, kernel_x, size_x, new_callback)) return 1; } @@ -103,7 +103,7 @@ int GP_FilterGaussianBlur_Raw(const GP_Context *src, GP_Context *dst, float kernel_y[size_y]; gaussian_kernel_init(sigma_y, kernel_y); - if (GP_FilterVLinearConvolutionInt_Raw(dst, dst, kernel_y, size_y, + if (GP_FilterVLinearConvolution_Raw(dst, dst, kernel_y, size_y, new_callback)) return 1; } @@ -137,213 +137,6 @@ GP_Context *GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, return dst; } -int 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; - uint32_t i; - GP_Pixel pix; - - GP_DEBUG(1, "Horizontal linear convolution kernel width %i image %ux%u", - kw, src->w, src->h); - - /* count kernel sum for normalization */ - for (i = 0; i < kw; i++) - kernel_sum += kernel[i]; - - /* do linear convolution */ - for (y = 0; y < (GP_Coord)dst->h; y++) { - uint32_t R[kw], G[kw], B[kw]; - - /* prefill the buffer on the start */ - for (i = 0; i < kw - 1; i++) { - int cx = i - kw/2; - - if (cx < 0) - cx = 0; - - pix = GP_GetPixel_Raw_24BPP(src, cx, y); - - R[i] = GP_Pixel_GET_R_RGB888(pix); - G[i] = GP_Pixel_GET_G_RGB888(pix); - B[i] = GP_Pixel_GET_B_RGB888(pix); - } - - int idx = kw - 1; - - for (x = 0; x < (GP_Coord)dst->w; x++) { - float r = 0, g = 0, b = 0; - - int cx = x + kw/2; - - if (cx >= (int)src->w) - cx = src->w - 1; - - pix = GP_GetPixel_Raw_24BPP(src, cx, y); - - R[idx] = GP_Pixel_GET_R_RGB888(pix); - G[idx] = GP_Pixel_GET_G_RGB888(pix); - B[idx] = GP_Pixel_GET_B_RGB888(pix); - - /* count the pixel value from neighbours weighted by kernel */ - for (i = 0; i < kw; i++) { - int k; - - if ((int)i < idx + 1) - k = kw - idx - 1 + i; - else - k = i - idx - 1; - - r += R[i] * kernel[k]; - g += G[i] * kernel[k]; - b += B[i] * kernel[k]; - } - - /* normalize the result */ - r /= kernel_sum; - g /= kernel_sum; - b /= kernel_sum; - - /* and clamp just to be extra sure */ - 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; - - pix = GP_Pixel_CREATE_RGB888((uint32_t)r, (uint32_t)g, (uint32_t)b); - - GP_PutPixel_Raw_24BPP(dst, x, y, pix); - - idx++; - - if (idx >= (int)kw) - idx = 0; - } - - if (GP_ProgressCallbackReport(callback, y, dst->h, dst->w)) - return 1; - } - - GP_ProgressCallbackDone(callback); - return 0; -} - -/* - * Special case for vertical only kernel (10-30% faster). - * - * Can be used in-place. - */ -int 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; - uint32_t i; - - GP_DEBUG(1, "Vertical linear convolution kernel width %i image %ux%u", - kh, src->w, src->h); - - /* count kernel sum for normalization */ - for (i = 0; i < kh; i++) - kernel_sum += kernel[i]; - - /* do linear convolution */ - for (x = 0; x < (GP_Coord)dst->w; x++) { - GP_Pixel pix; - uint32_t R[kh], G[kh], B[kh]; - - /* prefill the buffer on the start */ - for (i = 0; i < kh - 1; i++) { - int cy = i - kh/2; - - if (cy < 0) - cy = 0; - - pix = GP_GetPixel_Raw_24BPP(src, x, cy); - - R[i] = GP_Pixel_GET_R_RGB888(pix); - G[i] = GP_Pixel_GET_G_RGB888(pix); - B[i] = GP_Pixel_GET_B_RGB888(pix); - } - - int idx = kh - 1; - - for (y = 0; y < (GP_Coord)dst->h; y++) { - float r = 0, g = 0, b = 0; - - int cy = y + kh/2; - - if (cy >= (int)src->h) - cy = src->h - 1; - - pix = GP_GetPixel_Raw_24BPP(src, x, cy); - - R[idx] = GP_Pixel_GET_R_RGB888(pix); - G[idx] = GP_Pixel_GET_G_RGB888(pix); - B[idx] = GP_Pixel_GET_B_RGB888(pix); - - /* count the pixel value from neighbours weighted by kernel */ - for (i = 0; i < kh; i++) { - int k; - - if ((int)i < idx + 1) - k = kh - idx - 1 + i; - else - k = i - idx - 1; - - r += R[i] * kernel[k]; - g += G[i] * kernel[k]; - b += B[i] * kernel[k]; - } - - /* normalize the result */ - r /= kernel_sum; - g /= kernel_sum; - b /= kernel_sum; - - /* and clamp just to be extra sure */ - 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; - - pix = GP_Pixel_CREATE_RGB888((uint32_t)r, (uint32_t)g, (uint32_t)b); - - GP_PutPixel_Raw_24BPP(dst, x, y, pix); - - idx++; - - if (idx >= (int)kh) - idx = 0; - } - - if (GP_ProgressCallbackReport(callback, x, dst->w, dst->h)) - return 1; - } - - GP_ProgressCallbackDone(callback); - return 0; -} - #define MUL 1024 #define CLAMP(val) do { @@ -353,9 +146,9 @@ int GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, val = 0; } while (0) -int GP_FilterHLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, - float kernel[], uint32_t kw, - GP_ProgressCallback *callback) +int GP_FilterHLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kw, + GP_ProgressCallback *callback) { int32_t kernel_sum = 0; GP_Coord x, y; @@ -378,25 +171,30 @@ int GP_FilterHLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, uint8_t R[size], G[size], B[size]; /* Fetch the whole row */ - for (i = 0; i < size; i++) { - GP_Pixel pix; - int cx = i - kw/2; + GP_Pixel pix = GP_GetPixel_Raw_24BPP(src, 0, y); - if (cx < 0) - cx = 0; - - if (cx >= (int)src->w) - cx = src->w - 1; - - pix = GP_GetPixel_Raw_24BPP(src, cx, y); + for (i = 0; i < kw/2; i++) { + R[i] = GP_Pixel_GET_R_RGB888(pix); + G[i] = GP_Pixel_GET_G_RGB888(pix); + B[i] = GP_Pixel_GET_B_RGB888(pix); + } + + for (i = kw/2; i < src->w; i++) { + pix = GP_GetPixel_Raw_24BPP(src, i, y); R[i] = GP_Pixel_GET_R_RGB888(pix); G[i] = GP_Pixel_GET_G_RGB888(pix); B[i] = GP_Pixel_GET_B_RGB888(pix); } + + for (i = src->w; i < size; i++) { + R[i] = GP_Pixel_GET_R_RGB888(pix); + G[i] = GP_Pixel_GET_G_RGB888(pix); + B[i] = GP_Pixel_GET_B_RGB888(pix); + } for (x = 0; x < (GP_Coord)dst->w; x++) { - int32_t r = 0, g = 0, b = 0; + int32_t r = MUL/2, g = MUL/2, b = MUL/2; /* count the pixel value from neighbours weighted by kernel */ for (i = 0; i < kw; i++) { @@ -406,9 +204,9 @@ int GP_FilterHLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, } /* normalize the result */ - r = (r + MUL/2) / kernel_sum; - g = (g + MUL/2) / kernel_sum; - b = (b + MUL/2) / kernel_sum; + r /= kernel_sum; + g /= kernel_sum; + b /= kernel_sum; /* and clamp just to be extra sure */ CLAMP(r); @@ -427,9 +225,9 @@ int GP_FilterHLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, return 0; } -int GP_FilterVLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, - float kernel[], uint32_t kh, - GP_ProgressCallback *callback) +int GP_FilterVLinearConvolution_Raw(const GP_Context *src, GP_Context *dst, + float kernel[], uint32_t kh, + GP_ProgressCallback *callback) { int32_t kernel_sum = 0; GP_Coord x, y; @@ -452,26 +250,30 @@ int GP_FilterVLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, uint8_t R[size], G[size], B[size]; /* Fetch the whole column */ - for (i = 0; i < size; i++) { - GP_Pixel pix; - - int cy = i - kh/2; + GP_Pixel pix = GP_GetPixel_Raw_24BPP(src, x, 0); - if (cy < 0) - cy = 0; + for (i = 0; i < kh/2; i++) { + R[i] = GP_Pixel_GET_R_RGB888(pix); + G[i] = GP_Pixel_GET_G_RGB888(pix); + B[i] = GP_Pixel_GET_B_RGB888(pix); + } - if (cy >= (int)src->h) - cy = src->h - 1; - - pix = GP_GetPixel_Raw_24BPP(src, x, cy); + for (i = kh/2; i < src->h; i++) { + pix = GP_GetPixel_Raw_24BPP(src, x, i); R[i] = GP_Pixel_GET_R_RGB888(pix); G[i] = GP_Pixel_GET_G_RGB888(pix); B[i] = GP_Pixel_GET_B_RGB888(pix); } + + for (i = src->h; i < size; i++) { + R[i] = GP_Pixel_GET_R_RGB888(pix); + G[i] = GP_Pixel_GET_G_RGB888(pix); + B[i] = GP_Pixel_GET_B_RGB888(pix); + } for (y = 0; y < (GP_Coord)dst->h; y++) { - int32_t r = 0, g = 0, b = 0; + int32_t r = MUL/2, g = MUL/2, b = MUL/2; /* count the pixel value from neighbours weighted by kernel */ for (i = 0; i < kh; i++) { @@ -481,9 +283,9 @@ int GP_FilterVLinearConvolutionInt_Raw(const GP_Context *src, GP_Context *dst, } /* normalize the result */ - r = (r + MUL/2) / kernel_sum; - g = (g + MUL/2) / kernel_sum; - b = (b + MUL/2) / kernel_sum; + r /= kernel_sum; + g /= kernel_sum; + b /= kernel_sum; /* and clamp just to be extra sure */ CLAMP(r); ----------------------------------------------------------------------- Summary of changes: libs/filters/GP_Linear.c | 288 +++++++-------------------------------------- 1 files changed, 45 insertions(+), 243 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: d093866437ca8adc100d6bc2a40011a26c26e813
by metan 21 Jan '12

21 Jan '12

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Gfxprim January 2012