liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix minor memory leaks

Browse Source
This commit is contained in:
Lawrence Lee
2020-06-11 12:41:43 -07:00
parent 24681f324c
commit 6c59f0586f
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rtengine/perspectivecorrection.cc
View File

@@ -371,7 +371,7 @@ PerspectiveCorrection::Params PerspectiveCorrection::autocompute(ImageSource *sr
if (g.lines) free(g.lines); if (g.lines) free(g.lines);
if (g.points) free(g.points); if (g.points) free(g.points);
if (g.points_idx) free(g.points_idx); if (g.points_idx) free(g.points_idx);
free(g.buf); if (g.buf) free(g.buf);
if (!res) { if (!res) {
retval.angle = pparams->perspective.camera_roll; retval.angle = pparams->perspective.camera_roll;

14
rtgui/perspective.cc
View File

@@ -44,7 +44,7 @@ PerspCorrection::PerspCorrection () : FoldableToolPanel(this, "perspective", M("
Gtk::Image* ipers_draw_horiz = Gtk::manage (new RTImage ("draw-horizontal.png")); Gtk::Image* ipers_draw_horiz = Gtk::manage (new RTImage ("draw-horizontal.png"));
Gtk::Image* ipers_draw_vert = Gtk::manage (new RTImage ("draw-vertical.png")); Gtk::Image* ipers_draw_vert = Gtk::manage (new RTImage ("draw-vertical.png"));
Gtk::Image* ipers_draw = new RTImage ("draw.png"); Gtk::Image* ipers_draw = new RTImage ("draw.png");
Gtk::Image* ipers_trash = new RTImage ("trash-empty.png"); Gtk::Image* ipers_trash = Gtk::manage (new RTImage ("trash-empty.png"));
Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-horizontal-left-small.png")); Gtk::Image* ipersHL = Gtk::manage (new RTImage ("perspective-horizontal-left-small.png"));
Gtk::Image* ipersHR = Gtk::manage (new RTImage ("perspective-horizontal-right-small.png")); Gtk::Image* ipersHR = Gtk::manage (new RTImage ("perspective-horizontal-right-small.png"));
@@ -242,12 +242,8 @@ PerspCorrection::~PerspCorrection()
{ {
delete lines->callbacks; delete lines->callbacks;
delete lines; delete lines;
if (img_ctrl_lines_apply) { delete img_ctrl_lines_apply;
delete img_ctrl_lines_apply; delete img_ctrl_lines_edit;
}
if (img_ctrl_lines_edit) {
delete img_ctrl_lines_edit;
}
} }
void PerspCorrection::read (const ProcParams* pp, const ParamsEdited* pedited) void PerspCorrection::read (const ProcParams* pp, const ParamsEdited* pedited)
@@ -1080,6 +1076,8 @@ void ControlLineManager::removeAll(void)
delete control_lines[i]->begin; delete control_lines[i]->begin;
delete control_lines[i]->end; delete control_lines[i]->end;
delete control_lines[i]->line; delete control_lines[i]->line;
delete control_lines[i]->icon_h;
delete control_lines[i]->icon_v;
delete control_lines[i]; delete control_lines[i];
} }
control_lines.clear(); control_lines.clear();
@@ -1097,6 +1095,8 @@ void ControlLineManager::removeLine(size_t line_id)
delete line->begin; delete line->begin;
delete line->end; delete line->end;
delete line->line; delete line->line;
delete line->icon_h;
delete line->icon_v;
delete line; delete line;
control_lines.erase(control_lines.begin() + line_id); control_lines.erase(control_lines.begin() + line_id);
visibleGeometry.erase(visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id, visibleGeometry.erase(visibleGeometry.begin() + ::ControlLine::OBJ_COUNT * line_id,