generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,513 Commits 3 Branches 47 Tags
Commit Graph

45 Commits

Author SHA1 Message Date
Roman Donchenko
f07769e9d8 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
 2013-10-08 17:57:23 +04:00
Roman Donchenko
3cfad385ec Fix a -Wshadow warning in cap_openni.cpp. 2013-10-04 14:23:06 +04:00
Roman Donchenko
32630dbf61 Adapt cap_openni.cpp to the new Ptr. 2013-10-04 13:51:58 +04:00
Andrey Kamaev
3088808926 Fix build of various backends 2013-03-22 22:14:40 +04:00
Andrey Kamaev
762aefd71b Compile opencv_test_core with cv::String instead of std::string 
All tests passed!
 2013-03-22 22:14:22 +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
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
Vadim Pisarevsky
a09c88ab16 added Asus Xtion QVGA modes to the OpenNI backend (patch #1753) 2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
3243ad3483 applied patch #1473 (timestamp retrieval in OpenNI) 2012-10-09 21:52:41 +04:00
Sam Bromley
8506ce06c1 Fix missing remainder of line. 2012-07-26 12:46:51 -02:30
Sam Bromley
966a652142 Fix crash when polling for non-existent Kinects. 
If no Kinects are present, crash can result from
stepping beyond end of device list. Now we check
to ensure this does not happen.
 2012-07-26 12:36:21 -02:30
Maria Dimashova
f363c835ab fixed compilation error and some warnings if with_openni is true 2012-06-13 08:38:30 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Maria Dimashova
f70d171cef changed default parameter 2012-03-27 08:37:39 +00:00
Maria Dimashova
550fd8e57c added image and depth synchronization 2012-03-27 07:41:48 +00:00
Maria Dimashova
499efec5b0 removed debug log 2012-03-21 14:47:13 +00:00
Maria Dimashova
c1a6cb6221 added oni-files reading 2012-03-21 14:31:40 +00:00
Maria Dimashova
fedff0922e removed unnecessary members of CvCapture_OpenNI 2012-03-21 11:58:25 +00:00
Maria Dimashova
67d7669188 switched to use RunXmlScript always (missing '\n' at the end of xml script was a problem) 2012-03-21 08:56:38 +00:00
Maria Dimashova
baa81de122 renamed property of openni camera 2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a renamed property of openni camera 2012-03-16 09:08:18 +00:00
Maria Dimashova
930c7bf20e minor refactoring CvCapture_OpenNI 2012-03-15 15:55:07 +00:00
Maria Dimashova
c13febc4d4 minor refactoring CvCapture_OpenNI::CvCapture_OpenNI 2012-03-15 09:59:23 +00:00
Alexander Shishkov
6051e27a09 added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657 2012-03-12 16:07:42 +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
Maria Dimashova
ec150c24e3 added CV_CAP_PROP_OPENNI_REGISTRATION property for getting 2011-08-09 13:58:05 +00:00
Maria Dimashova
1f07209f6c fixed CvCapture_OpenNI constructor (removed all exceptions) (#1237) 2011-08-08 15:47:52 +00:00
Maria Dimashova
b64bb95860 added ability to reset view point of depth generator to normal one (#1195) 2011-07-13 17:05:57 +00:00
Maria Dimashova
8f4f982e5c added support of several kinects (#1105) 2011-06-09 11:22:48 +00:00
Maria Dimashova
c6e49402a5 changed temporary filename and aligned RGB data with XYZ data (#867) 2011-06-09 10:34:13 +00:00
Maria Dimashova
4a1ccbeee6 optimized retrievePointCloudMap (#1106) 2011-06-08 13:06:29 +00:00
Ethan Rublee
7d4f06b7f3 Attempting to add support for openni depth registration. 2011-06-07 03:19:38 +00:00
Maria Dimashova
e7e72d24d3 fixed compile error (ubuntu64) 2011-04-23 13:09:56 +00:00
Andrey Kamaev
b906ad3108 Test system included into Android build 2011-04-11 14:47:06 +00:00
Maria Dimashova
cbdc91889a fixed setProperty 2011-03-25 10:37:32 +00:00
Maria Dimashova
63c9b4cec1 fixed mirror property of kinect 2011-02-17 15:53:20 +00:00
Maria Dimashova
ad896ae640 refactored OpenNI integration 2011-02-04 13:41:10 +00:00
Maria Dimashova
152fefe854 minor changes 2011-01-31 08:24:30 +00:00
Maria Dimashova
d70d2edc9f changed returned value of unsupported property 2011-01-27 07:33:34 +00:00
Maria Dimashova
508aaa41f8 added ability to get and set some Kinect params 2011-01-26 10:38:31 +00:00
Maria Dimashova
68ed806be0 replaced own point cloud computing by OpenNI ConvertProjectiveToRealWorld() 2011-01-24 17:09:45 +00:00
Maria Dimashova
3a04d08bf7 added Kinect support (initial version without settings configuration yet) and sample on usage 2011-01-21 17:00:08 +00:00