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
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
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
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
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
侯骥
055adc2302
Update MatchTemplate_Demo.cpp
2014-06-11 10:29:30 +02:00
Alexander Alekhin
15b6fd2ec4
android: allow to build & run examples without Android OpenCV Manager
2014-06-06 18:01:04 +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
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