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

Merge branch 'dev' into hidpi-icons

Browse Source
This commit is contained in:
Hombre
2019-01-24 22:02:44 +01:00
parent 0407dc3487 f84a75de1e
commit cc1779a0ae
76 changed files with 1250 additions and 1262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
rtgui/filebrowserentry.cc
View File

@@ -217,47 +217,27 @@ void FileBrowserEntry::updateImage(rtengine::IImage8* img, double scale, const r
redrawRequests++;
feih->pending++;
struct tiupdate {
FileBrowserEntryIdleHelper* feih;
rtengine::IImage8* img;
double scale;
rtengine::procparams::CropParams cropParams;
};
idle_register.add(
[this, img, scale, cropParams]() -> bool
{
if (feih->destroyed) {
if (feih->pending == 1) {
delete feih;
} else {
--feih->pending;
}
tiupdate* param = new tiupdate{
feih,
img,
scale,
cropParams
};
const gint priority = G_PRIORITY_LOW;
const auto func = [](gpointer data) -> gboolean {
tiupdate* const params = static_cast<tiupdate*>(data);
FileBrowserEntryIdleHelper* const feih = params->feih;
if (feih->destroyed) {
if (feih->pending == 1) {
delete feih;
} else {
feih->pending--;
img->free();
return false;
}
params->img->free ();
delete params;
return 0;
}
feih->fbentry->_updateImage(img, scale, cropParams);
--feih->pending;
feih->fbentry->_updateImage (params->img, params->scale, params->cropParams);
feih->pending--;
delete params;
return FALSE;
};
idle_register.add(func, param, priority);
return false;
},
G_PRIORITY_LOW
);
}
void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rtengine::procparams::CropParams& cropParams)