Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk

src/admesh/stl_io.cpp

@@ -151,7 +151,7 @@ bool stl_write_binary(stl_file *stl, const char *file, const char *label)
 	memcpy(buffer, &stl->stats.number_of_facets, 4);
 	stl_internal_reverse_quads(buffer, 4);
 	fwrite(buffer, 4, 1, fp);
-	for (i = 0; i < stl->stats.number_of_facets; ++ i) {
+	for (size_t i = 0; i < stl->stats.number_of_facets; ++ i) {
 		memcpy(buffer, stl->facet_start + i, 50);
 		// Convert to little endian.
 		stl_internal_reverse_quads(buffer, 48);

src/libslic3r/Format/objparser.cpp

@@ -159,9 +159,12 @@ static bool obj_parseline(const char *line, ObjData &data)
 				line = endptr;
 				EATWS();
 			}
-			if (*line != 0)
+            // the following check is commented out because there may be obj files containing extra data, as those generated by Meshlab,
-				return false;
+            // see https://dev.prusa3d.com/browse/SPE-1019 for an example,
-			data.coordinates.push_back((float)x);
+            // and this would lead to a crash because no vertex would be stored 
+//            if (*line != 0)
+//                return false;
+            data.coordinates.push_back((float)x);
 			data.coordinates.push_back((float)y);
 			data.coordinates.push_back((float)z);
 			data.coordinates.push_back((float)w);
@@ -210,16 +213,16 @@ static bool obj_parseline(const char *line, ObjData &data)
 				}
 			}
 			if (vertex.coordIdx < 0)
-				vertex.coordIdx += data.coordinates.size() / 4;
+                vertex.coordIdx += (int)data.coordinates.size() / 4;
-			else
+            else
 				-- vertex.coordIdx;
 			if (vertex.normalIdx < 0)
-				vertex.normalIdx += data.normals.size() / 3;
+                vertex.normalIdx += (int)data.normals.size() / 3;
-			else
+            else
 				-- vertex.normalIdx;
 			if (vertex.textureCoordIdx < 0)
-				vertex.textureCoordIdx += data.textureCoordinates.size() / 3;
+                vertex.textureCoordIdx += (int)data.textureCoordinates.size() / 3;
-			else
+            else
 				-- vertex.textureCoordIdx;
 			data.vertices.push_back(vertex);
 			EATWS();
@@ -256,8 +259,8 @@ static bool obj_parseline(const char *line, ObjData &data)
 		// printf("usemtl %s\r\n", line);
 		EATWS();
 		ObjUseMtl usemtl;
-		usemtl.vertexIdxFirst = data.vertices.size();
+        usemtl.vertexIdxFirst = (int)data.vertices.size();
-		usemtl.name = line;
+        usemtl.name = line;
 		data.usemtls.push_back(usemtl);
 		break;
 	}
@@ -272,8 +275,8 @@ static bool obj_parseline(const char *line, ObjData &data)
 		if (*line != 0)
 			return false;
 		ObjObject object;
-		object.vertexIdxFirst = data.vertices.size();
+        object.vertexIdxFirst = (int)data.vertices.size();
-		object.name = line;
+        object.name = line;
 		data.objects.push_back(object);
 		break;
 	}
@@ -282,8 +285,8 @@ static bool obj_parseline(const char *line, ObjData &data)
 		// g [group name]
 		// printf("group %s\r\n", line);
 		ObjGroup group;
-		group.vertexIdxFirst = data.vertices.size();
+        group.vertexIdxFirst = (int)data.vertices.size();
-		group.name = line;
+        group.name = line;
 		data.groups.push_back(group);
 		break;
 	}
@@ -303,8 +306,8 @@ static bool obj_parseline(const char *line, ObjData &data)
 		if (*line != 0)
 			return false;
 		ObjSmoothingGroup group;
-		group.vertexIdxFirst   = data.vertices.size();
+        group.vertexIdxFirst = (int)data.vertices.size();
-		group.smoothingGroupID = g;
+        group.smoothingGroupID = g;
 		data.smoothingGroups.push_back(group);
 		break;
 	}
@@ -341,8 +344,9 @@ bool objparse(const char *path, ObjData &data)
 			lenPrev = len - lastLine;
 			memmove(buf, buf + lastLine, lenPrev);
 		}
-	} catch (std::bad_alloc &ex) {
+    }
-		printf("Out of memory\r\n");
+    catch (std::bad_alloc&) {
+        printf("Out of memory\r\n");
 	}
 	::fclose(pFile);
 

src/libslic3r/GCode.cpp

@@ -2688,11 +2688,11 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
         // PrusaMultiMaterial::Writer may generate GCodeAnalyzer::Height_Tag and GCodeAnalyzer::Width_Tag lines without updating m_last_height and m_last_width
         // so, if the last role was erWipeTower we force export of GCodeAnalyzer::Height_Tag and GCodeAnalyzer::Width_Tag lines
         bool last_was_wipe_tower = (m_last_analyzer_extrusion_role == erWipeTower);
+        char buf[64];
 
         if (path.role() != m_last_analyzer_extrusion_role)
         {
             m_last_analyzer_extrusion_role = path.role();
-            char buf[32];
             sprintf(buf, ";%s%d\n", GCodeAnalyzer::Extrusion_Role_Tag.c_str(), int(m_last_analyzer_extrusion_role));
             gcode += buf;
         }
@@ -2700,8 +2700,6 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
         if (last_was_wipe_tower || (m_last_mm3_per_mm != path.mm3_per_mm))
         {
             m_last_mm3_per_mm = path.mm3_per_mm;
-
-            char buf[32];
             sprintf(buf, ";%s%f\n", GCodeAnalyzer::Mm3_Per_Mm_Tag.c_str(), m_last_mm3_per_mm);
             gcode += buf;
         }
@@ -2709,8 +2707,6 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
         if (last_was_wipe_tower || (m_last_width != path.width))
         {
             m_last_width = path.width;
-
-            char buf[32];
             sprintf(buf, ";%s%f\n", GCodeAnalyzer::Width_Tag.c_str(), m_last_width);
             gcode += buf;
         }
@@ -2718,8 +2714,6 @@ std::string GCode::_extrude(const ExtrusionPath &path, std::string description,
         if (last_was_wipe_tower || (m_last_height != path.height))
         {
             m_last_height = path.height;
-
-            char buf[32];
             sprintf(buf, ";%s%f\n", GCodeAnalyzer::Height_Tag.c_str(), m_last_height);
             gcode += buf;
         }