Browse Source

Adapted to Magnum changes.

pull/34/head
Vladimír Vondruš 14 years ago
parent
commit
6f3c2ac5ec
  1. 2
      src/Plugins/TgaImporter/TgaImporter.cpp
  2. 6
      src/Plugins/TgaImporter/TgaImporter.h
  3. 2
      src/Plugins/TgaImporter/TgaImporterPluginRegistration.cpp

2
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;
}

6
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 */

2
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")

Loading…
Cancel
Save