lujia [Tue, 21 Apr 2015 06:32:27 +0000 (02:32 -0400)]
bugfix_for_hog_detectMultiScale_with_weights
(cherry picked from commit
7ce116695d616f73e285e55e0a38fa5fa6e5b097)
Vladislav Vinogradov [Thu, 23 Apr 2015 16:09:03 +0000 (19:09 +0300)]
disable several heavy performance tests
(cherry picked from commit
cbdddb473c10429ce8511fddc8afce8cea0a171c)
Vladislav Vinogradov [Thu, 23 Apr 2015 16:08:40 +0000 (19:08 +0300)]
disable Video_PyrLKOpticalFlowDense performance test
sanity fails on Maxwell and CUDA 7.0 due to unknow reason
(cherry picked from commit
b4c2891ef3e24d0e90e1706c24dc459f7ec62ed1)
Vladislav Vinogradov [Thu, 23 Apr 2015 09:44:09 +0000 (12:44 +0300)]
use border extrapolation for central pixel in pyrDown
in case if image has odd dimension
(cherry picked from commit
13252133035e3a5972c83d3f123b12033dcc3886)
Vladislav Vinogradov [Thu, 23 Apr 2015 09:43:17 +0000 (12:43 +0300)]
fix racecheck warning in scanRows kernel
(cherry picked from commit
fb15bdfb21da2c38beea6e87c7b08a19610821d6)
Vladislav Vinogradov [Thu, 23 Apr 2015 09:43:31 +0000 (12:43 +0300)]
increase epsilon for solvePnPRansac function
(cherry picked from commit
9d2d173485f15043abbfa41b030f16c11ec56dc4)
Vladislav Vinogradov [Tue, 14 Apr 2015 07:12:56 +0000 (10:12 +0300)]
increase epsilons for some sanity tests
(cherry picked from commit
6a6619ec1eb20e1c78705167c76fad4f0f6b578a)
Vladislav Vinogradov [Mon, 13 Apr 2015 14:12:04 +0000 (17:12 +0300)]
fix BruteForceMatcher resource distribution
added launch bounds attributes for all CUDA kernels
(cherry picked from commit
d22516872cab0fa7c9b661f85e1eb1d36b2ff7cb)
Vladislav Vinogradov [Mon, 13 Apr 2015 14:11:19 +0000 (17:11 +0300)]
make NVIDIA tests verbose by default
(cherry picked from commit
17608f7ade9f31f2363bcf1d15153b75868b8f15)
Vladislav Vinogradov [Mon, 13 Apr 2015 14:09:59 +0000 (17:09 +0300)]
fixed a bug in scanRows CUDA kernel (part of nppStIntegral)
uninitialized value
(cherry picked from commit
81ebe28c24df70fe06bbebe650eea0585bada0cd)
Vladislav Vinogradov [Tue, 7 Apr 2015 10:04:31 +0000 (13:04 +0300)]
fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture
(cherry picked from commit
27302c367cdd8636a0cd0dd290cc0fbfe0555f6b)
Vladislav Vinogradov [Mon, 2 Mar 2015 08:02:47 +0000 (11:02 +0300)]
fix tests for gpu HOG
initialize HOG after CUDA device switch
(cherry picked from commit
c849492dfa07c6a35dfbd3c44a42c1c6a4fc0d60)
Vladimir Kolesnikov [Wed, 1 Apr 2015 10:52:07 +0000 (13:52 +0300)]
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)
Vladislav Vinogradov [Fri, 27 Feb 2015 11:28:12 +0000 (14:28 +0300)]
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)
Vladislav Vinogradov [Fri, 27 Feb 2015 13:28:06 +0000 (16:28 +0300)]
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)
Vladislav Vinogradov [Wed, 25 Feb 2015 10:16:36 +0000 (13:16 +0300)]
set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic
(cherry picked from commit
c147ab1e8574bf5adc6847a9700d9d6718dc8a2f)
Roman Donchenko [Fri, 20 Feb 2015 15:37:21 +0000 (18:37 +0300)]
Mark the libs component required
Everything else depends on it, after all.
(cherry picked from commit
cf54e3b97ea13c0aeef5e94b5330a4b26a601d81)
Roman Donchenko [Fri, 20 Feb 2015 15:20:29 +0000 (18:20 +0300)]
Add component display names
(cherry picked from commit
6d52ea898442d2458a40f8b06b75320c9ab4a5cc)
Roman Donchenko [Fri, 20 Feb 2015 15:15:20 +0000 (18:15 +0300)]
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
Roman Donchenko [Fri, 13 Feb 2015 12:31:19 +0000 (15:31 +0300)]
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)
Roman Donchenko [Fri, 13 Feb 2015 12:12:52 +0000 (15:12 +0300)]
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)
Roman Donchenko [Tue, 10 Feb 2015 16:43:29 +0000 (19:43 +0300)]
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)
Alexander Smorkalov [Wed, 4 Feb 2015 13:52:39 +0000 (16:52 +0300)]
Added Debian changelog to -tests package.
(cherry picked from commit
a87ccb9ac068ef1cb9a5c99cd98615fade6676bf)
Alexander Smorkalov [Wed, 4 Feb 2015 08:37:52 +0000 (11:37 +0300)]
Debian package names replaced by lower case version to satisfy lintian.
(cherry picked from commit
e6ac64008bf8186f5ea30de25573ce667ab28d29)
Vladislav Vinogradov [Wed, 4 Feb 2015 08:21:17 +0000 (11:21 +0300)]
disable gpu::matchTemplate tests
(cherry picked from commit
7bb8c50080045dd350441e8ce744b1aa5f29cee8)
Alexander Smorkalov [Sat, 31 Jan 2015 21:34:23 +0000 (00:34 +0300)]
Fixed samples install permissions for Debian packaging.
(cherry picked from commit
cf852972d1c40ce16a56b8e7d5fbf060716560eb)
Alexander Smorkalov [Thu, 29 Jan 2015 16:20:18 +0000 (19:20 +0300)]
opencv_testing.sh script installation is removed as run tests script does the same thing.
(cherry picked from commit
9206ec30a25ce8653c3acc1603501e4f545bed25)
Alexander Smorkalov [Fri, 30 Jan 2015 09:26:08 +0000 (12:26 +0300)]
Added dependency from numpy to debian package with python bindings.
(cherry picked from commit
be6b8476750e1aefe21c9775b0b732b497e2d4bd)
Alexander Smorkalov [Fri, 30 Jan 2015 10:21:52 +0000 (13:21 +0300)]
Added Debian changelog installation step for Debian package generation.
(cherry picked from commit
ddc1b965b62a699239851c509e89efe23442a36e)
Vijay Pradeep [Thu, 8 Jan 2015 23:26:15 +0000 (15:26 -0800)]
Fixing race condition by expanding resultsMutex lock section
(cherry picked from commit
042ff210d57bba264639bcfe8974d0b3304d18a7)
Vladislav Vinogradov [Thu, 25 Dec 2014 14:43:13 +0000 (17:43 +0300)]
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)
Roman Donchenko [Mon, 22 Dec 2014 15:54:39 +0000 (18:54 +0300)]
cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed...
... before any exceptions occur.
(cherry picked from commit
08da247a871ed40b868119a999af538da6526c6d)
Vladislav Vinogradov [Tue, 25 Nov 2014 15:29:56 +0000 (18:29 +0300)]
get rid of cuda.h usage
(cherry picked from commit
eeb997261d1d22e8c69af777c86e21cce2d04f87)
Roman Donchenko [Wed, 12 Nov 2014 14:00:08 +0000 (17:00 +0300)]
Fix uninitialized memory reads and memory leaks in StereoGC
(cherry picked from commit
7d8e5f623a9f1f971c45aa4912dc4679f5165f43)
Vicente Olivert Riera [Mon, 27 Oct 2014 13:39:35 +0000 (13:39 +0000)]
superres: Fix
\ 1\ 1return 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
\ 1createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
(cherry picked from commit
2e393ab83362743ba1825ad4b31d4a2925c606b4)
Vladislav Vinogradov [Fri, 17 Oct 2014 09:23:23 +0000 (13:23 +0400)]
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)
Alexander Smorkalov [Wed, 5 Nov 2014 05:46:55 +0000 (08:46 +0300)]
Version++.
Vladislav Vinogradov [Thu, 23 Oct 2014 15:33:19 +0000 (19:33 +0400)]
minor fix for StereoCSBP data cost compute kernel and test
(cherry picked from commit
84f33d0578d3a836c8384608363ef5e2c24030fa)
Vladislav Vinogradov [Thu, 23 Oct 2014 14:39:36 +0000 (18:39 +0400)]
increase epsilons for some tests, which functions use floating point arithm
(cherry picked from commit
5c07e0b6d3f120c964ce8fac58bd2ab0ede96562)
Vladislav Vinogradov [Thu, 23 Oct 2014 14:09:49 +0000 (18:09 +0400)]
avoid pointer arithmetic on register memory in color conversion
(cherry picked from commit
e0827069c1c242ad9fceede43c642f8dfad0ef99)
Andrey Pavlenko [Wed, 1 Oct 2014 07:33:36 +0000 (07:33 +0000)]
Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies
Andrey Pavlenko [Wed, 1 Oct 2014 07:26:25 +0000 (07:26 +0000)]
Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency
Andrey Pavlenko [Wed, 1 Oct 2014 07:26:04 +0000 (07:26 +0000)]
Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra
Andrey Pavlenko [Wed, 1 Oct 2014 07:25:15 +0000 (07:25 +0000)]
Merge pull request #3291 from asmorkalov:android_superres_video_check
Alexander Smorkalov [Wed, 1 Oct 2014 05:13:35 +0000 (09:13 +0400)]
Turn off superres accuracy tests if video i/o is not supported.
Roman Donchenko [Tue, 30 Sep 2014 15:55:26 +0000 (15:55 +0000)]
Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport
Roman Donchenko [Tue, 30 Sep 2014 15:19:07 +0000 (15:19 +0000)]
Merge pull request #3285 from asmorkalov:android_servive_big.little_fix
Roman Donchenko [Tue, 30 Sep 2014 14:44:35 +0000 (14:44 +0000)]
Merge pull request #3287 from asmorkalov:android_manager_version_inc5
Alexander Smorkalov [Mon, 16 Jun 2014 04:39:03 +0000 (08:39 +0400)]
OpenCV Manager hardware detector workaround for not detected ARM SoC support.
Maksim Shabunin [Tue, 30 Sep 2014 10:53:16 +0000 (10:53 +0000)]
Merge pull request #3282 from asmorkalov:android_exclude_ocl
Alexander Smorkalov [Tue, 30 Sep 2014 10:34:00 +0000 (14:34 +0400)]
Test fisheye.rectify disabled for Tegra.
StevenPuttemans [Tue, 30 Sep 2014 09:53:46 +0000 (11:53 +0200)]
fixing dependencies
Alexander Smorkalov [Tue, 30 Sep 2014 09:35:19 +0000 (13:35 +0400)]
Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04.
Alexander Smorkalov [Tue, 23 Sep 2014 15:02:37 +0000 (19:02 +0400)]
GStreamer 1.0 backport from master branch.
Alexander Smorkalov [Tue, 30 Sep 2014 08:05:46 +0000 (12:05 +0400)]
OpenCV Manager version++.
Artur Wieczorek [Tue, 23 Sep 2014 17:31:55 +0000 (19:31 +0200)]
Remove ATL dependency from MSMF capture code
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
Alexander Smorkalov [Mon, 29 Sep 2014 16:42:24 +0000 (20:42 +0400)]
Exclude OpenCL tests from default test list for Android as they are experimental.
Roman Donchenko [Mon, 29 Sep 2014 14:53:02 +0000 (14:53 +0000)]
Merge pull request #3263 from asmorkalov:python_tests_package_lintian
Alexander Smorkalov [Wed, 24 Sep 2014 10:23:52 +0000 (14:23 +0400)]
Added implicit dependency from python and python-py to debian packages.
Maksim Shabunin [Mon, 29 Sep 2014 12:07:22 +0000 (12:07 +0000)]
Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4
Vadim Pisarevsky [Sat, 27 Sep 2014 13:06:44 +0000 (13:06 +0000)]
Merge pull request #3266 from mshabunin:arm_warning
Vadim Pisarevsky [Sat, 27 Sep 2014 13:06:18 +0000 (13:06 +0000)]
Merge pull request #3260 from a-wi:MSMF_file_error
Manfred Georg [Fri, 26 Sep 2014 16:44:25 +0000 (09:44 -0700)]
set ffmpeg mutex to NULL on destruction.
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=
28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423
Cherry picked from head (file has moved but issue is the same).
Conflicts:
modules/videoio/src/cap_ffmpeg_impl.hpp
Maksim Shabunin [Wed, 24 Sep 2014 13:53:23 +0000 (17:53 +0400)]
Fixed warning during cross compile for ARM
Vadim Pisarevsky [Wed, 24 Sep 2014 17:03:08 +0000 (17:03 +0000)]
Merge pull request #3261 from a-wi:CMake_FFMPEG_config
Vadim Pisarevsky [Wed, 24 Sep 2014 12:22:20 +0000 (12:22 +0000)]
Merge pull request #3262 from StevenPuttemans:fix_window_param
StevenPuttemans [Wed, 24 Sep 2014 07:33:22 +0000 (09:33 +0200)]
fixing some wrong CPP prefixes - still old interface
Artur Wieczorek [Tue, 23 Sep 2014 21:48:37 +0000 (23:48 +0200)]
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
Artur Wieczorek [Tue, 23 Sep 2014 20:06:12 +0000 (22:06 +0200)]
Fixed CMake issue with FFMPEG highgui configuration
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
Artur Wieczorek [Sat, 26 Apr 2014 08:12:37 +0000 (10:12 +0200)]
Fixed MSMF file capture error while opening the file containing unsupported video stream format
Vadim Pisarevsky [Tue, 23 Sep 2014 15:40:22 +0000 (15:40 +0000)]
Merge pull request #3255 from bhack:fix_cuda_macosx
bhack [Tue, 23 Sep 2014 10:39:16 +0000 (12:39 +0200)]
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
Taken from
3f0765523113ae7fc1b300f27dd78c642bb2b6c7
Vadim Pisarevsky [Tue, 23 Sep 2014 08:42:57 +0000 (08:42 +0000)]
Merge pull request #3251 from a-wi:MSMF_camera_errors
Vadim Pisarevsky [Tue, 23 Sep 2014 07:19:38 +0000 (07:19 +0000)]
Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2
Vadim Pisarevsky [Tue, 23 Sep 2014 07:18:00 +0000 (07:18 +0000)]
Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector
StevenPuttemans [Mon, 22 Sep 2014 20:12:27 +0000 (22:12 +0200)]
Fixing errors
Artur Wieczorek [Mon, 22 Sep 2014 17:38:04 +0000 (19:38 +0200)]
Fixed assertion warning in MSMF frame grabber
Artur Wieczorek [Mon, 22 Sep 2014 17:35:36 +0000 (19:35 +0200)]
Fixed MSMF video capture initialization
Vadim Pisarevsky [Mon, 22 Sep 2014 15:31:09 +0000 (15:31 +0000)]
Merge pull request #3247 from a-wi:CMake_MSMF_configuration
Vadim Pisarevsky [Mon, 22 Sep 2014 15:29:32 +0000 (15:29 +0000)]
Merge pull request #3243 from a-wi:MSMF_linking_error
StevenPuttemans [Thu, 4 Sep 2014 14:17:51 +0000 (16:17 +0200)]
fix blobdetector
Artur Wieczorek [Sun, 21 Sep 2014 16:48:54 +0000 (18:48 +0200)]
CMake configuration for MSMF capture
Artur Wieczorek [Fri, 19 Sep 2014 20:46:09 +0000 (22:46 +0200)]
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
Tom Stellard [Tue, 4 Mar 2014 20:48:07 +0000 (12:48 -0800)]
ocl: Don't use 'inline' attribute on functions
In C99 'inline' is not a hint to the compiler to inline the function,
it is an attribute that affects the linkage of the function. 'inline'
functions are required to have a definition in a different compiliation
unit, so compilers are free to delete 'inline' functions if they want to.
This issue can be seen in Clang when compiling at -O0. Clang
will sometimes delete 'inline' functions which creates an invalid
program.
Issue 3746: http://code.opencv.org/issues/3746
Vadim Pisarevsky [Fri, 19 Sep 2014 17:36:13 +0000 (17:36 +0000)]
Merge pull request #3240 from a-wi:MSMF_compilation_errors
Vadim Pisarevsky [Fri, 19 Sep 2014 17:35:07 +0000 (17:35 +0000)]
Merge pull request #3241 from WilhelmHannemann:bugfix_brute_force_match_cl
Artur Wieczorek [Fri, 19 Sep 2014 12:49:40 +0000 (14:49 +0200)]
Fixed compilation errors under VS 2010 and Win 7
WilhelmHannemann [Fri, 19 Sep 2014 14:42:59 +0000 (16:42 +0200)]
Merge branch 'bugfix_brute_force_match_cl' of https://github.com/WilhelmHannemann/opencv into bugfix_brute_force_match_cl
WilhelmHannemann [Fri, 19 Sep 2014 14:31:11 +0000 (16:31 +0200)]
Bugfix brute_force_match.cl (see code.opencv.org/issues/2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
WilhelmHannemann [Fri, 19 Sep 2014 14:31:11 +0000 (16:31 +0200)]
Bugfix brute_force_match.cl (Bug #2837): wrong results for non-float descriptors in OpenCL BruteForceMatcher
Vadim Pisarevsky [Fri, 19 Sep 2014 13:21:05 +0000 (13:21 +0000)]
Merge pull request #3238 from vpisarev:bfmatcher_fix
Vadim Pisarevsky [Fri, 19 Sep 2014 11:31:21 +0000 (15:31 +0400)]
Merge branch 'bug_3172' of https://github.com/elmarb/opencv into bfmatcher_fix;
use different fix for the problem, embedded right into the BFMatcher.
E Braun [Tue, 2 Sep 2014 16:05:23 +0000 (18:05 +0200)]
fix for bug 3172
E Braun [Tue, 2 Sep 2014 11:56:13 +0000 (13:56 +0200)]
Revert "fix for bug 3172"
This reverts commit
ed2cdb71e5821db85b57cf60d88689c2bf32aeeb.
E Braun [Thu, 31 Jul 2014 22:17:56 +0000 (00:17 +0200)]
fix for bug 3172
E Braun [Thu, 31 Jul 2014 22:16:58 +0000 (00:16 +0200)]
regression test for bug 3172
Vadim Pisarevsky [Fri, 19 Sep 2014 09:42:00 +0000 (09:42 +0000)]
Merge pull request #3235 from Atanahel:gbt_bugfix
Vadim Pisarevsky [Thu, 18 Sep 2014 17:45:28 +0000 (17:45 +0000)]
Merge pull request #3236 from vpisarev:fix_traincascade
Stephen Mell [Thu, 26 Jun 2014 18:28:47 +0000 (10:28 -0800)]
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
Benoit Seguin [Thu, 18 Sep 2014 12:03:13 +0000 (14:03 +0200)]
Fixing a line where integer data was treated as floating point data.