History

make compression optional

ZappoMan committed 12 years ago

Commit 6c640751 parent a590f386 files · +67 −36Browse files

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

Unified · Split

interface/src/VoxelSystem.cpp+2−2
@@ -595,7 +595,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 594 unmodified lines
595 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),595 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
596 "readBitstreamToTree()");596 "readBitstreamToTree()");
597 // ask the VoxelTree to read the bitstream into the tree597 // ask the VoxelTree to read the bitstream into the tree
598 ReadBitstreamToTreeParams args(WANT_COLOR, NO_EXISTS_BITS /*WANT_EXISTS_BITS*/, NULL, getDataSourceUUID());598 ReadBitstreamToTreeParams args(WANT_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
599 lockTree();599 lockTree();
600 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);600 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);
601 unlockTree();601 unlockTree();
@@ -605,7 +605,7 @@ int VoxelSystem::parseData(unsigned char* sourceBuffer, int numBytes) { · 3 unmodified lines
605 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),605 PerformanceWarning warn(Menu::getInstance()->isOptionChecked(MenuOption::PipelineWarnings),
606 "readBitstreamToTree()");606 "readBitstreamToTree()");
607 // ask the VoxelTree to read the MONOCHROME bitstream into the tree607 // ask the VoxelTree to read the MONOCHROME bitstream into the tree
608 ReadBitstreamToTreeParams args(NO_COLOR, NO_EXISTS_BITS /*WANT_EXISTS_BITS*/, NULL, getDataSourceUUID());608 ReadBitstreamToTreeParams args(NO_COLOR, WANT_EXISTS_BITS, NULL, getDataSourceUUID());
609 lockTree();609 lockTree();
610 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);610 _tree->readBitstreamToTree(voxelData, numBytes - numBytesPacketHeader, args);
611 unlockTree();611 unlockTree();