From 5d7144cf298c2d4eef1e55455d4ea8c9cf79a815 Mon Sep 17 00:00:00 2001 From: Filip Sykala Date: Wed, 18 May 2022 15:22:37 +0200 Subject: [PATCH] Fix ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:656:11: warning: unused variable 'icon_width_with_spacing' [-Wunused-variable] ../src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp:57:10: warning: 'finalize' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] ../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1381:35: warning: format string is not a string literal (potentially insecure) [-Wformat-security] ../src/slic3r/GUI/Jobs/CreateFontNameImageJob.cpp:102:23: warning: unused variable 'border' [-Wunused-variable] --- src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 3 +-- src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp index 861a41c7c..6e1922a16 100644 --- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp +++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp @@ -653,7 +653,6 @@ void GLGizmoEmboss::initialize() // make size pair number if (cfg.icon_width % 2 != 0) ++cfg.icon_width; - float icon_width_with_spacing = cfg.icon_width + space; cfg.delete_pos_x = cfg.max_font_name_width + space; int count_line_of_text = 3; cfg.text_size = ImVec2(-FLT_MIN, line_height_with_spacing * count_line_of_text); @@ -1378,7 +1377,7 @@ void GLGizmoEmboss::draw_font_list() } } if (ImGui::IsItemHovered()) - ImGui::SetTooltip(face_name.ToUTF8().data()); + ImGui::SetTooltip("%s", face_name.ToUTF8().data()); if (is_selected) ImGui::SetItemDefaultFocus(); if (!m_face_names.exist_textures[index] && ImGui::IsItemVisible()) { diff --git a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp index 1e380fc6d..7ea6fe0e7 100644 --- a/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp +++ b/src/slic3r/GUI/Jobs/CreateFontNameImageJob.hpp @@ -35,7 +35,7 @@ struct FontImageData // texture meta data GLenum format = GL_ALPHA, type = GL_UNSIGNED_BYTE; - GLint level = 0, border = 0; + GLint level = 0; }; /// @@ -59,7 +59,7 @@ public: /// /// /// - void finalize(bool canceled, std::exception_ptr &); + void finalize(bool canceled, std::exception_ptr &) override; }; } // namespace Slic3r::GUI