Permalink
Browse files

Merge branch '2.4'

  • Loading branch information...
2 parents 3785439 + 74e5ff2 commit 67073daf1997f39dc56c3e4092dd42b381063d64 Andrey Kamaev committed Apr 5, 2013
Showing with 11,100 additions and 16,540 deletions.
  1. +27 −10 3rdparty/tbb/CMakeLists.txt
  2. +18 −7 CMakeLists.txt
  3. +111 −46 android/android.toolchain.cmake
  4. +4 −0 android/service/doc/JavaHelper.rst
  5. +3 −4 android/service/engine/AndroidManifest.xml
  6. +1 −1 android/service/engine/jni/BinderComponent/OpenCVEngine.cpp
  7. +1 −1 android/service/engine/jni/Tests/OpenCVEngineTest.cpp
  8. +1 −1 android/service/engine/project.properties
  9. +6 −6 android/service/readme.txt
  10. +1 −0 cmake/OpenCVDetectAndroidSDK.cmake
  11. +5 −2 cmake/OpenCVDetectCUDA.cmake
  12. +4 −2 cmake/OpenCVDetectCXXCompiler.cmake
  13. +11 −1 cmake/OpenCVFindLibsGUI.cmake
  14. +1 −0 cmake/OpenCVFindLibsGrfmt.cmake
  15. +6 −4 cmake/OpenCVFindLibsPerf.cmake
  16. +20 −6 cmake/OpenCVFindLibsVideo.cmake
  17. +1 −0 cmake/OpenCVLegacyOptions.cmake
  18. 0 cmake/{ → checks}/OpenCVDetectCudaArch.cu
  19. +10 −0 cmake/checks/vfwtest.cpp
  20. +11 −0 cmake/checks/win32uitest.cpp
  21. +11 −2 cmake/templates/cvconfig.h.cmake
  22. +1 −1 doc/_themes/blue/layout.html
  23. +2 −2 doc/tutorials/features2d/feature_description/feature_description.rst
  24. +7 −7 doc/tutorials/introduction/android_binary_package/O4A_SDK.rst
  25. +8 −8 doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
  26. +0 −2 doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
  27. +1 −1 modules/calib3d/test/test_solvepnp_ransac.cpp
  28. +21 −5 modules/calib3d/test/test_stereomatching.cpp
  29. +1 −1 modules/contrib/doc/facerec/facerec_tutorial.rst
  30. +1 −1 modules/contrib/doc/facerec/src/CMakeLists.txt
  31. +1 −1 modules/contrib/include/opencv2/contrib/contrib.hpp
  32. +1 −1 modules/contrib/src/ba.cpp
  33. +1 −0 modules/contrib/src/fuzzymeanshifttracker.cpp
  34. +1 −1 modules/core/doc/intro.rst
  35. +1 −1 modules/core/include/opencv2/core/core.hpp
  36. +8 −2 modules/core/include/opencv2/core/cvdef.h
  37. +2 −0 modules/core/include/opencv2/core/mat.hpp
  38. +12 −0 modules/core/include/opencv2/core/mat.inl.hpp
  39. +9 −27 modules/core/src/lapack.cpp
  40. +1 −1 modules/core/src/matop.cpp
  41. +1 −1 modules/core/src/matrix.cpp
  42. +13 −0 modules/core/test/test_arithm.cpp
  43. +1 −1 modules/features2d/doc/feature_detection_and_description.rst
  44. +1 −1 modules/features2d/src/keypoint.cpp
  45. +3 −4 modules/flann/include/opencv2/flann/dist.h
  46. +0 −2 modules/gpu/CMakeLists.txt
  47. +2 −2 modules/gpu/perf/perf_video.cpp
  48. +5 −5 modules/gpu/src/element_operations.cpp
  49. +12 −10 modules/gpu/src/tvl1flow.cpp
  50. +16 −4 modules/highgui/CMakeLists.txt
  51. +1 −0 modules/highgui/include/opencv2/highgui/highgui_c.h
  52. +3 −3 modules/highgui/perf/perf_precomp.hpp
  53. +14 −6 modules/highgui/src/cap.cpp
  54. +2 −1 modules/highgui/src/cap_dshow.cpp
  55. +4 −4 modules/highgui/src/cap_ffmpeg.cpp
  56. +32 −24 modules/highgui/src/cap_ffmpeg_impl.hpp
  57. +1 −0 modules/highgui/src/cap_libv4l.cpp
  58. +2,810 −0 modules/highgui/src/cap_msmf.cpp
  59. +1 −1 modules/highgui/src/cap_vfw.cpp
  60. +1 −8 modules/highgui/src/precomp.hpp
  61. +8 −8 modules/highgui/src/window.cpp
  62. +1 −1 modules/highgui/test/test_ffmpeg.cpp
  63. +1 −1 modules/highgui/test/test_gui.cpp
  64. +4 −7 modules/highgui/test/test_precomp.hpp
  65. +3 −3 modules/imgproc/src/imgwarp.cpp
  66. +8 −1 modules/java/CMakeLists.txt
  67. +1 −1 modules/java/android_test/CMakeLists.txt
  68. +12 −1 modules/java/android_test/src/org/opencv/test/features2d/BruteForceHammingDescriptorMatcherTest.java
  69. +3 −0 modules/java/generator/src/java/android+CameraBridgeViewBase.java
  70. +3 −7 modules/java/generator/src/java/android+JavaCameraView.java
  71. +6 −0 modules/java/generator/src/java/android+OpenCVLoader.java
  72. +4 −4 modules/java/generator/src/java/core+MatOfDMatch.java
  73. +2 −1 modules/legacy/src/blobtrackingauto.cpp
  74. +1 −1 modules/legacy/src/calibfilter.cpp
  75. +1 −1 modules/legacy/src/epilines.cpp
  76. +50 −104 modules/nonfree/test/test_gpu.cpp
  77. +0 −70 modules/nonfree/test/test_main.cpp
  78. +5 −3 modules/nonfree/test/test_precomp.hpp
  79. +0 −11 modules/nonfree/test/test_surf.ocl.cpp
  80. +1 −1 modules/ocl/CMakeLists.txt
  81. +33 −1 modules/ocl/include/opencv2/ocl.hpp
  82. +0 −120 modules/ocl/perf/interpolation.hpp
  83. +99 −79 modules/ocl/perf/main.cpp
  84. +862 −4,073 modules/ocl/perf/perf_arithm.cpp
  85. +63 −65 modules/ocl/perf/perf_blend.cpp
  86. +150 −0 modules/ocl/perf/perf_brute_force_matcher.cpp
  87. +26 −96 modules/ocl/perf/perf_canny.cpp
  88. +91 −0 modules/ocl/perf/perf_color.cpp
  89. +40 −72 modules/ocl/perf/perf_columnsum.cpp
  90. +31 −68 modules/ocl/perf/perf_fft.cpp
  91. +222 −1,059 modules/ocl/perf/perf_filters.cpp
  92. +39 −64 modules/ocl/perf/perf_gemm.cpp
  93. +71 −106 modules/ocl/perf/perf_haar.cpp
  94. +31 −109 modules/ocl/perf/perf_hog.cpp
  95. +611 −1,854 modules/ocl/perf/perf_imgproc.cpp
  96. +74 −160 modules/ocl/perf/perf_match_template.cpp
  97. +93 −650 modules/ocl/perf/perf_matrix_operation.cpp
  98. +84 −0 modules/ocl/perf/perf_norm.cpp
  99. +32 −82 modules/ocl/perf/perf_pyrdown.cpp
  100. +143 −0 modules/ocl/perf/perf_pyrlk.cpp
  101. +31 −65 modules/ocl/perf/perf_pyrup.cpp
  102. +73 −410 modules/ocl/perf/perf_split_merge.cpp
  103. +324 −6 modules/ocl/perf/precomp.cpp
  104. +350 −33 modules/ocl/perf/precomp.hpp
  105. +0 −265 modules/ocl/perf/utility.cpp
  106. +0 −182 modules/ocl/perf/utility.hpp
  107. +2 −3 modules/ocl/src/fft.cpp
  108. +18 −6 modules/ocl/src/initialization.cpp
  109. +7 −5 modules/ocl/src/mcwutil.cpp
  110. +68 −34 modules/ocl/src/opencl/arithm_absdiff.cl
  111. +65 −31 modules/ocl/src/opencl/arithm_add.cl
  112. +126 −104 modules/ocl/src/opencl/arithm_addWeighted.cl
  113. +53 −28 modules/ocl/src/opencl/arithm_add_scalar.cl
  114. +53 −28 modules/ocl/src/opencl/arithm_add_scalar_mask.cl
  115. +103 −87 modules/ocl/src/opencl/arithm_bitwise_and.cl
  116. +236 −179 modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
  117. +183 −124 modules/ocl/src/opencl/arithm_bitwise_and_scalar.cl
  118. +206 −147 modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
  119. +36 −21 modules/ocl/src/opencl/arithm_bitwise_not.cl
  120. +55 −39 modules/ocl/src/opencl/arithm_bitwise_or.cl
  121. +235 −178 modules/ocl/src/opencl/arithm_bitwise_or_mask.cl
  122. +179 −119 modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
  123. +208 −148 modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
  124. +97 −83 modules/ocl/src/opencl/arithm_bitwise_xor.cl
  125. +235 −178 modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
  126. +184 −125 modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
  127. +207 −147 modules/ocl/src/opencl/arithm_bitwise_xor_scalar_mask.cl
  128. +137 −77 modules/ocl/src/opencl/arithm_compare_eq.cl
  129. +135 −76 modules/ocl/src/opencl/arithm_compare_ne.cl
  130. +61 −50 modules/ocl/src/opencl/arithm_div.cl
  131. +20 −4 modules/ocl/src/opencl/arithm_flip.cl
  132. +25 −10 modules/ocl/src/opencl/arithm_mul.cl
  133. +380 −0 modules/ocl/src/opencl/stereobp.cl
  134. +517 −0 modules/ocl/src/stereobp.cpp
  135. +50 −7 modules/ocl/test/test_calib3d.cpp
  136. +1 −1 modules/python/src2/cv2.cpp
  137. +3 −3 modules/stitching/include/opencv2/stitching/detail/warpers.hpp
  138. +9 −2 modules/stitching/src/matchers.cpp
  139. +0 −2 modules/superres/CMakeLists.txt
  140. +15 −14 modules/video/src/tvl1flow.cpp
  141. +6 −0 platforms/winrt/arm.winrt.toolchain.cmake
  142. +6 −0 platforms/winrt/scripts/cmake_winrt.cmd
  143. +8 −0 samples/android/native-activity/.classpath
  144. +75 −0 samples/android/native-activity/.cproject
  145. +33 −0 samples/android/native-activity/.project
  146. +4 −0 samples/android/native-activity/.settings/org.eclipse.jdt.core.prefs
  147. +12 −0 samples/android/native-activity/CMakeLists.txt
  148. +1 −1 samples/android/native-activity/jni/native.cpp
  149. +1 −1 samples/android/tutorial-2-mixedprocessing/jni/jni_part.cpp
  150. +1 −1 samples/cpp/Qt_sample/main.cpp
  151. +1 −1 samples/cpp/stereo_calib.cpp
  152. +1 −2 samples/gpu/super_resolution.cpp
  153. +0 −4,397 samples/ocl/performance.cpp
  154. +100 −0 samples/python2/dft.py
