408107ce6d
Added missing copyright headers.
2015-10-13 15:02:38 +03:00
3934d61de7
fixed uninitialized memory writing/reading in flann
2015-09-03 13:25:29 +03:00
c2f59a0f73
flann: fix AutotunedIndex crashing if a KDTree index is selected
...
Backport of mariusmuja/flann@f8ca6df3 .
2015-07-29 18:03:48 +03:00
7d665a4754
Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
2015-03-14 09:35:53 +09:00
8efdfd9dfc
Fix unused-parameter Warning
2015-03-14 06:07:55 +09:00
cd42e38013
FlannBasedMatcher(LshIndex) in the feature2d optimization for continuance additional train()
...
Current implementation of miniflann is releasing the trained index, and
rebuilding the index from the beginning.
But, some indexing algorithms like the LSH are able to add the indexing
data after that.
This branch is implementation of that optimization for LshIndex
FlannBasedMatcher in the feature2d.
2015-03-14 04:38:07 +09:00
ff4c42d182
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
2015-02-13 00:51:03 +00:00
c481e06e87
Fixed getPolicy() method to make it thread-safe.
...
(cherry picked from commit 8910508b83
2015-01-27 19:20:35 +03:00
a5969aec96
Merge pull request #3534 from taka-no-me:build_fixes
2014-12-26 14:34:13 +00:00
c105b72945
Assorted fixes:
...
* cmake CMP0054 and CMP0045
* aarch64 build
* portable code options in PCH cmake
* some of gcc 4.9 warnings
2014-12-25 12:41:16 +03:00
91e21847e2
Some changes to make migration to 3.0 easier
2014-12-16 13:00:31 +03:00
9b55c09999
Basic doxygen documentation support
...
- updated existing Doxyfile.in
- added corresponding cmake instructions
- added some specific files (layout, icon)
- clean existing doxygen warnings
Conflicts:
CMakeLists.txt
doc/CMakeLists.txt
modules/core/include/opencv2/core.hpp
modules/core/include/opencv2/core/base.hpp
modules/core/include/opencv2/core/cuda.inl.hpp
modules/core/include/opencv2/core/mat.hpp
modules/core/include/opencv2/core/matx.hpp
modules/core/include/opencv2/core/types.hpp
modules/flann/include/opencv2/flann/lsh_table.h
modules/imgproc/include/opencv2/imgproc.hpp
2014-10-23 18:27:26 +04:00
8539d424b2
Merge pull request #2071 from pemmanuelviel:LshOrthogonalSubvectors
2014-07-02 14:24:09 +00:00
ec99f96c62
Add the ensureSimpleDistance() method to ensure the user the returned distance is not ^2 (the default for L2 for instance)
2014-05-21 13:16:12 +02:00
2f8b5731da
Fix local variable shadowing
2014-05-21 12:27:38 +02:00
00367cfb00
Merge remote-tracking branch 'upstream/2.4' into LshOrthogonalSubvectors
2014-05-21 01:31:52 +02:00
e63d7de87c
Allows to choose orthogonal sub-vectors for LSH without using a static table among LshTable instances
2014-05-20 22:52:11 +02:00
6c118ebc51
Changed ostringstream to ostream for new print_params and added the old
...
version of print_params for backwards compatibility.
2014-05-12 23:01:44 +03:00
dfdb09386f
Autotuned_index now prints all info into logger instead of couting it.
2014-05-01 20:55:49 +03:00
6a5a0fe803
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist
2014-04-15 13:31:48 +04:00
bfb1ba371c
Merge pull request #2026 from pemmanuelviel:giveFurthestPoint
2014-03-18 13:40:44 +04:00
3f458c6eb1
Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified
2014-01-03 13:16:36 +01:00
8e93c19de3
Fix a heap issue with static on Windows
2013-12-26 23:46:52 +01:00
e85bacff7b
Avoid obtaining several identical dimensions between two LSH sub-vectors by choosing orthogonal sub-vectors.
2013-12-26 19:44:23 +01:00
d3ac1bc314
When a cluster is empty for KMeans, it's better to give it the point from another cluster j that is the furthest one from center j.
2013-12-20 01:00:55 +01:00
92fc763925
Fix some memory leaks in HierarchicalClusteringIndex
2013-12-18 22:46:41 +01:00
0d19685f95
Move templates in dist.h in order to share them between KMeansIndex and HierarchicalClusteringIndex classes.
2013-12-18 20:48:34 +01:00
fa749de0dc
As some processed distances are already ^2, use template to select whether or not we have to ^2 in KMeanspp
2013-12-18 20:48:25 +01:00
5aeeaa6fce
Apply to KMeansIndex KMeanspp the same modification as in HierarchicalClusteringIndex
2013-12-18 20:48:15 +01:00
45e0e5f8e9
Pick centers in KMeans++ with a probability proportional to their distance^2, instead of simple distance, to previous centers
2013-12-18 20:48:02 +01:00
fec697b390
Silenced a few -Wcast-align warnings in the headers.
...
We don't use -Wcast-align ourselves, but the headers trigger warnings
for those users who do, which is not nice.
2013-09-12 12:33:56 +04:00
a9975b144a
Fixed a bug in FLANN resulting in uninitialized accesses.
...
This is fixed upstream in mariusmuja/flann@b615f26 , but that fix
would break binary compatibility, so I had to make a different one.
Since the bug isn't quite obvious, here's an explanation. In the const
version of any::cast, if policy is a small_any_policy, its get_value
returns its input argument. So r becomes a pointer to obj, and the
return value is a reference to a local variable, which is invalidated
when the function exits.
2013-09-04 14:06:34 +04:00
e9a28f66ee
Normalized file endings.
2013-08-21 18:59:25 +04:00
2243118fc0
NEON instruction set enabled for WIN32 on ARM by default.
2013-08-04 08:47:42 -07:00
2665c39a0d
Fix build warnings from gcc 4.8
2013-05-13 17:07:30 +04:00
6f68640d4d
Multiple fixes for WinRT
...
Fixed flann build with NEON;
Fixed Haming distance with NEON;
Honest cvRound for WinRT added;
cvRound test added;
Video IO with direct show disabled;
2013-03-26 17:19:52 -07:00
098ea6fcb7
Checked key_size in LSH table for validness ( #2677 )
2013-01-31 23:19:19 +04:00
04384a71e4
Normalize line endings and whitespace
2012-10-17 15:32:23 +04:00
88e9a072ec
Fix binary compatibility of opencv_flann
2012-10-16 15:13:00 +04:00
a3b1971977
Bring back escaped virtual destructors from 2.4.2
2012-10-15 17:48:49 +04:00
d72cc06b96
fixed possibly inccorrect interval measurements in flann's timer (bug #1165 ). Note: this may break binary compatibility, but since the class is not wrapped in Java and not exposed in Windows API, for example (it's considered internal-use class for flann), the effect should be minimal
2012-10-11 22:40:37 +04:00
56b27bcc7e
Fix inconsistent argument type in HammingLUT distance (flann)
...
this fixes 64-bit MSVC warning
2012-10-10 00:31:22 +04:00
d54f4e1cfb
added #undef True/False to avoid collision with X11 (Patch #1562 )
2012-10-09 16:02:06 +04:00
7236858bea
Exposed HierarchicalClusteringIndex in OpenCV wrapper
2012-09-27 03:58:17 -07:00
0bd68a70f1
fixed #2297 , #2300 ; fixed several warnings
2012-08-28 13:45:35 +04:00
647b1dd96c
comment fixed
2012-08-07 23:19:13 +03:00
0998669d26
Revert "fixed LshIndex types in its constructor"
...
This reverts commit 54d68da8e7
2012-08-07 21:37:19 +03:00
54d68da8e7
fixed LshIndex types in its constructor
2012-07-24 17:09:24 +04:00
3df72fe669
fix gcc C++11 bug mentioned in http://answers.opencv.org/question/283 . Bug also fixed in FLANN upstream
2012-07-12 16:02:02 +00:00
73ce3ef8c1
fixed ios framework build (ticket #2092 )
2012-06-27 19:52:59 +00:00
Alexander Smorkalov