Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:29:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix some windows warnings in fsbinarystream.cpp

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-03-14 18:11:22 -07:00
parent 0e7e337807
commit 2766860b52
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/external/faceshift/src/fsbinarystream.cpp vendored
View file

@ -160,7 +160,7 @@ void fsBinaryStream::received(long int sz, const char *data) {
new_end = m_end + sz; new_end = m_end + sz;
} }
if (new_end > Size(m_buffer.size())) m_buffer.resize(1.5*new_end); if (new_end > Size(m_buffer.size())) m_buffer.resize((new_end * 15 / 10)); // HIFI: to get 1.5 without warnings
memcpy(&m_buffer[0] + m_end, data, sz); memcpy(&m_buffer[0] + m_end, data, sz);
m_end += sz; m_end += sz;
@ -172,7 +172,7 @@ static bool decodeInfo(fsTrackingData & _trackingData, const std::string &buffer
success &= read_pod<double>(_trackingData.m_timestamp, buffer, start); success &= read_pod<double>(_trackingData.m_timestamp, buffer, start);
unsigned char tracking_successfull = 0; unsigned char tracking_successfull = 0;
success &= read_pod<unsigned char>( tracking_successfull, buffer, start ); success &= read_pod<unsigned char>( tracking_successfull, buffer, start );
_trackingData.m_trackingSuccessful = bool(tracking_successfull); _trackingData.m_trackingSuccessful = bool(tracking_successfull != 0); // HIFI: get rid of windows warning
return success; return success;
} }