From 35a4551609e32222ac0f2467b64f314412480e0b Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Tue, 22 May 2018 13:56:17 +0300 Subject: [PATCH] imgcodecs: fix imwrite handling of different OutputArray types --- modules/imgcodecs/src/loadsave.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/imgcodecs/src/loadsave.cpp b/modules/imgcodecs/src/loadsave.cpp index e6782dc..5dba241 100644 --- a/modules/imgcodecs/src/loadsave.cpp +++ b/modules/imgcodecs/src/loadsave.cpp @@ -716,13 +716,10 @@ bool imwrite( const String& filename, InputArray _img, { CV_TRACE_FUNCTION(); std::vector img_vec; - //Did we get a Mat or a vector of Mats? - if (_img.isMat() || _img.isUMat()) - img_vec.push_back(_img.getMat()); - else if (_img.isMatVector() || _img.isUMatVector()) + if (_img.isMatVector() || _img.isUMatVector()) _img.getMatVector(img_vec); else - CV_Error(Error::StsBadArg, "Unknown/unsupported input encountered"); + img_vec.push_back(_img.getMat()); CV_Assert(!img_vec.empty()); return imwrite_(filename, img_vec, params, false); -- 2.7.4