Commit Graph

346 Commits

Author SHA1 Message Date
Vladislav Vinogradov
31c8b527c6 gpuarithm module for arithmetics operations on matrices 2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54 gpucodec module for video decoding/encoding 2013-04-18 11:33:29 +04:00
Vladislav Vinogradov
54e7c76d99 fixed compilation errors 2013-04-17 15:24:53 +04:00
Andrey Kamaev
8f32902ce6 Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
Andrey Kamaev
909d6fcf51 Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +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
Vladislav Vinogradov
ba1a1aecaa fixed gpu module compilation 2013-04-09 10:41:35 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Vladislav Vinogradov
9086efa8e9 fixed warnings 2013-04-02 13:24:00 +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
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
marina.kolpakova
0211843062 merge Detection structure for CPU and GPU soft cascade detectors 2013-03-18 06:58:53 +04:00
cuda-geek
819ac111a2 Merge pull request #660 from Nerei:2.4 2013-03-17 23:00:04 +04:00
Anatoly Baksheev
2bf3104ee5 bugfix in sample to support LBP classifier. To merge to master also. 2013-03-17 18:43:55 +04:00
marina.kolpakova
a476664144 fixed compilation with latest master changes 2013-03-14 20:12:52 +04:00
marina.kolpakova
5120322cea move gpu version of soft cascade to dedicated module 2013-03-14 12:27:13 +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
Vladislav Vinogradov
7a0d6f7733 Super Resolution module 2013-02-27 13:41:15 +04:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817 Merge branch '2.4' 2013-02-22 17:33:30 +04:00
Vladislav Vinogradov
8b1f88c40f updated gpu module API 2013-02-21 16:12:33 +04:00
Vladislav Vinogradov
a938534a7e restored binary compatibility 2013-02-21 12:18:08 +04:00
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality:
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Vladislav Vinogradov
aa73bf6079 added gpu optical flow sample 2013-02-13 15:58:12 +04:00
Vladislav Vinogradov
fe2e89df1b added gpu::HoughLinesP function 2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
ae6266e101 fixes for gpu module:
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Anatoly Baksheev
389ecbe96d warnings, renamed Marina's GPU_PERF_TEST_P 2012-12-25 22:00:20 +04:00
Vladislav Vinogradov
41c9377db0 fixed warnings under windows 2012-12-18 18:03:54 +04:00
Vladislav Vinogradov
1a1f454241 updated gpu houghlines sample 2012-12-17 11:15:45 +04:00
Vladislav Vinogradov
da017fbeb9 fast optical flow bm implementation 2012-12-17 10:39:19 +04:00
Vladislav Vinogradov
caf91ac159 new gpu::HoughLinesP implementation 2012-12-13 17:18:25 +04:00
Vladislav Vinogradov
da93a1dab9 fixed build for CARMA platform 2012-12-13 13:49:32 +04:00
Vladislav Vinogradov
aad76090ce gpu::HoughLinesP 2012-12-06 15:14:20 +04:00
Vladislav Vinogradov
05d842bcd8 a bit more opengl refactoring:
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
marina.kolpakova
209f16455d Merge cuda-geek/soft-cascade-gpu into cuda-dev 2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c Merge origin/master into cuda-dev 2012-11-26 18:56:33 +04:00
marina.kolpakova
c3e4a52fbe soft cascade sample 2012-11-14 20:11:18 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
marina.kolpakova
d65b3e0617 fix warning in CUDA samples 2012-11-10 04:59:55 +04:00
Andrey Kamaev
dad56e202f Rename sample & tutorial executables 2012-11-09 10:15:48 +04:00
Vladislav Vinogradov
beb377b38c gpu implementation of Dual TV-L1 Optical Flow 2012-11-02 19:51:43 +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
Andrey Kamaev
36f912261b Move gpu sample to gpu folder 2012-09-10 19:17:50 +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
Vladislav Vinogradov
beb3e6ff18 added GMG_GPU to bgfg_segm sample 2012-08-09 12:59:18 +04:00
Andrey Kamaev
a323da6fd5 Fixed some warnings and install problems on linux 2012-06-27 12:02:31 +00:00
Vladislav Vinogradov
e9e66e5796 added VIBE_GPU (background subtraction) to gpu module 2012-06-26 10:38:15 +00:00
Vladislav Vinogradov
d85ef03a42 added background subtraction sample for gpu module 2012-06-25 12:48:54 +00:00
Vladislav Vinogradov
3a4353f04d added FGDStatModel, MOG and MOG2 to gpu performance sample 2012-06-25 11:46:45 +00:00
Vladislav Vinogradov
ed8b6c798b copy 768x576.avi video to sample directory 2012-06-25 11:26:07 +00:00
Andrey Kamaev
e94e5866a1 Fixed mingw build warnings 2012-06-20 17:57:26 +00:00
Vladislav Vinogradov
2e2bd55729 new implementation of gpu::PyrLKOpticalFlow::dense (1.5 - 2x faster) 2012-06-15 11:02:33 +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
ca57239618 fixed some problems after r8280 (lost code) 2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
11eacb9d14 Bug #1823 : fixed patch size calculation in PyrLKOpticalFlow 2012-04-25 07:03:32 +00:00
Vladislav Vinogradov
092c1f98f6 fixed build of gpu demos pack 2012-04-25 06:27:55 +00:00
Vladislav Vinogradov
44eaeee865 refactored gpu BruteForceMather (made it similar to BFMatcher) 2012-04-24 07:56:33 +00:00
Vladislav Vinogradov
f65d841d6f fixed several warnings (VS2010, Win64)
added getParams method to VideoWriter_GPU
2012-04-23 14:22:02 +00:00
Vladislav Vinogradov
e29d41c885 minor fix in gpu video_writer sample 2012-04-18 11:49:17 +00:00
Vladislav Vinogradov
f4b4665940 added VideoReader_GPU 2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
2bfaf540a1 added VideoWriter_GPU 2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +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
Vadim Pisarevsky
4985c1b632 fixed hundreds of warnings from MSVC 2010. 2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
957e80abbd lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template. 2012-03-15 14:36:01 +00:00
Vladislav Vinogradov
ec5bdc7de8 added patch error calculation to gpu::PyrLKOpticalFlow 2012-03-05 10:36:57 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Vladislav Vinogradov
2d30480982 created wrappers for new NPP functions
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Alexey Spizhevoy
35d63083f9 Added Farneback's optical flow sample 2012-02-20 08:31:10 +00:00
Alexey Spizhevoy
2ad7add613 Minor refactoring of the GPU perf. sample 2012-02-17 07:02:11 +00:00
Alexey Spizhevoy
630d874e03 Updated the GPU performance sample 2012-02-16 13:08:22 +00:00
Alexey Spizhevoy
5c459aa815 Added the GPU version of the Farneback's optical flow 2012-02-16 11:23:51 +00:00
Vladislav Vinogradov
a10fed8fd1 added GoodFeaturesToTrackDetector_GPU and PyrLKOpticalFlow to gpu module 2012-02-13 12:57:27 +00:00
Vladislav Vinogradov
f883b31cfd updated performance sample 2012-02-08 11:02:32 +00:00
Vladislav Vinogradov
237b3ed3a0 fixed createOpticalFlowNeedleMap 2012-02-08 05:45:47 +00:00
Andrey Kamaev
5eb6ee6290 Fixing build with CUDA enabled 2012-02-03 12:54:52 +00:00
Andrey Kamaev
ee6fefc862 Fixing build with CUDA enabled 2012-02-03 12:35:39 +00:00
Andrey Kamaev
3ff438dc7a Fixing build with CUDA enabled 2012-02-03 12:15:27 +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
Vladislav Vinogradov
d38ca09738 added gpu::printCudaDeviceInfo to all samples 2012-01-30 07:20:09 +00:00
Anatoly Baksheev
2042e99cab gramma 2012-01-24 09:56:55 +00:00
Vladislav Vinogradov
59acbb1112 minor 2012-01-16 13:32:06 +00:00
Vladislav Vinogradov
9a2358628b minor fix 2012-01-16 13:22:28 +00:00
Vladislav Vinogradov
c4792c0102 updated optical_flow samples 2012-01-16 09:24:42 +00:00
Vladislav Vinogradov
a25b027ef7 updated gpu optical_flow sample 2012-01-11 13:05:03 +00:00
Vladislav Vinogradov
3aa537642d minor refactoring of gpu performance sample 2012-01-11 08:58:39 +00:00
Vladislav Vinogradov
5e38cf8042 added FAST_GPU and ORB_GPU classes 2011-12-27 09:33:20 +00:00
Vladislav Vinogradov
bd4239be7b moved OpenGL wrappers to separate header
added GlBuffer, GlTexture and GpuMat support to InputArray
replaced addTextOpenGl function by render + GlFont
2011-11-30 06:20:29 +00:00
Vladislav Vinogradov
2a4fb155e1 added OpenGL support to Gtk realization of highgui 2011-11-28 08:23:26 +00:00
Vladislav Vinogradov
c2783af781 added OpenGL support to highgui under WIN32 2011-11-21 11:58:52 +00:00
Vladislav Vinogradov
fcfa72081e moved GpuMat and DevMem2D to core module, some code refactoring 2011-11-09 13:13:52 +00:00
Vladislav Vinogradov
11a5e78042 fixed gpu samples build 2011-10-31 12:39:06 +00:00
Vladislav Vinogradov
09ba133ddf prepared GpuMat for moving to core module 2011-10-31 08:51:00 +00:00
Alexey Spizhevoy
a2090a44db Updated CLI for GPU samples 2011-10-24 08:34:15 +00:00
Vladislav Vinogradov
e7502e7641 implemented gpu::gemm via CUBLAS 2011-10-19 13:29:54 +00:00
Vladislav Vinogradov
b0536279eb added wrappers for BroxOpticalFlow and interpolateFrames 2011-10-17 13:12:39 +00:00
Vladislav Vinogradov
d3c4e90760 new optimized implementation of BruteForceMatcher_GPU (~2-3x faster) 2011-10-12 10:23:03 +00:00
Alexey Spizhevoy
8a799aa89a Updated optimal block size estimation for the convolve() function 2011-10-03 14:05:52 +00:00
Anatoly Baksheev
78e678b1f8 optflow_gpu compilation under ubuntu 2011-10-03 10:14:59 +00:00
Anatoly Baksheev
336e000ecc optical flow sample compilation under ubuntu 2011-10-03 10:05:41 +00:00
Anatoly Baksheev
5e831f7fca compilation under ubuntu 2011-09-30 12:00:44 +00:00
Andrey Kamaev
43ce5e6cc0 Fixed Linux build 2011-09-30 08:06:24 +00:00
Anton Obukhov
42c7aece36 [+] Added Brox optical flow (implementation courtesy of Michael Smirnov) 2011-09-29 14:46:39 +00:00
Vladislav Vinogradov
9da6d78989 optimized gpu filters, added buffered version for different filters 2011-09-28 11:52:26 +00:00
Vladislav Vinogradov
67a9b79433 added performance tests for gpu::reduce 2011-09-26 08:14:31 +00:00
Vladislav Vinogradov
b2079d6de1 implemented gpu::resize for all types 2011-09-12 10:13:14 +00:00
Vladislav Vinogradov
df9f707ff0 fixed bug in gpu::remap under win32 2011-09-06 13:42:50 +00:00
Vladislav Vinogradov
84022779a1 added bicubic interpolation to gpu::remap 2011-09-06 07:01:23 +00:00
Vladislav Vinogradov
47d68f6967 implemented gpu::remap for all types 2011-08-31 11:42:54 +00:00
Vladislav Vinogradov
5f9e47a9cd refactored gpu::BruteForceMatcher (moved some utility functions to device layer) 2011-08-29 11:31:52 +00:00
Vladislav Vinogradov
173ac5a64b optimized gpu pyrDown and pyrUp 2011-08-24 11:16:42 +00:00
Vladislav Vinogradov
5e9ae6b19f added TransformFunctorTraits, optimized some functions that use transform 2011-08-17 11:32:24 +00:00
Vladislav Vinogradov
6e3a1f7b49 implement optimized version of gpu::BruteForceMatcher::knnMatch when k == 2 2011-08-15 12:14:02 +00:00
Vladislav Vinogradov
8bb9e4302e added registerPageLocked/unregisterPageLocked functions
added convert functions to BruteForceMatcher_GPU
other minor fixes
2011-08-10 11:32:48 +00:00
Vladislav Vinogradov
12b7090a6f fixed some warnings under win64 2011-08-08 13:03:18 +00:00
Anatoly Baksheev
5c691907ed minor improvements in cmake-file for gpu samples 2011-08-08 12:16:23 +00:00
Vladislav Vinogradov
767ac9aa10 added gpu::Canny function 2011-08-08 08:53:55 +00:00
Vladislav Vinogradov
3ab2728da1 gpu device layer code refactoring 2011-08-03 12:10:36 +00:00
Vladislav Vinogradov
33df5ea07b added gpu::calcHist function 2011-08-01 13:15:37 +00:00
Vladislav Vinogradov
e746b3e8ae added buffered version of pyrDown and pyrUp
added stream support to downsample, upsample, pyrUp and pyrDown
2011-08-01 08:15:31 +00:00
Alexey Spizhevoy
a23406ea6c added missing header 2011-07-20 12:56:21 +00:00
Alexey Spizhevoy
674b763395 GPU: updated upsample, downsample functions, added pyrDown, pyrUp, added support of 16S filtering; put spherical warper on GPU (from opencv_stitching) 2011-06-30 14:39:48 +00:00
Vadim Pisarevsky
9df999154c fixed a few warnings and bugs, including ticket #1079 2011-06-12 20:29:50 +00:00
Alexey Spizhevoy
efe0b77416 reverted wrong commit for one of gpu samples 2011-06-09 10:21:02 +00:00
Alexey Spizhevoy
ace94d2ebf fixed bug in opencv_stitching (corrected resize images step), added matches checking (both 1->2 and 2->1 must be presented) 2011-06-09 10:16:10 +00:00
Anatoly Baksheev
ee3101ba1c removed cv_config 2011-06-09 08:25:36 +00:00
Anatoly Baksheev
22dbd002e6 fix compilation for macos 2011-06-03 08:13:03 +00:00
Anatoly Baksheev
68a2ec3394 compilation for macos 2011-06-01 15:42:11 +00:00
Anatoly Baksheev
1eba407378 compilation for macos 2011-06-01 15:35:30 +00:00
Vladislav Vinogradov
f906c9b259 added resetDevice function, removed MultiGpuManager 2011-06-01 10:11:27 +00:00
Vadim Pisarevsky
8ba6a54d28 fixed warning from GCC 2011-05-31 14:02:19 +00:00
Alexander Shishkov
33e71127f7 fixed problem with VideoInput on Windows when OpenCV compiled statically (ticket #573) 2011-05-30 13:32:57 +00:00