diff options
author | Eugene Sandulenko | 2010-08-18 12:58:45 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 23:07:29 +0000 |
commit | 3fb0e9383b7da395d2d715c6f1abeb0252cac229 (patch) | |
tree | 48c0b3fdda51cb1cea6b55232d3262dabff17cd2 /engines/sword25/gfx/image | |
parent | b01994a53bbc96da907a4c28934e644184291017 (diff) | |
download | scummvm-rg350-3fb0e9383b7da395d2d715c6f1abeb0252cac229.tar.gz scummvm-rg350-3fb0e9383b7da395d2d715c6f1abeb0252cac229.tar.bz2 scummvm-rg350-3fb0e9383b7da395d2d715c6f1abeb0252cac229.zip |
SWORD25: Removed last traces of STL
svn-id: r53262
Diffstat (limited to 'engines/sword25/gfx/image')
-rw-r--r-- | engines/sword25/gfx/image/b25sloader.cpp | 9 | ||||
-rw-r--r-- | engines/sword25/gfx/image/image.h | 3 | ||||
-rw-r--r-- | engines/sword25/gfx/image/imageloader.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/imageloader.h | 7 | ||||
-rw-r--r-- | engines/sword25/gfx/image/vectorimage.h | 1 |
5 files changed, 7 insertions, 17 deletions
diff --git a/engines/sword25/gfx/image/b25sloader.cpp b/engines/sword25/gfx/image/b25sloader.cpp index ea3266969c..38e70102b4 100644 --- a/engines/sword25/gfx/image/b25sloader.cpp +++ b/engines/sword25/gfx/image/b25sloader.cpp @@ -36,11 +36,6 @@ // Includes // ----------------------------------------------------------------------------- -#include <string> -#include <sstream> -#include <algorithm> -using namespace std; - #include "sword25/gfx/image/b25sloader.h" #include "sword25/gfx/image/pngloader.h" @@ -52,6 +47,7 @@ namespace Sword25 { namespace { unsigned int FindEmbeddedPNG(const char *FileDataPtr, unsigned int FileSize) { +#if 0 // Einen Stringstream mit dem Anfang der Datei intialisieren. 512 Byte sollten hierfür genügen. istringstream StringStream(string(FileDataPtr, FileDataPtr + min(static_cast<unsigned int>(512), FileSize))); @@ -66,6 +62,9 @@ unsigned int FindEmbeddedPNG(const char *FileDataPtr, unsigned int FileSize) { // Offset zum PNG innerhalb des Spielstandes berechnen und zurückgeben. return static_cast<unsigned int>(StringStream.tellg()) + CompressedGamedataSize + 1; } +#else + warning("STUB:FindEmbeddedPNG()"); +#endif return 0; } diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h index 1b7b2f2694..dbf5a7f31d 100644 --- a/engines/sword25/gfx/image/image.h +++ b/engines/sword25/gfx/image/image.h @@ -43,9 +43,6 @@ #define SWORD25_IMAGE_H // Includes -#include "sword25/kernel/memlog_off.h" -#include <vector> -#include "sword25/kernel/memlog_on.h" #include "sword25/kernel/common.h" #include "sword25/math/rect.h" #include "sword25/gfx/graphicengine.h" diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp index 450bd1b8fb..af16c5cb2f 100644 --- a/engines/sword25/gfx/image/imageloader.cpp +++ b/engines/sword25/gfx/image/imageloader.cpp @@ -40,7 +40,7 @@ namespace Sword25 { #define BS_LOG_PREFIX "IMAGELOADER" // Statische Elemente der Klasse BS_ImageLoader intialisieren. -std::list<ImageLoader *> ImageLoader::_ImageLoaderList; +Common::List<ImageLoader *> ImageLoader::_ImageLoaderList; bool ImageLoader::_ImageLoaderListInitialized = false; // Lade Methode @@ -113,7 +113,7 @@ void ImageLoader::_DeinitializeLoaderList() { ImageLoader *ImageLoader::_FindSuitableImageLoader(const char *pFileData, unsigned int FileSize) { // Alle BS_ImageLoader-Objekte durchgehen, bis eins gefunden wurde, dass das Bild laden kann - std::list<ImageLoader *>::iterator Iter = _ImageLoaderList.begin(); + Common::List<ImageLoader *>::iterator Iter = _ImageLoaderList.begin(); for (; Iter != _ImageLoaderList.end(); ++Iter) { // Falls ein geeigneter BS-ImageLoader gefunden wurde, wird er zurückgegeben. if ((*Iter)->IsCorrectImageFormat(pFileData, FileSize)) { diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h index c626fc20a7..0ed896dba2 100644 --- a/engines/sword25/gfx/image/imageloader.h +++ b/engines/sword25/gfx/image/imageloader.h @@ -47,11 +47,6 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/graphicengine.h" -// Die folgenden Header vertragen sich nicht mit der Memoryleak-Detection, daher wird sie kurzzeitig deaktiviert -#include "sword25/kernel/memlog_off.h" -#include <list> -#include "sword25/kernel/memlog_on.h" - namespace Sword25 { /** @@ -356,7 +351,7 @@ private: */ static ImageLoader *_FindSuitableImageLoader(const char *pFileData, unsigned int FileSize); - static std::list<ImageLoader *> _ImageLoaderList; // Die Liste aller BS_ImageLoader-Objekte + static Common::List<ImageLoader *> _ImageLoaderList; // Die Liste aller BS_ImageLoader-Objekte static bool _ImageLoaderListInitialized; // Gibt an, ob die Liste schon intialisiert wurde }; diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h index 6fa98e57d1..b61db91581 100644 --- a/engines/sword25/gfx/image/vectorimage.h +++ b/engines/sword25/gfx/image/vectorimage.h @@ -44,7 +44,6 @@ #include "sword25/math/rect.h" #if 0 -#include <vector> #include "agg_path_storage.h" #endif |