Merge pull request #4156 from mshabunin:fix-neon-intrin

eb4bd6b4 · Alexander Alekhin · bb556b8f · 7b784fa2 · eb4bd6b4
Commit eb4bd6b4 authored Jun 25, 2015 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

intrin_neon.hpp modules/hal/include/opencv2/hal/intrin_neon.hpp +1 -1

No files found.
--- a/modules/hal/include/opencv2/hal/intrin_neon.hpp
+++ b/modules/hal/include/opencv2/hal/intrin_neon.hpp
@@ -747,7 +747,7 @@ inline v_int32x4 v_trunc(const v_float32x4& a)
 { return v_int32x4(vcvtq_s32_f32(a.val)); }

 #define OPENCV_HAL_IMPL_NEON_TRANSPOSE4x4(_Tpvec, suffix) \
-inline void transpose4x4(const v_##_Tpvec& a0, const v_##_Tpvec& a1, \
+inline void v_transpose4x4(const v_##_Tpvec& a0, const v_##_Tpvec& a1, \
                         const v_##_Tpvec& a2, const v_##_Tpvec& a3, \
                         v_##_Tpvec& b0, v_##_Tpvec& b1, \
                         v_##_Tpvec& b2, v_##_Tpvec& b3) \