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 5e9ae922f961ce558878ad261b34db3dd7a99b6d (commit) from ed37d412a80d1a2032cc49f00a4e505ac297f7cc (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/5e9ae922f961ce558878ad261b34db3dd7a99... commit 5e9ae922f961ce558878ad261b34db3dd7a99b6d Author: Cyril Hrubis <metan@ucw.cz> Date: Sun Sep 9 10:56:49 2012 +0200 libs: Several small fixes. Notable Changes: * Change GP_DEBUG(0, ...) to GP_WARN(...) * Fix unmapped X11 key 'grave' * Whitespace fixes diff --git a/include/filters/GP_Blur.h b/include/filters/GP_Blur.h index fb0ac26..c008774 100644 --- a/include/filters/GP_Blur.h +++ b/include/filters/GP_Blur.h @@ -42,15 +42,15 @@ int GP_FilterGaussianBlurEx(const GP_Context *src, GP_Coord x_src, GP_Coord y_src, GP_Size w_src, GP_Size h_src, GP_Context *dst, - GP_Coord x_dst, GP_Coord y_dst, - float x_sigma, float y_sigma, - GP_ProgressCallback *callback); + GP_Coord x_dst, GP_Coord y_dst, + float x_sigma, float y_sigma, + GP_ProgressCallback *callback); GP_Context *GP_FilterGaussianBlurExAlloc(const GP_Context *src, GP_Coord x_src, GP_Coord y_src, GP_Size w_src, GP_Size h_src, - float x_sigma, float y_sigma, - GP_ProgressCallback *callback); + float x_sigma, float y_sigma, + GP_ProgressCallback *callback); static inline int GP_FilterGaussianBlur(const GP_Context *src, GP_Context *dst, float x_sigma, float y_sigma, diff --git a/include/filters/GP_Convolution.h b/include/filters/GP_Convolution.h index 858ead6..8c158ff 100644 --- a/include/filters/GP_Convolution.h +++ b/include/filters/GP_Convolution.h @@ -100,8 +100,8 @@ static inline int GP_FilterConvolution(const GP_Context *src, GP_Context *dst, } static inline GP_Context *GP_FilterConvolutionAlloc(const GP_Context *src, - const GP_FilterKernel2D *kernel, - GP_ProgressCallback *callback) + const GP_FilterKernel2D *kernel, + GP_ProgressCallback *callback) { return GP_FilterConvolutionExAlloc(src, 0, 0, src->w, src->h, kernel, callback); diff --git a/include/filters/GP_Dither.h b/include/filters/GP_Dither.h index 55a950c..2c4d321 100644 --- a/include/filters/GP_Dither.h +++ b/include/filters/GP_Dither.h @@ -53,8 +53,8 @@ * Semi internal raw version, use at your own risk. */ int GP_FilterFloydSteinberg_RGB888_Raw(const GP_Context *src, - GP_Context *dst, - GP_ProgressCallback *callback); + GP_Context *dst, + GP_ProgressCallback *callback); /* * Converts RGB888 24bit image to any RGB or Grayscale bitmap. @@ -75,7 +75,7 @@ int GP_FilterFloydSteinberg_RGB888(const GP_Context *src, */ GP_Context *GP_FilterFloydSteinberg_RGB888_Alloc(const GP_Context *src, GP_PixelType pixel_type, - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); /* * Hilbert-Peano space filling curve based dithering. diff --git a/include/filters/GP_GaussianNoise.h b/include/filters/GP_GaussianNoise.h index 59d9d35..9e9274e 100644 --- a/include/filters/GP_GaussianNoise.h +++ b/include/filters/GP_GaussianNoise.h @@ -40,7 +40,7 @@ int GP_FilterGaussianNoiseAddEx(const GP_Context *src, GP_Size w_src, GP_Size h_src, GP_Context *dst, GP_Coord x_dst, GP_Coord y_dst, - float sigma, float mu, + float sigma, float mu, GP_ProgressCallback *callback); GP_Context *GP_FilterGaussianNoiseAddExAlloc(const GP_Context *src, diff --git a/include/filters/GP_Median.h b/include/filters/GP_Median.h index 0547793..4a479cf 100644 --- a/include/filters/GP_Median.h +++ b/include/filters/GP_Median.h @@ -41,7 +41,7 @@ int GP_FilterMedianEx(const GP_Context *src, GP_Size w_src, GP_Size h_src, GP_Context *dst, GP_Coord x_dst, GP_Coord y_dst, - int xmed, int ymed, + int xmed, int ymed, GP_ProgressCallback *callback); GP_Context *GP_FilterMedianExAlloc(const GP_Context *src, @@ -52,7 +52,7 @@ GP_Context *GP_FilterMedianExAlloc(const GP_Context *src, static inline int GP_FilterMedian(const GP_Context *src, GP_Context *dst, - int xmed, int ymed, + int xmed, int ymed, GP_ProgressCallback *callback) { return GP_FilterMedianEx(src, 0, 0, src->w, src->h, diff --git a/include/filters/GP_Point.h b/include/filters/GP_Point.h index 31e9747..7032af3 100644 --- a/include/filters/GP_Point.h +++ b/include/filters/GP_Point.h @@ -42,7 +42,7 @@ int GP_FilterBrightness_Raw(const GP_Context *src, GP_Context *dst, GP_Context *GP_FilterBrightness(const GP_Context *src, GP_Context *dst, GP_FilterParam params[], - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); /* * Contrast filter. @@ -54,11 +54,11 @@ GP_Context *GP_FilterBrightness(const GP_Context *src, GP_Context *dst, */ int GP_FilterContrast_Raw(const GP_Context *src, GP_Context *dst, GP_FilterParam params[], - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); GP_Context *GP_FilterContrast(const GP_Context *src, GP_Context *dst, GP_FilterParam params[], - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); /* * Invert filter. @@ -87,7 +87,7 @@ GP_Context *GP_FilterNoise(const GP_Context *src, GP_Context *dst, */ GP_Context *GP_FilterPoint(const GP_Context *src, GP_Context *dst, GP_FilterParam filter_callback[], - GP_FilterParam priv[], - GP_ProgressCallback *callback); + GP_FilterParam priv[], + GP_ProgressCallback *callback); #endif /* FILTERS_GP_POINT_H */ diff --git a/include/filters/GP_Rotate.h b/include/filters/GP_Rotate.h index 7c39ced..bafc37a 100644 --- a/include/filters/GP_Rotate.h +++ b/include/filters/GP_Rotate.h @@ -170,7 +170,7 @@ int GP_FilterSymmetryByName(const char *symmetry); int GP_FilterSymmetry(const GP_Context *src, GP_Context *dst, GP_FilterSymmetries symmetry, - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); GP_Context *GP_FilterSymmetry_Alloc(const GP_Context *src, GP_FilterSymmetries symmetry, diff --git a/include/filters/GP_Sigma.h b/include/filters/GP_Sigma.h index 1660e5b..18275f0 100644 --- a/include/filters/GP_Sigma.h +++ b/include/filters/GP_Sigma.h @@ -48,7 +48,7 @@ int GP_FilterSigmaEx(const GP_Context *src, GP_Context *dst, GP_Coord x_dst, GP_Coord y_dst, int xrad, int yrad, int min, float sigma, - GP_ProgressCallback *callback); + GP_ProgressCallback *callback); GP_Context *GP_FilterSigmaExAlloc(const GP_Context *src, GP_Coord x_src, GP_Coord y_src, @@ -62,7 +62,7 @@ static inline int GP_FilterSigma(const GP_Context *src, GP_ProgressCallback *callback) { return GP_FilterSigmaEx(src, 0, 0, src->w, src->h, - dst, 0, 0, xrad, yrad, min, sigma, callback); + dst, 0, 0, xrad, yrad, min, sigma, callback); } static inline GP_Context *GP_FilterSigmaAlloc(const GP_Context *src, @@ -71,7 +71,7 @@ static inline GP_Context *GP_FilterSigmaAlloc(const GP_Context *src, GP_ProgressCallback *callback) { return GP_FilterSigmaExAlloc(src, 0, 0, src->w, src->h, - xrad, yrad, min, sigma, callback); + xrad, yrad, min, sigma, callback); } #endif /* GP_FILTERS_SIGMA_H */ diff --git a/libs/backends/GP_X11.c b/libs/backends/GP_X11.c index d95e2de..8e08476 100644 --- a/libs/backends/GP_X11.c +++ b/libs/backends/GP_X11.c @@ -536,7 +536,7 @@ GP_Backend *GP_BackendX11Init(const char *GP_UNUSED(display), unsigned int GP_UNUSED(h), const char *GP_UNUSED(caption)) { - GP_DEBUG(0, "FATAL: X11 support not compiled in"); + GP_WARN("FATAL: X11 support not compiled in"); return NULL; } diff --git a/libs/input/GP_InputDriverKBD.c b/libs/input/GP_InputDriverKBD.c index c598c37..9530fca 100644 --- a/libs/input/GP_InputDriverKBD.c +++ b/libs/input/GP_InputDriverKBD.c @@ -75,5 +75,5 @@ void GP_InputDriverKBDEventPut(unsigned char ev) } } - GP_DEBUG(0, "Unmapped key %i", keycode); + GP_WARN("Unmapped key %i", keycode); } diff --git a/libs/input/GP_InputDriverSDL.c b/libs/input/GP_InputDriverSDL.c index 207cfca..04cf416 100644 --- a/libs/input/GP_InputDriverSDL.c +++ b/libs/input/GP_InputDriverSDL.c @@ -120,7 +120,7 @@ void GP_InputDriverSDLEventPut(SDL_Event *ev) GP_EventPush(GP_EV_REL, GP_EV_REL_WHEEL, -1, NULL); return; default: - GP_DEBUG(0, "Unmapped SDL Mouse button %02x", + GP_WARN("Unmapped SDL Mouse button %02x", ev->button.button); return; } diff --git a/libs/input/GP_InputDriverX11.c b/libs/input/GP_InputDriverX11.c index 656c232..5caae39 100644 --- a/libs/input/GP_InputDriverX11.c +++ b/libs/input/GP_InputDriverX11.c @@ -41,7 +41,7 @@ static uint16_t keycode_table[] = { GP_KEY_LEFT_CTRL, GP_KEY_A, GP_KEY_S, GP_KEY_D, GP_KEY_F, GP_KEY_G, GP_KEY_H, GP_KEY_J, GP_KEY_K, GP_KEY_L, GP_KEY_SEMICOLON, GP_KEY_APOSTROPHE, - 0, GP_KEY_LEFT_SHIFT, GP_KEY_BACKSLASH, GP_KEY_Z, + GP_KEY_GRAVE, GP_KEY_LEFT_SHIFT, GP_KEY_BACKSLASH, GP_KEY_Z, GP_KEY_X, GP_KEY_C, GP_KEY_V, GP_KEY_B, GP_KEY_N, GP_KEY_M, GP_KEY_COMMA, GP_KEY_DOT, GP_KEY_SLASH, GP_KEY_RIGHT_SHIFT, 0, GP_KEY_LEFT_ALT, @@ -93,8 +93,8 @@ void GP_InputDriverX11EventPut(XEvent *ev) } if (key == 0) { - GP_DEBUG(0, "Unmapped X11 button %02x", - ev->xbutton.button); + GP_WARN("Unmapped X11 button %02x", + ev->xbutton.button); return; } @@ -117,14 +117,14 @@ void GP_InputDriverX11EventPut(XEvent *ev) key = keycode_table[keycode - 9]; if (key == 0) { - GP_DEBUG(0, "Unmapped X11 keycode %02x", keycode); + GP_WARN("Unmapped X11 keycode %02x", keycode); return; } GP_EventPushKey(key, press, NULL); break; default: - GP_DEBUG(0, "Unhandled X11 event type %u", ev->type); + GP_WARN("Unhandled X11 event type %u", ev->type); } } ----------------------------------------------------------------------- Summary of changes: include/filters/GP_Blur.h | 10 +++++----- include/filters/GP_Convolution.h | 4 ++-- include/filters/GP_Dither.h | 6 +++--- include/filters/GP_GaussianNoise.h | 2 +- include/filters/GP_Median.h | 4 ++-- include/filters/GP_Point.h | 10 +++++----- include/filters/GP_Rotate.h | 2 +- include/filters/GP_Sigma.h | 6 +++--- libs/backends/GP_X11.c | 2 +- libs/input/GP_InputDriverKBD.c | 2 +- libs/input/GP_InputDriverSDL.c | 2 +- libs/input/GP_InputDriverX11.c | 10 +++++----- 12 files changed, 30 insertions(+), 30 deletions(-) repo.or.cz automatic notification. Contact project admin jiri.bluebear.dluhos@gmail.com if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply. -- gfxprim.git ("A simple 2D graphics library with emphasis on correctness and well-defined operation.")