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
marina.kolpakova
23699acca0
fix for bug 2264
...
fix compilation OpenCV with cxx11 under Ubuntu with clang and gcc 4.7
2012-10-08 02:37:22 +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
Vadim Pisarevsky
427ce1247a
some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover
2012-09-23 20:57:34 +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
Philipp Wagner
cfa250eff5
The labels of a model are now cloned instead of using Mat::copyTo, because Mat::copyTo leads to a crash with the Python wrapper. I need to further investigate it.
2012-09-07 22:42:46 +02:00
Philipp Wagner
a5e37779fb
Added a simple CMakeLists.txt to the facerec_samples, which are not included in the samples folder. Makes building these samples a lot easier.
2012-09-07 17:33:44 +02:00
Andrey Kamaev
07d92d9e5a
Fix android build warnings
2012-09-04 17:44:23 +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
Alexandre Benoit
37fe2a252a
updated Retina module code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper... compile error corrected
2012-08-31 14:55:32 +02:00
Alexandre Benoit
5a6114e299
updated code for more flexible parallelisation : TBB parallel for loops are replaced by opencv parallel_for_ wrapper
2012-08-31 14:14:57 +02:00
Alexandre Benoit
ffb3842ef1
updated retina documentation
2012-08-31 11:19:46 +02:00
Alexandre Benoit
52b4b5b052
added retina module documentation
2012-08-30 16:02:04 +02:00
Andrey Kamaev
b2acf50c81
Fix build warning introduced in commit:424bc609b6f352a2b10f2a01ffcd037483e3591f
2012-08-30 13:04:34 +04:00
noob
fba081992d
Merge branch 'master' of git://code.opencv.org/opencv
2012-08-29 18:14:07 +02:00
noob
424bc609b6
Retina module is now parallelized thanks to the TBB library. Speed increase expected on multicore plateforms
2012-08-29 17:44:21 +02:00
Vadim Pisarevsky
633a8bfacc
fixed many warnings (modified pull request 13)
2012-08-28 18:15:14 +04:00
Andrey Kamaev
bbbe77e05e
Fix Android build for mips platform
2012-08-27 20:16:54 +04:00
Andrey Kamaev
ce11c0d1eb
Fix formatting in detection based tracker
2012-08-24 16:22:18 +04:00
Andrey Kamaev
9981b283a6
Fixed build warnings (including error in FAST)
2012-08-06 19:10:55 +04:00
Philipp Wagner
2c2d6fa5fd
Issue #2231 : Attempt to fix segfault, when copying labels. LDA needed to be updated to generate the Wrapper correctly.
2012-08-06 01:14:51 +02:00
Philipp Wagner
989631c5cc
facerec.cpp: Removed Original LBP wrapper, because it is not in use and therefore generates a warning.
2012-07-31 21:54:48 +02:00
Philipp Wagner
4a4f90c406
facerec.cpp: Added an exception to the LBP extraction, so now a meaningful exception is thrown if the wrong image type was given. Thanks to Eric Christiansen for reporting.
2012-07-31 21:50:46 +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
Philipp Wagner
b2deab2175
Updated the documentation to (1) reflect the latest changes and (2) answer some questions I were asked.
2012-07-29 23:16:51 +02:00
Philipp Wagner
5983f8008f
Fixed facerec_eigenfaces.cpp demo sample: it contained hardcoded values, which made wrong element access possible. Fixed unsigned integer/signed integer warnings in facerec.cpp.
2012-07-29 22:41:40 +02:00
Philipp Wagner
79b45b1392
Bug #2214 : Fixed bug, when calling the train method multiple times. The Eigenfaces and Fisherfaces method now re-estimate the model, the LBPH method appends the new data to the existing model.
2012-07-29 22:20:07 +02:00
Eric Christiansen
f08996bd37
asserted in LBPH code that images must have a single channel
2012-07-26 16:55:54 -07: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
Philipp Wagner
3ac6272c3b
Grammar and Formatting fixes. Added link to the Yale Facedatabase A. Added download directive links for linking to the sample source code samples.
2012-07-06 20:42:02 +00:00
Andrey Kamaev
e900952b87
quiet most of the OSX build warnings
2012-07-05 12:56:31 +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
Andrey Kamaev
51f6127e0a
Merged the recent fixes from 2.4 branch
2012-07-04 08:04:31 +00:00
Philipp Wagner
927523bc3d
Bug 2129: Fix for missing citations in FaceRecognizer documentation.
2012-07-02 18:43:20 +00:00
Andrey Kamaev
5d6c90e166
Fixed bugs in facerec documentation
2012-07-02 11:46:17 +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
Philipp Wagner
ea0b57cc23
API Link corrected.
2012-06-27 18:37:03 +00:00
Philipp Wagner
d636c677f4
API Link corrected.
2012-06-27 18:35:52 +00:00
Philipp Wagner
f2e78eed8c
Fixed wrong restructured text directive, when referencing to other documents.
2012-06-26 21:24:19 +00:00
Philipp Wagner
a15d97b716
Added the cv::FaceRecognizer documentation (API, Face Recognition Guide, Tutorials).
2012-06-26 20:13:11 +00:00
Andrey Kamaev
ecf6b5a87c
Making all dependencies from highgui module optional
2012-06-26 07:29:36 +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
7b806f6008
fixed several documentation errors
2012-06-25 12:56:46 +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
d48d7b2b46
Updated warning options for GCC; fixed new warnings.
2012-06-20 12:27:02 +00:00
Andrey Kamaev
e8d158a5c8
Reverted changes breaking Android build
2012-06-19 08:10:05 +00:00
Maria Dimashova
9152d3fee2
minor fixing
2012-06-18 14:25:00 +00:00
Alexander Smorkalov
1736cc9739
Code style fix. dbt face detection example turned off for Windows.
2012-06-18 10:59:28 +00:00
Alexander Smorkalov
7c160cdc30
Detection based tracker was refactored. Detector interface added.
2012-06-18 08:55:05 +00:00
Andrey Kamaev
33d9e2354a
Fixed Android build with Eigen.
2012-06-16 14:52:46 +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
2c9e81a3ec
The COLORMAP_PINK colormap was missing in applyColorMap.
2012-06-16 08:30:22 +00:00
Maria Dimashova
5df3c44d30
added check to weight in rgbd
2012-06-15 09:17:10 +00:00
Maria Dimashova
1774e73324
added weighting to rgbd odometry
2012-06-14 14:34:15 +00:00
Philipp Wagner
7b544d2a6d
Documentation for FaceRecognizer started (not added to toc of contrib/doc/contrib.rst yet). CSV file for the samples/cpp/facerec_demo.cpp added. Added some more exceptions to warn the user, when passing bad aligned data.
2012-06-12 22:49:14 +00:00
Andrey Kamaev
c5aba337e9
Fixed number of warnings. Fixed mingw64 build.
2012-06-12 14:46:12 +00:00
Philipp Wagner
b3c61ee0fe
Minor grammatical correction in comments.
2012-06-10 22:42:20 +00:00
Philipp Wagner
cd7d93f362
Exceptions now go into CV_Error. Added thresholding to the FaceRecognizer and updated the demo accordingly.
2012-06-10 22:23:18 +00:00
Philipp Wagner
ee1b671279
Several exceptions added to the available FaceRecognizer classes and helper methods, so wrong input data is reported to the user. facerec_demo.cpp updated to latest cv::Algorithm changes and commented.
2012-06-10 11:57:33 +00:00
Marina Kolpakova
6727e4cb6d
fixed build under android
2012-06-10 09:44:47 +00:00
Andrey Kamaev
f2d3b9b4a1
Warning fixes continued
2012-06-09 15:00:04 +00:00
Andrey Kamaev
47a4e87784
Ignored warnings from gtest with precompiled headers enabled
2012-06-08 14:54:17 +00:00
Andrey Kamaev
f62028dc16
Fixed mingw build.
2012-06-08 03:15:08 +00:00
Andrey Kamaev
49a1ba6038
Set stricter warning rules for gcc
2012-06-07 17:21:29 +00:00
Andrey Kamaev
586d5a6024
Merged lda fix from 2.4 branch (Fixed reconstruction, so that the mean is correctly added to the reconstructed image.)
2012-06-01 08:48:38 +00:00
Andrey Kamaev
78329b0dfe
New bunch of documentation fixes
2012-05-28 14:36:15 +00:00
Leonid Beynenson
32878f8577
Added a check of the DetectionBasedTracker's inner state in the main thread function of this class.
...
This change should fix a multithread bug in the class.
2012-05-22 13:24:37 +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
Leonid Beynenson
daec4d88fa
Now the DetectionBasedTracker will throw exception if it cannot load cascade detector from a file.
2012-05-21 13:54:42 +00:00
Vadim Pisarevsky
d5a0088bbe
merged 2.4 into trunk
2012-04-30 14:33:52 +00:00
Alexandre Benoit
9dfb1f77a0
fixed a dicide by zero potential problem
2012-04-25 13:56:09 +00:00
Vadim Pisarevsky
2fd1e2ea57
merged all the latest changes from 2.4 to trunk
2012-04-13 21:50:59 +00:00
Andrey Kamaev
72f2523d0f
Fixed ~20 potential errors identified by the MS complier.
2012-03-31 11:09:16 +00:00
Vadim Pisarevsky
beb7fc3c92
a LOT of obsolete stuff has been moved to the legacy module.
2012-03-30 12:19:25 +00:00
Andrey Kamaev
4a996111ea
Fixed Android build warnings
2012-03-27 06:16:13 +00:00
Andrey Kamaev
54a4ff033a
Fixed #1711
2012-03-26 13:17:18 +00:00
Vadim Pisarevsky
e778007d5d
applied patch from #1655 (thanks to Changbo Zhou!)
2012-03-26 08:18:10 +00:00
Vadim Pisarevsky
5777689fe9
fixed build errors & warnings on VS2010
2012-03-25 22:05:58 +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
Andrey Kamaev
bddff7b386
Fixed Android build warnings in logpolar_bsm
2012-03-19 12:55:44 +00:00
Vadim Pisarevsky
c94c3fb4eb
added Manuela Chessa as the co-author of logpolar_bsm.
2012-03-19 12:04:50 +00:00
Vadim Pisarevsky
c8e206c2ab
added LogPolar Blind Spot Model (thanks to Fabio Solari for the contribution)
2012-03-18 22:29:13 +00:00
Marina Kolpakova
aa19fd500c
Fixed bug #1654
2012-03-18 17:17:44 +00:00
Vadim Pisarevsky
846e37ded5
fixed many warnings from GCC 4.6.1
2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632
fixed hundreds of warnings from MSVC 2010.
2012-03-16 21:21:04 +00:00
Vadim Pisarevsky
957e80abbd
lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.
2012-03-15 14:36:01 +00:00
Maria Dimashova
8ec1c2b03a
minor change
2012-03-14 11:01:45 +00:00
Maria Dimashova
f67d9d9038
added ability to pass initial transformation to rgbd odometry
2012-03-13 13:07:30 +00:00
Maria Dimashova
fbfc0cc96f
added special cases to RGBDOdometry (translation only, rotation only)
2012-03-12 10:40:39 +00:00
Alexander Shishkov
f4e5209d5a
fixed compilation on Windows (NAN)
2012-03-12 07:27:04 +00:00
Maria Dimashova
90f6e319da
fixed compilation with eigen2
2012-03-11 11:45:29 +00:00
Andrey Kamaev
57c7604568
Fixed Android build warning
2012-03-11 10:53:42 +00:00
Maria Dimashova
abe2c2fb3f
fixed compilation with eigen2
2012-03-11 09:56:23 +00:00
Maria Dimashova
532781e8d2
initial version of rgbd odometry with sample
2012-03-11 09:31:28 +00:00
Vadim Pisarevsky
716a5d04ab
fixed a few problems detected by Xcode 4.2.1
2012-02-15 19:48:04 +00:00
Anatoly Baksheev
84db4eb6fa
fixed ~200 warnings for windows
...
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Alexandre Benoit
c07d9d75e8
added get methods for retina outputs
2012-02-10 13:25:33 +00:00
Alexander Shishkov
863fe3ecf8
fixed bug after const removing in retina
2012-02-06 10:34:00 +00:00
Alexander Shishkov
26ed10993e
fixed #1565 issue
2012-02-06 09:31:33 +00:00
Andrey Kamaev
984eb99428
Global CMake reorganization:
...
[~] Automatically tracked dependencies between modules
[+] Support for optional module dependencies
[+] Options to choose modules to build
[~] Removed hardcoded modules lists from OpenCVConfig.cmake, opencv.pc and OpenCV.mk
[+] Added COMPONENTS support for FIND_PACKAGE(OpenCV)
[~] haartraining and traincascade are moved outside of modules folder since they aren't the modules
2012-02-03 11:26:49 +00:00
Alexandre Benoit
3892ce1f73
added access methods to retreive retina input and output buffers sizes
2012-01-30 09:40:02 +00:00
Alexandre Benoit
555ed03613
corrected retina internal buffers copy methods
2012-01-13 09:52:24 +00:00
Alexandre Benoit
42e656542c
added cv::Filestorage based setup method for retina model
2011-11-23 15:05:19 +00:00
Leonid Beynenson
9d8d6ba490
Changed the class DetectionBasedTracker -- changed the system of states in the subclass DetectionBasedTracker::SeparateDetectionWork, made them more logical.
2011-11-17 16:16:09 +00:00
Leonid Beynenson
e9b9dfe1c2
Made changes in DetectionBasedTracker -- refactored the class.
2011-11-17 15:17:02 +00:00
Leonid Beynenson
01c15db6d2
Committed the first version of DetectionBasedTracker.
2011-11-16 17:29:10 +00:00
Vadim Pisarevsky
2e9f5c434b
added improved ORB implementation, convex-convex polygon intersection, eigen2x2 low-level function ...
2011-11-08 12:01:49 +00:00
Alexandre Benoit
9883b2d401
corrected stupid error for retina color mode selection in Retina::run method
2011-11-03 10:58:11 +00:00
Alexandre Benoit
bb329719c6
short change on default retina values setup for warning avoidance
2011-10-30 07:41:50 +00:00
Alexandre Benoit
57159998f0
clarified parameters inputs and outputs at the interface level for better clarity and ease of use, also corrected a mistake at activateContoursProcessing interface method
2011-10-30 07:33:00 +00:00
Alexandre Benoit
4685f0e9d6
corrected xml parameters file management in the retina interface
2011-10-21 10:02:09 +00:00
Alexandre Benoit
75506940eb
continuing code correction for windows warning elimination
2011-10-20 13:03:45 +00:00
Maria Dimashova
408d6b84fa
added func to different colors generation
2011-10-06 09:34:35 +00:00
Andrey Morozov
6138956b5e
minor fix
2011-10-04 22:00:57 +00:00
Andrey Morozov
99c2326e51
minor fix
2011-10-04 21:43:37 +00:00
Andrey Morozov
8a06b20ad6
fixed compile for linux
2011-10-04 21:31:52 +00:00
Andrey Morozov
f366553a80
improved some methods in the Directory class
2011-10-04 16:46:55 +00:00
Andrey Morozov
d58ff0f478
fixed include on Linux
2011-10-04 12:42:49 +00:00
Andrey Morozov
af730e4bff
added class Directory
2011-10-04 12:12:14 +00:00
Vadim Pisarevsky
60ebe2003f
fixed multiple warnings on Windows. fixed bug #1368
2011-10-03 11:00:28 +00:00
Anatoly Baksheev
415978b1c9
warnings
2011-09-05 14:37:27 +00:00
Alexandre Benoit
69b8f304d7
memory safety test added
2011-09-04 16:46:56 +00:00
Alexandre Benoit
c02b5f1d45
Updated retina access methods and OpenEXR image tone mapping demo cleaned
2011-09-04 08:00:28 +00:00
Andrey Pavlenko
8bf5c0e7ae
typo is fixed
2011-08-29 07:41:56 +00:00
Vadim Pisarevsky
714732e9bb
fixed some more hybrid tracker build problems on Windows
2011-08-27 10:43:53 +00:00
Vadim Pisarevsky
07746b54d6
fixed hybrid tracker build problems on Windows
2011-08-26 13:52:46 +00:00
Vadim Pisarevsky
ae83fe7645
added hybrid (feature-based & meanshift-based) tracker (by Pushkar)
2011-08-26 12:22:19 +00:00
Alexandre Benoit
a288163d73
enhanced and more robust image input management
2011-08-22 20:09:01 +00:00
Alexandre Benoit
4408423c9f
waiting for optimisation at Retina::_convertCvMat2ValarrayBuffer
2011-08-21 13:12:14 +00:00
Alexandre Benoit
05c0cd72d0
updated retina modules : minor misakes correction & changed pixel format to float instead of double to keep some memory, precision is almost sufficient, check for residual mistakes
2011-08-21 11:02:42 +00:00
Alexandre Benoit
66ee335ca9
updated retina modules : minor misakes correction & changed pixel format to float instead of double to keep some memory, precision is almost sufficient, check for residual mistakes
2011-08-21 11:01:53 +00:00
Alexandre Benoit
752eed00f2
updated GUI photoreceptors sensitivity parameter management
2011-08-20 12:41:34 +00:00
Alexandre Benoit
b4d42ae6f1
optimised input image management
2011-08-13 14:14:28 +00:00
Alexandre Benoit
1a749c5141
optimised input image management
2011-08-13 14:13:41 +00:00
Vadim Pisarevsky
50d70cf9c6
made retina code compile with VS2005/VS2008
2011-08-12 11:28:17 +00:00
Vadim Pisarevsky
2fe3ed75c1
fixed building retina code on Windows
2011-08-11 22:02:52 +00:00
Vadim Pisarevsky
2842d34611
added retina model, by Alexander Benoit
2011-08-11 20:42:08 +00:00
Vadim Pisarevsky
ff5e97c8e4
added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings
2011-07-19 12:27:07 +00:00
Andrey Kamaev
b16fb5d518
Fixed Android build.
2011-07-14 16:48:15 +00:00
Vadim Pisarevsky
7702fa4d61
added improved version of the variational stereo correspondence algorithm by Sergey Kosov
2011-07-14 15:30:28 +00:00