Merge pull request #13481 from dkurt:fix_13227
authorDmitry Kurtaev <dmitry.kurtaev+github@gmail.com>
Tue, 25 Dec 2018 14:29:12 +0000 (17:29 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 25 Dec 2018 14:29:12 +0000 (17:29 +0300)
commitff8c53ea20ffec8154f2c5bafe92c325e64622d2
tree8b1fa538d139e6920b51114490f603fa552b811d
parent148aee31e47938607857995fdc66405f889309c5
Merge pull request #13481 from dkurt:fix_13227

* Fix drawMatches and drawKeypoints for BGRA input images

* keep BGRA too

* Combine different input types for drawMatches test
modules/features2d/src/draw.cpp
modules/features2d/test/test_drawing.cpp [new file with mode: 0644]