From 1d2bc5afec46aa83a1f71020cde825619a7e57b1 Mon Sep 17 00:00:00 2001 From: Filip Sykala - NTB T15p Date: Thu, 7 Sep 2023 06:37:49 +0200 Subject: [PATCH] =?UTF-8?q?Fix:=20./src/slic3r/GUI/Gizmos/GLGizmoEmboss.cp?= =?UTF-8?q?p:1155:6:=20warning:=20=E2=80=98void=20{anonymous}::init=5Fnew?= =?UTF-8?q?=5Ftext=5Fline(Slic3r::GUI::TextLinesModel&,=20const=20Transfor?= =?UTF-8?q?m3d&,=20const=20Slic3r::ModelObject&,=20Slic3r::GUI::Emboss::St?= =?UTF-8?q?yleManager&)=E2=80=99=20defined=20but=20not=20used=20[-Wunused-?= =?UTF-8?q?function]=20../src/slic3r/Utils/EmbossStyleManager.cpp:650:68:?= =?UTF-8?q?=20warning:=20=E2=80=98depth=E2=80=99=20may=20be=20used=20unini?= =?UTF-8?q?tialized=20in=20this=20function=20[-Wmaybe-uninitialized]=20../?= =?UTF-8?q?src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp:1169:17:=20warning:=20unus?= =?UTF-8?q?ed=20variable=20=E2=80=98data=E2=80=99=20[-Wunused-variable]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 16 ---------------- src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp | 2 -- src/slic3r/GUI/IconManager.cpp | 2 +- src/slic3r/Utils/EmbossStyleManager.cpp | 5 +++-- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index e2a935a204..022145386c 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -1151,22 +1151,6 @@ void init_text_lines(TextLinesModel &text_lines, const Selection& selection, /* mv_trafo = mv_trafo * (es.fix_3mf_tr->inverse()); text_lines.init(mv_trafo, volumes, style_manager, count_lines); } - -void init_new_text_line(TextLinesModel &text_lines, const Transform3d& new_text_tr, const ModelObject& mo, /* const*/ StyleManager &style_manager) -{ - // prepare volumes to slice - ModelVolumePtrs volumes; - volumes.reserve(mo.volumes.size()); - for (ModelVolume *volume : mo.volumes) { - // only part could be surface for volumes - if (!volume->is_model_part()) - continue; - volumes.push_back(volume); - } - unsigned count_lines = 1; - text_lines.init(new_text_tr, volumes, style_manager, count_lines); -} - } void GLGizmoEmboss::reinit_text_lines(unsigned count_lines) { diff --git a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp index b41f896a22..a7bc41a283 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoSVG.cpp @@ -1166,8 +1166,6 @@ bool GLGizmoSVG::process() void GLGizmoSVG::close() { - ImDrawData *data = ImGui::GetDrawData(); - // close gizmo == open it again auto &mng = m_parent.get_gizmos_manager(); if (mng.get_current_type() == GLGizmosManager::Svg) diff --git a/src/slic3r/GUI/IconManager.cpp b/src/slic3r/GUI/IconManager.cpp index 117ddf13e6..a0637189f1 100644 --- a/src/slic3r/GUI/IconManager.cpp +++ b/src/slic3r/GUI/IconManager.cpp @@ -92,7 +92,7 @@ IconManager::Icons IconManager::init(const InitTypes &input) ImVector pack_rects; pack_rects.resize(input.size()); memset(pack_rects.Data, 0, (size_t) pack_rects.size_in_bytes()); - for (int i = 0; i < input.size(); i++) { + for (size_t i = 0; i < input.size(); i++) { const ImVec2 &size = input[i].size; assert(size.x > 1); assert(size.y > 1); diff --git a/src/slic3r/Utils/EmbossStyleManager.cpp b/src/slic3r/Utils/EmbossStyleManager.cpp index c49454cacd..5c368673a1 100644 --- a/src/slic3r/Utils/EmbossStyleManager.cpp +++ b/src/slic3r/Utils/EmbossStyleManager.cpp @@ -645,9 +645,10 @@ std::optional load_style(const Section &app_cfg_section) const std::string default_name = "font_name"; s.name = (name_it == app_cfg_section.end()) ? default_name : name_it->second; - float depth; read(app_cfg_section, APP_CONFIG_FONT_LINE_HEIGHT, fp.size_in_mm); - read(app_cfg_section, APP_CONFIG_FONT_DEPTH, depth);ep.depth = depth; + float depth = 1.; + read(app_cfg_section, APP_CONFIG_FONT_DEPTH, depth); + ep.depth = depth; read(app_cfg_section, APP_CONFIG_FONT_USE_SURFACE, ep.use_surface); read(app_cfg_section, APP_CONFIG_FONT_BOLDNESS, fp.boldness); read(app_cfg_section, APP_CONFIG_FONT_SKEW, fp.skew);