Cleanup: removed unused function; also murder instead of call for suicide (delete this)

This commit is contained in:
Ingo Weyrich
2020-08-13 13:10:33 +02:00
parent 130fbb8eb2
commit a5c7713042
13 changed files with 29 additions and 173 deletions

View File

@@ -699,7 +699,7 @@ rtengine::ProcessingJob* BatchQueue::imageReady(rtengine::IImagefloat* img)
err = img->saveAsJPEG (fname, saveFormat.jpegQuality, saveFormat.jpegSubSamp);
}
img->free ();
delete img;
if (err) {
throw Glib::FileError(Glib::FileError::FAILED, M("MAIN_MSG_CANNOTSAVE") + "\n" + fname);

View File

@@ -146,7 +146,7 @@ void BatchQueueEntryUpdater::processThread ()
}
memcpy(current.oimg, img->getData(), prevw * prevh * 3);
img->free();
delete img;
}
}

View File

@@ -1795,7 +1795,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 ();
@@ -1995,7 +1995,7 @@ bool EditorPanel::saveImmediately (const Glib::ustring &filename, const SaveForm
err = 1;
}
img->free();
delete img;
return !err;
}
@@ -2057,7 +2057,7 @@ bool EditorPanel::idle_sendToGimp ( ProgressConnector<rtengine::IImagefloat*> *p
}
if (tries == 1000) {
img->free ();
delete img;
return false;
}
@@ -2078,7 +2078,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;

View File

@@ -230,7 +230,7 @@ void FileBrowserEntry::updateImage(rtengine::IImage8* img, double scale, const r
--feih->pending;
}
img->free();
delete img;
return false;
}
@@ -276,7 +276,7 @@ void FileBrowserEntry::_updateImage(rtengine::IImage8* img, double s, const rten
landscape = newLandscape;
img->free();
delete img;
if (parent) {
if (rotated) {

View File

@@ -832,7 +832,7 @@ int processLineParams ( int argc, char **argv )
}
ii->decreaseRef();
resultImage->free();
delete resultImage;
}
if (imgParams) {

View File

@@ -110,7 +110,7 @@ void PreviewHandler::delImage(IImage8* i)
oldImg->getMutex().unlock();
}
i->free();
delete i;
pih->phandler->previewImgMutex.lock();
pih->phandler->previewImg.clear();
pih->phandler->previewImgMutex.unlock();