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

Merge branch 'dev' into waveform

Browse Source
This commit is contained in:
Flössie
2020-08-16 10:08:28 +02:00
parent e67b02da8b 4888cb76f2
commit c5ace05df8
54 changed files with 2532 additions and 1630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/editorpanel.cc
View File

@@ -1797,7 +1797,7 @@ bool EditorPanel::idle_saveImage (ProgressConnector<rtengine::IImagefloat*> *pc,
bool EditorPanel::idle_imageSaved (ProgressConnector<int> *pc, rtengine::IImagefloat* img, Glib::ustring fname, SaveFormat sf, rtengine::procparams::ProcParams &pparams)
{
img->free ();
delete img;
if (! pc->returnValue() ) {
openThm->imageDeveloped ();
@@ -1997,7 +1997,7 @@ bool EditorPanel::saveImmediately (const Glib::ustring &filename, const SaveForm
err = 1;
}
img->free();
delete img;
return !err;
}
@@ -2059,7 +2059,7 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
}
if (tries == 1000) {
img->free ();
delete img;
return false;
}
@@ -2080,7 +2080,7 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
bool EditorPanel::idle_sentToGimp (ProgressConnector<int> *pc, rtengine::IImagefloat* img, Glib::ustring filename)
{
img->free ();
delete img;
int errore = pc->returnValue();
setProgressState(false);
delete pc;