mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #11565 from alalek:issue_11545

Browse Source
This commit is contained in:
Alexander Alekhin 2018-05-22 16:00:37 +00:00
commit 2f9b4439af
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/imgcodecs/src/loadsave.cpp
View File

@ -722,13 +722,10 @@ bool imwrite( const String& filename, InputArray _img,
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
std::vector<Mat> img_vec; std::vector<Mat> img_vec;
//Did we get a Mat or a vector of Mats? if (_img.isMatVector() || _img.isUMatVector())
if (_img.isMat() || _img.isUMat())
img_vec.push_back(_img.getMat());
else if (_img.isMatVector() || _img.isUMatVector())
_img.getMatVector(img_vec); _img.getMatVector(img_vec);
else else
CV_Error(Error::StsBadArg, "Unknown/unsupported input encountered"); img_vec.push_back(_img.getMat());
CV_Assert(!img_vec.empty()); CV_Assert(!img_vec.empty());
return imwrite_(filename, img_vec, params, false); return imwrite_(filename, img_vec, params, false);

14
modules/imgcodecs/test/test_grfmt.cpp
View File

@ -337,4 +337,18 @@ TEST(Imgcodecs_Pam, read_write)
} }
#endif #endif
TEST(Imgcodecs, write_parameter_type)
{
cv::Mat m(10, 10, CV_8UC1, cv::Scalar::all(0));
cv::Mat1b m_type = cv::Mat1b::zeros(10, 10);
string tmp_file = cv::tempfile(".bmp");
EXPECT_NO_THROW(cv::imwrite(tmp_file, cv::Mat(m * 2))) << "* Failed with cv::Mat";
EXPECT_NO_THROW(cv::imwrite(tmp_file, m * 2)) << "* Failed with cv::MatExpr";
EXPECT_NO_THROW(cv::imwrite(tmp_file, m_type)) << "* Failed with cv::Mat_";
EXPECT_NO_THROW(cv::imwrite(tmp_file, m_type * 2)) << "* Failed with cv::MatExpr(Mat_)";
cv::Matx<uchar, 10, 10> matx;
EXPECT_NO_THROW(cv::imwrite(tmp_file, matx)) << "* Failed with cv::Matx";
EXPECT_EQ(0, remove(tmp_file.c_str()));
}
}} // namespace }} // namespace