mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-08 04:09:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,127 Commits 6 Branches 127 Tags 3 GiB
e2f00ce846
Commit Graph

259 Commits

Author SHA1 Message Date
Roman Donchenko
029fce10c9 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	3rdparty/libjasper/CMakeLists.txt
	cmake/OpenCVDetectOpenCL.cmake
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/imgproc/src/floodfill.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_or.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
	modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
	modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/precomp.hpp
	modules/python/src2/api
	modules/ts/src/ts_func.cpp
	samples/gpu/bgfg_segm.cpp
 2013-05-21 17:19:23 +04:00
Andrey Pavlenko
4af104aaae 'aapt' tool moved in SDK r22, adding support to run.py 2013-05-19 14:57:21 +04:00
Leszek Swirski
0e8c2b0395 Fix visibility of g_linked_ptr_mutex on Windows 
Reverts some changes in b8ed00bd64
 2013-05-15 14:42:28 +01:00
Andrey Kamaev
b8ed00bd64 Compile OpenCV with GCC visibility set to hidden 2013-05-13 18:33:20 +04:00
Andrey Pavlenko
d5881bc00a adding version info to test log 2013-05-12 18:36:55 +04:00
Andrey Kamaev
416fb50594 Revert "Merge pull request #836 from jet47:gpu-modules" 
This reverts commit fba72cb60d, reversing
changes made to 02131ffb62.
 2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
bc0e563092 CV_GPU_TEST_MAIN macros 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Andrey Kamaev
96b008cd29 Eliminate the need of ::testsing::ValuesIn() for CV_ENUM 
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
 2013-04-15 19:39:49 +04:00
Andrey Kamaev
802d004bbb Fix build issues 2013-04-13 16:53:59 +04:00
Andrey Kamaev
9deea80b83 Update gtest to upstream r652 
It is already marked as a gtest 1.7.0
 2013-04-13 16:29:05 +04:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Roman Donchenko
57d4c86b2b Fixed the shebang lines on the Python scripts. 
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
 2013-04-11 18:37:23 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
517062039e Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
Andrey Kamaev
71e43852ce Fix MSVC build issues 2013-04-01 15:24:34 +04:00
Andrey Kamaev
2b1ef95415 Completely separate C and C++ API of OpenCV core 2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
Andrey Kamaev
62adc01980 Move cv::Rect_ 2013-04-01 15:24:33 +04:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
marina.kolpakova
4096b54560 use static assertation where suitable 2013-03-25 00:29:12 +04:00
Vladislav Vinogradov
f0b19d4659 updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
Vladislav Vinogradov
3b065e38be fixed warnings 2013-03-18 14:06:29 +04:00
Vladislav Vinogradov
abc9ef6809 moved utility functions from gpu_perf_test and gpu_test to ts module 2013-03-18 14:06:19 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Vladislav Vinogradov
ecb2ebfba4 Move opengl iterop code to cv::ogl namespace 
Fixed issues: #2737 #2848
 2013-03-12 18:13:11 +04:00
Andrey Kamaev
891d7da6ee Merge branch '2.4' 2013-02-28 11:17:06 +04:00
Andrey Kamaev
a5d2253be8 Merge pull request #544 from AnnaKogan8:added-regressions-only-option 2013-02-28 00:38:47 +04:00
Andrey Kamaev
4d2c864bea Add option --with-score to summary.py to automatically classify speedups 
Legend for new column is:
* FASTER - strong speedup
* faster - spedup is detected but it is unreliable
* <empty> - no change in speed
* slower - slowdown is detected but it is unreliable
* SLOWER - strong slowdown
 2013-02-26 19:42:51 +04:00
Anna Kogan
a9b1c5db78 Added --regressions-only=X-FACTOR option 2013-02-26 11:09:17 +04:00
Andrey Kamaev
0b8a6da817 Merge branch '2.4' 2013-02-22 17:33:30 +04:00
Alexander Smorkalov
e21a1d3124 Test system refactoring 
cmpEps replaced on cmpEps2 to reduce code dublication;
Constants for cmpEps return values added.
 2013-02-21 12:07:04 +04:00
