GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-15 00:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix memory leaks

Browse Source
This commit is contained in:
Filip Sykala 2022-03-24 10:32:15 +01:00
parent 610c290548
commit 0d77aaaa8d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/Emboss.cpp
View File

@ -6,6 +6,8 @@
#define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation #define STB_TRUETYPE_IMPLEMENTATION // force following include to generate implementation
#include "imgui/imstb_truetype.h" // stbtt_fontinfo #include "imgui/imstb_truetype.h" // stbtt_fontinfo
#include "imgui/imgui.h" // free memory from stb
#include "Utils.hpp" // ScopeGuard
#include <Triangulation.hpp> // CGAL project #include <Triangulation.hpp> // CGAL project
#include "libslic3r.h" #include "libslic3r.h"
@ -75,12 +77,17 @@ std::optional<Emboss::Glyph> Private::get_glyph(const stbtt_fontinfo &font_info,
stbtt_vertex *vertices; stbtt_vertex *vertices;
int num_verts = stbtt_GetGlyphShape(&font_info, glyph_index, &vertices); int num_verts = stbtt_GetGlyphShape(&font_info, glyph_index, &vertices);
if (num_verts <= 0) return glyph; // no shape if (num_verts <= 0) return glyph; // no shape
ScopeGuard sg1([&vertices]() { ImGui::MemFree(vertices); });
int *contour_lengths = NULL; int *contour_lengths = NULL;
int num_countour_int = 0; int num_countour_int = 0;
stbtt__point *points = stbtt_FlattenCurves(vertices, num_verts, stbtt__point *points = stbtt_FlattenCurves(vertices, num_verts,
flatness, &contour_lengths, &num_countour_int, font_info.userdata); flatness, &contour_lengths, &num_countour_int, font_info.userdata);
if (!points) return glyph; // no valid flattening
ScopeGuard sg2([&contour_lengths, &points]() {
ImGui::MemFree(contour_lengths);
ImGui::MemFree(points);
});
size_t num_contour = static_cast<size_t>(num_countour_int); size_t num_contour = static_cast<size_t>(num_countour_int);
Polygons glyph_polygons; Polygons glyph_polygons;
@ -109,6 +116,7 @@ std::optional<Emboss::Glyph> Private::get_glyph(const stbtt_fontinfo &font_info,
std::reverse(pts.begin(), pts.end()); std::reverse(pts.begin(), pts.end());
glyph_polygons.emplace_back(pts); glyph_polygons.emplace_back(pts);
} }
// fix for bad defined fonts // fix for bad defined fonts
glyph.shape = Slic3r::union_ex(glyph_polygons); glyph.shape = Slic3r::union_ex(glyph_polygons);