* Fix drawMatches and drawKeypoints for BGRA input images * keep BGRA too * Combine different input types for drawMatches test