[gegl] operations: don't reinvent min() and max() macros in gaussian-blur
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] operations: don't reinvent min() and max() macros in gaussian-blur
- Date: Mon, 20 May 2013 22:44:55 +0000 (UTC)
commit 2efd765e27a449110c88168d3c19b67c1178edee
Author: Michael Natterer <mitch gimp org>
Date: Tue May 21 00:43:52 2013 +0200
operations: don't reinvent min() and max() macros in gaussian-blur
operations/common/gaussian-blur.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/operations/common/gaussian-blur.c b/operations/common/gaussian-blur.c
index c7fb511..b9f22b7 100644
--- a/operations/common/gaussian-blur.c
+++ b/operations/common/gaussian-blur.c
@@ -404,9 +404,9 @@ fir_ver_blur (GeglBuffer *src,
g_free (dst_buf);
}
-static void prepare (GeglOperation *operation)
+static void
+prepare (GeglOperation *operation)
{
-#define max(A,B) ((A) > (B) ? (A) : (B))
GeglOperationAreaFilter *area = GEGL_OPERATION_AREA_FILTER (operation);
GeglChantO *o = GEGL_CHANT_PROPERTIES (operation);
@@ -417,14 +417,13 @@ static void prepare (GeglOperation *operation)
/* XXX: these should be calculated exactly considering o->filter, but we just
* make sure there is enough space */
- area->left = area->right = ceil ( max (fir_radius_x, iir_radius_x));
- area->top = area->bottom = ceil ( max (fir_radius_y, iir_radius_y));
+ area->left = area->right = ceil (MAX (fir_radius_x, iir_radius_x));
+ area->top = area->bottom = ceil (MAX (fir_radius_y, iir_radius_y));
gegl_operation_set_format (operation, "input",
babl_format ("RaGaBaA float"));
gegl_operation_set_format (operation, "output",
babl_format ("RaGaBaA float"));
-#undef max
}
#include "opencl/gegl-cl.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]