Merge with dev

rtgui/toolpanelcoord.h

@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
+ *  along with RawTherapee.  If not, see <https://www.gnu.org/licenses/>.
  */
 #ifndef __TOOLPANELCCORD__
 #define __TOOLPANELCCORD__
@@ -78,6 +78,7 @@
 #include "colortoning.h"
 #include "filmsimulation.h"
 #include "prsharpening.h"
+#include "pdsharpening.h"
 #include "fattaltonemap.h"
 #include "localcontrast.h"
 #include "softlight.h"
@@ -159,7 +160,7 @@ protected:
     FattalToneMapping *fattal;
     MetaDataPanel* metadata;
     FilmNegative* filmNegative;
-
+    PdSharpening* pdSharpening;
     std::vector<PParamsChangeListener*> paramcListeners;
 
     rtengine::StagedImageProcessor* ipc;