From 09711d86ed8b99d1420a1b8926253f9dbf9f611b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 21 May 2013 18:03:14 -0700 Subject: [PATCH] fix compiler warning --- libraries/voxels/src/VoxelTree.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/voxels/src/VoxelTree.cpp b/libraries/voxels/src/VoxelTree.cpp index 31d68ecc45..4270e90eec 100644 --- a/libraries/voxels/src/VoxelTree.cpp +++ b/libraries/voxels/src/VoxelTree.cpp @@ -352,10 +352,9 @@ void VoxelTree::readCodeColorBufferToTree(unsigned char *codeColorBuffer, bool d } void VoxelTree::processRemoveVoxelBitstream(unsigned char * bitstream, int bufferSizeBytes) { - // XXXBHG: validate buffer is at least 4 bytes long? other guards?? - unsigned short int itemNumber = (*((unsigned short int*)&bitstream[1])); - int atByte = 3; - unsigned char* pVoxelData = (unsigned char*)&bitstream[3]; + //unsigned short int itemNumber = (*((unsigned short int*)&bitstream[sizeof(PACKET_HEADER)])); + int atByte = sizeof(short int) + sizeof(PACKET_HEADER); + unsigned char* pVoxelData = (unsigned char*)&bitstream[atByte]; while (atByte < bufferSizeBytes) { unsigned char octets = (unsigned char)*pVoxelData; int voxelDataSize = bytesRequiredForCodeLength(octets)+3; // 3 for color!