Merge commit '43aec5ad' into merge-2.4

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

cmake/OpenCVCRTLinkage.cmake

@@ -98,4 +98,3 @@ if(NOT BUILD_WITH_DEBUG_INFO AND NOT MSVC)
   string(REPLACE "/Zi" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
   string(REPLACE "/Zi" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
 endif()
-

cmake/OpenCVCompilerOptions.cmake

@@ -294,4 +294,4 @@ if(MSVC)
   if(NOT ENABLE_NOISY_WARNINGS)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4251") #class 'std::XXX' needs to have dll-interface to be used by clients of YYY
   endif()
-endif()
+endif()

cmake/OpenCVFindIPP.cmake

@@ -140,7 +140,7 @@ endfunction()
 # ------------------------------------------------------------------------
 function(set_ipp_new_libraries _LATEST_VERSION)
     set(IPP_PREFIX "ipp")
-    
+
     if(${_LATEST_VERSION} VERSION_LESS "8.0")
         set(IPP_SUFFIX "_l")        # static not threaded libs suffix IPP 7.x
     else()
@@ -346,4 +346,4 @@ if(WIN32 AND MINGW AND NOT IPP_LATEST_VERSION_MAJOR LESS 7)
     #     See http://code.opencv.org/issues/1906 for additional details
     set(MSV_NTDLL    "ntdll")
     set(IPP_LIBRARIES ${IPP_LIBRARIES} ${MSV_NTDLL}${IPP_LIB_SUFFIX})
-endif()
+endif()

cmake/OpenCVFindXimea.cmake

@@ -19,7 +19,7 @@ set(XIMEA_LIBRARY_DIR)
 if(WIN32)
   # Try to find the XIMEA API path in registry.
   GET_FILENAME_COMPONENT(XIMEA_PATH "[HKEY_CURRENT_USER\\Software\\XIMEA\\CamSupport\\API;Path]" ABSOLUTE)
- 
+
   if(EXISTS ${XIMEA_PATH})
     set(XIMEA_FOUND 1)
     # set LIB folders
@@ -43,4 +43,4 @@ endif()
 
 mark_as_advanced(FORCE XIMEA_FOUND)
 mark_as_advanced(FORCE XIMEA_PATH)
-mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)
+mark_as_advanced(FORCE XIMEA_LIBRARY_DIR)

cmake/OpenCVUtils.cmake

@@ -515,4 +515,4 @@ function(ocv_source_group group)
   cmake_parse_arguments(OCV_SOURCE_GROUP "" "" "GLOB" ${ARGN})
   file(GLOB srcs ${OCV_SOURCE_GROUP_GLOB})
   source_group(${group} FILES ${srcs})
-endfunction()
+endfunction()

cmake/checks/OpenCVDetectCudaArch.cu

@@ -11,4 +11,4 @@ int main()
         printf("%d.%d ", prop.major, prop.minor);
     }
     return 0;
-}
+}

cmake/checks/vfwtest.cpp

@@ -7,4 +7,4 @@ int main()
   AVIFileInit();
   AVIFileExit();
   return 0;
-}
+}

cmake/checks/winrttest.cpp

@@ -3,4 +3,4 @@
 int main(int, char**)
 {
     return 0;
-}
+}

cmake/cl2cpp.cmake

@@ -32,4 +32,4 @@ foreach(cl ${cl_list})
   file(APPEND ${OUTPUT} "const char* ${cl_filename}=\"${lines};\n")
 endforeach()
 
-file(APPEND ${OUTPUT} "}\n}\n")
+file(APPEND ${OUTPUT} "}\n}\n")

cmake/templates/cmake_uninstall.cmake.in

@@ -23,5 +23,3 @@ FOREACH(file ${files})
     MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
   ENDIF(EXISTS "$ENV{DESTDIR}${file}")
 ENDFOREACH(file)
-
-

cmake/templates/opencv_modules.hpp.in

@@ -6,4 +6,4 @@
  *
 */
 
-@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@
+@OPENCV_MODULE_DEFINITIONS_CONFIGMAKE@