Andrey Kamaev
727a339455
Merge pull request #730 from vpisarev:ba_fix
2013-04-02 15:24:12 +04:00
Andrey Kamaev
517062039e
Make core/internal.hpp a private header
2013-04-01 17:29:10 +04:00
Andrey Kamaev
715fa3303e
Move cv::Mat out of core.hpp
2013-04-01 15:24:34 +04:00
Vadim Pisarevsky
10702c6d75
fixes in bundle adjustment code by Nils Hasler
2013-04-01 15:20:35 +04:00
Andrey Kamaev
db45e04d58
Merge pull request #720 from taka-no-me:drop_sort
2013-04-01 15:14:45 +04:00
Vladislav Vinogradov
d27d091e59
fixed mind/maxd search in CvFuzzyMeanShiftTracker::SearchWindow::initDepthValues
2013-04-01 11:53:05 +04:00
Andrey Kamaev
cc6bdfb045
Remove inline sorting algorithms from core headers
2013-03-28 17:22:50 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
33ef7990b0
Update documentation
2013-03-22 22:14:54 +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
82d7292ee7
Merge pull request #680 from vpisarev:c2cpp_video_take2
2013-03-22 19:34:53 +04:00
Vadim Pisarevsky
07e0f7bf59
refactored video module; use the new-style algorithms now
2013-03-20 19:51:49 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +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
2a06fd98c0
Fix build errors with c++11
2013-03-11 16:03:48 +04:00
Andrey Kamaev
ec8637a990
Fix build errors
2013-03-11 14:52:22 +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
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andy Maloney
ac8744af6a
No need to check vector size before clear()
2013-02-02 19:00:41 -05:00
Andy Maloney
bc68dfb4e8
Remove unused vars
2013-02-01 18:09:58 -05: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
13b6a3a15e
Merge branch 2.4
2012-12-24 17:10:07 +04:00
Andrey Kamaev
9944282b09
Fix build with STLPort from NDK r8d
2012-12-22 00:59:56 +04:00
Andrey Kamaev
e10ee89ec4
Merge branch 2.4
2012-11-30 19:54:24 +04:00
Vadim Pisarevsky
db965353f4
fixed a few compile errors/warnings in 2.4 branch of the docs
2012-11-26 18:48:23 +04:00
marina.kolpakova
285d6320be
add #/usr/bin/env python to all python files
2012-11-23 22:57:22 +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
Andrey Kamaev
934b623fa9
Merging pull request #169 from taka-no-me:android-ndk-r8c
2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4
Fix Android build with clang compiler
2012-11-20 15:20:04 +04:00
Alexander Mordvintsev
9cfa51a483
added CV_OUT to StereoVar output paramiter
2012-11-13 23:17:54 +04:00
Andrey Kamaev
9719ea93b6
Merge branch 2.4
2012-11-13 19:54:48 +04:00
Andrey Kamaev
5bc66ec8e4
Merge pull request #149 from taka-no-me/osx_warnings
2012-11-13 18:21:40 +04:00
Andrey Kamaev
a126532cb7
Fix OS X build warnings
2012-11-09 11:29:52 +04:00
Vadim Pisarevsky
2e54e2a586
fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility.
2012-11-08 16:15:04 +04:00
Andrey Kamaev
4d059e9e5b
Merge release 2.4.3
2012-11-02 17:58:02 +04:00
marina.kolpakova
7a5b9a6b7f
replase __APPLE__ marco with __clang__
2012-11-01 19:34:05 +04:00
Andrey Kamaev
74fe158f4b
Merge pull request #117 from vpisarev/doc_updates
2012-10-31 16:56:04 +04:00
Andrey Kamaev
f15e49041e
Merge pull request #112 from taka-no-me/warnings
2012-10-31 16:51:35 +04:00
Vadim Pisarevsky
849a8c8d20
fixed many errors in warnings in rst docs; added ocl module description (by Niko Li)
2012-10-31 15:15:51 +04:00
Andrey Kamaev
468eefe0ce
Merge branch '2.4'
2012-10-30 15:10:17 +04:00
alexandre benoit
08ff5f92f4
minor updates for doc redirections and tutorial images size
2012-10-30 15:06:13 +04:00
alexandre benoit
a0c92265db
minor updates for doc redirections and tutorial images size
2012-10-28 18:52:04 +01:00
Andrey Kamaev
2b0072d823
Suppress more warnings in gtest on OS X
2012-10-24 20:36:30 +04:00
Andrey Kamaev
8dbde3297e
Merge branch '2.4'
2012-10-23 20:32:19 +04:00
Andrey Kamaev
2e91405833
Fix OS X build warnings
2012-10-22 20:33:14 +04:00
Andrey Kamaev
73bbabf207
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-18 13:03:12 +04:00
Andrey Kamaev
0e7ca71dcc
Normalize whitespace in documentation and text files
2012-10-17 21:42:09 +04:00
Andrey Kamaev
461b69f6ee
Eliminate discrepancies between signatures in documentation and OpenCV headers
...
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +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
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
