Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2019-04-05 12:55:56 +0300
committerEnrico Turri <enricoturri@seznam.cz>2019-04-05 12:55:56 +0300
commit6ca49c05df15a176280a097ebb282f017f558484 (patch)
tree3cf2e90dd73b3e2c650d386c07322b3395590356 /src/slic3r/GUI/GLTexture.cpp
parentd79b090f7c69eb3435a3f17fa21e864e52e25983 (diff)
parent233eda28131081a052a401744ee4e94143972726 (diff)
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
Diffstat (limited to 'src/slic3r/GUI/GLTexture.cpp')
-rw-r--r--src/slic3r/GUI/GLTexture.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp
index cf218820b..2fff0869a 100644
--- a/src/slic3r/GUI/GLTexture.cpp
+++ b/src/slic3r/GUI/GLTexture.cpp
@@ -13,15 +13,11 @@
#include <vector>
#include <algorithm>
-#define NANOSVG_IMPLEMENTATION
#include "nanosvg/nanosvg.h"
-#define NANOSVGRAST_IMPLEMENTATION
#include "nanosvg/nanosvgrast.h"
#include "libslic3r/Utils.hpp"
-#include "libslic3r/Utils.hpp"
-
namespace Slic3r {
namespace GUI {
@@ -380,6 +376,7 @@ bool GLTexture::load_from_svg(const std::string& filename, bool use_mipmaps, uns
if (n_pixels <= 0)
{
reset();
+ nsvgDelete(image);
return false;
}