mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 11:28:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,336 Commits 6 Branches 127 Tags 3 GiB
2cc11e2c6a
Commit Graph

43 Commits

Author SHA1 Message Date
Roman Donchenko
d58cd9851f Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
	modules/core/src/cmdparser.cpp
	modules/gpu/CMakeLists.txt
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_video.cpp
	modules/highgui/doc/reading_and_writing_images_and_video.rst
	modules/ocl/src/cl_context.cpp
	modules/video/include/opencv2/video/background_segm.hpp
	samples/cpp/image_sequence.cpp
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
	samples/python/chessboard.py
	samples/python/cvutils.py
	samples/python/demhist.py
	samples/python/dft.py
	samples/python/distrans.py
	samples/python/edge.py
	samples/python/ffilldemo.py
	samples/python/fitellipse.py
	samples/python/houghlines.py
	samples/python/inpaint.py
	samples/python/logpolar.py
	samples/python/morphology.py
	samples/python/numpy_array.py
	samples/python/watershed.py
 2013-12-03 17:35:21 +04:00
Alexander Smorkalov
d39e73365c Some debug options are removed because they are installed by Cmake automatically. 
Also forcing -ggdb3 on android leads to debuging issues.
 2013-11-29 15:34:50 +04:00
Adrian Stratulat
f9ea3772b0 Add compile option for enabling NEON 2013-09-14 13:32:20 +03:00
Roman Donchenko
2d6f35d6ed Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/gpuwarping/src/cuda/resize.cu
	modules/gpuwarping/src/resize.cpp
	modules/gpuwarping/test/test_resize.cpp
	modules/ocl/perf/main.cpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_precomp.cpp
	modules/ocl/perf/perf_precomp.hpp
 2013-08-27 19:15:47 +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
10860783ef Added warnings-as-errors support for MSVC. 2013-08-22 18:25:38 +04:00
Roman Donchenko
e9a28f66ee Normalized file endings. 2013-08-21 18:59:25 +04:00
Roman Donchenko
3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
 2013-06-10 18:18:01 +04:00
Andrey Pavlenko
081c47e3df making the comment less ambigous 2013-05-31 19:55:51 +04:00
Andrey Pavlenko
6f006e50dc setting 'char' to be signed by default since some tests fail when it's wrong (e.g. native compilation on ARM Linux) 2013-05-31 18:58:30 +04:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Kamaev
9e12b7c3c2 Merge release 2.4.4 2013-03-04 19:43:49 +04:00
Andrey Kamaev
22d33373fa Fix build warnings on MSVC x64 and OS X clang 2013-03-01 13:29:43 +04:00
Andrey Kamaev
c02179a765 Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3" 
This reverts commit 4be7619ce4.
 2012-12-22 21:14:14 +04:00
Andrey Kamaev
8dbde3297e Merge branch '2.4' 2012-10-23 20:32:19 +04:00
Andrey Kamaev
ed00642600 Force build with -O2 instead of -O3 on 32-bit linux 2012-10-23 15:52:11 +04:00
Andrey Kamaev
a3b1971977 Bring back escaped virtual destructors from 2.4.2 2012-10-15 17:48:49 +04:00
Vadim Pisarevsky
4be7619ce4 _InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3 2012-10-08 21:37:15 +04:00
Andrey Kamaev
f32eb05ea1 Fix AVX and other SIMD support detection 2012-09-17 13:30:28 +04:00
Anatoly Baksheev
0ba01afd83 added GPU bilateral filter + tests 
added GPU non local means brute force filter + tests
 2012-08-29 19:20:32 +04:00
Anatoly Baksheev
290030d030 possibility to enable /mp compiler flag from cmake 
fixed MCVC warnings
 2012-08-23 16:53:53 +04:00
Vadim Pisarevsky
fac3d9994c integrated another portion of SSE optimizations from Grigory Frolov 2012-07-31 19:07:55 +04:00
Andrey Kamaev
d48d7b2b46 Updated warning options for GCC; fixed new warnings. 2012-06-20 12:27:02 +00:00
Andrey Kamaev
16b50fcec7 restored -Wno-unnamed-type-template-args 2012-06-12 16:15:14 +00:00
Andrey Kamaev
4ddcf06404 Added own CMake macro for compiler flag checks (to not depend on CMake version) 2012-06-12 16:11:30 +00:00
Andrey Kamaev
37212f5e00 Fixing compiler flags checks. 2012-06-12 15:14:28 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Andrey Kamaev
8720b27d87 Fixed build with TBB for Android 2012-06-08 10:32:51 +00:00
Andrey Kamaev
2f40905548 Fixed Android build 2012-06-08 08:11:17 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Andrey Kamaev
0fe0a88108 Minor cmake change 2012-05-23 19:28:41 +00:00
Andrey Kamaev
f8368ba6da MinGW: try -mpreferred-stack-boundary instead of mstackrealign 2012-05-19 08:50:24 +00:00
Andrey Kamaev
18c52c309b Restored -O2 for MinGW 2012-05-18 17:32:55 +00:00
Andrey Kamaev
4a3141accf #1932 Fixed SSE instability on mingw32 2012-05-17 20:25:12 +00:00
Andrey Kamaev
d2da219ec0 Fixed incorrect CMake variable name 2012-05-15 07:43:00 +00:00
Andrey Kamaev
26fb7603c0 Fixed typo #1896 2012-05-14 14:51:13 +00:00
Andrey Kamaev
07658aeb74 Fixed replacement of -O3 with -O2 for mingw compiler #1896 2012-05-14 14:19:28 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Alexander Shishkov
216ef24b92 fixed Debug compilation on Windows (it works for VS versions > 2005) 2012-03-26 07:33:01 +00:00
Andrey Kamaev
4b5d04f475 Fixed tbb hang in Android apps 2012-02-29 08:11:01 +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