From 65986a1cef8479eef85586d7b2d942998b5dc75e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Thu, 26 Jan 2012 20:00:50 +0100
Subject: [PATCH] Adapted to Magnum changes.

---
 src/Plugins/TGAImporter/TGAImporter.cpp          | 6 +++---
 src/Plugins/TGAImporter/Test/TGAImporterTest.cpp | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Plugins/TGAImporter/TGAImporter.cpp b/src/Plugins/TGAImporter/TGAImporter.cpp
index f38c5162f..40c7ccbc5 100644
--- a/src/Plugins/TGAImporter/TGAImporter.cpp
+++ b/src/Plugins/TGAImporter/TGAImporter.cpp
@@ -56,13 +56,13 @@ bool TGAImporter::open(std::istream& in) {
         return false;
     }
 
-    ColorFormat colorFormat;
+    AbstractTexture::ColorFormat colorFormat;
     switch(header.bpp) {
         case 24:
-            colorFormat = ColorFormat::BGR;
+            colorFormat = AbstractTexture::ColorFormat::BGR;
             break;
         case 32:
-            colorFormat = ColorFormat::BGRA;
+            colorFormat = AbstractTexture::ColorFormat::BGRA;
             break;
         default:
             Error() << "TGAImporter: unsupported bits-per-pixel:" << (int) header.bpp;
diff --git a/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp b/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
index 5cba1938e..f1600d3e9 100644
--- a/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
+++ b/src/Plugins/TGAImporter/Test/TGAImporterTest.cpp
@@ -73,7 +73,7 @@ void TGAImporterTest::bits24() {
     TGAImporter importer;
     QVERIFY(importer.open(in));
     auto image = importer.image2D(0);
-    QVERIFY(image->colorFormat() == ColorFormat::BGR);
+    QVERIFY(image->colorFormat() == AbstractTexture::ColorFormat::BGR);
     QVERIFY(image->dimensions() == Math::Vector2<GLsizei>(2, 3));
     QVERIFY(image->type() == TypeTraits<GLubyte>::glType());
     QVERIFY(string(static_cast<const char*>(image->data())) == string(data + 18, 2*3*3));
@@ -89,7 +89,7 @@ void TGAImporterTest::bits32() {
     TGAImporter importer;
     QVERIFY(importer.open(in));
     auto image = importer.image2D(0);
-    QVERIFY(image->colorFormat() == ColorFormat::BGRA);
+    QVERIFY(image->colorFormat() == AbstractTexture::ColorFormat::BGRA);
     QVERIFY(image->dimensions() == Math::Vector2<GLsizei>(2, 3));
     QVERIFY(image->type() == TypeTraits<GLubyte>::glType());
     QVERIFY(string(static_cast<const char*>(image->data()), 2*3*3) == string(data + 18, 2*3*3));