merge with dev

2017-06-11 18:38:31 +02:00
parent 849a2652a3 e8bbefef7a
commit f1a90dad54
33 changed files with 215 additions and 138 deletions
--- a/rtengine/procparams.h
+++ b/rtengine/procparams.h
@@ -1538,11 +1538,15 @@ 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;
 };

 /**