Merge branch '2.4'

diff --cc CMakeLists.txt
Simple merge

diff --cc doc/user_guide/ug_mat.rst
Simple merge

diff --cc modules/core/include/opencv2/core/version.hpp
index 8d47f45,b6d1568..916d173
--- 1/modules/core/include/opencv2/core/version.hpp
--- 2/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@@ -47,9 -47,10 +47,10 @@@
  #ifndef __OPENCV_VERSION_HPP__
  #define __OPENCV_VERSION_HPP__
  
- #define CV_MAJOR_VERSION    2
- #define CV_MINOR_VERSION    4
- #define CV_SUBMINOR_VERSION 9
+ #define CV_VERSION_EPOCH    2
+ #define CV_VERSION_MAJOR    4
 -#define CV_VERSION_MINOR    3
 -#define CV_VERSION_REVISION 2
++#define CV_VERSION_MINOR    9
++#define CV_VERSION_REVISION 0
  
  #define CVAUX_STR_EXP(__A)  #__A
  #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)

diff --cc modules/gpu/src/ffmpeg_video_source.cpp
Simple merge

diff --cc modules/gpu/src/video_writer.cpp
Simple merge

diff --cc modules/imgproc/perf/perf_resize.cpp
Simple merge

diff --cc modules/ocl/include/opencv2/ocl/ocl.hpp
index c32f948,5e4b143..9340371
--- 1/modules/ocl/include/opencv2/ocl/ocl.hpp
--- 2/modules/ocl/include/opencv2/ocl/ocl.hpp
+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp
@@@ -1754,12 -1738,13 +1754,13 @@@ namespace c
  
      }
  }
- #if _MSC_VER >= 1200
- #pragma warning( push)
- #pragma warning( disable: 4267)
+ #if defined _MSC_VER && _MSC_VER >= 1200
+ #  pragma warning( push)
+ #  pragma warning( disable: 4267)
  #endif
  #include "opencv2/ocl/matrix_operations.hpp"
- #if _MSC_VER >= 1200
- #pragma warning( pop)
+ #if defined _MSC_VER && _MSC_VER >= 1200
+ #  pragma warning( pop)
  #endif
 -#endif /* __OPENCV_GPU_HPP__ */
+ 
 +#endif /* __OPENCV_OCL_HPP__ */

diff --cc modules/ocl/perf/main.cpp
index 663bc19,e517a37..f1b6884
--- 1/modules/ocl/perf/main.cpp
--- 2/modules/ocl/perf/main.cpp
+++ b/modules/ocl/perf/main.cpp
@@@ -79,30 -79,49 +79,30 @@@ int main(int argc, char **argv
      TS::ptr()->init("ocl");
      InitGoogleTest(&argc, argv);
      const char *keys =
 -
 -        "{ h | help     | false              | print help message }"
 -
 -        "{ w | workdir  | ../../../samples/c/| set working directory }"
 -
 -        "{ t | type     | gpu                | set device type:cpu or gpu}"
 -
 -        "{ p | platform | 0                  | set platform id }"
 -
 -        "{ d | device   | 0                  | set device id }";
 -
 -
 +        "{ h | false              | print help message }"
 +              "{ w | ../../../samples/c/| set working directory i.e. -w=C:\\}"
 +        "{ t | gpu                | set device type:i.e. -t=cpu or gpu}"
 +        "{ p | 0                  | set platform id i.e. -p=0}"
 +        "{ d | 0                  | set device id i.e. -d=0}";
  
      CommandLineParser cmd(argc, argv, keys);
 -
 -    if (cmd.get<bool>("help"))
 -
 +    if (cmd.get<string>("h")=="true")
      {
 -
          cout << "Avaible options besides goole test option:" << endl;
 -
 -        cmd.printParams();
 +        cmd.printMessage();
 +        return 0;
      }
 -
 -    workdir = cmd.get<string>("workdir");
 -
 -    string type = cmd.get<string>("type");
 -
 -    unsigned int pid = cmd.get<unsigned int>("platform");
 -
 -    int device = cmd.get<int>("device");
 -
 -
 +    workdir = cmd.get<string>("w");
 +    string type = cmd.get<string>("t");
 +    unsigned int pid = cmd.get<unsigned int>("p");
 +    int device = cmd.get<int>("d");
      print_info();
-     int flag = CVCL_DEVICE_TYPE_GPU;
+     // int flag = CVCL_DEVICE_TYPE_GPU;
  
-     if(type == "cpu")
-     {
-         flag = CVCL_DEVICE_TYPE_CPU;
-     }
+     // if(type == "cpu")
 -
+     // {
 -
+     //     flag = CVCL_DEVICE_TYPE_CPU;
 -
+     // }
      std::vector<cv::ocl::Info> oclinfo;
      int devnums = getDevice(oclinfo);
      if(devnums <= device || device < 0)

diff --cc modules/ts/include/opencv2/ts/ts.hpp
Simple merge

diff --cc modules/ts/src/ts_perf.cpp
Simple merge