From a7522e54ec12667c9e870f6cf585243b24018962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 29 Aug 2013 01:48:43 +0200 Subject: [PATCH] Assert that the file is really closed after closing it in importer. Should harden plugin implementations a bit more. --- src/Audio/AbstractImporter.cpp | 5 ++++- src/Text/AbstractFont.cpp | 5 ++++- src/Trade/AbstractImporter.cpp | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Audio/AbstractImporter.cpp b/src/Audio/AbstractImporter.cpp index 2e0ced0e3..28e185ebd 100644 --- a/src/Audio/AbstractImporter.cpp +++ b/src/Audio/AbstractImporter.cpp @@ -76,7 +76,10 @@ void AbstractImporter::doOpenFile(const std::string& filename) { } void AbstractImporter::close() { - if(isOpened()) doClose(); + if(isOpened()) { + doClose(); + CORRADE_INTERNAL_ASSERT(!isOpened()); + } } Buffer::Format AbstractImporter::format() const { diff --git a/src/Text/AbstractFont.cpp b/src/Text/AbstractFont.cpp index aa8e054e1..560e5385e 100644 --- a/src/Text/AbstractFont.cpp +++ b/src/Text/AbstractFont.cpp @@ -100,7 +100,10 @@ void AbstractFont::doOpenFile(const std::string& filename, const Float size) { } void AbstractFont::close() { - if(isOpened()) doClose(); + if(isOpened()) { + doClose(); + CORRADE_INTERNAL_ASSERT(!isOpened()); + } } UnsignedInt AbstractFont::glyphId(const char32_t character) { diff --git a/src/Trade/AbstractImporter.cpp b/src/Trade/AbstractImporter.cpp index e5e2eca1a..9d985b3dc 100644 --- a/src/Trade/AbstractImporter.cpp +++ b/src/Trade/AbstractImporter.cpp @@ -76,7 +76,10 @@ void AbstractImporter::doOpenFile(const std::string& filename) { } void AbstractImporter::close() { - if(isOpened()) doClose(); + if(isOpened()) { + doClose(); + CORRADE_INTERNAL_ASSERT(!isOpened()); + } } Int AbstractImporter::defaultScene() {