From 8bb15dfe5f338d1e3be8c144f2b59b23ffdfae55 Mon Sep 17 00:00:00 2001 From: haesleinhuepf Date: Wed, 11 Dec 2019 16:13:04 +0100 Subject: [PATCH] bugfix: buffer overflow in case byte or short images are projected --- .../java/net/haesleinhuepf/clij/kernels/maxProjection.cl | 4 ++-- src/main/java/net/haesleinhuepf/clij/kernels/projections.cl | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/haesleinhuepf/clij/kernels/maxProjection.cl b/src/main/java/net/haesleinhuepf/clij/kernels/maxProjection.cl index a8f2fec..1fed4eb 100644 --- a/src/main/java/net/haesleinhuepf/clij/kernels/maxProjection.cl +++ b/src/main/java/net/haesleinhuepf/clij/kernels/maxProjection.cl @@ -7,10 +7,10 @@ __kernel void max_project_3d_2d( const int x = get_global_id(0); const int y = get_global_id(1); - DTYPE_IN max = 0; + float max = 0; for(int z = 0; z < GET_IMAGE_IN_DEPTH(src); z++) { - DTYPE_IN value = READ_IMAGE_3D(src,sampler,(int4)(x,y,z,0)).x; + float value = READ_IMAGE_3D(src,sampler,(int4)(x,y,z,0)).x; if (value > max || z == 0) { max = value; } diff --git a/src/main/java/net/haesleinhuepf/clij/kernels/projections.cl b/src/main/java/net/haesleinhuepf/clij/kernels/projections.cl index 46ec095..e1f0282 100644 --- a/src/main/java/net/haesleinhuepf/clij/kernels/projections.cl +++ b/src/main/java/net/haesleinhuepf/clij/kernels/projections.cl @@ -8,7 +8,7 @@ __kernel void mean_project_3d_2d( const int x = get_global_id(0); const int y = get_global_id(1); - DTYPE_IN sum = 0; + float sum = 0; int count = 0; for(int z = 0; z < GET_IMAGE_IN_DEPTH(src); z++) { @@ -27,10 +27,10 @@ __kernel void min_project_3d_2d( const int x = get_global_id(0); const int y = get_global_id(1); - DTYPE_IN min = 0; + float min = 0; for(int z = 0; z < GET_IMAGE_IN_DEPTH(src); z++) { - DTYPE_IN value = READ_IMAGE_3D(src,sampler,(int4)(x,y,z,0)).x; + float value = READ_IMAGE_3D(src,sampler,(int4)(x,y,z,0)).x; if (value < min || z == 0) { min = value; }