Commit Graph

124 Commits

Author SHA1 Message Date
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
Vladislav Vinogradov fd88654b45 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov 3c34b24f1f replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov ae94256edc renmaed gpu module -> cuda 2013-09-02 14:00:44 +04:00
Vladislav Vinogradov 29386f1449 renamed gpubgsegm -> cudabgsegm 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov 259ceb7eaa renamed gpufeatures2d -> cudafeatures2d 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov 5660d6a680 renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov a0ae602bb7 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov 219b662127 renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
Vladislav Vinogradov d4901a99ea renamed gpuwarping -> cudawarping 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov dcd600cc47 renamed gpuarithm -> cudaarithm 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov 91dd44e7fa removed compatibility headers 2013-09-02 14:00:42 +04:00
Vladislav Vinogradov e895b7455e renamed gpu namespace -> cuda 2013-09-02 14:00:41 +04:00
Vladislav Vinogradov 62edeeed16 refactored FGD algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov b8f0d1a0e4 refactored MOG2 algorithm 2013-07-18 15:39:42 +04:00
Vladislav Vinogradov a2adab7283 refactored MOG algorithm
converted it to abstract interface
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov de56163f97 refactored gpu::matchTemplate (converted it into Algorithm) 2013-07-17 11:39:57 +04:00
Vladislav Vinogradov 70e6dc615a refactored GoodFeaturesToTrackDetector 2013-07-17 11:39:56 +04:00
Vladislav Vinogradov d7ff3ad0cf refactored cornerHarris and cornerMinEigenVal
* converted it into Algorithm
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov 48fb8c4f8a refactored gpu::Canny (converted it into Algorithm) 2013-07-17 11:39:53 +04:00
Vladislav Vinogradov fc8476544c switched to Input/Output Array in Histogram Processing 2013-07-17 11:39:52 +04:00
Vladislav Vinogradov 98bd401534 fix gpu::DeviceInfo compilation under linux
glibc defines major and minor macros
which conflict with  gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Vladislav Vinogradov 5720eaf354 refactored Morphology Filters 2013-06-14 17:25:57 +04:00
Vladislav Vinogradov 12ae11e2ff refactored Separable Linear Filters 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov 1eedc6c42a refactored Linear Filter 2013-06-14 17:25:56 +04:00
Vladislav Vinogradov 2dab93c2e8 refactored gpu info structures (TargetArchs and DeviceInfo)
now DeviceInfo provides full information about device (from cudaDeviceProp)
2013-06-10 12:40:32 +04:00
Andrey Kamaev 8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Andrey Kamaev 5e048d1fa5 Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
Andrey Kamaev 0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev 82d7292ee7 Merge pull request #680 from vpisarev:c2cpp_video_take2 2013-03-22 19:34:53 +04:00
Andrey Kamaev 1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Vadim Pisarevsky 07e0f7bf59 refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +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 0a65f2f4af merged gpunonfree and nonfree module 2013-03-18 16:14:37 +04:00
Vladislav Vinogradov fd7bf0b766 moved SURF_GPU and VIBE to gpunonfree module 2013-03-18 14:06:29 +04:00
Vladislav Vinogradov 8b1f88c40f updated gpu module API 2013-02-21 16:12:33 +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 f4e33ea0ba Fix build of samples 2012-10-17 02:09:46 +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
AoD314 54a202b3d5 add new version of CommandLineParser. add empty docs 2012-09-07 13:24:48 +04:00
Andrey Kamaev f2a02feffa Fix Windows build issues
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Andrey Kamaev a323da6fd5 Fixed some warnings and install problems on linux 2012-06-27 12:02:31 +00:00
Vladislav Vinogradov 3a4353f04d added FGDStatModel, MOG and MOG2 to gpu performance sample 2012-06-25 11:46:45 +00:00
Andrey Kamaev c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev 49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vladislav Vinogradov ef478840af added message that timings doesn't include data transfer to gpu performance sample (Issue #1846) 2012-05-12 06:28:51 +00:00
Vladislav Vinogradov 44eaeee865 refactored gpu BruteForceMather (made it similar to BFMatcher) 2012-04-24 07:56:33 +00:00
Vladislav Vinogradov 5fe493474c minor fix of gpu performance sample 2012-04-02 08:55:04 +00:00
Vladislav Vinogradov c02c676865 fixed gpu performance sample (SURF usage)
added tests for filter2D
2012-04-02 08:53:06 +00:00