mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 22:44:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
16,963 Commits 6 Branches 128 Tags 3 GiB
f332f98757
Commit Graph

2138 Commits

Author SHA1 Message Date
Dan Moodie
f332f98757 Removed last trailing whitespace. Can't believe I missed it. 2015-10-05 20:21:46 -04:00
Dan
e4184195a2 Looks like something automatically added tabs back in after I already fixed the white space. :/ 2015-09-28 09:37:10 -04:00
Dan
3efe131480 Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial 
Conflicts:
	samples/cpp/tutorial_code/gpu/gpu-thrust-interop/Thrust_interop.hpp
 2015-09-25 08:58:53 -04:00
Dan
ab84de967e More whitespace fixes. 2015-09-25 08:56:37 -04:00
Dan Moodie
7376c5311b Fixed tabs in whitespace. 2015-09-24 14:29:17 -04:00
Dan
12dcb1555e Missed one conversion of CV_TYPE to cv::DataType 2015-09-24 10:01:26 -04:00
Dan
00c2930709 improved comments. 2015-09-24 09:32:46 -04:00
Dan
23fc5930b7 Improved thrust interop tutorial. 2015-09-24 09:32:38 -04:00
Dan
09d392f09d Added thrust tutorial. 2015-09-24 09:32:27 -04:00
Dan
a80e0cf8bd Added tutorials for using thrust. 2015-09-24 09:32:18 -04:00
Alexander Alekhin
acec99876d Merge pull request #5363 from avershov:opencl-vaapi-detect 2015-09-24 12:32:03 +00:00
Alexey Ershov
5feca50f58 changed device detection procedure, added resizing surface to bigger size 
removed unused context_id2; changed blur size 7x7 to 3x3; added short comments
removed unnecessary call to convertFromVASurface()
replaced dumpSurface() with writeImage()
added infile cmdline parameter, input image loaded by imread()
 2015-09-23 17:35:49 +03:00
Alexander Alekhin
44ab680613 Merge pull request #5341 from blebo:py3compat 2015-09-21 11:47:26 +00:00
Vadim Pisarevsky
9533982729 Merge pull request #5272 from avershov:opencl-vaapi-fallback 2015-09-14 11:54:20 +00:00
Adam Gibson
4f2612fcfd Removed trailing whitespace from squares.py compatibility comment. 2015-09-14 13:03:16 +08:00
Adam Gibson
a413423ff6 Reverted _doc.py to Python 2-only version. Interim measure to prevent docs from failing during build, until all samples are updated with Python 2/3 compatibility. 2015-09-14 12:24:08 +08:00
Adam Gibson
b57be28920 Various Python samples updated for Python 2/3 compatibility. 2015-09-14 00:00:22 +08:00
Alexey Ershov
22bb5d1fcc implemented sample build in fallback mode without interop 2015-09-10 19:30:19 +03:00
Alexey Ershov
f533c05644 sample changed to execute only one mode (interop on/off) per run 2015-09-10 15:41:04 +03:00
Vadim Pisarevsky
6208ab4e49 Merge pull request #5304 from paroj:calib_feye 2015-09-09 11:00:40 +00:00
Vadim Pisarevsky
8660d550d3 Merge pull request #5302 from berak:patch-2 2015-09-09 10:34:29 +00:00
Alexey Ershov
e0b3751c17 added run iteration without timing to complete internal initializations 2015-09-08 21:01:57 +03:00
berak
602bd60c3a Update cloning_gui.cpp 2015-09-04 17:13:58 +02:00
Pavel Rojtberg
d0e16b21d4 add support for fisheye camera model 2015-09-04 15:54:34 +02:00
berak
dc265071d0 Update PnPProblem.cpp 2015-09-04 10:57:33 +02:00
Alexey Ershov
68a0347ff9 fallback path & sample timing implemented 
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
 2015-09-04 02:42:49 +03:00
Andrey Pavlenko
74fcefedcb giving a chance for OpenCL 1.1 devices 2015-08-27 14:05:32 +03:00
Andrey Pavlenko
8031742817 unused imports clean-up 2015-08-27 14:05:31 +03:00
Andrey Pavlenko
43b76e548b adding NO_PROCESSING (i.e. just preview) mode 2015-08-27 14:05:31 +03:00
Andrey Pavlenko
016011fdf8 fixing start faulure on some devices; syncronization improvements 2015-08-27 14:05:31 +03:00
Vadim Pisarevsky
96fa0ef752 Merge pull request #5115 from ManuelFreudenreich:hog_variable 2015-08-25 14:45:53 +00:00
Alexander Alekhin
1b1246cbae samples: fix OpenCL detection / build warning 2015-08-24 15:52:14 +03:00
Alexander Alekhin
44f8670719 Merge pull request #5171 from avershov:opencl-vaapi-interop 2015-08-21 12:47:14 +00:00
Alexey Ershov
a8656ea20f implemented core support & sample 
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
 2015-08-21 02:44:03 +03:00
Alexander Alekhin
ca5e07d342 Merge pull request #5199 from TheodoreT:tickmeter_update 2015-08-17 17:18:31 +00:00
theodore
9449af8ada 1e-3 -> 1e3 2015-08-17 15:52:16 +02:00
Ilya Lavrenov
7da16d6f47 used proper method 2015-08-17 01:44:50 +03:00
theodore
6d68f72473 bug fix fro the TickMeter class 2015-08-15 14:12:40 +02:00
Alexander Alekhin
03bab0fc0d tutorial-4-opencl: enable build with OpenCV 2015-08-13 13:32:23 +03:00
Alexander Alekhin
e1ad86c1fa android samples: update way to attach native part of OpenCV 
OPENCV_ANDROID_SDK - OpenCV Android SDK location (or OpenCV build dir)
Can be passed via ndk-build parameter or environment variable.
 2015-08-12 18:37:29 +03:00
Alexander Alekhin
d789c810bf Merge pull request #4239 from apavlenko:android_ocl_sample2 2015-08-12 14:00:36 +00:00
ManuelFreudenreich
89889ae8ea changed hog to work with variable parameters and changed the hog sample to test it with more options 
added comments and tests
 2015-08-12 09:16:20 +02:00
Alexander Alekhin
c119e04947 fix opengl sample build on Linux (#5067) 2015-08-11 22:49:19 +03:00
Alexey Ershov
c7f420ba75 applied changes proposed in 5122 2015-08-06 20:55:41 +03:00
Adam Geitgey
e976c448b7 Prevent grabcut, houghcircles and houghlines python2 demos from running automatically while browsing demos in the demo list viewer 2015-08-04 14:01:51 -07:00
Alexander Alekhin
da948c82b4 Merge pull request #5106 from vladimir-dudnik:opencl-opengl-upd 2015-08-03 09:57:06 +00:00
Alexander Alekhin
0f8c46f368 Merge pull request #5107 from vladimir-dudnik:d3d-interop-upd 2015-08-03 09:56:37 +00:00
Vadim Pisarevsky
02906bf23a Merge pull request #5102 from nzjrs:fix-python-digits 2015-08-03 05:40:24 +00:00
Vladimir Dudnik
57bff43aec fixed not initialized nv12_cpu_copy surface, remove odd code 2015-08-01 02:10:05 +03:00
Vladimir Dudnik
5c4c8bcea3 update opencl-opengl interop sample (remove odd no processing branch) 2015-08-01 01:16:06 +03:00