Maksim Shabunin
07cffc9df2
Merge pull request #7090 from daB0bby:patch-1
2016-08-11 10:57:33 +00:00
Alexander Alekhin
c2394339a8
Merge pull request #7075 from alalek:ocl_fix_canny_perf_test
2016-08-11 09:19:44 +00:00
Maksim Shabunin
de0909e03c
Merge pull request #7083 from tomoaki0705:fixAccumulateShortFloat
2016-08-11 09:00:38 +00:00
daB0bby
5cc1ef9022
fix code-style consistency
2016-08-11 10:15:48 +02:00
Vadim Pisarevsky
f210602d1e
Merge pull request #7071 from K-Shinotsuka:issue14
2016-08-10 10:49:05 +00:00
Alexander Alekhin
f8b185b55f
Merge pull request #7070 from paroj:noculegacy
2016-08-10 10:48:31 +00:00
Alexander Alekhin
0dd00321e0
Merge pull request #7072 from alalek:ocl_fix_canny
2016-08-10 13:44:52 +03:00
Vadim Pisarevsky
df665e2386
Merge pull request #6983 from K-Shinotsuka:issue8
2016-08-10 10:31:12 +00:00
Vadim Pisarevsky
96d48331da
Merge pull request #7076 from sovrasov:mkl_lapack
2016-08-10 10:25:17 +00:00
Tomoaki Teshima
ba73249dc0
let the test of AccSqr_SIMD<ushort, float> pass
...
* The difference becomes too large when multiply is done in int16
* To reproduce the test failure, IPP has to be switched off
2016-08-10 18:36:00 +09:00
Vadim Pisarevsky
8b155b1c6d
Merge pull request #6955 from snosov1:fix-6836
2016-08-10 09:26:51 +00:00
Vadim Pisarevsky
5eee757658
Merge pull request #6949 from wiryls:FileStorageBase64DocsTests
2016-08-10 09:26:13 +00:00
Vladislav Sovrasov
a113d9bcc1
Add MKL support
2016-08-10 11:20:23 +03:00
Alexander Alekhin
44bda8fbb7
Merge pull request #7044 from wolever:master
2016-08-09 12:59:38 +00:00
Alexander Alekhin
f2e41ce391
ocl: fix input data for Canny perf test
...
"declare.in(img, WARMUP_RNG)" overrides input image with random values
Also added support for different input sizes (via cv::resize)
2016-08-09 15:49:22 +03:00
Alexander Alekhin
32c239085d
Merge pull request #7067 from tomoaki0705:fixBuildErrorJetsonK1
2016-08-09 10:39:56 +00:00
k-shinotsuka
042b0a584d
improve LKTrackerInvoker::operator()
2016-08-09 18:59:29 +09:00
Alexander Alekhin
b8e08d5d3c
ocl: fix Canny for Intel devices
...
There is an issue with processing of abs(short) function for
negative argument.
Affected OpenCL devices:
- iGPU: Intel(R) HD Graphics 520 (OpenCL 2.0 )
- CPU: Intel(R) Core(TM) i5-6300U CPU @ 2.40GHz (OpenCL 2.0 (Build 10094))
2016-08-09 12:48:06 +03:00
Pavel Rojtberg
677f242761
stitching: use correct ifdef to allow compilation without cudalegacy
...
GraphCutSeamFinderGpu requires cudalegacy.
2016-08-09 11:39:05 +02:00
Tomoaki Teshima
3debc78a5f
fix build error on JetsonTK1
...
* avoid using vld1_f16 and vst1_f16 on gcc 4 series (Ubuntu 14.04)
* guard correctly with #if
* use static inline
2016-08-09 17:12:22 +09:00
Vadim Pisarevsky
0d8a21efd5
Merge pull request #7016 from lewgate:bugfix_2
2016-08-08 15:20:11 +00:00
Vadim Pisarevsky
28d28a2607
Merge pull request #7024 from paroj:semanticidx
2016-08-08 15:19:36 +00:00
Vadim Pisarevsky
b316aa3710
Merge pull request #7043 from alalek:add_nonfree_flag
2016-08-08 15:18:49 +00:00
Vadim Pisarevsky
a95d63dab6
Merge pull request #7042 from alalek:update_6967
2016-08-08 15:17:48 +00:00
Vadim Pisarevsky
39ebca5dbf
Merge pull request #7047 from tomoaki0705:brushUpFp16Cuda
2016-08-08 14:43:57 +00:00
catree
74b899d8b0
Modify the figure of the pinhole camera model with pixels starting from the uv axis.
2016-08-08 03:31:31 +02:00
mschoeneck
5f30a0a076
Merge pull request #6958 from mschoeneck:Common-Canny-parallelization
...
* Common Canny parallelization added. TBB and single thread code removed. Final pass vectorized with SSE2 intrinsics.
* wrong #ifdef replaced with #if
* Merged to actual Canny version
* Merged common parallelized Canny with actual Canny implementation
* Remove 'Mutex *mutex' and pass 'Mutex mutex' from outside to parallelCanny
* Replaced extern Mutex with intern mutable Mutex.
2016-08-05 17:20:56 +03:00
Tomoaki Teshima
2db2d137ce
follow the naming rule as other API
...
* stop using 'CUDA' prefix
* add explanation
2016-08-05 22:14:55 +09:00
Alexander Alekhin
b12286329f
imgproc: sepFilter: update OpenCL condition
...
Problem is observed with test_loop_times=100
in corner cases like 93x1 or similar
2016-08-05 12:27:24 +03:00
Alexander Alekhin
2812762d6b
imgproc: disable IPP for GaussianBlur in case of ROI
2016-08-05 12:27:18 +03:00
matze
37cccf17c0
imgproc: Prefer OCL calculation before IPP in GaussianBlur.
2016-08-05 12:27:16 +03:00
MYLS
1da8a19af3
fixed two bugs that I caused.
2016-08-05 16:15:03 +08:00
MYLS
86238d2748
make some changes according to the code review.
...
- use `std::string` instead of `new char`;
- reserve 1 MB for buffer;
2016-08-05 15:17:21 +08:00
David Wolever
b42288c2de
Cleaner fix for crash on double-stop of CvVideoCamera
2016-08-04 12:44:07 -04:00
Alexander Alekhin
18e7afdfd9
cmake: add OPENCV_ENABLE_NONFREE option and macro
2016-08-04 19:23:49 +03:00
Vadim Pisarevsky
d67e6f5cc9
Merge pull request #7029 from wolever:master
2016-08-04 13:34:55 +00:00
k-shinotsuka
065d631f0e
improve MomentsInTile_SIMD<uchar, int, int>()
2016-08-04 20:08:53 +09:00
Vadim Pisarevsky
d7ee62f03b
1. fix warning from Xcode 7.x
...
2. fixed parsing of "cat[range_spec]ord[range_spec]" type specification string when using ml::TrainData::loadFromCSV(). Thanks to A. Kaehler for reporting it
2016-08-04 12:52:10 +03:00
Alexander Alekhin
b2698f24b0
Merge pull request #7033 from tomoaki0705:brushUpFp16
2016-08-04 09:31:52 +00:00
Vadim Pisarevsky
7eee5cb724
Merge pull request #7026 from sovrasov:calib_points_number
2016-08-04 09:14:03 +00:00
Vadim Pisarevsky
b8d743bf50
Merge pull request #6970 from K-Shinotsuka:issue6
2016-08-03 18:50:00 +00:00
Vadim Pisarevsky
0a7e53da0a
Merge pull request #7010 from K-Shinotsuka:issue10
2016-08-03 18:44:02 +00:00
Vadim Pisarevsky
03d6c5e473
Merge pull request #7011 from K-Shinotsuka:issue11
2016-08-03 18:34:08 +00:00
k-shinotsuka
1a18a33688
improve SumSqr_SIMD<schar, int, int>()
2016-08-03 19:17:51 +09:00
Tomoaki Teshima
87ca607fd4
brush up convertFp16
...
* raise an error when wrong bit depth passed
* raise an build error when wrong depth is specified for cvtScaleHalf_
* remove unnecessary safe check in cvtScaleHalf_
* use intrinsic instead of direct pointer access
* update the explanation
2016-08-03 17:27:45 +09:00
Juan Pablo Aveggio
ba5f9d68c4
Update bagofwords.cpp
2016-08-02 20:53:05 -03:00
David Wolever
3d19de2b58
Fix crash on double-stop of CvVideoCamera
2016-08-02 17:52:02 -04:00
k-shinotsuka
0b4e06ad3c
improve SumSqr_SIMD<uchar, int, int>()
2016-08-02 23:46:03 +09:00
k-shinotsuka
5775ace5e0
improve thresh_8u()
2016-08-02 23:35:14 +09:00
Vadim Pisarevsky
fc742da6e3
Merge pull request #6959 from LeoBras:Better_StereoBM
2016-08-02 14:30:02 +00:00