Andrey Kamaev
67073daf19
Merge branch '2.4'
2013-04-05 21:11:59 +04:00
Andrey Kamaev
940eedfb27
Finalize core headers reorganization
2013-04-03 14:10:03 +04:00
Vadim Pisarevsky
10702c6d75
fixes in bundle adjustment code by Nils Hasler
2013-04-01 15:20:35 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
2ad7b97f1c
All modules (except ocl and gpu) compiles and pass tests
2013-03-22 22:14:26 +04:00
Andrey Kamaev
a42a0f5fca
Added compatibility headers
2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
berak
baf2b87a0d
Update modules/contrib/include/opencv2/contrib/contrib.hpp
...
class LevMarqSparse is not tagged CV_EXPORTS,
so the contrib module, built the on win using vs won't contain that symbol,
trying to create an instance of LevMarqSparse will lead to a 'undefined symbol' err, because it did not make it into the library.
2013-02-01 21:13:55 +01:00
Andrey Kamaev
dc0788c864
Merge branch 2.4
2013-01-17 18:39:20 +04:00
Alexander Smorkalov
8cb0343f4c
Documentation build warning fixes.
...
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
084b1c7969
Merge branch 2.4
2013-01-11 15:45:23 +04:00
Andrey Kamaev
b401c6a0c3
Fix discrepancies between function signatures in headers and documentation
2012-12-26 18:24:50 +04:00
Andrey Kamaev
7f542e391a
Merge branch 2.4
...
Conflicts:
android/service/engine/AndroidManifest.xml - use file from 2.4
modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Alexander Mordvintsev
9cfa51a483
added CV_OUT to StereoVar output paramiter
2012-11-13 23:17:54 +04:00
OpenCV Buildbot
81f826db2b
Normalize line endings and whitespace
2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
Andrey Kamaev
26bcb3812c
Fix binary compatibility of opencv_contrib
2012-10-17 02:09:28 +04:00
Andrey Kamaev
0dc3d61071
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-17 02:09:17 +04:00
Andrey Kamaev
0442bca235
Revert "partially recovered binary compatibility (ticket #2415 )"
...
This reverts commit 94b97b7a63
.
2012-10-16 19:37:12 +04:00
Andrey Kamaev
075372a71c
Revert "fixed compilation error because of DetectionBasedTracker"
...
This reverts commit 9b8c47399a
.
2012-10-16 19:37:02 +04:00
Andrey Kamaev
e7b81688a4
Revert "yet another portion of changes towards the binary compatibility"
...
This reverts commit 618fbf5508
.
2012-10-16 19:35:57 +04:00
Kirill Kornyakov
9b8c47399a
fixed compilation error because of DetectionBasedTracker
2012-10-09 18:55:20 +04:00
Vadim Pisarevsky
618fbf5508
yet another portion of changes towards the binary compatibility
2012-10-08 21:36:27 +04:00
Vadim Pisarevsky
94b97b7a63
partially recovered binary compatibility (ticket #2415 )
2012-10-08 17:06:05 +04:00
Leonid Beynenson
2fd8ad65b9
Made changes in cv::DetectionBasedTracker -- now it can return status of the tracked objects
2012-10-04 20:50:59 +04:00
Andrey Kamaev
0e9405e591
Honor resently added functionality in hdr_parser and rst_parser; minor fixes in documentation
2012-09-14 22:26:32 +04:00
Vadim Pisarevsky
67ff95083d
added openfabmap code, contributed by Arren Glover. fixed several warnings in the new versions of retina filters
2012-09-03 17:03:31 +04:00
Philipp Wagner
9db42aca04
Issue #2232 : Bugfixes for 64bit Python-compability.
2012-08-06 01:37:43 +02:00
Philipp Wagner
62a8f6783e
FaceRecognizer supports updating a model now. Documentation has been updated to reflect latest changes.
2012-07-30 19:31:10 +02:00
Philipp Wagner
f29d73fe86
Updated the train method to be an InputArrayOfArrays, so the Python wrapper now generates the correct code (and it works).
2012-07-29 23:51:12 +02:00
Leonid Beynenson
6d3db49932
Changed DetectionBasedTracker a bit to make its method addObject to return an integer value -- the id of the new added object.
2012-07-09 14:37:12 +00:00
Andrey Kamaev
b1eba01afb
Fixed several mistakes in documentation
2012-07-05 07:30:45 +00:00
Vadim Pisarevsky
acf356b080
added contrib module support in Python wrappers (thanks to Eric Christiansen)
2012-07-04 17:59:14 +00:00
Leonid Beynenson
35344569bf
Added possibility in the class DetectionBasedTracker to work as a tracker only -- without the mainDetector.
...
In this case new objects will be added into it by the method addObject(const cv::Rect& location).
2012-06-28 16:07:10 +00:00
Alexander Smorkalov
80febef237
revision 8721 vas merged to head. Detection based tracker interface changed. cpp and android samples updated.
2012-06-25 17:01:55 +00:00
Andrey Kamaev
bd901eb52d
Reverted r8721 and r8725 (issue #2080 )
2012-06-24 08:50:03 +00:00
Alexander Smorkalov
a3be73b5cc
revisions 8681 and 8688 restored. Warning fixed.
...
Warning: changes beak binary compatibility
2012-06-21 14:37:28 +00:00
Andrey Kamaev
e94e5866a1
Fixed mingw build warnings
2012-06-20 17:57:26 +00:00
Andrey Kamaev
e8d158a5c8
Reverted changes breaking Android build
2012-06-19 08:10:05 +00:00
Alexander Smorkalov
1736cc9739
Code style fix. dbt face detection example turned off for Windows.
2012-06-18 10:59:28 +00:00
Alexander Smorkalov
7c160cdc30
Detection based tracker was refactored. Detector interface added.
2012-06-18 08:55:05 +00:00
Philipp Wagner
000bf4af48
Two colormaps removed from the list of colormaps, as they are no visually improved enhancement to a Jet colormap.
2012-06-16 08:33:48 +00:00
Philipp Wagner
cd7d93f362
Exceptions now go into CV_Error. Added thresholding to the FaceRecognizer and updated the demo accordingly.
2012-06-10 22:23:18 +00:00
Philipp Wagner
ee1b671279
Several exceptions added to the available FaceRecognizer classes and helper methods, so wrong input data is reported to the user. facerec_demo.cpp updated to latest cv::Algorithm changes and commented.
2012-06-10 11:57:33 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Vadim Pisarevsky
41c932f306
FaceRecognizer class is now derived from Algorithm, therefore it's possible to set and retrieve the parameters using conventional Algorithm::set and Algorithm::get methods
2012-05-21 15:27:40 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
cec8f719a3
added face recognition algorithms, LDA, colormaps (all by Philipp Wagner)
2012-03-24 22:03:47 +00:00
Maria Dimashova
be1d95b495
added default values of parameters
2012-03-20 14:41:27 +00:00