diff --git a/src/slic3r/GUI/Auxiliary.cpp b/src/slic3r/GUI/Auxiliary.cpp index c3ea3d703e..8115f1d724 100644 --- a/src/slic3r/GUI/Auxiliary.cpp +++ b/src/slic3r/GUI/Auxiliary.cpp @@ -378,14 +378,15 @@ void AuFile::on_set_cover() } bool result = true; - wxImage thumbnail_img;; + wxImage thumbnail_img; + result = generate_image(m_file_path.string(), thumbnail_img, _3MF_COVER_SIZE); if (result) { auto cover_img_path = dir_path.string() + "/thumbnail_3mf.png"; thumbnail_img.SaveFile(encode_path(cover_img_path.c_str())); } - result = generate_image(m_file_path.string(), thumbnail_img, PRINTER_THUMBNAIL_SMALL_SIZE, GERNERATE_IMAGE_CROP_VERTICAL); + result = generate_image(m_file_path.string(), thumbnail_img, PRINTER_THUMBNAIL_SMALL_SIZE); if (result) { auto small_img_path = dir_path.string() + "/thumbnail_small.png"; thumbnail_img.SaveFile(encode_path(small_img_path.c_str())); diff --git a/src/slic3r/GUI/GUI_Utils.cpp b/src/slic3r/GUI/GUI_Utils.cpp index c2f6600d71..1c472f420d 100644 --- a/src/slic3r/GUI/GUI_Utils.cpp +++ b/src/slic3r/GUI/GUI_Utils.cpp @@ -450,7 +450,7 @@ bool generate_image(const std::string &filename, wxImage &image, wxSize img_size if (method == GERNERATE_IMAGE_RESIZE) { float h_factor = img.GetHeight() / (float) image.GetHeight(); float w_factor = img.GetWidth() / (float) image.GetWidth(); - float factor = std::max(h_factor, w_factor); + float factor = std::min(h_factor, w_factor); int tar_height = (int) ((float) img.GetHeight() / factor); int tar_width = (int) ((float) img.GetWidth() / factor); img = img.Rescale(tar_width, tar_height); @@ -465,7 +465,7 @@ bool generate_image(const std::string &filename, wxImage &image, wxSize img_size return false; } - image.ConvertAlphaToMask(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); + //image.ConvertAlphaToMask(image.GetMaskRed(), image.GetMaskGreen(), image.GetMaskBlue()); return true; }