From 030c6f4631593dd75bf87358f8c128c85980305b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 30 Aug 2013 14:56:16 +0200 Subject: [PATCH 1/3] More documentation improvement. --- README.md | 4 ++-- doc/mainpage.dox | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6075ba92d..530a996e4 100644 --- a/README.md +++ b/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. diff --git a/doc/mainpage.dox b/doc/mainpage.dox index 0a85240b5..fe47ce03c 100644 --- a/doc/mainpage.dox +++ b/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. From 39e70907f2dbbf9820b51f49c01d4c3ddef17503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 30 Aug 2013 15:00:40 +0200 Subject: [PATCH 2/3] Audio: use proper Array constructor. Spotted with Clang. --- src/Audio/AbstractImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Audio/AbstractImporter.cpp b/src/Audio/AbstractImporter.cpp index 28e185ebd..ab3178154 100644 --- a/src/Audio/AbstractImporter.cpp +++ b/src/Audio/AbstractImporter.cpp @@ -93,7 +93,7 @@ UnsignedInt AbstractImporter::frequency() const { } Containers::Array AbstractImporter::data() { - CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::data(): no file opened", {}); + CORRADE_ASSERT(isOpened(), "Audio::AbstractImporter::data(): no file opened", nullptr); return doData(); } From e236fc7e8af6c549009474e31eabd6a525bd0d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 30 Aug 2013 15:01:09 +0200 Subject: [PATCH 3/3] DebugTools: explicitly define destructor in source file. Fixes Clang warning about deletion of forward-declared MeshView, causing undefined behavior. --- src/DebugTools/Implementation/CapsuleRenderer.cpp | 4 ++++ src/DebugTools/Implementation/CapsuleRenderer.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/DebugTools/Implementation/CapsuleRenderer.cpp b/src/DebugTools/Implementation/CapsuleRenderer.cpp index 1cd1922bd..ef158ba7a 100644 --- a/src/DebugTools/Implementation/CapsuleRenderer.cpp +++ b/src/DebugTools/Implementation/CapsuleRenderer.cpp @@ -90,6 +90,10 @@ AbstractCapsuleRenderer<3>::AbstractCapsuleRenderer(): AbstractShapeRenderer<3>( } } +AbstractCapsuleRenderer<2>::~AbstractCapsuleRenderer() = default; + +AbstractCapsuleRenderer<3>::~AbstractCapsuleRenderer() = default; + template CapsuleRenderer::CapsuleRenderer(const Shapes::Implementation::AbstractShape& capsule): capsule(static_cast>&>(capsule).shape) {} template void CapsuleRenderer::draw(Resource& options, const typename DimensionTraits::MatrixType& projectionMatrix) { diff --git a/src/DebugTools/Implementation/CapsuleRenderer.h b/src/DebugTools/Implementation/CapsuleRenderer.h index d00c5e47f..5a2553470 100644 --- a/src/DebugTools/Implementation/CapsuleRenderer.h +++ b/src/DebugTools/Implementation/CapsuleRenderer.h @@ -37,6 +37,7 @@ template class AbstractCapsuleRenderer; template<> class AbstractCapsuleRenderer<2>: public AbstractShapeRenderer<2> { public: explicit AbstractCapsuleRenderer(); + ~AbstractCapsuleRenderer(); protected: Resource 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 bottom, cylinder, top;