Vladislav Vinogradov
fe1bd0cc2f
fix racecheck warning in scanRows kernel
...
(cherry picked from commit fb15bdfb21
)
2015-05-06 16:23:09 +03:00
Vladislav Vinogradov
a752f25944
increase epsilon for solvePnPRansac function
...
(cherry picked from commit 9d2d173485
)
2015-05-06 16:22:57 +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
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
Alexander Smorkalov
1b5835cd35
Added dependency from numpy to debian package with python bindings.
...
(cherry picked from commit be6b847675
)
2015-04-19 13:37:04 +03:00
Alexander Smorkalov
9932bbad3a
Added Debian changelog installation step for Debian package generation.
...
(cherry picked from commit ddc1b965b6
)
2015-04-19 13:36:47 +03:00
Vijay Pradeep
39ac84ff04
Fixing race condition by expanding resultsMutex lock section
...
(cherry picked from commit 042ff210d5
)
2015-04-19 13:36:17 +03:00
Vladislav Vinogradov
fcbefaff86
fix tests for gpu::matchTemplate:
...
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
(cherry picked from commit d00f36ec75
)
2015-04-19 13:32:24 +03:00
Roman Donchenko
bf2256fb89
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
...
... before any exceptions occur.
(cherry picked from commit 08da247a87
)
2015-04-19 13:31:52 +03:00
Vladislav Vinogradov
b0b2fc9e3f
get rid of cuda.h usage
...
(cherry picked from commit eeb997261d
)
2015-04-19 13:29:45 +03:00
Roman Donchenko
1ccd64e102
Fix uninitialized memory reads and memory leaks in StereoGC
...
(cherry picked from commit 7d8e5f623a
)
2015-04-19 13:27:55 +03:00
Vicente Olivert Riera
23bf3e337a
superres: Fix return value VideoFrameSource_GPU
...
superres module fails to compile with the following error messages:
[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....
This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
(cherry picked from commit 2e393ab833
)
2015-04-19 13:25:16 +03:00
Vladislav Vinogradov
3cf265992f
fix installation layout for debian packages:
...
Install symlinks to shared libraries as a part of development package,
not runtime package.
It is default behavior for debian packages.
(cherry picked from commit f55c1cc0fb
)
2015-04-19 13:23:47 +03:00
Alexander Smorkalov
67635c6d65
Version++.
2014-11-05 08:46:55 +03:00
Vladislav Vinogradov
a26e496d00
minor fix for StereoCSBP data cost compute kernel and test
...
(cherry picked from commit 84f33d0578
)
2014-11-04 10:19:38 +03:00
Vladislav Vinogradov
d579d3e596
increase epsilons for some tests, which functions use floating point arithm
...
(cherry picked from commit 5c07e0b6d3
)
2014-11-04 10:19:18 +03:00
Vladislav Vinogradov
5a77176654
avoid pointer arithmetic on register memory in color conversion
...
(cherry picked from commit e0827069c1
)
2014-11-04 10:18:58 +03:00
Andrey Pavlenko
7018f94959
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
2014-10-01 07:33:36 +00:00
Andrey Pavlenko
533fde66e3
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
2014-10-01 07:26:25 +00:00
Andrey Pavlenko
5bd18155be
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
2014-10-01 07:26:04 +00:00
Andrey Pavlenko
aa6b5ac124
Merge pull request #3291 from asmorkalov:android_superres_video_check
2014-10-01 07:25:15 +00:00
Alexander Smorkalov
ca40a749b6
Turn off superres accuracy tests if video i/o is not supported.
2014-10-01 09:15:24 +04:00
Roman Donchenko
d54d580f79
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
2014-09-30 15:55:26 +00:00
Roman Donchenko
774d6c1d0a
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
2014-09-30 15:19:07 +00:00
Roman Donchenko
302d80d744
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
2014-09-30 14:44:36 +00:00
Alexander Smorkalov
286c6b496d
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
2014-09-30 18:43:11 +04:00
Maksim Shabunin
44da1f795f
Merge pull request #3282 from asmorkalov:android_exclude_ocl
2014-09-30 10:53:16 +00:00
Alexander Smorkalov
71c4e96e17
Test fisheye.rectify disabled for Tegra.
2014-09-30 14:49:33 +04:00
StevenPuttemans
60fd5c2a3a
fixing dependencies
2014-09-30 11:53:46 +02:00
Alexander Smorkalov
8271c4e9c4
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27
GStreamer 1.0 backport from master branch.
2014-09-30 12:30:09 +04:00