Commit Graph

240 Commits

Author SHA1 Message Date
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