From e8c3838065102fe9423769a5b18c3a72a1332b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 29 Mar 2013 12:32:49 +0100 Subject: [PATCH] TgaImporter: deinlined functions. --- src/Plugins/TgaImporter/TgaImporter.cpp | 14 ++++++++++++++ src/Plugins/TgaImporter/TgaImporter.h | 12 +++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index 912203c9d..37f456847 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -39,6 +39,16 @@ namespace Magnum { namespace Trade { namespace TgaImporter { static_assert(sizeof(TgaImporter::Header) == 18, "TgaImporter: header size is not 18 bytes"); #endif +TgaImporter::TgaImporter(): _image(nullptr) {} + +TgaImporter::TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), _image(nullptr) {} + +TgaImporter::~TgaImporter() { close(); } + +TgaImporter::Features TgaImporter::features() const { + return Feature::OpenFile|Feature::OpenStream; +} + bool TgaImporter::TgaImporter::open(const std::string& filename) { std::ifstream in(filename.c_str()); if(!in.good()) { @@ -132,6 +142,10 @@ void TgaImporter::close() { _image = nullptr; } +UnsignedInt TgaImporter::TgaImporter::image2DCount() const { + return _image ? 1 : 0; +} + ImageData2D* TgaImporter::image2D(UnsignedInt) { return _image; } diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h index a1109bbc1..d66cc35bf 100644 --- a/src/Plugins/TgaImporter/TgaImporter.h +++ b/src/Plugins/TgaImporter/TgaImporter.h @@ -50,20 +50,18 @@ namespace Magnum { namespace Trade { namespace TgaImporter { class MAGNUM_TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { public: /** @brief Default constructor */ - inline explicit TgaImporter(): _image(nullptr) {} + explicit TgaImporter(); /** @brief Plugin manager constructor */ - inline explicit TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin): AbstractImporter(manager, std::move(plugin)), _image(nullptr) {} + explicit TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager, std::string plugin); - inline virtual ~TgaImporter() { close(); } - - inline Features features() const override { return Feature::OpenFile|Feature::OpenStream; } + virtual ~TgaImporter(); + Features features() const override; bool open(std::istream& in) override; bool open(const std::string& filename) override; void close() override; - - UnsignedInt image2DCount() const override { return _image ? 1 : 0; } + UnsignedInt image2DCount() const override; ImageData2D* image2D(UnsignedInt id) override; #pragma pack(1)