diff options
author | Eugene Sandulenko | 2010-08-05 12:48:19 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 22:27:03 +0000 |
commit | de0fe1db4939bbb787de60231dd30a7b5391f269 (patch) | |
tree | 96c1872068e9847500e4cf3b63242998bcb0c517 /engines/sword25/gfx/image | |
parent | eb30ebde2a4e3181bc2ef2daccedfe852aa891e1 (diff) | |
download | scummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.tar.gz scummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.tar.bz2 scummvm-rg350-de0fe1db4939bbb787de60231dd30a7b5391f269.zip |
SWORD25: Mass-putting of all files in gfx/ into Sword25 namespace
svn-id: r53214
Diffstat (limited to 'engines/sword25/gfx/image')
-rw-r--r-- | engines/sword25/gfx/image/b25sloader.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/b25sloader.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/image.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/imageloader.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/imageloader.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/imageloader_ids.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/pngloader.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/pngloader.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/vectorimage.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/vectorimage.h | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/vectorimagerenderer.cpp | 4 | ||||
-rw-r--r-- | engines/sword25/gfx/image/vectorimagerenderer.h | 4 |
12 files changed, 48 insertions, 0 deletions
diff --git a/engines/sword25/gfx/image/b25sloader.cpp b/engines/sword25/gfx/image/b25sloader.cpp index 3a5db7c6bc..ea1e933edd 100644 --- a/engines/sword25/gfx/image/b25sloader.cpp +++ b/engines/sword25/gfx/image/b25sloader.cpp @@ -44,6 +44,8 @@ using namespace std; #include "sword25/gfx/image/b25sloader.h" #include "sword25/gfx/image/pngloader.h" +namespace Sword25 { + #define BS_LOG_PREFIX "B25SLOADER" // ----------------------------------------------------------------------------- @@ -114,3 +116,5 @@ bool BS_B25SLoader::ImageProperties(const char * FileDataPtr, unsigned int FileS return false; } + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/b25sloader.h b/engines/sword25/gfx/image/b25sloader.h index 4d7b61a6ef..be28b646c8 100644 --- a/engines/sword25/gfx/image/b25sloader.h +++ b/engines/sword25/gfx/image/b25sloader.h @@ -42,6 +42,8 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/image/imageloader.h" +namespace Sword25 { + // ----------------------------------------------------------------------------- // Klassendeklaration // ----------------------------------------------------------------------------- @@ -64,4 +66,6 @@ protected: }; +} // End of namespace Sword25 + #endif diff --git a/engines/sword25/gfx/image/image.h b/engines/sword25/gfx/image/image.h index 23073d71b8..8c5d750b6a 100644 --- a/engines/sword25/gfx/image/image.h +++ b/engines/sword25/gfx/image/image.h @@ -50,6 +50,8 @@ #include "sword25/math/rect.h" #include "sword25/gfx/graphicengine.h" +namespace Sword25 { + class BS_Image { public: @@ -220,4 +222,6 @@ public: //@} }; +} // End of namespace Sword25 + #endif diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp index 998c784c33..1bf7508ee5 100644 --- a/engines/sword25/gfx/image/imageloader.cpp +++ b/engines/sword25/gfx/image/imageloader.cpp @@ -35,6 +35,8 @@ #include "sword25/gfx/image/imageloader.h" #include "sword25/gfx/image/imageloader_ids.h" +namespace Sword25 { + #define BS_LOG_PREFIX "IMAGELOADER" // Statische Elemente der Klasse BS_ImageLoader intialisieren. @@ -133,3 +135,5 @@ BS_ImageLoader* BS_ImageLoader::_FindSuitableImageLoader(const char* pFileData, BS_LOG_ERRORLN("Could not find suitable image loader for image data."); return NULL; } + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/imageloader.h b/engines/sword25/gfx/image/imageloader.h index 7529bbb916..15c4e20606 100644 --- a/engines/sword25/gfx/image/imageloader.h +++ b/engines/sword25/gfx/image/imageloader.h @@ -52,6 +52,8 @@ #include <list> #include "sword25/kernel/memlog_on.h" +namespace Sword25 { + /** @brief Über die statischen Methoden dieser Klasse werden alle unterstützten Bildformate geladen. @@ -370,4 +372,6 @@ private: static bool _ImageLoaderListInitialized; // Gibt an, ob die Liste schon intialisiert wurde }; +} // End of namespace Sword25 + #endif diff --git a/engines/sword25/gfx/image/imageloader_ids.h b/engines/sword25/gfx/image/imageloader_ids.h index a9de1378a4..74c5c3429a 100644 --- a/engines/sword25/gfx/image/imageloader_ids.h +++ b/engines/sword25/gfx/image/imageloader_ids.h @@ -47,6 +47,8 @@ #include "sword25/gfx/image/pngloader.h" #include "sword25/gfx/image/b25sloader.h" +namespace Sword25 { + // Die Tabelle enthält Pointer auf statische Member-Funktionen innerhalb der Klassen, die eine Instanz der Klasse // erzeugen typedef BS_ImageLoader* (*BS_IMAGELOADER_NEW)(); @@ -57,3 +59,5 @@ const BS_IMAGELOADER_NEW BS_IMAGELOADER_IDS[] = }; const int BS_IMAGELOADER_COUNT = sizeof(BS_IMAGELOADER_IDS) / sizeof(BS_IMAGELOADER_NEW); + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/pngloader.cpp b/engines/sword25/gfx/image/pngloader.cpp index 80008c3e4d..693874314f 100644 --- a/engines/sword25/gfx/image/pngloader.cpp +++ b/engines/sword25/gfx/image/pngloader.cpp @@ -40,6 +40,8 @@ #include "sword25/gfx/image/pngloader.h" #include <png.h> +namespace Sword25 { + #define BS_LOG_PREFIX "PNGLOADER" // ----------------------------------------------------------------------------- @@ -402,3 +404,5 @@ bool BS_PNGLoader::IsCorrectImageFormat(const char* FileDataPtr, unsigned int Fi { return DoIsCorrectImageFormat(FileDataPtr, FileSize); } + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/pngloader.h b/engines/sword25/gfx/image/pngloader.h index 0be88ca8e1..a4ce28fbe5 100644 --- a/engines/sword25/gfx/image/pngloader.h +++ b/engines/sword25/gfx/image/pngloader.h @@ -47,6 +47,8 @@ #include "sword25/kernel/common.h" #include "sword25/gfx/image/imageloader.h" +namespace Sword25 { + // Klassendefinition class BS_PNGLoader : public BS_ImageLoader { @@ -76,4 +78,6 @@ protected: bool ImageProperties(const char * FileDatePtr, unsigned int FileSize, BS_GraphicEngine::COLOR_FORMATS & ColorFormat, int & Width, int & Height); }; +} // End of namespace Sword25 + #endif diff --git a/engines/sword25/gfx/image/vectorimage.cpp b/engines/sword25/gfx/image/vectorimage.cpp index 27c2c6adac..6d0c046fcd 100644 --- a/engines/sword25/gfx/image/vectorimage.cpp +++ b/engines/sword25/gfx/image/vectorimage.cpp @@ -45,6 +45,8 @@ using namespace std; +namespace Sword25 { + #define BS_LOG_PREFIX "VECTORIMAGE" @@ -584,3 +586,5 @@ bool BS_VectorImage::SetContent(const std::vector<unsigned char> & Pixeldata, un BS_LOG_ERRORLN("SetContent() is not supported."); return 0; } + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/vectorimage.h b/engines/sword25/gfx/image/vectorimage.h index 30a2d289de..778422f295 100644 --- a/engines/sword25/gfx/image/vectorimage.h +++ b/engines/sword25/gfx/image/vectorimage.h @@ -48,6 +48,8 @@ #include "agg_color_rgba.h" +namespace Sword25 { + class BS_VectorImage; /** @@ -179,4 +181,6 @@ private: BS_Rect m_BoundingBox; }; +} // End of namespace Sword25 + #endif diff --git a/engines/sword25/gfx/image/vectorimagerenderer.cpp b/engines/sword25/gfx/image/vectorimagerenderer.cpp index b5047141c1..7206551586 100644 --- a/engines/sword25/gfx/image/vectorimagerenderer.cpp +++ b/engines/sword25/gfx/image/vectorimagerenderer.cpp @@ -43,6 +43,8 @@ #include "agg_conv_stroke.h" +namespace Sword25 { + // ----------------------------------------------------------------------------- // CompoundShape // ----------------------------------------------------------------------------- @@ -211,3 +213,5 @@ bool BS_VectorImageRenderer::Render(const BS_VectorImage & VectorImage, return true; } + +} // End of namespace Sword25 diff --git a/engines/sword25/gfx/image/vectorimagerenderer.h b/engines/sword25/gfx/image/vectorimagerenderer.h index e26b0fc302..b104374054 100644 --- a/engines/sword25/gfx/image/vectorimagerenderer.h +++ b/engines/sword25/gfx/image/vectorimagerenderer.h @@ -52,6 +52,8 @@ #include "agg_trans_affine.h" #include "agg_span_allocator.h" +namespace Sword25 { + class BS_VectorImage; @@ -88,4 +90,6 @@ private: agg::span_allocator<agg::rgba8> Alloc; }; +} // End of namespace Sword25 + #endif |