From e5cf6c7c933ad8585984a8a47f4a71f62e6f7328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 23 Feb 2012 14:41:16 +0100 Subject: [PATCH] Adapted to Magnum changes. --- src/Plugins/TGAImporter/TGAImporter.cpp | 6 +++--- src/Plugins/TGAImporter/TGAImporter.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Plugins/TGAImporter/TGAImporter.cpp b/src/Plugins/TGAImporter/TGAImporter.cpp index 4602a9e99..480fac98c 100644 --- a/src/Plugins/TGAImporter/TGAImporter.cpp +++ b/src/Plugins/TGAImporter/TGAImporter.cpp @@ -17,7 +17,7 @@ #include "Utility/Endianness.h" #include "Math/Vector2.h" -#include "Trade/Image.h" +#include "Trade/ImageData.h" using namespace std; using namespace Corrade::Utility; @@ -75,7 +75,7 @@ bool TGAImporter::open(std::istream& in) { Math::Vector2 dimensions(header.width, header.height); - _image = new Image2D(dimensions, colorFormat, buffer); + _image = new ImageData2D(colorFormat, dimensions, buffer); return true; } @@ -84,7 +84,7 @@ void TGAImporter::close() { _image = nullptr; } -Image2D* TGAImporter::image2D(size_t id) { +ImageData2D* TGAImporter::image2D(size_t id) { return _image; } diff --git a/src/Plugins/TGAImporter/TGAImporter.h b/src/Plugins/TGAImporter/TGAImporter.h index d614f84a3..ff8b8afe1 100644 --- a/src/Plugins/TGAImporter/TGAImporter.h +++ b/src/Plugins/TGAImporter/TGAImporter.h @@ -35,7 +35,7 @@ class TGAImporter: public AbstractImporter { void close(); inline size_t image2DCount() const { return _image ? 1 : 0; } - Image2D* image2D(size_t id); + ImageData2D* image2D(size_t id); #pragma pack(1) struct Header { @@ -55,7 +55,7 @@ class TGAImporter: public AbstractImporter { #pragma pack(8) private: - Image2D* _image; + ImageData2D* _image; }; }}}