Merge pull request #843 from pengx17:2.4_stereobp_fix

12 years ago · 4f26f0c2e2
parent a9a269505c 3282aaa1f5
commit 4f26f0c2e2
1 changed files with 4 additions and 4 deletions
--- a/modules/ocl/src/opencl/stereobp.cl
+++ b/modules/ocl/src/opencl/stereobp.cl
@ -185,10 +185,10 @@ __kernel void data_step_down(__global T *src, int src_rows,
        for (int d = 0; d < cndisp; ++d)
        {
            float dst_reg;
-            dst_reg  = src[(d * src_rows + (2*y+0)) * src_step + 2*x+0];
-            dst_reg += src[(d * src_rows + (2*y+1)) * src_step + 2*x+0];
-            dst_reg += src[(d * src_rows + (2*y+0)) * src_step + 2*x+1];
-            dst_reg += src[(d * src_rows + (2*y+1)) * src_step + 2*x+1];
+            dst_reg  = src[(d * src_rows + min(2*y+0, src_rows-1)) * src_step + 2*x+0];
+            dst_reg += src[(d * src_rows + min(2*y+1, src_rows-1)) * src_step + 2*x+0];
+            dst_reg += src[(d * src_rows + min(2*y+0, src_rows-1)) * src_step + 2*x+1];
+            dst_reg += src[(d * src_rows + min(2*y+1, src_rows-1)) * src_step + 2*x+1];

            dst[(d * dst_rows + y) * dst_step + x] = saturate_cast(dst_reg);
        }