From d280205245b5c119bac689a058783fc8b9537b19 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Wed, 6 May 2015 10:00:10 +0300
Subject: [PATCH] fixed compile errors on ARM, as well as failures in OCL_Dft*
 regression tests

---
 modules/core/src/opencl/fft.cl                  | 10 ++++++++++
 modules/hal/include/opencv2/hal/intrin_neon.hpp |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/modules/core/src/opencl/fft.cl b/modules/core/src/opencl/fft.cl
index 3901db4eb7..d9dfbb7c6a 100644
--- a/modules/core/src/opencl/fft.cl
+++ b/modules/core/src/opencl/fft.cl
@@ -574,6 +574,16 @@ __kernel void fft_multi_radix_rows(__global const uchar* src_ptr, int src_step,
         #pragma unroll
         for (int i=x; i<cols; i+=block_size)
             dst[i] = SCALE_VAL(smem[i], scale);
+#ifdef REAL_INPUT
+#ifdef COMPLEX_OUTPUT
+#ifdef IS_1D
+        for(int i=x+1; i < (dst_cols+1)/2; i+=block_size)
+        {
+            dst[dst_cols-i] = (CT)(SCALE_VAL(smem[i].x, scale), SCALE_VAL(-smem[i].y, scale));
+        }
+#endif
+#endif
+#endif
 #else
         // pack row to CCS
         __local FT* smem_1cn = (__local FT*) smem;
diff --git a/modules/hal/include/opencv2/hal/intrin_neon.hpp b/modules/hal/include/opencv2/hal/intrin_neon.hpp
index ab6aa86315..2418566e62 100644
--- a/modules/hal/include/opencv2/hal/intrin_neon.hpp
+++ b/modules/hal/include/opencv2/hal/intrin_neon.hpp
@@ -322,6 +322,9 @@ OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_int16x8, vmulq_s16)
 OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_int32x4, vaddq_s32)
 OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_int32x4, vsubq_s32)
 OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_int32x4, vmulq_s32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_uint32x4, vaddq_u32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_uint32x4, vsubq_u32)
+OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_uint32x4, vmulq_u32)
 OPENCV_HAL_IMPL_NEON_BIN_OP(+, v_float32x4, vaddq_f32)
 OPENCV_HAL_IMPL_NEON_BIN_OP(-, v_float32x4, vsubq_f32)
 OPENCV_HAL_IMPL_NEON_BIN_OP(*, v_float32x4, vmulq_f32)