Merged master into pixelshift

2016-12-12 14:25:57 +01:00
parent 9bd874eb8c 1f080e0438
commit 7dcf89808f
25 changed files with 1940 additions and 65 deletions
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -1937,7 +1937,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
    }


-    if( totBP )
+    if( totBP ) {
        if ( ri->getSensorType() == ST_BAYER ) {
            if(numFrames == 4) {
                for(int i = 0; i < 4; ++i) {
@@ -1951,6 +1951,7 @@ void RawImageSource::preprocess  (const RAWParams &raw, const LensProfParams &le
        } else {
            interpolateBadPixelsNColours( *bitmapBads, ri->get_colors() );
        }
+    }

    if ( ri->getSensorType() == ST_BAYER && raw.bayersensor.linenoise > 0 ) {
        if (plistener) {