Merge pull request #11169 from tomoaki0705:universalRemap

diff --cc modules/core/include/opencv2/core/hal/intrin_sse.hpp
Simple merge

diff --cc modules/core/include/opencv2/core/hal/intrin_vsx.hpp
Simple merge

diff --cc modules/imgproc/src/imgwarp.cpp
index 24af8e2,ba1858b..58ae385
--- 1/modules/imgproc/src/imgwarp.cpp
--- 2/modules/imgproc/src/imgwarp.cpp
+++ b/modules/imgproc/src/imgwarp.cpp
@@@ -50,9 -50,8 +50,9 @@@
  #include "precomp.hpp"
  #include "opencl_kernels_imgproc.hpp"
  #include "hal_replacement.hpp"
- 
+ #include "opencv2/core/hal/intrin.hpp"
  #include "opencv2/core/openvx/ovx_defs.hpp"
 +#include "opencv2/core/softfloat.hpp"
  #include "imgwarp.hpp"
  
  using namespace cv;