3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed build of test_color.cpp on non-Windows OSs

Browse Source
This commit is contained in:
enricoturri1966 2021-12-22 11:31:35 +01:00
parent c44fd43307
commit ab99a7865f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/GLCanvas3D.cpp
View File

@ -5377,7 +5377,9 @@ void GLCanvas3D::_render_overlays()
void GLCanvas3D::_render_volumes_for_picking() const void GLCanvas3D::_render_volumes_for_picking() const
{ {
#if !ENABLE_COLOR_CLASSES
static const GLfloat INV_255 = 1.0f / 255.0f; static const GLfloat INV_255 = 1.0f / 255.0f;
#endif // !ENABLE_COLOR_CLASSES
// do not cull backfaces to show broken geometry, if any // do not cull backfaces to show broken geometry, if any
glsafe(::glDisable(GL_CULL_FACE)); glsafe(::glDisable(GL_CULL_FACE));

4
tests/libslic3r/test_color.cpp
View File

@ -9,7 +9,7 @@ using namespace Slic3r;
SCENARIO("Color encoding/decoding cycle", "[Color]") { SCENARIO("Color encoding/decoding cycle", "[Color]") {
GIVEN("Color") { GIVEN("Color") {
const ColorRGB src_rgb(unsigned char(255), unsigned char(127), unsigned char(63)); const ColorRGB src_rgb(static_cast<unsigned char>(255), static_cast<unsigned char>(127), static_cast<unsigned char>(63));
WHEN("apply encode/decode cycle") { WHEN("apply encode/decode cycle") {
const std::string encoded = encode_color(src_rgb); const std::string encoded = encode_color(src_rgb);
ColorRGB res_rgb; ColorRGB res_rgb;
@ -24,7 +24,7 @@ SCENARIO("Color encoding/decoding cycle", "[Color]") {
SCENARIO("Color picking encoding/decoding cycle", "[Color]") { SCENARIO("Color picking encoding/decoding cycle", "[Color]") {
GIVEN("Picking color") { GIVEN("Picking color") {
const ColorRGB src_rgb(unsigned char(255), unsigned char(127), unsigned char(63)); const ColorRGB src_rgb(static_cast<unsigned char>(255), static_cast<unsigned char>(127), static_cast<unsigned char>(63));
WHEN("apply encode/decode cycle") { WHEN("apply encode/decode cycle") {
const unsigned int encoded = picking_encode(src_rgb.r_uchar(), src_rgb.g_uchar(), src_rgb.b_uchar()); const unsigned int encoded = picking_encode(src_rgb.r_uchar(), src_rgb.g_uchar(), src_rgb.b_uchar());
const ColorRGBA res_rgba = picking_decode(encoded); const ColorRGBA res_rgba = picking_decode(encoded);