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

Merge branch 'dev' into procparams-cleanup

Browse Source
This commit is contained in:
Flössie
2017-12-05 18:23:48 +01:00
parent 95614c7ecb d78848c614
commit e6e4bfa350
19 changed files with 988 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtgui/editorpanel.cc
View File

@@ -2186,6 +2186,11 @@ void EditorPanel::beforeAfterToggled ()
beforeIpc = rtengine::StagedImageProcessor::create (beforeImg);
beforeIpc->setPreviewScale (10);
beforeIpc->setPreviewImageListener (beforePreviewHandler);
Glib::ustring monitorProfile;
rtengine::RenderingIntent intent;
ipc->getMonitorProfile(monitorProfile, intent);
beforeIpc->setMonitorProfile(monitorProfile, intent);
beforeIarea->imageArea->setPreviewHandler (beforePreviewHandler);
beforeIarea->imageArea->setImProcCoordinator (beforeIpc);

8
rtgui/lensprofile.cc
View File

@@ -190,10 +190,6 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
updateDisabled(false);
}
ckbUseDist->set_active (pp->lensProf.useDist);
ckbUseVign->set_active (pp->lensProf.useVign && isRaw);
ckbUseCA->set_active(pp->lensProf.useCA && isRaw && ckbUseCA->get_sensitive());
const LFDatabase *db = LFDatabase::getInstance();
LFCamera c;
@@ -226,6 +222,10 @@ void LensProfilePanel::read(const rtengine::procparams::ProcParams* pp, const Pa
updateLensfunWarning();
ckbUseDist->set_active (pp->lensProf.useDist);
ckbUseVign->set_active (pp->lensProf.useVign && isRaw);
ckbUseCA->set_active(pp->lensProf.useCA && isRaw && ckbUseCA->get_sensitive());
enableListener ();
conUseDist.block(false);
}

4
rtgui/thumbbrowserentrybase.cc
View File

@@ -400,7 +400,7 @@ void ThumbBrowserEntryBase::resize (int h)
MYWRITERLOCK(l, lockRW);
height = h;
int old_preh = preh, old_width = width;
int old_preh = preh;
// dimensions of the button set
int bsw = 0, bsh = 0;
@@ -462,7 +462,7 @@ void ThumbBrowserEntryBase::resize (int h)
width = bsw + 2 * sideMargin + 2 * borderWidth;
}
if ( preh != old_preh || width != old_width ) {
if (preh != old_preh) {
delete [] preview;
preview = nullptr;
refreshThumbnailImage ();