History

cleanup for coding standard

ZappoMan committed 12 years ago

Commit 25511f91 parent 94584d46 files · +30 −26Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 6 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+8−4
@@ -599,8 +599,10 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 598 unmodified lines
599599 lockTree();
600600 VoxelPacket packet(VOXEL_PACKET_COMPRESSION_DEFAULT);
601601 int compressedSize = numBytes - numBytesPacketHeader;
602− packet.loadCompressedContent(voxelData, compressedSize);
603−printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
602+ packet.loadFinalizedContent(voxelData, compressedSize);
603+ if (Menu::getInstance()->isOptionChecked(MenuOption::ExtraDebugging)) {
604+ qDebug("got packet numBytes=%d finalized size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
605+ }
604606 _tree->readBitstreamToTree(packet.getUncompressedData(), packet.getUncompressedSize(), args);
605607 unlockTree();
606608 }
@@ -613,8 +615,10 @@ printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numByt · 6 unmodified lines
613615 lockTree();
614616 VoxelPacket packet(VOXEL_PACKET_COMPRESSION_DEFAULT);
615617 int compressedSize = numBytes - numBytesPacketHeader;
616− packet.loadCompressedContent(voxelData, compressedSize);
617−printf("got packet numBytes=%d compressed size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
618+ packet.loadFinalizedContent(voxelData, compressedSize);
619+ if (Menu::getInstance()->isOptionChecked(MenuOption::ExtraDebugging)) {
620+ qDebug("got packet numBytes=%d finalized size %d uncompressed size %d\n",numBytes, compressedSize, packet.getUncompressedSize());
621+ }
618622 _tree->readBitstreamToTree(packet.getUncompressedData(), packet.getUncompressedSize(), args);
619623 unlockTree();
620624 }