Vladislav Sovrasov
3a51cae208
Fix rectangle selection in some of python samples
2016-03-03 11:06:21 +03:00
Vladislav Sovrasov
ab4d375349
Add new tests on python
2016-03-03 11:06:20 +03:00
Vitaly Tuzov
25b4d8a1b5
Added images necessary for tests
2016-02-26 12:42:35 +03:00
Marina Noskova
53711ec29d
Deleted default value for parameters in docs.
...
Added some asserts.
2016-02-25 19:12:54 +03:00
Marina Noskova
74c87a26a5
Delete function areClassesEmpty().
2016-02-25 15:31:07 +03:00
Marina Noskova
f3c4a6aab8
Rename parameters lambda, gamma0 and c.
2016-02-24 13:22:07 +03:00
Maksim Shabunin
8c29380471
Merge pull request #6105 from mshabunin:tutorial-folder-correction
2016-02-15 13:10:45 +00:00
Eric Zavesky
77fa8d9d5a
- fix windows-based warnings for type casts
2016-02-15 05:37:54 -06:00
Marina Noskova
ff54952769
Corrected spelling mistakes
2016-02-15 14:35:36 +03:00
Eric Zavesky
335f7e7916
- trim whitespace, as required by build machine
2016-02-15 05:33:37 -06:00
Eric Zavesky
d7e57f2152
- fix typo from last minute change
2016-02-15 04:54:59 -06:00
Eric Zavesky
4c5af4f361
- add ROI selection, allow device input, use BB for area exclusion
...
- previously BB was ignored for first frame, now masks analysis area
- also allow real-time feedback of processing
2016-02-15 04:27:28 -06:00
Eric Zavesky
4546139844
- remove zero threshold that prevents ORB from finding any local features
2016-02-15 04:26:03 -06:00
Maksim Shabunin
6c0c0466c6
Tutorials: moved Megamind.avi files to samples/data folder
2016-02-12 13:44:14 +03:00
Maksim Shabunin
359acc0d33
Tutorials: moved imgcodecs and videoio tutorials to separate pages
2016-02-12 13:35:46 +03:00
Marina Noskova
5496dedd6a
Fixed warnings.
2016-02-10 19:46:24 +03:00
Marina Noskova
05353a1492
Removed trailing whitespaces
2016-02-10 16:59:12 +03:00
Marina Noskova
41c0a38344
Fixed test samples for tests with different borders
...
Added new test (separating two points)
2016-02-10 16:59:12 +03:00
Marina Noskova
bfdca05f25
Added margin type, added tests with different scales of features.
...
Also fixed documentation, refactored sample.
2016-02-10 16:59:12 +03:00
Marina Noskova
acd74037b3
Increasing the dimension of features space in the SVMSGD::train function.
2016-02-10 16:59:11 +03:00
Marina Noskova
40bf97c6d1
Refactored SVMSGD class
2016-02-10 16:56:14 +03:00
alcinos
6e3b90de9b
Add static creator for TVL1 optical flow class
2016-01-28 20:03:28 +01:00
Alexander Fedorov
474c53ac71
Fixed parser for img1_filename and img2_filename.
...
Without fixes after 68 line (img1_filename = parser.get<std::string>(0);) OpenCV Error:
./stereo_matching im0.png im1.png --max-disparity=16 --blocksize=17
OpenCV Error: Bad argument (undeclared position 0 requested) in getByIndex, file /home/entodi/opencv/modules/core/src/command_line_parser.cpp, line 169
terminate called after throwing an instance of 'cv::Exception'
what(): /home/entodi/opencv/modules/core/src/command_line_parser.cpp:169: error: (-5) undeclared position 0 requested in function getByIndex
2016-01-18 15:34:41 +03:00
BinMatrix
c7481c55f7
Fix the mouse bug and the problem of collapse
2016-01-13 19:04:17 +08:00
Alexander Alekhin
cdb9c60dcb
gpu samples: fix REMOVE_ITEM error
2015-12-31 02:24:54 +03:00
Ishank gulati
24da1ba3dc
added videoio docs and tutorials
2015-12-26 10:48:01 +05:30
Alexander Alekhin
613b289325
python: add launch script for winpack python demo
2015-12-18 15:59:02 +03:00
Alexander Alekhin
a8e2922467
rename samples/{python2 -> python}
2015-12-18 11:00:32 +03:00
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Vadim Pisarevsky
2ecb48921b
Merge pull request #5802 from bastelflp:py3samples_docstr
2015-12-18 07:20:53 +00:00
flp
0c5d9e18d1
Removed outdated tutorial link
2015-12-18 01:34:57 +01:00
Alexander Alekhin
03e74330fa
Merge pull request #5828 from mshabunin:CommandLineArgs
2015-12-17 17:46:37 +00:00
Vadim Pisarevsky
9aeb8c8d5a
Merge pull request #5810 from mshabunin:hal_interface
2015-12-17 16:48:02 +00:00
ValeryTyumen
297808e6b9
Feature #3957
2015-12-17 18:19:39 +03:00
Maksim Shabunin
c04d62db8b
HAL samples readme file updated
2015-12-17 16:09:36 +03:00
Maksim Shabunin
d214770d5b
HAL samples: renamed and added readme
2015-12-17 13:25:47 +03:00
Maksim Shabunin
84f37d352f
HAL moved back to core
2015-12-17 12:33:23 +03:00
flp
32737df1b5
Print found calibration data
2015-12-16 22:01:18 +01:00
Alexander Alekhin
491a3fdebc
android samples: force setVisibility (see #5812 )
2015-12-16 14:31:49 +03:00
Alexander Alekhin
3b87e3fa20
Merge pull request #5812 from qubick:master
2015-12-16 10:05:34 +00:00
qubick
5502f0b45d
surfaceview import
2015-12-15 12:35:21 -07:00
Alexander Alekhin
8f60740205
fix build warning (unreachable code) and exit error codes
2015-12-15 22:06:11 +03:00
qubick
1434f55cb9
camera view was enabled to visible when the app launched
2015-12-15 11:38:56 -07:00
Alexander Alekhin
31d0dcf28e
fixup
2015-12-15 15:54:45 +03:00
Maksim Shabunin
574280cd3a
Merge pull request #5784 from alalek:distrib_fix
2015-12-15 12:24:36 +00:00
flp
b6ce4a527e
added docstring to python files
2015-12-15 01:03:50 +01:00
flp
14c5ef8db4
Added .gitignore for tmp files created by examples
2015-12-15 01:03:50 +01:00
flp
006d5ac0a5
Adapted for py2/py3 compatibility
2015-12-15 01:03:50 +01:00
Vadim Pisarevsky
ba71caca04
fixed digits.py sample
2015-12-14 16:37:19 +03:00
flp
4ed2d6328b
Python samples adapted for Python3 compatibility
...
Common fixes:
- print function
- int / float division
- map, zip iterators in py3 but lists in py2
Known bugs with opencv 3.0.0
- digits.py, called via digits_video.py: https://github.com/Itseez/opencv/issues/4969
- gaussian_mix.py: https://github.com/Itseez/opencv/pull/4232
- video_v4l2.py: https://github.com/Itseez/opencv/pull/5474
Not working:
- letter_recog.py due to changed ml_StatModel.train() signature
2015-12-13 02:49:54 +01:00
Alexander Alekhin
1836d41b5c
warning fix (MSVS2015)
2015-12-12 15:23:31 +03:00
Alexander Alekhin
8f732f2cfe
fix samples deps
...
some tutorials depends on contrib modules
2015-12-12 15:23:31 +03:00
Deanna Hood
0d706f6796
Return uncompressed support vectors for getSupportVectors on linear SVM (Bug #4096 )
2015-12-10 18:31:02 +03:00
niederb
d8e3971e7f
Fixed variable importance in rtrees
2015-12-10 18:09:15 +03:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00
LaurentBerger
bef009c9dd
fixed #5005 : stitching_detailed.cpp
2015-11-23 21:55:59 +01:00
Vadim Pisarevsky
c4edd86aeb
Merge pull request #5400 from dtmoodie:thrust_tutorial
2015-11-23 18:36:42 +00:00
Maksim Shabunin
0d29774401
Merge pull request #5298 from slothspot:master
2015-11-22 18:08:21 +00:00
Maksim Shabunin
eebd4cad66
Fix compilation problems with XCode 7.1.1 and cmake 3.3.2
2015-11-17 18:52:55 +03:00
Dan
aa14b6d2f3
Merge branch 'thrust_tutorial' of http://github.com/dtmoodie/opencv into thrust_tutorial
2015-11-10 12:29:51 -05:00
Dan
01f40cfafc
Corrected the case where channel == -1
2015-11-10 12:29:29 -05:00
brossetti
4194b7effe
fixed bug on left mouse button click
...
Adding None as outImage in pos3 of cv2.drawKeypoints. Fixes bug that throws 'TypeError: Required argument 'outImage' (pos 3) not found' on left mouse button click
2015-11-09 04:37:59 -05:00
Viet Dinh
ed0065266e
update fixing bug #5599
2015-11-02 08:38:05 -05:00
Vadim Pisarevsky
7ca9e49749
Merge pull request #5607 from n3011:patch-1
2015-11-02 11:55:12 +00:00
Vadim Pisarevsky
d55e44f0b7
Merge pull request #5608 from n3011:patch-2
2015-11-02 11:14:39 +00:00
Vadim Pisarevsky
92298c88bd
Merge pull request #5609 from n3011:patch-3
2015-11-02 11:14:24 +00:00
Ishant Mrinal Haloi
47b2511f07
Update driver_api_stereo_multi.cpp
2015-11-02 15:08:27 +08:00
Ishant Mrinal Haloi
52b4fe63c1
Update cascadeclassifier_nvidia_api.cpp
2015-11-02 15:07:45 +08:00
Ishant Mrinal Haloi
46be45b4f7
Update driver_api_multi.cpp
2015-11-02 15:06:38 +08:00
Ishant Mrinal Haloi
64eb69cb15
Update multi.cpp
2015-11-02 15:05:45 +08:00
Alexander Alekhin
9a0beda037
Merge pull request #5489 from paroj:v4l2noconvert
2015-10-23 16:35:36 +00:00
Maksim Shabunin
490b327be9
Merge pull request #5365 from sturkmen72:patch-2
2015-10-22 12:25:48 +00:00
Alexander Alekhin
4dc2313527
Merge pull request #5552 from hyunkim9123:camshift-2.4
2015-10-21 06:13:38 +00:00
Suleyman TURKMEN
fd4761ba31
Update face detection samples
2015-10-20 19:09:21 +03:00
Maksim Shabunin
3119f0a61b
Merge pull request #5519 from hyunkim9123:camshift_py
2015-10-20 14:43:33 +00:00
Pavel Rojtberg
54e7f08760
add python sample to test/ showcase new cap_v4l2 features
2015-10-18 14:13:44 +02:00
paul.kim
78a566611d
Fix the issue in mouse click event
2015-10-17 10:42:48 +09:00
Alexander Smorkalov
bf41e791ff
Merge pull request #5514 from asmorkalov:as/nonfree-independent-samples
2015-10-15 10:56:23 +00:00
paul.kim
d5d16bb3b1
Fix the issue in mouse click event
2015-10-15 11:09:31 +09:00
Alexander Smorkalov
341e7b3be2
Fixed samples build with nonfree.
2015-10-14 16:19:37 +03:00
Alexander Smorkalov
bba8c0beac
Made samples build independent from nonfree module.
2015-10-14 12:56:58 +03:00
Rodrigo Benenson
d8e470fc30
CommandLineParser missing gpu option
...
As is it was not possible to use CUDA.
2015-10-13 19:04:06 +02:00
Alexander Smorkalov
ff00220302
Set of lintain warning fixes for -samples debian package.
2015-10-13 16:32:53 +03:00
Alexander Alekhin
0f1fdd885d
Merge pull request #5471 from StevenPuttemans:add_images_python_tutorials
2015-10-09 11:31:32 +00:00
Alexander Alekhin
441eeef319
Merge pull request #5470 from apavlenko:android_camera_gl_view
2015-10-08 13:31:51 +00:00
Andrey Pavlenko
24ca6aaada
fix build with CMake
...
now it builds by the command:
`cmake.exe -Wno-dev -GNinja -DCMAKE_MAKE_PROGRAM="path\to\ninja\ninja.exe" -DCMAKE_TOOLCHAIN_FILE=../opencv3/platforms/android/android.toolchain.cmake -DANDROID_ABI="armeabi-v7a with NEON" -DANDROID_SDK_TARGET=21 -DANDROID_NATIVE_API_LEVEL=14 -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DBUILD_ANDROID_EXAMPLES=ON -DINSTALL_ANDROID_EXAMPLES=ON -DWITH_OPENCL=YES -DANDROID_OPENCL_SDK=path\to\OpenCL ../opencv`
2015-10-08 13:48:46 +03:00
StevenPuttemans
913c266b4a
adding missing images from python tutorials, like chessboard.png, simple.jpg, home.jpg, fly.png, ...
2015-10-08 11:59:54 +02:00
Andrey Pavlenko
23fea91e84
minor fixes
2015-10-08 12:37:59 +03:00
Andrey Pavlenko
a041105491
refactoring Tutorial-4 using new OpenCV CameraGLSurfaceView
2015-10-08 01:26:54 +03:00
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
Kauê de Moraes Vestena
1bd18836d7
little fixes and correction of a conceptual error
...
Previously, there's no way to the user see the found corners, i've changed that.
In a cout, are write that: "average reprojection err = "
But it isn't a "reprojection error" at all, it is a mean of each EPIPOLAR error, wich occur when the product x' * F * x is not equal to zero.
(x and x' are the same points in the right and left scene)
(the RMS that explain the average absolute reprojection error is given by the return of the stereoCalibrate() function)
At least, i think it's interesting to initialize the camera matrices before.
Thank you all for this amazing code. Apologize my weak english.
2015-09-27 15:53:30 -03: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
Alexander Alekhin
58a11ac079
Merge pull request #5403 from sturkmen72:patch-9
2015-09-25 12:08:13 +00:00
Suleyman TURKMEN
69d84c8f3e
Update how_to_scan_images.cpp
2015-09-25 14:32:58 +03:00
Maksim Shabunin
09ba5a28d0
Merge pull request #5393 from enesates:patch-1
2015-09-25 07:35:47 +00: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
Enes Ateş
5df2713b16
XML file path correction
...
in documentation exact path is images/CameraCalibration/VID5
see also PR #5393
2015-09-24 10:34:42 +02: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
Enes Ateş
769fe82743
XML file path correction
...
in documentation exact path is images/CameraCalibration/VID5
2015-09-23 13:19:17 +02: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
Dmitry Melnichenko
319b6a447f
Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules
2015-09-03 17:16:59 +03:00
Dmitry Melnichenko
b484f377dd
Fix build of Java-Sbt sample
2015-09-03 15:18:42 +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
John Stowers
e05b6bb6e7
remove picloud from digits_adjust
...
the service has been closed since 2013/2014
2015-07-31 09:17:16 +02:00
John Stowers
c4c3f1b25e
fix digits.py to not ignore model parameters
...
otherwise model is only ever trained with default
parameters, and digits_adjust does nothing (for example)
2015-07-31 09:14:20 +02:00
Andrey Pavlenko
56bde913d4
adding mode switching via menu
2015-07-31 03:39:26 +03:00
Andrey Pavlenko
9ab291ea1c
adding displaying FPS
2015-07-31 01:52:10 +03:00
Alexander Alekhin
fe0a17e78f
fix build with Win7 SDK
2015-07-30 23:23:01 +03:00
Andrey Pavlenko
0185cb27eb
excluding libOpenCL.so from the APK
2015-07-30 23:18:45 +03:00
Alexey Ershov
ea10290153
change displaying of fps to time (ms)
2015-07-30 19:57:11 +03:00
Maksim Shabunin
6922b94894
Merge pull request #5093 from sturkmen72:patch-5
2015-07-30 13:04:48 +00:00
Alexander Alekhin
2b2bc83b61
Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop
2015-07-30 10:36:25 +00:00
Suleyman TURKMEN
9dd41a8187
Update how_to_scan_images.cpp
2015-07-30 13:17:17 +03:00
Vladimir Dudnik
6bd01a96d9
finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat.
2015-07-29 19:52:05 +03:00
Vladimir Dudnik
d4774ead43
d3d11-nv12 interop
...
fixed issues with ocl nv12 cvt kernel
finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)
an attempt to fix build issue
fix for non opencl build issue
fix typo
fix compilation warnings
fix compile issue for Mac (OpenCL)
add convertion from rgba to nv12 (still need to debug kernel)
remove empty line at the EOF
fixed compilation warning
2015-07-29 19:52:03 +03:00
Alexey Ershov
0a4830b3d5
added command line processing
2015-07-29 13:51:03 +03:00
Alexey Ershov
b102bc6678
fixed memory leaks
2015-07-29 11:07:11 +03:00
Andrey Pavlenko
c8f863dfc5
minor fixes
2015-07-29 00:13:35 +03:00
Andrey Pavlenko
0e4bb2b49f
adding OpenCV with TAPI (UMats)
2015-07-27 04:04:56 +03:00
Andrey Pavlenko
274aba1a89
adding OpenCL processing (Image2D-to-Image2D only, others will be added later)
2015-07-27 02:57:01 +03:00
Andrey Pavlenko
2a6d4b6ee2
Camera and Camera2 preview is rendered via OpenGL textures and can be modified on CPU via C++ code. No OpenCL yet.
2015-07-27 01:07:56 +03:00
Maksim Shabunin
ecd3661119
Merge pull request #4179 from sbokov:improvingStereoSGBM
2015-07-24 21:12:56 +00:00
sbokov
aea4157340
Adding new HAL-accelerated MODE_SGBM_3WAY
...
New mode is approximately 2-3 times faster than MODE_SGBM
with minimal degradation in quality and uses universal
HAL intrinsics. A performance test was added. The accuracy
test was updated to support the new mode.
2015-07-23 23:08:26 +03:00
Renato Florentino Garcia
ec0f901153
Remove an unneeded semicolon.
2015-07-21 14:54:06 -03:00
Alexander Alekhin
c0b544af70
Merge pull request #4209 from vladimir-dudnik:fix-opencl-opencv-interop-sample
2015-07-21 15:58:20 +00:00
Alexander Alekhin
c0ee03fab2
Merge pull request #4192 from avershov:opencl-opengl-buffer
2015-07-21 14:10:00 +00:00
Alexey Ershov
89392b2a6d
added convertToGLBuffer() & convertFromGLBuffer() functions; added OpenGL interop sample comment
...
rewrite & change convertFromGLBuffer() & convertToGLBuffer() into acquireGLBuffer() & releaseGLBuffer(), respectively
opengl sample: added buffer support
tested and fixed buffer support on Windows
change glFlush() call to glFinish()
added UMat::release() call; fixed functions' names
adopted & implemented API suggestion(s) from Alexander
fixed unreachable code warning
added more info to the mapGLBuffer/unmapGLBuffer description
2015-07-21 13:42:17 +03:00
Vladimir Dudnik
ef05318c69
fix opencl-opencv-interop.cpp issues reported by Dmitry Budnikov
2015-07-21 01:27:27 +03:00
Vladimir Dudnik
6c452addfe
changed output from fps to time (in msec). Notes for dx10 and dx11: the first measure is wrong (zero), the followiing are correct; measured time includes output text to surface.
2015-07-20 19:05:05 +03:00
Vladimir Dudnik
dee05f982b
compute fps changed (now only interop counts). fixed d3d10 and d3d11 print info method (there were issues with texture mapping)
2015-07-13 23:40:45 +03:00
Vladimir Dudnik
38723b0339
simplified sample's interface (remove odd "no processing" branch, add print to screen for processing mode)
2015-07-09 22:41:05 +03:00
Alexander Alekhin
f4cb8c0dfb
Merge pull request #4127 from avershov:opengl-opencl-sample
2015-07-02 11:24:10 +00:00
Vadim Pisarevsky
d0c43f16e0
Merge pull request #4155 from MSOpenTech:highgui_contrib
2015-06-29 12:44:16 +00:00
Alexey Ershov
8ed45609d0
fixed cleanup, fixed unused context
2015-06-29 11:46:31 +03:00
Maxim Kostin
ccdd1126f6
Updated sample to showcase highgui WinRT usage
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-06-26 23:41:39 +03:00
Alexander Alekhin
898b257261
replacement for #4160
2015-06-26 18:45:58 +03:00
Alexey Ershov
3f68787051
OpenGL OpenCL sample
...
057cd52 first versions: cv::ogl::convertFromGLTexture2D & cv::ogl::convertToGLTexture2D
5656e94 added autogenerated stuff for cl_gl.h
765f1fd resolved CL functions in opengl.cpp
9f9fee3 implemented function cv::ogl::ocl::initializeContextFromGLTexture2D()
a792adb cv::ogl::ocl::initializeContextFromGLTexture2D() - added linux support (glx.h)
51c2869 added missing error message in function cv::ogl::ocl::initializeContextFromGLTexture2D()
513b887 fixed extension call in function cv::ogl::ocl::initializeContextFromGLTexture2D()
475a3e9 added CL-GL interop Windows sample (gpu/opengl_interop.cpp)
07af28f added building of CL-GL interop sample - Windows only
befe3a2 fixed whitespace errors & doxygen warnings (precommit_docs)
551251a changed function name to cv::ogl::ocl::initializeContextFromGL(), removed unused argument
4d5f009 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR
9fc3055 changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH
6d31cee Revert "changed CL_DEVICES_FOR_GL_CONTEXT_KHR to CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KH"
cc6a025 added texture format check in cv::ogl::convertFromGLTexture2D()
063a2c1 CL-GL sample: added Linux implementation (Xlib/GLX)
c392ae9 fixed trailing whitespace
85a80d0 fixed include files
ae23628 excluded samples/opengl from build case 2
9870ea5 added android EGL support
530b64c added doxygen documentation comments to CL-GL interop functions
2015-06-26 14:15:12 +03:00
LaurentBerger
2f8ef61618
move data/detect_blob.png in samples/data
2015-06-22 17:51:01 +02:00
Vladimir Dudnik
217dd63e02
OpenCV-OpenCL interop (PR #4072 ):
...
Commits:
added new function, cv::ocl::attachContext(String& platformName, void* platformID, void* context, void* deviceID) which allow to attach externally created OpenCL context to OpenCV.
add definitions of clRetainDevice, clRetainContext funcs
removed definitions for clRetainContext, clRetainDevice
fixed build issue under Linux
fixed uninitialized vars, replace dbgassert in error handling
remove function which is not ready yet
add new function, cv::ocl::convertFromBuffer(int rows, int cols, int type, void* cl_mem_obj, UMat& dst, UMatUsageFlags usageFlags = cv::USAGE_DEFAULT) which attaches user allocated OpenCL clBuffer to UMat
uncommented clGetMemObjectInfo definition (otherwise prevent opencv build)
fixed build issue on linux and android
add step parameter to cv::ocl::convertFromBuffer func
suppress compile-time warning
added sample opencl-opencv interoperability (showcase for cv::ocl::convertFromBuffer func)
CMakeLists.txt modified to not create sample build script if OpenCL SDK not found in system
fixed build issue (apple opencl include dir and spaces in CMake file)
added call to clRetainContext for attachContext func and call to clRetainMemObject for convertFromBuffer func
uncommented clRetainMemObject definition
added comments and cleanup
add local path to cmake modules search dirs (instead of replacing)
remove REQUIRED for find_package call (sample build together with opencv). need to try standalone sample build
opencl-interop sample moved to standalone build
set minimum version requirement for sample's cmake to 3.1
put cmake_minimum_required under condition, so do not check if samples not builded
remove code dups for setSize, updateContinuityFlag, and finalizeHdr
commented out cmake_minimum_required(VERSION 3.1)
add safety check for cmake version
add convertFromImage func and update opencl-interop sample
uncommented clGetImageInfo defs
uncommented clEnqueueCopyImageToBuffer defs
fixed clEnqueueCopyImageToBuffer defs
add doxygen comments
remove doxygen @fn tag
try to restart buildbot
add doxygen comments to directx interop funcs
remove internal header, use fwd declarations in affected compile units instead
2015-06-19 13:33:22 +03:00
Alexander Alekhin
6ab9df5208
Merge pull request #4132 from mshabunin:fix-java-package
2015-06-18 16:13:23 +00:00
Ruslan Baratov
83b882039e
Update samples/cpp/example_cmake: no need to use include_directories
2015-06-17 17:53:05 +02:00
Maksim Shabunin
bfa77ff5a4
Increase android samples versions
2015-06-17 18:10:28 +03:00
sbokov
5123c3e52e
Added ground-truth disparity map for 'aloe'
2015-06-14 23:59:48 +03:00
Maksim Shabunin
39fdcf4df3
Merge pull request #4083 from mshabunin:java-engine
2015-06-03 17:17:36 +00:00
Maksim Shabunin
7ee79b73f6
AndroidMgr: fixed package build
2015-06-03 19:01:48 +03:00
berak
851ce27240
http://code.opencv.org/issues/4359 2.4 branch
2015-06-03 07:48:29 +02:00
berak
737a1e2f12
http://code.opencv.org/issues/4359 , for master
2015-06-03 07:44:46 +02:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Vadim Pisarevsky
24dea1c616
Merge pull request #3984 from LaurentBerger:ExampleCppORB
2015-05-29 21:36:43 +00:00
Evgeny Agafonchikov
fd860d7cd0
Adding backslash in macro-based paths
...
of WINRT samples
This removes requirement to add OPENCV_WINRT_INSTALL_DIR with backslash in the end
in case trailing slash is presented VS handles duplicated slashes w/o issues
2015-05-29 09:36:42 +03:00
Vadim Pisarevsky
b46719b093
Merge pull request #4074 from vpisarev:objdetect_fixes
2015-05-28 19:43:51 +00:00
Vadim Pisarevsky
8b8fc9e66b
Merge pull request #4070 from techfort:fixpythonsample
2015-05-28 18:06:17 +00:00
Vadim Pisarevsky
036c438904
make facedetect.py work when the nested cascade is not specified
2015-05-28 19:01:56 +03:00
Vadim Pisarevsky
5e095c8fbd
Merge pull request #4022 from LaurentBerger:ExampleBLOB_MSER
2015-05-28 15:00:36 +00:00
Vadim Pisarevsky
f7ad192842
Merge pull request #4063 from Dikay900:2_4_to_master
2015-05-28 14:49:13 +00:00
Vadim Pisarevsky
58cf11bd44
Merge pull request #4069 from MSOpenTech:sample-face-contrib
2015-05-28 14:48:00 +00:00