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