@@ -122,15 +122,32 @@ file(GLOB lib_srcs "${tbb_src_dir}/src/tbb/*.cpp")
file(GLOB lib_hdrs "${tbb_src_dir}/src/tbb/*.h")
list(APPEND lib_srcs "${tbb_src_dir}/src/rml/client/rml_tbb.cpp")
-add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required
- -D__TBB_BUILD=1 #required
- -D__TBB_SURVIVE_THREAD_SWITCH=0 #no cilk support
- -DUSE_PTHREAD #required for Unix
- -DTBB_USE_GCC_BUILTINS=1 #required for ARM GCC
- -DTBB_USE_DEBUG=0 #just to be sure
- -DTBB_NO_LEGACY=1 #don't need backward compatibility
- -DDO_ITT_NOTIFY=0 #it seems that we don't need these notifications
- )
+if (WIN32)
+ add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0
+ -D__TBB_BUILD=1
+ -D_UNICODE
+ -DUNICODE
+ -DWINAPI_FAMILY=WINAPI_FAMILY_APP
+ -DDO_ITT_NOTIFY=0
+ ) # defines were copied from windows.cl.inc
+set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} /APPCONTAINER")
+else()
+ add_definitions(-D__TBB_DYNAMIC_LOAD_ENABLED=0 #required
+ -D__TBB_BUILD=1 #required
+ -D__TBB_SURVIVE_THREAD_SWITCH=0 #no cilk support
+ -DTBB_USE_DEBUG=0 #just to be sure
+ -DTBB_NO_LEGACY=1 #don't need backward compatibility
+ -DDO_ITT_NOTIFY=0 #it seems that we don't need these notifications
+ )
+endif()
+
+if (HAVE_LIBPTHREAD)
+ add_definitions(-DUSE_PTHREAD) #required for Unix
+endif()
+
+if (CMAKE_COMPILER_IS_GNUCXX)
+ add_definitions(-DTBB_USE_GCC_BUILTINS=1) #required for ARM GCC
+endif()
if(ANDROID_COMPILER_IS_CLANG)
add_definitions(-D__TBB_GCC_BUILTIN_ATOMICS_PRESENT=1)
@@ -145,7 +162,7 @@ endif()
set(TBB_SOURCE_FILES ${lib_srcs} ${lib_hdrs})
-if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+if (ARM AND NOT WIN32)
if (NOT ANDROID)
set(TBB_SOURCE_FILES ${TBB_SOURCE_FILES} "${CMAKE_CURRENT_SOURCE_DIR}/arm_linux_stub.cpp")
endif()
View
@@ -118,6 +118,7 @@ OCV_OPTION(WITH_CUFFT "Include NVidia Cuda Fast Fourier Transform (FFT)
OCV_OPTION(WITH_CUBLAS "Include NVidia Cuda Basic Linear Algebra Subprograms (BLAS) library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS) )
OCV_OPTION(WITH_NVCUVID "Include NVidia Video Decoding library support" OFF IF (CMAKE_VERSION VERSION_GREATER "2.8" AND NOT ANDROID AND NOT IOS AND NOT APPLE) )
OCV_OPTION(WITH_EIGEN "Include Eigen2/Eigen3 support" ON)
+OCV_OPTION(WITH_VFW "Include Video for Windows support" ON IF WIN32 )
OCV_OPTION(WITH_FFMPEG "Include FFMPEG support" ON IF (NOT ANDROID AND NOT IOS))
OCV_OPTION(WITH_GSTREAMER "Include Gstreamer support" ON IF (UNIX AND NOT APPLE AND NOT ANDROID) )
OCV_OPTION(WITH_GSTREAMER_1_X "Include Gstreamer 1.x support" OFF)
@@ -133,13 +134,15 @@ OCV_OPTION(WITH_PNG "Include PNG support" ON)
OCV_OPTION(WITH_PVAPI "Include Prosilica GigE support" ON IF (NOT ANDROID AND NOT IOS) )
OCV_OPTION(WITH_GIGEAPI "Include Smartek GigE support" ON IF (NOT ANDROID AND NOT IOS) )
OCV_OPTION(WITH_QT "Build with Qt Backend support" OFF IF (NOT ANDROID AND NOT IOS) )
+OCV_OPTION(WITH_WIN32UI "Build with Win32 UI Backend support" ON IF WIN32 )
OCV_OPTION(WITH_QUICKTIME "Use QuickTime for Video I/O insted of QTKit" OFF IF APPLE )
OCV_OPTION(WITH_TBB "Include Intel TBB support" OFF IF (NOT IOS) )
OCV_OPTION(WITH_CSTRIPES "Include C= support" OFF IF WIN32 )
OCV_OPTION(WITH_TIFF "Include TIFF support" ON IF (NOT IOS) )
OCV_OPTION(WITH_UNICAP "Include Unicap support (GPL)" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) )
OCV_OPTION(WITH_V4L "Include Video 4 Linux support" ON IF (UNIX AND NOT ANDROID) )
-OCV_OPTION(WITH_VIDEOINPUT "Build HighGUI with DirectShow support" ON IF WIN32 )
+OCV_OPTION(WITH_DSHOW "Build HighGUI with DirectShow support" ON IF (WIN32 AND NOT ARM) )
+OCV_OPTION(WITH_MSMF "Build HighGUI with Media Foundation support" OFF IF WIN32 )
OCV_OPTION(WITH_XIMEA "Include XIMEA cameras support" OFF IF (NOT ANDROID AND NOT APPLE) )
OCV_OPTION(WITH_XINE "Include Xine support (GPL)" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) )
OCV_OPTION(WITH_CLP "Include Clp support (EPL)" OFF)
@@ -171,7 +174,7 @@ OCV_OPTION(BUILD_JASPER "Build libjasper from source" WIN32 O
OCV_OPTION(BUILD_JPEG "Build libjpeg from source" WIN32 OR ANDROID OR APPLE )
OCV_OPTION(BUILD_PNG "Build libpng from source" WIN32 OR ANDROID OR APPLE )
OCV_OPTION(BUILD_OPENEXR "Build openexr from source" WIN32 OR ANDROID OR APPLE )
-OCV_OPTION(BUILD_TBB "Download and build TBB from source" ANDROID IF CMAKE_COMPILER_IS_GNUCXX )
+OCV_OPTION(BUILD_TBB "Download and build TBB from source" ANDROID )
# OpenCV installation options
# ===================================================
@@ -600,8 +603,8 @@ else()
if(DEFINED WITH_QT)
status(" QT 4.x:" NO)
endif()
- if(WIN32)
- status(" Win32 UI:" YES)
+ if(DEFINED WITH_WIN32UI)
+ status(" Win32 UI:" HAVE_WIN32UI THEN YES ELSE NO)
else()
if(APPLE)
if(WITH_CARBON)
@@ -665,6 +668,10 @@ endif()
status("")
status(" Video I/O:")
+if (DEFINED WITH_VFW)
+ status(" Video for Windows:" HAVE_VFW THEN YES ELSE NO)
+endif(DEFINED WITH_VFW)
+
if(DEFINED WITH_1394)
status(" DC1394 1.x:" HAVE_DC1394 THEN "YES (ver ${ALIASOF_libdc1394_VERSION})" ELSE NO)
status(" DC1394 2.x:" HAVE_DC1394_2 THEN "YES (ver ${ALIASOF_libdc1394-2_VERSION})" ELSE NO)
@@ -749,9 +756,13 @@ if(DEFINED WITH_V4L)
ELSE "${HAVE_CAMV4L_STR}/${HAVE_CAMV4L2_STR}")
endif(DEFINED WITH_V4L)
-if(DEFINED WITH_VIDEOINPUT)
- status(" DirectShow:" HAVE_VIDEOINPUT THEN YES ELSE NO)
-endif(DEFINED WITH_VIDEOINPUT)
+if(DEFINED WITH_DSHOW)
+ status(" DirectShow:" HAVE_DSHOW THEN YES ELSE NO)
+endif(DEFINED WITH_DSHOW)
+
+if(DEFINED WITH_MSMF)
+ status(" Media Foundation:" HAVE_MSMF THEN YES ELSE NO)
+endif(DEFINED WITH_MSMF)
if(DEFINED WITH_XIMEA)
status(" XIMEA:" HAVE_XIMEA THEN YES ELSE NO)
Oops, something went wrong.

0 comments on commit 67073da

Please sign in to comment.