Fix merge conflicts
added CV_16SC2 && CV_16UC1 map types support to ocl::remap (INTER_LINEAR mode)
Fix the whitespace warning.
Support PyString_AsString() in Python 3 < 3.3

In Python 3, version 3.3+, PyUnicode_AsUTF8() provides similar
functionality to Python 2's PyString_AsString().

In older versions of Python 3, there is no public function to provide
the same functionality.  However, the "internal" _PyUnicode_AsString()
does provide that functionality, so use it to replace
PyString_AsString().

With this patch, cv2 should compile for Python 3.[0-2].
Merge pull request #1763 from SpecLad:cv-func
Merge pull request #1755 from KonstantinMatskevich:dump_info
Merge pull request #1759 from ilya-lavrenov:ocl_distanceToCenters
CMake's get_filename_component with NAME_WE parameters, interprets first period as start of extension. For. e.g file name with out extension of 'this.is.a.text.file.txt' will be taken as 'this'. Hence using NAME with regex replacement to get 'this.is.a.text.file'
Merge pull request #1771 from kiranpradeep:2.4
Merge pull request #1742 from pengx17:master_ocl_retina_sample
added ROI support to ocl::buildWarp*Maps functions
added an accuracy test for ocl::buildWarpPerspectiveMaps
fixed ocl::cvtColor for CV_YUV2BGRA and CV_YUV2RGBA
added YCrCb to RGB, BGR, RGBA, BGRA modes to ocl::cvtColor
color.cpp refactoring: created generic interface for toRGB and fromRGB callers
added RGB -> XYZ conversion to ocl::cvtColor
added XYZ to RGB conversion to ocl::cvtColor
Fix the build of OpenCV with XIMEA on Windows 64 bits:
  - crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
  - the "CMAKE_CL_64" variable is not initialized when using mingw

PR#1039 modified to be able to merge on branch 2.4
added RGB[A] <-> BGR[A] conversion to ocl::cvtColor
replaced custom PI by OpenCL M_PI constant