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

Merge from branch 3.0

Browse Source
This commit is contained in:
ffsup2
2011-04-21 23:38:35 +02:00
parent 718c070c4b
commit 628692ed12
10 changed files with 1059 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rtgui/editorpanel.cc
View File

@@ -286,13 +286,22 @@ EditorPanel::~EditorPanel () {
history->setHistoryBeforeLineListener (NULL);
// the order is important!
iarea->setBeforeAfterViews (NULL, iarea);
delete iarea;
iarea = NULL;
if (beforeIpc)
beforeIpc->stopProcessing ();
delete beforeIarea;
beforeIarea = NULL;
if (beforeIpc)
beforeIpc->setPreviewImageListener (NULL);
delete beforePreviewHandler;
beforePreviewHandler = NULL;
if (beforeIpc)
rtengine::StagedImageProcessor::destroy (beforeIpc);
beforeIpc = NULL;
close ();
if (epih->pending)
@@ -1240,6 +1249,10 @@ void EditorPanel::beforeAfterToggled () {
}
if (beforeAfter->get_active ()) {
int errorCode=0;
rtengine::InitialImage *beforeImg = rtengine::InitialImage::load ( isrc->getImageSource ()->getFileName(), openThm->getType()==FT_Raw , &errorCode, NULL);
if( !beforeImg || errorCode )
return;
beforeIarea = new ImageAreaPanel ();
@@ -1259,8 +1272,8 @@ void EditorPanel::beforeAfterToggled () {
beforeAfterBox->show_all ();
beforePreviewHandler = new PreviewHandler ();
isrc->increaseRef ();
beforeIpc = rtengine::StagedImageProcessor::create (isrc);
beforeIpc = rtengine::StagedImageProcessor::create (beforeImg);
beforeIpc->setPreviewScale (10);
beforeIpc->setPreviewImageListener (beforePreviewHandler);
beforeIarea->imageArea->setPreviewHandler (beforePreviewHandler);