Commit Graph

20374 Commits

Author SHA1 Message Date
Vadim Pisarevsky
77f9bb7b76 Merge pull request #6831 from bobpaulin:master 2016-07-18 15:24:35 +00:00
Vadim Pisarevsky
d62b0bd363 Merge pull request #6849 from alcinos:optflow_interface 2016-07-18 15:05:13 +00:00
Vadim Pisarevsky
4da91f9e6d Merge pull request #6861 from teng88:patch-1 2016-07-18 14:43:23 +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
0015a09987 Merge pull request #6827 from jtkb:cmake-maven-release 2016-07-18 08:56:26 +00: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
Alexander Alekhin
69c4e84dad Merge pull request #6918 from jet47:gpu-opengl-sample-build 2016-07-15 16:52:42 +00:00
Maksim Shabunin
464aa5e555 Merge pull request #6803 from alalek:issue_6720 2016-07-15 13:58:39 +00:00
Arthur Cinader
bd7c21d83e Fix explanation to refelect how matching currently works. 2016-07-15 09:57:12 -04:00
Alexander Alekhin
bfb4ebfa03 Merge pull request #6916 from ilya-lavrenov:qt5 2016-07-15 13:43:33 +00:00
Alexander Alekhin
99b0845cd5 ffmpeg windows wrapper 2.7.1=>3.1.1, openh264 1.4.0=>1.5.0, vpx 1.5.0 2016-07-15 16:31:57 +03: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
Vladislav Vinogradov
9f3b1f7e50 use HAVE_OPENGL instead of WITH_OPENGL for GPU opengl sample
in this case the sample will not be built if OpenGL is not found
2016-07-15 15:14:56 +03: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
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