c20ff6ce19
made everything compile and even run somehow
2014-08-03 01:41:09 +04:00
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
05164bf713
Merge pull request #2608 from Siddharthk:master
2014-08-01 09:13:32 +00:00
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
223cdcd0ee
fixed compilation of some samples; fixed ANN_MLP::predict
2014-07-30 22:53:46 +04:00
2ab7fb6051
Merge pull request #3017 from f-morozov:akaze
2014-07-30 15:03:47 +00:00
7f82960897
AKAZE fixes, tests and tutorial
2014-07-30 18:02:08 +04:00
85ccac2633
Added help()
2014-07-30 15:23:52 +02:00
4a86900761
Added help()
2014-07-30 13:32:27 +02:00
69f1ee8732
Code tutorial
2014-07-30 13:08:19 +02:00
6ff58f02e2
Code tutorial
2014-07-30 12:57:18 +02:00
94968c81e0
Code tutorial
2014-07-30 12:57:11 +02:00
b58979d057
Code tutorial
2014-07-30 12:57:04 +02:00
38c2cc8521
Code tutorial
2014-07-30 12:56:55 +02:00
31bec45998
Code tutorial
2014-07-30 12:56:46 +02:00
b33a2f24fa
Code tutorial
2014-07-30 12:56:30 +02:00
9d18f5c458
Code tutorial
2014-07-30 12:56:22 +02:00
6f5876f8f7
Code tutorial
2014-07-30 12:55:35 +02:00
2848f43acc
Code tutorial
2014-07-30 12:54:49 +02:00
319dbd2eb7
Code tutorial
2014-07-30 12:53:43 +02:00
924e062426
Code tutorial
2014-07-30 12:53:24 +02:00
3b24aa2441
Code tutorial
2014-07-30 12:53:14 +02:00
be4c1afb0b
Code tutorial
2014-07-30 12:53:06 +02:00
550e3721ae
Code tutorial
2014-07-30 12:51:59 +02:00
64c164c111
Code tutorial
2014-07-30 12:39:46 +02:00
74e52df3cd
Code tutorial
2014-07-30 12:33:27 +02:00
7334e54a63
Code tutorial
2014-07-30 12:31:19 +02:00
88d05a89d4
removed build error
...
Whitespaces removed
2014-07-29 00:15:11 +05:30
14d0b763ec
changed demo tutorial path
2014-07-29 00:15:11 +05:30
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
ee90b88dd7
Merge pull request #2720 from pglotov:master
2014-07-25 12:54:22 +00:00
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
8f8450793a
Merge pull request #2964 from vbystricky:highgui_split
2014-07-16 19:29:36 +00:00
7a77cf584a
added timelapse
2014-07-15 09:32:47 -07:00
cf3757448d
Merge pull request #2965 from soulslicer:patch-2
2014-07-15 09:44:32 +00:00
b1793e2fb9
Merge pull request #2939 from adishavit:sample-fix_stitching_pipeline
2014-07-15 08:09:04 +00:00
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00
64d8cf1e2e
improving face-rec sample:
...
* CSV can contain dir-s and wildcards
* save trained model
2014-07-12 19:28:43 +04:00
67e23ed972
Fixing double to uchar conversion warning.
2014-07-11 07:33:42 -07:00
6e022dcb06
Update facedetect.cpp
...
Somebody forgot to add curly brackets
2014-07-10 17:44:40 -07:00
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
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
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
561703ca27
Fixed the compiler warnings for the demo program.
2014-07-01 17:04:28 -07:00
14548227ca
Adding support for GDAL raster images.
2014-07-01 16:29:11 -07:00
e8850bf84a
Merge pull request #2626 from KayKwon:matlab_formatter
2014-06-26 17:40:26 +04:00
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
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
b6e25a9fc7
Fix typos
2014-06-16 18:48:10 +08:00
055adc2302
Update MatchTemplate_Demo.cpp
2014-06-11 10:29:30 +02:00
Vadim Pisarevsky
Roman Donchenko
f-morozov
edgarriba
siddharth
vbystricky
Petr Glotov
Andrey Pavlenko
Marvin Smith
Raaj
Adi Shavit
Neo Alienson
侯骥