mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-27 19:38:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,605 Commits 6 Branches 127 Tags 3 GiB
72d5609a36
Commit Graph

12605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrey Pavlenko
c7d90c8b32 adding old cascade 2014-01-14 23:15:50 +04:00
Andrey Pavlenko
9b7b360bf7 fixing compilation if WITH_OPENCL=OFF 2014-01-14 17:50:00 +04:00
Ilya Lavrenov
7ed692bf92 fixed cv::cvtColor 2014-01-14 16:16:35 +04:00
Nick D'Ademo
25870fa66b Added PVAPI enums to highgui.hpp 
Added "PVAPI_" prefix to FrameStartTriggerMode definition
 2014-01-14 21:38:57 +11:00
Roman Donchenko
2fde4d8a94 Merge pull request #2145 from andreasBihlmaier:2.4 2014-01-14 11:55:29 +04:00
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
Andrey Pavlenko
fdb1019b9e Merge pull request #2147 from ilya-lavrenov:tapi_sqrt 2014-01-14 11:34:03 +04:00
Matthias Bady
06fb073b8b Merge branch 'master' of https://github.com/Itseez/opencv into brief_cl 2014-01-13 18:14:56 +01:00
Ilya Lavrenov
09bff78d63 deleted extra arg in case of power=0.5 2014-01-13 19:59:10 +04:00
Roman Donchenko
2443e8090e Merge pull request #2133 from apavlenko:2.4-perf_haar 2014-01-13 19:28:09 +04:00
ahb
49dfa5a17f Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8 
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83

The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp.  http://sourceforge.net/p/predef/wiki/OperatingSystems/)

Adjust all other occurrences of "defined(linux)" as well.
 2014-01-13 16:09:42 +01:00
Ilya Lavrenov
30b5234e9a added perf test for cv::sqrBoxFilter 2014-01-13 18:51:49 +04:00
Ilya Lavrenov
8702fceb4b fixed cv::integral perf test 2014-01-13 18:36:52 +04:00
Roman Donchenko
c3bfe3f33e Merge pull request #2136 from SpecLad:python-ver 2014-01-13 18:17:00 +04:00
Andrey Pavlenko
4c99196399 adding finish() to flush CL queue, renaming the test to match 'master' branch 2014-01-13 18:12:30 +04:00
Ilya Lavrenov
a7a7b80ff8 added perf test for cv::Moments 2014-01-13 17:50:14 +04:00
Andrey Pavlenko
520a692fda switching to CL_PERF_TEST_P, adding safeFinish() to flush CL queue 2014-01-13 16:58:36 +04:00
Roman Donchenko
9628abc786 Merge pull request #2137 from ilya-lavrenov:gitignore 2014-01-13 16:33:16 +04:00
Roman Donchenko
85c713b59e Merge pull request #2138 from alekcac:python_tutorial_fix 2014-01-13 16:32:42 +04:00
Roman Donchenko
af9cd79e16 Merge pull request #2121 from ilya-lavrenov:tapi_perf 2014-01-13 16:30:33 +04:00
Roman Donchenko
87e0c26129 Merge pull request #2108 from pemmanuelviel:flannMemoryLeak 2014-01-13 16:26:02 +04:00
Ilya Lavrenov
6fb878a65f added perf tests for cv::medianBlur 2014-01-13 15:59:24 +04:00
Max Khardin
d8e5f1611b Rewrite definition/declaration of variables to be more compact 2014-01-13 15:55:49 +04:00
Ilya Lavrenov
5e7fd8bd7e added perf tests for cv::morphologyEx 2014-01-13 15:43:09 +04:00
Ilya Lavrenov
5a2a0b326a added perf tests for cv::dilate 2014-01-13 15:30:35 +04:00
Ilya Lavrenov
f61597dce8 added perf tests for filters 2014-01-13 15:26:50 +04:00
Ilya Lavrenov
04ae46e21c added perf tests to some imgproc functions 2014-01-13 15:01:52 +04:00
Nick D'Ademo
3cf5c0b991 Added get and set for extra PVAPI property: CV_CAP_PROP_FRAMESTARTTRIGGERMODE 2014-01-13 22:01:09 +11:00
Ilya Lavrenov
e76d51511e added perf test for cv::cvtColor, pyr operations 2014-01-13 14:40:42 +04:00
Ilya Lavrenov
4bd4c8d12a added perf tests for cv::blendLinear 2014-01-13 14:06:15 +04:00
Daniil Osokin
5d2edced26 Added throwing exception when saving untrained SVM model 2014-01-13 13:50:30 +04:00
Ilya Lavrenov
6fbaff6d83 added perf tests for T-API warp operations 2014-01-13 13:10:26 +04:00
Andrey Pavlenko
a7821c60e5 refactoring the test as it should be in 2.4 2014-01-13 11:20:17 +04:00
Andrey Pavlenko
6071671bda Merge pull request #2135 from alalek:ocl_runtime_cleanup_2 2014-01-11 17:15:22 +04:00
Andrey Pavlenko
d64f05cd59 Merge pull request #2112 from ilya-lavrenov:tapi_stitching 2014-01-11 16:39:22 +04:00
Alexander Shishkov
e90d0b6e4c changed code in python tutorial, these functions don’t return image 2014-01-11 16:35:41 +04:00
Ilya Lavrenov
f197d8b91c updated .gitignore 2014-01-10 18:59:06 +04:00
Ilya Lavrenov
da2790249e added NORM_L2SQR type to cv::norm 2014-01-10 18:45:52 +04:00
Ilya Lavrenov
2e5e278271 added cv::PSNR performance test 2014-01-10 18:45:40 +04:00
Ilya Lavrenov
a01e81c8f7 added some performance tests 2014-01-10 18:45:40 +04:00
Ilya Lavrenov
1592234f1a added mask support to cv::norm, cv::meanStdDev 2014-01-10 18:45:40 +04:00
Roman Donchenko
9e3673ef53 Don't use PYTHON_VERSION_STRING when searching for Python libraries 
It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.
 2014-01-10 18:40:47 +04:00
Ilya Lavrenov
7852b2f155 updated docs according to the last changes 2014-01-10 18:19:26 +04:00
Ilya Lavrenov
8f9ccc099b replaced Mat by Input/Output arrays 2014-01-10 18:16:56 +04:00
Ilya Lavrenov
118709fd9f added OpenCL accelerated warpers 2014-01-10 18:16:56 +04:00
Roman Donchenko
5a9900481a Merge pull request #2105 from ilya-lavrenov:norm 2014-01-10 18:12:08 +04:00
Roman Donchenko
890f1baff0 Merge pull request #2132 from ComFreek:patch-2 2014-01-10 11:44:46 +04:00
Alexander Alekhin
f7b0940d44 core/ocl: runtime, remove unused declarations 2014-01-10 11:42:02 +04:00
Andrey Pavlenko
4d28e8243c 'master'-like Haar perf test 2014-01-10 00:14:48 +04:00
Andrey Pavlenko
2c0e24e948 adding Haar & LBP cascades perf test using UMat, removing old incomplete test 2014-01-10 00:08:15 +04:00