Browse Source

Adapted to Magnum changes.

pull/34/head
Vladimír Vondruš 14 years ago
parent
commit
e5cf6c7c93
  1. 6
      src/Plugins/TGAImporter/TGAImporter.cpp
  2. 4
      src/Plugins/TGAImporter/TGAImporter.h

6
src/Plugins/TGAImporter/TGAImporter.cpp

@ -17,7 +17,7 @@
#include "Utility/Endianness.h" #include "Utility/Endianness.h"
#include "Math/Vector2.h" #include "Math/Vector2.h"
#include "Trade/Image.h" #include "Trade/ImageData.h"
using namespace std; using namespace std;
using namespace Corrade::Utility; using namespace Corrade::Utility;
@ -75,7 +75,7 @@ bool TGAImporter::open(std::istream& in) {
Math::Vector2<GLsizei> dimensions(header.width, header.height); Math::Vector2<GLsizei> dimensions(header.width, header.height);
_image = new Image2D(dimensions, colorFormat, buffer); _image = new ImageData2D(colorFormat, dimensions, buffer);
return true; return true;
} }
@ -84,7 +84,7 @@ void TGAImporter::close() {
_image = nullptr; _image = nullptr;
} }
Image2D* TGAImporter::image2D(size_t id) { ImageData2D* TGAImporter::image2D(size_t id) {
return _image; return _image;
} }

4
src/Plugins/TGAImporter/TGAImporter.h

@ -35,7 +35,7 @@ class TGAImporter: public AbstractImporter {
void close(); void close();
inline size_t image2DCount() const { return _image ? 1 : 0; } inline size_t image2DCount() const { return _image ? 1 : 0; }
Image2D* image2D(size_t id); ImageData2D* image2D(size_t id);
#pragma pack(1) #pragma pack(1)
struct Header { struct Header {
@ -55,7 +55,7 @@ class TGAImporter: public AbstractImporter {
#pragma pack(8) #pragma pack(8)
private: private:
Image2D* _image; ImageData2D* _image;
}; };
}}} }}}

Loading…
Cancel
Save