From 595f23b06ea45e091bcc76bc985e3c6654bad6e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Mon, 2 Apr 2012 04:29:23 +0200
Subject: [PATCH] Adapted to Magnum changes.

---
 src/Plugins/TgaImporter/Test/TgaImporterTest.cpp | 8 ++++----
 src/Plugins/TgaImporter/TgaImporter.cpp          | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
index 231839da9..2adf5bd56 100644
--- a/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
+++ b/src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
@@ -73,9 +73,9 @@ void TgaImporterTest::bits24() {
     TgaImporter importer;
     QVERIFY(importer.open(in));
     auto image = importer.image2D(0);
-    QVERIFY(image->colorFormat() == AbstractTexture::ColorFormat::BGR);
+    QVERIFY(image->components() == AbstractImage::Components::BGR);
     QVERIFY(image->dimensions() == Math::Vector2<GLsizei>(2, 3));
-    QVERIFY(image->type() == TypeTraits<GLubyte>::glType());
+    QVERIFY(image->type() == TypeTraits<GLubyte>::imageType());
     QVERIFY(string(static_cast<const char*>(image->data())) == string(data + 18, 2*3*3));
 }
 
@@ -89,9 +89,9 @@ void TgaImporterTest::bits32() {
     TgaImporter importer;
     QVERIFY(importer.open(in));
     auto image = importer.image2D(0);
-    QVERIFY(image->colorFormat() == AbstractTexture::ColorFormat::BGRA);
+    QVERIFY(image->components() == AbstractImage::Components::BGRA);
     QVERIFY(image->dimensions() == Math::Vector2<GLsizei>(2, 3));
-    QVERIFY(image->type() == TypeTraits<GLubyte>::glType());
+    QVERIFY(image->type() == TypeTraits<GLubyte>::imageType());
     QVERIFY(string(static_cast<const char*>(image->data()), 2*3*3) == string(data + 18, 2*3*3));
 }
 
diff --git a/src/Plugins/TgaImporter/TgaImporter.cpp b/src/Plugins/TgaImporter/TgaImporter.cpp
index 25b74a7b4..359f6158f 100644
--- a/src/Plugins/TgaImporter/TgaImporter.cpp
+++ b/src/Plugins/TgaImporter/TgaImporter.cpp
@@ -64,13 +64,13 @@ bool TgaImporter::open(std::istream& in) {
         return false;
     }
 
-    AbstractTexture::ColorFormat colorFormat;
+    AbstractImage::Components components;
     switch(header.bpp) {
         case 24:
-            colorFormat = AbstractTexture::ColorFormat::BGR;
+            components = AbstractImage::Components::BGR;
             break;
         case 32:
-            colorFormat = AbstractTexture::ColorFormat::BGRA;
+            components = AbstractImage::Components::BGRA;
             break;
         default:
             Error() << "TgaImporter: unsupported bits-per-pixel:" << (int) header.bpp;
@@ -83,7 +83,7 @@ bool TgaImporter::open(std::istream& in) {
 
     Math::Vector2<GLsizei> dimensions(header.width, header.height);
 
-    _image = new ImageData2D(colorFormat, dimensions, buffer);
+    _image = new ImageData2D(dimensions, components, buffer);
     return true;
 }