mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: compile warings caused by 64bit shift 

jira:NONE

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ibce8e160a922c266bfb9b6a52fad01466fee8bef
This commit is contained in:
xun.zhang 2024-08-21 15:09:49 +08:00 committed by lane.wei
parent 1525c3c3ac
commit c6251b4d64
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libslic3r/FilamentGroup.cpp
View File

@ -208,7 +208,7 @@ namespace Slic3r
int used_filament_num = used_filaments.size(); int used_filament_num = used_filaments.size();
bool have_enough_size = (used_filament_num <= (m_max_group_size[0] + m_max_group_size[1])); bool have_enough_size = (used_filament_num <= (m_max_group_size[0] + m_max_group_size[1]));
uint64_t max_group_num = static_cast<uint64_t>(1 << used_filament_num); uint64_t max_group_num = (static_cast<uint64_t>(1) << used_filament_num);
int best_cost = std::numeric_limits<int>::max(); int best_cost = std::numeric_limits<int>::max();
std::vector<int>best_label; std::vector<int>best_label;
@ -228,7 +228,7 @@ namespace Slic3r
std::set<int>group_0, group_1; std::set<int>group_0, group_1;
for (int j = 0; j < used_filament_num; ++j) { for (int j = 0; j < used_filament_num; ++j) {
if (i & static_cast<uint64_t>(1 << j)) if (i & (static_cast<uint64_t>(1) << j))
group_1.insert(used_filaments[j]); group_1.insert(used_filaments[j]);
else else
group_0.insert(used_filaments[j]); group_0.insert(used_filaments[j]);