Andrey Kamaev
b44b920997 Merge branch '2.4' 2013-02-12 16:30:18 +04:00
Andrey Kamaev
2a98c1f89c Merge pull request #446 from AnnaKogan8:updated-perf-timing-script 2013-02-11 14:02:39 +04:00
Alexey Spizhevoy
e0ead7b606 fixed assertion failure (vector out of range) for the 'vc10,debug' build (#2775) 2013-02-08 17:44:57 +04:00
Anna Kogan
51e58aeb25 Added --failed-only option and multiple input files support 2013-02-07 19:08:31 +04:00
Andrey Kamaev
61079547f0 Merge branch '2.4' 2013-02-01 14:59:40 +04:00
Andrey Kamaev
4f1913ed26 Correct tolerance value for sanity checks with ERROR_RELATIVE 
Use min/max bounds instead of local value to calculate acceptance threshold.
Threshold based on local values somethimes does not work because cancellation
of big values may produce error bigger than local value.
 2013-01-31 15:47:14 +04:00
Andrey Kamaev
7572b4d400 Merge branch '2.4' 2013-01-30 15:12:50 +04:00
Andrey Kamaev
e79e81c6cd Fix Windows build warnings 2013-01-30 13:24:49 +04:00
cuda-geek
11dfceb2c9 Merge pull request #328 from jet47:new-gpu-fixes 2013-01-29 11:00:37 +04:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Ivan Korolev
6385b0f7ed Fixed a formula to calculate the relative error 2013-01-25 11:19:38 +04:00
Andrey Kamaev
3c4cfccc88 Merge pull request #321 from apavlenko:warp_sanity_check 2013-01-24 13:05:54 +04:00
Vladislav Vinogradov
b7e6b5af1b fixed tests (call resetDevice, if there was a gpu failure) 2013-01-23 21:05:04 +04:00
Andrey Kamaev
0773ab4d07 Merge pull request #315 from taka-no-me:java_on 2013-01-23 19:02:27 +04:00
Andrey Pavlenko
e287dea91b fixing build warnings 2013-01-23 18:45:06 +04:00
Andrey Kamaev
3889b34ec3 Add option to run java tests with run.py 2013-01-23 18:08:08 +04:00
Andrey Pavlenko
81721d0dce enabling sanity checks for warp and resize functions on Android 
- add syntetic images generation function to ts
- use generated syntetic images
 2013-01-23 17:25:30 +04:00
Anna Kogan
0587bef667 Switched time from seconds to minutes 2013-01-15 15:32:22 +04:00
Anna Kogan
3cdfa654ae Added 'Num of tests' col, changed headers, added 'overall time' row 2013-01-15 15:26:43 +04:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Anna Kogan
3271e395c8 Improved console output 2013-01-10 13:19:59 +04:00
Anna Kogan
0d7ce141aa Cleaned code 2013-01-10 13:18:26 +04:00
Anna Kogan
0334cf11cc Fixed last testsuit disregarding 2013-01-10 13:16:46 +04:00
marina.kolpakova
45191dd6a5 merge CUDA dev branch 2012-12-29 19:44:38 +04:00
Anatoly Baksheev
be22891f71 added GPU_PERF_TESTP_P but haven't switched test to it (only perf4au app) 2012-12-25 21:23:15 +04:00
Andrey Kamaev
132b5d6435 Merge release 2.4.3.2 2012-12-25 19:07:08 +04:00
Andrey Kamaev
02d1e68c64 Merge pull request #257 from AnnaKogan8:perf-tests-timing-script 2012-12-24 19:38:49 +04:00
Andrey Kamaev
13b6a3a15e Merge branch 2.4 2012-12-24 17:10:07 +04:00
Anna Kogan
f57d692cd7 Improved code 2012-12-24 17:09:04 +04:00
Anna Kogan
e1331b44f5 Wrote script generating timing table 2012-12-24 17:09:04 +04:00
Vladislav Vinogradov
5138b7d209 Merge branch 'master' into cuda-dev 2012-12-24 13:48:33 +04:00
Andrey Kamaev
9944282b09 Fix build with STLPort from NDK r8d 2012-12-22 00:59:56 +04:00
Andrey Kamaev
962884cdec Merge branch 2.4 2012-12-21 17:58:48 +04:00
Andrey Kamaev
b6efec5f8b Add support for Android NDK r8d 2012-12-21 15:39:23 +04:00
Vladislav Vinogradov
660d23aa04 added cv::gpu::resetDevice to RunPerfTestBody 2012-12-20 15:33:04 +04:00
Andrey Kamaev
80a1d569ca Add support for multidimentional matrices into the sanity checks 2012-12-15 20:15:34 +04:00
Andrey Kamaev
f5cd20d80b Merge branch 2.4 2012-12-14 14:46:41 +04:00
Andrey Kamaev
817a4c0c30 Merge branch 2.4 into perf_verify_sanity 2012-12-12 20:14:25 +04:00
Andrey Kamaev
e1afb1409f Add --perf_verify_sanity option to performance tests 
This option provides an easy way to identify tests having no regression data
for sanity checks
 2012-12-12 19:42:24 +04:00
Andrey Kamaev
6e244c83cd Corrected sanity checks in several perf tests 
Also fixed a typo in performance testing framework and removed hardcoded
temporary file name from highgui perf test
 2012-12-12 01:00:47 +04:00
Andrey Kamaev
67ce03d7dd Merge branch 2.4 2012-12-10 23:51:34 +04:00
Andrey Kamaev
7c6191ec11 Refactored run.py script and temporary file generation logic 
* use OPENCV_TEMP_PATH environment variable on all platforms
* fix cleanup after OpenCV tests on Windows
* add --list flag to output names of all tests found
* do not override user-passed --perf_min_samples and --perf_force_samples
  options by --check flag
* fix complier checks inside run.py
 2012-12-08 15:43:23 +04:00
Andrey Kamaev
b0d3830399 Update gtest to upstream r629 2012-12-05 03:02:37 +04:00
Andrey Kamaev
e10ee89ec4 Merge branch 2.4 2012-11-30 19:54:24 +04:00
Andrey Kamaev
157cdeb443 Merge pull request #175 from taka-no-me:run_py 2012-11-28 12:44:05 +04:00
Andrey Kamaev
8daebeac8a run.py: add --check option for easy run of sanity checks 2012-11-24 14:12:32 +04:00
Andrey Kamaev
9db1d9ba13 run.py: improve handling of multiple Android devices 
* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
 2012-11-24 14:11:07 +04:00
marina.kolpakova
285d6320be add #/usr/bin/env python to all python files 2012-11-23 22:57:22 +04:00
Andrey Kamaev
4d059e9e5b Merge release 2.4.3 2012-11-02 17:58:02 +04:00
Andrey Kamaev
7267d518d5 Fix build in Visual Studio 2005 2012-11-01 12:42:51 +04:00
Andrey Kamaev
6211f156e6 Merge 2.4.3-rc 2012-10-24 19:56:27 +04:00
Andrey Kamaev
0072078857 Hide non-windows variable in gtest 2012-10-23 18:09:49 +04:00
Andrey Kamaev
c13eb07d47 Fix argument parsing for old command line parser 2012-10-23 12:07:01 +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
d566c6bc86 Revert "add new version of CommandLineParser. add empty docs" 
This reverts commit 54a202b3d5.

Conflicts:
	modules/core/doc/command_line_parser.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/src/cmdparser.cpp
	modules/gpu/perf/main.cpp
	modules/gpu/test/main.cpp
	modules/ts/src/ts_perf.cpp
 2012-10-15 20:01:44 +04:00
Andrey Kamaev
52e490ef88 Revert "fixed compile error under linux" 
This reverts commit e2d9fc4dcc.
 2012-10-15 20:01:44 +04:00
Andrey Kamaev
3ffe0f0117 Remove unused tbb::task_scheduler_init from perf tests 2012-10-15 16:25:06 +04:00
Andrey Kamaev
c3881ede62 Refactor thread management in performance tests 2012-10-15 16:14:11 +04:00
Kirill Kornyakov
84176fa027 Added perf test for warpPerpsective with large resolutions 2012-10-12 17:14:23 +04:00
marina.kolpakova
800cb9d0e6 allow gpu module write sanity data for GPU and CPU tests in one xml 2012-10-12 14:46:18 +04:00
Andrey Kamaev
a3a658c034 Quiet MSVC warning 2012-10-12 12:19:34 +04:00
Andrey Kamaev
97640847c5 Add methods to sort keypoints and corresponding descriptors 2012-10-11 18:25:45 +04:00