platform/upstream/opencv.git
4 years agoMerge pull request #16766 from VadimLevin:dev/vlevin/video_writer_params_constructor
Vadim Levin [Tue, 28 Apr 2020 08:38:39 +0000 (11:38 +0300)]
Merge pull request #16766 from VadimLevin:dev/vlevin/video_writer_params_constructor

* feature: Extend VideoWriter to accept vector of parameters

 - Add additional constructor and `open` method for `VideoWriter`
   those accept a vector of parameters
 - Move actual implementation of the `VideoWriter::open` to general method
   which accepts vector of parameters
 - Propagate parsed parameters map up to actual video backend construction

* fix: Change VideoWriter constructor description to suppress doc warning

* refactor: Rollback newlines changes

* feature: Changed VideoWriter parameters workflow

* feature: Log unused parameters in VideoWriter open

* doc: Fix VideoWriter `isColor` parameter description

* fix: int to bool VC++ conversion warning

* doc: Remove information about `isColor` flag usage.

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 24 Apr 2020 18:32:18 +0000 (18:32 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17119 from alalek:move_sift
Alexander Alekhin [Fri, 24 Apr 2020 18:15:15 +0000 (18:15 +0000)]
Merge pull request #17119 from alalek:move_sift

4 years agoMerge pull request #17149 from alalek:core_simd_suppress_coverity
Alexander Alekhin [Fri, 24 Apr 2020 17:46:53 +0000 (17:46 +0000)]
Merge pull request #17149 from alalek:core_simd_suppress_coverity

4 years agoMerge pull request #17144 from YashasSamaga:cuda4dnn-fix-i17116
Alexander Alekhin [Fri, 24 Apr 2020 17:40:57 +0000 (17:40 +0000)]
Merge pull request #17144 from YashasSamaga:cuda4dnn-fix-i17116

4 years agoMerge pull request #17108 from HowardsPlayPen:patch-1
Alexander Alekhin [Fri, 24 Apr 2020 17:25:31 +0000 (17:25 +0000)]
Merge pull request #17108 from HowardsPlayPen:patch-1

4 years agocore(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors
Alexander Alekhin [Fri, 24 Apr 2020 16:36:35 +0000 (16:36 +0000)]
core(SIMD): suppress coverity UNINIT_CTOR on SIMD vectors

4 years agoUpdate videocapture_basic.cpp
HowardsPlayPen [Sun, 19 Apr 2020 11:51:27 +0000 (12:51 +0100)]
Update videocapture_basic.cpp

I believe you are using the wrong version of open() on line 28 - adding deviceID + appId together. It's better to use the new version of .open() taking two integers as parameter.

4 years agohandle redundant slice in SliceOp
YashasSamaga [Fri, 24 Apr 2020 07:24:17 +0000 (12:54 +0530)]
handle redundant slice in SliceOp

4 years agoMerge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy
Alexander Alekhin [Thu, 23 Apr 2020 22:39:45 +0000 (22:39 +0000)]
Merge pull request #17134 from alalek:dnn_ie_avoid_conversion_to_legacy

4 years agoMerge pull request #17129 from alalek:dnn_myriad_tests
Alexander Alekhin [Thu, 23 Apr 2020 19:41:15 +0000 (19:41 +0000)]
Merge pull request #17129 from alalek:dnn_myriad_tests

4 years agodnn(ie): avoid conversion to legacy CNNNetworkImpl
Alexander Alekhin [Wed, 22 Apr 2020 22:33:12 +0000 (22:33 +0000)]
dnn(ie): avoid conversion to legacy CNNNetworkImpl

4 years agoMerge pull request #17088 from mpashchenkov:mp/ocv-gapi-kernel-laplacian
Maxim Pashchenkov [Thu, 23 Apr 2020 17:47:55 +0000 (20:47 +0300)]
Merge pull request #17088 from mpashchenkov:mp/ocv-gapi-kernel-laplacian

G-API: Laplacian and bilateralFilter standard kernels

* Added Laplacian kernel and tests

* Added: Laplacian kernel, Bilateral kernel (CPU, GPU); Performance and accuracy tests for this kernels

* Changed tolerance for GPU test

* boner

* Some changes with alignment; Tests's parameters are the same as for OCV

* Cut tests

* Compressed tests

* Minor changes (rsrt bb)

* Returned types

4 years agoMerge pull request #17082 from OrestChura:oc/buildPyramid
Alexander Alekhin [Thu, 23 Apr 2020 12:07:26 +0000 (12:07 +0000)]
Merge pull request #17082 from OrestChura:oc/buildPyramid

4 years agofeatures2d(sift): move SIFT tests / headers / build fixes
Alexander Alekhin [Tue, 21 Apr 2020 06:58:21 +0000 (06:58 +0000)]
features2d(sift): move SIFT tests / headers / build fixes

4 years agoMerge pull request #17133 from alalek:build_fix_gapi_ie
Alexander Alekhin [Wed, 22 Apr 2020 23:06:14 +0000 (23:06 +0000)]
Merge pull request #17133 from alalek:build_fix_gapi_ie

4 years agogapi: fix build, update IE handling, add OPENCV_GAPI_INF_ENGINE
Alexander Alekhin [Wed, 22 Apr 2020 21:41:36 +0000 (21:41 +0000)]
gapi: fix build, update IE handling, add OPENCV_GAPI_INF_ENGINE

4 years agodnn(test): skip failed NGRAPH/MYRIAD tests
Alexander Alekhin [Wed, 22 Apr 2020 09:01:25 +0000 (09:01 +0000)]
dnn(test): skip failed NGRAPH/MYRIAD tests

4 years agoMerge pull request #17122 from mshabunin:videoio-win-dbg-plugins
Alexander Alekhin [Wed, 22 Apr 2020 11:42:33 +0000 (11:42 +0000)]
Merge pull request #17122 from mshabunin:videoio-win-dbg-plugins

4 years agovideoio: load debug versions of plug-ins in debug builds
Maksim Shabunin [Tue, 21 Apr 2020 12:17:45 +0000 (15:17 +0300)]
videoio: load debug versions of plug-ins in debug builds

4 years agoMerge pull request #16887 from ashishkrshrivastava:fasterrcnn
Alexander Alekhin [Wed, 22 Apr 2020 09:47:45 +0000 (09:47 +0000)]
Merge pull request #16887 from ashishkrshrivastava:fasterrcnn

4 years agoMerge pull request #17120 from ganesh-k13:bugfix/documentation/16987
Alexander Alekhin [Wed, 22 Apr 2020 09:08:02 +0000 (09:08 +0000)]
Merge pull request #17120 from ganesh-k13:bugfix/documentation/16987

4 years agoadd fused batchNorm Upsample
ashishiva3@gmail.com [Thu, 19 Mar 2020 16:52:36 +0000 (22:22 +0530)]
add fused batchNorm Upsample

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 21 Apr 2020 21:08:52 +0000 (21:08 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17123 from ganesh-k13:bugfix/documentation/3.4/16987
Alexander Alekhin [Tue, 21 Apr 2020 21:03:35 +0000 (21:03 +0000)]
Merge pull request #17123 from ganesh-k13:bugfix/documentation/3.4/16987

4 years agoMerge pull request #17030 from ashishkrshrivastava:onnximporter
Alexander Alekhin [Tue, 21 Apr 2020 21:02:41 +0000 (21:02 +0000)]
Merge pull request #17030 from ashishkrshrivastava:onnximporter

4 years agoMerge pull request #16961 from rayonnant14:objdetect_different_return_value_issue
Polina Smolnikova [Tue, 21 Apr 2020 20:44:50 +0000 (23:44 +0300)]
Merge pull request #16961 from rayonnant14:objdetect_different_return_value_issue

QRDetectMulti : different return value bug fix

* QRDetectMulti : bug fix

* added tests

* changed test image due to large size of previous test image

4 years agoMerge pull request #16995 from mpashchenkov:mp/ocv-gapi-standalone-mat
Maxim Pashchenkov [Tue, 21 Apr 2020 20:22:01 +0000 (23:22 +0300)]
Merge pull request #16995 from mpashchenkov:mp/ocv-gapi-standalone-mat

G-API: Mat's "deownification"

* deowned Mat

* boner

* Removed canDescribe test for own::Mat

* Removed STANDALONE flag for apply() and operator()

* Removed: desc_tests for own::Mat, descr_of for own::Mat.

* Returned: tests, cv::gapi::own::descr_of; fixed alignment; Removed own::Mat's headers

* Removed unused header own/mat.hpp from gbackend.hpp

4 years agoFormula Fixes for master branch
Ganesh Kathiresan [Tue, 21 Apr 2020 14:01:52 +0000 (19:31 +0530)]
Formula Fixes for master branch

Foumula fix 6

Foumula fix 7

4 years agoFormula Fixes for 3.4 branch
Ganesh Kathiresan [Tue, 21 Apr 2020 10:38:58 +0000 (16:08 +0530)]
Formula Fixes for 3.4 branch

Foumula fix 1

Foumula fix 2

Foumula fix 3

Foumula fix 4

Foumula fix 5

Foumula fix 8

4 years agogapi: buildOpticalFlowPyramid() interface, CPUkernel and CPUtests implementation
OrestChura [Mon, 13 Apr 2020 21:53:01 +0000 (00:53 +0300)]
gapi: buildOpticalFlowPyramid() interface, CPUkernel and CPUtests implementation
     - kernel added to a cv::gapi::video namespace
     - tests to check a kernels (based on cv::video tests for cv::buildOpticalFlowPyramid())
     - tests for a combined G-API-pipeline (buildOpticalFlowPyramid() -> calcOpticalFlowPyrLK())
     - tests for internal purposes added
     - custom function for comparison in tests implemented

4 years agomodification for upsample node fused from unfused Resize subgraph
AshihsKrShrivastava [Fri, 10 Apr 2020 06:36:09 +0000 (12:06 +0530)]
modification for upsample node fused from unfused Resize subgraph

4 years agoMerge pull request #17112 from l-bat:ie_region
Liubov Batanina [Tue, 21 Apr 2020 09:26:58 +0000 (12:26 +0300)]
Merge pull request #17112 from l-bat:ie_region

* Support nGraph Region

* Support region since OpenVINO 2020.2

* Skip myriad

4 years agoMerge pull request #17106 from pauljurczak:patch-3
Alexander Alekhin [Mon, 20 Apr 2020 18:00:01 +0000 (18:00 +0000)]
Merge pull request #17106 from pauljurczak:patch-3

4 years agoMerge pull request #17109 from alalek:cmake_videoio_plugins_all
Alexander Alekhin [Mon, 20 Apr 2020 17:24:18 +0000 (17:24 +0000)]
Merge pull request #17109 from alalek:cmake_videoio_plugins_all

4 years agoAdded descriptions of randu and randn
Paul Jurczak [Sun, 19 Apr 2020 07:14:09 +0000 (01:14 -0600)]
Added descriptions of randu and randn

4 years agoMerge pull request #17110 from alalek:videoio_msmf_fix_warning
Alexander Alekhin [Sun, 19 Apr 2020 20:41:18 +0000 (20:41 +0000)]
Merge pull request #17110 from alalek:videoio_msmf_fix_warning

4 years agovideoio(msmf): fix build warning
Alexander Alekhin [Sun, 19 Apr 2020 19:47:32 +0000 (19:47 +0000)]
videoio(msmf): fix build warning

- warning C4800: 'int': forcing value to bool 'true' or 'false'

4 years agocmake: handle VIDEOIO_PLUGIN_LIST=all
Alexander Alekhin [Sun, 19 Apr 2020 19:21:31 +0000 (19:21 +0000)]
cmake: handle VIDEOIO_PLUGIN_LIST=all

4 years agoMerge pull request #17102 from dkurt:dnn_ie_flexible_inputs
Alexander Alekhin [Sun, 19 Apr 2020 18:06:09 +0000 (18:06 +0000)]
Merge pull request #17102 from dkurt:dnn_ie_flexible_inputs

4 years agoMerge pull request #17105 from benji1123:pointPolygonTest_demo
Alexander Alekhin [Sun, 19 Apr 2020 17:38:23 +0000 (17:38 +0000)]
Merge pull request #17105 from benji1123:pointPolygonTest_demo

4 years agofix tuple error
Ben [Sun, 19 Apr 2020 02:08:36 +0000 (22:08 -0400)]
fix tuple error

4 years agoMerge pull request #17046 from alalek:core_inputarray_matexpr_cleanup
Alexander Alekhin [Sat, 18 Apr 2020 21:41:59 +0000 (21:41 +0000)]
Merge pull request #17046 from alalek:core_inputarray_matexpr_cleanup

4 years agoFlexible inputs for OpenVINO IR models
Dmitry Kurtaev [Sat, 18 Apr 2020 16:42:48 +0000 (19:42 +0300)]
Flexible inputs for OpenVINO IR models

4 years agoMerge pull request #17096 from spectralio:java-cmake-fix
Alexander Alekhin [Fri, 17 Apr 2020 21:24:41 +0000 (21:24 +0000)]
Merge pull request #17096 from spectralio:java-cmake-fix

4 years agoMerge pull request #17041 from alalek:core_simd_vector_ctors
Alexander Alekhin [Fri, 17 Apr 2020 21:22:07 +0000 (21:22 +0000)]
Merge pull request #17041 from alalek:core_simd_vector_ctors

4 years agocore(SIMD): align behavior of vector constructors
Alexander Alekhin [Sun, 12 Apr 2020 18:18:17 +0000 (18:18 +0000)]
core(SIMD): align behavior of vector constructors

- setzero() calls are dropped due low-level API nature
- initialization is mandatory if necessary (not an output of other calls)

4 years agoMerge pull request #16769 from mshabunin:fix-ipp-install
Maksim Shabunin [Fri, 17 Apr 2020 14:28:42 +0000 (17:28 +0300)]
Merge pull request #16769 from mshabunin:fix-ipp-install

* Do not copy standalone IPP libraries to install for static builds

* Restored IPP installation under option

4 years agoMerge pull request #16795 from jshiwam:qrsample
jshiwam [Fri, 17 Apr 2020 12:16:39 +0000 (17:46 +0530)]
Merge pull request #16795 from jshiwam:qrsample

Added a sample file for qrcode detection in python

* sample python file for qrcode detection added in samples/python

* input taken using argparse and the indents were removed

* Removed unused variables

* updated the format and removed unused variables

Removed the use of global variables and used parameterised contructor instead

=set multi detection true by default

* added detection from camera

* samples(python): coding style in qrcode.py

4 years agofix missing underscore
spectralio [Fri, 17 Apr 2020 11:08:32 +0000 (13:08 +0200)]
fix missing underscore

4 years agoMerge pull request #17071 from mshabunin:tickmeter-fps
Alexander Alekhin [Fri, 17 Apr 2020 08:56:29 +0000 (08:56 +0000)]
Merge pull request #17071 from mshabunin:tickmeter-fps

4 years agoTickMeter: added FPS and AvgTime, improved docs, reformatted
Maksim Shabunin [Wed, 15 Apr 2020 08:18:03 +0000 (11:18 +0300)]
TickMeter: added FPS and AvgTime, improved docs, reformatted

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 16 Apr 2020 18:28:27 +0000 (18:28 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years ago[move sift.cpp] sift: avoid inplace calls of GaussianBlur
Alexander Alekhin [Thu, 16 Apr 2020 14:46:38 +0000 (14:46 +0000)]
[move sift.cpp] sift: avoid inplace calls of GaussianBlur

- should unlock IPP optimizations

original commit: https://github.com/opencv/opencv_contrib/commit/ce7c8f2646ccf3f5e657ab1241e22c0c32cd9d41

4 years ago[move sift.cpp] sift: perf tests and trace regions
Alexander Alekhin [Thu, 16 Apr 2020 05:33:54 +0000 (05:33 +0000)]
[move sift.cpp] sift: perf tests and trace regions

original commit: https://github.com/opencv/opencv_contrib/commit/a15e105db12aa7a0bade47afb791682201e46f60

4 years agoMerge pull request #17091 from tomoaki0705:fixHOGDetectorFailure
Alexander Alekhin [Thu, 16 Apr 2020 16:34:45 +0000 (16:34 +0000)]
Merge pull request #17091 from tomoaki0705:fixHOGDetectorFailure

4 years agoavoid test failure on Arm platform
Tomoaki Teshima [Thu, 16 Apr 2020 15:59:15 +0000 (00:59 +0900)]
avoid test failure on Arm platform

4 years agoMerge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2
Alexander Alekhin [Thu, 16 Apr 2020 12:19:58 +0000 (12:19 +0000)]
Merge pull request #17075 from alalek:dnn_updates_from_openvino_2020.2

4 years agoMerge pull request #17080 from dkurt:dnn_ngraph_future
Alexander Alekhin [Thu, 16 Apr 2020 11:19:08 +0000 (11:19 +0000)]
Merge pull request #17080 from dkurt:dnn_ngraph_future

4 years agoMerge pull request #17084 from tomoaki0705:fixQRInputCheck
Alexander Alekhin [Thu, 16 Apr 2020 09:44:08 +0000 (09:44 +0000)]
Merge pull request #17084 from tomoaki0705:fixQRInputCheck

4 years agoMerge pull request #17083 from pauljurczak:patch-2
Alexander Alekhin [Thu, 16 Apr 2020 09:43:44 +0000 (09:43 +0000)]
Merge pull request #17083 from pauljurczak:patch-2

4 years agoMerge pull request #17074 from AlanLi7991:doc/python-svm-doc-formula-miss
Alexander Alekhin [Thu, 16 Apr 2020 09:43:20 +0000 (09:43 +0000)]
Merge pull request #17074 from AlanLi7991:doc/python-svm-doc-formula-miss

4 years agoRemove NodeVector for nGraph
Dmitry Kurtaev [Wed, 15 Apr 2020 15:12:56 +0000 (18:12 +0300)]
Remove NodeVector for nGraph

4 years agodoc: formula miss
Alanli [Thu, 16 Apr 2020 00:05:00 +0000 (09:05 +0900)]
doc: formula miss

4 years agofix wrong condition check
Tomoaki Teshima [Wed, 15 Apr 2020 23:24:14 +0000 (08:24 +0900)]
fix wrong condition check

4 years agoAdded to description of WCube constructor
Paul Jurczak [Wed, 15 Apr 2020 22:06:14 +0000 (16:06 -0600)]
Added to description of WCube constructor

`WCube` constructor reorders `min_point`, `max_point` parameters when necessary. I added this info to the description.

4 years agoMerge pull request #17081 from alalek:backport_17056
Alexander Alekhin [Wed, 15 Apr 2020 18:33:41 +0000 (18:33 +0000)]
Merge pull request #17081 from alalek:backport_17056

4 years agoMerge pull request #17079 from tomoaki0705:fixCUDABgSgmMOG
Alexander Alekhin [Wed, 15 Apr 2020 18:30:09 +0000 (18:30 +0000)]
Merge pull request #17079 from tomoaki0705:fixCUDABgSgmMOG

4 years agobuild: winpack_dldt with dldt 2020.2
Alexander Alekhin [Mon, 13 Apr 2020 21:17:11 +0000 (21:17 +0000)]
build: winpack_dldt with dldt 2020.2

4 years agoMerge pull request #17056 from alalek:build_opencv_winpack_dldt_2020.2
Alexander Alekhin [Wed, 15 Apr 2020 17:24:34 +0000 (17:24 +0000)]
Merge pull request #17056 from alalek:build_opencv_winpack_dldt_2020.2

4 years agofix test failure on Jetson TX2
Tomoaki Teshima [Wed, 15 Apr 2020 14:25:12 +0000 (23:25 +0900)]
fix test failure on Jetson TX2

4 years agoMerge pull request #17017 from VadimLevin:dev/vlevin/header-parser-explicit-support
Alexander Alekhin [Wed, 15 Apr 2020 12:53:42 +0000 (12:53 +0000)]
Merge pull request #17017 from VadimLevin:dev/vlevin/header-parser-explicit-support

4 years agofeature: Added `explicit` support to header parser
Vadim Levin [Wed, 15 Apr 2020 11:25:39 +0000 (14:25 +0300)]
feature: Added `explicit` support to header parser

- It is safe to remove `explicit` keyword for constructors with 1
argument, because it is C++ specific keyword and does not affect any of
the generated binding.

4 years agodnn: use OpenVINO 2020.2 defines
Alexander Alekhin [Thu, 27 Feb 2020 11:28:50 +0000 (14:28 +0300)]
dnn: use OpenVINO 2020.2 defines

original commit: 45263d76429390a4c625f262248312dd68c57111

4 years agotest: Added tests for VideoCapture constructors in java
Vadim Levin [Wed, 15 Apr 2020 11:12:31 +0000 (14:12 +0300)]
test: Added tests for VideoCapture constructors in java

4 years agobuild: winpack_dldt with dldt 2020.2
Alexander Alekhin [Mon, 13 Apr 2020 21:17:11 +0000 (21:17 +0000)]
build: winpack_dldt with dldt 2020.2

4 years agoMerge pull request #17048 from anton-potapov:ap/variant_get_if
Alexander Alekhin [Tue, 14 Apr 2020 19:06:01 +0000 (19:06 +0000)]
Merge pull request #17048 from anton-potapov:ap/variant_get_if

4 years agocore: drop EXPR handing code in InputArray
Alexander Alekhin [Mon, 13 Apr 2020 03:53:03 +0000 (03:53 +0000)]
core: drop EXPR handing code in InputArray

4 years agoMerge pull request #17060 from dkurt:dnn_align_ie_pool
Alexander Alekhin [Tue, 14 Apr 2020 15:15:44 +0000 (15:15 +0000)]
Merge pull request #17060 from dkurt:dnn_align_ie_pool

4 years agoMerge pull request #17049 from ilya-lavrenov:il/nn-builder
Alexander Alekhin [Tue, 14 Apr 2020 15:14:35 +0000 (15:14 +0000)]
Merge pull request #17049 from ilya-lavrenov:il/nn-builder

4 years agoGAPI: utils - variant::get_if
Anton Potapov [Mon, 13 Apr 2020 08:17:08 +0000 (11:17 +0300)]
GAPI: utils - variant::get_if

adding one more missing function to local version of std::variant

4 years agoFixed compilation when NN builder is not built
Ilya Lavrenov [Sun, 12 Apr 2020 20:36:21 +0000 (23:36 +0300)]
Fixed compilation when NN builder is not built

4 years agoAlign DLIE and nGraph average pooling layers
Dmitry Kurtaev [Tue, 14 Apr 2020 10:54:54 +0000 (13:54 +0300)]
Align DLIE and nGraph average pooling layers

4 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 13 Apr 2020 20:00:12 +0000 (20:00 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

4 years agoMerge pull request #17025 from tomoaki0705:fixTestFailureCUDABruteForceNonLocalMeans
Alexander Alekhin [Mon, 13 Apr 2020 18:17:50 +0000 (18:17 +0000)]
Merge pull request #17025 from tomoaki0705:fixTestFailureCUDABruteForceNonLocalMeans

4 years agoMerge pull request #16925 from dkurt:dnn_ssd.pytorch
Alexander Alekhin [Mon, 13 Apr 2020 13:12:12 +0000 (13:12 +0000)]
Merge pull request #16925 from dkurt:dnn_ssd.pytorch

4 years agoMerge pull request #17047 from alalek:fix_permissions
Alexander Alekhin [Mon, 13 Apr 2020 12:34:08 +0000 (12:34 +0000)]
Merge pull request #17047 from alalek:fix_permissions

4 years agoEnable ONNX SSD from https://github.com/amdegroot/ssd.pytorch
Dmitry Kurtaev [Sat, 28 Mar 2020 15:53:57 +0000 (18:53 +0300)]
Enable ONNX SSD from https://github.com/amdegroot/ssd.pytorch

4 years agoMerge pull request #16985 from ashishkrshrivastava:padfusion
Alexander Alekhin [Mon, 13 Apr 2020 11:26:12 +0000 (11:26 +0000)]
Merge pull request #16985 from ashishkrshrivastava:padfusion

4 years agoMerge pull request #13869 from chacha21:LineVirtualIterator
Pierre Chatelier [Mon, 13 Apr 2020 06:59:31 +0000 (08:59 +0200)]
Merge pull request #13869 from chacha21:LineVirtualIterator

* LineVirtualIterator

Proposal of LineVirtualIterator, an alternative to "LineIterator not attached to any mat".
This is basically the same implementation, replacing the address difference by a single "offset" variable. elemsize becomes irrelevant and considered to be 1. "step" is thus equal to size.width since no stride is expected.

* Update drawing.cpp

fixed warning

* improvement of LineVirtualIterator

instead of being too conservative, the new implementation gets rid of "offset/step" and only keeps a "Point currentPos" up to date.

left_to_right is renamed to forceLeftToRight as suggested (even for the old LineIterator)

assert() replaced by CV_Assert() (even for the old LineIterator)

* fixed implementation

+fixed last commit so that LineVirtualIterator gives at least the same results as LineIterator

+added a new constructor that does not require any Size, so that no clipping is done and iteration occurs from pt1 to pt2. This is done by adding a spatial offset to pt1 and pt2 so that the same implementation is used, the size being in that case the spatial size between pt1 and pt2

* Update imgproc.hpp

fixed warnings

* Update drawing.cpp

fixed whitespace

* Update drawing.cpp

trailing whitespace

* Update imgproc.hpp

+added a new constructor that takes a Rect rather than a Size. It computes the line pt1->pt2 that clips that rect.
Yet again, this is still based on the same implementation, thanks to the Size and the currentPosOffset that can artifically consider the origin of the rect at (0,0)

* revert changes

revert changes on  original LineIterator implementation, that will be superseded by the new LineVirtualIterator anyway

* added test of LineVirtualIterator

* More tests

* refactoring

Use C++11 chained constructors
Improved code style

* improve test

Added offset as random test data.

* fixed order of initialization

* merged LineIterator and VirtualLineIterator

* merged LineIterator & VirtualLineIterator

* merged LineIterator & VirtualLineIterator

* merged LineIterator & VirtualLineIterator

* made LineIterator::operator ++() more efficient

added one perfectly predictable check; in theory, since ptmode is set in the end of the constructor in the header file, the compiler can figure out that it's always true/false and eliminate the check from the inline `LineIterator::operator++()` completely

* optimized Line() function

in the most common case (CV_8UC3) eliminated the check from the loop

Co-authored-by: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
4 years agofix files permissions
Alexander Alekhin [Mon, 13 Apr 2020 04:29:55 +0000 (04:29 +0000)]
fix files permissions

4 years agoMerge pull request #17039 from tomoaki0705:fixCudaImgprocFailure
Alexander Alekhin [Sun, 12 Apr 2020 17:15:48 +0000 (17:15 +0000)]
Merge pull request #17039 from tomoaki0705:fixCudaImgprocFailure

4 years agofix test failure on Jetson TX1/TX2/Nano
Tomoaki Teshima [Sun, 12 Apr 2020 14:58:53 +0000 (23:58 +0900)]
fix test failure on Jetson TX1/TX2/Nano

4 years agoMerge pull request #17006 from tpoisonooo:patch-1
Alexander Alekhin [Sat, 11 Apr 2020 17:24:36 +0000 (17:24 +0000)]
Merge pull request #17006 from tpoisonooo:patch-1

4 years agoUpdate grfmt_pxm.cpp
tpoisonooo [Tue, 7 Apr 2020 09:01:45 +0000 (17:01 +0800)]
Update grfmt_pxm.cpp

remove comment in .ppm

4 years agoReflecitonPad2d and ZeroPad2d Subgraph fusion added
AshihsKrShrivastava [Sun, 5 Apr 2020 05:32:12 +0000 (11:02 +0530)]
ReflecitonPad2d and ZeroPad2d Subgraph fusion added

4 years agoMerge pull request #16653 from alalek:core_inputarray_matexpr
Alexander Alekhin [Fri, 10 Apr 2020 16:57:17 +0000 (16:57 +0000)]
Merge pull request #16653 from alalek:core_inputarray_matexpr

4 years agoMerge pull request #17023 from poelmanc:patch-1
Alexander Alekhin [Fri, 10 Apr 2020 16:32:15 +0000 (16:32 +0000)]
Merge pull request #17023 from poelmanc:patch-1

4 years agoRemove std::binary_function as it's invalid C++
Conrad Poelman [Thu, 9 Apr 2020 09:19:23 +0000 (05:19 -0400)]
Remove std::binary_function as it's invalid C++

std::binary_function was deprecated with C++11 and removed in C++17. It provided just two typedefs which in this case were unused.

4 years agoMerge pull request #17000 from rgarnov:async_islands
Alexander Alekhin [Fri, 10 Apr 2020 12:23:52 +0000 (12:23 +0000)]
Merge pull request #17000 from rgarnov:async_islands