FREESCAPE: moved NeoDecoder into the Freescape namespace

engines/freescape/freescape.cpp

@@ -624,7 +624,7 @@ void FreescapeEngine::loadDataBundle() {
 
 byte *FreescapeEngine::getPaletteFromNeoImage(Common::SeekableReadStream *stream, int offset) {
 	stream->seek(offset);
-	Image::NeoDecoder decoder;
+	NeoDecoder decoder;
 	decoder.loadStream(*stream);
 	byte *palette = (byte *)malloc(16 * 3 * sizeof(byte));
 	memcpy(palette, decoder.getPalette(), 16 * 3 * sizeof(byte));
@@ -633,7 +633,7 @@ byte *FreescapeEngine::getPaletteFromNeoImage(Common::SeekableReadStream *stream
 
 Graphics::Surface *FreescapeEngine::loadAndConvertNeoImage(Common::SeekableReadStream *stream, int offset, byte *palette) {
 	stream->seek(offset);
-	Image::NeoDecoder decoder(palette);
+	NeoDecoder decoder(palette);
 	decoder.loadStream(*stream);
 	Graphics::Surface *surface = new Graphics::Surface();
 	surface->copyFrom(*decoder.getSurface());

engines/freescape/neo.cpp

@@ -26,7 +26,7 @@
 
 #include "freescape/neo.h"
 
-namespace Image {
+namespace Freescape {
 
 NeoDecoder::NeoDecoder(byte *palette) {
 	_surface = nullptr;
@@ -119,4 +119,4 @@ bool NeoDecoder::loadStream(Common::SeekableReadStream &stream) {
 	return true;
 }
 
-} // End of namespace Image
+} // End of namespace Freescape

engines/freescape/neo.h

@@ -32,9 +32,9 @@ namespace Common {
 class SeekableReadStream;
 }
 
-namespace Image {
+namespace Freescape {
 
-class NeoDecoder : public ImageDecoder {
+class NeoDecoder : public Image::ImageDecoder {
 public:
 	NeoDecoder(byte *palette = nullptr);
 	virtual ~NeoDecoder();
@@ -52,6 +52,6 @@ private:
 	byte *_palette;
 	uint16 _paletteColorCount;
 };
-} // End of namespace Image
+} // End of namespace Freescape
 
 #endif // FREESCAPE_NEO_H