merge with dev...

2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1538,15 +1538,11 @@ public:
    PartialProfile      (bool createInstance = false, bool paramsEditedValue = false);
    PartialProfile      (ProcParams* pp, ParamsEdited* pe = nullptr, bool fullCopy = false);
    PartialProfile      (const ProcParams* pp, const ParamsEdited* pe = nullptr);
-    ~PartialProfile     ();
    void deleteInstance ();
    void clearGeneral   ();
    int  load           (const Glib::ustring &fName);
    void set            (bool v);
    const void applyTo  (ProcParams *destParams) const ;
-private:
-    bool ownsPparams;
-    bool ownsPedited;
 };

 /**