Alexander Alekhin
bea2c75452
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-09-05 14:29:22 +03:00
Maksim Shabunin
f3aab47f94
Assorted documentation fixes
...
* removed private flann documentation
* common tutorial images moved to doc/images
* grouping issues
2019-08-31 01:50:11 +03:00
luz.paz
fcc7d8dd4e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
backporting of commit: ec43292e1e
2019-08-16 17:34:29 +03:00
luz.paz
ec43292e1e
Fix modules/ typos
...
Found using `codespell -q 3 -S ./3rdparty -L activ,amin,ang,atleast,childs,dof,endwhile,halfs,hist,iff,nd,od,uint`
2019-08-15 18:02:09 -04:00
TheGoddessInari
960bb540ec
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
backport of commit: 4e998c9ade
2019-08-05 17:19:12 +03:00
TheGoddessInari
4e998c9ade
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
...
This fixes a compiler error on MSVC with Unreal Engine (at least).
2019-07-28 10:21:15 -07:00
Alexander Alekhin
b95e93c20a
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-06-26 20:19:04 +00:00
Apoorv Goel
5b521bb778
Merge pull request #14898 from UnderscoreAsterisk:flann-warnings-and-4376
...
Keep a local copy of `features` from `flann::GenericIndex ` constructor (#14898 )
* Fix warnings on Windows
* Fix #4376
2019-06-26 19:35:11 +03:00
Alexander Alekhin
8c25a8eb7b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-03-22 19:31:31 +03:00
Matthew K. Gumbel
74e3403620
flann/kmeans: Fix non-determinism of KMeans index
...
When running with >1 OpenCV thread, KMeans index generation was
non-deterministic because of a RWW race. Issue is resolved by removing
the offending logic from the parallel section.
2019-03-20 08:44:31 -07:00
Alexander Alekhin
8bde6aea4b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2019-02-19 19:49:13 +00:00
Lindsay Roberts
7c72e095fa
Fix Flann compilation under nvcc + NEON
...
All <arm_neon.h> includes in core/cv_cpu_dispatch.h are protected by an
ifndef __CUDACC__ to prevent attempting to use neon intrinsics when
compiling cuda kernels (.cu) -- this prevents hard errors such as
error: identifier "__builtin_neon_qi" is undefined
Add this same protection to flann/dist.h to fix compilation involving
flann.hpp.
2019-02-19 15:11:01 +02:00
Alexander Alekhin
8f4e5c2fb8
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-11-26 15:37:45 +03:00
1over
5ff76088b9
fixed memory issue in flann
2018-11-25 01:31:54 +01:00
Alexander Alekhin
043e7e3516
flann: drop untested hdf5.h
2018-10-21 15:16:52 +00:00
Alexander Alekhin
9c23f2f1a6
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-10-20 11:37:54 +00:00
Apoorv Goel
d8ffddd075
Merge pull request #12871 from UnderscoreAsterisk:document-Distance
...
* Document distance functors in dist.h
* Add spec for Distance
* Generate appropriate links for symbols
2018-10-20 11:15:13 +03:00
Apoorv
a7dfa261d8
Add documentation for radiusSearch
2018-10-18 04:09:16 +05:30
Alexander Alekhin
a8b0db4e5d
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-09-28 14:14:47 +03:00
Alexander Alekhin
52f52f6786
flann: drop useless mutex
2018-09-26 19:37:44 +03:00
Alexander Alekhin
5fb0f34e8a
Merge pull request #12570 from alalek:drop_usrtype1
...
* core: drop usage of CV_USRTYPE1 in OpenCV
avoid OpenCV crashes due size change CV_ELEM_SIZE(CV_USRTYPE1): 8 -> 2
* ! fix persistence internal types
2018-09-19 13:55:26 +03:00
Hamdi Sahloul
a39e0daacf
Utilize CV_UNUSED macro
2018-09-07 20:33:52 +09:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
4df4a37b11
flann: apply CV_OVERRIDE/CV_FINAL
2018-03-28 18:43:27 +03:00
luz.paz
e805a55a5b
Misc. modules/ typos (cont.)
...
Found via `codespell`
2018-02-12 10:15:36 -05:00
Pavel Rojtberg
6fb9d42c3f
Hid symbols in static builds, added LTO flags, removed exports from ts
2017-12-07 10:26:48 +03:00
Maksim Shabunin
248e2c7d47
Fixed some issues found by static analysis
2017-09-08 12:22:12 +03:00
Alexander Alekhin
7067c1597d
flann: std::vector<size_t> can't be converted into cv::Mat properly
...
size_t is not supported cv::Mat type
2017-08-30 13:16:00 +03:00
Alexander Alekhin
12213f9985
flann: fix out of buffer access
2017-07-26 18:17:03 +03:00
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
Tony Lian
c8783f3e23
Merge pull request #9075 from TonyLianLong:master
...
Remove unnecessary Non-ASCII characters from source code (#9075 )
* Remove unnecessary Non-ASCII characters from source code
Remove unnecessary Non-ASCII characters and replace them with ASCII
characters
* Remove dashes in the @param statement
Remove dashes and place single space in the @param statement to keep
coding style
* misc: more fixes for non-ASCII symbols
* misc: fix non-ASCII symbol in CMake file
2017-07-03 16:14:17 +00:00
Maksim Shabunin
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
Alexander Alekhin
82ec76c123
Merge pull request #8990 from mshabunin:fix-static-2
2017-06-27 14:53:26 +00:00
Alexander Alekhin
22d2207d41
flann: fix build with MSVC /sdl option
2017-06-27 15:25:19 +03:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
cc52523375
flann: add normal assignment operator for cvflann::any
2017-06-14 00:55:52 +00:00
Matthias Grundmann
e0fe3cce71
Update autotuned_index.h
...
Add missing sstream header for decl of std::ostringstream in line 104
2017-04-10 12:07:28 -07:00
Alexander Alekhin
147f3ebf0a
flann: use OpenCV theRNG()
...
std::rand() has no thread-safe guarantee.
2017-03-02 13:45:12 +03:00
mshabunin
c6c519166e
Added CV_DEPRECATED macro
2017-01-24 15:57:06 +03:00
Alexander Alekhin
1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
sourin
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
daB0bby
7840b07d2f
bypass macro
2016-09-23 13:00:30 +02:00
Maksim Shabunin
dc704d77ac
Fixed several GCC 5.x warnings
2016-09-01 15:44:01 +03:00
Maksim Shabunin
b99d010977
Fixed memory leak in flann KMeansIndex
2016-04-13 12:08:42 +03:00
Krishnaraj Bhat
9b8013d193
gcc6: fix misleading indentation warning
...
cosmetic changes to fix this warning.
real bugs not found
2016-03-07 17:06:16 +05:30
Ilya Lavrenov
3143f2fb50
fixed uninitialized memory writing/reading in flann
2015-09-13 12:43:44 +02:00
Roman Donchenko
a3b515c524
flann: fix AutotunedIndex crashing if a KDTree index is selected
...
Backport of mariusmuja/flann@f8ca6df3 .
2015-09-11 18:37:51 +02:00
Thomas Gabrowski
63dbeeaac5
Fix iOS warnings about implicit conversion precision by changing double literals to float ones
...
Conflicts:
modules/contrib/include/opencv2/contrib/retina.hpp
2015-04-26 12:22:41 +02:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
472c210687
Doxygen documentation: flann, photo and stitching modules
2014-12-01 15:47:13 +03:00