From 7e8d9c154d06397a859622316372b73c3baee357 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Mon, 17 Dec 2018 12:11:51 +0100 Subject: [PATCH] WIP: Fix of PrusaControl import. Now the transformation matrices need to be restored as well. --- src/libslic3r/Format/PRUS.cpp | 2 +- src/libslic3r/GCode/WipeTowerPrusaMM.cpp | 1 - src/slic3r/GUI/GLCanvas3D.hpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libslic3r/Format/PRUS.cpp b/src/libslic3r/Format/PRUS.cpp index f79721be7..6c0b055d6 100644 --- a/src/libslic3r/Format/PRUS.cpp +++ b/src/libslic3r/Format/PRUS.cpp @@ -329,7 +329,7 @@ bool load_prus(const char *path, Model *model) if (! mz_zip_reader_file_stat(&archive, i, &stat)) continue; std::vector buffer; - buffer.assign((size_t)stat.m_uncomp_size + 1, 0); + buffer.assign((size_t)stat.m_uncomp_size, 0); res = mz_zip_reader_extract_file_to_mem(&archive, stat.m_filename, (char*)buffer.data(), (size_t)stat.m_uncomp_size, 0); if (res == MZ_FALSE) std::runtime_error(std::string("Error while extracting a file from ") + path); diff --git a/src/libslic3r/GCode/WipeTowerPrusaMM.cpp b/src/libslic3r/GCode/WipeTowerPrusaMM.cpp index b0da3a210..f87969505 100644 --- a/src/libslic3r/GCode/WipeTowerPrusaMM.cpp +++ b/src/libslic3r/GCode/WipeTowerPrusaMM.cpp @@ -487,7 +487,6 @@ WipeTowerPrusaMM::material_type WipeTowerPrusaMM::parse_material(const char *nam return INVALID; } - // Returns gcode to prime the nozzles at the front edge of the print bed. WipeTower::ToolChangeResult WipeTowerPrusaMM::prime( // print_z of the first layer. diff --git a/src/slic3r/GUI/GLCanvas3D.hpp b/src/slic3r/GUI/GLCanvas3D.hpp index ebc2929d9..eecc3261b 100644 --- a/src/slic3r/GUI/GLCanvas3D.hpp +++ b/src/slic3r/GUI/GLCanvas3D.hpp @@ -155,7 +155,7 @@ class GLCanvas3D // float distance; #if !ENABLE_CONSTRAINED_CAMERA_TARGET Vec3d target; -#endif !// ENABLE_CONSTRAINED_CAMERA_TARGET +#endif // ENABLE_CONSTRAINED_CAMERA_TARGET private: #if ENABLE_CONSTRAINED_CAMERA_TARGET