Commit 78ca5ddd authored by MYLS's avatar MYLS

solve errors and warnings

parent 0823ec0e
...@@ -2236,7 +2236,7 @@ and ...@@ -2236,7 +2236,7 @@ and
@param len Number of the array elements to write @param len Number of the array elements to write
@param dt Specification of each array element, see @ref format_spec "format specification" @param dt Specification of each array element, see @ref format_spec "format specification"
*/ */
CVAPI(void) cvWriteRawDataBase64( CvFileStorage* fs, const void* _data, CVAPI(void) cvWriteRawDataBase64( CvFileStorage* fs, const void* src,
int len, const char* dt ); int len, const char* dt );
/** @brief Returns a unique pointer for a given name. /** @brief Returns a unique pointer for a given name.
......
...@@ -48,7 +48,7 @@ PERF_TEST_P(Size_Mat_StrType, fs_text, ...@@ -48,7 +48,7 @@ PERF_TEST_P(Size_Mat_StrType, fs_text,
remove(file_name.c_str()); remove(file_name.c_str());
SANITY_CHECK(dst); SANITY_CHECK(dst, 1);
} }
PERF_TEST_P(Size_Mat_StrType, fs_base64, PERF_TEST_P(Size_Mat_StrType, fs_base64,
...@@ -83,5 +83,5 @@ PERF_TEST_P(Size_Mat_StrType, fs_base64, ...@@ -83,5 +83,5 @@ PERF_TEST_P(Size_Mat_StrType, fs_base64,
} }
remove(file_name.c_str()); remove(file_name.c_str());
SANITY_CHECK(dst); SANITY_CHECK(dst, 1);
} }
This diff is collapsed.
...@@ -182,7 +182,7 @@ TEST(Core_InputOutput_Base64, valid) ...@@ -182,7 +182,7 @@ TEST(Core_InputOutput_Base64, valid)
cvStartWriteStruct(*fs, "manydata", CV_NODE_SEQ); cvStartWriteStruct(*fs, "manydata", CV_NODE_SEQ);
cvStartWriteStruct(*fs, 0, CV_NODE_SEQ | CV_NODE_FLOW); cvStartWriteStruct(*fs, 0, CV_NODE_SEQ | CV_NODE_FLOW);
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
cvWriteRawData(*fs, rawdata.data(), rawdata.size(), "i"); cvWriteRawData(*fs, rawdata.data(), static_cast<int>(rawdata.size()), "i");
cvEndWriteStruct(*fs); cvEndWriteStruct(*fs);
cvWriteString(*fs, 0, str_out.c_str(), 1); cvWriteString(*fs, 0, str_out.c_str(), 1);
cvEndWriteStruct(*fs); cvEndWriteStruct(*fs);
...@@ -211,7 +211,7 @@ TEST(Core_InputOutput_Base64, valid) ...@@ -211,7 +211,7 @@ TEST(Core_InputOutput_Base64, valid)
cvWriteString(*fs, 0, str_out.c_str(), 1); cvWriteString(*fs, 0, str_out.c_str(), 1);
cvStartWriteStruct(*fs, 0, CV_NODE_SEQ | CV_NODE_FLOW, "binary"); cvStartWriteStruct(*fs, 0, CV_NODE_SEQ | CV_NODE_FLOW, "binary");
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++)
cvWriteRawData(*fs, rawdata.data(), rawdata.size(), "i"); cvWriteRawData(*fs, rawdata.data(), static_cast<int>(rawdata.size()), "i");
cvEndWriteStruct(*fs); cvEndWriteStruct(*fs);
cvEndWriteStruct(*fs); cvEndWriteStruct(*fs);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment