[gegl] opencl,box-blur: Use integer min/max
- From: Øyvind Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] opencl,box-blur: Use integer min/max
- Date: Fri, 21 Jul 2017 16:50:05 +0000 (UTC)
commit d2612ded323934dd8d46643b8c125c79d78ae2a9
Author: Jan Vesely <jano vesely gmail com>
Date: Sat Apr 29 16:20:10 2017 -0400
opencl,box-blur: Use integer min/max
Fixes:
** (gegl:10409): WARNING **: build program failure
stringInput.cl:196:21: error: call to 'fmax' is ambiguous
stringInput.cl:197:20: error: call to 'fmin' is ambiguous
Signed-off-by: Jan Vesely <jano vesely gmail com>
opencl/box-blur.cl | 4 ++--
opencl/box-blur.cl.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/opencl/box-blur.cl b/opencl/box-blur.cl
index 3ae3ac9..9966615 100644
--- a/opencl/box-blur.cl
+++ b/opencl/box-blur.cl
@@ -57,8 +57,8 @@ void kernel_box_blur_fast (__global const float4 *in,
const int twice_radius = 2 * radius;
const int in_width = twice_radius + width;
const int in_height = twice_radius + height;
- const int start = fmax( -radius, -local_id0 );
- const int stop = fmin( radius, get_local_size(0) - local_id0 );
+ const int start = max( -radius, -local_id0 );
+ const int stop = min( radius, (int)get_local_size(0) - local_id0 );
const float4 area = (float4) ( ((stop - start) + 1) * (twice_radius + 1) );
int column_index_start,column_index_end;
int y = get_global_id(1) * size;
diff --git a/opencl/box-blur.cl.h b/opencl/box-blur.cl.h
index c512357..83e2d8e 100644
--- a/opencl/box-blur.cl.h
+++ b/opencl/box-blur.cl.h
@@ -58,8 +58,8 @@ static const char* box_blur_cl_source =
" const int twice_radius = 2 * radius; \n"
" const int in_width = twice_radius + width; \n"
" const int in_height = twice_radius + height; \n"
-" const int start = fmax( -radius, -local_id0 ); \n"
-" const int stop = fmin( radius, get_local_size(0) - local_id0 ); \n"
+" const int start = max( -radius, -local_id0 ); \n"
+" const int stop = min( radius, (int)get_local_size(0) - local_id0 ); \n"
" const float4 area = (float4) ( ((stop - start) + 1) * (twice_radius + 1) ); \n"
" int column_index_start,column_index_end; \n"
" int y = get_global_id(1) * size; \n"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]