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

Free some arrays in iplocallab.cc

Browse Source
This commit is contained in:
Desmis 2019-11-10 17:47:51 +01:00
parent abb958fe8d
commit cbba21294d
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/iplocallab.cc
View File

@ -8530,7 +8530,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
} }
transit_shapedetect(7, loctemp.get(), nullptr, nullptr, buflight, bufchrom, nullptr, nullptr, nullptr, false, hueref, chromaref, lumaref, sobelref, 0.f, nullptr, lp, original, transformed, cx, cy, sk); transit_shapedetect(7, loctemp.get(), nullptr, nullptr, buflight, bufchrom, nullptr, nullptr, nullptr, false, hueref, chromaref, lumaref, sobelref, 0.f, nullptr, lp, original, transformed, cx, cy, sk);
buflight.free();
bufsh.free();
if (params->locallab.spots.at(sp).recurs) { if (params->locallab.spots.at(sp).recurs) {
original->CopyFrom(transformed); original->CopyFrom(transformed);
float avge; float avge;
@ -11396,6 +11397,8 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
transit_shapedetect(1, bufexporig.get(), nullptr, originalmaskexp.get(), buflight, bufl_ab, buf_a_cat, buf_b_cat, nullptr, false, hueref, chromaref, lumaref, sobelref, meansob, blend2, lp, original, transformed, cx, cy, sk); transit_shapedetect(1, bufexporig.get(), nullptr, originalmaskexp.get(), buflight, bufl_ab, buf_a_cat, buf_b_cat, nullptr, false, hueref, chromaref, lumaref, sobelref, meansob, blend2, lp, original, transformed, cx, cy, sk);
bufexporig.reset(); bufexporig.reset();
blend2.free(); blend2.free();
buflight.free();
if (params->locallab.spots.at(sp).recurs) { if (params->locallab.spots.at(sp).recurs) {
original->CopyFrom(transformed); original->CopyFrom(transformed);
float avge; float avge;
@ -12444,7 +12447,10 @@ void ImProcFunctions::Lab_Local(int call, int sp, float** shbuffer, LabImage * o
//bufcolfin add for merge //bufcolfin add for merge
if (!(usergb && spez)) { if (!(usergb && spez)) {
transit_shapedetect(smerge, bufcolorig.get(), bufcolfin.get(), originalmaskcol.get(), buflight, bufchro, buf_a, buf_b, bufhh, HHcurve, hueref, chromaref, lumaref, sobelref, meansob, blend2, lp, original, transformed, cx, cy, sk); transit_shapedetect(smerge, bufcolorig.get(), bufcolfin.get(), originalmaskcol.get(), buflight, bufchro, buf_a, buf_b, bufhh, HHcurve, hueref, chromaref, lumaref, sobelref, meansob, blend2, lp, original, transformed, cx, cy, sk);
if(blends) blend2.free(); if(blends) {
blend2.free();
}
buflight.free();
} }
if (params->locallab.spots.at(sp).recurs) { if (params->locallab.spots.at(sp).recurs) {

8
rtgui/controlspotpanel.cc
View File

@ -381,13 +381,13 @@ ControlSpotPanel::ControlSpotPanel():
maskBox->pack_start(*deltae_); maskBox->pack_start(*deltae_);
maskBox->pack_start(*scopemask_); maskBox->pack_start(*scopemask_);
// maskBox->pack_start(*shortc_); // maskBox->pack_start(*shortc_);
Gtk::HSeparator *separator = Gtk::manage(new Gtk::HSeparator()); // Gtk::HSeparator *separator = Gtk::manage(new Gtk::HSeparator());
maskBox->pack_start(*separator, Gtk::PACK_SHRINK, 2); // maskBox->pack_start(*separator, Gtk::PACK_SHRINK, 2);
// maskBox->pack_start(*ctboxmergemethod); // maskBox->pack_start(*ctboxmergemethod);
Gtk::HSeparator *separator1 = Gtk::manage(new Gtk::HSeparator()); // Gtk::HSeparator *separator1 = Gtk::manage(new Gtk::HSeparator());
maskBox->pack_start(*separator1, Gtk::PACK_SHRINK, 2); // maskBox->pack_start(*separator1, Gtk::PACK_SHRINK, 2);
maskBox->pack_start(*lumask_); maskBox->pack_start(*lumask_);
// maskBox->pack_start(*savrest_); // maskBox->pack_start(*savrest_);