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

22 Commits

Author SHA1 Message Date
Roman Donchenko
fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp
 2014-01-14 11:53:59 +04:00
Ilya Lavrenov
6b9ebcbf3d deleted extra semicolons 2014-01-07 02:52:30 +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
ilya-lavrenov
7a53910495 fixed warning on windows 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
909d6fcf51 Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +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
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
itsyplen
3876cf22e3 reverted samples with new command argument parser. will be continued after OpenCV release. 2011-06-09 12:01:47 +00:00
Kirill Kornyakov
534ac83b8d update help corresponding single format and update some samples through using CommandLineParser class 2011-05-29 10:01:01 +00:00
Kirill Kornyakov
dc3fe6e9cf update help according single standart for it 2011-05-28 10:53:53 +00:00
Vadim Pisarevsky
23768b1826 replaced #include <some_opencv_hdr> with #include "some_opencv_hdr" (ticket ) 2011-05-21 18:32:34 +00:00
Kirill Kornyakov
aadb1669a7 some samples updated according to new CommandLineParser class 2011-05-21 14:09:03 +00:00
Anatoly Baksheev
8ebff41c29 more warnings fixed. +some warnings in examples 2011-05-07 12:06:58 +00:00
Gary Bradski
a3d7aebbef revamped 2010-12-04 08:34:54 +00:00
Gary Bradski
439b1057e6 added to and moved comments to top 2010-12-01 02:20:36 +00:00
Vadim Pisarevsky
042271f5f7 use the new-style headers in the samples to improve OpenCV build time. 2010-11-26 17:59:40 +00:00
Vadim Pisarevsky
127d6649a1 "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00