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
Joe Minichino
47d8187bc3
fixed outdated params setting
2015-05-28 15:20:08 +01:00
Maxim Kostin
3408114602
Added video face detection. Restructured code.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-28 13:42:59 +03:00
Joe Minichino
a4a2659dff
fixed digits.py sample to work with opencv 3
2015-05-27 15:43:52 +01:00
Maxim Kostin
aa932eab41
Adding WinRT face tracking sample. Works with asset images. Created by @ericmitt.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-27 14:55:47 +03:00
Alexander Alekhin
75558ae75c
Merge pull request #4058 from mshabunin:latch-sample
2015-05-26 16:26:57 +00:00
Samyak Datta
e9c765ee2c
C++ sample code to detect facial features
2015-05-26 18:08:26 +02:00
Maksim Shabunin
330b3e87eb
Fixed latch sample build without contrib
2015-05-26 15:57:07 +03:00
Vadim Pisarevsky
8fb37606f6
Merge pull request #4032 from mshabunin:fix-pkg-config
2015-05-26 12:47:14 +00:00
Vadim Pisarevsky
60064b3de7
Merge pull request #4015 from GilLevi:AddingLATCH
2015-05-25 13:09:49 +00:00
GilLevi
a4e5b09ea4
fixed whitespace issue
2015-05-25 01:28:05 +03:00
Vadim Pisarevsky
8e392251ba
Merge pull request #4016 from vladimir-dudnik:directx-opencl-sample
2015-05-22 13:21:36 +00:00
Maksim Shabunin
3863dc5b2b
Updated pkg-config generation, added sample makefile
2015-05-22 16:09:07 +03:00
Vladimir Dudnik
c64a15294d
short description moved to the beginning of file
2015-05-22 14:12:00 +03:00
laurentBerger
b204013483
back to #include "opencv2/cvconfig.h"
2015-05-21 20:22:57 +02:00
Vladimir Dudnik
892684ebe5
add short description
2015-05-21 17:08:13 +03:00
laurentBerger
b116d6c6e8
use ifndef HAVE_GTK
2015-05-21 14:57:49 +02:00
laurentBerger
a6a0fc5b21
replace "cvconfig.h" it with "opencv2/cvconfig.h".
2015-05-21 14:01:11 +02:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
GilLevi
05a45ef6dc
renamed LATCH
2015-05-21 00:04:24 +03:00
Vladimir Dudnik
af806bc816
replaced macros with template func
2015-05-19 16:08:25 +03:00
laurentBerger
268283ff16
suppress android and mac warnings
2015-05-16 22:54:53 +02:00
GilLevi
6613519c2e
added sample for LATCH
2015-05-16 22:37:38 +03:00
laurentBerger
546f70a6f0
some warnings and errors
2015-05-16 21:01:31 +02:00
GilLevi
f85eb23c3b
sample for LATCH
2015-05-16 21:15:09 +03:00
Vadim Pisarevsky
78e89ba3ff
Merge pull request #4001 from LaurentBerger:ExampleBLOB
2015-05-16 18:11:29 +00:00
laurentBerger
187ab0ca61
include cvconfig.h to use constant HAVE_OPENGL
2015-05-16 19:59:59 +02:00
laurentBerger
7cf5de0ed0
trailing whitespace and some bracket
2015-05-16 19:29:12 +02:00
laurentBerger
68e9d19743
An example how to use features2d for MSER. Data results are visualized in 3D using openglwith mouse or keyboard
2015-05-16 18:59:22 +02:00
Vladimir Dudnik
f0197006e0
removed original samples and replace them with new ones. modified new samples (reduce code duplication, add cmd line params and short description)
2015-05-16 00:40:05 +03:00
Maxim Kostin
3d20157d4f
Added sample Windows Universal application (UAP) using videoio logic for video preview and processing.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 18:03:06 +03:00
Vladimir Dudnik
3cb4954d70
fixed new blank line at EOF
2015-05-14 12:08:14 +03:00
GilLevi
a41ac8fd40
added sample code for LATCH
2015-05-13 21:20:28 +03:00
laurentBerger
06b0fa6fc2
BLOB_MSER avec opengl
2015-05-13 18:03:58 +02:00
Vladimir Dudnik
450a276f87
directx opencl interop samples (with copy from opencl image2d to buffer)
2015-05-13 01:51:54 +03:00
laurentBerger
780f4ae7c5
try to implement remark included in message
2015-05-12 19:01:05 +02:00
laurentBerger
dfc508bb15
problem float constant and position of > in vector
2015-05-11 13:45:08 +02:00
laurentBerger
05bc7621e6
trailing whitespace
2015-05-11 13:20:52 +02:00
laurentBerger
a94fdbe0f0
Example about BLOB with a new image in data folder
2015-05-11 13:13:20 +02:00
laurentBerger
e7fcffeead
Exxemple MSER et BLOB séparés
2015-05-11 12:48:18 +02:00
laurentBerger
16e20e5c73
An another improvement?
2015-05-09 10:29:53 +02:00
laurentBerger
9e97d7b4db
Etude de MSER
2015-05-09 08:44:18 +02:00
laurentBerger
26d7da68fc
warning C4101: 'e' line 146
2015-05-08 09:57:05 +02:00
laurentBerger
f6f5b6035b
trailing whitespace
2015-05-07 22:55:38 +02:00
laurentBerger
966d50762d
Try to include comment from @eduardo and @berak
...
Akaze descriptor with DESCRIPTOR_KAZE_UPRIGHT added
2015-05-07 22:48:13 +02:00
laurentBerger
3a53e726dd
example BLOB_MSER and fixed bug in blobdetector
2015-05-07 11:52:06 +02:00
laurentBerger
cfcef3ec98
File was not saved due to wrong file name.
...
Add a comment about bug 4308
2015-05-06 19:55:16 +02:00
laurentBerger
171b58e2ca
Example BLOB_MSER
2015-05-06 16:50:22 +02:00
laurentBerger
6b9e273f92
Essai examleBlob et MSER
2015-05-05 12:06:16 +02:00
laurentBerger
09930938e8
Trailing white space first step
2015-05-04 10:59:43 +02:00
laurentBerger
09e9e8ad9f
I have modified source file and add a chart to have distance between keypoint for decriptor function og matching algorithm
...
My english is not good so you can change some words in my comment
2015-05-04 10:36:24 +02:00
laurentBerger
9ddb8bdb8b
Problem with warning: comparison between signed and unsigned integer expressions
2015-05-03 14:08:24 +02:00
laurentBerger
56856a1810
Conversion size-t in int
2015-05-03 13:28:23 +02:00
laurentBerger
341de5d53f
trailing whitespace
2015-05-03 12:04:19 +02:00
laurentBerger
b28056e3dd
Trailing whitespace
2015-05-03 11:58:32 +02:00
laurentBerger
3e25c085ba
A sample program : how to use ORB AKAZE BRISK descriptors for matching.
...
see http://answers.opencv.org/question/61062/features2d-example/
2015-05-03 11:42:27 +02:00
Vadim Pisarevsky
08848c56b7
Merge pull request #3965 from Dikay900:2_4_diff_to_master_2
2015-04-28 10:47:05 +00:00
Pierre Moulon
901d4995e3
Fix a typo error
...
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
2015-04-25 15:07:17 +02:00
Adi Shavit
aad95c7d8c
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2015-04-25 14:54:35 +02:00
Dikay900
d9b7b300b4
fix qt example on 2.4 with vs2010 and higher
2015-04-25 14:46:17 +02:00
Brian Park
044de4105e
add input paramter checking that verifies the existance of the input files to stero_match example
...
remove the unnecessary header file
check input paramter by checking the image size
2015-04-25 14:46:17 +02:00
Chris Mayo
7a5aa06b9e
Act on INSTALL_PYTHON_EXAMPLES
...
Conflicts:
samples/CMakeLists.txt
2015-04-25 14:46:16 +02:00
Ben Hagen
a21fb63c28
store user-provided data in PlaneTracker class
2015-04-25 11:22:18 +02:00
Yang Fan
eaa9b78121
ENH: explicitly declared outputFilename to surpress error C2668
...
Conflicts:
samples/gpu/video_writer.cpp
2015-04-25 10:58:01 +02:00
ttagu99
a81374c1d7
findcontour_example check image empty
2015-04-24 21:58:31 +02:00
侯骥
66fc6126d2
Update MatchTemplate_Demo.cpp
2015-04-24 21:58:31 +02:00
Jay Bosamiya
8b58b59df4
Fix typo
2015-04-24 21:58:30 +02:00
RafaRuiz
f0595b8254
Update lkdemo.cpp because of memory leak
...
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
2015-04-24 21:58:29 +02:00
Pastafarianist
1e01441767
Fixed typo
2015-04-24 21:58:29 +02:00
Dikay900
c797746b6e
use constant instead of value backported from #785
2015-04-24 21:58:28 +02:00
Dikay900
1bf4427a5c
filename correction from #3217
2015-04-24 21:58:28 +02:00
Kevin Hughes
ac3ec0d96d
squashed #823
...
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions
2015-04-24 21:58:14 +02:00
Maximilien Cuony
5c6c537044
Fix typo in error for extrinsic parameters
2015-04-24 18:39:34 +02:00
Dikay900
f8c82fc214
update openni sample comments referring #81
2015-04-24 18:25:23 +02:00
Dikay900
9f7548ab89
update openni sample comments referring #81
2015-04-24 18:19:03 +02:00
Vadim Pisarevsky
8e493ef370
Merge pull request #3925 from ttagu99:findcontour_example2
2015-04-21 12:21:36 +00:00
Vadim Pisarevsky
887fe932cc
Merge pull request #3926 from stoneyang:stone
2015-04-21 12:20:42 +00:00
Maksim Shabunin
bb0631a365
Add sample cmake project
2015-04-16 17:33:38 +03:00
Yang Fan
3b177eaaa3
ENH: explicitly declared outputFilename to surpress error C2668
2015-04-14 13:39:14 +08:00
ttagu99
3c797b0ca5
findcontour_example check image empty
2015-04-14 10:01:53 +09:00
Maksim Shabunin
35b2139929
Basic HAL module
2015-04-07 18:16:22 +03:00
Vadim Pisarevsky
a035d39158
Merge pull request #3892 from MSOpenTech:imgcodecs-contrib
2015-04-02 11:53:55 +00:00
Vadim Pisarevsky
5ab26e3202
Merge pull request #3874 from paroj:calib_sample
2015-04-01 11:13:05 +00:00
Maxim Kostin
75850a1351
Added sample imgcodecs logic to winrt sample app
...
- Made use imread() in OcvImageProcessing sample.
- Added test/sample logic to verify file creation via imgcodecs.
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-31 17:09:09 +03:00
Pavel Rojtberg
7c5084e385
- update documentation
...
* correct the part about fixed aspect
* improve formatting
* add snippet markers to source
* replace inline code by @snippet
- do not run calibration twice when using a imageList
- make output consistent in itself (CamelCase vs no_camel_case) as well as with old camera calibrate sample
- respect write extrinsic/ points flags
- set the aspectRatio value when specified
- fix writing of calibration settings. also update grammar.
- fix intendation and remove some size_t -> int casts by using size_t
2015-03-31 15:45:57 +02:00
Vadim Pisarevsky
77cbddf715
Merge pull request #3847 from mshabunin:android-build
2015-03-26 16:56:49 +00:00
RafaRuiz
660a53e0e0
Update lkdemo.cpp because of memory leak
...
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
2015-03-24 09:06:55 +00:00
Maksim Shabunin
231685133e
OpenCV Manager: support 3.0.0 library
2015-03-19 15:27:14 +03:00
Maxim Kostin
349e3b546a
Fixed 'doc' builder warnings.
2015-03-18 17:44:49 +03:00
Maxim Kostin
5ec908c5f0
Added WinRT 8.1 Modern Desktop JavaScript sample
2015-03-18 16:31:27 +03:00
Vadim Pisarevsky
930808c22b
Merge pull request #3820 from LorenaGdL:patch-1
2015-03-13 13:20:09 +00:00
Alexander Alekhin
50b99e5aef
fix compilation on MSVS2010
2015-03-12 19:07:53 +03:00
LorenaGdL
b21b24fd8a
Update train_HOG.cpp
...
Incorrect number of input arguments in main function
2015-03-11 14:18:07 +01:00
StevenPuttemans
3a7ea37090
extra camera specific information for IP settings
2015-03-10 10:16:13 +01:00
Vadim Pisarevsky
c9ea878d10
Merge pull request #3722 from berak:py_houghlines_sample
2015-03-03 18:16:25 +00:00
Maxim Kostin
ad1149ff12
Enabled property sheets for WinRT related samples
2015-03-02 22:26:46 +03:00
Maxim Kostin
530c8dc0c0
Fixing 'doc' buildbot job: removing trailing whitespaces and tab indents
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
213a6bc5c4
Adding Widows Phone 8 sample apps
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:45 +03:00
Maxim Kostin
59d6a281cd
Added WinRT Universal Apps samples
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:44 +03:00
Maxim Kostin
5810845777
Added and updated WinRT samples
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:44 +03:00
Vadim Pisarevsky
22ad72d08e
Merge pull request #3690 from theodr:moprh_lines_detection_tut
2015-03-02 11:36:15 +00:00
Vadim Pisarevsky
e9d30a9383
Merge pull request #3746 from theodr:pca_tutorial
2015-03-02 11:29:33 +00:00
theodore
79bc85fb09
Introduction to PCA tutorial
2015-02-26 15:53:03 +01:00
theodore
96c824f375
Morphology Lines Extraction Tutorial
2015-02-24 14:33:15 +01:00
berak
c83044d45a
fix houghlines.py sample and tutorial
...
fix whitespace
2015-02-20 10:51:52 +01:00
Maksim Shabunin
79e8f0680c
Updated ml module interfaces and documentation
2015-02-17 11:46:14 +03:00
Maksim Shabunin
da383e65e2
Remove deprecated methods from cv::Algorithm
2015-02-16 15:28:54 +03:00
Maksim Shabunin
c85197da55
Fixed allocated vector size in ML ANN algorithm
...
- updated return value of points_classifier sample
2015-02-03 18:16:20 +03:00
Vadim Pisarevsky
e64fb44f67
Merge pull request #3632 from theodr:dist_transf_tutorial
2015-02-02 10:10:39 +00:00
tt
4ea2eceb70
Image Segmentation .cpp tutorial
...
Distance Transform tutorial fixes
Distance Transform fixes v.2
Distance Transform fixes v.3
Distance Transform fixes v.4
2015-01-27 16:44:52 +01:00
Vladislav Vinogradov
124ac15f1e
remove cuda module
2015-01-22 15:02:21 +03:00
Vladislav Vinogradov
ce0e595a4f
move the rest cuda functions to cuda legacy
2015-01-22 15:02:21 +03:00
Vadim Pisarevsky
3f1fb281be
Merge pull request #3635 from jet47:cuda-optflow-refactoring
2015-01-22 09:45:19 +00:00
Vadim Pisarevsky
9c81338cb9
Merge pull request #3505 from karelknoest:lsd_subpixel
2015-01-22 09:44:29 +00:00
Vladislav Vinogradov
710617034b
remove unused function from pyrlk_optical_flow sample
2015-01-21 15:50:22 +03:00
Vladislav Vinogradov
63ff39f9f3
remove obsolete gpu optical flow samples
2015-01-21 15:50:22 +03:00
Vladislav Vinogradov
b3a743f09a
fix gpu samples compilation
2015-01-21 15:50:22 +03:00
Vadim Pisarevsky
479cac2a14
Merge pull request #3626 from jet47:cuda-bgsegm-refactoring
2015-01-21 10:40:47 +00:00
karelknoest
1ded2de2dd
Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm.
2015-01-20 17:05:38 +01:00
StevenPuttemans
cf5a7b9679
remove an unused #endif
2015-01-20 15:41:39 +01:00
Vadim Pisarevsky
95ecdc3af9
Merge pull request #3600 from jet47:cuda-objdetect-module
2015-01-20 13:29:32 +00:00
Vadim Pisarevsky
f647054c8c
Merge pull request #3616 from marvins:gdal-fixes
2015-01-20 12:31:14 +00:00
Vadim Pisarevsky
696a6561d3
Merge pull request #3627 from cbenhagen:patch-1
2015-01-20 12:27:19 +00:00
Ben Hagen
5422cbcecb
make PlaneTracker class more thread-safe
2015-01-19 21:57:23 +01:00
Ben Hagen
3f8cefea0e
store user-provided data in PlaneTracker class
2015-01-19 21:51:19 +01:00
Vladislav Vinogradov
dae188d14f
move obsolete algorithms from cudabgsegm to cudalegacy:
...
* GMG
* FGD
2015-01-19 14:17:00 +03:00
Vadim Pisarevsky
381917b762
Merge pull request #3563 from cjmayo:pyexamples
2015-01-19 11:09:58 +00:00
Vadim Pisarevsky
5cc4aa0e93
Merge pull request #3554 from wangyan42164:match_template_mask
2015-01-19 11:03:44 +00:00
Vadim Pisarevsky
225c3e78cb
Merge pull request #3582 from ptzafrir:fix_samples
2015-01-19 10:53:42 +00:00
Vadim Pisarevsky
219d315c8d
Merge pull request #3615 from jaybosamiya:grabcuttypo
2015-01-19 10:50:52 +00:00
Vadim Pisarevsky
3a84444488
Merge pull request #3596 from jet47:cuda-features2d-refactoring
2015-01-19 10:48:18 +00:00
Alexander Smorkalov
911be68a41
Prevent native c/c++/ocl/gpu CMakeLists.txt install if samples are turned off.
2015-01-18 20:33:05 +03:00
Marvin Smith
91fbe00caa
Updated gdal tutorial to include comments.
2015-01-17 19:28:58 -08:00
Jay Bosamiya
10cc7c78dd
Fix typo
2015-01-17 22:53:30 +05:30
Yan Wang
46ed461e22
Add template match with mask.
...
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
2015-01-16 11:09:26 +08:00
Vadim Pisarevsky
df57d038b8
Merge pull request #3572 from berak:python_samples_30
2015-01-15 13:17:26 +00:00
Tzafrir
997dded1ac
add default file to load in case sample was run without command line arguments
2015-01-15 14:10:31 +02:00
Alexander Smorkalov
187befd665
Fixed installation of CMakeLists.txt and enabled GPU samples build in stand alone version.
2015-01-15 14:48:24 +03:00
Vadim Pisarevsky
16b56e71d9
Merge pull request #3561 from jet47:cuda-arithm-refactoring
2015-01-15 11:44:35 +00:00
berak
fd60e98c5b
fixes for latest changes in opencv3.0 api
...
fixes for latest changes in opencv3.0 api
waitKey() normalization
fixed mser bindings
2015-01-15 12:01:47 +01:00
Vladislav Vinogradov
734212a402
refactor CUDA CascadeClassifier
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
8257dc3c1e
refactor CUDA HOG algorithm:
...
use abstract interface with hidden implementation
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
f126f371b2
move CUDA object detection algorithms to separate module
2015-01-14 19:50:05 +03:00
Vladislav Vinogradov
8a178da1a4
refactor CUDA BFMatcher algorithm:
...
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
f960a5707d
refactor CUDA ORB feature detector/extractor algorithm:
...
use new abstract interface and hidden implementation
2015-01-13 18:03:57 +03:00
Vladislav Vinogradov
14ef62ed66
refactor CUDA FAST feature detector algorithm:
...
use new FastFeatureDetector abstract interface and hidden implementation
2015-01-13 18:03:56 +03:00
Alexander Smorkalov
3425c90b66
GPU samples with NVIDIA specific API excluded from build if CUDA disabled.
2015-01-13 14:58:51 +03:00
Alexander Smorkalov
b0c5f49170
Build fixes for GPU samples.
2015-01-13 14:39:18 +03:00
Vadim Pisarevsky
2ecca8f59c
Merge pull request #3566 from jet47:cuda-imgproc-refactoring
2015-01-13 11:21:51 +00:00
Alexander Smorkalov
c0d76ef984
driver_api_stereo_multi sample reworked to use parallel_for_ instead of parallel_do
2015-01-13 13:00:06 +03:00
Alexander Smorkalov
72063bf136
parallel_do replaced with parallel_for_ in driver_gpu_multi sample.
2015-01-13 12:53:13 +03:00
Basheer Subei
fd1cae0dcc
typo fix in instructions of fitline.py sample
2015-01-05 00:09:00 +03:00
Alexander Smorkalov
091c7a3821
OpenGL interop sample reworked not ot use cvconfig.h
2015-01-04 23:52:00 +03:00
Vadim Pisarevsky
6cb93445e1
Merge pull request #3548 from alalek:fix_sample_python
2014-12-31 09:31:33 +00:00
Alexander Smorkalov
e02418e904
parallel_do replaced by parallel_for_ in gpu/multi.cpp sample to get rid of cvconfig.h
2014-12-30 16:44:33 +03:00
Alexander Smorkalov
840088e021
Get rid of cvconfig.h in Latent SVM samples. Use common OpenCV parallel framework instead of direct TBB calls.
2014-12-30 15:52:23 +03:00
Vladislav Vinogradov
220d937d9a
removed buffered versions of histogram functions
...
used BufferPool mechanism instead
2014-12-30 15:37:45 +03:00
Chris Mayo
34f0da6010
Act on INSTALL_PYTHON_EXAMPLES
2014-12-30 10:13:10 +00:00
Vladislav Vinogradov
cd0e95de16
refactor cudaarithm reductions:
...
* remove overloads with explicit buffer, now BufferPool is used
* added async versions for all reduce functions
2014-12-30 11:06:33 +03:00
Maksim Shabunin
b4050c775e
Updated sample files documentation inclusions
2014-12-26 19:17:18 +03:00
Alexander Alekhin
63fc313d02
samples: fix python contants
2014-12-26 14:47:36 +03:00
Vladislav Vinogradov
53862687d5
rename CudaMem -> HostMem to better reflect its purpose
2014-12-23 17:42:49 +03:00
doltac
6cc5959356
Fixed typos in latentSVM detector demo.
2014-12-11 19:22:40 +09:00
Vadim Pisarevsky
46858c4328
Merge pull request #3463 from Dikay900:fix_sample_video_writer
2014-12-02 09:04:27 +00:00
Dikay900
44f629f99c
fix gpu sample performance test cpu part
2014-11-30 15:19:16 +01:00
Dikay900
8c919ed248
samples: gpu: fix include of TickMeter
2014-11-28 19:19:20 +01:00
Samyak Datta
a3f05474c9
C++ sample code to detect facial features
2014-11-12 23:35:02 +05:30
Vladislav Vinogradov
1189606cd8
fix gpu performance sample compilation
2014-11-12 18:07:20 +03:00
Alexander Alekhin
2e05f1e3f8
openni_capture sample: enable OpenNI2 if available
...
Sample works with OpenNI2 with minimal code changes (CAP_OPENNI -> CAP_OPENNI2)
2014-11-08 02:22:29 +03:00
Vadim Pisarevsky
fe4e1913f0
Merge pull request #3357 from briansp2020:master
2014-11-07 12:02:53 +00:00
Brian Park
e4fa217a62
remove the unnecessary header file
2014-11-05 20:12:18 -08:00
Vadim Pisarevsky
c91b0e7ac4
Merge pull request #3217 from avdmitry:samples_cpp_data
2014-11-05 14:57:46 +00:00
Vadim Pisarevsky
d052d863eb
Merge pull request #3315 from abak:seamless-refactor
2014-11-05 10:41:32 +00:00
Brian Park
9e3a2cbab2
check input paramter by checking the image size
2014-11-03 21:38:15 -08:00
Brian Park
5de5f26223
Merge remote-tracking branch 'upstream/master'
2014-10-29 23:15:22 -07:00
StevenPuttemans
7dce2d0b8f
fixing cap_pvpapi interface and making sure both AVT Manta and Proscilla
...
series are supported. Testing this with both cams for Windows and Linux
exhaustively.
Optimizing memory footprint by removing unused calls.
Adapted with the input of Shai
Added small example that illustrates how it should work.
2014-10-28 15:33:37 +01:00
Brian Park
f83a76cdeb
add input paramter checking that verifies the existance of the input files to stero_match example
2014-10-21 22:47:49 -07:00
Chuanbo Weng
2b52bb092a
Update hog.cpp
...
Update according to vbystricky's comments
2014-10-20 18:14:38 +08:00
Chuanbo Weng
7452eef6e9
Correctly enable OpenCL mode in tapi's hog example.
...
For current OpenCV-CL architecture, if the data buffer
allocated in UMat are cpu buffer(not ocl buffer) under
cpu mode, and then pass this UMat to an OpenCL kernel
as an argument, the OpenCL path will fail and fallback
to cpu mode. Take HOGDescriptor::oclSvmDetector as an example:
ocl::setUseOpenCL(false);
//data allocated in hog.oclSvmDetector will be cpu buffer
hog.setSVMDetector(HOGDescriptor::getDaimlerPeopleDetector());
ocl::setUseOpenCL(true);
//We enabled OpenCL, but hog.oclSvmDetector are cpu buffer,
//so it will fail in the function ocl_classify_hists
//when reach to this line
//idx = k.set(idx, ocl::KernelArg::PtrReadOnly(detector));
hog.detectMultiScale(img, found, hit_threshold, win_stride,
Size(0, 0), scale, gr_threshold);
Similar problems heppen on img_aux and img. So we should re-define
or re-set these UMat when do mode switch (CPU -> OpenCL) in order
to make their data be allocated by ocl and then OpenCL path will
succeed.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
2014-10-20 11:50:46 +08:00
Vadim Pisarevsky
d2b9dc5530
quickly corrected the previous refactoring of features2d: moved from set(SOME_PROP, val) to setSomeProp(val)
2014-10-18 20:44:26 +04:00
Vadim Pisarevsky
1176d4ef84
fixed some more compile errors and test failures
2014-10-17 15:02:56 +04:00
Vadim Pisarevsky
d36b546df8
trying to fix strange compiler bug
2014-10-17 14:56:58 +04:00
Vadim Pisarevsky
06d4aa6060
now all the samples and opencv_contrib compile!
2014-10-17 14:56:58 +04:00
Adrien BAK
82a5ff8540
fix warnings in samples
2014-10-15 11:09:33 +09:00
Vadim Pisarevsky
263fd81bbc
Merge pull request #3245 from avdmitry:hello_opencv_sample
2014-10-09 14:56:13 +00:00
Dmitriy Anisimov
4c08581e48
opencv_version
2014-10-04 21:39:57 +04:00
Dmitriy Anisimov
71348651eb
fixed display_image tutorial sample
2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
55c799a474
fixed warnings in documents
2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
ec03d6e6fc
removed cpp/tutorial_code/images/
2014-09-23 07:45:52 +04:00
Dmitriy Anisimov
1007c06d44
initial commit
2014-09-23 07:45:51 +04:00
Maksim Shabunin
5e3e438edb
Fix xfeatures2d dependencies
2014-09-19 16:41:33 +04:00
Juan Carlos Niebles
dc49e11527
removed setter methods, replaced by CV_PROP_RW macro
2014-09-18 09:39:35 -05:00
Juan Carlos Niebles
1162f0ed63
fixed whitespaces
2014-09-17 19:02:12 -05:00
Juan Carlos Niebles
f610c88103
extended python interface for KalmanFilter
2014-09-17 18:45:48 -05:00
Vadim Pisarevsky
60a1cc34b8
Merge pull request #3231 from vpisarev:reenable_cpp_samples
2014-09-17 10:53:21 +00:00
Vadim Pisarevsky
aa4a80defc
the samples from the main repository should not depend on modules from opencv_contrib
2014-09-17 13:49:48 +04:00
Maximilien Cuony
9ac0b06ff1
Fix typo in error for extrinsic parameters
2014-09-17 09:32:19 +02:00
Vadim Pisarevsky
f8254a1011
Merge pull request #3200 from pierriko:master
2014-09-14 18:50:33 +00:00
Pierrick Koch
aeda3d2d69
[samples/pyhton] fix common {LINE->CV}_AA
2014-09-09 11:04:24 +02:00
Maksim Shabunin
c42424f2db
Fixed android samples build
2014-09-08 23:22:29 +04:00
John Kua
fb0c0eaa7c
Fixed bad non-ASCII character in how_to_scan_images.cpp which causes a compile error
2014-09-04 16:36:36 -07:00
Rok Mandeljc
d9db950c0e
samples: gpu: performance: SURF is now part of opencv_xfeatures2d
2014-08-30 01:01:08 +02:00
Rok Mandeljc
db391fdfdd
samples: gpu: performance: BackgroundSubtractorMOG is now part of opencv_bgsegm module
2014-08-30 01:01:08 +02:00
Rok Mandeljc
fbf28bcc63
samples: gpu: performance: fix include path for opencv_xfeatures2d
...
As opencv_xfeatures2d is part of opencv-contrib and not opencv repository,
${OpenCV_SOURCE_DIR}/modules/modules/include is not a correct include
path - use ${opencv_xfeatures2d_SOURCE_DIR}/include instead
2014-08-30 01:01:08 +02:00
Rok Mandeljc
653bca8b74
samples: gpu: super_resolution: disable simple optical flow
...
The cv::superres::createOptFlow_Simple() function along with the
simple optical flow class implementation is currently commented out
in the superres module's code, so comment it out in the example as well.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
f739990f4c
samples: gpu: performance: removed FGDStatModel performance comparison test
...
The FGD background subtraction model was part of opencv_legacy module;
as it is gone now, it makes little sense to benchmark the GPU version,
either, so the whole test is removed.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
51311779b3
samples: gpu: performance: remove inclusion of opencv2/legacy.hpp header
...
The header is gone now, along with the opencv_legacy module.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
e0c8721830
samples: gpu: removed inclusion of non-existent opencv2/contrib/contrib.hpp header, re-introduced TickMeter class in a separate header
...
This patch removes inclusion of opencv2/contrib/contrib.hpp header,
which does not exist anymore due to removal of opencv_contrib module.
The samples including this header appear to be doing so in order to
use TickMeter class; therefore, the latter is now provided by tick_meter.hpp
header file, located in samples/gpu folder.
2014-08-30 01:01:08 +02:00
Rok Mandeljc
8908b22c9d
samples: gpu: removed softcascade example
...
The example in question cannot be compiled anymore as the softcascade
module has been removed in 3858f2291d
.
2014-08-30 01:01:08 +02:00
StevenPuttemans
d27e440b2a
continue fixing nonfree elements
...
fixed dependency of stitching module on xfeatures2d module as optional
fixed the initModule_xfeatures2d function that was called in module stitching since it is in another namespace than the standard cv one.
2014-08-28 13:30:47 +02:00
StevenPuttemans
564a8ed208
adapted all nonfree header inclusion since it doesn't exist anymore as a module
2014-08-25 21:31:34 +02:00
Vadim Pisarevsky
b56933d9dc
Merge pull request #3131 from znah:python_namespaces
2014-08-22 07:12:31 +00:00
Alexander Mordvintsev
74c77d826f
base class name resolution
...
fixed find_obj.py
2014-08-21 14:51:03 +04:00
Vadim Pisarevsky
b2cd954f24
Merge pull request #3042 from edgarriba:master
2014-08-20 13:18:37 +00:00
Vadim Pisarevsky
a223479107
Merge pull request #3099 from f-morozov:akaze_tutorial
2014-08-19 22:22:23 +00:00
f-morozov
886319c81d
AKAZE fixes and tracking tutorial
2014-08-19 16:35:20 +04:00
edgarriba
7e2bb63378
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-18 22:30:00 +02:00
Maksim Shabunin
108caae216
Modified logistic regression module according to comments
...
- Reworked documentation to reflect actual code
- Removed some unused variables
- Removed unnecessary 'cv::' modifiers
2014-08-18 19:13:59 +04:00
Maksim Shabunin
4667e18831
Updated logistic regression example
...
- Extracted common operations to separate functions.
- Activated first parameters set.
- Some output formatting.
- Fixed loop break condition in mini_batch_gradient function.
2014-08-18 19:06:58 +04:00
Maksim Shabunin
3e26086f82
Reworked ML logistic regression implementation, initial version
2014-08-18 19:06:58 +04:00
Maksim Shabunin
71770eb790
Fixed ML module build after merge
2014-08-18 19:06:58 +04:00
Rahul Kavi
3cdd2b2761
updated logistic regression program with new api example
2014-08-18 19:06:52 +04:00
Rahul Kavi
b8ea21b2e5
updated logistic regression sample program
2014-08-18 19:06:48 +04:00