Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/core/include/opencv2/core/internal.hpp
	modules/core/src/arithm.cpp
	modules/imgproc/src/imgwarp.cpp
	modules/objdetect/src/hog.cpp

diff --cc doc/tutorials/introduction/windows_install/windows_install.rst
Simple merge

diff --cc modules/core/src/arithm.cpp
index 0c6c432,fa74cfa..8e01de1
--- 1/modules/core/src/arithm.cpp
--- 2/modules/core/src/arithm.cpp
+++ b/modules/core/src/arithm.cpp
@@@ -1810,10 -1550,10 +1810,10 @@@ static BinaryFunc* getAbsDiffTab(
  void cv::add( InputArray src1, InputArray src2, OutputArray dst,
            InputArray mask, int dtype )
  {
 -    arithm_op(src1, src2, dst, mask, dtype, getAddTab() );
 +    arithm_op(src1, src2, dst, mask, dtype, getAddTab(), false, 0, OCL_OP_ADD );
  }
  
- void cv::subtract( InputArray src1, InputArray src2, OutputArray dst,
+ void cv::subtract( InputArray _src1, InputArray _src2, OutputArray _dst,
                 InputArray mask, int dtype )
  {
  #ifdef HAVE_TEGRA_OPTIMIZATION
@@@ -1845,7 -1606,7 +1866,7 @@@
          }
      }
  #endif
-     arithm_op(src1, src2, dst, mask, dtype, getSubTab(), false, 0, OCL_OP_SUB );
 -    arithm_op(_src1, _src2, _dst, mask, dtype, getSubTab() );
++    arithm_op(_src1, _src2, _dst, mask, dtype, getSubTab(), false, 0, OCL_OP_SUB );
  }
  
  void cv::absdiff( InputArray src1, InputArray src2, OutputArray dst )

diff --cc modules/core/test/test_arithm.cpp
Simple merge

diff --cc modules/imgproc/src/imgwarp.cpp
index 6dca96e,dcd718f..e7b0d56
--- 1/modules/imgproc/src/imgwarp.cpp
--- 2/modules/imgproc/src/imgwarp.cpp
+++ b/modules/imgproc/src/imgwarp.cpp
@@@ -4385,8 -3554,7 +4385,7 @@@ class WarpPerspectiveInvoker 
      public ParallelLoopBody
  {
  public:
- 
 -    warpPerspectiveInvoker(const Mat &_src, Mat &_dst, double *_M, int _interpolation,
 +    WarpPerspectiveInvoker(const Mat &_src, Mat &_dst, double *_M, int _interpolation,
                             int _borderType, const Scalar &_borderValue) :
          ParallelLoopBody(), src(_src), dst(_dst), M(_M), interpolation(_interpolation),
          borderType(_borderType), borderValue(_borderValue)
@@@ -4478,9 -3645,9 +4477,9 @@@ class IPPWarpPerspectiveInvoker 
      public ParallelLoopBody
  {
  public:
 -    IPPwarpPerspectiveInvoker(Mat &_src, Mat &_dst, double (&_coeffs)[3][3], int &_interpolation,
 -                              int &_borderType, const Scalar &_borderValue, ippiWarpPerspectiveBackFunc _func, bool *_ok) :
 -        ParallelLoopBody(), src(_src), dst(_dst), coeffs(_coeffs), mode(_interpolation),
 +    IPPWarpPerspectiveInvoker(Mat &_src, Mat &_dst, double (&_coeffs)[3][3], int &_interpolation,
-         int &_borderType, const Scalar &_borderValue, ippiWarpPerspectiveFunc _func, bool *_ok) :
++                              int &_borderType, const Scalar &_borderValue, ippiWarpPerspectiveFunc _func, bool *_ok) :
 +        ParallelLoopBody(), src(_src), dst(_dst), mode(_interpolation), coeffs(_coeffs),
          borderType(_borderType), borderValue(_borderValue), func(_func), ok(_ok)
      {
          *ok = true;

diff --cc modules/imgproc/src/morph.cpp
Simple merge