Merge with ef386222219c7d420954431bdbcf252e8a487d1c

2014-02-19 14:09:22 +01:00
parent 8d70ca0f41
commit ee040bc8cd
94 changed files with 1433 additions and 218 deletions
--- a/rtengine/dcrop.h
+++ b/rtengine/dcrop.h
@@ -74,6 +74,7 @@ class Crop : public DetailedCrop, public EditBuffer {
    public:
        Crop             (ImProcCoordinator* parent, EditDataProvider *editDataProvider);
        virtual ~Crop    ();
+        int skip2;

        void mLock       () { cropMutex.lock(); }
        void mUnlock     () { cropMutex.lock(); }