3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-12 01:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed build on Mac and Linux

Browse source
This commit is contained in:
Enrico Turri 2019-02-26 13:27:41 +01:00
parent e1eff8fa5c
commit f84591e570
2 changed files with 0 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/slic3r/GUI/GLTexture.hpp
View file

@ -38,10 +38,7 @@ namespace GUI {
virtual ~GLTexture();
bool load_from_file(const std::string& filename, bool use_mipmaps);
#if ENABLE_TEXTURES_FROM_SVG
bool load_from_svg_file(const std::string& filename, bool use_mipmaps, unsigned int max_size_px);
#endif // ENABLE_TEXTURES_FROM_SVG
#if ENABLE_SVG_ICONS
// meanings of states: (std::pair<int, bool>)
// first field (int):
// 0 -> no changes
@ -51,7 +48,6 @@ namespace GUI {
// false -> no changes
// true -> add background color
bool load_from_svg_files_as_sprites_array(const std::vector<std::string>& filenames, const std::vector<std::pair<int, bool>>& states, unsigned int sprite_size_px);
#endif // ENABLE_SVG_ICONS
void reset();
unsigned int get_id() const { return m_id; }
@ -65,11 +61,9 @@ namespace GUI {
protected:
unsigned int generate_mipmaps(wxImage& image);
#if ENABLE_TEXTURES_FROM_SVG
private:
bool load_from_png(const std::string& filename, bool use_mipmaps);
bool load_from_svg(const std::string& filename, bool use_mipmaps, unsigned int max_size_px);
#endif // ENABLE_TEXTURES_FROM_SVG
};
} // namespace GUI