Merge remote-tracking branch 'upstream/3.4' into merge-3.4

6886937e · Alexander Alekhin · 653bef23 · 6d656ca0 · 6886937e
Commit 6886937e authored Jul 12, 2019 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

retina_kernel.cl modules/bioinspired/src/opencl/retina_kernel.cl +2 -2

No files found.
--- a/modules/bioinspired/src/opencl/retina_kernel.cl
+++ b/modules/bioinspired/src/opencl/retina_kernel.cl
@@ -411,9 +411,9 @@ kernel void amacrineCellsComputing(
    float4 val_opl_off = vload4(0, opl_off);

    float4 magnoXonPixelResult = coeff * (vload4(0, out_on) + val_opl_on - vload4(0, prev_in_on));
-    vstore4(fmax(magnoXonPixelResult, 0), 0, out_on);
+    vstore4(fmax(magnoXonPixelResult, 0.f), 0, out_on);
    float4 magnoXoffPixelResult = coeff * (vload4(0, out_off) + val_opl_off - vload4(0, prev_in_off));
-    vstore4(fmax(magnoXoffPixelResult, 0), 0, out_off);
+    vstore4(fmax(magnoXoffPixelResult, 0.f), 0, out_off);

    vstore4(val_opl_on, 0, prev_in_on);
    vstore4(val_opl_off, 0, prev_in_off);