generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Solve warnings, and adjusted the test case.

Browse Source
This commit is contained in:
MYLS 2016-06-19 02:00:32 +08:00
parent 882e4221e7
commit 958263d245
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/persistence.cpp
View File

@ -3498,7 +3498,7 @@ cvWriteRawData( CvFileStorage* fs, const void* _data, int len, const char* dt )
data += sizeof(size_t); data += sizeof(size_t);
break; break;
default: default:
CV_Assert(!"elem_type is not support."); CV_Error( CV_StsUnsupportedFormat, "Unsupported type" );
return; return;
} }
@ -3620,7 +3620,7 @@ cvReadRawDataSlice( const CvFileStorage* fs, CvSeqReader* reader,
data += sizeof(size_t); data += sizeof(size_t);
break; break;
default: default:
CV_Assert(0); CV_Error( CV_StsUnsupportedFormat, "Unsupported type" );
return; return;
} }
} }
@ -3670,7 +3670,7 @@ cvReadRawDataSlice( const CvFileStorage* fs, CvSeqReader* reader,
data += sizeof(size_t); data += sizeof(size_t);
break; break;
default: default:
CV_Assert(0); CV_Error( CV_StsUnsupportedFormat, "Unsupported type" );
return; return;
} }
} }

10
modules/core/test/test_io.cpp
View File

@ -592,14 +592,14 @@ TEST(Core_InputOutput, filestorage_yml_base64)
{ /* init */ { /* init */
/* normal mat */ /* normal mat */
_2d_out = cv::Mat(1000, 1000, CV_8UC3, cvScalar(1U, 2U, 3U)); _2d_out = cv::Mat(100, 100, CV_8UC3, cvScalar(1U, 2U, 127U));
for (int i = 0; i < _2d_out.rows; ++i) for (int i = 0; i < _2d_out.rows; ++i)
for (int j = 0; j < _2d_out.cols; ++j) for (int j = 0; j < _2d_out.cols; ++j)
_2d_out.at<cv::Vec3b>(i, j)[1] = i % 256; _2d_out.at<cv::Vec3b>(i, j)[1] = i % 256;
/* 4d mat */ /* 4d mat */
const int Size[] = {4, 4, 4, 4}; const int Size[] = {4, 4, 4, 4};
cv::Mat _4d(4, Size, CV_32FC4); cv::Mat _4d(4, Size, CV_64FC4, cvScalar(0.888, 0.111, 0.666, 0.444));
const cv::Range ranges[] = { const cv::Range ranges[] = {
cv::Range(0, 2), cv::Range(0, 2),
cv::Range(0, 2), cv::Range(0, 2),
@ -654,14 +654,14 @@ TEST(Core_InputOutput, filestorage_xml_base64)
{ /* init */ { /* init */
/* normal mat */ /* normal mat */
_2d_out = cv::Mat(1000, 1000, CV_8UC3, cvScalar(1U, 2U, 3U)); _2d_out = cv::Mat(100, 100, CV_8UC3, cvScalar(1U, 2U, 127U));
for (int i = 0; i < _2d_out.rows; ++i) for (int i = 0; i < _2d_out.rows; ++i)
for (int j = 0; j < _2d_out.cols; ++j) for (int j = 0; j < _2d_out.cols; ++j)
_2d_out.at<cv::Vec3b>(i, j)[1] = i % 256; _2d_out.at<cv::Vec3b>(i, j)[1] = i % 256;
/* 4d mat */ /* 4d mat */
const int Size[] = {4, 4, 4, 4}; const int Size[] = {4, 4, 4, 4};
cv::Mat _4d(4, Size, CV_32FC4); cv::Mat _4d(4, Size, CV_64FC4, cvScalar(0.888, 0.111, 0.666, 0.444));
const cv::Range ranges[] = { const cv::Range ranges[] = {
cv::Range(0, 2), cv::Range(0, 2),
cv::Range(0, 2), cv::Range(0, 2),
@ -704,5 +704,5 @@ TEST(Core_InputOutput, filestorage_xml_base64)
EXPECT_EQ(_nd_in.cols , _nd_in.cols); EXPECT_EQ(_nd_in.cols , _nd_in.cols);
EXPECT_EQ(_nd_in.dims , _nd_in.dims); EXPECT_EQ(_nd_in.dims , _nd_in.dims);
EXPECT_EQ(_nd_in.depth(), _nd_in.depth()); EXPECT_EQ(_nd_in.depth(), _nd_in.depth());
EXPECT_EQ(cv::countNonZero(cv::mean(_nd_in != _nd_out)), 0); EXPECT_EQ(cv::countNonZero(cv::sum(_nd_in != _nd_out)), 0);
} }