Browse Source

Include cleanup.

pull/34/head
Vladimír Vondruš 13 years ago
parent
commit
4c8cf7c8fa
  1. 2
      src/Plugins/TgaImporter/Test/TgaImporterTest.cpp
  2. 12
      src/Plugins/TgaImporter/TgaImporter.cpp
  3. 2
      src/Plugins/TgaImporter/TgaImporter.h

2
src/Plugins/TgaImporter/Test/TgaImporterTest.cpp

@ -20,8 +20,6 @@
#include "../TgaImporter.h"
using namespace Corrade::Utility;
namespace Magnum { namespace Trade { namespace TgaImporter { namespace Test {
class TgaImporterTest: public Corrade::TestSuite::Tester {

12
src/Plugins/TgaImporter/TgaImporter.cpp

@ -18,11 +18,11 @@
#include <fstream>
#include <algorithm>
#include <Utility/Endianness.h>
#include "Math/Vector2.h"
#include <Math/Vector2.h>
#include <Swizzle.h>
#include "Trade/ImageData.h"
using namespace Corrade::Utility;
#include <Trade/ImageData.h>
using Corrade::Utility::Endianness;
namespace Magnum { namespace Trade { namespace TgaImporter {
@ -61,8 +61,8 @@ bool TgaImporter::open(std::istream& in) {
in.read(reinterpret_cast<char*>(&header), sizeof(Header));
/* Convert to machine endian */
header.width = Endianness::littleEndian<unsigned short>(header.width);
header.height = Endianness::littleEndian<unsigned short>(header.height);
header.width = Endianness::littleEndian(header.width);
header.height = Endianness::littleEndian(header.height);
if(header.colorMapType != 0) {
Error() << "TgaImporter: paletted files are not supported";

2
src/Plugins/TgaImporter/TgaImporter.h

@ -19,7 +19,7 @@
* @brief Class Magnum::Trade::TgaImporter::TgaImporter
*/
#include "Trade/AbstractImporter.h"
#include <Trade/AbstractImporter.h>
#ifndef DOXYGEN_GENERATING_OUTPUT
#ifdef _WIN32

Loading…
Cancel
Save