From 6f3c2ac5ec189071d66cd690c4001c806540eb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 23 Jun 2012 04:05:19 +0200 Subject: [PATCH] Adapted to Magnum changes. --- src/Plugins/TgaImporter/TgaImporter.cpp | 2 +- src/Plugins/TgaImporter/TgaImporter.h | 6 +++--- src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp index 599392a2e..7a9f70d5b 100644 --- a/src/Plugins/TgaImporter/TgaImporter.cpp +++ b/src/Plugins/TgaImporter/TgaImporter.cpp @@ -100,7 +100,7 @@ void TgaImporter::close() { _image = nullptr; } -ImageData2D* TgaImporter::image2D(size_t id) { +ImageData2D* TgaImporter::image2D(unsigned int id) { return _image; } diff --git a/src/Plugins/TgaImporter/TgaImporter.h b/src/Plugins/TgaImporter/TgaImporter.h index f5522a67a..daab490bc 100644 --- a/src/Plugins/TgaImporter/TgaImporter.h +++ b/src/Plugins/TgaImporter/TgaImporter.h @@ -44,14 +44,14 @@ class TGAIMPORTER_EXPORT TgaImporter: public AbstractImporter { TgaImporter(Corrade::PluginManager::AbstractPluginManager* manager = 0, const std::string& plugin = ""): AbstractImporter(manager, plugin), _image(nullptr) {} inline virtual ~TgaImporter() { close(); } - inline int features() const { return OpenFile|OpenStream; } + inline Features features() const { return Feature::OpenFile|Feature::OpenStream; } bool open(std::istream& in); bool open(const std::string& filename); void close(); - inline size_t image2DCount() const { return _image ? 1 : 0; } - ImageData2D* image2D(size_t id); + inline unsigned int image2DCount() const { return _image ? 1 : 0; } + ImageData2D* image2D(unsigned int id); #pragma pack(1) /** @brief TGA file header */ diff --git a/src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp b/src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp index a408bef17..601ed8fd1 100644 --- a/src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp +++ b/src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp @@ -16,4 +16,4 @@ #include "TgaImporter.h" PLUGIN_REGISTER(TgaImporter, Magnum::Trade::TgaImporter::TgaImporter, - "cz.mosra.magnum.Trade.AbstractImporter/0.1") + "cz.mosra.magnum.Trade.AbstractImporter/0.2")