Merge branch 'dev' into rt-cli

2017-03-18 18:17:45 +01:00
parent 97caf21b5c 56477d4105
commit c654785ae3
156 changed files with 7335 additions and 1876 deletions
--- a/rtengine/imagefloat.cc
+++ b/rtengine/imagefloat.cc
@@ -203,7 +203,7 @@ void Imagefloat::getStdImage (ColorTemp ctemp, int tran, Imagefloat* image, Prev
    int maxx = width; // Source image
    int maxy = height; // Source image
    int mtran = tran & TR_ROT;
-    int skip = pp.skip;
+    int skip = pp.getSkip();

    // improve speed by integrating the area division into the multipliers
    // switched to using ints for the red/green/blue channel buffer.