20 Commits

Author SHA1 Message Date
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
8c9c2b3a03 Fix build on Windows with OpenGl enabled
There was missing windows.h include in OpenGL interop code.
2012-11-09 10:00:24 +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
0442bca235 Revert "partially recovered binary compatibility (ticket #2415)"
This reverts commit 94b97b7a631abb1f42b4f66cfc7149e6e46203c8.
2012-10-16 19:37:12 +04:00
Vadim Pisarevsky
94b97b7a63 partially recovered binary compatibility (ticket #2415) 2012-10-08 17:06:05 +04:00
Anatoly Baksheev
55b1d7c097 added CUDA_DISABLER preprocessor commands 2012-10-01 23:57:38 +04:00
Vadim Pisarevsky
0bd68a70f1 fixed #2297, #2300; fixed several warnings 2012-08-28 13:45:35 +04:00
Andrey Kamaev
f2d3b9b4a1 Warning fixes continued 2012-06-09 15:00:04 +00:00
Vladislav Vinogradov
f65d841d6f fixed several warnings (VS2010, Win64)
added getParams method to VideoWriter_GPU
2012-04-23 14:22:02 +00:00
Andrey Kamaev
b538210804 Fixed Linux build with OpenGL but without CUDA 2012-03-15 15:08:21 +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
ade7394e77 refactored and fixed bugs in gpu warp functions (remap, resize, warpAffine, warpPerspective)
wrote more complicated tests for them
implemented own version of warpAffine and warpPerspective for different border interpolation types
refactored some gpu tests
2012-03-14 15:54:17 +00:00
Vladislav Vinogradov
5c0f2f8ea1 reused buffer in GlTexture::copyFrom(GpuMat) 2012-02-27 13:22:41 +00:00
Anatoly Baksheev
84db4eb6fa fixed ~200 warnings for windows
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Vladislav Vinogradov
cdae0743ab fix OpenGL render functions
fix createOpticalFlowNeedleMap
2012-01-18 08:27:08 +00:00
Vladislav Vinogradov
a25b027ef7 updated gpu optical_flow sample 2012-01-11 13:05:03 +00:00
Vladislav Vinogradov
a2697b18e2 minor fix 2011-11-30 07:38:45 +00:00
Vladislav Vinogradov
fa93b724ee minor 2011-11-30 07:19:09 +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