Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 18:50:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix warning in ByteCountCoded<>

Browse source
This commit is contained in:
ZappoMan 2014-09-13 07:57:45 -07:00
parent ec23a7a868
commit 973479d1ac
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
libraries/shared/src/ByteCountCoding.h
View file

@ -59,23 +59,15 @@ template<typename T> inline QByteArray& operator>>(QByteArray& in, ByteCountCode
template<typename T> inline QByteArray ByteCountCoded<T>::encode() const { template<typename T> inline QByteArray ByteCountCoded<T>::encode() const {
QByteArray output; QByteArray output;
//qDebug() << "data="; int totalBits = sizeof(data) * BITS_IN_BYTE;
//outputBufferBits((const unsigned char*)&data, sizeof(data)); int valueBits = totalBits;
T totalBits = sizeof(data) * BITS_IN_BYTE;
//qDebug() << "totalBits=" << totalBits;
T valueBits = totalBits;
bool firstValueFound = false; bool firstValueFound = false;
T temp = data; T temp = data;
T lastBitMask = (T)(1) << (totalBits - 1); T lastBitMask = (T)(1) << (totalBits - 1);
//qDebug() << "lastBitMask=";
//outputBufferBits((const unsigned char*)&lastBitMask, sizeof(lastBitMask));
// determine the number of bits that the value takes // determine the number of bits that the value takes
for (int bitAt = 0; bitAt < totalBits; bitAt++) { for (size_t bitAt = 0; bitAt < totalBits; bitAt++) {
T bitValue = (temp & lastBitMask) == lastBitMask; T bitValue = (temp & lastBitMask) == lastBitMask;
//qDebug() << "bitValue[" << bitAt <<"]=" << bitValue;
if (!firstValueFound) { if (!firstValueFound) {
if (bitValue == 0) { if (bitValue == 0) {
valueBits--; valueBits--;
@ -85,17 +77,12 @@ template<typename T> inline QByteArray ByteCountCoded<T>::encode() const {
} }
temp = temp << 1; temp = temp << 1;
} }
//qDebug() << "valueBits=" << valueBits;
// calculate the number of total bytes, including our header // calculate the number of total bytes, including our header
// BITS_IN_BYTE-1 because we need to code the number of bytes in the header // BITS_IN_BYTE-1 because we need to code the number of bytes in the header
// + 1 because we always take at least 1 byte, even if number of bits is less than a bytes worth // + 1 because we always take at least 1 byte, even if number of bits is less than a bytes worth
int numberOfBytes = (valueBits / (BITS_IN_BYTE - 1)) + 1; size_t numberOfBytes = (valueBits / (BITS_IN_BYTE - 1)) + 1;
//qDebug() << "numberOfBytes=" << numberOfBytes;
//int numberOfBits = numberOfBytes + valueBits;
//qDebug() << "numberOfBits=" << numberOfBits;
output.fill(0, numberOfBytes); output.fill(0, numberOfBytes);
// next pack the number of header bits in, the first N-1 to be set to 1, the last to be set to 0 // next pack the number of header bits in, the first N-1 to be set to 1, the last to be set to 0