Alexander Alekhin [Tue, 22 May 2018 16:02:01 +0000 (19:02 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 22 May 2018 16:00:37 +0000 (16:00 +0000)]
Merge pull request #11565 from alalek:issue_11545
Alexander Alekhin [Tue, 22 May 2018 15:58:51 +0000 (15:58 +0000)]
Merge pull request #11564 from alalek:ts_run_py_passthrough_test_args
Alexander Enaldiev [Tue, 22 May 2018 15:10:15 +0000 (18:10 +0300)]
Merge pull request #11417 from Turim:imgcodecs_cmake_decoders_customize_formats
* imgcodecs cmake: the option to customize supported formats list (WITH_IMGCODEC_HDR, WITH_IMGCODEC_SUNRASTER, WITH_IMGCODEC_PXM)
* imgcodecs: fixes
- fixed CMake scripts (=OFF doesn't really work)
- restore dropped GDCM block
- added _IMGCODEC_ prefix
- fixed tests
- include PAM format under WITH_IMGCODEC_PXM option
Alexander Alekhin [Tue, 22 May 2018 14:19:13 +0000 (14:19 +0000)]
Merge pull request #11558 from alalek:issue_11552
Alexander Alekhin [Tue, 22 May 2018 14:12:32 +0000 (14:12 +0000)]
Merge pull request #11566 from mshabunin:allow-ie-force
Alexander Alekhin [Tue, 22 May 2018 13:05:23 +0000 (13:05 +0000)]
Merge pull request #11563 from alalek:dnn_text_test_threshold
Alexander Alekhin [Tue, 22 May 2018 12:26:34 +0000 (12:26 +0000)]
Merge pull request #11543 from catree:add_tutorial_imgproc_java_python
Maksim Shabunin [Tue, 22 May 2018 12:18:18 +0000 (15:18 +0300)]
dnn: support later IE versions
Maksim Shabunin [Tue, 22 May 2018 11:40:03 +0000 (14:40 +0300)]
dnn: allow setting IE paths via command line
Alexander Alekhin [Tue, 22 May 2018 10:56:17 +0000 (13:56 +0300)]
imgcodecs: fix imwrite handling of different OutputArray types
Alexander Alekhin [Tue, 22 May 2018 10:55:14 +0000 (13:55 +0300)]
imgcodecs: added test for imwrite parameter types
issue 11545
Alexander Alekhin [Tue, 22 May 2018 10:40:09 +0000 (13:40 +0300)]
ts: run.py passthrough --test_* args "as is"
to allow pass `--test_bigdata` via run.py
Alexander Alekhin [Tue, 22 May 2018 10:29:31 +0000 (13:29 +0300)]
dnn(text): update check threshols
- make green Linux debug/Linux32/Win32 builders
Alexander Alekhin [Mon, 21 May 2018 15:59:46 +0000 (15:59 +0000)]
Merge pull request #11532 from paroj:realsense
Alexander Alekhin [Mon, 21 May 2018 14:54:11 +0000 (17:54 +0300)]
cmake: filter NVCC compiler flags (Wimplicit-fallthrough, OPENCV_CUDA_NVCC_FILTEROUT_OPTIONS)
issue 11552
Alexander Alekhin [Mon, 21 May 2018 13:20:14 +0000 (16:20 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 21 May 2018 13:02:29 +0000 (13:02 +0000)]
Merge pull request #11390 from dkurt:east_text_detection
Alexander Alekhin [Mon, 21 May 2018 10:35:36 +0000 (10:35 +0000)]
Merge pull request #11555 from alalek:fix_videocapture_frame_lifetime
Alexander Alekhin [Mon, 21 May 2018 09:07:02 +0000 (12:07 +0300)]
videoio: fix lifetime management of data of input frames
Alexander Alekhin [Mon, 21 May 2018 09:21:06 +0000 (09:21 +0000)]
Merge pull request #11536 from catree:add_tutorial_highgui_trackbar_python_java
Alexander Alekhin [Mon, 21 May 2018 08:03:52 +0000 (08:03 +0000)]
Merge pull request #11541 from lupustr3:pvlasov/icv_package_hotfix
Alexander Alekhin [Sun, 20 May 2018 20:59:33 +0000 (20:59 +0000)]
Merge pull request #11550 from tomoaki0705:fixCudaAsync
Alexander Alekhin [Sun, 20 May 2018 20:58:51 +0000 (20:58 +0000)]
Merge pull request #11546 from shengyu7697:tab_to_space
Tomoaki Teshima [Sun, 20 May 2018 10:38:02 +0000 (19:38 +0900)]
fix the test failure of CUDA_Arithm/MeanStdDev
shengyu [Sat, 19 May 2018 03:06:54 +0000 (11:06 +0800)]
fix wrong indentation on github page (tab to space)
catree [Fri, 18 May 2018 17:51:34 +0000 (19:51 +0200)]
Add Java and Python code for the following imgproc tutorials: Canny, Remap, threshold and threshold inRange. Use HSV colorspace instead of RGB for inRange threshold tutorial.
Dmitry Kurtaev [Mon, 30 Apr 2018 18:51:33 +0000 (21:51 +0300)]
Return a convex hull from rotatedRectangleIntersection
Alexander Alekhin [Fri, 18 May 2018 10:59:27 +0000 (10:59 +0000)]
Merge pull request #11531 from alalek:issue_11518
Alexander Alekhin [Fri, 18 May 2018 10:50:32 +0000 (10:50 +0000)]
Merge pull request #11537 from alalek:build_warnings
Pavel Vlasov [Fri, 18 May 2018 09:08:22 +0000 (12:08 +0300)]
Hotfix packages with several fixes in IW code including:
__STDCALL macro change to support IPP 2018u3+ external packages
Memory leak fix in Gaussian filter
Improved checkers for OpenMP supported features
Improved declarations for atomic operations.
ICV binary and package version are the same.
catree [Thu, 17 May 2018 12:19:08 +0000 (14:19 +0200)]
Add Java and Python code for trackbar tutorial.
Alexander Alekhin [Thu, 17 May 2018 15:29:04 +0000 (18:29 +0300)]
fix build warnings
Alexander Alekhin [Thu, 17 May 2018 15:28:58 +0000 (15:28 +0000)]
Merge pull request #11520 from terfendail:ffmpeg_icapture
Alexander Alekhin [Thu, 17 May 2018 14:53:19 +0000 (14:53 +0000)]
Merge pull request #11523 from alalek:bigdata_tests
Alexander Alekhin [Thu, 17 May 2018 12:30:11 +0000 (15:30 +0300)]
photo: initialize cos() table with double type
This avoids MSVC 19.14.26428.1 to call vectorized __vdecl_cosf4() function with less precision.
Pavel Rojtberg [Wed, 16 May 2018 14:27:25 +0000 (16:27 +0200)]
videoio: add rudimentary librealsense 1.x support
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
Alexander Alekhin [Wed, 16 May 2018 19:40:02 +0000 (19:40 +0000)]
Merge pull request #11529 from catree:add_tutorial_morphology_python_java
Alexander Alekhin [Wed, 16 May 2018 18:40:12 +0000 (18:40 +0000)]
Merge pull request #11397 from pengli:dnn_half
Alexander Alekhin [Wed, 16 May 2018 15:40:51 +0000 (15:40 +0000)]
Merge pull request #11516 from berak:java_features2d
Alexander Alekhin [Wed, 16 May 2018 14:58:16 +0000 (17:58 +0300)]
photo(test): update test checks
- allow 5% of changed pixels with intensity difference <= 1
Li Peng [Sat, 28 Apr 2018 15:50:37 +0000 (23:50 +0800)]
add fp16 accuracy and perf test
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 26 Apr 2018 11:36:19 +0000 (19:36 +0800)]
fp16 ocl support for more layers
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 26 Apr 2018 11:22:29 +0000 (19:22 +0800)]
fp16 ocl support for googlenet
Signed-off-by: Li Peng <peng.li@intel.com>
Li Peng [Thu, 26 Apr 2018 11:20:16 +0000 (19:20 +0800)]
dnn fp16 support
Signed-off-by: Li Peng <peng.li@intel.com>
Vitaly Tuzov [Tue, 15 May 2018 12:12:49 +0000 (15:12 +0300)]
FFMPEG-based VideoCapture and VideoWriter backend changed to C++ interface
berak [Mon, 14 May 2018 13:12:29 +0000 (15:12 +0200)]
features2d: remove deprecated java wrappers
Alexander Alekhin [Wed, 16 May 2018 14:11:36 +0000 (14:11 +0000)]
Merge pull request #11494 from tomoaki0705:fixOpenCLDnn
catree [Wed, 16 May 2018 12:05:39 +0000 (14:05 +0200)]
Add Java and Python code for morphology tutorials.
Alexander Alekhin [Wed, 16 May 2018 12:15:38 +0000 (12:15 +0000)]
Merge pull request #11528 from tomoaki0705:fixTabSpaceLibTiff
Alexander Alekhin [Wed, 16 May 2018 12:14:11 +0000 (12:14 +0000)]
Merge pull request #11525 from alalek:issue_11511
Tomoaki Teshima [Wed, 16 May 2018 10:23:19 +0000 (19:23 +0900)]
work around of the test failure of opencv_test_dnn
* let OpenCL kernel run only on Intel GPU
* brush up the workaround based on 9a2b028 from alalek
Tomoaki Teshima [Wed, 16 May 2018 09:56:23 +0000 (18:56 +0900)]
remove Tab
Alexander Alekhin [Wed, 16 May 2018 09:29:26 +0000 (09:29 +0000)]
Merge pull request #11526 from nglee:dev_cudaMeanStdDevFix
Namgoo Lee [Tue, 15 May 2018 18:31:47 +0000 (03:31 +0900)]
cuda_meanStdDev : bug fix
Alexander Alekhin [Tue, 15 May 2018 16:54:24 +0000 (16:54 +0000)]
Merge pull request #11519 from paroj:openni_color
Alexander Alekhin [Tue, 15 May 2018 15:38:22 +0000 (18:38 +0300)]
cuda: avoid unnecessary cudaStreamSynchronize() call
resolves #11511
Alexander Alekhin [Tue, 15 May 2018 12:56:26 +0000 (15:56 +0300)]
tests: add "bigdata" tests
Alexander Alekhin [Tue, 15 May 2018 11:35:55 +0000 (14:35 +0300)]
ts: add BigData tests category (skipped by default)
Pass --test_bigdata to allow launching of "BigData" tests.
Pavel Rojtberg [Tue, 15 May 2018 09:29:51 +0000 (11:29 +0200)]
samples: openni_capture - use COLORMAP_JET for depth visualization
instead of an ad-hoc implementation of it
Alexander Alekhin [Mon, 14 May 2018 16:14:10 +0000 (16:14 +0000)]
Merge pull request #11482 from allnes:gst_remove_container
Alexander Nesterov [Tue, 8 May 2018 20:41:05 +0000 (23:41 +0300)]
Remove command line argument related to container
Vadim Pisarevsky [Mon, 14 May 2018 12:29:14 +0000 (15:29 +0300)]
handle huge matrices correctly (#11505)
* make sure that the matrix with more than INT_MAX elements is marked as non-continuous, and thus all the pixel-wise functions process it correctly (i.e. row-by-row, not as a single row, where integer overflow may occur when computing the total number of elements)
Alexander Alekhin [Mon, 14 May 2018 12:17:35 +0000 (15:17 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 14 May 2018 12:17:10 +0000 (12:17 +0000)]
Merge pull request #11497 from alalek:libjpeg-turbo
Alexander Alekhin [Sun, 13 May 2018 17:36:13 +0000 (17:36 +0000)]
Merge pull request #11506 from catree:tutorial_euler_angles_doc
Alexander Alekhin [Sat, 12 May 2018 08:58:08 +0000 (08:58 +0000)]
Merge pull request #11504 from alalek:check_flake8
catree [Fri, 11 May 2018 23:11:13 +0000 (01:11 +0200)]
Clarify the Euler angles convention chosen. Replace rotation inverse with matrix transpose.
Alexander Alekhin [Thu, 10 May 2018 14:02:24 +0000 (17:02 +0300)]
3rdparty: integrate libjpeg-turbo build scripts into OpenCV
Alexander Alekhin [Thu, 10 May 2018 12:50:35 +0000 (15:50 +0300)]
3rdparty: added libjpeg-turbo source code (1.5.3)
Repo: https://github.com/libjpeg-turbo/libjpeg-turbo.git
Tag: 1.5.3
excluded libjpeg-turbo files:
- bmp.c
- bmp.h
- cderror.h
- cdjpeg.c
- cdjpeg.h
- cjpeg.c
- djpeg.c
- example.c
- jcstest.c
- jdatadst-tj.c
- jdatasrc-tj.c
- jpegtran.c
- rdbmp.c
- rdcolmap.c
- rdgif.c
- rdjpgcom.c
- rdppm.c
- rdrle.c
- rdswitch.c
- rdtarga.c
- tjbench.c
- tjunittest.c
- tjutil.c
- tjutil.h
- transupp.c
- transupp.h
- turbojpeg-jni.c
- turbojpeg.c
- turbojpeg.h
- wrbmp.c
- wrgif.c
- wrjpgcom.c
- wrppm.c
- wrrle.c
- wrtarga.c
Alexander Alekhin [Fri, 11 May 2018 11:32:19 +0000 (14:32 +0300)]
eliminate 'git diff ---check' false alarms for Markdown files
Alexander Alekhin [Fri, 11 May 2018 10:52:15 +0000 (13:52 +0300)]
cmake: added check_flake8 target
Alexander Alekhin [Fri, 11 May 2018 10:29:28 +0000 (13:29 +0300)]
python: better Python 3 support
Alexander Alekhin [Fri, 11 May 2018 13:28:52 +0000 (13:28 +0000)]
Merge pull request #11445 from cclauss:file-long-raw_input-xrange
Alexander Alekhin [Fri, 11 May 2018 13:28:27 +0000 (13:28 +0000)]
Merge pull request #11444 from cclauss:patch-2
Alexander Alekhin [Fri, 11 May 2018 13:26:41 +0000 (13:26 +0000)]
Merge pull request #11443 from cclauss:fix-Python-string-format
Alexander Alekhin [Fri, 11 May 2018 13:26:04 +0000 (13:26 +0000)]
Merge pull request #11442 from cclauss:print-function
Dmitry Kurtaev [Tue, 24 Apr 2018 15:25:43 +0000 (18:25 +0300)]
EAST: An Efficient and Accurate Scene Text Detector (https://arxiv.org/abs/1704.03155v2)
Alexander Alekhin [Fri, 11 May 2018 11:47:13 +0000 (11:47 +0000)]
Merge pull request #11502 from berak:fix_knearest
berak [Fri, 11 May 2018 09:47:02 +0000 (11:47 +0200)]
ml: fix caching of internal state when changing the impl in KNearest
Alexander Alekhin [Fri, 11 May 2018 09:48:05 +0000 (09:48 +0000)]
Merge pull request #11459 from dkurt:dnn_mobilenet_v2
Alexander Alekhin [Fri, 11 May 2018 09:47:03 +0000 (09:47 +0000)]
Merge pull request #11461 from dkurt:dnn_reduce_mem_consumption
Alexander Alekhin [Fri, 11 May 2018 06:47:15 +0000 (06:47 +0000)]
Merge pull request #11498 from matech96:camshift_publication_date
matech96 [Thu, 10 May 2018 20:07:50 +0000 (22:07 +0200)]
Update py_meanshift.markdown
Fix publication date of "Computer Vision Face Tracking for Use in a Perceptual User Interface" from 1988 to 1998.
Dmitry Kurtaev [Fri, 4 May 2018 09:09:06 +0000 (12:09 +0300)]
Fuse multipliers but not convolution layers weights
Alexander Alekhin [Thu, 10 May 2018 15:19:56 +0000 (18:19 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Pisarevsky [Thu, 10 May 2018 15:15:04 +0000 (15:15 +0000)]
Merge pull request #11418 from K-Shinotsuka:issue42
Vadim Pisarevsky [Thu, 10 May 2018 15:14:39 +0000 (15:14 +0000)]
Merge pull request #11430 from K-Shinotsuka:issue43
Alexander Alekhin [Thu, 10 May 2018 14:41:07 +0000 (14:41 +0000)]
Merge pull request #11490 from shengyu7697:tab_to_space
Alexander Alekhin [Thu, 10 May 2018 14:37:51 +0000 (14:37 +0000)]
Merge pull request #11489 from alalek:fix_arm_build
Alexander Alekhin [Wed, 9 May 2018 20:48:33 +0000 (20:48 +0000)]
Merge pull request #11476 from tomoaki0705:fixCudaSampleBuildError
Namgoo Lee [Wed, 9 May 2018 20:44:34 +0000 (05:44 +0900)]
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
Alexander Alekhin [Sun, 6 May 2018 23:54:10 +0000 (02:54 +0300)]
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:
a58c9d4d630926ed81beda1a8f7f8ec52165949e
Alexander Alekhin [Wed, 9 May 2018 15:04:16 +0000 (15:04 +0000)]
Merge pull request #11478 from cabelo:select-device-dnn
cabelo [Tue, 8 May 2018 04:07:23 +0000 (01:07 -0300)]
select the device (video capture)
shengyu [Wed, 9 May 2018 13:15:51 +0000 (21:15 +0800)]
tab to space
Alexander Alekhin [Wed, 9 May 2018 10:36:48 +0000 (10:36 +0000)]
Merge pull request #11481 from dapicard:11480-allow_to_force_video_codec_ffmpeg
Tomoaki Teshima [Tue, 8 May 2018 15:23:49 +0000 (00:23 +0900)]
cuda: fix build error of sample
Damien Picard [Tue, 8 May 2018 13:02:01 +0000 (15:02 +0200)]
Fixes 11480 : allow to force the video codec used to read videos
with the ffmpeg backend
Maksim Shabunin [Tue, 8 May 2018 10:21:17 +0000 (10:21 +0000)]
Merge pull request #11474 from tomoaki0705:fixNeonRotateLeft