Commit Graph

24058 Commits

Author SHA1 Message Date
Alexander Alekhin
6f24b81079 Merge pull request #11490 from shengyu7697:tab_to_space 2018-05-10 14:41:07 +00:00
Alexander Alekhin
d2bc7b5a95 Merge pull request #11489 from alalek:fix_arm_build 2018-05-10 14:37:51 +00:00
Alexander Alekhin
9dc2005251 Merge pull request #11476 from tomoaki0705:fixCudaSampleBuildError 2018-05-09 20:48:33 +00:00
Namgoo Lee
ed86bd34b1 Merge pull request #11483 from nglee:dev_cudaCannyStreamIssue
cuda_canny : multi stream safety (#11483)

* CUDA_ImgProc/Canny Asynchronous test

* cuda_canny : multi stream safety (1/3)

- Convert global variable canny::counter to class local variable

* cuda_canny : multi stream safety (2/3)

- Use texture objects rather than texture reference for cc >= 3.0,
  since texture reference must be declared as a static global variable
  which results in race condition when ran concurrently

* cuda_canny : multi stream safety (3/3)

- Refrain from using global variable in row_filter and column_filter
  (converts column_filter::c_kernel and row_filter::c_kernel to local
  variables)

* Fixes #11193
2018-05-09 23:44:34 +03:00
Alexander Alekhin
352510cc19 core: fix ARM intrinsincs
'0' is specific case (make no sence as a standalone operation),
but it can be useful in template-based programming.

reverts commit: a58c9d4d63
2018-05-09 23:31:02 +03:00
Alexander Alekhin
959a12cbac Merge pull request #11478 from cabelo:select-device-dnn 2018-05-09 15:04:16 +00:00
cabelo
1b3e0783f4 select the device (video capture) 2018-05-09 17:20:02 +03:00
shengyu
70455a959d tab to space 2018-05-09 21:15:51 +08:00
Alexander Alekhin
2025650d50 Merge pull request #11481 from dapicard:11480-allow_to_force_video_codec_ffmpeg 2018-05-09 10:36:48 +00:00
Tomoaki Teshima
f7ea6b12ea cuda: fix build error of sample 2018-05-09 00:23:49 +09:00
Damien Picard
ba000bf8ea Fixes 11480 : allow to force the video codec used to read videos
with the ffmpeg backend
2018-05-08 15:02:01 +02:00
Maksim Shabunin
107b3f328b Merge pull request #11474 from tomoaki0705:fixNeonRotateLeft 2018-05-08 10:21:17 +00:00
Tomoaki Teshima
a58c9d4d63 arm: fix build error of v_rotate_left
* remove meaningless tests
2018-05-08 00:35:18 +09:00
Alexander Alekhin
8a767689cf Merge pull request #11470 from seiko2plus:VSXImprovements_2 2018-05-06 19:14:05 +00:00
Alexander Alekhin
60e5e213fd Merge pull request #11454 from seiko2plus:issue11433_samples 2018-05-05 18:57:49 +00:00
Alexander Alekhin
527696ddf0 Merge pull request #11327 from cdcseacave:master 2018-05-05 18:56:27 +00:00
Alexander Alekhin
4fd17f8b54 Merge pull request #11463 from abhi-jha:master 2018-05-05 16:14:35 +00:00
Sayed Adel
115b10ed32 photo:ppc fix MergeRobertson test 2018-05-05 09:38:55 +00:00
cDc
f2fbfd7a10 fix bug in Matx::inv() 2018-05-05 10:30:58 +03:00
abhi-jha
a31aff452a fix spelling error 2018-05-05 10:08:16 +03:00
Sayed Adel
ed19da21ab core:ppc Several improvements on VSX(2)
* add v_float64x2 support to v_rotate_*
* treat float vector in v_check_any, vec_any_lt as int vector
* add test case for v_rotate_left
2018-05-04 23:09:38 +00:00
Dmitry Kurtaev
777d77848c Free Convolution and MatMul weights after TensorFlow layers import 2018-05-04 11:20:14 +03:00
Dmitry Kurtaev
9ffe4694db Reduce memory consumption at Caffe importer 2018-05-04 09:24:13 +03:00
Dmitry Kurtaev
d381948cee Update script to generate MobileNet-SSD V2 text graph 2018-05-04 07:55:18 +03:00
Sayed Adel
e00a58a05f samples: add C++11 override to virtual methods 2018-05-03 20:12:24 +00:00
k-shinotsuka
ecb4ea8f76 add universal intrinsics for RGB2HSV_f 2018-05-04 00:58:46 +09:00
k-shinotsuka
a5f68e98f4 add universal intrinsics for HLS2RGB_f 2018-05-03 23:50:38 +09:00
Alexander Alekhin
9fa01a7b70 Merge pull request #11436 from seiko2plus:issue11433 2018-05-03 10:37:40 +00:00
zuoshaobo
4ff6a1bc7b Merge pull request #11425 from zuoshaobo:relu_negative_slope
* FIX INF_ENGINE RELU ERROR

* set slope to variable

* tab in indentwq
2018-05-03 13:36:49 +03:00
cclauss
8a79b167b8 Define execfile, file, long, raw_input, xrange for Python 3 2018-05-03 09:19:05 +02:00
cclauss
de99f53e94 Don't forget self in table_formatter.py
__ridx__ is an _undefined name_ in this context but __self.ridx__ is used three other times in this method and nine times in this class.  Undefined names may raise [NameError](https://docs.python.org/3/library/exceptions.html#NameError) at runtime.

flake8 testing of https://github.com/opencv/opencv

$ __flake8 . --count --select=E901,E999,F821,F822,F823 --show-source --statistics__
```
./modules/ts/misc/table_formatter.py:50:23: F821 undefined name 'ridx'
            self.rows[ridx + 1].props = properties
                      ^
```
2018-05-03 08:24:24 +02:00
cclauss
d4a966c7c4 Fix Python string formatting 2018-05-03 07:47:34 +02:00
cclauss
05c1a3d160 print() is a function in Python 3 2018-05-03 07:12:12 +02:00
Sayed Adel
788d6a7105 cmake: Disable -Wsuggest-override option in case of using PCH #11433 2018-05-02 09:12:55 +00:00
Alexander Alekhin
684cf43360 Merge pull request #11420 from alalek:git_tag_describe 2018-04-28 15:00:44 +00:00
Alexander Alekhin
083b08742d Merge pull request #11406 from alalek:core_matsize_dims 2018-04-28 14:38:42 +00:00
Alexander Alekhin
80934dc488 cmake: update 'git describe' information 2018-04-28 17:17:31 +03:00
Alexander Alekhin
c67613e0fe Merge pull request #11419 from alalek:msvs2017_build_warning 2018-04-28 13:23:32 +00:00
Alexander Alekhin
65b0b319eb eliminate MSVS2017 build warning
modules\dnn\src\layers\prior_box_layer.cpp(208): warning C4834: discarding return value of function with 'nodiscard' attribute
2018-04-28 15:14:41 +03:00
yuki takehara
4934f7c5a4 Merge pull request #11285 from take1014:core_6125
* Resolves 6125

* Fix test code

* Delete unnecessary code
2018-04-28 14:14:10 +03:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera 2018-04-27 19:34:29 +03:00
Alexander Alekhin
7e43a0c2b7 Merge pull request #11394 from dkurt:dnn_custom_layers_py 2018-04-27 15:19:46 +00:00
Alexander Alekhin
8c349ff8ff core: added MatSize::dims() method
to avoid accessing of 'p[-1]' (static code analysers dislike this)
2018-04-27 16:57:29 +03:00
Alexander Alekhin
8d7ccd29fe Merge pull request #11401 from exoson:livestitch 2018-04-27 13:47:42 +00:00
Tomoaki Teshima
87a4f4ab3a Merge pull request #11409 from tomoaki0705/fixCLAHEfailure
Arm: fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4 (#11409)

* fix the test failure of OCL_Imgproc/CLAHETest.Accuracy on ODROID-XU4
  * avoid the race condition in the reduce

* imgproc(ocl): simplify CLAHE code

* remove unused class
2018-04-27 16:41:56 +03:00
Alexander Alekhin
71d406b40c Merge tag '3.4.1-cvsdk' into 3.4
OpenCV 3.4.1 for Intel Computer Vision SDK
2018-04-27 14:52:21 +03:00
Alexander Alekhin
e785afd356 Merge pull request #11410 from alalek:ipp_norm_L1_16UC3_mask_AVX512 2018-04-27 10:57:37 +00:00
Alexander Alekhin
856a07711b core: disabled IPP AVX512 normL1(a, b, mask)
for cv::Mat with type=16UC3 and width < 16
2018-04-27 12:57:53 +03:00
exoson
058299cc66 Optimize MultiBandBlender to run faster 2018-04-27 10:48:13 +03:00
Alexander Alekhin
1031dfe4e8 Merge pull request #11402 from alalek:build_warnings 2018-04-26 19:04:37 +00:00