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