3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-28 11:11:16 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' into tm_sla_printer_mirror

Browse source
This commit is contained in:
tamasmeszaros 2019-06-05 15:10:02 +02:00
commit 97cbb5344e
109 changed files with 25034 additions and 8806 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libslic3r/SLA/SLARaster.cpp
View file

@ -20,7 +20,7 @@
#include <agg/agg_path_storage.h>
// Experimental minz image write:
#include <miniz/miniz_tdef.h>
#include <miniz.h>
namespace Slic3r {

4
src/libslic3r/SLA/SLASupportTree.cpp
View file

@ -757,8 +757,8 @@ public:
template<class T> inline const Pillar& pillar(T id) const {
static_assert(std::is_integral<T>::value, "Invalid index type");
assert(id >= 0 && id < m_pillars.size() &&
id < std::numeric_limits<size_t>::max());
assert(id >= 0 && size_t(id) < m_pillars.size() &&
size_t(id) < std::numeric_limits<size_t>::max());
return m_pillars[size_t(id)];
}