Maksim Shabunin
b9ea59df35
Merge pull request #6995 from PkLab:i6746_naming_videoio_enums
2016-08-15 09:01:24 +00:00
Alexander Alekhin
658e4c3db6
Merge pull request #7104 from alalek:port_6106
2016-08-12 13:51:55 +00:00
Ilya Lavrenov
1b3f634843
fixed compilation warning
2016-08-12 14:23:15 +03:00
Alexander Alekhin
1fb1088b7d
Merge pull request #7102 from lupustr3:pvlasov/ipp_switch_fix
2016-08-12 10:39:44 +00:00
Pavel Vlasov
8bcec7d77f
IPP enabling fix and typo fix;
2016-08-12 10:11:47 +03:00
PkLab.net
3ea02018b5
Naming some enumerations in videoio
2016-08-11 20:27:42 +02:00
Alexander Alekhin
74e997f15b
Merge pull request #7062 from kurenai:return_if_camera_disconnected
2016-08-11 14:07:42 +00:00
Maksim Shabunin
cf30c582c6
Merge pull request #7057 from K-Shinotsuka:issue13
2016-08-11 11:46:33 +00:00
Maksim Shabunin
648bac2cc4
Merge pull request #7069 from StevenPuttemans:try_fix_cuda
2016-08-11 11:06:34 +00:00
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
Maksim Shabunin
8e06ae2762
Merge pull request #7078 from mshabunin:pr6862
2016-08-11 08:56:07 +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
Alexander Alekhin
923967403e
Merge pull request #7074 from sovrasov:interactive_calib_fix
2016-08-10 13:05:52 +03: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
ggargov
83b36bfd79
Added comments to clarify sample code
...
Program flow is not easily apparent so hopefully ANY comments in the code could help new users.
2016-08-09 18:08:58 +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
Vladislav Sovrasov
5590421a5d
Fix build interactive-calibration app
2016-08-09 15:29:57 +03:00
StevenPuttemans
a0ff9f69ef
fix inclusion of OpenCV header opencv.hpp
...
cudev (only for use in .cu files) & cudalegacy (only legacy code) not included
2016-08-09 13:45:10 +02: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
k-shinotsuka
e37c53d13e
improve RGB2YCrCb_i<uchar>()
2016-08-09 11:33:00 +09:00
Vadim Pisarevsky
c1d73e4fca
Merge pull request #7059 from berak:doc_python_drawkeypoints
2016-08-08 15:31:11 +00: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
Maksim Shabunin
ad974de165
Merge pull request #7066 from StevenPuttemans:fix_build_cuda_issues
2016-08-08 13:22:49 +00:00
kurenai
c61f4e8863
return false from VideoCapture::grabFrame when camera is disconneted
2016-08-08 20:41:56 +08:00
Alexander Alekhin
2833aeb310
Merge pull request #7060 from catree:add_camera_model_doc
2016-08-08 11:49:41 +00:00
Alexander Alekhin
9c90b6271c
Merge pull request #7040 from sovrasov:calib_tutorial_code_update
2016-08-08 11:38:20 +00:00
StevenPuttemans
2ad411f914
fixing issues
2016-08-08 12:12:35 +02:00
Vladislav Sovrasov
46c8b09453
Improvements in camera_calibration tutorial code
2016-08-08 12:07:04 +03:00
berak
d2a1994d71
python docs: fix missing output image in cv2.drawKeypoint examples
2016-08-08 08:14:26 +02: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
