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

Adding PixelShift to PartialPaste window + small bugfixs (issue #3489)

Browse Source
This commit is contained in:
Hombre
2017-03-28 00:02:10 +02:00
parent 76f16eb3a7
commit 209ea3533b
11 changed files with 104 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/pixelshift.cc
View File

@@ -332,7 +332,7 @@ void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RA
} else if(bayerParams.pixelShiftMotionCorrectionMethod == RAWParams::BayerSensor::Off) {
bayerParams.pixelShiftMotion = 0;
bayerParams.pixelShiftAutomatic = false;
bayerParams.pixelshiftShowMotion = false;
bayerParams.pixelShiftShowMotion = false;
}
if((bayerParams.pixelShiftMotion > 0 || bayerParams.pixelShiftAutomatic)) {
@@ -454,8 +454,8 @@ void RawImageSource::pixelshift(int winx, int winy, int winw, int winh, const RA
}
const int motion = bayerParams.pixelShiftMotion;
const bool showMotion = bayerParams.pixelshiftShowMotion;
const bool showOnlyMask = bayerParams.pixelshiftShowMotionMaskOnly && showMotion;
const bool showMotion = bayerParams.pixelShiftShowMotion;
const bool showOnlyMask = bayerParams.pixelShiftShowMotionMaskOnly && showMotion;
const RAWParams::BayerSensor::ePSMotionCorrection gridSize_ = bayerParams.pixelShiftMotionCorrection;
const bool adaptive = bayerParams.pixelShiftAutomatic;
#ifdef PIXELSHIFTDEV