Vadim Pisarevsky
ebe979090e
Merge pull request #3963 from Dikay900:2_4_diff_to_master
2015-04-28 10:41:42 +00:00
Pierre Moulon
901d4995e3
Fix a typo error
...
Fix a typo error
Conflicts:
modules/features2d/include/opencv2/features2d.hpp
2015-04-25 15:07:17 +02:00
Adi Shavit
aad95c7d8c
Added call to clone() to avoid unexpected change to external data.
...
- Fix both stitching_detailed.cpp sample and cv::Stitcher.
2015-04-25 14:54:35 +02:00
Dikay900
d9b7b300b4
fix qt example on 2.4 with vs2010 and higher
2015-04-25 14:46:17 +02:00
Brian Park
044de4105e
add input paramter checking that verifies the existance of the input files to stero_match example
...
remove the unnecessary header file
check input paramter by checking the image size
2015-04-25 14:46:17 +02:00
Chris Mayo
7a5aa06b9e
Act on INSTALL_PYTHON_EXAMPLES
...
Conflicts:
samples/CMakeLists.txt
2015-04-25 14:46:16 +02:00
Ben Hagen
a21fb63c28
store user-provided data in PlaneTracker class
2015-04-25 11:22:18 +02:00
Yang Fan
eaa9b78121
ENH: explicitly declared outputFilename to surpress error C2668
...
Conflicts:
samples/gpu/video_writer.cpp
2015-04-25 10:58:01 +02:00
Abhijit Kundu
fd4df0f67d
Added suuport for finding Intel TBB for Visual Studio 2013
2015-04-25 10:23:34 +02:00
Simon Heinen
6decc2596d
squashed #3729
...
Update android+AsyncServiceHelper.java
Update android+AsyncServiceHelper.java
changed tabs in last commit to spaces
Update android+AsyncServiceHelper.java
small formatting fixes
2015-04-24 23:02:10 +02:00
Eric Sommerlade
41b920344d
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
...
Conflicts:
modules/imgcodecs/src/grfmt_tiff.cpp
2015-04-24 22:59:08 +02:00
Ying Xiong
82668e06d4
Silence cmake 3.0+ warnings about MACOSX_RPATH
2015-04-24 22:39:49 +02:00
ttagu99
a81374c1d7
findcontour_example check image empty
2015-04-24 21:58:31 +02:00
侯骥
66fc6126d2
Update MatchTemplate_Demo.cpp
2015-04-24 21:58:31 +02:00
Jay Bosamiya
8b58b59df4
Fix typo
2015-04-24 21:58:30 +02:00
RafaRuiz
f0595b8254
Update lkdemo.cpp because of memory leak
...
In MacOSx x64 it was getting a memory leak even without initializing points:
http://code.opencv.org/issues/4250
2015-04-24 21:58:29 +02:00
Pastafarianist
1e01441767
Fixed typo
2015-04-24 21:58:29 +02:00
Dikay900
c797746b6e
use constant instead of value backported from #785
2015-04-24 21:58:28 +02:00
Dikay900
1bf4427a5c
filename correction from #3217
2015-04-24 21:58:28 +02:00
Kevin Hughes
ac3ec0d96d
squashed #823
...
removed separate example for reading image sequences and modified starter_video.cpp to better explain the functionality of VideoCapture. I also added a bit more explanation in the documentation of the VideoCapture interface
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
samples/cpp/starter_video.cpp
starter_video.cpp changed CV WINDOW KEEPRATIO to just WINDOW KEEPTATIO to fix build error
starter_video.cpp hid local functions
2015-04-24 21:58:14 +02:00
Maximilien Cuony
5c6c537044
Fix typo in error for extrinsic parameters
2015-04-24 18:39:34 +02:00
Dikay900
f8c82fc214
update openni sample comments referring #81
2015-04-24 18:25:23 +02:00
Andrey Pavlenko
40b762bceb
adding test for polylines()
call with empty Point-s vector and fix for crash in this case
2015-04-24 16:40:14 +03:00
Ilya Lavrenov
89e3c508d8
fixed tests for aarch64
2015-04-24 13:56:20 +03:00
Vladislav Vinogradov
cbdddb473c
disable several heavy performance tests
2015-04-23 19:09:03 +03:00
Vladislav Vinogradov
b4c2891ef3
disable Video_PyrLKOpticalFlowDense performance test
...
sanity fails on Maxwell and CUDA 7.0 due to unknow reason
2015-04-23 19:08:40 +03:00
Vladislav Vinogradov
1325213303
use border extrapolation for central pixel in pyrDown
...
in case if image has odd dimension
2015-04-23 17:21:42 +03:00
Vladislav Vinogradov
fb15bdfb21
fix racecheck warning in scanRows kernel
2015-04-23 17:21:42 +03:00
Vladislav Vinogradov
9d2d173485
increase epsilon for solvePnPRansac function
2015-04-23 17:21:42 +03:00
Vadim Pisarevsky
26e3bcb9de
Merge pull request #3956 from ilya-lavrenov:cuda_aarch64
2015-04-23 13:49:33 +00:00
Vadim Pisarevsky
960dee8ab8
Merge pull request #3953 from ilya-lavrenov:cuda_unused
2015-04-23 12:26:07 +00:00
Ilya Lavrenov
847976de4e
fixed find cuda for aarch64
2015-04-23 14:49:12 +03:00
Ilya Lavrenov
ceec0eb33a
rmeoved unused functions
2015-04-23 12:48:50 +03:00
Vadim Pisarevsky
4840c4ae6f
Merge pull request #3949 from ilya-lavrenov:clobbered_warning
2015-04-22 19:07:46 +00:00
Ilya Lavrenov
02e29fc99c
suppress -Wclobbered warning
2015-04-22 16:42:03 +03:00
lujia
7ce116695d
bugfix_for_hog_detectMultiScale_with_weights
2015-04-21 02:32:27 -04:00
Vadim Pisarevsky
c879b1ab09
Merge pull request #3940 from sergarrido:fix-gen_pattern.py-2.4
2015-04-20 19:47:55 +00: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