Merge branch 'master' into compatibility

README.md

@@ -55,8 +55,8 @@ FEATURES
     Snapshot is available at http://mosra.cz/blog/magnum-doc/.
 *   Vector and matrix library with implementation of complex numbers,
     quaternions and their dual counterparts for representing transformations.
-*   Classes wrapping OpenGL and simplifying its usage with direct state access
-    and automatic fallback for unavailable features.
+*   Classes wrapping OpenGL using RAII principle and simplifying its usage with
+    direct state access and automatic fallback for unavailable features.
 *   Extensible scene graph which can be modified for each specific usage.
 *   Plugin-based data exchange framework, tools for manipulating meshes,
     textures and images.

doc/mainpage.dox

@@ -77,8 +77,8 @@ recent C++11 features and abstract away platform-specific issues.
 
 -   Vector and matrix library with implementation of complex numbers,
     quaternions and their dual counterparts for representing transformations.
--   Classes wrapping OpenGL and simplifying its usage with direct state access
-    and automatic fallback for unavailable features.
+-   Classes wrapping OpenGL using RAII principle and simplifying its usage with
+    direct state access and automatic fallback for unavailable features.
 -   Extensible scene graph which can be modified for each specific usage.
 -   Plugin-based data exchange framework, tools for manipulating meshes,
     textures and images.

src/Audio/AbstractImporter.cpp

@@ -93,7 +93,7 @@ UnsignedInt AbstractImporter::frequency() const {
 }
 
 Containers::Array<unsigned char> AbstractImporter::data() {
-    CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::data(): no file opened", {});
+    CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::data(): no file opened", nullptr);
     return doData();
 }
 

src/DebugTools/Implementation/CapsuleRenderer.cpp

@@ -90,6 +90,10 @@ AbstractCapsuleRenderer<3>::AbstractCapsuleRenderer(): AbstractShapeRenderer<3>(
     }
 }
 
+AbstractCapsuleRenderer<2>::~AbstractCapsuleRenderer() = default;
+
+AbstractCapsuleRenderer<3>::~AbstractCapsuleRenderer() = default;
+
 template<UnsignedInt dimensions> CapsuleRenderer<dimensions>::CapsuleRenderer(const Shapes::Implementation::AbstractShape<dimensions>& capsule): capsule(static_cast<const Shapes::Implementation::Shape<Shapes::Capsule<dimensions>>&>(capsule).shape) {}
 
 template<UnsignedInt dimensions> void CapsuleRenderer<dimensions>::draw(Resource<ShapeRendererOptions>& options, const typename DimensionTraits<dimensions, Float>::MatrixType& projectionMatrix) {

src/DebugTools/Implementation/CapsuleRenderer.h

@@ -37,6 +37,7 @@ template<UnsignedInt dimensions> class AbstractCapsuleRenderer;
 template<> class AbstractCapsuleRenderer<2>: public AbstractShapeRenderer<2> {
     public:
         explicit AbstractCapsuleRenderer();
+        ~AbstractCapsuleRenderer();
 
     protected:
         Resource<MeshView> bottom, cylinder, top;
@@ -45,6 +46,7 @@ template<> class AbstractCapsuleRenderer<2>: public AbstractShapeRenderer<2> {
 template<> class AbstractCapsuleRenderer<3>: public AbstractShapeRenderer<3> {
     public:
         explicit AbstractCapsuleRenderer();
+        ~AbstractCapsuleRenderer();
 
     protected:
         Resource<MeshView> bottom, cylinder, top;