merge with dev - I hope no error

2017-02-21 18:02:48 +01:00
parent f9b592dfd5 ac882d2ff2
commit 1f7ad78e25
74 changed files with 886 additions and 695 deletions
--- a/rtengine/dcrop.cc
+++ b/rtengine/dcrop.cc
@@ -123,7 +123,7 @@ void Crop::setEditSubscriber (EditSubscriber* newSubscriber)
            PipetteBuffer::LabBuffer = nullptr;
        }

-        if (PipetteBuffer::singlePlaneBuffer.getW() != -1) {
+        if (PipetteBuffer::singlePlaneBuffer.getWidth() != -1) {
            PipetteBuffer::singlePlaneBuffer.flushData();
        }
    }