Alexandr Kondratev
d394d26b46
highgui: window QT+OpenGL mouse wheel support, build fix
2016-07-23 18:06:46 +03:00
Tomoaki Teshima
4423a5edad
fix build error
...
* NAN is not defined on some platform
2016-07-23 23:11:57 +09:00
Vadim Pisarevsky
80951bd091
Merge pull request #6966 from theg4sh:linux-window-mouse-wheel-support
2016-07-21 21:22:02 +00:00
Vadim Pisarevsky
134154ec6d
Merge pull request #6963 from ilya-lavrenov:vec2i_fs
2016-07-21 20:55:05 +00:00
Alexandr Kondratev
ecfabd7aac
Merge branch 'master' of https://github.com/Itseez/opencv into linux-window-mouse-wheel-support
2016-07-21 18:16:41 +03:00
Alexandr Kondratev
13aef2c0cf
highgui: window_QT mouse wheel support
2016-07-21 18:13:42 +03:00
Alexandr Kondratev
82e4e1816f
highgui: removed excessed variable orient in window_gtk
2016-07-21 17:51:19 +03:00
Ilya Lavrenov
313f54bc39
read/write vec2i from/to filestorage
2016-07-21 10:58:49 +03:00
Vadim Pisarevsky
371096493c
Merge pull request #6962 from alalek:fix_build_log_macro
2016-07-21 07:40:35 +00:00
Vadim Pisarevsky
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
Vadim Pisarevsky
167a4e6592
Merge pull request #6942 from alalek:fix_android_pack
2016-07-21 07:30:15 +00:00
Vadim Pisarevsky
1fc655a58f
Merge pull request #6964 from tomoaki0705:fixTypoImgproc
2016-07-21 07:27:48 +00:00
Your Name
440ba2e4a7
Passing Disparity Shift as a parameter.
2016-07-20 22:57:55 -03:00
Tomoaki Teshima
57d1591957
imgproc: fix typo
...
* indent line
2016-07-21 06:42:11 +09:00
Alexander Alekhin
daf1879a2e
test: ffmpeg: change resolution for H264 test
2016-07-21 00:20:18 +03:00
Alexander Alekhin
2acfb263bb
Merge pull request #6910 from ilya-lavrenov:clone
2016-07-20 15:32:22 +00:00
Alexander Alekhin
60676dbbe8
fix build: move LOG macro from stitching public headers
2016-07-20 18:10:26 +03:00
Alexander Alekhin
2ec63e4dd1
fix android pack build
2016-07-20 16:49:57 +03:00
Vadim Pisarevsky
c4cc54e5da
Merge pull request #6953 from ilya-lavrenov:arithm
2016-07-20 13:42:30 +00:00
Vadim Pisarevsky
cc5c5f7da9
Merge pull request #6795 from tomoaki0705:accelerateBilateralFilterNeon
2016-07-20 13:19:06 +00:00
Vadim Pisarevsky
a455858dd9
Merge pull request #6878 from alalek:canny_custom_gradient
2016-07-20 13:16:53 +00:00
Vadim Pisarevsky
848c66babd
Merge pull request #6879 from savuor:fix/RNG_corrupts_stack
2016-07-20 13:13:40 +00:00
Ilya Lavrenov
71cbd6f02e
fixed bug #5775
2016-07-20 11:38:15 +03:00
Tomoaki Teshima
b436f4b995
accelerate bilateralFilter using NEON
...
* clean up some lines
2016-07-20 08:28:49 +09:00
Leonardo Brás
0e9c8e2dd5
'resolves' 6898
...
I have seen that you can input a Mat_<float> on StereoBM, but the value seems the same as CV_16S.
I changed it so, only if you input a Mat_<float> it makes use of a previously truncated 4 bits, giving more resolution to Disparity Matrix. (The algorithm stays the same, it's not more precise).
If any other input Mat is given, it changes nothing.
2016-07-19 20:11:41 -03:00
Vadim Pisarevsky
b34272f8a2
Merge pull request #6787 from theg4sh:linux-window-mouse-wheel-support
2016-07-19 19:06:03 +00:00
Alexander Alekhin
6d65f7a261
Merge pull request #6954 from ilya-lavrenov:typo
2016-07-19 16:25:26 +00:00
Vadim Pisarevsky
b0cc495698
Merge pull request #6822 from saedrna:master
2016-07-19 15:37:31 +00:00
Rostislav Vasilikhin
96edb270a6
fixed memory corruption when normal dist. params have less channels than target matrix; test added
2016-07-19 17:26:39 +03:00
Alexander Alekhin
e20a93f7d6
imgproc test: Canny with custom gradient
2016-07-19 17:15:36 +03:00
Alexander Alekhin
575de89ee2
imgproc: Canny: enable IPP & OpenCL optimization code path
2016-07-19 17:15:36 +03:00
Alexander Alekhin
460b1dc2fa
imgproc: Canny with custom gradient
2016-07-19 17:15:36 +03:00
Ilya Lavrenov
6c42ad5b90
fixed typo
2016-07-19 16:18:48 +03:00
Vadim Pisarevsky
5d3860703d
Merge pull request #6895 from mshabunin:check-6851
2016-07-19 12:11:23 +00:00
Maksim Shabunin
644c0dd5f4
Merge pull request #6940 from andy-held:cuda_pyrlk_static_const_init
2016-07-19 08:47:57 +00:00
Ilya Lavrenov
87ae4e0564
fixed clone of empty matrix
2016-07-19 11:31:53 +03:00
Vadim Pisarevsky
26bf5b5de3
Merge pull request #6797 from tomoaki0705:featureSIMDHog
2016-07-18 18:34:21 +00:00
Vadim Pisarevsky
1e17ffe9ac
Merge pull request #6839 from thierrylamarre:better_png_transparency
2016-07-18 18:24:34 +00:00
Vadim Pisarevsky
34d68edd1a
Merge pull request #6924 from K-Shinotsuka:issue3
2016-07-18 18:16:02 +00:00
Vadim Pisarevsky
b6f21a6cac
Merge pull request #6813 from mshabunin:gdcm-cmake-search
2016-07-18 16:00:43 +00:00
Vadim Pisarevsky
48b747903b
Merge pull request #6830 from tomoaki0705:featureSupportFp16
2016-07-18 15:56:00 +00:00
Vadim Pisarevsky
a86a5c798b
Merge pull request #6836 from vicproon:rectify_correct_principal_point
2016-07-18 15:53:35 +00:00
Vadim Pisarevsky
b28194addc
Merge pull request #6860 from IshankGulati:svm-error-message
2016-07-18 15:44:40 +00:00
Vadim Pisarevsky
d62b0bd363
Merge pull request #6849 from alcinos:optflow_interface
2016-07-18 15:05:13 +00:00
Alexander Alekhin
89c9e7c2e6
Merge pull request #6928 from K-Shinotsuka:issue4
2016-07-18 13:51:55 +00:00
Alexander Alekhin
b747633584
Merge pull request #6915 from arrybn:bugs_4515_6544_tests
2016-07-18 13:46:48 +00:00
Alexander Alekhin
55d0945149
Merge pull request #6932 from philippefoubert:bugfix_issue_6931
2016-07-18 13:23:56 +00:00
Andreas Franek
13d1ee10be
replaced static const members with static functions for msvc
...
cpmpatability
2016-07-18 14:41:55 +02:00
Maksim Shabunin
070f0f8445
Merge pull request #6936 from catree:fix_NAryMatIterator_code_example
2016-07-18 08:38:49 +00:00
Maksim Shabunin
474868a892
Merge pull request #6884 from alalek:migration
2016-07-18 07:49:38 +00:00
Maksim Shabunin
1efa7f4d27
Merge pull request #6911 from ilya-lavrenov:push_back
2016-07-18 07:33:12 +00:00
arybnikov
2deda0e868
Added tests for issues ##4515, 6544
2016-07-18 10:01:13 +03:00
k-shinotsuka
a25dba001d
improve SymmRowSmallVec_8u32s().
2016-07-18 13:58:11 +09:00
catree
7f64f31f66
Fix NAryMatIterator code example.
2016-07-17 23:21:15 +02:00
Philippe FOUBERT
d9a56f6590
Resolves issue #6931
2016-07-17 12:22:37 +02:00
k-shinotsuka
6f8695c178
improve RowVec_8u32s().
2016-07-17 18:35:34 +09:00
Maksim Shabunin
464aa5e555
Merge pull request #6803 from alalek:issue_6720
2016-07-15 13:58:39 +00:00
Alexander Alekhin
bfb4ebfa03
Merge pull request #6916 from ilya-lavrenov:qt5
2016-07-15 13:43:33 +00:00
Alexander Alekhin
0e6aa189cb
Merge pull request #6905 from alalek:ffmpeg_fix_get_fps
2016-07-15 12:58:19 +00:00
Maksim Shabunin
91d80d0309
Merge pull request #6798 from tomoaki0705:featureSSEvideoAcc
2016-07-15 12:31:18 +00:00
Maksim Shabunin
63d8290491
Merge pull request #6779 from alalek:python_dynamic_lookup
2016-07-15 12:28:30 +00:00
Ilya Lavrenov
957bf1452c
added some tests for push_back
2016-07-15 14:48:22 +03:00
Ilya Lavrenov
3bf16da92d
added condition for Qt5
2016-07-15 14:01:36 +03:00
Maksim Shabunin
b0fa477614
Merge pull request #6908 from ilya-lavrenov:reduce
2016-07-15 09:07:56 +00:00
Maksim Shabunin
154d61edf9
Merge pull request #6907 from ilya-lavrenov:typo
2016-07-15 09:07:19 +00:00
Maksim Shabunin
9e7124127f
Merge pull request #6906 from jet47:goodFeaturesToTrack-maxCorners-docs
2016-07-15 09:06:55 +00:00
Maksim Shabunin
b542914057
Merge pull request #6904 from ilya-lavrenov:minmaxloc
2016-07-15 09:06:15 +00:00
Tomoaki Teshima
3c2f7ecc97
speed up accumulate, accumulateSquare, accumulateProduct and accumulateWeighted using SIMD
...
* use SSE and/or AVX based on configuration
* revise the test to verify the implementation
2016-07-15 08:09:24 +09:00
Alexander Alekhin
f3494647c5
Merge pull request #6762 from maff91:master
2016-07-14 16:17:03 +00:00
Maksim Shabunin
fc890bd941
Merge pull request #6815 from smigielski:fix_6605
2016-07-14 14:36:45 +00:00
Maksim Shabunin
f695d4f04b
Merge pull request #6903 from jet47:cuda-stream-thread-safety-notes
2016-07-14 14:29:08 +00:00
Ilya Lavrenov
0af3947468
added note about cv::reduce output type for MIN/MAX
2016-07-14 17:22:08 +03:00
thierry
ea911d34c6
remove 2-channel png encoder/decoder support
2016-07-14 14:58:05 +02:00
Ilya Lavrenov
c634e39299
removed extra semicolon
2016-07-14 15:50:35 +03:00
Vladislav Vinogradov
1c8b1b2d2b
add note about "maxCorners <= 0" case in goodFeaturesToTrack
2016-07-14 15:48:08 +03:00
Alexander Alekhin
9bda0546f8
Merge pull request #6769 from andy-held:cuda_optflow_error_calc
2016-07-14 12:24:24 +00:00
Alexander Alekhin
df5d51f1c0
Merge pull request #6900 from mshabunin:fix-python-hal
2016-07-14 12:23:05 +00:00
thierry
d40e46bc9b
Merge branch 'master' into better_png_transparency
...
* master: (468 commits)
added suppression for TBB valgrind issue
update CUDA architecture flags initialization
increase minimal supported CUDA toolkit to 6.5
check the CPU flag correctly
opencv_visualization: check cmdline args
provide better error messages
stop search of markers in Exif reader to prevent infinite loop
Fix calibration fail on python with CALIB_THIN_PRISM_MODEL flag
clarify CUDA arithm operations usage with mask
fixed empty image condition in resize
fixed memory leak in flann tests
fisheye: add CALIB_FIX_PRINCIPAL_POINT
get/put: more type-safety and code unification using templates
py_tutorials: fix cv2.findContours return val
imgproc: speed up threshold of 64F version using NEON and SSE * use NEON under aarch64 only * check 64F version correctly
bigdata: add test, resolve split/merge issue
Improved Carotene library linear resize evaluation precision and enabled it as HAL implementation.
persistence: fixing crash with space-only values
Removed unnecessary check for Android API level and unused flags.
Fix for median blur of 2-channel images
...
2016-07-14 14:05:16 +02:00
Alexander Alekhin
998c43ffea
videoio: ffmpeg: fix get_fps() implementation
2016-07-14 15:00:54 +03:00
Ilya Lavrenov
c4b57d0ded
disable ippiMinMaxIndx_32f_C1R usage since it crashes on Nans
2016-07-14 14:52:58 +03:00
Maksim Shabunin
a00f0c44ae
Merge pull request #6821 from sturkmen72:TickMeter_class_addition
2016-07-14 11:40:46 +00:00
Maksim Shabunin
7d007d212c
Merge pull request #6828 from paroj:cmatvals_cpp
2016-07-14 11:31:48 +00:00
Maksim Shabunin
79f8e516b8
Merge pull request #6891 from snosov1:fix-5311
2016-07-14 11:25:58 +00:00
Vladislav Vinogradov
bfd6ae77f5
Add note that cv::cuda::Stream class is not thread safe
2016-07-14 14:20:37 +03:00
Maksim Shabunin
4d053405cf
Merge pull request #6809 from K-Shinotsuka:master
2016-07-14 09:37:53 +00:00
Maksim Shabunin
07b18b0e8a
Merge pull request #6863 from SorcererX:patch-1
2016-07-14 09:34:13 +00:00
Maksim Shabunin
f698bc1cc2
Fixes header filtering for python bindings generator
2016-07-13 19:49:38 +03:00
Alexander Alekhin
525e04cfcc
Merge pull request #6794 from jet47:cuda-modules-fixes
2016-07-13 15:13:55 +00:00
Maksim Shabunin
95da5ec245
Restored check chessboard parameters
2016-07-13 16:03:47 +03:00
Maksim Shabunin
3bfe76e24c
Ported PR #4187 to master
2016-07-13 15:46:48 +03:00
Maksim Shabunin
b000663a88
Cleanup
2016-07-13 15:45:48 +03:00
Alexander Alekhin
e871045b46
Merge pull request #6896 from jet47:cuda-arch-update
2016-07-13 12:26:52 +00:00
Alexander Alekhin
9c92f65c0b
Merge pull request #6808 from sturkmen72:patch-14
2016-07-13 11:54:11 +00:00
Alexander Alekhin
53f4eaa7a7
Merge pull request #6892 from ioxp:fsSpace
2016-07-13 11:46:50 +00:00
Alexander Alekhin
6c4b634cfe
Merge pull request #6814 from tomoaki0705:featureThreshold64fSimd
2016-07-13 11:45:28 +00:00
Vladislav Vinogradov
112903c2bd
increase minimal supported CUDA toolkit to 6.5
2016-07-13 13:02:13 +03:00
Maksim Shabunin
8215d20dbf
fixup! Fixed several merge issues
2016-07-13 12:11:44 +03:00
Maksim Shabunin
2a350b11dd
Fixed several merge issues
2016-07-13 11:48:28 +03:00
Tomoaki Teshima
9fca953e62
check the CPU flag correctly
2016-07-13 07:34:49 +09:00
Alexander Alekhin
f75f894d73
Merge pull request #6889 from ilya-lavrenov:exif
2016-07-12 15:12:19 +00:00