Ilya Lavrenov
02e29fc99c
suppress -Wclobbered warning
2015-04-22 16:42:03 +03:00
Vadim Pisarevsky
7dd19f6d97
Merge pull request #3939 from paroj:fmtfix
2015-04-22 12:15:17 +00:00
Vadim Pisarevsky
415a212d09
Merge pull request #3936 from dhood:fitEllipse-bug
2015-04-22 11:22:35 +00:00
Vadim Pisarevsky
bac4999ae4
Merge pull request #3948 from PhilLab:markdownPatch
2015-04-22 11:02:50 +00:00
Philipp Hasper
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
Vadim Pisarevsky
a69b435c92
Merge pull request #3909 from Nuzhny007:master
2015-04-21 14:02:59 +00:00
Vadim Pisarevsky
063e4004ba
Merge pull request #3935 from vpisarev:extending_hal_part1
2015-04-21 14:02:02 +00:00
Vadim Pisarevsky
dce0405c4d
Merge pull request #3947 from tcavallari:patch-1
2015-04-21 14:01:22 +00:00
Vadim Pisarevsky
8e493ef370
Merge pull request #3925 from ttagu99:findcontour_example2
2015-04-21 12:21:36 +00:00
Vadim Pisarevsky
887fe932cc
Merge pull request #3926 from stoneyang:stone
2015-04-21 12:20:42 +00:00
Vadim Pisarevsky
0f13208d81
Merge pull request #3929 from daeyun:findEssentialMat_doc
2015-04-21 12:20:02 +00:00
Vadim Pisarevsky
737d866197
Merge pull request #3930 from berak:python_docs_stereobm
2015-04-21 12:19:37 +00:00
Vadim Pisarevsky
4c875dc393
Merge pull request #3932 from nisargthakkar:Bug4243
2015-04-21 12:18:37 +00:00
Vadim Pisarevsky
60a51b82d7
Merge pull request #3921 from sergarrido:master
2015-04-21 12:11:57 +00:00
Vadim Pisarevsky
99d0fcf49d
Merge pull request #3938 from paroj:triangulatecpp
2015-04-21 12:02:26 +00:00
Vadim Pisarevsky
faf84e7100
Merge pull request #3937 from mshabunin:android-engine3
2015-04-21 11:47:26 +00:00
Vadim Pisarevsky
d01ee09fd6
Merge pull request #3945 from nisargthakkar:DocBugFix4282
2015-04-21 11:46:30 +00:00
Vadim Pisarevsky
926754a66e
another attempt to resolve ABI checker complains
2015-04-21 12:42:46 +03:00
Pavel Rojtberg
78eac67a01
clean up cvTriangulatePoints by using C++ primitives directly.
...
- fixes the Calib3d_StereoCalibrate_C testcase.
update comment regarding cv::SVD::MODIFY_A
2015-04-21 11:29:26 +02:00
Vadim Pisarevsky
fa41653420
trying to avoid ABI checker failures
2015-04-21 11:30:41 +03:00
tcavallari
cca78e0601
Null Pointer check in vizimpl.cpp
...
Should fix #4191 (http://code.opencv.org/issues/4191 )
2015-04-21 10:08:17 +02:00
lujia
7ce116695d
bugfix_for_hog_detectMultiScale_with_weights
2015-04-21 02:32:27 -04:00
Nisarg Thakkar
0fd1203b3b
Fixed Doc Errors Bug#4282
2015-04-21 10:37:50 +05:30
Vadim Pisarevsky
b27467d9f9
Merge pull request #3931 from mshabunin:fix-svm-train
2015-04-20 20:00:36 +00:00
Vadim Pisarevsky
b4aa37aa30
Merge pull request #3933 from BKNio:putText_3_0
2015-04-20 20:00:11 +00:00
Vadim Pisarevsky
c879b1ab09
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
2015-04-20 19:47:55 +00:00
Vadim Pisarevsky
6916a1438f
fixed some newly introduced compile errors and warnings
2015-04-20 21:34:37 +03:00
Vadim Pisarevsky
ca9a2887fc
extended universal intrinsics: added 64-bit integers, improved shift operators, renamed "pack" operations; changed semantics of extended integer multiplication, added v_dotprod.
...
also, split intrinsics into separate files. C implementation is compiled only when none of SSE2 or NEON is available.
2015-04-20 20:27:03 +03:00
Vladislav Vinogradov
a984da911b
increase epsilons for some sanity tests
...
(cherry picked from commit 6a6619ec1e
)
2015-04-19 14:06:47 +03:00
Vladislav Vinogradov
df55be3c3d
fix BruteForceMatcher resource distribution
...
added launch bounds attributes for all CUDA kernels
(cherry picked from commit d22516872c
)
2015-04-19 14:06:36 +03:00
Vladislav Vinogradov
55339de684
make NVIDIA tests verbose by default
...
(cherry picked from commit 17608f7ade
)
2015-04-19 14:06:25 +03:00
Vladislav Vinogradov
f08dd510fa
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
...
uninitialized value
(cherry picked from commit 81ebe28c24
)
2015-04-19 14:06:11 +03:00
Alexander Smorkalov
de8d8720a2
Merge pull request #3924 from jet47:gpu-fixes
2015-04-19 11:04:55 +00:00
Vladislav Vinogradov
d308ed3712
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
...
(cherry picked from commit 27302c367c
)
2015-04-19 14:02:54 +03:00
Vladislav Vinogradov
6d0f8aa893
fix tests for gpu HOG
...
initialize HOG after CUDA device switch
(cherry picked from commit c849492dfa
)
2015-04-19 14:01:16 +03:00
Vladimir Kolesnikov
bea98bd22a
Not block PDB file in multithreaded build on Windows.
...
If used cl compiler, but generator is not Visual Studio e.g. Ninja,
enable FS option to prevent blocking PDB file in multithreaded build.
(cherry picked from commit 58c9135626
)
2015-04-19 14:00:24 +03:00
Vladislav Vinogradov
4539607ab1
fix gpu HOG implementation:
...
move hog::set_up_constants from constructor to compute method
if user changed CUDA device between constructor and computation,
some variables were uninitialized
(cherry picked from commit 21bbed7baf
)
2015-04-19 13:57:37 +03:00
Vladislav Vinogradov
b320138dba
fix GpuMat::setTo implementation
...
previous implementation was not thread/stream safe, since it used constant
memory
new implementation doesn't use any global objects, so it is thread/stream safe
(cherry picked from commit 4f5d30a865
)
2015-04-19 13:57:23 +03:00
Vladislav Vinogradov
95ea12588e
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
...
(cherry picked from commit c147ab1e85
)
2015-04-19 13:57:03 +03:00
Roman Donchenko
bcd08b5d18
Mark the libs component required
...
Everything else depends on it, after all.
(cherry picked from commit cf54e3b97e
)
2015-04-19 13:55:35 +03:00
Roman Donchenko
19298ae3cb
Add component display names
...
(cherry picked from commit 6d52ea8984
)
2015-04-19 13:55:22 +03:00
Roman Donchenko
5e06da3050
Update the CPack variables to match the changes in asmorkalov/CMake#1
...
Which also happens to align the non-Debian specific variables
with the ones used by upstream CMake.
(cherry picked from commit b8c60234c3
)
Conflicts:
cmake/OpenCVPackaging.cmake
2015-04-19 13:54:32 +03:00
Roman Donchenko
17ac18a7b9
Remove useless CPACK_*_COMPONENT_INSTALL variables
...
They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
(cherry picked from commit 49fe496914
)
2015-04-19 13:42:14 +03:00
Roman Donchenko
c259590b26
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
(cherry picked from commit 77578d415f
)
2015-04-19 13:41:22 +03:00
Roman Donchenko
3f3ca85103
Don't use ${CMAKE_INSTALL_PREFIX} as an install destination
...
Absolute destinations are not necessary, and prevent CPack from working.
(cherry picked from commit 0387f8ad56
)
2015-04-19 13:39:55 +03:00
Alexander Smorkalov
05ddc16eaa
Added Debian changelog to -tests package.
...
(cherry picked from commit a87ccb9ac0
)
2015-04-19 13:39:01 +03:00
Alexander Smorkalov
2ba77614aa
Debian package names replaced by lower case version to satisfy lintian.
...
(cherry picked from commit e6ac64008b
)
2015-04-19 13:38:46 +03:00
Vladislav Vinogradov
ef347aa6a4
disable gpu::matchTemplate tests
...
(cherry picked from commit 7bb8c50080
)
2015-04-19 13:38:20 +03:00
Alexander Smorkalov
b1cdb91139
Fixed samples install permissions for Debian packaging.
...
(cherry picked from commit cf852972d1
)
2015-04-19 13:37:50 +03:00
Alexander Smorkalov
a09ad35d98
opencv_testing.sh script installation is removed as run tests script does the same thing.
...
(cherry picked from commit 9206ec30a2
)
2015-04-19 13:37:29 +03:00