From b90e109b413cba8420aa10c680643efb795f1ac2 Mon Sep 17 00:00:00 2001
From: Filip Sykala - NTB T15p <Filip.Sykala@prusa3d.cz>
Date: Wed, 21 Dec 2022 10:51:02 +0100
Subject: [PATCH] =?UTF-8?q?Fix:=20../src/slic3r/GUI/GLCanvas3D.cpp:3474:46?=
 =?UTF-8?q?:=20warning:=20comparison=20of=20integer=20expressions=20of=20d?=
 =?UTF-8?q?ifferent=20signedness:=20=E2=80=98int=E2=80=99=20and=20?=
 =?UTF-8?q?=E2=80=98std::vector<Slic3r::ModelObject*>::size=5Ftype?=
 =?UTF-8?q?=E2=80=99=20{aka=20=E2=80=98unsigned=20int=E2=80=99}=20[-Wsign-?=
 =?UTF-8?q?compare]=20../src/slic3r/GUI/GLCanvas3D.cpp:3477:58:=20warning:?=
 =?UTF-8?q?=20comparison=20of=20integer=20expressions=20of=20different=20s?=
 =?UTF-8?q?ignedness:=20=E2=80=98int=E2=80=99=20and=20=E2=80=98std::vector?=
 =?UTF-8?q?<Slic3r::ModelVolume*>::size=5Ftype=E2=80=99=20{aka=20=E2=80=98?=
 =?UTF-8?q?unsigned=20int=E2=80=99}=20[-Wsign-compare]=20../src/slic3r/GUI?=
 =?UTF-8?q?/Gizmos/GLGizmoEmboss.cpp:249:62:=20warning:=20comparison=20of?=
 =?UTF-8?q?=20integer=20expressions=20of=20different=20signedness:=20?=
 =?UTF-8?q?=E2=80=98int=E2=80=99=20and=20=E2=80=98std::vector<Slic3r::Mode?=
 =?UTF-8?q?lObject*>::size=5Ftype=E2=80=99=20{aka=20=E2=80=98unsigned=20in?=
 =?UTF-8?q?t=E2=80=99}=20[-Wsign-compare]=20../src/slic3r/GUI/Gizmos/GLGiz?=
 =?UTF-8?q?moEmboss.cpp:3603:39:=20warning:=20comparison=20of=20integer=20?=
 =?UTF-8?q?expressions=20of=20different=20signedness:=20=E2=80=98int?=
 =?UTF-8?q?=E2=80=99=20and=20=E2=80=98std::vector<Slic3r::ModelObject*>::s?=
 =?UTF-8?q?ize=5Ftype=E2=80=99=20{aka=20=E2=80=98unsigned=20int=E2=80=99}?=
 =?UTF-8?q?=20[-Wsign-compare]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/slic3r/GUI/GLCanvas3D.cpp           | 4 ++--
 src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index de912a134..088451b79 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -3471,10 +3471,10 @@ void GLCanvas3D::on_mouse(wxMouseEvent& evt)
         for (int hover_volume_id : m_hover_volume_idxs) { 
             const GLVolume &hover_gl_volume = *m_volumes.volumes[hover_volume_id];
             int object_idx = hover_gl_volume.object_idx();
-            if (object_idx < 0 || object_idx >= m_model->objects.size()) continue;
+            if (object_idx < 0 || static_cast<size_t>(object_idx) >= m_model->objects.size()) continue;
             const ModelObject* hover_object = m_model->objects[object_idx];
             int hover_volume_idx = hover_gl_volume.volume_idx();
-            if (hover_volume_idx < 0 || hover_volume_idx >= hover_object->volumes.size()) continue;
+            if (hover_volume_idx < 0 || static_cast<size_t>(hover_volume_idx) >= hover_object->volumes.size()) continue;
             const ModelVolume* hover_volume = hover_object->volumes[hover_volume_idx];
             if (!hover_volume->text_configuration.has_value()) continue;
             m_selection.add_volumes(Selection::EMode::Volume, {(unsigned) hover_volume_id});
diff --git a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
index 4e4ab5035..ecbfd5a8c 100644
--- a/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
+++ b/src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
@@ -246,7 +246,7 @@ void GLGizmoEmboss::create_volume(ModelVolumeType volume_type)
     DataBase emboss_data = priv::create_emboss_data_base(m_text, m_style_manager);
     const ModelObjectPtrs &objects = selection.get_model()->objects;
     // No selected object so create new object
-    if (selection.is_empty() || object_idx < 0 || object_idx >= objects.size()) {
+    if (selection.is_empty() || object_idx < 0 || static_cast<size_t>(object_idx) >= objects.size()) {
         // create Object on center of screen
         // when ray throw center of screen not hit bed it create object on center of bed
         priv::start_create_object_job(emboss_data, screen_center);
@@ -3600,7 +3600,7 @@ bool priv::start_create_volume_on_surface_job(
     const ModelObjectPtrs &objects = plater->model().objects;
 
     int object_idx = gl_volume->object_idx();
-    if (object_idx < 0 ||  object_idx >= objects.size()) return false;
+    if (object_idx < 0 || static_cast<size_t>(object_idx) >= objects.size()) return false;
     ModelObject *obj = objects[object_idx];
     size_t vol_id = obj->volumes[gl_volume->volume_idx()]->id().id;
     auto cond = RaycastManager::AllowVolumes({vol_id});