diff options
| author | Marius Kintel <marius@kintel.net> | 2013-05-09 12:32:43 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-05-09 12:32:43 (GMT) |
| commit | 6ee78e7f68e70f121625327aa97f979551e692b3 (patch) | |
| tree | 9804a4fe5f3bf7f547595aaf1e2f6d281e6ef715 | |
| parent | c5ebdb788b63ce8998a85e7c678ed4d46f3ea841 (diff) | |
Handle lack of trailing newline in dat files. Fixes #336
| -rw-r--r-- | src/surface.cc | 2 | ||||
| -rw-r--r-- | testdata/scad/features/surface-simple.dat | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/surface.cc b/src/surface.cc index 46ddc07..7987b99 100644 --- a/src/surface.cc +++ b/src/surface.cc @@ -122,7 +122,7 @@ PolySet *SurfaceNode::evaluate_polyset(class PolySetEvaluator *) const std::getline(stream, line); boost::trim(line); } - if (stream.eof()) break; + if (line.size() == 0 && stream.eof()) break; int col = 0; tokenizer tokens(line, sep); diff --git a/testdata/scad/features/surface-simple.dat b/testdata/scad/features/surface-simple.dat index 32eba08..166c600 100644 --- a/testdata/scad/features/surface-simple.dat +++ b/testdata/scad/features/surface-simple.dat @@ -1,2 +1,6 @@ 0 1 2 3 + +# Comment + + |