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
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
Vadim Pisarevsky
35d0a45df6
Merge pull request #7020 from StevenPuttemans:add_scale_option
2016-08-04 13:37:29 +00:00
Vadim Pisarevsky
d67e6f5cc9
Merge pull request #7029 from wolever:master
2016-08-04 13:34:55 +00:00
Maksim Shabunin
1ae9a5d1d8
Merge pull request #7038 from StevenPuttemans:fix_module_including
2016-08-04 13:23:41 +00:00
Vadim Pisarevsky
29afb83f24
Merge pull request #7039 from vpisarev:2_small_fixes
2016-08-04 12:13:35 +00: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
StevenPuttemans
e42750c63c
fix including of correct header files #7027
2016-08-04 11:32:33 +02: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
Alexander Alekhin
6a69852df1
Merge pull request #7030 from jpaveggio:patch-1
2016-08-03 10:20:23 +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
Jeff McBride
562c15cbe9
Don't assume all images have the same number of calibration points
...
Cast to (int) to avoid warnings
Add test for different points number case in fisheye calibration function
2016-08-02 17:21:17 +03:00
StevenPuttemans
d8698fc359
allow for screen size related resizing
2016-08-02 10:44:01 +02:00
Alexander Alekhin
da2810918c
Merge pull request #6991 from tomoaki0705:featureGpuMatFp16
2016-08-02 08:39:25 +00:00
Alexander Alekhin
4f7b3e8a56
Merge pull request #7018 from catree:add_camera_model_doc
2016-08-01 13:27:34 +00:00
catree
6e931aaab7
Add pinhole camera model illustration in calib3d documentation.
2016-08-01 02:25:45 +02:00
Tomoaki Teshima
2974b049e7
cudev: add feature to convert FP32(float) from/to FP16(half) on GPU
...
* add feature of Fp16 on GPU (cudev)
* add test
* leave template function as unimplemented to raise error
2016-08-01 00:55:16 +09:00
Alexander Alekhin
f2e9588c93
Merge pull request #6999 from tomoaki0705:featureCmakeFp16
2016-07-29 10:35:54 +00:00
Tomoaki Teshima
c57f8780e9
show CPU feature correctly when FP16 is available
...
* make sure that CV_FP16 has the correct meaning
* check FP16 feature correctly
2016-07-29 14:10:33 +09:00
Vadim Pisarevsky
3b1803f6b1
Merge pull request #6989 from mself:gftt-deterministic-sort
2016-07-28 15:27:39 +00:00
Vadim Pisarevsky
f96b5652ce
Merge pull request #6984 from K-Shinotsuka:issue9
2016-07-28 12:05:13 +00:00
Vadim Pisarevsky
b721269c29
Merge pull request #6996 from juliendehos:merge_debevec
2016-07-28 11:51:12 +00:00
Vadim Pisarevsky
8124b5600f
Merge pull request #7007 from tomoaki0705:fixDocTypo
2016-07-28 11:42:07 +00:00
Vadim Pisarevsky
f9e02aa612
Merge pull request #6986 from Wing0:master
2016-07-28 11:35:07 +00:00
Tomoaki Teshima
bae8b2a9b0
doc: fix typo and grammar
2016-07-28 18:35:16 +09:00
Alexander Alekhin
8cdd91cd23
Merge pull request #7006 from derlunz:fix-qtopengl-build
2016-07-27 20:10:38 +00:00
Alexander Alekhin
6cff909bc8
Merge pull request #7004 from StevenPuttemans:cmd_parser_opencv_annotation
2016-07-27 18:24:17 +00:00
Alexander Alekhin
328da251ed
Merge pull request #7000 from StevenPuttemans:fix_master_build
2016-07-27 18:17:37 +00:00
Alexander Alekhin
085ea5049b
Merge pull request #7002 from StevenPuttemans:add_extra_limits_to_help
2016-07-27 18:16:37 +00:00
Christian Kapeller
81e6ef2958
highgui: window QT+OpenGL mouse wheel support, another build fix
...
amends work done in pull request #6976 .
2016-07-27 16:14:57 +02:00
StevenPuttemans
e0f19ec48a
change parameter input to the CommandLineParser interface
2016-07-27 14:02:28 +02:00
k-shinotsuka
ecfd4ad11e
improve MomentsInTile_SIMD<ushort, int, int>()
2016-07-27 20:27:30 +09:00
StevenPuttemans
6df12a0507
add limits of tool to help message
2016-07-27 11:42:22 +02:00
StevenPuttemans
64dbf6c987
fix build #6993
2016-07-27 11:21:08 +02:00
Your Name
718891d937
Tabs -> Whitespaces.
2016-07-26 23:46:58 -03:00
Your Name
c6f790ce12
Fixed using local variable instead of global var.
...
- Still need to change SSE_2
2016-07-26 23:29:05 -03:00
Alexander Alekhin
9ad0dcb57f
Merge pull request #6987 from tomoaki0705:fixTypoCalib3d
2016-07-26 20:15:45 +00:00
Julien Dehos
e072fa8121
fix a bug in MergeDebevec (modify input times)
2016-07-26 18:01:36 +02:00
Matthew Self
72672c293f
Make goodFeaturesToTrack() return deterministic results
...
When using OCL, the results of goodFeaturesToTrack() vary slightly from
run to run. This appears to be because the order of the results from
the findCorners kernel depends on thread execution and the sorting
function that is used at the end to rank the features only enforces are
partial sort order.
This does not materially impact the quality of the results, but it
makes it hard to build regression tests and generally introduces noise
into the system that should be avoided.
An easy fix is to change the sort function to enforce a total sort on
the features, even in cases where the match quality is exactly the same
for two features.
2016-07-25 21:17:54 -07:00
Tomoaki Teshima
ce66de8e3d
calib3d: fix typo
2016-07-26 12:56:10 +09:00