X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fdevil%2Fdevilloader.cpp;h=8fbf59ccbee6150a44259437ac3f2fc78be5f02d;hb=HEAD;hp=a6693080748a001b87612615920e477e642b1018;hpb=054fca09f0bbd64fdbd6406a0643de938a9cd4fb;p=libs%2Fgui.git

diff --git a/source/graphics/devil/devilloader.cpp b/source/graphics/devil/devilloader.cpp
index a669308..8fbf59c 100644
--- a/source/graphics/devil/devilloader.cpp
+++ b/source/graphics/devil/devilloader.cpp
@@ -1,7 +1,7 @@
+#include "devilloader.h"
 #include <algorithm>
 #include <msp/strings/format.h>
 #include <IL/il.h>
-#include "devilloader.h"
 
 using namespace std;
 
@@ -54,7 +54,7 @@ int tell(void *handle)
 	return reinterpret_cast<Msp::IO::Seekable *>(handle)->tell();
 }
 
-std::string error_string(ILenum err)
+string error_string(ILenum err)
 {
 	switch(err)
 	{
@@ -135,7 +135,6 @@ void DevilLoader::load_pixels_(Image::Data &data)
 	ilBindImage(id);
 
 	unsigned data_size = data.stride*data.height;
-	data.pixels = new char[data_size];
 	ILubyte *il_data = ilGetData();
 	copy(il_data, il_data+data_size, data.pixels);