Merge pull request #1171 from LaurentBerger:woHALDisFlow

modules/optflow/include/opencv2/optflow/sparse_matching_gpc.hpp

@@ -52,7 +52,6 @@ the use of this software, even if advised of the possibility of such damage.
 #define __OPENCV_OPTFLOW_SPARSE_MATCHING_GPC_HPP__
 
 #include "opencv2/core.hpp"
-#include "opencv2/core/hal/intrin.hpp"
 #include "opencv2/imgproc.hpp"
 
 namespace cv

modules/optflow/src/dis_flow.cpp

@@ -40,7 +40,6 @@
 //
 //M*/
 
-#include "opencv2/core/hal/intrin.hpp"
 #include "precomp.hpp"
 #include "opencl_kernels_optflow.hpp"
 

modules/optflow/src/sparse_matching_gpc.cpp

@@ -46,6 +46,7 @@
 #include "opencv2/imgcodecs.hpp"
 #include "precomp.hpp"
 #include "opencl_kernels_optflow.hpp"
+#include "opencv2/core/hal/intrin.hpp"
 
 /* Disable "from double to float" and "from size_t to int" warnings.
  * Fixing these would make the code look ugly by introducing explicit cast all around.