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

solve warning for IOS

Browse Source 
Two test are still needed:

1. Verify the Base64 data.
2. Read an old YML file for compatibility test.
This commit is contained in:
MYLS
2016-06-19 02:44:39 +08:00
parent 958263d245
commit 9faa2a7fd0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -298,7 +298,6 @@ namespace base64
bool flush(); bool flush();
private: private:
static const size_t BUFFER_LEN = 120U; static const size_t BUFFER_LEN = 120U;
uchar * dst_beg;
uchar * dst_cur; uchar * dst_cur;
uchar * dst_end; uchar * dst_end;
std::vector<uchar> base64_buffer; std::vector<uchar> base64_buffer;
@@ -6329,8 +6328,7 @@ bool base64::read_base64_header(std::string const & header, int & byte_size, std
***************************************************************************/ ***************************************************************************/
base64::Base64ContextParser::Base64ContextParser(uchar * buffer, size_t size) base64::Base64ContextParser::Base64ContextParser(uchar * buffer, size_t size)
: dst_beg(buffer) : dst_cur(buffer)
, dst_cur(buffer)
, dst_end(buffer + size) , dst_end(buffer + size)
, base64_buffer(BUFFER_LEN) , base64_buffer(BUFFER_LEN)
, src_beg(0) , src_beg(0)
@@ -6840,7 +6838,7 @@ private:
{ {
size_t cnt = 0; size_t cnt = 0;
char type = '\0'; char type = '\0';
int offset = 0; size_t offset = 0;
std::istringstream iss(dt); std::istringstream iss(dt);
while (!iss.eof()) { while (!iss.eof()) {
@@ -6888,7 +6886,7 @@ private:
offset = static_cast<size_t>(cvAlign(static_cast<int>(offset), static_cast<int>(size))); offset = static_cast<size_t>(cvAlign(static_cast<int>(offset), static_cast<int>(size)));
pack.offset = offset; pack.offset = offset;
offset += static_cast<int>(size); offset += size;
/* set type */ /* set type */
switch (type) switch (type)