3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of 2.1.0-rc2 Fails to open "certain' STL files #2906

Browse Source
This commit is contained in:
bubnikv 2019-09-12 10:16:52 +02:00
parent 1b1899e24f
commit 6f4fff1b29
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/admesh/stlinit.cpp
View File

@ -179,12 +179,12 @@ static bool stl_read(stl_file *stl, FILE *fp, int first_facet, bool first)
// Some G-code generators tend to produce text after "endloop" and "endfacet". Just ignore it. // Some G-code generators tend to produce text after "endloop" and "endfacet". Just ignore it.
char buf[2048]; char buf[2048];
fgets(buf, 2047, fp); fgets(buf, 2047, fp);
bool endloop_ok = strncmp(buf, "endloop", 7) == 0 && (buf[7] == '\n' || buf[7] == ' ' || buf[7] == '\t'); bool endloop_ok = strncmp(buf, "endloop", 7) == 0 && (buf[7] == '\r' || buf[7] == '\n' || buf[7] == ' ' || buf[7] == '\t');
assert(endloop_ok); assert(endloop_ok);
// Skip the trailing whitespaces and empty lines. // Skip the trailing whitespaces and empty lines.
fscanf(fp, " "); fscanf(fp, " ");
fgets(buf, 2047, fp); fgets(buf, 2047, fp);
bool endfacet_ok = strncmp(buf, "endfacet", 8) == 0 && (buf[8] == '\n' || buf[8] == ' ' || buf[8] == '\t'); bool endfacet_ok = strncmp(buf, "endfacet", 8) == 0 && (buf[8] == '\r' || buf[8] == '\n' || buf[8] == ' ' || buf[8] == '\t');
assert(endfacet_ok); assert(endfacet_ok);
if (res_normal != 3 || res_outer_loop != 0 || res_vertex1 != 3 || res_vertex2 != 3 || res_vertex3 != 3 || ! endloop_ok || ! endfacet_ok) { if (res_normal != 3 || res_outer_loop != 0 || res_vertex1 != 3 || res_vertex2 != 3 || res_vertex3 != 3 || ! endloop_ok || ! endfacet_ok) {
BOOST_LOG_TRIVIAL(error) << "Something is syntactically very wrong with this ASCII STL! "; BOOST_LOG_TRIVIAL(error) << "Something is syntactically very wrong with this ASCII STL! ";