generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,523 Commits 3 Branches 47 Tags
d4a1df85be
Commit Graph

14 Commits

Author SHA1 Message Date
Roman Donchenko
bbc35d609d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVModule.cmake
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/src/cuda/generalized_hough.cu
	modules/gpu/src/generalized_hough.cpp
	modules/python/CMakeLists.txt
 2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45 All installed files marked with component names for install customization. 2014-01-21 20:34:36 +04:00
Alexander Alekhin
e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
*  from StevenPuttemans:bugfix_3283
*  from alalek:ocl_test_fix_rng
*  from alalek:cmake_install_win
*  from ilya-lavrenov:ipp_warn_fix
*  from alalek:perf_simple_strategy
*  from alalek:svm_workaround
*  from alalek:ocl_fix_cl_double
*  from ilya-lavrenov:ocl_setto_opencl12
*  from asmorkalov:android_fd_cp_fix
*  from ilya-lavrenov:ocl_norm
*  from sperrholz:ocl-arithm-additions
*  from ilya-lavrenov:ocl_setto_win_fix
*  from ilya-lavrenov:pr1582_fix
*  from alalek:ocl_remove_cl_hpp_h
*  from alalek:ocl_program_cache_update
*  from ilya-lavrenov:ocl_war_on_double
*  from ilya-lavrenov:ocl_perf
*  from alalek:cl_code_cleanup
*  from alalek:test_fix_run_py
*  from alalek:ocl_fix_cleanup
*  from alalek:ocl_fix_build_mac
*  from ilya-lavrenov:ocl_mac_kernel_warnings
*  from ilya-lavrenov:ocl_fix_tvl1_and_sparse
*  from alalek:ocl_test_dump_info
*  from ilya-lavrenov:ocl_disable_svm_noblas
*  from alalek:ocl_fixes
*  from ilya-lavrenov:ocl_imgproc
*  from ilya-lavrenov:ocl_fft_cleanup
*  from alalek:fix_warn_upd_haar
*  from ilya-lavrenov:ocl_some_optimization
*  from alalek:ocl_fix_perf_kalman
*  from alalek:ocl_fix_string_info
*  from ilya-lavrenov:ocl_svm_misprint
*  from ilya-lavrenov:ocl_cvtColor
*  from ilya-lavrenov:ocl_info
*  from a0byte:2.4
*  from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
 2013-10-15 20:08:52 +04:00
Alexander Alekhin
555c505b70 update cmake 'install' target for Windows platform 
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
 2013-10-09 17:49:10 +04:00
Roman Donchenko
2c4bbb313c 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
 2013-08-27 13:26:44 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Andrey Kamaev
69648f0a6f Make photo.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Andrey Kamaev
daead680cd Add option to control build of applications (feature ) 2013-01-29 16:38:59 +04:00
marina.kolpakova
cd301e530f minor in train application 2012-11-07 03:19:04 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Andrey Kamaev
984eb99428 Global CMake reorganization: 
[~] Automatically tracked dependencies between modules
 [+] Support for optional module dependencies
 [+] Options to choose modules to build
 [~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
 [+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
 [~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
 2012-02-03 11:26:49 +00:00