Correct read message count from proto naming.

Author: alexmillane

voxblox/include/voxblox/io/layer_io_inl.h

@@ -36,8 +36,8 @@ bool LoadBlocksFromFile(
   do {
     // Get number of messages
     uint32_t num_protos;
-    if (!utils::readProtoMsgCountToStream(&proto_file, &num_protos,
-                                          &tmp_byte_offset)) {
+    if (!utils::readProtoMsgCountFromStream(&proto_file, &num_protos,
+                                            &tmp_byte_offset)) {
       LOG(ERROR) << "Could not read number of messages.";
       return false;
     }
@@ -150,8 +150,8 @@ bool LoadLayer(const std::string& file_path, const bool multiple_layer_support,
   do {
     // Get number of messages
     uint32_t num_protos;
-    if (!utils::readProtoMsgCountToStream(&proto_file, &num_protos,
-                                          &tmp_byte_offset)) {
+    if (!utils::readProtoMsgCountFromStream(&proto_file, &num_protos,
+                                            &tmp_byte_offset)) {
       LOG(ERROR) << "Could not read number of messages.";
       return false;
     }

voxblox/include/voxblox/utils/protobuf_utils.h

@@ -10,8 +10,9 @@
 namespace voxblox {
 
 namespace utils {
-bool readProtoMsgCountToStream(std::fstream* stream_in, uint32_t* message_count,
-                               uint64_t* byte_offset);
+bool readProtoMsgCountFromStream(std::fstream* stream_in,
+                                 uint32_t* message_count,
+                                 uint64_t* byte_offset);
 
 bool writeProtoMsgCountToStream(uint32_t message_count,
                                 std::fstream* stream_out);

voxblox/src/utils/protobuf_utils.cc

@@ -7,8 +7,9 @@
 namespace voxblox {
 
 namespace utils {
-bool readProtoMsgCountToStream(std::fstream* stream_in, uint32_t* message_count,
-                               uint64_t* byte_offset) {
+bool readProtoMsgCountFromStream(std::fstream* stream_in,
+                                 uint32_t* message_count,
+                                 uint64_t* byte_offset) {
   CHECK_NOTNULL(stream_in);
   CHECK_NOTNULL(message_count);
   CHECK_NOTNULL(byte_offset);