MYLS
a9b4cdd36f
Merge branch 'master' of https://github.com/wiryls/opencv
2016-07-15 18:46:07 +08:00
MYLS
75b93b17ee
Merge remote-tracking branch 'refs/remotes/opencv/master'
2016-07-15 18:44:45 +08:00
Maksim Shabunin
2d964f800d
Merge pull request #6909 from jet47:fix-gpu-examples-compilation
2016-07-15 09:08:21 +00: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
Vladislav Vinogradov
033c01afe2
fix video_reader GPU sample compilation after latest changes in master
2016-07-14 16:18:43 +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
bb41df9d5f
Merge pull request #6901 from ilya-lavrenov:valgrind-tbb-suppression
2016-07-14 11:46:37 +00: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
Ilya Lavrenov
9e8d060314
added suppression for TBB valgrind issue
2016-07-14 12:16:52 +03:00
Maksim Shabunin
f698bc1cc2
Fixes header filtering for python bindings generator
2016-07-13 19:49:38 +03:00
Alexander Alekhin
3e77731f7e
Merge pull request #6824 from dozyc:tapi_hog_sample
2016-07-13 15:18:14 +00: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
a9353ad2ec
Merge pull request #6880 from berak:fix_opencv_visualization
2016-07-13 11:51:29 +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
d76f258aeb
update CUDA architecture flags initialization
...
* remove obsolete paths
* add Pascal arch support
2016-07-13 13:03:16 +03: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
Kerry Billingham
b2dd128ec5
Creation of Maven POM project and documentation.
...
This commit introduces a POM.xml file to allow the build of OpenCV and Java bundles using Maven.
An additonal directory has been created 'platforms/maven' to contain the POM and scripts used during the build process. An additional Markdown file is included to give instructions on how to build with Maven.
2016-07-12 21:59:12 +01:00
berak
20b9ff4ff6
opencv_visualization: check cmdline args
2016-07-12 19:40:46 +02:00
Alexander Alekhin
f75f894d73
Merge pull request #6889 from ilya-lavrenov:exif
2016-07-12 15:12:19 +00:00
Sergei Nosov
dce310e03c
provide better error messages
2016-07-12 18:03:28 +03:00
Alexander Alekhin
3c1a002dab
Merge pull request #6883 from ilya-lavrenov:resize
2016-07-12 14:35:25 +00:00