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
Rahul Kavi
7612e7af05
fixed trailing white-space in sample program for logistic regression
2014-08-18 19:06:48 +04:00
Rahul Kavi
3a6466d2e1
updated logistic regression sample program
2014-08-18 19:06:48 +04:00
Rahul Kavi
8355293306
added program to demonstrate use of logistic regression classifier
2014-08-18 19:06:36 +04:00
Rahul Kavi
62470d8a33
added sample data file to test logistic regression program
2014-08-18 19:06:36 +04:00
Vadim Pisarevsky
9a5aa4b23c
trying to solve compile problems; temporarily disabled some tests for just added optimization algo's
2014-08-14 14:37:30 +04:00
Vadim Pisarevsky
00b2124876
fixing more compile problems with Java bindings etc
2014-08-14 13:48:52 +04:00
Vadim Pisarevsky
a602185fb6
Merge pull request #3097 from mshabunin:gdal-support
2014-08-13 19:26:10 +00:00
mshabunin
3ed89a8879
Merge with master and fix conflicts
2014-08-13 18:24:11 +04:00
Adil Ibragimov
8a4a1bb018
Several type of formal refactoring:
...
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
2014-08-13 15:21:35 +04:00
edgarriba
301ed34142
removed old headers
2014-08-12 17:36:23 +02:00
edgarriba
7da9800694
removed old headers
2014-08-12 17:22:35 +02:00
edgarriba
4a214c08e5
removed old code
2014-08-12 17:07:38 +02:00
edgarriba
1dec1645e5
Merge branch 'master' of https://github.com/Itseez/opencv
2014-08-12 16:45:22 +02:00
Vadim Pisarevsky
31df47b6ea
moved nonfree and a part of features2d to opencv_contrib/xfeatures2d
2014-08-11 23:26:39 +04:00
edgarriba
afdb67b462
SOLVEPNP_* flags
2014-08-11 16:28:09 +02:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
07744af790
Merge pull request #3066 from vpisarev:minor_fixes
2014-08-11 10:27:30 +00:00
edgarriba
b7a19a9a5f
Removed Timer
2014-08-11 11:06:05 +02:00
edgarriba
c7f6c0cb9f
Fixed warnings + RANSAC confidence to double
2014-08-11 10:17:42 +02:00
Vadim Pisarevsky
d0137b6d2d
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
2014-08-10 23:24:16 +04:00
edgarriba
bc250c2e3f
bug fixed
2014-08-09 19:15:46 +02:00
edgarriba
80b4f99b1e
bug fixed
2014-08-09 18:16:44 +02:00
edgarriba
d09b404178
tutorial update
2014-08-09 17:32:52 +02:00
edgarriba
7ecad71ab0
fixed warnings
2014-08-09 17:18:47 +02:00
edgarriba
8c4b8cc0b4
fixed warnings
2014-08-09 17:14:24 +02:00
Vadim Pisarevsky
68305703bd
modified farneback sample to use T-API
2014-08-08 22:45:07 +04:00
edgarriba
3f5d3b2d40
video opening path modified
2014-08-08 15:36:27 +02:00
edgarriba
7d8a16ae39
remove unused tutorials
2014-08-08 14:45:43 +02:00
edgarriba
8b732e086d
updated ransanc model
2014-08-08 13:52:15 +02:00
edgarriba
c07cd007eb
Multi class tutorial compilation
2014-08-08 11:46:26 +02:00
edgarriba
8c08258cf2
moved headers
2014-08-07 13:06:24 +02:00
edgarriba
3a2cf37115
fixed conflicts
2014-08-07 12:41:47 +02:00
edgarriba
837f001789
update cmake
2014-08-07 11:55:17 +02:00
edgarriba
381574bdb7
Modified cmake
2014-08-07 11:33:32 +02:00
edgarriba
f1b6809eee
Updated Utils functions
2014-08-06 10:05:26 +02:00
edgarriba
2881f2a096
Fixed warnings
2014-08-06 09:21:38 +02:00
edgarriba
d2665b655e
Fixed warnings
2014-08-06 08:41:14 +02:00
edgarriba
e14f91dd37
Update headers
2014-08-06 08:18:11 +02:00
edgarriba
ddf5c86f3a
Added code
2014-08-06 08:12:55 +02:00
edgarriba
57d2cb8962
deleted: src/CsvReader.cpp
...
deleted: src/CsvReader.h
deleted: src/CsvWriter.cpp
deleted: src/CsvWriter.h
deleted: src/Mesh.cpp
deleted: src/Mesh.h
deleted: src/Model.cpp
deleted: src/Model.h
deleted: src/ModelRegistration.cpp
deleted: src/ModelRegistration.h
deleted: src/PnPProblem.cpp
deleted: src/PnPProblem.h
deleted: src/RobustMatcher.cpp
deleted: src/RobustMatcher.h
deleted: src/Utils.cpp
deleted: src/Utils.h
deleted: src/main_detection.cpp
deleted: src/main_registration.cpp
deleted: src/main_verification.cpp
deleted: src/test_pnp.cpp
2014-08-06 08:11:03 +02:00
edgarriba
43301096d3
Update tutorial
2014-08-05 20:06:47 +02:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
edgarriba
7b0be9cf8f
Update code
2014-08-05 17:27:20 +02:00
edgarriba
0d2bc9b0a1
Removed whitespaces
2014-08-05 17:02:06 +02:00
edgarriba
55819ae464
Tutorial code restructure
2014-08-05 15:48:54 +02:00
edgarriba
23785faf02
Update for NON BOOST libraries
2014-08-05 14:47:06 +02:00
edgarriba
16e750dd37
Update for Boost libraries
2014-08-05 14:02:23 +02:00
edgarriba
1727e0acf6
Update for Boost libraries
2014-08-05 14:00:23 +02:00
edgarriba
dfa3ccdea9
Update for Boost libraries
2014-08-05 13:43:01 +02:00
edgarriba
a3e74ec521
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
2014-08-05 12:59:47 +02:00
Vadim Pisarevsky
432b7cb235
Merge pull request #3032 from vpisarev:refactor_ml2
2014-08-04 14:51:38 +00:00
Vadim Pisarevsky
cb9b88e65b
fixed more compile warnings on Windows
2014-08-04 14:22:31 +04:00
Vadim Pisarevsky
c20ff6ce19
made everything compile and even run somehow
2014-08-03 01:41:09 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
05164bf713
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
Vadim Pisarevsky
10b60f8d16
continuing refactoring ml samples; added "max vote" response to ANN_MLP. Probably, should make it in less hacky way
2014-07-31 14:12:10 +04:00
Vadim Pisarevsky
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
Vadim Pisarevsky
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
f-morozov
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
edgarriba
85ccac2633
Added help()
2014-07-30 15:23:52 +02:00
edgarriba
4a86900761
Added help()
2014-07-30 13:32:27 +02:00
edgarriba
69f1ee8732
Code tutorial
2014-07-30 13:08:19 +02:00
edgarriba
6ff58f02e2
Code tutorial
2014-07-30 12:57:18 +02:00
edgarriba
94968c81e0
Code tutorial
2014-07-30 12:57:11 +02:00
edgarriba
b58979d057
Code tutorial
2014-07-30 12:57:04 +02:00
edgarriba
38c2cc8521
Code tutorial
2014-07-30 12:56:55 +02:00
edgarriba
31bec45998
Code tutorial
2014-07-30 12:56:46 +02:00
edgarriba
b33a2f24fa
Code tutorial
2014-07-30 12:56:30 +02:00
edgarriba
9d18f5c458
Code tutorial
2014-07-30 12:56:22 +02:00
edgarriba
6f5876f8f7
Code tutorial
2014-07-30 12:55:35 +02:00
edgarriba
2848f43acc
Code tutorial
2014-07-30 12:54:49 +02:00
edgarriba
319dbd2eb7
Code tutorial
2014-07-30 12:53:43 +02:00
edgarriba
924e062426
Code tutorial
2014-07-30 12:53:24 +02:00
edgarriba
3b24aa2441
Code tutorial
2014-07-30 12:53:14 +02:00
edgarriba
be4c1afb0b
Code tutorial
2014-07-30 12:53:06 +02:00
edgarriba
550e3721ae
Code tutorial
2014-07-30 12:51:59 +02:00
edgarriba
64c164c111
Code tutorial
2014-07-30 12:39:46 +02:00
edgarriba
74e52df3cd
Code tutorial
2014-07-30 12:33:27 +02:00
edgarriba
7334e54a63
Code tutorial
2014-07-30 12:31:19 +02:00
siddharth
88d05a89d4
removed build error
...
Whitespaces removed
2014-07-29 00:15:11 +05:30
siddharth
14d0b763ec
changed demo tutorial path
2014-07-29 00:15:11 +05:30
Vadim Pisarevsky
1ad9827fc4
removed ERFilter (to be moved to opencv_contrib/modules/text) and lineMOD (to be moved to opencv_contrib/modules/rgbd)
2014-07-28 16:48:53 +04:00
Vadim Pisarevsky
ee90b88dd7
Merge pull request #2720 from pglotov:master
2014-07-25 12:54:22 +00:00
vbystricky
fd51c133df
Add depends from highgui to imgcodecs and videoio. And include header from imgcodecs and videoio to imgcodecs
2014-07-21 15:10:41 +04:00
Vadim Pisarevsky
8f8450793a
Merge pull request #2964 from vbystricky:highgui_split
2014-07-16 19:29:36 +00:00
Petr Glotov
7a77cf584a
added timelapse
2014-07-15 09:32:47 -07:00
Vadim Pisarevsky
cf3757448d
Merge pull request #2965 from soulslicer:patch-2
2014-07-15 09:44:32 +00:00
Vadim Pisarevsky
b1793e2fb9
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
2014-07-15 08:09:04 +00:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
Andrey Pavlenko
64d8cf1e2e
improving face-rec sample:
...
* CSV can contain dir-s and wildcards
* save trained model
2014-07-12 19:28:43 +04:00
Marvin Smith
67e23ed972
Fixing double to uchar conversion warning.
2014-07-11 07:33:42 -07:00
Raaj
6e022dcb06
Update facedetect.cpp
...
Somebody forgot to add curly brackets
2014-07-10 17:44:40 -07:00
Roman Donchenko
a3bde36c84
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/contrib/doc/facerec/facerec_api.rst
modules/contrib/include/opencv2/contrib/contrib.hpp
modules/contrib/src/facerec.cpp
modules/core/include/opencv2/core/mat.hpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/highgui/src/loadsave.cpp
modules/imgproc/src/pyramids.cpp
modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
modules/python/src2/gen.py
modules/python/test/test.py
modules/superres/test/test_superres.cpp
samples/cpp/facerec_demo.cpp
2014-07-08 14:33:56 +04:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Adi Shavit
7674f3ddbf
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2014-07-03 22:14:58 +03:00
Marvin Smith
561703ca27
Fixed the compiler warnings for the demo program.
2014-07-01 17:04:28 -07:00
Marvin Smith
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
Roman Donchenko
e8850bf84a
Merge pull request #2626 from KayKwon:matlab_formatter
2014-06-26 17:40:26 +04:00
Vadim Pisarevsky
07c0d50edf
put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.
2014-06-24 21:16:09 +04:00
Vadim Pisarevsky
3858f2291d
removed contrib, legacy and softcsscade modules; removed latentsvm and datamatrix detector from objdetect. removed haartraining and sft apps.
...
some of the stuff will be moved to opencv_contrib module.
in order to make this PR pass buildbot, please, comment off opencv_legacy, opencv_contrib and opencv_softcascade test runs.
2014-06-24 19:18:51 +04:00
Neo Alienson
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
侯骥
055adc2302
Update MatchTemplate_Demo.cpp
2014-06-11 10:29:30 +02:00
Roman Donchenko
1f4ddbe5b6
Merge pull request #2705 from KonstantinMatskevich:face_recognition_labels_info
2014-06-10 12:24:56 +04:00
Alexander Alekhin
15b6fd2ec4
android: allow to build & run examples without Android OpenCV Manager
2014-06-06 18:01:04 +04:00
Konstantin Matskevich
8d4a76925c
fixed binary compatibility
2014-05-21 09:25:15 +04:00
Roman Donchenko
3d7a457c97
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/introduction/linux_install/linux_install.rst
modules/core/doc/operations_on_arrays.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/gpu/src/cuda/resize.cu
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/video/src/bgfg_gaussmix2.cpp
2014-05-19 18:39:20 +04:00
Vladislav Vinogradov
55a714c83b
fix cv::kmeans function
...
reshape input matrix, since the function works with data
as with [N x dims] matrix
2014-05-13 18:00:17 +04:00
Konstantin Matskevich
aa76ef9a98
fixes
2014-05-08 15:55:55 +04:00
Konstantin Matskevich
36afd4ef55
added additionalInfo in faceRecognition
2014-05-07 16:29:55 +04:00
KayKwon
e13e3be16e
Merge branch 'master' into matlab_formatter
2014-04-16 11:13:02 +09:00
KayKwon
84257b57d0
Fix for (Bug #2789 )
...
Add MatlabFormatter for matlab style output.
See http://code.opencv.org/issues/2789
2014-04-16 10:56:27 +09:00
Alexander Alekhin
c1ea6f3c42
TAPI: stitching: improve warpers
2014-04-11 13:01:07 +04:00
Alexander Alekhin
1d9808e5d5
TAPI: stitching, replaced Mat->UMat/_Array
2014-04-11 13:01:06 +04:00
Alexander Alekhin
03773cb117
remove ippasync samples from build without IPP-A
2014-04-09 18:58:53 +04:00
Andrey Pavlenko
9ec823d800
Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert
2014-04-08 11:05:30 +04:00
Elena Gvozdeva
f9c5289483
fixed
2014-04-07 18:53:07 +04:00
Elena Gvozdeva
037ac27ec8
Added SharedMatrix
2014-04-03 14:53:27 +04:00
Elena Gvozdeva
fa2d79a15b
Added IPP Async converters, doc and sample
2014-04-01 16:47:29 +04:00
Roman Donchenko
f77c68e0fa
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/imgproc/src/opencl/integral_sqrsum.cl
modules/nonfree/doc/feature_detection.rst
modules/nonfree/include/opencv2/nonfree/ocl.hpp
modules/nonfree/src/surf_ocl.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
modules/ocl/test/test_imgproc.cpp
2014-03-31 14:42:00 +04:00
Martin Jul
73042b32e1
Fixed typos in "matching"
2014-03-26 23:29:48 +01:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Roman Donchenko
a1e5bd71f1
Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control
2014-03-19 14:49:22 +04:00
Alexander Smorkalov
b4e4f13f9e
Superres module enabled for Android. GPU samples build fixed for Android.
2014-03-18 17:07:19 +04:00
Roman Donchenko
a489d86e5f
Merge pull request #2460 from berak:b_3598_24
2014-03-17 15:52:56 +04:00
berak
5f94a205d1
fixed h / s ranges in histogram_calculation tutorial
...
literalinclude
literalinclude, dropped :lines:
2014-03-17 11:01:02 +01:00
Roman Donchenko
95a55453df
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/perf/perf_pnp.cpp
modules/contrib/src/imagelogpolprojection.cpp
modules/contrib/src/templatebuffer.hpp
modules/core/perf/opencl/perf_gemm.cpp
modules/cudafeatures2d/doc/feature_detection_and_description.rst
modules/cudafeatures2d/perf/perf_features2d.cpp
modules/cudafeatures2d/src/fast.cpp
modules/cudafeatures2d/test/test_features2d.cpp
modules/features2d/doc/feature_detection_and_description.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/imgproc/perf/opencl/perf_blend.cpp
modules/imgproc/perf/opencl/perf_color.cpp
modules/imgproc/perf/opencl/perf_moments.cpp
modules/imgproc/perf/opencl/perf_pyramid.cpp
modules/objdetect/perf/opencl/perf_hogdetect.cpp
modules/ocl/perf/perf_arithm.cpp
modules/ocl/perf/perf_bgfg.cpp
modules/ocl/perf/perf_blend.cpp
modules/ocl/perf/perf_brute_force_matcher.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/perf/perf_gftt.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_imgwarp.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_matrix_operation.cpp
modules/ocl/perf/perf_ml.cpp
modules/ocl/perf/perf_moments.cpp
modules/ocl/perf/perf_opticalflow.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/video/src/lkpyramid.cpp
modules/video/src/precomp.hpp
samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Ilya Lavrenov
099ea91823
typos
2014-03-04 12:47:40 +04:00
Roman Donchenko
db85c35e69
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/basicretinafilter.hpp
modules/contrib/src/magnoretinafilter.hpp
modules/contrib/src/parvoretinafilter.hpp
modules/contrib/src/retinacolor.hpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/highgui/src/cap_tyzx.cpp
modules/ocl/perf/perf_filters.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/test/test_filters.cpp
modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Roman Donchenko
af8aa8a2fa
Merge pull request #2433 from ilya-lavrenov:typos
2014-03-03 12:20:35 +04:00
Ilya Lavrenov
eedf86402d
typos
2014-03-02 21:04:17 +04:00
Arun JVS
31fb7c4fec
Fixed Bug #3568 : Build fails with WITH_OPENGL=ON
2014-02-25 14:34:32 +05:30
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Roman Donchenko
a0bb74a086
Merge pull request #2337 from pmoulon:master
2014-02-17 12:24:48 +04:00
Pierre Moulon
f3f8b843b6
Fix a typo error
2014-02-14 12:21:35 +01:00
Roman Donchenko
a1de9e9ad5
Merge pull request #2329 from ilya-lavrenov:macosx_ogl
2014-02-14 14:38:37 +04:00
Roman Donchenko
88f993dbda
Deleted an assignment to a variable that doesn't exist.
2014-02-14 14:37:56 +04:00
Ilya Lavrenov
b92a46c130
some more fixes
2014-02-13 23:47:18 +04:00
Alexander Smorkalov
7da3e98dfd
Application pause/resume fix for Android sample NativeActivity.
2014-02-13 16:47:02 +04:00
Ilya Lavrenov
879c0196d4
enabled OpenGL on MacOSX
2014-02-13 00:17:15 +04:00
Sven Wehner
f7041bacc0
grabcut.py sample: Allow drawing rect from bottom/right
...
The grabcut sample script isn't able to create rectangles correctly that are
drawn from e.g. bottom-right to top-left.
This small commit uses four min() calls to determine the correct
top-left point of the rectangle.
It also removes some unnecessary white spaces before colons.
2014-02-10 16:53:17 +01:00
Alexander Smorkalov
6ae4a9b09b
Multiple improvements in OpenCV examples build.
...
EMBED_CUDA and FORCE_EMBED_OPENCV flags added to cmake macro add_android_project;
INSTALL_CUDA_LIBRARIES option added to OpenCV.mk
opencv_dynamicuda library installation with enabled OPENCV_INSTALL_MODULES flag fixed;
CUDA initialization apportunity added to OpenCVLoader.initDebug();
Tutorial-4-CUDA sample reimplemented with static OpenCV and CUDA initialization.
2014-02-06 15:32:57 +04:00
Roman Donchenko
721d0145e0
Merge pull request #2002 from abak:stereo_calibrate
2014-02-05 17:47:27 +04:00
Ilya Lavrenov
2e8579fe9b
cleaned up super_resolution sample from old OCL
2014-02-05 00:28:10 +04:00
Ilya Lavrenov
c7fe162829
renamed **2 -> **
2014-02-04 19:55:11 +04:00
Andrey Pavlenko
92c8b94ba9
Merge pull request #2265 from vpisarev:ocl_facedetect_amd3
2014-02-04 00:39:09 +04:00
Vadim Pisarevsky
b8c6adc569
Merge pull request #2178 from Nerei:viz_backport
2014-02-03 16:16:51 +04:00
Roman Donchenko
652a0bd5ce
Merge pull request #2262 from SpecLad:merge-2.4
2014-02-03 15:33:41 +04:00
Vadim Pisarevsky
30593ee55e
3rd attempt to prepare patch with improved OpenCL kernels of CascadeClassifier.
2014-02-03 15:12:27 +04:00
Roman Donchenko
2bbda9d225
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/cudaimgproc/test/test_color.cpp
modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/test/test_core.cpp
modules/gpu/test/test_imgproc.cpp
modules/java/generator/src/cpp/VideoCapture.cpp
samples/gpu/performance/CMakeLists.txt
samples/tapi/CMakeLists.txt
2014-02-03 13:23:59 +04:00
Vladislav Vinogradov
214cbabc40
update stitching sample
2014-02-03 12:55:03 +04:00
Ilya Lavrenov
f8dd9960af
one more ocl deletion
2014-02-01 21:50:14 +04:00
Ilya Lavrenov
0f168936a0
OCL module 2 trash
2014-01-31 13:19:16 +04:00
Roman Donchenko
afa62c4161
Merge pull request #2212 from SpecLad:hog-sample-const-mat
2014-01-29 17:20:25 +04:00
Alexander Smorkalov
39201e68e2
Code review notes fixed.
...
Env setup for testing package implemented using /etc/profile.d;
Variable with path for all native samples added;
Path for test binaries and test data updated.
2014-01-27 18:47:09 +04:00
Roman Donchenko
6a511755b2
Fixed build for samples/cpp/train_HOG.cpp.
...
get_hogdescriptor_visu is passed img->clone(), which is not usable
as a non-const reference (and it doesn't modify the argument, anyway).
2014-01-27 17:39:33 +04:00
Alexander Smorkalov
f332cba14b
OpenCV C/C++/OCL/CUDA samples install path fixed. Install rools for tests added.
2014-01-27 15:49:24 +04:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Konstantin Matskevich
07778e1760
fixes
2014-01-24 13:37:19 +04:00
Konstantin Matskevich
450ea3131f
samples
2014-01-24 12:59:19 +04:00
Andrey Pavlenko
1400f53436
Merge pull request #2184 from ilya-lavrenov:bioinspired2contrib
2014-01-21 23:27:16 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Andrey Pavlenko
c8afe7efc6
Merge pull request #1320 from mbarnach:svm_hog
2014-01-21 19:23:04 +04:00
Ilya Lavrenov
5d206059a8
moved bioinspired to opencv_contrib
2014-01-21 18:02:53 +04:00
Anatoly Baksheev
130914d9f4
fixed documentation warnings
2014-01-21 02:15:37 +04:00
Roman Donchenko
fee2ed37fc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/core/include/opencv2/core/mat.hpp
modules/core/src/algorithm.cpp
modules/core/src/arithm.cpp
modules/features2d/src/features2d_init.cpp
modules/gpu/include/opencv2/gpu/gpu.hpp
modules/gpu/perf/perf_imgproc.cpp
modules/imgproc/src/generalized_hough.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/video/src/tvl1flow.cpp
modules/video/src/video_init.cpp
2014-01-14 11:53:59 +04:00
Ilya Lavrenov
118709fd9f
added OpenCL accelerated warpers
2014-01-10 18:16:56 +04:00
Roman Donchenko
a13e32f5ab
Merge pull request #2115 from nghiaho12:kmeans_sample
2014-01-09 16:58:29 +04:00
Nghia Ho
bf4994554d
Removed unecessary initialisation of Mat centers.
2014-01-09 21:04:17 +11:00
Ilya Lavrenov
6b9ebcbf3d
deleted extra semicolons
2014-01-07 02:52:30 +04:00
Nghia Ho
601b7d1dd3
Fixed a valgrind 'Conditional jump or move depends on uninitialised value(s)' on cv::kmeans(...). The original code used points(sampleCount, 1, CV_32FC2), which confused generateCentersPP into thinking it is a 1 dimensional center, instead of 2. As a result it would set only the x variable and leave y unitialised.
2014-01-06 20:19:07 +11:00
Ilya Lavrenov
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
2013-12-30 03:19:17 +04:00
Ilya Lavrenov
63e4af8536
added the first T-API example - CamShift tracking
2013-12-29 14:36:59 +04:00
Alexander Smorkalov
cea9a97434
CUDA support check added.
2013-12-26 14:52:41 +04:00
Alexander Smorkalov
b3eee49451
New sample for CUDA on Android added.
2013-12-26 14:52:41 +04:00
Roman Donchenko
3c4b24d531
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/highgui/src/cap.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/color.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
Roman Donchenko
f22d9a232d
Merge pull request #2022 from asmorkalov:ocv_dynamic_cuda
2013-12-23 12:45:49 +04:00
Roman Donchenko
6e22be4100
Merge pull request #2003 from vbystricky:intelperc_camera_2.4
2013-12-20 17:06:27 +04:00
Roman Donchenko
b633c73c46
Merge pull request #1994 from StevenPuttemans:bugfix_3431
2013-12-20 11:57:30 +04:00
Alexander Smorkalov
529bd41751
Build fixes for case where HAVE_CUDA==OFF.
2013-12-20 11:37:15 +04:00
Vadim Pisarevsky
a1784b7320
converted old haar cascades to the new format; added the conversion function; added OpenCL optimization into CascadeClassfier; optimized the data structures and CPU code for the stump case.
2013-12-19 14:48:42 +04:00
Vadim Pisarevsky
ec3f22cee2
renamed OpenCL kernel filename; made some final changes
2013-12-19 14:29:28 +04:00
Andrey Pavlenko
8c60498673
adding timing for multi-threaded case
2013-12-18 17:02:39 +04:00
Vladimir Bystricky
dd71bef6f5
Fix errors in example (samples/cpp/intelperc_capture.cpp)
2013-12-18 09:59:24 +04:00
Andrey Pavlenko
e719bee2b8
minor refactoring, no functional changes
2013-12-18 00:15:02 +04:00
Vladimir Bystricky
63ae0eeba5
Fix build errors
2013-12-17 18:39:52 +04:00
Andrey Pavlenko
bd91b39593
Merge pull request #1917 from alalek:ocl_d3d
2013-12-17 16:44:27 +04:00
Vladimir Bystricky
cc08e00876
Fix notes about cmake files. Fix build warning.
2013-12-17 16:13:55 +04:00
Roman Donchenko
e49b8dee40
Merge pull request #1881 from pentschev:defaultNorm_master
2013-12-17 13:53:59 +04:00
Roman Donchenko
52a785e95a
Merge pull request #1996 from SpecLad:merge-2.4
2013-12-17 13:21:48 +04:00
Vladimir Bystricky
4088013251
Add set/get depth generator properties by default. Add documentation
2013-12-17 12:00:40 +04:00
Adrien BAK
c5c3fd4443
modify signature of stereoCalibrate for consistency
2013-12-17 14:53:44 +09:00
Roman Donchenko
9d8d70d6ca
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
2013-12-16 15:02:12 +04:00
StevenPuttemans
12c25b9310
Fixed suggestion of bugfix 3431
...
Seems correct to me and builds fine
2013-12-16 11:05:53 +01:00
StevenPuttemans
e4b41d38f1
Fixed descripotorsCount to descriptorsCount
...
See feature 2862
2013-12-16 10:47:24 +01:00
Alexander Alekhin
11b9d5bf4d
core: added DirectX interop implementation (OpenCL) with samples
2013-12-13 19:02:41 +04:00
Vladimir Bystricky
e8d2a9752b
Add support Creative Senz3D camera by Intel Perceptual Computing SDK
2013-12-13 17:25:16 +04:00
Mimmmo Cosenza
f07e9e7c5f
add clojure sample
2013-12-11 13:26:47 +01:00
Ilya Lavrenov
1015c5c24d
fixed facedetect sample
2013-12-11 15:08:49 +04:00
Vadim Pisarevsky
302a5adcc2
converted Haar cascades to the new format; now they are handled with C++ code.
2013-12-10 22:54:37 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Peter Andreas Entschev
6f3163f62d
DescriptorExtractor: added defaultNorm() to return default norm type.
...
Added the defaultNorm() method to the DescriptorExtractor class. This method returns the default norm type for each descriptor type. The tests and C/C++ samples were updated to get the norm type directly from the DescriptorExtractor inherited classes.
This was reported in feature report #2182 (http://code.opencv.org/issues/2182 ). It will make it possible to get the norm type usually applied matching method for each descriptor, instead of passing it manually.
2013-12-09 09:54:42 -02:00
Alfonso (the fonz) de la Osa
df0c43321d
--no-display property fix in stereo_match.cpp sample
2013-12-09 10:55:44 +00:00
Ilya Lavrenov
926cab2baa
fixed warnings
2013-12-06 15:20:29 +04:00
Andrey Pavlenko
894724eaf0
minor improvements
2013-12-06 14:49:36 +04:00
Konstantin Matskevich
7a78559708
some fixes
2013-12-06 12:12:24 +04:00
Konstantin Matskevich
0a1ff0d42d
multithreading facedetector
2013-12-05 09:47:36 +04:00
Konstantin Matskevich
e38ba1999b
facedetect
2013-12-05 09:20:36 +04:00
Baichuan Su
632b21e090
Modify default setting, using ocl method when have ocl module
2013-12-04 18:26:54 +04:00
Baichuan Su
2cf16db683
Add Macro to decide using ocl method or not.
2013-12-04 18:26:54 +04:00
Baichuan Su
00300baa53
Add OpenCL SVM paths for bagofwords_classification and points_classifier samples.
2013-12-04 18:26:54 +04:00
siddharth
778edff9e1
Added comment in demo file
2013-12-04 19:18:00 +05:30
siddharth
33e6c07485
Removed build errors and removed test images
...
Removed conflict
Error fix 1
Error fix 2
Error fix 3
Error fix 3
Error fix 4
Error fix 5
Error fix 6
Error fix 7
Error fix 8
Error fix 9
Error fix 10
Error fix 11
Error fix 12
Errors fixed
Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth
f85a615f3f
whitespaces removed and other minor changes to fix build error
...
Update 1
update 2
Update 3
Update 4
Update 5
update 6
Update 7
Update 8
Update 9
Update 10
Update 11
Update 12
Update 13
Update 14
Update 15
Update 16
Update 17
Update 18
Update 19
Update 20
Update 21
Update 22
Removed Headers
Update 23
Update 24
Update 25
Update 26
Update 27
Update 28
2013-12-04 19:17:59 +05:30
siddharth
05c7c9325a
cloning_gui.cpp updated
2013-12-04 19:17:59 +05:30
siddharth
75b76554bf
errors in samples/cpp removed
2013-12-04 19:17:59 +05:30
siddharth
01e1ccfa88
cloning_demo error removed
2013-12-04 19:17:59 +05:30
siddharth
f8b00e5269
renamed
2013-12-04 19:17:59 +05:30
siddharth
7ab43585aa
remove cloning_example.cpp
2013-12-04 19:17:58 +05:30
siddharth
50c19423f9
cloning demo added
2013-12-04 19:17:58 +05:30
siddharth
56ab1c18e6
new filters added and all the 3 modules updated
...
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth
1ed0e44090
added keyboard control
2013-12-04 19:17:58 +05:30
siddharth
e170115ad0
new interface added. decolor and cloning module added.
...
Both modules added
2013-12-04 19:17:58 +05:30
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Roman Donchenko
790f53f12a
Merge pull request #1887 from jet47:android-cuda-6.0
2013-12-02 18:53:26 +04:00
Roman Donchenko
f7f194e5dd
Merge pull request #1797 from moodoki:bugfix_3344
2013-12-02 17:53:34 +04:00
Roman Donchenko
0bbd768d9d
Merge pull request #1884 from asmorkalov:winrt_img_proc_sample
2013-12-02 12:27:51 +04:00
Andrey Pavlenko
429ab8ebee
Merge pull request #1845 from StevenPuttemans:bugfix_3306
2013-11-29 23:08:20 +04:00
Vladislav Vinogradov
fc1d38ced8
fixed compilation of gpu-basics-similarity tutorial:
...
initialize TIMES variable with some default value (10)
2013-11-29 14:53:33 +04:00
Alexander Smorkalov
6b09345232
Filter selection and several filters implemented for WinRT sample.
2013-11-29 09:47:25 +04:00
Roman Donchenko
19b88a17bf
Merge pull request #1873 from abak:hough_24
2013-11-28 12:11:24 +04:00
Alexander Smorkalov
2cfd635e9e
Image processing sample for WinRT added.
2013-11-27 21:54:11 -08:00
Adrien BAK
38904c9a11
fix exception being thrown when no arguments are passed
2013-11-28 12:09:17 +09:00
Adrien BAK
094d7c4926
build fix
2013-11-28 11:42:44 +09:00
Roman Donchenko
10aec14a4d
Merge pull request #1849 from StevenPuttemans:feature_3375_documentation
2013-11-27 13:22:31 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00
Adrien BAK
dda3b534ad
fix indent
2013-11-26 16:09:59 +09:00
Adrien BAK
1c025be068
fix typos
2013-11-26 16:09:42 +09:00
Adrien BAK
514f1fae95
improved error handling
2013-11-26 16:09:29 +09:00
Adrien BAK
8a2de2ecca
modified HoughCircleDemo to introduce variable params via trackbars
...
Conflicts:
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
2013-11-26 16:09:04 +09:00
StevenPuttemans
6f892b10ff
Applied feature #3375 and fix of pull 1842 to avoid merging problems later
2013-11-25 10:53:03 +01:00
StevenPuttemans
1b0297d92b
Added fixes mentioned in bugreport 3306
...
- Added author provided fixes
- Added code example
- Added documentation fixes
2013-11-25 09:35:23 +01:00
Roman Donchenko
684ff70308
Merge pull request #1864 from berak:mouse_and_match
2013-11-25 12:15:52 +04:00
Mathieu Barnachon
089b8e2f4a
Suppress a space!
2013-11-24 17:10:06 +01:00
berak
10639d63f5
mouse_and_match.py missing import cv2
2013-11-24 15:58:13 +01:00
Mathieu Barnachon
e015691b41
Fix warnings as errors.
2013-11-24 15:32:52 +01:00
Mathieu Barnachon
63c23cce65
Merge remote-tracking branch 'upstream/master' into svm_hog
2013-11-24 13:24:39 +01:00
Mathieu Barnachon
e1955759af
Fix some warning.
...
Adding missing credit for a function.
2013-11-24 13:22:10 +01:00
StevenPuttemans
2427c03625
Wrong example at the visual studio tutorial. Fixed link, fixed sample
...
content and renamed to a more sensible name. Also fixed a wrong link in the
actual display_image tutorial.
2013-11-22 10:41:17 +01:00
Andrey Pavlenko
8d1a8df1a9
Merge pull request #1824 from vpisarev:ocl_experiments5
2013-11-20 19:14:40 +04:00
Roman Donchenko
b8283edfca
Fix the Qt sample, broken after #1722 .
2013-11-20 14:57:21 +04:00
Roman Donchenko
aacf188e83
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/color.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_color.cpp
samples/cpp/3calibration.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
samples/cpp/Qt_sample/main.cpp
samples/cpp/camshiftdemo.cpp
samples/cpp/descriptor_extractor_matcher.cpp
samples/cpp/distrans.cpp
samples/cpp/generic_descriptor_match.cpp
samples/cpp/grabcut.cpp
samples/cpp/morphology2.cpp
samples/cpp/segment_objects.cpp
samples/cpp/stereo_calib.cpp
samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
samples/cpp/video_dmtx.cpp
2013-11-19 16:21:09 +04:00
Vadim Pisarevsky
8c44995ea6
another attempt to fix compile errors
2013-11-18 22:15:04 -05:00
Vadim Pisarevsky
241002384c
fixed some more compile errors
2013-11-18 14:26:19 -05:00
Vadim Pisarevsky
e2bbe7597b
fixed few compile errors and doc build errors
2013-11-18 13:48:04 -05:00
Vadim Pisarevsky
d914f20a4c
updated patch to bring in the first functions with "transparent API"
2013-11-18 11:48:00 -05:00
Roman Donchenko
7703b63cae
Merge pull request #1722 from StevenPuttemans:feature_1631_second
2013-11-18 15:48:27 +04:00
StevenPuttemans
2b106db02f
Applied all fixes related to translating C to C++ code
...
Also fixed some typos and code alignment
Also adapted tutorial CPP samples
Fixed some identation problems
2013-11-17 20:34:50 +01:00
moodoki
b8de81749c
Slight modification to example code for FLANN matcher with comment on #3344
2013-11-14 00:22:20 +08:00
Mathieu Barnachon
a4ceb7b6ee
Fix compilation issues.
2013-11-11 19:29:39 +01:00
Roman Donchenko
4f1aed98de
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
modules/contrib/src/detection_based_tracker.cpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/gpumat.cpp
modules/core/src/opengl.cpp
modules/gpu/src/cuda/safe_call.hpp
modules/highgui/src/cap.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/doc/image_processing.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/test_objdetect.cpp
samples/ocl/adaptive_bilateral_filter.cpp
2013-11-11 16:55:36 +04:00
Roman Donchenko
c970d4bf6e
Merge pull request #1742 from pengx17:master_ocl_retina_sample
2013-11-08 17:17:20 +04:00
Harris Gasparakis
a1de91a4fd
Cleaned up adaptive bilateral filtering, added support for gaussian interpolation, updated sample and docs
2013-11-06 16:48:50 +04:00
Peng Xiao
7a2a810de5
Update retina_ocl.cpp
2013-11-06 17:00:27 +08:00
Roman Donchenko
9c83f6c4fb
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectCUDA.cmake
modules/core/include/opencv2/core/version.hpp
modules/cudacodec/src/ffmpeg_video_source.cpp
modules/gpu/src/video_writer.cpp
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_video_io.cpp
modules/highgui/test/test_video_pos.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/kmeans.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/safe_call.hpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_moments.cpp
samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
peng xiao
8adebcbc00
Add ocl retina sample.
2013-11-05 14:48:29 +08:00
peng xiao
2a111f7a6c
Let perf/accuracy test of ocl haar uses detectMultiScale api.
...
Fix image to be used by perf test.
2013-11-05 10:40:27 +08:00
Roman Donchenko
d07e7897a0
Fixed building with OpenCL, but without the ocl module.
...
HAVE_opencv_ocl implies HAVE_OPENCL, so checking for both is not
necessary.
2013-10-30 14:07:34 +04:00
Peng Xiao
252f13f53e
Fix a typo
2013-10-30 10:36:28 +08:00
Roman Donchenko
03bbee327b
Merge pull request #1486 from nzjrs:cv2-logpolar
2013-10-29 16:15:57 +04:00
Ilya Lavrenov
ee8f0a3f36
ocl example typo
2013-10-28 14:09:30 +04:00
Roman Donchenko
78be4f66f7
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
modules/calib3d/src/calibration.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
samples/ocl/adaptive_bilateral_filter.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/clahe.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
Andrey Pavlenko
66e5be2d64
Merge pull request #1655 from pengx17:2.4_opt_superres_ocl
2013-10-25 19:47:38 +04:00
Roman Donchenko
6dda2652cd
Merge pull request #1659 from ilya-lavrenov:ocl_examples
2013-10-23 14:50:56 +04:00
Roman Donchenko
4036f6a3d0
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
apps/CMakeLists.txt
modules/contrib/CMakeLists.txt
modules/core/include/opencv2/core/version.hpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_imgproc.cpp
samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
Ilya Lavrenov
4d86e2140d
OpenCL examples refactoring
2013-10-21 23:50:54 +04:00
peng xiao
7285341083
1. Let btvRegWeights to be constant per process
call.
...
2. Let Farneback to be the default optical flow method.
3. Fix a timing method bug for ocl path.
4. Remove useless finish operation in farneback
5. Refactor buffer usage.
2013-10-21 10:21:37 +08:00
Vladislav Vinogradov
5673e7e435
fix bug in gpu bgsegm sample
...
create `d_fgimg` matrix before cleaning.
2013-10-19 12:40:10 +04:00
Roman Donchenko
bfdbc9cefd
Merge pull request #1375 from jet47:gpu-examples-build
2013-10-16 13:22:26 +04:00
Alexander Alekhin
e845184843
Merge remote-tracking branch 'upstream/2.4' into merge-2.4
...
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVDetectPython.cmake
cmake/OpenCVGenConfig.cmake
modules/core/CMakeLists.txt
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/cl_operations.cpp
modules/ocl/src/cl_programcache.cpp
modules/ocl/src/color.cpp
modules/ocl/src/fft.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/gemm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/svm.cpp
modules/ocl/test/main.cpp
modules/ocl/test/test_fft.cpp
modules/ocl/test/test_moments.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_optflow.cpp
modules/ocl/test/utility.hpp
modules/python/CMakeLists.txt
modules/ts/include/opencv2/ts.hpp
modules/ts/src/ts_perf.cpp
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
Alexander Alekhin
74329ee416
cmake: revert CRT linkage option for MSVS
2013-10-09 17:49:11 +04:00
ilya-lavrenov
7a53910495
fixed warning on windows
2013-10-09 17:49:10 +04:00
Alexander Alekhin
555c505b70
update cmake 'install' target for Windows platform
...
Allow to build samples via OpenCV binaries from distribution package
(find_package with OpenCV_DIR).
2013-10-09 17:49:10 +04:00
Roman Donchenko
dfb698dc64
Merge pull request #1581 from SpecLad:merge-2.4
2013-10-09 12:33:50 +04:00
Roman Donchenko
f07769e9d8
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
2013-10-08 17:57:23 +04:00
Ilya Lavrenov
35d9ce0c0c
fixed warnings
2013-10-08 12:46:43 +04:00
Alexander Smorkalov
fdc1a06397
Invalid copy-passed exception messages in FaceDetect sample for Android fixed.
2013-10-08 10:28:24 +04:00
Alexander Alekhin
69c2ef5ed2
ocl: update ocl samples
2013-10-03 23:26:06 +04:00
Roman Donchenko
a1e239d2bf
Merge pull request #1527 from vpisarev:shape_module
2013-10-03 11:54:41 +04:00
Roman Donchenko
30d7e1c33d
Merge remote-tracking branch 'origin/master' into merge-2.4
...
Conflicts:
doc/tutorials/bioinspired/retina_model/retina_model.rst~
2013-10-02 13:37:33 +04:00
Roman Donchenko
1ac1b9ae35
Merge pull request #1474 from f-morozov:for_pr
2013-10-02 11:49:54 +04:00
Roman Donchenko
184ae873d4
Merge pull request #1526 from vpisarev:linedetector_python
2013-10-01 19:49:17 +04:00
Roman Donchenko
6133aeede8
Merge branch 'master' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
2013-10-01 17:37:05 +04:00
Roman Donchenko
81eb4bd8be
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
doc/tutorials/features2d/feature_detection/feature_detection.rst
modules/bioinspired/doc/retina/index.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/operations.hpp
modules/core/src/stat.cpp
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/imgproc/src/filter.cpp
modules/legacy/src/dpstereo.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/doc/image_processing.rst
modules/ocl/doc/object_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +04:00
Roman Donchenko
4ec5c04504
Merge pull request #1315 from dbloisi:add_bs_tutorial
2013-10-01 15:29:38 +04:00
John Stowers
51341738ba
Add cv::logPolar, cv::linearPolar, and a python example
2013-09-30 22:31:19 +02:00
Roman Donchenko
ada858e1c0
Merge pull request #1429 from nzjrs:fix-sketcher
2013-09-30 18:06:56 +04:00
Juan Manuel Perez
fe7bab499f
Corrections for compiling issues in Win, And and Doc
2013-09-30 14:39:17 +04:00
Juan Manuel Perez
61c27ac81e
Shape module added
2013-09-30 14:39:17 +04:00
Alexander Mordvintsev
20fe614c2f
createLineSegmentDetectorPtr -> createLineSegmentDetector in tests and samples
2013-09-30 14:30:01 +04:00
Nghia Ho
b9e542e35e
Missing closedir with opendir
2013-09-28 21:46:48 +10:00
lluis
047b568f6d
erGrouping now uses a classifier for group validation instead of a set of heuristical ifos.
...
Updated documentation and sample to use the new function API
2013-09-27 19:19:45 +02:00
Fedor Morozov
c9ace38897
Docs updated, added InputArray, fixes for makePtr,...
2013-09-26 19:02:35 +04:00
Andrey Pavlenko
0a695eb314
hortening the file names (HighDynamicRange -> HDR)
2013-09-26 17:06:06 +04:00
Alexander Smorkalov
4b203f7b1a
Merge pull request #1470 from IceRage:min_enclosing_triangle
2013-09-26 16:28:54 +04:00
Alexander Smorkalov
c6ab8cb6ee
Merge pull request #1471 from ozantonkal:master
2013-09-25 17:19:39 +04:00
Alexander Smorkalov
c8b97271cc
Merge pull request #1430 from nzjrs:add-brisk-to-demos
2013-09-23 16:34:19 +04:00
Alexander Smorkalov
298a1d50d2
Merge pull request #1299 from jet47:gpu-cuda-rename
2013-09-23 10:31:51 +04:00
John Stowers
4b19fda1d6
Add brisk features to python demos
2013-09-20 21:12:49 +02:00
John Stowers
42faaa8b39
Fix mouse handling in python demos
2013-09-20 21:04:07 +02:00
lluis
2837bfd9fa
Added erGrouping function: Find groups of Extremal Regions that are organized as text blocks. Updated sample/cpp to use the complete text detection pipeline
2013-09-19 10:30:25 +02:00
Fedor Morozov
f99be6bda6
Mergin itseez
2013-09-18 18:55:12 +04:00
Ozan Tonkal
5780b418c9
delete duplicate bunny.ply, remove tabs and extra lines
2013-09-18 13:46:43 +01:00
Ozan Tonkal
8de46e1f81
removed trailing spaces
2013-09-18 12:50:55 +01:00
Ozan Tonkal
223fb39d94
include viz tutorials in the main tutorials file. ignore viz samples
2013-09-17 20:17:13 +02:00
Ozan Tonkal
a117400577
ignore viz tutorials when BUILD_opencv_viz is not set
2013-09-17 18:55:10 +02:00
Ozan Tonkal
e3e5fd5baa
Merge remote-tracking branch 'itseezstream/master'
2013-09-17 17:50:14 +02:00
Ozan Tonkal
3165b526f2
merge with Itseez/opencv
2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff
rename widgets from *Widgets to W*
2013-09-15 16:26:53 +02:00
lluis
d25309f82e
first parameter of createERFilterNM1/createERFilterNM2 is now mandatory. changed the sample program to use the new prototypes
2013-09-13 16:29:21 +02:00
Ovidiu Parvu
8bada4c751
Overloaded the minEnclosingTriangle function such that there is an alternative function with the same name which does not require the output parameter ``area''.
...
Changed the sample source file minarea.cpp to use the overloaded version of the function.
Updated some comments in the min_enclosing_triangle.cpp source file.
2013-09-12 23:47:48 +01:00
Mathieu Barnachon
0934344a3d
Update sample and code with external computation of HOG detector.
2013-09-12 18:38:49 +02:00
Ovidiu Parvu
0ed2f6201d
Optimised one assert statement in the min_enclosing_triangle.cpp file. Added the minEnclosingTriangle functionality to the existing minarea.cpp sample file.
2013-09-12 15:01:21 +01:00
Vladislav Vinogradov
6bbac2a7d9
Merge branch 'master' into gpu-cuda-rename
2013-09-11 09:41:23 +04:00
Roman Donchenko
242e4254f3
Merge pull request #1427 from SpecLad:merge-2.4
2013-09-10 18:28:20 +04:00
Roman Donchenko
95c2e8b51f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
modules/gpu/src/match_template.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
Roman Donchenko
3609bb41a7
Updated the native activity sample to master's API.
2013-09-09 18:17:02 +04:00
Roman Donchenko
84435ba741
Merge pull request #1365 from bitwangyaoyao:2.4_bilateral
2013-09-09 16:46:33 +04:00
Vladislav Vinogradov
1036ce807c
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudaimgproc/src/gftt.cpp
modules/objdetect/include/opencv2/objdetect/erfilter.hpp
modules/objdetect/src/erfilter.cpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-09 12:57:35 +04:00
Ozan Tonkal
56f9168ac1
support VTK 6.0.0: cmakelist.txt might need to be refactored
2013-09-08 19:07:15 +02:00
Ozan Tonkal
c773061457
updated documentation
2013-09-08 19:03:55 +02:00
Ozan Tonkal
2969ec0274
transformations tutorial rst
2013-09-08 19:03:54 +02:00
Ozan Tonkal
5307339f85
tutorial code for makeTransformToGlobal, makeCameraPose, minor fixes in widget_pose tutorial
2013-09-08 19:03:54 +02:00
Ozan Tonkal
7116e22b52
some of the tutorials
2013-09-08 19:03:54 +02:00
Ozan Tonkal
fdbf20c172
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
2013-09-08 19:03:54 +02:00
lluis
cd33ca0009
changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.
2013-09-06 19:10:53 +02:00
Vladislav Vinogradov
0c7663eb3b
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/core/include/opencv2/core/cuda.hpp
modules/cudacodec/src/thread.cpp
modules/cudacodec/src/thread.hpp
modules/superres/perf/perf_superres.cpp
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/optical_flow.cpp
modules/videostab/src/global_motion.cpp
modules/videostab/src/inpainting.cpp
samples/cpp/stitching_detailed.cpp
samples/cpp/videostab.cpp
samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
lluis
b9a5e919e2
better parameter settings for the ERFilter sample
2013-09-06 12:31:49 +02:00
lluis
15511bff40
better classifiers performance by training them with a new dataset of "manually" selected regions
2013-09-06 12:31:49 +02:00
Ozan Tonkal
f99e874704
tutorial: creating_widgets code
2013-09-05 21:03:40 +02:00
Ozan Tonkal
b60894c1dd
launching viz tutorial
2013-09-05 21:03:40 +02:00
Roman Donchenko
62353b7980
Boring changes - samples.
2013-09-05 19:02:59 +04:00
Mathieu Barnachon
2fe340bf8a
adding sample to train HOG and compare it with default people detector.
2013-09-05 17:33:08 +12:00
Roman Donchenko
36e0891480
Fixed OCL samples' install path being inconsistent with the other samples.
2013-09-04 18:52:03 +04:00
Vladislav Vinogradov
1ad4592bfc
Merge branch 'master' into gpu-cuda-rename
...
Conflicts:
modules/cudaoptflow/perf/perf_optflow.cpp
modules/cudaoptflow/src/tvl1flow.cpp
samples/gpu/stereo_multi.cpp
2013-09-04 09:58:32 +04:00
Roman Donchenko
c42d61e464
Merge pull request #1283 from melody-rain:new_mog_mog2
2013-09-03 18:43:03 +04:00
Roman Donchenko
b3e73cf7d6
Merge pull request #1388 from bitwangyaoyao:2.4_CLAHE
2013-09-03 18:30:15 +04:00
Roman Donchenko
e7f83619c5
Merge pull request #1378 from StevenPuttemans:bugfix_3115
2013-09-03 12:07:24 +04:00
yao
a70bdfc13f
a little fix to tests and sample
2013-09-03 15:02:18 +08:00
Roman Donchenko
9218f4976c
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
Roman Donchenko
ff2b12334d
Merge pull request #1355 from jet47:gpu-stereo-multi-gpu-sample
2013-09-02 14:10:06 +04:00
Vladislav Vinogradov
12f50d7f67
fixed video_writer sample
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
a41006754e
fix documentation
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
fd88654b45
replaced GPU -> CUDA
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
3c34b24f1f
replaced gpu->cuda in files names
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
ae94256edc
renmaed gpu module -> cuda
2013-09-02 14:00:44 +04:00
Vladislav Vinogradov
29386f1449
renamed gpubgsegm -> cudabgsegm
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
259ceb7eaa
renamed gpufeatures2d -> cudafeatures2d
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
5660d6a680
renamed gpuoptflow -> cudaoptflow
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
a0ae602bb7
renamed gpuimgproc -> cudaimgproc
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
219b662127
renamed gpufilters -> cudafilters
2013-09-02 14:00:43 +04:00
Vladislav Vinogradov
71d61e07b1
renamed gpustereo -> cudastereo
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
d4901a99ea
renamed gpuwarping -> cudawarping
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dcd600cc47
renamed gpuarithm -> cudaarithm
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
6d216d78d9
renamed gpulegacy -> cudalegacy
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
dbeb3e2968
renamed gpucodec -> cudacodec
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
cfe4a71dc6
renamed gpu* source to cuda* in core module
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
91dd44e7fa
removed compatibility headers
2013-09-02 14:00:42 +04:00
Vladislav Vinogradov
5a85f1b6da
renamed gpucodec namespace -> cudacodec
2013-09-02 14:00:41 +04:00
Vladislav Vinogradov
e895b7455e
renamed gpu namespace -> cuda
2013-09-02 14:00:41 +04:00
StevenPuttemans
7e638cb0b5
Bugfix 3115: Added not to documentation for python version for
...
facerecognizer interface + white + whitespaces remove
2013-09-02 11:59:35 +02:00
dbloisi
20f932bd46
fixing trailing whitespaces
2013-09-01 22:13:49 +02:00
dbloisi
f0910466f9
fixing trailing whitespaces
2013-09-01 20:59:27 +02:00
dbloisi
a34f7b7714
fixing other white spaces
2013-09-01 19:05:07 +02:00
Gabe Schwartz
e2441e0034
Removed incorrect iCCP chunks from GUI resources.
...
Also removed malformed tEXt chunk from a logo PNG.
2013-08-30 09:49:24 -04:00
Vladislav Vinogradov
17e20b2c60
fix for bug #3219 (undefined reference in GPU samples)
2013-08-30 14:46:47 +04:00
zio dodo
5f7163bff2
Merge branch 'master' of https://github.com/Itseez/opencv into add_bs_tutorial
...
Conflicts:
modules/stitching/src/motion_estimators.cpp
2013-08-29 20:12:12 +02:00
yao
26b5eb3e39
add adaptive bilateral filter (cpp and ocl version)
2013-08-29 10:48:15 +08:00
Roman Donchenko
e958767a8b
Merge pull request #1343 from asmorkalov:android_img_manipulations_fix
2013-08-28 19:01:15 +04:00
Alexander Smorkalov
8d4cbf4deb
Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.
2013-08-28 15:08:13 +04:00
Roman Donchenko
e59c74e1c7
Merge pull request #1348 from SpecLad:merge-2.4
2013-08-28 13:41:41 +04:00
Vladislav Vinogradov
d87eb75904
rewrite gpu stereo multi gpu sample:
...
* use different approaches -> threads and streams
* clean up code
2013-08-28 12:41:41 +04:00
Roman Donchenko
2d6f35d6ed
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/gpuwarping/src/cuda/resize.cu
modules/gpuwarping/src/resize.cpp
modules/gpuwarping/test/test_resize.cpp
modules/ocl/perf/main.cpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_canny.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/perf_precomp.cpp
modules/ocl/perf/perf_precomp.hpp
2013-08-27 19:15:47 +04:00
Roman Donchenko
dd25f416a6
War on Whitespace, master edition: tabs.
2013-08-27 17:13:53 +04:00
Roman Donchenko
cd5b8af609
Restored one executable bit that was lost during the war on whitespace.
2013-08-27 14:39:43 +04:00
Roman Donchenko
9ed475cf52
War on Whitespace, master edition: file endings.
2013-08-27 14:23:26 +04:00
Roman Donchenko
9b92545ce6
War on Whitespace, master edition: trailing spaces.
2013-08-27 13:57:24 +04:00
Roman Donchenko
2c4bbb313c
Merge commit '43aec5ad' into merge-2.4
...
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
2013-08-27 13:26:44 +04:00
Roman Donchenko
657699a1da
Merge pull request #1267 from clhsieh:gpu_example_build_failed_with_cuda5p5
2013-08-27 12:43:36 +04:00
Fedor Morozov
833f8d16fa
Robertson and tutorial
2013-08-26 15:23:37 +04:00
Roman Donchenko
580677f43d
Merge pull request #1304 from berak:doc_tut_cascade
2013-08-23 15:18:06 +04:00
Kirill Kornyakov
030fa5673e
bugfix-for-3231
2013-08-23 12:34:35 +04:00
Changlin Hsieh
723ba29660
Update cmake files by using CUDA_CUDA_LIBRARIES
2013-08-23 16:05:35 +08:00
berak
50288f1314
rebased commits
2013-08-22 18:40:30 +02:00
berak
926d6876d3
using VideoCapture instead of CvCapture* in cascade tutorial
...
corrected constants, changed objdetection.cpp as well
updated objDetection2.cpp as well
fixed headers in objdetection2.cpp
removed useles RNG
fixed buildbot warnings (wow, i like that bot!)
victim of the war on whitespace
fixing buildbot warnings
fixing last buildbot warning, heya .
trying to rebase/squash commits
2013-08-22 17:38:59 +02:00
Roman Donchenko
3c137f7a04
Converted tabs to spaces.
2013-08-21 18:59:26 +04:00
Roman Donchenko
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
Roman Donchenko
f55740da70
Deleted all trailing whitespace.
2013-08-21 18:59:24 +04:00
zio dodo
449b4d8a65
Added the tutorial on background subtraction, in the video section
2013-08-21 12:06:48 +02:00
Roman Donchenko
f76dd99299
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVModule.cmake
doc/tutorials/calib3d/camera_calibration/camera_calibration.rst
doc/tutorials/features2d/feature_detection/feature_detection.rst
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
doc/tutorials/features2d/feature_homography/feature_homography.rst
modules/core/include/opencv2/core/operations.hpp
modules/core/src/arithm.cpp
modules/gpu/perf/perf_video.cpp
modules/imgproc/include/opencv2/imgproc/imgproc.hpp
modules/java/generator/gen_java.py
modules/java/generator/src/cpp/VideoCapture.cpp
modules/nonfree/src/opencl/surf.cl
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/perf/perf_precomp.hpp
modules/ocl/src/color.cpp
modules/ocl/src/filtering.cpp
modules/ocl/test/test_color.cpp
modules/ocl/test/test_objdetect.cpp
modules/python/src2/cv2.cpp
samples/gpu/CMakeLists.txt
samples/gpu/super_resolution.cpp
2013-08-19 19:02:36 +04:00
Roman Donchenko
7919bcef70
Merge pull request #1277 from NCBee:2.4
2013-08-16 19:59:12 +04:00
Bahram Dahi
230bc03d97
Moved Scalar variable 'value' to int main() to work around a GCC -Wshadow warning in operations.hpp
2013-08-16 08:14:32 -07:00
Roman Donchenko
2530b580a8
Merge branch 'master' into merge-2.4
...
Conflicts:
modules/photo/doc/inpainting.rst
2013-08-16 14:14:12 +04:00
Jin Ma
8fb6b689c6
1. Added OpenCL version of superres to the sample.
...
2. Modified according to the feedback of the community.
2013-08-16 16:31:31 +08:00
Jin Ma
3fb0bf6e99
Added MOG and MOG2.
2013-08-16 14:19:46 +08:00
Roman Donchenko
73c5069f54
Merge pull request #1276 from nghiaho12:mushroom
2013-08-15 12:05:02 +04:00
Nghia Ho
21641d04a7
Fixed mismatching allocation and deallocation: el_ptr
2013-08-14 23:36:29 +10:00
Roman Donchenko
7992402ecf
Merge pull request #1149 from jet47:generalized-hough-refactoring
2013-08-14 13:26:24 +04:00
Changlin Hsieh
c1dd38cbff
Fix GPU example build failed with cuda 5.5
2013-08-14 16:16:03 +08:00
Roman Donchenko
339dd983ee
Adjusted the camera calibration sample to master API.
2013-08-13 14:55:27 +04:00
Roman Donchenko
6b5ac42a9b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
modules/features2d/doc/object_categorization.rst
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/object_detection.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/samplers.cpp
modules/ml/doc/k_nearest_neighbors.rst
modules/nonfree/doc/feature_detection.rst
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/photo/doc/inpainting.rst
modules/ts/include/opencv2/ts.hpp
platforms/scripts/camera_build.conf
samples/android/camera-calibration/AndroidManifest.xml
2013-08-13 12:56:39 +04:00
Daniil Osokin
65c5c4df70
Fixed build of camera calibration android sample
2013-08-08 09:31:25 +04:00
Roman Donchenko
2f780ed994
Fix whitespace errors.
2013-08-06 18:07:00 +04:00
Roman Donchenko
dcaf923517
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/ffmpeg/ffmpeg_version.cmake
cmake/OpenCVFindLibsGrfmt.cmake
cmake/templates/cvconfig.h.cmake
modules/bioinspired/doc/retina/index.rst
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/calib3d/src/precomp.hpp
modules/contrib/src/inputoutput.cpp
modules/contrib/src/precomp.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/types_c.h
modules/core/src/drawing.cpp
modules/core/src/precomp.hpp
modules/core/src/system.cpp
modules/features2d/doc/common_interfaces_of_descriptor_matchers.rst
modules/features2d/doc/common_interfaces_of_feature_detectors.rst
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/features2d/src/precomp.hpp
modules/flann/src/precomp.hpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/image_filtering.rst
modules/gpu/doc/image_processing.rst
modules/gpu/doc/video.rst
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/perf4au/main.cpp
modules/gpu/src/imgproc.cpp
modules/gpu/src/precomp.hpp
modules/gpu/test/test_imgproc.cpp
modules/highgui/CMakeLists.txt
modules/highgui/test/test_precomp.hpp
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
modules/imgproc/src/precomp.hpp
modules/java/generator/src/cpp/Mat.cpp
modules/legacy/src/precomp.hpp
modules/ml/doc/k_nearest_neighbors.rst
modules/ml/src/precomp.hpp
modules/nonfree/doc/feature_detection.rst
modules/nonfree/src/precomp.hpp
modules/objdetect/include/opencv2/objdetect/objdetect.hpp
modules/objdetect/src/cascadedetect.cpp
modules/objdetect/src/hog.cpp
modules/objdetect/src/precomp.hpp
modules/objdetect/test/test_latentsvmdetector.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/opencl/objdetect_hog.cl
modules/ocl/src/precomp.hpp
modules/photo/src/precomp.hpp
modules/stitching/src/precomp.hpp
modules/superres/perf/perf_precomp.hpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
modules/superres/test/test_precomp.hpp
modules/ts/include/opencv2/ts.hpp
modules/video/src/precomp.hpp
modules/videostab/src/precomp.hpp
modules/world/src/precomp.hpp
2013-08-06 13:56:49 +04:00
Andrey Pavlenko
4c03afe006
Merge pull request #1079 from AlexeySpizhevoy:master
2013-08-05 10:54:44 +04:00
Andrey Pavlenko
487ff4f3aa
Merge pull request #1151 from jet47:gpubgsegm-refactoring
2013-08-05 10:20:00 +04:00
Andrey Pavlenko
4ed9b1ca9a
Merge pull request #1166 from StevenPuttemans:patch_2288
2013-07-31 15:50:13 +04:00
StevenPuttemans
f33fe94c0d
Added the sample from patch #2288 : reading in sequence of images
...
Added bugfixes
- Changed CV_WINDOW_NORMAL to 1
- Changed the help function to static
- Added extra help information on mask specifics
2013-07-31 13:38:18 +02:00
Andrey Pavlenko
cd62f9f7cb
Merge pull request #1164 from bitwangyaoyao:master_fixHaar
2013-07-30 16:14:24 +04:00
Daniil Osokin
23c802b4cd
Added camera calibration sample for android
2013-07-26 01:19:32 +04:00
Roman Donchenko
8afb7a40c6
Merge pull request #1159 from lluisgomez:scene_text_detection_NM
2013-07-25 12:13:49 +04:00
Roman Donchenko
45f7c83da4
Merge pull request #1119 from 23pointsNorth:lsd
2013-07-24 13:50:11 +04:00
Daniel Angelov
ae93a3e681
The accurate LineSegmentDetector object.
2013-07-22 15:08:23 +03:00
Daniel Angelov
26847f92b3
Fixed the sample.
2013-07-22 14:46:34 +03:00
Daniel Angelov
982ccd784e
Added the update on the sample.
2013-07-22 13:49:33 +03:00
yao
3d3e9ab635
Fix the problem of haar caused by merge
2013-07-22 17:53:56 +08:00
Daniel Angelov
965b3759b1
Update on the class to reflect the review. Split the class into virtual and implementation. change of name to LineSegmentDetector, using Input/Output-Arrays, general clean ups.
2013-07-21 01:31:51 +03:00
lluis
5abe3b59f5
Class-specific Extremal Region Filter algorithm as proposed in :
...
Neumann L., Matas J.: Real-Time Scene Text Localization and Recognition, CVPR 2012.
High-level C++ interface and implementation of algorithm is in the objdetect module.
C++ example, a test image, and the default classifiers in xml files.
2013-07-20 01:10:05 +02:00
Vladislav Vinogradov
62edeeed16
refactored FGD algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
697793090d
refactored GMG algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
b8f0d1a0e4
refactored MOG2 algorithm
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
a2adab7283
refactored MOG algorithm
...
converted it to abstract interface
2013-07-18 15:39:42 +04:00
Vladislav Vinogradov
7b87d72d80
refactored generalized hough (both CPU and GPU):
...
removed set/get methods from Algorithm (implement owns)
removed GHT_* enumeration
2013-07-18 15:17:33 +04:00
Vladislav Vinogradov
39a25115e0
fixed compilation
2013-07-17 11:41:48 +04:00
Vladislav Vinogradov
de56163f97
refactored gpu::matchTemplate (converted it into Algorithm)
2013-07-17 11:39:57 +04:00
Vladislav Vinogradov
70e6dc615a
refactored GoodFeaturesToTrackDetector
2013-07-17 11:39:56 +04:00
Vladislav Vinogradov
d7ff3ad0cf
refactored cornerHarris and cornerMinEigenVal
...
* converted it into Algorithm
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
ad4d6bed9d
refactored gpu::GeneralizedHough
2013-07-17 11:39:55 +04:00
Vladislav Vinogradov
1652540a1f
refactored HoughLines (converted it into Algorithm)
2013-07-17 11:39:54 +04:00
Vladislav Vinogradov
48fb8c4f8a
refactored gpu::Canny (converted it into Algorithm)
2013-07-17 11:39:53 +04:00
Vladislav Vinogradov
fc8476544c
switched to Input/Output Array in Histogram Processing
2013-07-17 11:39:52 +04:00
Vladislav Vinogradov
9eea9835ab
switched to Input/Output Array in Color Processing
2013-07-17 11:39:52 +04:00
Roman Donchenko
3443fd85cd
Merge pull request #984 from albenoit:master
2013-07-16 11:57:52 +04:00
alexandre benoit
7fe78efda3
retina included in namespace bioinspired + followed suggestions made by Vadim
2013-07-14 19:28:37 +02:00
Daniel Angelov
22c8010b2d
Added needed header, changed macro name.
2013-07-14 12:56:22 +03:00
Daniel Angelov
6bd5e12be3
Added a sample to show usage of the class.
2013-07-13 04:11:27 +03:00
Vladislav Vinogradov
2932beddcf
switched to Input/Output Array in gpuwarping functions
2013-07-12 08:12:48 +04:00
Roman Donchenko
c05bfe9d6d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/features2d/include/opencv2/features2d/features2d.hpp
modules/ocl/src/opencl/stereobp.cl
modules/ocl/src/stereobp.cpp
2013-07-08 18:47:38 +04:00
Alexander Smorkalov
69b308a368
Various fixes in android sample NativeActivity.
2013-07-05 14:08:37 +04:00
alexandre benoit
188f889949
Merge branch 'master' of code.opencv.org:opencv
2013-07-04 16:19:24 +02:00
Roman Donchenko
4cf9990d4e
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
doc/tutorials/definitions/noContent.rst
doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/include/opencv2/core/version.hpp
modules/gpu/CMakeLists.txt
modules/highgui/perf/perf_output.cpp
modules/highgui/test/test_video_io.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/opencl/moments.cl
modules/ocl/test/main.cpp
modules/ocl/test/test_moments.cpp
modules/python/test/test.py
modules/ts/include/opencv2/ts/ts_perf.hpp
modules/ts/src/precomp.hpp
modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
Alexey Spizhevoy
37ea872204
added handling of camera parameters estimation errors ( #3122 )
2013-07-03 15:20:14 +04:00
Andrey Pavlenko
89086bdb8d
Merge pull request #1046 from SpecLad:merge-2.4
2013-07-02 15:39:07 +04:00
Roman Donchenko
c8cd2cf601
Merge pull request #1061 from bitwangyaoyao:2.4_fix2
2013-07-01 13:21:12 +04:00
Alexander Smorkalov
67d4d9e9f4
Path to OpenCV dll libs fixes.
2013-06-28 16:48:27 +04:00
Kirill Kornyakov
aef347e7b3
Removed references to opencv.itseez.com
2013-06-28 12:48:12 +04:00
yao
c73a10cb4d
warnings fix
2013-06-28 16:23:01 +08:00
Kirill Kornyakov
cbed07bc18
Removed references to YG from samples
2013-06-28 12:21:52 +04:00
yao
6982ea5a66
some tweaks to samples
2013-06-28 15:08:39 +08:00
yao
f1d9680ba8
format the ocl's samples name
2013-06-28 11:44:43 +08:00
Alexander Smorkalov
347c86d9b5
Windows RT related code cleanup.
...
Windows RT sample cleanup.
Video I/O code cleanup.
2013-06-26 05:44:10 -07:00
Roman Donchenko
f36f8067bc
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
modules/core/include/opencv2/core/core.hpp
modules/core/include/opencv2/core/cuda/limits.hpp
modules/core/include/opencv2/core/internal.hpp
modules/core/src/matrix.cpp
modules/nonfree/test/test_features2d.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/hog.cpp
modules/ocl/test/test_haar.cpp
modules/ocl/test/test_objdetect.cpp
modules/ocl/test/test_pyrup.cpp
modules/ts/src/precomp.hpp
samples/ocl/facedetect.cpp
samples/ocl/hog.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/surf_matcher.cpp
2013-06-25 15:55:52 +04:00
Alexander Smorkalov
91c519467d
WinRT build fix for samples and static libs.
2013-06-25 03:36:07 -07:00
Alexander Smorkalov
b0854c605a
Windows RT sample improved.
...
Corrent histogram output on YUV image implemented;
Some code refactoring done.
2013-06-25 03:36:05 -07:00
Alexander Smorkalov
bf22567c09
Transform selection implemented in sample GUI.
...
Gistogram output does not work propertly due color conversion problems.
2013-06-25 03:36:04 -07:00
Alexander Smorkalov
de9f659f1e
Several transforms added to sample IMFTransform.
2013-06-25 03:36:03 -07:00
Alexander Smorkalov
9e06287121
Windows RT sample updated.
...
Unused scenarious removed.
Grey scale convertion replaced with cv::Canny call.
2013-06-25 03:36:01 -07:00
Alexander Smorkalov
4990336760
Base camera access sample for Windows RT added.
...
Microsoft Media Foundation Camera Sample for Windows RT added.
2013-06-25 03:36:00 -07:00
Vladislav Vinogradov
98bd401534
fix gpu::DeviceInfo compilation under linux
...
glibc defines major and minor macros
which conflict with gpu::DeviceInfo methods with the same name
2013-06-24 10:11:44 +04:00
Roman Donchenko
eff6dccb3b
Merge pull request #1014 from jet47:gpustereo-refactoring
2013-06-21 17:38:36 +04:00
Roman Donchenko
b20c9ad2d1
Merge pull request #1015 from SpecLad:merge-2.4
2013-06-21 17:38:04 +04:00
yao
6326739b44
a bug fix in stereo_match sample
2013-06-21 14:50:08 +08:00
Roman Donchenko
13cd0a0502
Merge remote-tracking branch 'origin/2.4'
...
Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats
Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
yao
f1c549fabf
revise ocl samples, add tvl1 sample
2013-06-19 16:36:23 +08:00
Vladislav Vinogradov
be9bb8f18b
refactored StereoConstantSpaceBP
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
d0e89337da
refactored StereoBeliefPropagation
2013-06-14 18:17:31 +04:00
Vladislav Vinogradov
dd6d58f873
refactored StereoBM
2013-06-14 18:17:30 +04:00
Vladislav Vinogradov
5720eaf354
refactored Morphology Filters
2013-06-14 17:25:57 +04:00
Vladislav Vinogradov
12ae11e2ff
refactored Separable Linear Filters
2013-06-14 17:25:56 +04:00
Vladislav Vinogradov
1eedc6c42a
refactored Linear Filter
2013-06-14 17:25:56 +04:00
Roman Donchenko
71db862dc2
Merge pull request #977 from jet47:gpucodec-refactoring
2013-06-14 16:24:24 +04:00
Sergei Nosov
982ef83f80
Fixes bug #3071 .
...
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
2013-06-13 11:51:45 +04:00
alexandre benoit
2c1fb5fd71
minor correction after buildbot warnings
2013-06-13 06:55:35 +02:00
alexandre benoit
7bff79bbeb
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
2013-06-12 22:43:36 +02:00
alexandre benoit
cdbbe0dfbe
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
2013-06-12 22:40:43 +02:00
Vladislav Vinogradov
8fcef225fb
switched to Input/Output Array in reductions operations
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
0c50d0821f
switched to Input/Output Array in transpose/flip operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
76211709a3
refactored VideoReader (convert it to abstract interface)
...
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8
refactored VideoWriter class (convert it to abstract interface)
2013-06-11 17:57:39 +04:00
Roman Donchenko
7c4e3715b3
Merge pull request #975 from SpecLad:merge-2.4
2013-06-11 17:28:26 +04:00
Roman Donchenko
3bfc69740b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Merged pull requests:
#890 from caorong:patch-1
#893 from jet47:gpu-arm-fixes
#933 from pengx17:2.4_macfix_cont
#935 from pengx17:2.4_filter2d_fix
#936 from bitwangyaoyao:2.4_perf
#937 from bitwangyaoyao:2.4_fixPyrLK
#938 from pengx17:2.4_surf_sample
#939 from pengx17:2.4_getDevice
#940 from SpecLad:autolock
#941 from apavlenko:signed_char
#946 from bitwangyaoyao:2.4_samples2
#947 from jet47:fix-gpu-arm-build
#948 from jet47:cuda-5.5-support
#952 from SpecLad:jepg
#953 from jet47:fix-bug-3069
#955 from SpecLad:symlink
#957 from pengx17:2.4_fix_corner_detector
#959 from SpecLad:qt4-build
#960 from SpecLad:extra-modules
Conflicts:
modules/core/include/opencv2/core/core.hpp
modules/gpu/CMakeLists.txt
modules/gpu/include/opencv2/gpu/device/vec_math.hpp
modules/gpu/perf/perf_video.cpp
modules/gpuimgproc/src/cuda/hough.cu
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/pyrlk.cpp
samples/gpu/driver_api_multi.cpp
samples/gpu/driver_api_stereo_multi.cpp
samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
2dab93c2e8
refactored gpu info structures (TargetArchs and DeviceInfo)
...
now DeviceInfo provides full information about device (from cudaDeviceProp)
2013-06-10 12:40:32 +04:00
Vladislav Vinogradov
76f4b02b06
refactored gpu::Stream (minor fixes)
2013-06-10 12:40:31 +04:00
Vladislav Vinogradov
4c9773d55f
renamed gpu headers (made it more consistent)
2013-06-10 12:40:30 +04:00
Alexander Smorkalov
a39a9f677f
NativeActivity sample build with Eclipse CDT fixed.
2013-06-10 11:06:28 +04:00
Vadim Pisarevsky
4cf7a963a0
Merge pull request #946 from bitwangyaoyao:2.4_samples2
2013-06-07 13:44:29 +04:00
Vladislav Vinogradov
3eeaa9189c
Revert "Revert "Merge pull request #836 from jet47:gpu-modules""
2013-06-07 13:05:39 +04:00
caorong
a2adafd508
fix a bug(DetectorType never change)
...
changed line281 -> line220
Presentation:
because line 220 give the globle var mDetectorType,and in line 230 it will be compared with mDeteorType !!! it will never be unequal ~
fix:
change mDetectorType(previous globle var) to a new local val tmpDetectorType
2013-06-05 15:57:54 +04:00
Roman Donchenko
bae85660da
Merge remote-tracking branch 'origin/2.4'
...
Pull requests:
#943 from jet47:cuda-5.5-support
#944 from jet47:cmake-2.8.11-cuda-fix
#912 from SpecLad:contributing
#934 from SpecLad:parallel-for
#931 from jet47:gpu-test-fixes
#932 from bitwangyaoyao:2.4_fixBFM
#918 from bitwangyaoyao:2.4_samples
#924 from pengx17:2.4_arithm_fix
#925 from pengx17:2.4_canny_tmp_fix
#927 from bitwangyaoyao:2.4_perf
#930 from pengx17:2.4_haar_ext
#928 from apavlenko:bugfix_3027
#920 from asmorkalov:android_move
#910 from pengx17:2.4_oclgfft
#913 from janm399:2.4
#916 from bitwangyaoyao:2.4_fixPyrLK
#919 from abidrahmank:2.4
#923 from pengx17:2.4_macfix
Conflicts:
modules/calib3d/src/stereobm.cpp
modules/features2d/src/detectors.cpp
modules/gpu/src/error.cpp
modules/gpu/src/precomp.hpp
modules/imgproc/src/distransform.cpp
modules/imgproc/src/morph.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/opencl/haarobjectdetect.cl
modules/ocl/src/pyrlk.cpp
modules/video/src/bgfg_gaussmix2.cpp
modules/video/src/lkpyramid.cpp
platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
platforms/scripts/ABI_compat_generator.py
samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +04:00
Roman Donchenko
5b5815d8cf
Merge pull request #893 from jet47:gpu-arm-fixes
2013-06-04 17:52:30 +04:00
yao
f049aa7674
use GoodFeaturesToTrackDetector_OCL
2013-06-04 15:59:21 +08:00
Vladislav Vinogradov
ff28bf831f
disabled samples with driver api
2013-06-03 14:01:04 +04:00
peng xiao
cdb16f1120
Fix build error
2013-05-31 17:29:55 +08:00
peng xiao
d85f27b537
Update ocl::surf_matcher sample.
...
The new sample adjust some parameters thus it should always be able to
calculate valid homography matrix when input is box.png and
box_in_scene.png.
Pure cpp surf and bfmatcher implementation is also added to show the user
its accuracy and performance.
2013-05-31 16:06:56 +08:00
Vadim Pisarevsky
6bb9342a5f
Merge pull request #918 from bitwangyaoyao:2.4_samples
2013-05-30 12:01:40 +04:00
abidrahmank
2dd3bf116e
ANDed waitkey result with 0xFF for x64 systems
2013-05-27 10:30:30 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
yao
fad96b95ad
add results verification to facedetect and hog samples
2013-05-24 15:52:33 +08:00
yao
036b0579f1
remove the images in ocl sample folder
2013-05-23 18:12:09 +08:00
yao
33a3a19207
add two samples
2013-05-23 18:10:38 +08:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Vadim Pisarevsky
54afb85d0c
Merge pull request #823 from pickle27:starter_image_sequence
2013-05-14 15:56:35 +04:00
Andrey Kamaev
b8ed00bd64
Compile OpenCV with GCC visibility set to hidden
2013-05-13 18:33:20 +04:00
Andrey Kamaev
60059a7aa0
Improve handling of native_app_glue dependency in Android samples
2013-05-13 17:01:18 +04:00
Vadim Pisarevsky
8130d92602
Merge pull request #841 from Pastafarianist:patch-1
2013-05-12 13:00:23 +04:00
Vadim Pisarevsky
f1e8f69d2c
Merge pull request #861 from albenoit:master
2013-05-12 12:53:14 +04:00
Andrey Pavlenko
2faa2adae2
Merge pull request #846 from smart-mobile-software:tuto_crash
2013-05-07 15:15:16 +04:00
poiuytrez
7dda8e2cb8
Link to bug tracker replaced by bug description
2013-05-07 11:45:18 +02:00
Pastafarianist
d2116f38fe
Fixed typo
2013-05-05 16:17:41 +04:00
poiuytrez
bef6de9025
Fix tuto3 picture taken crash on all devices
...
A modification of the JavaCameraView is needed to avoid a crash when the
app is exited. It is a good practice to remove the callback after the
stopPreview method.
2013-05-01 16:58:15 +02:00
alexandre benoit
9c26387ce0
updated sources to correct buildbot warnings
2013-04-30 17:32:47 +02:00
alexandre benoit
a659e287fb
minor error correction
2013-04-30 14:52:14 +02:00
alexandre benoit
72742f5316
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
2013-04-29 19:06:35 +02:00
alexandre benoit
9549949228
minor chnges for conflict removal
2013-04-29 15:12:44 +02:00
albenoit
9e1ce1ed52
Merge pull request #2 from albenoit/retina_devel
...
Retina devel
2013-04-27 13:47:30 -07:00
alexandre benoit
ea1a64477f
updated tutorial with new retina interface use
2013-04-27 22:39:28 +02:00
alexandre benoit
b62d101115
updated retina interface for cleaner use, following OpenCV standards
2013-04-27 21:13:45 +02:00
poiuytrez
60bf018781
Fix android tutorial 3 second picture taken bug
2013-04-24 12:38:15 +02:00
Kevin Hughes
69c626e720
starter_video.cpp hid local functions
2013-04-22 22:28:35 -04:00
Kevin Hughes
3441b2df65
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
2013-04-22 16:35:23 -04:00
Pastafarianist
28427ce2e8
Fixed typo
2013-04-21 23:04:54 +04:00
Andrey Kamaev
416fb50594
Revert "Merge pull request #836 from jet47:gpu-modules"
...
This reverts commit fba72cb60d
, reversing
changes made to 02131ffb62
.
2013-04-18 15:03:50 +04:00
Vladislav Vinogradov
564f609885
fixed samples compilation
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
787e56ab5c
disabled gpucodec module on MacOS
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
5ee9d3111d
fixed gpu tutorial
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
13d087e62d
videostab module fixes
2013-04-18 13:28:34 +04:00
Vladislav Vinogradov
fdeec6896c
stitching module fixes
2013-04-18 13:28:30 +04:00
Vladislav Vinogradov
ac0f506d0e
split gpuvideo onto gpuoptflow and gpubgsegm
2013-04-18 11:33:34 +04:00
Vladislav Vinogradov
eda124ec32
removed gpuobjdetect module
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
28b1caa730
gpustereo module for stereo correspondence
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
fc3730fcc2
gpuwarping module for image warping
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
508fb6aa5b
renamed gpunvidia -> gpulegacy
2013-04-18 11:33:33 +04:00
Vladislav Vinogradov
a6648b5372
gpuobjdetect module for object detection
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
b08b9ab83b
gpucalib3d module for camera calibration and stereo correspondence
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
fc1fa28556
gpuvideo module for video processing
2013-04-18 11:33:32 +04:00
Vladislav Vinogradov
7544ddbfef
gpufeatures2d module 2d for feature detection and matching
2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
e41aea0acf
gpuimgproc module for image processing
2013-04-18 11:33:31 +04:00
Vladislav Vinogradov
229ca0914a
gpunvidia module for NCV & NPP API
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
84de6ce036
gpufilters module for image filtering
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
31c8b527c6
gpuarithm module for arithmetics operations on matrices
2013-04-18 11:33:30 +04:00
Vladislav Vinogradov
1b00a3ed54
gpucodec module for video decoding/encoding
2013-04-18 11:33:29 +04:00
Kevin Hughes
47c84335f0
removed starter_image_sequence.cpp
2013-04-17 13:22:37 -04:00
Kevin Hughes
eedb6fa3c4
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
2013-04-17 13:20:32 -04:00
Vladislav Vinogradov
54e7c76d99
fixed compilation errors
2013-04-17 15:24:53 +04:00
Andrey Pavlenko
8c40f0ccf2
fixing build and lint warnings
2013-04-16 15:30:43 +04:00
Andrey Kamaev
8f32902ce6
Minimize usages of legacy C API inside the library
2013-04-16 12:00:02 +04:00
Kevin Hughes
b141762070
added an example of using cv::VideoCapture to read image sequences like 000.pmg, 001.png ... 100.png etc.
2013-04-15 13:21:20 -04:00
Andrey Kamaev
f886651cf0
Drop old python samples and tests
2013-04-12 19:37:40 +04:00
Andrey Kamaev
909d6fcf51
Move legacy part of opencv_contrib to separate header
2013-04-12 19:37:40 +04:00
Andrey Kamaev
3b364330ad
Merge branch '2.4'
2013-04-12 15:35:38 +04:00
Andrey Kamaev
abe2ea59ed
Merge pull request #802 from SpecLad:shebang
2013-04-12 15:00:28 +04:00
Andrey Kamaev
8406312571
Remove C API from OpenCL module
2013-04-12 14:37:02 +04:00
Andrey Kamaev
5e048d1fa5
Move C API of opencv_objdetect to separate file
...
Also move cv::linemod to own header
2013-04-12 14:37:01 +04:00
Andrey Kamaev
e5a33723fc
Move C API of opencv_calib3d to separate file
2013-04-11 21:00:17 +04:00
Roman Donchenko
57d4c86b2b
Fixed the shebang lines on the Python scripts.
...
Also, removed the one from modules/python/src2/cv.py and cleared its
executable bit, since it's not a script.
2013-04-11 18:37:23 +04:00
Kirill Kornyakov
53a06913cb
Minor code cleanings in lkdemo.cpp
2013-04-11 17:57:33 +04:00
Kirill Kornyakov
e351538697
#2813 bugfix
2013-04-11 17:50:10 +04:00
Andrey Kamaev
199a35a105
Move C API of opencv_video to separate file
2013-04-11 17:38:33 +04:00
Andrey Kamaev
7711fe2f43
Merge pull request #794 from asmorkalov:android_no_layout
2013-04-11 11:34:42 +04:00
Andrey Kamaev
c98c246fc2
Move border type constants and Moments class to core module
2013-04-10 19:14:24 +04:00
Alexander Smorkalov
82c61eba49
Feature #2893 Create Java sample without layout.xml implemented.
2013-04-10 13:38:59 +04:00
Andrey Kamaev
71896544ca
Merge pull request #789 from asmorkalov:android_na_mk_fix
2013-04-09 13:14:22 +04:00
Vladislav Vinogradov
ba1a1aecaa
fixed gpu module compilation
2013-04-09 10:41:35 +04:00
Alexander Smorkalov
7bd169caa9
Native activity build with Android.mk fixed.
2013-04-09 10:17:22 +04:00
Andrey Kamaev
dd74a851f3
Fix build errors
2013-04-08 17:10:31 +04:00
Andrey Kamaev
69648f0a6f
Make photo.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
0738ea7d0f
Make highgui.hpp independent from C API
2013-04-08 15:47:29 +04:00
Andrey Kamaev
288a0634c2
Make imgproc.hpp independent from C API
2013-04-08 15:47:28 +04:00
Andrey Kamaev
6ef43cd96e
Merge pull request #779 from sivapvarma:master
2013-04-08 10:11:33 +04:00
Andrey Kamaev
5cfb6a848e
Merge pull request #780 from sivapvarma:2.4
2013-04-08 10:11:16 +04:00
Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Siva Prasad Varma
e2df8c7e62
Fix bug #2590
...
replaced wrong check to correct check
2013-04-05 19:09:09 +05:30
Siva Prasad Varma
3b0ce8e132
Add HoughTransform examples python2
...
houghlines.py for HoughLinesP() and HoughLines()
houghcircles.py for HoughCircles()
2013-04-05 14:32:07 +05:30
Alexander Smorkalov
f89cc191a4
Waning fixes for Android samples
2013-04-05 12:17:45 +04:00
Alexander Shishkov
35f75147b0
removed willowgarage.com links
2013-04-04 14:33:00 +04:00
Alexander Shishkov
382695ba5a
removed links to the http://opencv.willowgarage.com/
2013-04-04 13:44:28 +04:00
Alexander Smorkalov
3929a43873
Native activity install fixed.
2013-04-03 14:43:23 +04:00
Andrey Kamaev
c979de1eed
Rewrite Mat formatting without std streams
2013-04-03 11:55:19 +04:00
Vladislav Vinogradov
9086efa8e9
fixed warnings
2013-04-02 13:24:00 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
3890a74565
Drop outdated definitions from internal.hpp
...
This also fixes few clang build errors
2013-04-01 15:24:35 +04:00
Andrey Kamaev
71e43852ce
Fix MSVC build issues
2013-04-01 15:24:34 +04:00
Andrey Kamaev
2b1ef95415
Completely separate C and C++ API of OpenCV core
2013-04-01 15:24:34 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Andrey Kamaev
5e7ab8baf3
Move cv::Scalar_ to types.hpp
2013-04-01 15:24:33 +04:00
Andrey Kamaev
13b31b0804
Move C++ basic structures to separate header and inverse dependency from C API
...
cv::Complex, cv::Point_ and cv::Point3_ are moved.
2013-04-01 15:24:32 +04:00
Andrey Kamaev
2a1cf23fab
Merge pull request #713 from bitwangyaoyao:2.4_perf
2013-04-01 15:16:48 +04:00
Alexander Smorkalov
f2fe89c6d8
CMakeLists.txt for Android native activity added.
2013-04-01 12:38:26 +04:00
Dustin Spicuzza
b08432cfe7
Port dft.py sample from cv to cv2
2013-03-29 17:37:00 -04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
yao
5539e85a11
use perf test replace performance sample
2013-03-27 12:04:48 +08:00
Andrey Kamaev
20534c9beb
Merge pull request #692 from vpisarev:refactor_calib3d_stereo
2013-03-26 18:38:16 +04:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
29cfeb7cee
Fix build of apps and samples
2013-03-22 22:14:36 +04:00
Andrey Kamaev
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
7661625c39
converter stereo correspondence algorithms to the new style
2013-03-22 01:05:30 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
1b4afcca30
Move OpenCl SURF perf tests to nonfree and fix build of samples
2013-03-21 18:19:52 +04:00
Andrey Kamaev
40c26e21d2
Merge pull request #662 from asmorkalov:android_native_activity
2013-03-21 14:47:14 +04:00
Vadim Pisarevsky
321070ccf0
Merge pull request #669 from vpisarev:fast_lin_svm
2013-03-21 12:22:36 +04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
24c614f686
added load/save feature for SVM classifier in letter_recog sample
2013-03-19 18:41:38 +04:00
Vadim Pisarevsky
a06af5ca25
dramatic speedup of SVM::predict in the case of linear SVM
2013-03-19 18:28:17 +04:00
Alexander Smorkalov
b37d65ff2b
Code refactoring was done.
2013-03-18 17:36:48 +04:00
Vladislav Vinogradov
0a65f2f4af
merged gpunonfree and nonfree module
2013-03-18 16:14:37 +04:00
cuda-geek
3f8d87d82c
Merge pull request #661 from cuda-geek:merge-cpu-gpu-detections
2013-03-18 15:34:02 +04:00
Vladislav Vinogradov
fd7bf0b766
moved SURF_GPU and VIBE to gpunonfree module
2013-03-18 14:06:29 +04:00
Alexander Smorkalov
dc2bca0772
Initialization with Manager instead static link added.
2013-03-18 10:37:11 +04:00
Alexander Smorkalov
436d9bbcbb
Base for Native Activity example added.
2013-03-18 10:37:11 +04:00
marina.kolpakova
0211843062
merge Detection structure for CPU and GPU soft cascade detectors
2013-03-18 06:58:53 +04:00
cuda-geek
819ac111a2
Merge pull request #660 from Nerei:2.4
2013-03-17 23:00:04 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Anatoly Baksheev
2bf3104ee5
bugfix in sample to support LBP classifier. To merge to master also.
2013-03-17 18:43:55 +04:00
Andrey Kamaev
e75df56317
Unified handling of InputOutputArrays in Python wrapper generator
...
This makes arguments of type InputOutputArray required in python unless they
have a default value in C++.
As result following python functions changes signatures in non-trivial way:
* calcOpticalFlowFarneback
* calcOpticalFlowPyrLK
* calibrateCamera
* findContours
* findTransformECC
* floodFill
* kmeans
* PCACompute
* stereoCalibrate
And the following functions become return their modified inputs as a return
value:
* accumulate
* accumulateProduct
* accumulateSquare
* accumulateWeighted
* circle
* completeSymm
* cornerSubPix
* drawChessboardCorners
* drawContours
* drawDataMatrixCodes
* ellipse
* fillConvexPoly
* fillPoly
* filterSpeckles
* grabCut
* insertChannel
* line
* patchNaNs
* polylines
* randn
* randShuffle
* randu
* rectangle
* setIdentity
* updateMotionHistory
* validateDisparity
* watershed
2013-03-15 17:44:49 +04:00
Andrey Kamaev
a1c456b7c3
Extract common base header for C and C++ APIs
2013-03-15 10:38:38 +04:00
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
marina.kolpakova
157a98edf7
refactored cuda error handling; remove optional dependancies in soft cascade training app
2013-03-14 23:43:03 +04:00
marina.kolpakova
a476664144
fixed compilation with latest master changes
2013-03-14 20:12:52 +04:00
marina.kolpakova
5120322cea
move gpu version of soft cascade to dedicated module
2013-03-14 12:27:13 +04:00
Andrey Kamaev
d9cd753835
Merge pull request #645 from taka-no-me:bump_headers
2013-03-14 11:42:23 +04:00
Andrey Kamaev
7d0938d481
Merge pull request #640 from cuda-geek:soft-cascade-sample
2013-03-14 11:41:17 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
marina.kolpakova
b4b63cd698
add softcascade to people detector sample
2013-03-13 07:39:50 +04:00
Andrey Kamaev
9f3ce0dd97
Reword and merge pull request #625 from jet47/gpu-fixes
2013-03-12 18:14:23 +04:00
Vladislav Vinogradov
ecb2ebfba4
Move opengl iterop code to cv::ogl namespace
...
Fixed issues: #2737 #2848
2013-03-12 18:13:11 +04:00
Andrey Kamaev
fb04f3a58d
Merge pull request #622 from moshekaplan:python2_cleanups
2013-03-11 21:14:20 +04:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
Moshe Kaplan
bd042d9cc3
Fixed shebangs, added error checking
2013-03-06 01:41:02 -05:00
Andrey Kamaev
816adcfdac
Merge pull request #605 from vpisarev:c2cpp_calib3d_stereo
2013-03-05 15:26:51 +04:00
Moshe Kaplan
facd580f28
Small changes to Python samples
...
Update find_obj.py:
Added additional error checking for the loaded files and modified the detector check to be more pythonic (is versus ==).
Update common.py:
Fixed a typo (contais -> contains)
2013-03-04 12:25:35 -05:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Vadim Pisarevsky
df89f30b4a
removed preset parameter in createStereoBM, updated stereo_match sample
2013-03-02 02:17:49 +04:00
Andrey Kamaev
e6cb44edc3
Merge pull request #600 from taka-no-me:fix_build_warnings
2013-03-01 17:09:56 +04:00
Andrey Kamaev
22d33373fa
Fix build warnings on MSVC x64 and OS X clang
2013-03-01 13:29:43 +04:00
Andrey Kamaev
eaaba1336a
Merge pull request #595 from bitwangyaoyao:2.4_perfTest
2013-03-01 12:49:43 +04:00
yao
8f3883a28d
fix a compile warning
2013-03-01 10:06:51 +08:00
Andrey Pavlenko
af2552d72c
fixing issues from http://www.code.opencv.org/issues/2807
2013-02-28 19:11:24 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Kamaev
2a73a6c445
Merge pull request #525 from odeniz:2.4
2013-02-28 18:05:55 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Andrey Pavlenko
29b763dc60
updating samples to load JNI lib with correct suffix
2013-02-28 16:24:52 +04:00
Andrey Kamaev
bf4c8c6ff1
Merge pull request #584 from bitwangyaoyao:2.4_perfTest
2013-02-28 15:44:06 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
yao
ed3c3822fc
adjust some test cases, use original template file name in Haar
2013-02-28 12:15:13 +08:00
Georgios Evangelidis
f40725bb50
Add ECC algorithm
...
Evangelidis, G.D. and Psarakis E.Z. "Parametric Image Alignment using Enhanced
Correlation Coefficient Maximization", IEEE Transactions on PAMI, vol. 32, no.
10, 2008
2013-02-28 01:48:00 +04:00
Andrey Kamaev
5b7a4cd955
Merge pull request #579 from bitwangyaoyao:2.4_perfTest
2013-02-27 19:34:17 +04:00
yao
bf427c01c1
adjust matchTemplate in performance sample, as current version is too slow when template size isn't small
2013-02-27 21:41:04 +08:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
6409a4b112
fix the compile warnings
2013-02-27 11:16:46 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Alexander Smorkalov
11885e86ee
Feature #2833 Sepia size in Image Manipulations demo implemented.
2013-02-26 11:25:33 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Oscar Deniz Suarez
07ea88b8c6
Update samples/c/smiledetect.cpp
...
Fixed isdigit() Android build error
2013-02-22 16:23:42 +01:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Oscar Deniz Suarez
8cfba6456b
Update samples/c/smiledetect.cpp
...
- Changed to floating neighbor maximum mode
- Fixed some previous errors.
2013-02-21 22:55:28 +01:00
Oscar Deniz Suarez
379dcf87d5
Added smile detector
2013-02-21 17:17:34 +01:00
Vladislav Vinogradov
8b1f88c40f
updated gpu module API
2013-02-21 16:12:33 +04:00
Andrey Kamaev
afa993316f
Merge pull request #502 from jet47:opengl-updates
2013-02-21 15:12:43 +04:00
Vladislav Vinogradov
a938534a7e
restored binary compatibility
2013-02-21 12:18:08 +04:00
Andrey Kamaev
637397f621
Merge branch '2.4'
2013-02-20 12:31:16 +04:00
Abid K
96b2898f38
Update samples/python2/hist.py
...
range in calcHist() changed from [0,255] to [0,256]. Otherwise, it won't count pixels with value 255. It can be verified taking sum of histogram values and checking it with image size.
2013-02-19 19:31:53 +05:30
Vladislav Vinogradov
e06c3ec7c5
updated OpenGL functionality:
...
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
262fc929aa
Merge branch '2.4'
2013-02-18 15:35:42 +04:00
Andrey Kamaev
7e5eee5bf1
Merge pull request #301 from emchristiansen:javasample2.4
2013-02-15 18:38:25 +04:00
Andrey Pavlenko
2853bab471
converting images to PNG
2013-02-15 16:46:30 +04:00
Andrey Pavlenko
edb15dee3d
review feed-back considered
2013-02-15 16:33:13 +04:00
Andrey Pavlenko
a8c2fc6908
changing layout, adding ant and eclipse sections, more pictures
2013-02-14 17:54:37 +04:00
Vladislav Vinogradov
a3a09cf4d1
refactored OpticalFlowDual_TVL1:
...
* added DenseOpticalFlow interface
* moved OpticalFlowDual_TVL1 to src folder
2013-02-14 13:26:47 +04:00
Vladislav Vinogradov
aa73bf6079
added gpu optical flow sample
2013-02-13 15:58:12 +04:00
Vladislav Vinogradov
fe2e89df1b
added gpu::HoughLinesP function
2013-02-13 15:56:58 +04:00
Vladislav Vinogradov
1498d2f427
added dual tvl1 optical flow implementation
2013-02-13 15:42:58 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
d067dc5a05
Code review notes fixed.
2013-02-11 11:36:12 +04:00
Alexander Smorkalov
9a2d6f854b
Tutorial-1-Java -> Tutorial-1-CameraPreview
...
Issues fix.
2013-02-08 13:13:37 +04:00
Alexander Smorkalov
507e2dc0ad
Project files for Eclipse updated.
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
b558bb4894
Tutorial-5 -> Tutorial-3
2013-02-08 12:50:58 +04:00
Alexander Smorkalov
902463b6e9
Tutorial4 sample renamed to Tutorial-2-MixedProcessing
2013-02-08 12:50:07 +04:00
Alexander Smorkalov
08cd51df1f
Tutorial-3 removed as dublicate part of tutorial-4.
2013-02-08 12:47:45 +04:00
Alexander Smorkalov
b943277559
Tutorial-2 removed as dublicate of tutorial-1 and image manipulations sample.
2013-02-08 12:47:23 +04:00
Alexander Smorkalov
33502c86ac
Tutorial 1 renamed
2013-02-08 12:45:48 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
6b5eac328f
Android samples updated according onCameraFrame callback signature change.
...
FpsMeter class removed from Image Manipulations and Face Detection examples as unused code.
2013-02-04 17:43:46 +04:00
cuda-geek
6b4304efda
Merge pull request #388 from ivan-korolev:fix_cmd_line_parsing_in_samples
2013-01-31 17:15:14 +04:00
Andrey Kamaev
57d3152cd0
Merge branch '2.4'
2013-01-31 14:35:27 +04:00
Ivan Korolev
36451319c1
fixed cmd line parsing in the samples
2013-01-31 12:08:43 +04:00
Andrey Kamaev
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Andrey Kamaev
7572b4d400
Merge branch '2.4'
2013-01-30 15:12:50 +04:00
Andrey Kamaev
68be50bbab
Fix clang build warning
2013-01-30 13:31:00 +04:00
Andrey Kamaev
9690ed8232
Fix build of OpenCV samples (Linux)
2013-01-30 12:48:01 +04:00
Vadim Pisarevsky
c69312ea0d
fixed #2580 , #2210 . some work on #2025 .
...
modified SIFT to 1) double image before finding keypoints, 2) use floating-point internally instead of 16-bit integers, 3) set the keypoint response to the abs(interpolated_DoG_value). step 1) increases the number of detected keypoints significantly and together with 2) and 3) it improves some detection benchmarks. On the other hand, the stability of the small keypoints is lower, so the rotation and scale invariance tests now struggle a bit. In 2.5 need to make this feature optional and add some more intelligence to the algorithm.
added test that finds a planar object using SIFT.
2013-01-29 19:38:56 +04:00
cuda-geek
11dfceb2c9
Merge pull request #328 from jet47:new-gpu-fixes
2013-01-29 11:00:37 +04:00
Andrey Kamaev
f4e27bcbbc
Merge branch '2.4'
2013-01-25 16:30:36 +04:00
Andrey Kamaev
d5b15d6523
Fix ocl build warnings
2013-01-24 17:08:30 +04:00
Stefan Romberg
9f417268b3
Fixed visualization by choosing the color appropriate to the detection
...
Fixed visualization by choosing the color appropriate to the detection
score.
Previously the example showed all detections with the same color
disregarding the confidence. This led to the impression that the object
detection did not work at all because there are many detections with low
confidences.
PR to master was
https://github.com/Itseez/opencv/pull/320
2013-01-24 10:01:18 +01:00
Vladislav Vinogradov
ae6266e101
fixes for gpu module:
...
- fixed printCudaDeviceInfo for new CC
- fixed some compilation errors and warnings
- removed unset command from CMake script
- removed unused std imports
2013-01-23 21:05:06 +04:00
Vadim Pisarevsky
dc4d0398f3
converted few more comp. geometry functions to C++
2013-01-22 16:54:31 +04:00
Eric Christiansen
6169b1dc90
Adds samples for Java and Scala
2013-01-15 12:03:55 -08:00
Vadim Pisarevsky
b68df415a9
Merge pull request #135 from nevion:master
2013-01-10 16:43:45 +04:00
marina.kolpakova
45191dd6a5
merge CUDA dev branch
2012-12-29 19:44:38 +04:00
Anatoly Baksheev
389ecbe96d
warnings, renamed Marina's GPU_PERF_TEST_P
2012-12-25 22:00:20 +04:00
Andrey Kamaev
132b5d6435
Merge release 2.4.3.2
2012-12-25 19:07:08 +04:00
Andrey Pavlenko
dd8e648d78
hiding empty menu button on Android 4
2012-12-25 17:49:10 +04:00
Andrey Kamaev
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Vladislav Vinogradov
5138b7d209
Merge branch 'master' into cuda-dev
2012-12-24 13:48:33 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
962884cdec
Merge branch 2.4
2012-12-21 17:58:48 +04:00
Alexander Smorkalov
77df8730ef
Tutorial-5 sample extended.
...
Application menu reorganized;
Resolution control added.
2012-12-20 11:16:34 +04:00
Alexander Smorkalov
1555922228
OpenCV for Android SDK installation improved;
...
ReadMe.txt for OpenCV Manager added;
share folder excluded from SDK.
2012-12-19 17:28:46 +04:00
Vladislav Vinogradov
41c9377db0
fixed warnings under windows
2012-12-18 18:03:54 +04:00
Anatoly Baksheev
680eeecc3b
fixed samples compilation
2012-12-17 13:19:26 +04:00
Vladislav Vinogradov
1a1f454241
updated gpu houghlines sample
2012-12-17 11:15:45 +04:00
Vladislav Vinogradov
da017fbeb9
fast optical flow bm implementation
2012-12-17 10:39:19 +04:00
Vadim Pisarevsky
2a42960ff2
Merge branch 'master' of https://github.com/nevion/opencv into cc
2012-12-15 21:45:55 +04:00
Andrey Kamaev
f5cd20d80b
Merge branch 2.4
2012-12-14 14:46:41 +04:00
Vladislav Vinogradov
caf91ac159
new gpu::HoughLinesP implementation
2012-12-13 17:18:25 +04:00
Vladislav Vinogradov
da93a1dab9
fixed build for CARMA platform
2012-12-13 13:49:32 +04:00
marina.kolpakova
a6c3ed5b36
Merge branch master into cuda-dev
2012-12-11 01:12:14 +04:00
Jason Newton
6a4d881a78
use vector instead of non-standard stack allocation. also correct program argument borkage
2012-12-08 23:09:05 -08:00
Alexander Smorkalov
d550f95347
Date and time added to saved file name.
2012-12-07 14:46:53 +04:00
Vladislav Vinogradov
aad76090ce
gpu::HoughLinesP
2012-12-06 15:14:20 +04:00
Vladislav Vinogradov
05d842bcd8
a bit more opengl refactoring:
...
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
* fixed indentation in gl_core_3_1
* minor improvments for opengl sample
2012-12-03 13:11:06 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Alexander Smorkalov
22484872fa
Sample Tutorial-5 improved
...
Aditional toasts added;
Exception handling improved;
Bitmap recycling added.
2012-11-30 18:41:46 +04:00
Vladislav Vinogradov
08fbf667f9
refactored opengl functionality
...
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
Andrey Kamaev
60a98aa5f7
Merge pull request #199 from apavlenko/remove_android_tutorial0
...
removing Android tutorial 0
2012-11-30 01:20:07 -08:00
Andrey Pavlenko
ea83d384c1
removing Android tutorial 0 since it has become irrelevant after moving to the new application framework
2012-11-30 12:32:16 +04:00
Alexander Smorkalov
d36f8b9eb3
Code review comments applied
...
Sample renamed to CameraControl;
Picture taking added to show camera preview restart.
2012-11-29 18:26:57 +04:00
Alexander Smorkalov
86f7a357ae
Tutorial-5 functionality implemented.
2012-11-27 18:06:43 +04:00
Alexander Smorkalov
24c920a33a
Base for new sample added.
2012-11-27 18:06:43 +04:00
Jason Newton
00bdca7684
A few changes to comply with upstream requirements for merge.
...
-Change input/output order from (out Labeled, in Image) -> (in Image, Out Labeled) and convert
to Input/OutputArrays in the process.
-Adopt OutputArray for statistics export so that the algorithm is "wrapper friendly" and not requiring a new struct in
language bindings at the expense of using doubles for everything and slowing statistics computation down..
2012-11-27 02:31:38 -08:00
Alexander Smorkalov
e95fc27490
Samples updated
...
In tutorial-1 fps meter enabled via layout.xml. Camera id is set to "any" via lauout.xml;
In tutorial-2 message moved ion the bottom of the screen.
2012-11-27 12:47:41 +04:00
marina.kolpakova
209f16455d
Merge cuda-geek/soft-cascade-gpu into cuda-dev
2012-11-26 19:15:02 +04:00
marina.kolpakova
1712d0930c
Merge origin/master into cuda-dev
2012-11-26 18:56:33 +04:00
Andrey Pavlenko
b19f672843
( #2569 ) simplifying code to avoid Eclipse CDT editor confusion, removing warnings and typos in comments
2012-11-26 17:32:10 +04:00
Andrey Kamaev
23011ffd81
Merge pull request #179 from cuda-geek:usr-bin-env-python
2012-11-24 19:24:01 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +04:00
Alexander Smorkalov
2c67731a7b
Issue #2549 OpenCV Samples does not expand on full screen fixed.
...
All samples use application style in android manifest instead of system calls in onCreate event now.
2012-11-23 13:12:11 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5
Merge pull request #161 from apavlenko:fix/sdk_r21
2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e
Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
...
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
marina.kolpakova
c3e4a52fbe
soft cascade sample
2012-11-14 20:11:18 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400
Merge pull request #147 from taka-no-me/win_warnings
2012-11-13 19:48:59 +04:00
Andrey Kamaev
a218507586
Merge pull request #148 from taka-no-me/tutorial_codes
2012-11-13 18:20:49 +04:00
marina.kolpakova
d65b3e0617
fix warning in CUDA samples
2012-11-10 04:59:55 +04:00
Andrey Kamaev
dad56e202f
Rename sample & tutorial executables
2012-11-09 10:15:48 +04:00
Andrey Kamaev
b131dfeecd
Build tutorial codes together with other samples
...
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01
Fix Windows build warnings
2012-11-09 10:10:04 +04:00
Alexander Smorkalov
91a9923dcf
Face detection package name replaced on org.opencv.facedetect for consistency with Google Play package.
2012-11-09 09:40:19 +04:00
Alexander Smorkalov
95b7f5c46c
Face Detection sample namespace replaced on org.opencv.facedetect for consistency with Google Play.
2012-11-07 13:27:33 +04:00
Jason Newton
4c0cb2576d
connectedComponents: peep-hole optimizations, mostly surrouding the fact that cv::Mat::at is expensive in a tight-loop -also added a "blobstats" version
2012-11-05 08:10:35 -08:00
Jason Newton
45b4f4f32b
connectedComponents: warning free version
2012-11-05 08:10:29 -08:00
Vladislav Vinogradov
beb377b38c
gpu implementation of Dual TV-L1 Optical Flow
2012-11-02 19:51:43 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
marina.kolpakova
9b92de9a88
Merge pull request #121 from branch asmorkalov:android_samples_fix
2012-11-01 19:11:53 +04:00
Alexander Smorkalov
a1a2cb0aeb
OpenCV Samples testing problems fixed:
...
Memory leak in color-blob-detection sample fixed;
Default face size in face-detection is set to 20%;
Error handling improved;
Some possible mat leak fixed;
Manager verison and engine interface version incremented to fix incompatibilities;
Docs updated;
2012-10-31 17:24:50 +04:00
Andrey Kamaev
66b90d19a6
Merge pull request #81 from stephenfox/master
2012-10-31 16:59:45 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
3fb90abb76
added retina code tutorial
2012-10-30 15:06:13 +04:00
Alexander
d495daf1ed
Memory leak of native OpenCV mats fixed.
2012-10-29 16:56:21 +04:00
Alexander Smorkalov
83d8bc8c55
Tutorial 1 updated. Execution time camera switching implemented.
...
Some unification done to simplify camera switching.
2012-10-26 13:30:20 +04:00
Vladislav Vinogradov
0ad849d2fd
Dual TV-L1 optical flow implementation
2012-10-25 11:25:35 +04:00
Andrey Kamaev
673aa91bac
Fix remaining windows build warnings
2012-10-24 20:27:20 +04:00
Andrey Kamaev
6211f156e6
Merge 2.4.3-rc
2012-10-24 19:56:27 +04:00
alexandre benoit
b5bd86b2a7
added retina code tutorial
2012-10-24 12:20:59 +02:00
Alexander Smorkalov
76bcf72ded
2.4.3 version support added to OpenCV Manager. Docs updated. Samples updated.
2012-10-24 09:51:01 +04:00
Alexander Smorkalov
c1d42664bc
Refactring. Bug fix.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a942747046
Code review coments fixed. Lint wornings fixed.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
4c06d0834e
camera-preview sample removed from CMakeLists.txt
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
84856fa2c1
CMakeLists.txt rescued. Androidmanifest unified.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
a5ee07d340
Image manipulations sample ported on new framework.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
898320a0f6
Code clean up.
2012-10-23 20:06:58 +04:00
Alexander Smorkalov
c64ee44c9e
Color blob detection sample ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
2fd8b51a26
Face detection sample ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
d9ea16ce57
Tutorial1 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
873f47654a
Tutorial2 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
31763bdcf0
Tutorial3 ported on new framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
50500e5923
Tutorial4 ported on new sample framework.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
9029acf6f0
openCV application framework moved to modules/java/... folder. Now it is part of OpenCV SDK.
2012-10-23 20:06:33 +04:00
Alexander Smorkalov
68ab3d5be6
Processing thread added to Java camera view.
2012-10-23 20:06:32 +04:00
Alexander Smorkalov
8393fd0c9d
Auto focus added;
...
Old Android support added;
Android 4.1.x fixes added;
Thead sync added;
Camera errors handling added.
2012-10-23 20:06:32 +04:00
Alexander Smorkalov
f8bcff8ff3
Device rotation support added;
...
Nexus 7 support added.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
09901fae2b
OnResume/OnPause handlers added to start/stop camera.
...
OpenCV initialization moved to onResume event to support package installation waiting.
2012-10-23 20:05:16 +04:00
Alexander Smorkalov
cc3430dbcc
Naming fixed;
...
Warnings fixed;
Nexus 7 support added to manifest.
2012-10-23 20:04:09 +04:00
Konstantin Bezruk
cd152c3a03
Puzzle15 implementation with use of the OpenCV surface framework
2012-10-23 20:02:46 +04:00
Alexander Smorkalov
5f1339b319
Menu and style removed from sample.
2012-10-23 20:02:46 +04:00
Andrey Pavlenko
a32004f90c
adding initial version of a sample with new Camera-View handling design
2012-10-23 20:01:23 +04:00
Stephen Fox
9f8ce906f4
fix to documentation regarding CV_CAP_OPENNI_* in high gui userguide
...
fix comments to accurate match CV_CAP_OPENNI_* vs. wrong OPENNI_*
2012-10-22 23:18:46 -05:00
Andrey Kamaev
57775988e7
Merge branch '2.4'
2012-10-22 16:57:56 +04:00
Andrey Kamaev
8fb6d9f650
Fix Android build warnings
2012-10-19 16:14:14 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
f4e33ea0ba
Fix build of samples
2012-10-17 02:09:46 +04:00
Andrey Kamaev
7225f89ea2
Revert opencv_videostab to the state of 2.4.2
2012-10-17 02:09:43 +04:00
Andrey Kamaev
26bcb3812c
Fix binary compatibility of opencv_contrib
2012-10-17 02:09:28 +04:00
Andrey Kamaev
d566c6bc86
Revert "add new version of CommandLineParser. add empty docs"
...
This reverts commit 54a202b3d5
.
Conflicts:
modules/core/doc/command_line_parser.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/cmdparser.cpp
modules/gpu/perf/main.cpp
modules/gpu/test/main.cpp
modules/ts/src/ts_perf.cpp
2012-10-15 20:01:44 +04:00
Andrey Kamaev
dbd30d4fba
Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core"
...
This reverts commit eb4ce67dac
.
Conflicts:
samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java
2012-10-15 17:53:57 +04:00
Vadim Pisarevsky
cb58e5a3a4
let Kalman handle the missing measurements (bug #1380 )
2012-10-12 14:01:36 +04:00
Andrey Kamaev
83799d6bf4
Fix Mat indexing in TrackingMotion tutorial code (supersedes pull request #38 )
2012-10-12 12:59:50 +04:00
Vsevolod Glumov
69fbc6102c
Fixed an issue with 'how_to_scan_images.cpp' tutorial code. Issue #2259
2012-10-11 03:51:34 +04:00
Alexander Smorkalov
a91de25f10
Build fix after issue #2284 fix.
2012-10-10 14:27:17 +04:00
Vadim Pisarevsky
044d38a051
expanded cv::threshold parallelization to other threading frameworks; fixed potential bug with unprocessed bottom of the image; fixed build problem in stitching
2012-10-09 22:38:04 +04:00
Vadim Pisarevsky
a09c88ab16
added Asus Xtion QVGA modes to the OpenNI backend (patch #1753 )
2012-10-09 22:01:43 +04:00
Vadim Pisarevsky
a310e2f027
fixed the case of scale != 1 in stereo_match.cpp (patch #1936 )
2012-10-08 22:39:11 +04:00
Abhinav Gupta
c0638aa2e0
Update samples/cpp/tutorial_code/features2D/SURF_detector.cpp
...
Changes made for OpenCV 2.4.2 compatibility
2012-10-05 21:31:41 +04:00
Andrey Pavlenko
a8e7f91e34
java samples fix (clear view before drawing frame) of 'dirty' FPS display bug
2012-09-28 18:21:22 +04:00
Vadim Pisarevsky
427ce1247a
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
2012-09-23 20:57:34 +04:00
Alexander Mordvintsev
1017dea332
Merge branch 'master' of git://code.opencv.org/opencv
2012-09-17 19:37:38 +04:00
Alexander Mordvintsev
2a96f28bc1
get rid of Lock in gabor_threads.py
2012-09-17 19:30:20 +04:00
Andrey Kamaev
e73089bdb5
Fix windows build warnings
2012-09-17 13:30:28 +04:00
yao
04e946b2a3
make ocl surf sample compile on Linux
2012-09-13 17:34:06 +08:00
yao
c09e2f88df
Add a SURF sample for ocl module
2012-09-12 11:49:37 +08:00
Andrey Kamaev
36f912261b
Move gpu sample to gpu folder
2012-09-10 19:17:50 +04:00
Vladislav Vinogradov
98c92f196e
added Generalized Hough implementation
2012-09-10 16:49:40 +04:00
Andrey Kamaev
e564a53ccd
Add gitignore for Android tests and samples
2012-09-10 15:48:57 +04:00
Vadim Pisarevsky
53fdae93bd
fixed compile error on Windows
2012-09-07 15:25:32 +04:00
AoD314
54a202b3d5
add new version of CommandLineParser. add empty docs
2012-09-07 13:24:48 +04:00
Andrey Kamaev
07d92d9e5a
Fix android build warnings
2012-09-04 17:44:23 +04:00
Kevin
93155c6ae0
Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated
2012-09-04 13:58:59 +04:00
Vadim Pisarevsky
67ff95083d
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
2012-09-03 17:03:31 +04:00
kir
44da71daf4
removed duplicated sample (for facedetect)
2012-08-31 18:38:42 +04:00
Andrey Kamaev
067744d071
Fix Android samples for devices having front camera only (Nexus 7)
2012-08-31 18:25:08 +04:00
Andrey Kamaev
fc93518449
Fix package name of Android color blob detection sample
2012-08-31 17:47:12 +04:00
Andrey Kamaev
bd12f636c8
Unify manifest files in Android examples
2012-08-31 17:47:12 +04:00
Yury Zemlyanskiy
1fde184192
Small fixes for SimpleFlow algorithm
...
+ Fixed warnings
+ Add new function calcOpticalFlow with smaller number of arguments
+ Add asserts to algorithm and remove 'exit(1)'
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
784c09d6f9
Updates for SimpleFlow algorithm
...
+ New format for flow data - CV_32C2
+ Memory optimization
+ Cross Bilateral Filter optimization
+ Minor optimizations
+ Sample for calcOpticalFlowSF improved
2012-08-31 14:39:59 +04:00
Yury Zemlyanskiy
c77d099018
"SimpleFlow" optical flow estimation algorithm (GSoC project) declaration in includes, implementation, usage example, test
2012-08-31 14:39:58 +04:00
niko
6f6e990988
use mutex provided by opencv itself
...
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
2012-08-31 14:08:52 +08:00
Andrey Kamaev
cd59cf3ab5
Fixed java camera release in Android tutorial-0 sample
2012-08-28 20:37:06 +04:00
Andrey Kamaev
47b9640785
Updated package version in Android samples
2012-08-28 15:07:42 +04:00
Andrey Kamaev
ba862ffdff
Fix/workaround bogus error in Android samples running on Android 4.1.1
2012-08-24 16:24:53 +04:00
Andrey Kamaev
e9e0668549
Fix crash on resume in face detection sample
2012-08-24 16:24:53 +04:00
Andrey Kamaev
285af48040
Fix Andoid samples: black screen after resume problem
2012-08-24 16:17:42 +04:00
Alexander Mordvintesv
4fb15ae1f0
Merge branch 'master' of code.opencv.org:opencv
2012-08-22 16:43:48 +03:00
Alexander Mordvintesv
d9185ec21b
added _doc.py -- doc-string ckecking utility
...
added some sample description
2012-08-22 16:42:19 +03:00
Vadim Pisarevsky
bbf679267a
modified facedetect to properly display very oblong objects and optionally flip image horizontally (for profile face detection). Added LBP cascades by Attila Novak for profile face detection and silverware detection (those are results of GSoC 2012)
2012-08-22 15:48:57 +04:00
Andrey Kamaev
f2a02feffa
Fix Windows build issues
...
* No /arch:SSE3 in MSVC
* Warnings fixed or suppressed
2012-08-22 11:21:09 +04:00
Alexander Mordvintesv
c9f2ff4487
added texture_flow.py sample
2012-08-19 20:36:50 +03:00
Alexander Mordvintesv
4c15465fbb
Merge branch 'master' of code.opencv.org:opencv
2012-08-18 19:43:46 +03:00
Alexander Mordvintesv
a4bffd96c4
added deconvolution.py sample and example images
2012-08-18 19:43:32 +03:00
Alexander Smorkalov
a1d8091e10
ColorBlobDetection Sample, ImageManpulations Sample and Tutorial2 updated. Issues with native camera on Nexus 7 (Android 4.1) fixed.
2012-08-16 16:52:53 +04:00
bitwangyaoyao
a091f9e4e2
bug fix of "squares" sample for ocl module
2012-08-16 20:34:24 +08:00
yao
d363d5589c
add an "squares" sample for ocl module
2012-08-16 16:01:40 +08:00
Alexey Spizhevoy
7992203598
Fixed CMakeLists.txt
2012-08-13 14:44:41 +04:00
Alexey Spizhevoy
27eb5d07cf
Added getScale/setScale for image warpers (stitching module)
2012-08-13 14:39:47 +04:00
Philipp Wagner
9c75ff43ba
Bug #2257 : Adding a quick workaround for truncated labels on 64bit machines in the Python FaceRecognizer wrapper code. This is only a temporary bugfix, that will be fixed at a better point as soon as possible.
2012-08-11 22:36:35 +02:00
Philipp Wagner
6161a3335c
Removed writing the test.png, wasn't meant to be commited.
2012-08-09 23:52:09 +02:00
Vladislav Vinogradov
79ef454c5f
Merge branch 'bgfg-gmg-optimized' into bgfg-gmg-merged
2012-08-09 14:55:36 +04:00
Vladislav Vinogradov
beb3e6ff18
added GMG_GPU to bgfg_segm sample
2012-08-09 12:59:18 +04:00
Vladislav Vinogradov
42c1d4f4b1
new optimized version of BackgroundSubtractorGMG
2012-08-08 18:15:06 +04:00
Vladislav Vinogradov
c5e92c31ba
fixed Bug #2252
...
error in the tutorial Similarity check (PNSR and SSIM) on the GPU
2012-08-08 14:38:14 +04:00
yao
2fed1fcbff
add an ocl sample
2012-08-08 17:12:53 +08:00
Alexander Mordvintesv
7db1f711f6
Merge branch 'master' of code.opencv.org:opencv
...
Conflicts:
samples/python2/common.py
samples/python2/feature_homography.py
samples/python2/plane_ar.py
samples/python2/plane_tracker.py
2012-08-07 23:21:56 +03:00
Alexander Mordvintesv
a29be81d77
typo fix in features_homography.py
2012-08-07 21:37:46 +03:00
alexey.spizhevoy
a39bce204d
implemented DP-based seam estimation method
2012-08-07 16:24:21 +04:00
Andrey Kamaev
5100ca7508
svn repository web references are replaced with links to git
2012-08-07 14:30:36 +04:00
Vadim Pisarevsky
2013118971
new/improved Python samples by Alexander Mordvintsev
2012-08-06 16:35:35 +04:00
Alexander Mordvintesv
d9dc02541a
Added descriptions to PlaneTracker samples
2012-08-05 10:20:42 +03:00
Alexander Mordvintesv
353c69e017
created PlaneTracker (int plane_tracker.py), which implements multitarget planar tracking
...
rewritten feature_homography.py using it
added plane_ar.py - simple augmented reality sample
2012-08-03 22:17:11 +03:00
Alexander Mordvintesv
ffa8c32348
work on feature_homography.py: multiple targets
2012-08-01 21:41:03 +03:00
Philipp Wagner
40e65b9603
facerec_demo.py: Updated contact mail address.
2012-07-30 19:31:49 +02:00
Alexander Mordvintsev
72a4f1924d
feature_homography.py:
...
building descriptor index on target capture
simple AR experiment (work in progress)
2012-07-30 12:39:41 +04:00
Philipp Wagner
c0a4105467
facerec_demo.py: Shortened code. Final version.
2012-07-30 02:24:39 +02:00
Philipp Wagner
4a7e29b3f4
facerec_demo.py: Reworked demo to remove all matplotlib dependencies.
2012-07-30 02:18:27 +02:00
Philipp Wagner
508a029dae
Moved the facerec_demo.py to the wrong directory. Now moved to the python2 folder.
2012-07-30 01:18:58 +02:00
Philipp Wagner
1454f3d391
Added the facerec_demo.py to show how to perform Face Recognition with the Python module.
2012-07-30 01:16:38 +02:00
Alexander Mordvintesv
f8facadc67
print description in mosse.py
2012-07-29 17:24:47 +03:00
Alexander Mordvintesv
f6191cc5bb
added MOSSE sample
2012-07-29 17:21:49 +03:00
Alexander Mordvintesv
0f9bbf85e5
spelling corrections, added aero images as a more impressive example for
...
ASIFT
2012-07-29 16:26:22 +03:00
Alexander Mordvintesv
88a9f8f919
spelling corrections, added aero images as a more impressive example for
...
ASIFT
2012-07-29 16:15:44 +03:00
marina.kolpakova
cf92e4b4e0
Merge branch 'master' of git://5.9.49.245/opencv
2012-07-25 08:33:51 +04:00
marina.kolpakova
51f7a3ca81
fixed #2190
2012-07-25 08:32:14 +04:00
Andrey Pavlenko
794b07ba11
removing unused files
2012-07-24 23:58:52 +04:00
Andrey Pavlenko
e16ae33a17
removing unused file
2012-07-24 23:55:14 +04:00
Alexander Mordvintsev
ea96047f78
small doc fix
2012-07-16 14:17:39 +00:00
Alexander Mordvintsev
200357fdf4
window name changed
2012-07-16 14:16:36 +00:00
Alexander Mordvintsev
ad7a6ec41f
correct unknown feature report in find_obj.py
2012-07-16 12:31:56 +00:00
Alexander Mordvintsev
3ce5b01543
added asift.py sample
2012-07-16 12:29:49 +00:00
Alexander Mordvintsev
99e404fe86
moving data used by sample into a separate folder
...
small fix in find_obj.py
2012-07-16 11:46:05 +00:00
Alexander Mordvintsev
8610ff1b4d
find_obj.py allows to select detector and matcher and explore matching pairs
2012-07-16 11:31:43 +00:00
Andrey Pavlenko
dc68a56bab
fixing wording
2012-07-15 05:51:29 +00:00
Andrey Pavlenko
92e6aa5f17
customizing the 'Google Market error' message in samples
2012-07-14 19:49:00 +00:00
Andrey Pavlenko
4e4db94b6b
removing warnings on deprecated api when targeting to android-15+
2012-07-14 19:07:27 +00:00
Alexander Mordvintsev
7bbc42127e
refactored find_obj.py sample:
...
- handle bad matching case
- use BFMatcher and FlannBasedMatcher (and thus fixing a bug: L2^2 metric was used for flann)
2012-07-13 20:27:54 +00:00
Alexander Mordvintsev
65e2350606
work on digits_video.py
2012-07-12 11:51:27 +00:00
Andrey Pavlenko
5ec9909b71
updating include dirs to make CDT project in Eclipse happy
2012-07-11 13:12:37 +00:00
Alexander Mordvintsev
84281d284e
mdot function in common.py
2012-07-11 05:07:00 +00:00
Alexander Mordvintsev
d9478252e9
show detected keypoints in feature_homography.py
2012-07-09 12:19:59 +00:00
Alexander Mordvintsev
a2c3c1800a
new feature_homography.py sample
2012-07-06 15:42:42 +00:00
Andrey Kamaev
620d122fc2
Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings
2012-07-05 07:58:40 +00:00
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Alexander Mordvintsev
1543b46383
HoG and Hellinger-metric preprocess for digit recognition
...
line breaks in fitline.py description
2012-07-02 13:49:36 +00:00
Andrey Pavlenko
e2e6838da3
adding CDT Builder (via ndk-build.cmd) for JNI part
2012-07-02 13:15:16 +00:00
Alexander Smorkalov
3a88fc5aa9
Android samples renaming was done. Icon updated.
2012-07-02 10:06:08 +00:00
Maria Dimashova
b3f68d29e7
fixed bow sample
2012-07-02 09:21:55 +00:00
Alexander Mordvintsev
83ccdbd0ce
refactored digits_adjust.py (dataset preprocess in cloud)
2012-07-02 07:49:46 +00:00
Alexander Mordvintsev
6977a89525
descriptions for watershed.py and video.py
2012-07-02 04:44:31 +00:00
Alexander Mordvintsev
d015bf6f5e
fitline.py sample added
2012-07-02 03:51:47 +00:00
Vadim Pisarevsky
e4b58ebff5
added GMG background segmentation algorithm by Andrew Godbehere, ticket #2065
2012-06-28 16:24:48 +00:00
Leonid Beynenson
00b02f9f6d
Small addition change in the FileStorage sample.
2012-06-28 11:17:32 +00:00
Leonid Beynenson
7fc18fe146
Added to the sample, demonstrating FileStorage, how to read/write data from/to std::string.
2012-06-28 10:32:34 +00:00
Andrey Pavlenko
42d830ec23
switching to dynamic linking
2012-06-28 07:51:19 +00:00
Alexander Mordvintsev
c6685bc9a7
improved recognition accuracy by better region normalization
2012-06-27 13:22:06 +00:00
Alexander Mordvintsev
60dd599aea
discard digit's internal contours in digits_video.py
2012-06-27 12:42:21 +00:00
Andrey Kamaev
a323da6fd5
Fixed some warnings and install problems on linux
2012-06-27 12:02:31 +00:00
Alexander Mordvintsev
981564ffe9
work on digits_video.py
2012-06-27 10:09:45 +00:00
Alexander Mordvintsev
c71c82a8f1
work on digits_video.py
2012-06-27 09:46:04 +00:00
Alexander Mordvintsev
b987154ebc
digits_video.py prints warning if trained classifier (should be created by digits.py) not found
2012-06-27 08:29:22 +00:00
Andrey Pavlenko
3804ca3e20
changing package layout after 'make install' for Android build
2012-06-27 06:22:26 +00:00
Alexander Mordvintsev
6dffc5332d
digits_video.py (VERY IMMATURE)
...
digits.py now saves the resulting SVM classifier for use in digits_video.py
2012-06-27 05:59:16 +00:00
Alexander Mordvintsev
13b30d7428
digits_adjust.py sample added
2012-06-27 05:51:24 +00:00
Alexander Mordvintsev
d636e1128b
removed ANN digits recognition
...
added deskew for SVN and KNearest recognition sample
2012-06-27 04:29:15 +00:00
Andrey Pavlenko
9efc1a689b
fixing project properties
2012-06-26 15:25:00 +00:00
Alexander Smorkalov
b962bf75cf
Sample3-native build fix. Dependency from OpenCV library project added. Scripts updated.
2012-06-26 13:24:12 +00:00
Alexander Smorkalov
369f2c4903
Color blob detection example updated for OpenCV Manager model.
2012-06-26 12:58:46 +00:00
Alexander Smorkalov
109e308763
Sample4-mixed was updated for OpenCV Manager model.
2012-06-26 12:57:43 +00:00
Alexander Smorkalov
0693073b98
Example3-native updated for OpenCV Manager model
2012-06-26 12:44:57 +00:00
Alexander Smorkalov
521b89e69d
Sample 2 was updated for OpenCV Manager model.
2012-06-26 12:31:04 +00:00
Alexander Smorkalov
207f4fc53c
Sample 1 updated for OpenCV Manager model.
2012-06-26 12:26:42 +00:00
Alexander Smorkalov
7a858885e6
Image manipulations sample updated for OpenCV Manager model.
2012-06-26 12:20:35 +00:00
Vladislav Vinogradov
e9e66e5796
added VIBE_GPU (background subtraction) to gpu module
2012-06-26 10:38:15 +00:00
Andrey Kamaev
ecf6b5a87c
Making all dependencies from highgui module optional
2012-06-26 07:29:36 +00:00
Alexander Smorkalov
700b685575
Revision 8725 restored. Android sample FaceDetection updated according DetectionBasedTracker interface.
2012-06-25 17:12:19 +00:00
Alexander Smorkalov
80febef237
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
2012-06-25 17:01:55 +00:00
Vladislav Vinogradov
d85ef03a42
added background subtraction sample for gpu module
2012-06-25 12:48:54 +00:00
Vladislav Vinogradov
3a4353f04d
added FGDStatModel, MOG and MOG2 to gpu performance sample
2012-06-25 11:46:45 +00:00
Vladislav Vinogradov
ed8b6c798b
copy 768x576.avi video to sample directory
2012-06-25 11:26:07 +00:00
Andrey Kamaev
ec3a7665b0
Fixed FREAK on Android
2012-06-25 11:19:11 +00:00
Alexander Mordvintsev
d49c697fda
added comments to contours.py and edge.py samples
2012-06-25 10:58:34 +00:00
Alexander Mordvintsev
a3220a446f
added comment to letter_recog.py sample (adopted from c++ version)
2012-06-25 10:52:45 +00:00
Andrey Kamaev
bd901eb52d
Reverted r8721 and r8725 (issue #2080 )
2012-06-24 08:50:03 +00:00
Vadim Pisarevsky
74707ec7ae
added FREAK (by Kirell Benzi, Raphael Ortiz, Alexandre Alahi and Pierre Vandergheynst)
2012-06-24 01:37:55 +00:00
Alexander Smorkalov
02170a0a58
Sample updated due to new DetectionBasedTracker interface.
2012-06-22 14:07:54 +00:00
Andrey Pavlenko
2984fa751e
adding OpenCV Manager
2012-06-21 14:50:05 +00:00
Alexander Smorkalov
a3be73b5cc
revisions 8681 and 8688 restored. Warning fixed.
...
Warning: changes beak binary compatibility
2012-06-21 14:37:28 +00:00
Andrey Pavlenko
0a58d8f139
moving to OpenCVLoader API
2012-06-21 14:06:23 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
988c405f79
Fixed build with MSVC
2012-06-20 16:03:03 +00:00
Andrey Kamaev
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
e8d158a5c8
Reverted changes breaking Android build
2012-06-19 08:10:05 +00:00
Alexander Mordvintsev
e0df3e27ac
added digits2.py sample (work in progress)
2012-06-18 14:42:43 +00:00
Maria Dimashova
39f865faf9
set sample param to its default value in function
2012-06-18 14:14:15 +00:00
Alexander Mordvintsev
3b55e0d4e9
added kmeans.py sample
2012-06-18 11:48:04 +00:00
Alexander Smorkalov
1736cc9739
Code style fix. dbt face detection example turned off for Windows.
2012-06-18 10:59:28 +00:00
Alexander Smorkalov
7c160cdc30
Detection based tracker was refactored. Detector interface added.
2012-06-18 08:55:05 +00:00
Andrey Pavlenko
0942244d6f
'call' added to android.bat call
2012-06-15 15:37:11 +00:00
Vladislav Vinogradov
2e2bd55729
new implementation of gpu::PyrLKOpticalFlow::dense (1.5 - 2x faster)
2012-06-15 11:02:33 +00:00
Andrey Pavlenko
8bc9e52dcc
fixing typo that breaks the build
2012-06-15 10:42:32 +00:00
Kirill Kornyakov
58aac7ea98
fixes #2044
2012-06-15 07:07:29 +00:00
Alexander Mordvintsev
a98d6b6217
exposed parallelized SVM prediction to python (predict_all)
2012-06-14 10:02:49 +00:00
Philipp Wagner
7b544d2a6d
Documentation for FaceRecognizer started (not added to toc of contrib/doc/contrib.rst yet). CSV file for the samples/cpp/facerec_demo.cpp added. Added some more exceptions to warn the user, when passing bad aligned data.
2012-06-12 22:49:14 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Alexander Mordvintsev
02e3afae3a
fixed find_obj.py (use detectAndCompute)
2012-06-12 06:31:51 +00:00
Philipp Wagner
b3c61ee0fe
Minor grammatical correction in comments.
2012-06-10 22:42:20 +00:00
Philipp Wagner
cd7d93f362
Exceptions now go into CV_Error. Added thresholding to the FaceRecognizer and updated the demo accordingly.
2012-06-10 22:23:18 +00:00
Philipp Wagner
ee1b671279
Several exceptions added to the available FaceRecognizer classes and helper methods, so wrong input data is reported to the user. facerec_demo.cpp updated to latest cv::Algorithm changes and commented.
2012-06-10 11:57:33 +00:00
Alexander Mordvintsev
889df76ea7
added lappyr.py sample
2012-06-10 08:38:25 +00:00
Vadim Pisarevsky
1e14d84008
possibly fixed crash boost caused by the recent modification; slightly improved mlp params in letter_recog sample
2012-06-09 07:05:24 +00:00
Andrey Kamaev
2f40905548
Fixed Android build
2012-06-08 08:11:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
517fc5e2d2
fixed typo in the tutorial code (thanks to Abid Rahman; ticket #2016 )
2012-06-06 10:04:09 +00:00
Andrey Pavlenko
da7920ff85
auto-copy java.so to package
2012-06-06 09:22:53 +00:00
Alexander Mordvintsev
455349a0eb
comments for digits.py sample
2012-06-06 05:52:28 +00:00
Alexander Mordvintsev
3cfa6949d7
work on added digits.py sample (neural network for handwritten digit recognition)
2012-06-01 13:27:56 +00:00
Alexander Smorkalov
3780685fe6
CodeReview #1512 notes fixed.
2012-05-31 12:26:29 +00:00
Alexander Smorkalov
5c528defb8
CodeReview #1511 notes upplied.
2012-05-31 10:54:37 +00:00
Andrey Pavlenko
eb4ce67dac
fixing Java test and sample after moving drawContours() from Imgproc to Core
2012-05-29 11:04:04 +00:00
Kirill Kornyakov
5c13b8706f
added fix_properties scripts for Android samples
2012-05-28 13:31:44 +00:00
Alexander Mordvintsev
a61b730238
compatibility corrections
2012-05-28 09:25:08 +00:00
Alexander Mordvintsev
e0c1fb5f76
updated video_threaded.py sample:
...
- switch btw threaded and non-threaded mode
- performance counters
- description
2012-05-28 08:51:50 +00:00
Alexander Mordvintsev
6116049225
video_threaded.py sample now uses multiprocessing module's ThreadPool
2012-05-25 14:38:39 +00:00
Andrey Kamaev
eb90882b2d
Fixed some build warnings
2012-05-25 13:13:51 +00:00
Alexander Mordvintsev
eb28bef2db
added video_threaded.py sample
2012-05-24 15:40:55 +00:00
Alexander Smorkalov
fc71745caf
cv::Exception handling added. Multithreading bug fixed.
2012-05-22 14:47:40 +00:00
Alexander Smorkalov
b422d078f8
Face detection example updated. Dtetection base tracker mode added.
2012-05-22 12:21:26 +00:00
Alexander Mordvintsev
ddf7fde3b2
fixed gaussian_mix.py sample
2012-05-22 09:11:09 +00:00
Alexander Mordvintsev
cef18937a2
made video_dmtx.py description visible in demo.py
2012-05-22 08:45:10 +00:00
Alexander Mordvintsev
f4f41df756
removed derivLambda param for LK-tracker
...
linetype -> lineType
2012-05-22 08:43:42 +00:00
Maria Dimashova
608855a322
include nonfree for a couple of f2d samples
2012-05-21 08:47:57 +00:00
Andrey Pavlenko
e3fc405393
fix for #1954 (typos)
2012-05-17 19:36:38 +00:00
Andrey Pavlenko
5855c4905e
Android samples are updated: onPause()/onResume() release/open camera, a message is shown on camera open error, minor fixes in code and resources
2012-05-17 14:51:04 +00:00
Alexander Smorkalov
abe16352d6
ColorBlobDetection example. Bug fix. Refactoring.
2012-05-12 07:38:31 +00:00
Vladislav Vinogradov
ef478840af
added message that timings doesn't include data transfer to gpu performance sample (Issue #1846 )
2012-05-12 06:28:51 +00:00
Vadim Pisarevsky
e794622776
propagated 2 fixed from 2.4 to trunk
2012-05-11 11:48:26 +00:00
Alexander Smorkalov
bae8a88c53
Base version implemented.
2012-05-04 13:46:00 +00:00
Vladislav Vinogradov
ca57239618
fixed some problems after r8280 (lost code)
2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Alexey Spizhevoy
02d34bdac2
Refactored videostab module
2012-04-26 09:01:15 +00:00
Alexandre Benoit
18fdc6bf1c
user can now use the default retia config auatogenerated file to test their own setup
2012-04-25 13:55:14 +00:00
Alexey Spizhevoy
71391eb76f
Added LP based global motion estimation (videostab)
2012-04-25 13:21:38 +00:00
Vladislav Vinogradov
11eacb9d14
Bug #1823 : fixed patch size calculation in PyrLKOpticalFlow
2012-04-25 07:03:32 +00:00
Vladislav Vinogradov
092c1f98f6
fixed build of gpu demos pack
2012-04-25 06:27:55 +00:00
Alexey Spizhevoy
95efec7539
Added local outlier rejector. Added rigid motion estimator. Refactored videostab module.
2012-04-24 12:23:23 +00:00
Vladislav Vinogradov
44eaeee865
refactored gpu BruteForceMather (made it similar to BFMatcher)
2012-04-24 07:56:33 +00:00
Vladislav Vinogradov
f65d841d6f
fixed several warnings (VS2010, Win64)
...
added getParams method to VideoWriter_GPU
2012-04-23 14:22:02 +00:00
Alexey Spizhevoy
24be840c44
Added GPU version of wobble suppressor (videostab)
2012-04-23 10:37:07 +00:00
Alexey Spizhevoy
36ef599840
Fixed trim ratio estimation for the case of homographies motion model (videostab)
2012-04-23 06:42:55 +00:00
Alexey Spizhevoy
e49ea39a1f
Fixed parsing cmd args bug (videostab)
2012-04-19 12:16:45 +00:00
Alexey Spizhevoy
f355f798a4
Minor changes in videostab module and sample
2012-04-19 10:27:17 +00:00
Alexey Spizhevoy
f42eea1029
Added timing for main steps (videostab)
2012-04-19 09:29:13 +00:00
Alexey Spizhevoy
ada63d1800
Updated videostab sample
2012-04-19 08:38:42 +00:00
Alexey Spizhevoy
536d36b05a
Refactoring (videostab)
2012-04-18 17:00:07 +00:00
Alexey Spizhevoy
1569c1ed52
Added GPU version of PyrLK based global motion estimator (videostab)
2012-04-18 13:23:41 +00:00
Vladislav Vinogradov
e29d41c885
minor fix in gpu video_writer sample
2012-04-18 11:49:17 +00:00
Vladislav Vinogradov
f4b4665940
added VideoReader_GPU
2012-04-18 11:18:25 +00:00
Alexey Spizhevoy
19c30eaa11
Refactored videostab module
2012-04-17 09:12:14 +00:00
Vladislav Vinogradov
2bfaf540a1
added VideoWriter_GPU
2012-04-17 07:12:16 +00:00
Alexey Spizhevoy
8c4ffc8bb2
Fixed typo (videostab)
2012-04-16 11:14:30 +00:00
Alexey Spizhevoy
40e7990b6b
Added linear programming based stabilizer (videostab)
2012-04-16 06:41:06 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Alexey Spizhevoy
9d871abd32
Refactored videostab module. Added normalization into motion estimators.
2012-04-11 14:02:10 +00:00
Alexey Spizhevoy
b5a1bad7a4
Added more flags for motion estimation in videostab sample
2012-04-11 10:17:35 +00:00
Alexey Spizhevoy
b549900fe1
Minor fixes and updates in videostab module and sample
2012-04-10 10:33:19 +00:00
Alexey Spizhevoy
673f879ccd
Fixed bug in videostab sample. Fixed model size in global estimators.
2012-04-10 09:07:30 +00:00
Alexey Spizhevoy
30b461a506
Added support of homography motion model into vidostab sample
2012-04-06 10:51:46 +00:00
Alexey Spizhevoy
d9d4755387
Updated wobble suppression code in videostab module
2012-04-06 08:52:31 +00:00
Alexey Spizhevoy
fa09f3d121
Refactored videostab module. Added MoreAccurateMotionWobbleSuppressor class
2012-04-05 13:23:42 +00:00
Alexey Spizhevoy
f32b645b96
Refactored videostab module, added base class for woobble suppression
2012-04-05 09:15:13 +00:00
Alexander Mordvintsev
5ee7596cbc
fixed EM sample
2012-04-04 12:06:36 +00:00
Alexey Spizhevoy
efa0717d01
Added support of homography estimation into videostab module
2012-04-04 11:45:16 +00:00
Alexey Spizhevoy
56b5e6d8a8
Updated videostab module
2012-04-02 12:26:05 +00:00
Alexey Spizhevoy
3e23bb6df6
Refactored videostab module and sample
2012-04-02 09:25:27 +00:00
Vladislav Vinogradov
5fe493474c
minor fix of gpu performance sample
2012-04-02 08:55:04 +00:00
Vladislav Vinogradov
c02c676865
fixed gpu performance sample (SURF usage)
...
added tests for filter2D
2012-04-02 08:53:06 +00:00
Vadim Pisarevsky
f309bafe9e
another fix for cap_dshow.cpp; fixed warning in facerec_demo
2012-03-30 20:06:06 +00:00
Andrey Kamaev
0d18d19ad6
Fixed Android build warnings
2012-03-30 16:10:52 +00:00
Vadim Pisarevsky
68d20301f2
fixed building delaunay.c with MSVC
2012-03-30 12:54:54 +00:00
Vadim Pisarevsky
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
Alexey Spizhevoy
014accaf31
Fixed default arg value in videostab sample
2012-03-30 09:49:41 +00:00
Alexey Spizhevoy
99f29b75a1
Added linear similarity estimation into videostab module
2012-03-30 09:44:32 +00:00
Vadim Pisarevsky
33bc089506
fixed HOGDescriptor::detect and HOGDescriptor::detectMultiScale signatures (ticket #1304 )
2012-03-29 17:18:38 +00:00
Andrey Pavlenko
6d49b075d9
updating screen resolutions support settings
2012-03-29 15:41:38 +00:00
Andrey Pavlenko
74749fccbf
fix for #1724 : making Java samples compatible with Android 3.1+ targets
2012-03-28 15:32:01 +00:00
Andrey Kamaev
e72a23243b
Reworked build scripts for Android Java API, tests and examples
2012-03-27 16:05:52 +00:00
Vadim Pisarevsky
7a62413c94
added houghcircles sample, improved circle detection (ticket #951 )
2012-03-27 12:00:22 +00:00
Vadim Pisarevsky
e8fab91d51
added DIST_LABEL_PIXEL labelType to distanceTransform, ticket #1641 (thanks to Mikhail Matrosov for the patch)
2012-03-27 09:06:21 +00:00
Maria Dimashova
550fd8e57c
added image and depth synchronization
2012-03-27 07:41:48 +00:00
Vadim Pisarevsky
cec8f719a3
added face recognition algorithms, LDA, colormaps (all by Philipp Wagner)
2012-03-24 22:03:47 +00:00
Vadim Pisarevsky
648669cb81
preliminary version of a multi-level findcontours
2012-03-24 20:07:10 +00:00
Andrey Kamaev
9b2d7e19db
Added "fat" mode for Java wrapper
2012-03-23 17:03:05 +00:00
Alexey Spizhevoy
45fd8a6a63
Added load and save motion args into videostab sample
2012-03-22 09:30:28 +00:00
Alexey Spizhevoy
984583981c
Split stabilizer into OnePassStabilizer and TwoPassStabilizer
2012-03-22 07:52:17 +00:00
Andrey Pavlenko
6708869425
updating Java samples to meet Java API changes
2012-03-22 07:25:29 +00:00
Maria Dimashova
c1a6cb6221
added oni-files reading
2012-03-21 14:31:40 +00:00
Alexey Spizhevoy
3323ee9d18
Added distance threshold argument into videostab sample
2012-03-21 08:34:00 +00:00
Gary Bradski
ad2ee1d572
import as cv not cv2. Fixed
2012-03-21 05:13:02 +00:00
Alexey Spizhevoy
dcb5464b3c
Added more inpainting methods. Fixed some errors.
2012-03-20 12:24:51 +00:00
Marina Kolpakova
577dabb8bc
fixed bug #1571
2012-03-20 09:44:40 +00:00
Alexey Spizhevoy
be73f8e29c
Added quiet mode into videostab sample
2012-03-20 08:12:58 +00:00
Alexey Spizhevoy
e4651fa697
Fixed ensureInclusionConstraint
2012-03-20 07:30:07 +00:00
Alexey Spizhevoy
3abd941774
Minor changes in videostab sample
2012-03-20 07:16:10 +00:00
Alexey Spizhevoy
bde7456256
Updated videostab sample
2012-03-20 06:52:52 +00:00
Alexey Spizhevoy
a60dc947b1
Added first version of videostab module
2012-03-19 13:39:23 +00:00
Marina Kolpakova
1d2c6ef410
fixed sample for new signature of calcOpticalFlowPyrLK
2012-03-19 12:55:48 +00:00
Alexey Spizhevoy
e87a07e2aa
Fixed bug #1693 . Also corrected default parameters for stitching.
2012-03-19 11:51:18 +00:00
Gary Bradski
a4de511eb7
Added cv.DestroyAllWindows() to file close
2012-03-18 23:21:54 +00:00
Gary Bradski
5878ab6a0f
added destroyAllWindows at end
2012-03-18 23:12:55 +00:00
Gary Bradski
8a48b8dffd
added destroy all windows
2012-03-18 23:07:39 +00:00
Gary Bradski
c29f0dfdfa
added destroy all windows
2012-03-18 23:01:31 +00:00
Vadim Pisarevsky
c8e206c2ab
added LogPolar Blind Spot Model (thanks to Fabio Solari for the contribution)
2012-03-18 22:29:13 +00:00
Marina Kolpakova
082e988173
Fixed bug #1666
2012-03-18 16:46:07 +00:00
Vadim Pisarevsky
d60623279c
switched to non-constant references in Algorithm::addParam, which is more safe.
2012-03-17 09:50:47 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Maria Dimashova
baa81de122
renamed property of openni camera
2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a
renamed property of openni camera
2012-03-16 09:08:18 +00:00
Maria Dimashova
930c7bf20e
minor refactoring CvCapture_OpenNI
2012-03-15 15:55:07 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Gary Bradski
c47c1adc94
remove some unneeded imports
2012-03-15 03:50:31 +00:00
Gary Bradski
dfaabd88fc
added cv2.destroyAllWindows()
2012-03-15 03:45:15 +00:00
Gary Bradski
41d2a3c832
Examples of using histograms in python
2012-03-14 23:33:16 +00:00
Gary Bradski
9164ccbaaf
added 0xFF & in front of every waitKey so that it works on linux
2012-03-14 21:46:34 +00:00
Ivan Korolev
6e2507c197
Added some new warpers.
2012-03-14 12:59:23 +00:00
Maria Dimashova
f67d9d9038
added ability to pass initial transformation to rgbd odometry
2012-03-13 13:07:30 +00:00
Vadim Pisarevsky
191e969243
fixed angle check in squares.py (thanks to Abid Rahman)
2012-03-12 16:45:17 +00:00
Alexander Shishkov
6051e27a09
added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657
2012-03-12 16:07:42 +00:00
Maria Dimashova
fbfc0cc96f
added special cases to RGBDOdometry (translation only, rotation only)
2012-03-12 10:40:39 +00:00
Alexander Shishkov
be63ce723f
#1672
...
updated links in cheatsheet
renamed directory for Mat tutorial
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +00:00
Maria Dimashova
532781e8d2
initial version of rgbd odometry with sample
2012-03-11 09:31:28 +00:00
Alexander Mordvintsev
58174f6ada
Added GIL-release code into python wrappers
...
Added gabor_threads.py sample
2012-03-07 11:09:27 +00:00
Alexander Mordvintsev
2727a425e4
fixed distrans.py sample (distanceTransform -> distanceTransformWithLabels)
2012-03-06 13:22:55 +00:00