9952 Commits

Author SHA1 Message Date
Alexander Smorkalov
00d9f690f6 Version++. 2.4.10.4 2015-05-20 11:21:28 +03:00
Vladislav Vinogradov
ae79fe10dc do not loose logs from nvidia tests
(cherry picked from commit d58d277707ac4750d0986c25de1ef6ca896254aa)
2015-05-20 08:16:44 +03:00
Vladislav Vinogradov
62fc342d35 use fixed seed for RNG in gpu SolvePnPRansac test
(cherry picked from commit 95eed59f2dcc0fc4a3b46892d60deb9e26d22872)
2015-05-20 08:16:22 +03:00
Vladislav Vinogradov
36924d6dbb use cv::theRNG() instead of ::rand() in gpu::solvePnPRansac
(cherry picked from commit 62bc647731cc41d216ad2d96e2572a416ccb6588)
2015-05-20 08:16:05 +03:00
Alexander Smorkalov
e49e75da06 OpenCV patch verison++. 2.4.10.3 2015-05-06 16:29:51 +03:00
Vladislav Vinogradov
1d40946959 Bug #4315 : fix CUDA bitwise operations with mask
(cherry picked from commit d87c30dc8470e39048cc01f75f26eb7bd3d6ce9f)
2015-05-06 16:27:12 +03:00
Alexander Smorkalov
2598392295 Added explicit deb package dependency from libtbb-dev if TBB is enabled.
(cherry picked from commit 63d6cc5ca66c0627652021650b3f5c5cc608d7f5)
2015-05-06 16:26:50 +03:00
lujia
17cc5e2c40 bugfix_for_hog_detectMultiScale_with_weights
(cherry picked from commit 7ce116695d616f73e285e55e0a38fa5fa6e5b097)
2015-05-06 16:24:39 +03:00
Vladislav Vinogradov
4b14400976 disable several heavy performance tests
(cherry picked from commit cbdddb473c10429ce8511fddc8afce8cea0a171c)
2015-05-06 16:24:07 +03:00
Vladislav Vinogradov
4704a254f7 disable Video_PyrLKOpticalFlowDense performance test
sanity fails on Maxwell and CUDA 7.0 due to unknow reason
(cherry picked from commit b4c2891ef3e24d0e90e1706c24dc459f7ec62ed1)
2015-05-06 16:23:41 +03:00
Vladislav Vinogradov
7708e9882e use border extrapolation for central pixel in pyrDown
in case if image has odd dimension

(cherry picked from commit 13252133035e3a5972c83d3f123b12033dcc3886)
2015-05-06 16:23:28 +03:00
Vladislav Vinogradov
fe1bd0cc2f fix racecheck warning in scanRows kernel
(cherry picked from commit fb15bdfb21da2c38beea6e87c7b08a19610821d6)
2015-05-06 16:23:09 +03:00
Vladislav Vinogradov
a752f25944 increase epsilon for solvePnPRansac function
(cherry picked from commit 9d2d173485f15043abbfa41b030f16c11ec56dc4)
2015-05-06 16:22:57 +03:00
Vladislav Vinogradov
a984da911b increase epsilons for some sanity tests
(cherry picked from commit 6a6619ec1eb20e1c78705167c76fad4f0f6b578a)
2.4.10.2
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 d22516872cab0fa7c9b661f85e1eb1d36b2ff7cb)
2015-04-19 14:06:36 +03:00
Vladislav Vinogradov
55339de684 make NVIDIA tests verbose by default
(cherry picked from commit 17608f7ade9f31f2363bcf1d15153b75868b8f15)
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 81ebe28c24df70fe06bbebe650eea0585bada0cd)
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 27302c367cdd8636a0cd0dd290cc0fbfe0555f6b)
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 c849492dfa07c6a35dfbd3c44a42c1c6a4fc0d60)
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 58c9135626ed85b3436c44b54030f5d9ab485e43)
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 21bbed7bafd25114ff15d8012f3f8619d258d0c1)
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 4f5d30a865bd45f144cc70aed1057ac500a72e0c)
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 c147ab1e8574bf5adc6847a9700d9d6718dc8a2f)
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 cf54e3b97ea13c0aeef5e94b5330a4b26a601d81)
2015-04-19 13:55:35 +03:00
Roman Donchenko
19298ae3cb Add component display names
(cherry picked from commit 6d52ea898442d2458a40f8b06b75320c9ab4a5cc)
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 b8c60234c3fa94c31a3e2a72275fefa811c75d5c)

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 49fe496914cca93f19dd61aa7b1c120037d65282)
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 77578d415f4d2b22a4ee1989ef0afda73c9d649b)
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 0387f8ad56ba863a3d0d6656579e839ccaa66f10)
2015-04-19 13:39:55 +03:00
Alexander Smorkalov
05ddc16eaa Added Debian changelog to -tests package.
(cherry picked from commit a87ccb9ac068ef1cb9a5c99cd98615fade6676bf)
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 e6ac64008bf8186f5ea30de25573ce667ab28d29)
2015-04-19 13:38:46 +03:00
Vladislav Vinogradov
ef347aa6a4 disable gpu::matchTemplate tests
(cherry picked from commit 7bb8c50080045dd350441e8ce744b1aa5f29cee8)
2015-04-19 13:38:20 +03:00
Alexander Smorkalov
b1cdb91139 Fixed samples install permissions for Debian packaging.
(cherry picked from commit cf852972d1c40ce16a56b8e7d5fbf060716560eb)
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 9206ec30a25ce8653c3acc1603501e4f545bed25)
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 be6b8476750e1aefe21c9775b0b732b497e2d4bd)
2015-04-19 13:37:04 +03:00
Alexander Smorkalov
9932bbad3a Added Debian changelog installation step for Debian package generation.
(cherry picked from commit ddc1b965b62a699239851c509e89efe23442a36e)
2015-04-19 13:36:47 +03:00
Vijay Pradeep
39ac84ff04 Fixing race condition by expanding resultsMutex lock section
(cherry picked from commit 042ff210d57bba264639bcfe8974d0b3304d18a7)
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 d00f36ec7585d98c7cab26430c55e9c82b97ed49)
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 08da247a871ed40b868119a999af538da6526c6d)
2015-04-19 13:31:52 +03:00
Vladislav Vinogradov
b0b2fc9e3f get rid of cuda.h usage
(cherry picked from commit eeb997261d1d22e8c69af777c86e21cce2d04f87)
2015-04-19 13:29:45 +03:00
Roman Donchenko
1ccd64e102 Fix uninitialized memory reads and memory leaks in StereoGC
(cherry picked from commit 7d8e5f623a9f1f971c45aa4912dc4679f5165f43)
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 2e393ab83362743ba1825ad4b31d4a2925c606b4)
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 f55c1cc0fb390f88c91557cb443e932f459c5849)
2015-04-19 13:23:47 +03:00
Alexander Smorkalov
67635c6d65 Version++. 2.4.10.1 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 84f33d0578d3a836c8384608363ef5e2c24030fa)
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 5c07e0b6d3f120c964ce8fac58bd2ab0ede96562)
2014-11-04 10:19:18 +03:00
Vladislav Vinogradov
5a77176654 avoid pointer arithmetic on register memory in color conversion
(cherry picked from commit e0827069c1c242ad9fceede43c642f8dfad0ef99)
2014-11-04 10:18:58 +03:00
Andrey Pavlenko
7018f94959 Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies 2.4.10 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