From ed04dbb9420946b21e971fbce23b46fa4d23b5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 27 Feb 2023 16:16:09 +0100 Subject: [PATCH] Use vector instead of list --- src/OpenMesh/Core/IO/reader/PLYReader.cc | 6 ++---- src/OpenMesh/Core/IO/reader/PLYReader.hh | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.cc b/src/OpenMesh/Core/IO/reader/PLYReader.cc index 6ca341f7..14aa8402 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.cc +++ b/src/OpenMesh/Core/IO/reader/PLYReader.cc @@ -137,8 +137,8 @@ bool _PLYReader_::read(std::istream& _in, BaseImporter& _bi, Options& _opt) { // Add TextureFiles int texture_index = 0; - for(auto texture_file = texture_files_.begin(); texture_file != texture_files_.end(); texture_file++) { - _bi.add_texture_information(texture_index++, *texture_file); + for(auto const & texture_file : texture_files_) { + _bi.add_texture_information(texture_index++, texture_file); } // filter relevant options for reading @@ -1351,10 +1351,8 @@ bool _PLYReader_::can_u_read(std::istream& _is) const { if (keyword == "comment") { std::getline(_is, line); - std::cerr << "Comment detected : " << line << std::endl; // TextureFile if (line.rfind(" TextureFile ", 0) == 0) { - std::cerr << "Comment is Texture File: " << line.substr(13) << std::endl; texture_files_.push_back(line.substr(13)); } } else if (keyword == "element") { diff --git a/src/OpenMesh/Core/IO/reader/PLYReader.hh b/src/OpenMesh/Core/IO/reader/PLYReader.hh index f820396a..0590ff6b 100644 --- a/src/OpenMesh/Core/IO/reader/PLYReader.hh +++ b/src/OpenMesh/Core/IO/reader/PLYReader.hh @@ -201,7 +201,7 @@ private: mutable std::vector< ElementInfo > elements_; - mutable std::list< std::string > texture_files_; + mutable std::vector< std::string > texture_files_; template inline void read(_PLYReader_::ValueType _type, std::istream& _in, T& _value, OpenMesh::GenProg::TrueType /*_binary*/) const