Skip to content

Commit

Permalink
Merge pull request #2066 from SergioRAgostinho/ply_parser_warn
Browse files Browse the repository at this point in the history
Removed unused member from ply_parser
  • Loading branch information
taketwo authored Nov 10, 2017
2 parents 6555b9a + 2cc02ea commit 0f0a872
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 13 deletions.
5 changes: 1 addition & 4 deletions io/include/pcl/io/ply/ply_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,7 @@ namespace pcl
typedef int flags_type;
enum flags { };

ply_parser (flags_type flags = 0) :
flags_ (flags),
ply_parser () :
comment_callback_ (), obj_info_callback_ (), end_header_callback_ (),
line_number_ (0), current_element_ ()
{}
Expand Down Expand Up @@ -391,8 +390,6 @@ namespace pcl
end_element_callback_type end_element_callback;
std::vector<boost::shared_ptr<property> > properties;
};

flags_type flags_;

info_callback_type info_callback_;
warning_callback_type warning_callback_;
Expand Down
3 changes: 1 addition & 2 deletions io/src/ply_io.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -517,8 +517,7 @@ pcl::PLYReader::vertexListPropertyEndCallback () {}
bool
pcl::PLYReader::parse (const std::string& istream_filename)
{
pcl::io::ply::ply_parser::flags_type ply_parser_flags = 0;
pcl::io::ply::ply_parser ply_parser (ply_parser_flags);
pcl::io::ply::ply_parser ply_parser;

ply_parser.info_callback (boost::bind (&pcl::PLYReader::infoCallback, this, boost::ref (istream_filename), _1, _2));
ply_parser.warning_callback (boost::bind (&pcl::PLYReader::warningCallback, this, boost::ref (istream_filename), _1, _2));
Expand Down
3 changes: 1 addition & 2 deletions io/tools/ply/ply2obj.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,7 @@ ply_to_obj_converter::face_end ()
bool
ply_to_obj_converter::convert (std::istream&, const std::string& istream_filename, std::ostream& ostream, const std::string&)
{
pcl::io::ply::ply_parser::flags_type ply_parser_flags = 0;
pcl::io::ply::ply_parser ply_parser (ply_parser_flags);
pcl::io::ply::ply_parser ply_parser;

ply_parser.info_callback (boost::bind (&ply_to_obj_converter::info_callback, this, boost::ref (istream_filename), _1, _2));
ply_parser.warning_callback (boost::bind (&ply_to_obj_converter::warning_callback, this, boost::ref (istream_filename), _1, _2));
Expand Down
4 changes: 1 addition & 3 deletions io/tools/ply/ply2ply.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -339,9 +339,7 @@ ply_to_ply_converter::end_header_callback()
bool
ply_to_ply_converter::convert (const std::string &ifilename, std::istream&, std::ostream& ostream)
{
pcl::io::ply::ply_parser::flags_type ply_parser_flags = 0;

pcl::io::ply::ply_parser ply_parser(ply_parser_flags);
pcl::io::ply::ply_parser ply_parser;

ply_parser.info_callback(boost::bind(&ply_to_ply_converter::info_callback, this, boost::ref(ifilename), _1, _2));
ply_parser.warning_callback(boost::bind(&ply_to_ply_converter::warning_callback, this, boost::ref(ifilename), _1, _2));
Expand Down
3 changes: 1 addition & 2 deletions io/tools/ply/ply2raw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,7 @@ ply_to_raw_converter::face_end () {}
bool
ply_to_raw_converter::convert (std::istream&, const std::string& istream_filename, std::ostream& ostream, const std::string&)
{
pcl::io::ply::ply_parser::flags_type ply_parser_flags = 0;
pcl::io::ply::ply_parser ply_parser (ply_parser_flags);
pcl::io::ply::ply_parser ply_parser;

ply_parser.info_callback (boost::bind (&ply_to_raw_converter::info_callback, this, boost::ref (istream_filename), _1, _2));
ply_parser.warning_callback (boost::bind (&ply_to_raw_converter::warning_callback, this, boost::ref (istream_filename), _1, _2));
Expand Down

0 comments on commit 0f0a872

Please sign in to comment.