From c0988beb3312b53756ece02e964e91a16c07b158 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Sat, 21 Jan 2017 13:44:10 +0100 Subject: [PATCH] Pixelshift: fixed two small bugs --- rtengine/rawimagesource.cc | 2 +- rtgui/bayerprocess.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc index 11d7a2af2..f5bea64d3 100644 --- a/rtengine/rawimagesource.cc +++ b/rtengine/rawimagesource.cc @@ -2035,7 +2035,7 @@ void RawImageSource::demosaic(const RAWParams &raw) bayerParams.pixelShiftAutomatic = false; bayerParams.pixelshiftShowMotion = false; } - if(!bayerParams.pixelshiftShowMotion || bayerParams.pixelShiftNonGreenAmaze || bayerParams.pixelShiftNonGreenCross2 || (bayerParams.pixelShiftBlur && bayerParams.pixelShiftExp0)) { + if(!bayerParams.pixelshiftShowMotion || bayerParams.pixelShiftNonGreenAmaze || bayerParams.pixelShiftNonGreenCross2 || (bayerParams.pixelShiftBlur && bayerParams.pixelShiftSmooth)) { if((bayerParams.pixelShiftMotion > 0 || bayerParams.pixelShiftAutomatic) && numFrames == 4) { if(bayerParams.pixelShiftMedian) { // We need the amaze demosaiced frames for motion correction if(!bayerParams.pixelShiftMedian3) { diff --git a/rtgui/bayerprocess.cc b/rtgui/bayerprocess.cc index 5d33ffe18..89b92ebd2 100644 --- a/rtgui/bayerprocess.cc +++ b/rtgui/bayerprocess.cc @@ -831,7 +831,6 @@ void BayerProcess::pixelShiftAutomaticChanged () pixelShiftNonGreenHorizontal->set_sensitive(pixelShiftAutomatic->get_active ()); pixelShiftNonGreenVertical->set_sensitive(pixelShiftAutomatic->get_active ()); pixelShiftHoleFill->set_sensitive(pixelShiftAutomatic->get_active () && pixelShiftMotionCorrection->get_active_row_number() == 5); - pixelShiftMedian->set_sensitive(pixelShiftAutomatic->get_active ()); pixelShiftMedian3->set_sensitive(pixelShiftAutomatic->get_active () && pixelShiftMedian->get_active()); pixelShiftGreen->set_sensitive(pixelShiftAutomatic->get_active ()); pixelShiftBlur->set_sensitive(pixelShiftAutomatic->get_active () && pixelShiftMotionCorrection->get_active_row_number() == 5);