Lubov Batanina [Fri, 9 Aug 2019 16:51:42 +0000 (19:51 +0300)]
Merge pull request #15203 from l-bat:determine_inp_shape
* Determine input shapes
* Add test
* Remove getInputShapes
* Fix model
* Fix constructors
* Add Caffe test
* Fix predict
Alexander Alekhin [Fri, 9 Aug 2019 15:24:00 +0000 (15:24 +0000)]
Merge pull request #15198 from AsyaPronina:bump_to_new_ade_release
Alexander Alekhin [Thu, 8 Aug 2019 19:34:33 +0000 (19:34 +0000)]
Merge pull request #15262 from alalek:fix_15252
Alexander Alekhin [Thu, 8 Aug 2019 13:54:35 +0000 (13:54 +0000)]
Merge pull request #15256 from dkurt:dnn_model_warps
Alexander Alekhin [Thu, 8 Aug 2019 13:13:25 +0000 (16:13 +0300)]
gapi: fix build with MSVS2017/2019
AsyaPronina [Wed, 7 Aug 2019 18:35:28 +0000 (21:35 +0300)]
Bump to new ADE release v0.1.1f
Dmitry Kurtaev [Wed, 7 Aug 2019 11:51:41 +0000 (14:51 +0300)]
Add preprocessing warps for separate parameters
Alexander Alekhin [Mon, 5 Aug 2019 18:11:43 +0000 (18:11 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 5 Aug 2019 18:08:48 +0000 (18:08 +0000)]
Merge pull request #15239 from alalek:videoio_skip_msmf_tests2
Alexander Alekhin [Mon, 5 Aug 2019 16:13:17 +0000 (19:13 +0300)]
videoio(test): skip unstable MSMF tests (2)
Alexander Alekhin [Mon, 5 Aug 2019 15:09:22 +0000 (15:09 +0000)]
Merge pull request #15234 from alalek:backport
Alexander Alekhin [Mon, 5 Aug 2019 15:08:41 +0000 (15:08 +0000)]
Merge pull request #15233 from alalek:videoio_skip_msmf_tests
Alexander Alekhin [Mon, 5 Aug 2019 15:07:40 +0000 (15:07 +0000)]
Merge pull request #15228 from flyseaworld:exif/read_num_dir
Dmitry Matveev [Mon, 5 Aug 2019 14:56:34 +0000 (17:56 +0300)]
Merge pull request #15090 from dmatveev:dm/ng-0001-g-api-inference-api
* G-API-NG/API: Introduced inference API and IE-based backend
- Very quick-n-dirty implementation
- OpenCV's own DNN module is not used
- No tests so far
* G-API-NG/IE: Refined IE backend, added more tests
* G-API-NG/IE: Fixed various CI warnings & build issues + tests
- Added tests on multi-dimensional own::Mat
- Added tests on GMatDesc with dimensions
- Documentation on infer.hpp
- Fixed more warnings + added a ROI list test
- Fix descr_of clash for vector<Mat> & standalone mode
- Fix build issue with gcc-4.8x
- Addressed review comments
* G-API-NG/IE: Addressed review comments
- Pass `false` to findDataFile()
- Add deprecation warning suppression macros for IE
Sebastián Gurin [Mon, 5 Aug 2019 12:41:59 +0000 (09:41 -0300)]
OpenCV.js docker container build instructions
backport of commit:
59b0314a0ef49d407f78742fc44fdc19bd20bf0e
Victor Romero [Sat, 3 Aug 2019 19:53:38 +0000 (12:53 -0700)]
TheGoddessInari [Sun, 28 Jul 2019 17:21:15 +0000 (10:21 -0700)]
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
This fixes a compiler error on MSVC with Unreal Engine (at least).
backport of commit:
4e998c9adeb8ec874d29a0ed5d450da3a9bdd0e8
John Smith [Fri, 19 Jul 2019 12:07:09 +0000 (14:07 +0200)]
Fix cv::selectROI rectangle rendering issue
backport of commit:
95c65aff75f62407ca1e99bbfa18e2d54322aab5
Alexander Alekhin [Mon, 5 Aug 2019 13:57:04 +0000 (16:57 +0300)]
videoio(test): skip unstable MSMF tests
yaohai [姚海] [Mon, 5 Aug 2019 09:11:46 +0000 (17:11 +0800)]
fix exif bug
Alexander Alekhin [Mon, 5 Aug 2019 12:44:00 +0000 (12:44 +0000)]
Merge pull request #15227 from tomoaki0705:fixFallThroughCarotene
Alexander Alekhin [Mon, 5 Aug 2019 12:43:13 +0000 (12:43 +0000)]
Merge pull request #15222 from hmaarrfk:verify_carbon
Sebastián Gurin [Mon, 5 Aug 2019 12:41:59 +0000 (09:41 -0300)]
Merge pull request #15221 from cancerberoSgx:master
OpenCv.js docker container build instructions (#15221)
* emscripten docker container
* docker
* typo
* typo
* whitespace issue
Tomoaki Teshima [Mon, 5 Aug 2019 08:42:48 +0000 (17:42 +0900)]
fix fall through warning
Mark Harfouche [Sun, 4 Aug 2019 22:24:33 +0000 (18:24 -0400)]
Verify Carbon correctly on OSX
Alexander Alekhin [Sun, 4 Aug 2019 21:10:06 +0000 (21:10 +0000)]
Merge pull request #15220 from thangktran:fixbug/confusing_error_message_from_persistence
Thang Tran [Sun, 4 Aug 2019 15:17:03 +0000 (17:17 +0200)]
core: fixed error message to avoid confusion
Victor Romero [Sat, 3 Aug 2019 19:53:38 +0000 (12:53 -0700)]
Merge pull request #15207 from vicroms:fix-uwp-build
Fix build for UWP (#15207)
* Guard non-WinRT calls to fix UWP build
* Remove unnecessary guard for WinRT
Alexander Alekhin [Fri, 2 Aug 2019 16:08:55 +0000 (16:08 +0000)]
Merge pull request #15158 from dkurt:fix_tf_ssd_configs
Alexander Alekhin [Fri, 2 Aug 2019 15:34:02 +0000 (15:34 +0000)]
Merge pull request #15202 from hugolm84:support_build_shared_for_wince
Alexander Alekhin [Fri, 2 Aug 2019 12:25:23 +0000 (12:25 +0000)]
Merge pull request #15188 from mshabunin:fix-v4l-old
Maksim Shabunin [Fri, 26 Jul 2019 12:37:28 +0000 (15:37 +0300)]
Fix for building with old V4L
Alexander Alekhin [Thu, 1 Aug 2019 16:35:06 +0000 (16:35 +0000)]
Merge pull request #15098 from RealJohnSmith:master
Alexander Alekhin [Thu, 1 Aug 2019 16:33:37 +0000 (16:33 +0000)]
Merge pull request #15197 from mshabunin:restore-ipp-cut
Alexander Alekhin [Thu, 1 Aug 2019 16:33:10 +0000 (16:33 +0000)]
Merge pull request #15195 from mshabunin:disable-pch
Andrey Golubev [Thu, 1 Aug 2019 16:30:05 +0000 (19:30 +0300)]
Merge pull request #15190 from andrey-golubev:fluid_invalid_roi
G-API: verify y offset and height of Fluid output ROIs (#15190)
* G-API: validate GFluidOutputRoi y and height
* Rearrange tested ROIs
Hugo Lindström [Thu, 1 Aug 2019 13:28:04 +0000 (15:28 +0200)]
Support building shared libraries on WINCE.
Maksim Shabunin [Wed, 31 Jul 2019 15:03:23 +0000 (15:03 +0000)]
Merge pull request #15168 from dkurt:dnn_onnx_15120
Maksim Shabunin [Wed, 31 Jul 2019 12:41:22 +0000 (15:41 +0300)]
Restored IPP call reduction
Maksim Shabunin [Wed, 31 Jul 2019 12:16:23 +0000 (15:16 +0300)]
PCH: disable by default on all platforms except MSVC
dcouwenh [Tue, 30 Jul 2019 20:49:46 +0000 (16:49 -0400)]
Bayer VNG Demosaicing Fix #2 (Merge pull request #15086)
* Update demosaicing.cpp
Fixed calculation of Bs for non-green pixels.
* Fixed cvtColor perf test for bayer VNG
Andrey Golubev [Tue, 30 Jul 2019 20:48:46 +0000 (23:48 +0300)]
G-API: fix Fluid reshape with unused nodes (Merge pull request #15115)
* G-API: fix fluid reshape with unused nodes
* Update test names
* Add FIXME for future improvement
Lubov Batanina [Tue, 30 Jul 2019 20:07:37 +0000 (23:07 +0300)]
Add high level API (Merge pull request #14780)
* Add high level API
* Fix Model
* Add DetectionModel
* Add ClassificationModel
* Fix classify
* Add python test
* Fix pytest
* Fix comments to review
* Fix detect
* Fix docs
* Modify DetectionOutput postprocessing
* Fix test
* Extract ref boxes
* Fix draw rect
* fix test
* Add rect wrap
* Fix wrap
* Fix detect
* Fix Rect wrap
* Fix OCL_FP16
* Fix MyriadX
* Fix nms
* Fix NMS
* Fix coords
Maksim Shabunin [Tue, 30 Jul 2019 14:28:07 +0000 (14:28 +0000)]
Merge pull request #15172 from TheGoddessInari:fix_windows
Maksim Shabunin [Tue, 30 Jul 2019 14:26:33 +0000 (14:26 +0000)]
Merge pull request #15176 from dkurt:fix_14993
Lubov Batanina [Tue, 30 Jul 2019 14:23:47 +0000 (17:23 +0300)]
Support for several min and max sizes in PriorBox layer (Merge pull request #15076)
* Support for several min and max sizes in PriorBox layer
* Fix minSize
* Check size
* Modify initInfEngine
* Fix tests
* Fix IE support
* Add priorbox test
* Remove inputs
Maksim Shabunin [Tue, 30 Jul 2019 14:18:51 +0000 (14:18 +0000)]
Merge pull request #14938 from LaurentBerger:face_clip
Maksim Shabunin [Tue, 30 Jul 2019 14:15:34 +0000 (14:15 +0000)]
Merge pull request #15169 from dkurt:dnn_onnx_drop_vgg16
Maksim Shabunin [Tue, 30 Jul 2019 14:13:00 +0000 (14:13 +0000)]
Merge pull request #15181 from berak:java_print_blob
berak [Mon, 29 Jul 2019 08:49:42 +0000 (10:49 +0200)]
java: fix Mat.toString() for higher dimensions
Dmitry Kurtaev [Sun, 28 Jul 2019 19:32:37 +0000 (22:32 +0300)]
Fix #14993
Dmitry Kurtaev [Sat, 27 Jul 2019 19:10:13 +0000 (22:10 +0300)]
Add support for slice from ONNX with multiple outputs
TheGoddessInari [Sun, 28 Jul 2019 17:21:15 +0000 (10:21 -0700)]
Make sure to use defined(__GNUC__) instead of bare __GNUC__ in flann2 header.
This fixes a compiler error on MSVC with Unreal Engine (at least).
Dmitry Kurtaev [Sat, 27 Jul 2019 20:04:25 +0000 (23:04 +0300)]
Remove VGG16 from ONNX test because there is VGG16_bn
Dmitry Kurtaev [Sat, 27 Jul 2019 12:03:58 +0000 (15:03 +0300)]
Fixes for OpenCV face detection network
Dmitry Kurtaev [Sat, 27 Jul 2019 10:30:15 +0000 (13:30 +0300)]
Fix 2019R2 tests
Dmitry Kurtaev [Fri, 26 Jul 2019 10:57:08 +0000 (13:57 +0300)]
Modify SSD from TensorFlow graph generation script to enable MyriadX
Alexander Alekhin [Fri, 26 Jul 2019 03:26:56 +0000 (03:26 +0000)]
Merge tag '4.1.1'
Alexander Alekhin [Fri, 26 Jul 2019 03:24:45 +0000 (03:24 +0000)]
release: OpenCV 4.1.1
OpenCV 4.1.1
Alexander Alekhin [Fri, 26 Jul 2019 03:22:23 +0000 (03:22 +0000)]
Merge tag '4.1.1-openvino'
Alexander Alekhin [Thu, 25 Jul 2019 19:21:47 +0000 (19:21 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 25 Jul 2019 19:19:16 +0000 (19:19 +0000)]
Merge tag '3.4.7'
Alexander Alekhin [Thu, 25 Jul 2019 19:01:19 +0000 (19:01 +0000)]
OpenCV version++ (3.4.7)
OpenCV 3.4.7
Alexander Alekhin [Thu, 25 Jul 2019 18:59:56 +0000 (18:59 +0000)]
Merge pull request #15139 from alalek:openvino_2019R2
Alexander Alekhin [Thu, 25 Jul 2019 18:56:32 +0000 (18:56 +0000)]
Merge pull request #15118 from dkurt:fix_15106
Chip Kerchner [Thu, 25 Jul 2019 18:21:32 +0000 (14:21 -0400)]
Merge pull request #15136 from ChipKerchner:dotProd_unroll
* Unroll multiply and add instructions in dotProd_32f - 35% faster.
* Eliminate unnecessary v_reduce_sum instructions.
Alexander Alekhin [Thu, 25 Jul 2019 18:19:04 +0000 (18:19 +0000)]
Merge pull request #15150 from alalek:fix_15124_15125
Dmitry Kurtaev [Mon, 22 Jul 2019 09:18:57 +0000 (12:18 +0300)]
Fix false positives of face detection network for large faces
Alexander Alekhin [Thu, 25 Jul 2019 16:25:57 +0000 (16:25 +0000)]
Merge pull request #15131 from paroj:web
Alexander Alekhin [Thu, 25 Jul 2019 16:14:25 +0000 (16:14 +0000)]
Merge pull request #15145 from alalek:fix_15127
Alexander Alekhin [Thu, 25 Jul 2019 06:57:49 +0000 (06:57 +0000)]
dnn(test): OpenVINO 2019R2
Alexander Alekhin [Thu, 25 Jul 2019 14:15:59 +0000 (17:15 +0300)]
objdetect: validate feature rectangle on reading
Alexander Alekhin [Thu, 25 Jul 2019 12:14:22 +0000 (15:14 +0300)]
core(persistence): added null ptr checks
Alexander Alekhin [Thu, 25 Jul 2019 11:36:36 +0000 (11:36 +0000)]
Merge pull request #15103 from alalek:simd_intrinsics_in_user_code
Alexander Alekhin [Mon, 24 Jun 2019 11:57:44 +0000 (14:57 +0300)]
dnn: use OpenVINO 2019R2 defines
Andrey Golubev [Wed, 24 Jul 2019 20:36:18 +0000 (23:36 +0300)]
Merge pull request #14985 from andrey-golubev:gapi_fix_ocl_umat
* G-API: fix GOCLExecutable issue with UMat lifetime
Add tests on initialized/uninitialized outputs for all
backends
* Use proper clean-up procedure for magazine
* Rename InitOut test and reduce tested sizes
* Enable output allocation test
Alexey Smirnov [Wed, 24 Jul 2019 20:29:52 +0000 (23:29 +0300)]
Merge pull request #14952 from smirnov-alexey:gapi_transform_macro_rework
G-API: GAPI_TRANSFORM internal functionality rework (#14952)
* Change internal pattern and substitute signatures and refactor tests
* Enhance GArrayU with type-checker function
Add a couple of new tests on GAPI_TRANSFORM
Alexander Alekhin [Wed, 24 Jul 2019 20:28:48 +0000 (20:28 +0000)]
Merge pull request #15091 from anton-potapov:fluid_internal_parallellism_custom_pfor
Hugo Lindström [Wed, 24 Jul 2019 20:12:09 +0000 (22:12 +0200)]
Merge pull request #15059 from hugolm84:improved-support-for-wince
* Improve support for Windows Embedded Compact
* Remove redundant set(WINCE true) and format CMake
Pavel Rojtberg [Tue, 23 Jul 2019 09:57:59 +0000 (11:57 +0200)]
js: whitelist some more functions (calib3d , aruco)
Alexander Alekhin [Mon, 22 Jul 2019 17:47:54 +0000 (17:47 +0000)]
Merge pull request #15105 from komakai:camera_permissions
Alexander Alekhin [Mon, 22 Jul 2019 17:38:37 +0000 (17:38 +0000)]
Merge pull request #15097 from komakai:no_samples_build-option
Alexander Alekhin [Sun, 21 Jul 2019 18:06:04 +0000 (18:06 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 21 Jul 2019 17:57:19 +0000 (17:57 +0000)]
Merge pull request #15107 from dkurt:js_features2d_drawings
Alexander Alekhin [Sun, 21 Jul 2019 17:56:41 +0000 (17:56 +0000)]
Merge pull request #15104 from alalek:videoio_fix_debug_message
Dmitry Kurtaev [Sat, 20 Jul 2019 20:26:40 +0000 (23:26 +0300)]
Fix drawKeypoints and drawMatches for JS
Alexander Alekhin [Sat, 20 Jul 2019 08:07:14 +0000 (08:07 +0000)]
Merge pull request #15093 from tomoaki0705:fixCudaLegacyRansac
Giles Payne [Sat, 20 Jul 2019 04:40:10 +0000 (13:40 +0900)]
Add CameraActivity utility class to automate Camera permission request handling
Alexander Alekhin [Thu, 18 Jul 2019 07:25:59 +0000 (07:25 +0000)]
core: support SIMD intrinsics in user code
Lubov Batanina [Fri, 19 Jul 2019 16:18:34 +0000 (19:18 +0300)]
Merge pull request #15032 from l-bat:reduce_mean
* Added support for the ONNX "ReduceMean" Layer. (as this is the same as the GlobalAveragePool)
* Add ReduceMean test
* Fix ONNX importer
* Fix ReduceMean
* Add assert
* Split test
* Fix split test
Alexander Alekhin [Fri, 19 Jul 2019 15:50:54 +0000 (15:50 +0000)]
Merge pull request #15092 from alalek:videoio_gstreamer_more_get_checks
John Smith [Fri, 19 Jul 2019 12:07:09 +0000 (14:07 +0200)]
Fix cv::selectROI rectangle rendering issue
Alexander Alekhin [Thu, 18 Jul 2019 22:12:01 +0000 (22:12 +0000)]
videoio(gstreamer): more .get() checks
Alexander Alekhin [Fri, 19 Jul 2019 10:11:35 +0000 (10:11 +0000)]
Merge pull request #15084 from lpea:calib3d_doc_fix
Anton Potapov [Thu, 18 Jul 2019 20:24:56 +0000 (23:24 +0300)]
Fluid Internal Parallelism
- added ability to use custom implementation of "parallel for" function
Tomoaki Teshima [Fri, 19 Jul 2019 08:50:00 +0000 (17:50 +0900)]
cudalegacy: fix test failure of SolvePnPRansac
* use SOLVE_EPNP for the initial guess
Alexander Alekhin [Thu, 18 Jul 2019 21:36:38 +0000 (21:36 +0000)]
videoio: fix debug message
Alexander Alekhin [Thu, 18 Jul 2019 19:15:14 +0000 (19:15 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 18 Jul 2019 19:09:07 +0000 (19:09 +0000)]
Merge pull request #15058 from alalek:core_fix_base64_packed_struct_master
Alexander Alekhin [Thu, 18 Jul 2019 19:07:05 +0000 (19:07 +0000)]
Merge pull request #15050 from alalek:core_fix_base64_packed_struct