From 4b0e9dbea7d903cdd1aa62119dc4f468d4bf1dfc Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Tue, 8 Mar 2016 15:11:24 +0100
Subject: [PATCH] Update DPF

---
 dpf/dgl/Application.hpp                |  2 +-
 dpf/dgl/ImageWidgets.hpp               |  4 ++--
 dpf/dgl/Makefile.mk                    |  4 +++-
 dpf/dgl/src/Geometry.cpp               |  4 ++--
 dpf/dgl/src/WidgetPrivateData.hpp      | 11 ++++++-----
 dpf/distrho/DistrhoUtils.hpp           |  2 +-
 dpf/distrho/src/DistrhoPluginCarla.cpp |  2 --
 7 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/dpf/dgl/Application.hpp b/dpf/dgl/Application.hpp
index 85c3770..6787c49 100644
--- a/dpf/dgl/Application.hpp
+++ b/dpf/dgl/Application.hpp
@@ -49,7 +49,7 @@ public:
    /**
       Destructor.
     */
-    ~Application();
+    virtual ~Application();
 
    /**
       Idle function.
diff --git a/dpf/dgl/ImageWidgets.hpp b/dpf/dgl/ImageWidgets.hpp
index 5c23319..aafe196 100644
--- a/dpf/dgl/ImageWidgets.hpp
+++ b/dpf/dgl/ImageWidgets.hpp
@@ -79,7 +79,7 @@ private:
     struct PrivateData;
     PrivateData* const pData;
 
-    DISTRHO_LEAK_DETECTOR(ImageButton)
+    DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ImageButton)
 };
 
 // -----------------------------------------------------------------------
@@ -225,7 +225,7 @@ private:
     void setAbsolutePos(int, int) const noexcept {}
     void setAbsolutePos(const Point<int>&) const noexcept {}
 
-    DISTRHO_LEAK_DETECTOR(ImageSlider)
+    DISTRHO_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(ImageSlider)
 };
 
 // -----------------------------------------------------------------------
diff --git a/dpf/dgl/Makefile.mk b/dpf/dgl/Makefile.mk
index 538a75c..74829ee 100644
--- a/dpf/dgl/Makefile.mk
+++ b/dpf/dgl/Makefile.mk
@@ -59,11 +59,13 @@ endif
 
 BUILD_C_FLAGS   = $(BASE_FLAGS) -std=c99 $(CFLAGS)
 BUILD_CXX_FLAGS = $(BASE_FLAGS) -std=c++11 $(CXXFLAGS) $(CPPFLAGS)
-LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
 
 ifeq ($(MACOS),true)
 # 'no-undefined' is always enabled
 LINK_FLAGS      = $(LINK_OPTS) $(LDFLAGS)
+else
+# Specify 'no-undefined'
+LINK_FLAGS      = $(LINK_OPTS) -Wl,--no-undefined $(LDFLAGS)
 endif
 
 ifeq ($(MACOS_OLD),true)
diff --git a/dpf/dgl/src/Geometry.cpp b/dpf/dgl/src/Geometry.cpp
index 11916c5..2aafce7 100644
--- a/dpf/dgl/src/Geometry.cpp
+++ b/dpf/dgl/src/Geometry.cpp
@@ -655,13 +655,13 @@ void Circle<T>::_draw(const bool outline)
 {
     DISTRHO_SAFE_ASSERT_RETURN(fNumSegments >= 3 && fSize > 0.0f,);
 
-    float t, x = fSize, y = 0.0f;
+    double t, x = fSize, y = 0.0;
 
     glBegin(outline ? GL_LINE_LOOP : GL_POLYGON);
 
     for (uint i=0; i<fNumSegments; ++i)
     {
-        glVertex2f(x + fPos.fX, y + fPos.fY);
+        glVertex2d(x + fPos.fX, y + fPos.fY);
 
         t = x;
         x = fCos * x - fSin * y;
diff --git a/dpf/dgl/src/WidgetPrivateData.hpp b/dpf/dgl/src/WidgetPrivateData.hpp
index bbac64b..4fa0b2a 100644
--- a/dpf/dgl/src/WidgetPrivateData.hpp
+++ b/dpf/dgl/src/WidgetPrivateData.hpp
@@ -44,6 +44,7 @@ struct Widget::PrivateData {
           parent(p),
           absolutePos(0, 0),
           size(0, 0),
+          subWidgets(),
           id(0),
           needsFullViewport(false),
           needsScaling(false),
@@ -81,7 +82,7 @@ struct Widget::PrivateData {
         {
             // limit viewport to widget bounds
             glViewport(absolutePos.getX(),
-                       height - static_cast<int>(self->getHeight()) - absolutePos.getY(),
+                       static_cast<int>(height - self->getHeight()) - absolutePos.getY(),
                        static_cast<GLsizei>(self->getWidth()),
                        static_cast<GLsizei>(self->getHeight()));
         }
@@ -89,13 +90,13 @@ struct Widget::PrivateData {
         {
             // only set viewport pos
             glViewport(absolutePos.getX(),
-                        /*height - static_cast<int>(self->getHeight())*/ - absolutePos.getY(),
-                        static_cast<GLsizei>(width),
-                        static_cast<GLsizei>(height));
+                       /*static_cast<int>(height - self->getHeight())*/ - absolutePos.getY(),
+                       static_cast<GLsizei>(width),
+                       static_cast<GLsizei>(height));
 
             // then cut the outer bounds
             glScissor(absolutePos.getX(),
-                      height - static_cast<int>(self->getHeight()) - absolutePos.getY(),
+                      static_cast<int>(height - self->getHeight()) - absolutePos.getY(),
                       static_cast<GLsizei>(self->getWidth()),
                       static_cast<GLsizei>(self->getHeight()));
 
diff --git a/dpf/distrho/DistrhoUtils.hpp b/dpf/distrho/DistrhoUtils.hpp
index 967821d..9b768cb 100644
--- a/dpf/distrho/DistrhoUtils.hpp
+++ b/dpf/distrho/DistrhoUtils.hpp
@@ -68,7 +68,7 @@ int64_t d_cconst(const uint8_t a, const uint8_t b, const uint8_t c, const uint8_
 static inline
 uint32_t d_version(const uint8_t major, const uint8_t minor, const uint8_t micro) noexcept
 {
-    return (major << 16) | (minor << 8) | (micro << 0);
+    return uint32_t(major << 16) | uint32_t(minor << 8) | (micro << 0);
 }
 
 /*
diff --git a/dpf/distrho/src/DistrhoPluginCarla.cpp b/dpf/distrho/src/DistrhoPluginCarla.cpp
index 4c931ce..6f73466 100644
--- a/dpf/distrho/src/DistrhoPluginCarla.cpp
+++ b/dpf/distrho/src/DistrhoPluginCarla.cpp
@@ -42,7 +42,6 @@ class UICarla
 public:
     UICarla(const NativeHostDescriptor* const host, PluginExporter* const plugin)
         : fHost(host),
-          fPlugin(plugin),
           fUI(this, 0, editParameterCallback, setParameterCallback, setStateCallback, sendNoteCallback, setSizeCallback, plugin->getInstancePointer())
     {
         fUI.setWindowTitle(host->uiName);
@@ -125,7 +124,6 @@ protected:
 private:
     // Plugin stuff
     const NativeHostDescriptor* const fHost;
-    PluginExporter* const fPlugin;
 
     // UI
     UIExporter fUI;