diff options
author | Eugene Sandulenko | 2010-10-19 20:52:47 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-19 20:52:47 +0000 |
commit | f3becaddf1d865e44f13aadbb8c71952a73f2268 (patch) | |
tree | 703ea24624b0d2b2b56bb2705922ff7139928882 /engines/sword25/gfx/image/imageloader.cpp | |
parent | bbd95da899c496c10a4050b7b3cfd3f8dc8aa6b3 (diff) | |
download | scummvm-rg350-f3becaddf1d865e44f13aadbb8c71952a73f2268.tar.gz scummvm-rg350-f3becaddf1d865e44f13aadbb8c71952a73f2268.tar.bz2 scummvm-rg350-f3becaddf1d865e44f13aadbb8c71952a73f2268.zip |
SWORD25: Enforce code naming conventions in gfx/image/imageloader*
svn-id: r53623
Diffstat (limited to 'engines/sword25/gfx/image/imageloader.cpp')
-rw-r--r-- | engines/sword25/gfx/image/imageloader.cpp | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/engines/sword25/gfx/image/imageloader.cpp b/engines/sword25/gfx/image/imageloader.cpp index 55ce833cc9..9838e8f0b6 100644 --- a/engines/sword25/gfx/image/imageloader.cpp +++ b/engines/sword25/gfx/image/imageloader.cpp @@ -40,84 +40,75 @@ namespace Sword25 { #define BS_LOG_PREFIX "IMAGELOADER" // Statische Elemente der Klasse BS_ImageLoader intialisieren. -Common::List<ImageLoader *> ImageLoader::_ImageLoaderList; -bool ImageLoader::_ImageLoaderListInitialized = false; +Common::List<ImageLoader *> ImageLoader::_imageLoaderList; +bool ImageLoader::_imageLoaderListInitialized = false; -// Lade Methode -// ------------ - -bool ImageLoader::LoadImage(const byte *pFileData, uint FileSize, - GraphicEngine::COLOR_FORMATS ColorFormat, +bool ImageLoader::loadImage(const byte *pFileData, uint fileSize, + GraphicEngine::COLOR_FORMATS colorFormat, byte *&pUncompressedData, - int &Width, int &Height, - int &Pitch) { + int &width, int &height, + int &pitch) { // Falls die Liste der BS_ImageLoader noch nicht initialisiert wurde, wird dies getan. - if (!_ImageLoaderListInitialized) - _InitializeLoaderList(); + if (!_imageLoaderListInitialized) + initializeLoaderList(); // Passenden BS_ImageLoader finden und Bild dekodieren - ImageLoader *pLoader = _FindSuitableImageLoader(pFileData, FileSize); + ImageLoader *pLoader = findSuitableImageLoader(pFileData, fileSize); if (pLoader) { - return pLoader->DecodeImage(pFileData, FileSize, - ColorFormat, + return pLoader->decodeImage(pFileData, fileSize, + colorFormat, pUncompressedData, - Width, Height, - Pitch); + width, height, + pitch); } return false; } -// Info Methode -// ------------ - -bool ImageLoader::ExtractImageProperties(const byte *pFileData, uint FileSize, - GraphicEngine::COLOR_FORMATS &ColorFormat, - int &Width, int &Height) { +bool ImageLoader::extractImageProperties(const byte *pFileData, uint fileSize, + GraphicEngine::COLOR_FORMATS &colorFormat, + int &width, int &height) { // Falls die Liste der BS_ImageLoader noch nicht initialisiert wurde, wird dies getan. - if (!_ImageLoaderListInitialized) - _InitializeLoaderList(); + if (!_imageLoaderListInitialized) + initializeLoaderList(); // Passenden BS_ImageLoader finden und Bildeigenschaften auslesen. - ImageLoader *pLoader = _FindSuitableImageLoader(pFileData, FileSize); + ImageLoader *pLoader = findSuitableImageLoader(pFileData, fileSize); if (pLoader) { - return pLoader->ImageProperties(pFileData, FileSize, - ColorFormat, - Width, Height); + return pLoader->imageProperties(pFileData, fileSize, + colorFormat, + width, height); } return false; } -// Verwaltungs Methoden -// -------------------- - -void ImageLoader::_InitializeLoaderList() { +void ImageLoader::initializeLoaderList() { // Von jedem BS_ImageLoader wird eine Instanz erzeugt, diese fügen sich selbständig in die BS_ImageLoader-Liste ein. for (int i = 0; i < BS_IMAGELOADER_COUNT; i++) BS_IMAGELOADER_IDS[i](); // Die Liste als gefüllt markieren. - _ImageLoaderListInitialized = true; + _imageLoaderListInitialized = true; // Sicherstellen, dass beim Beenden alle BS_ImageLoader Instanzen zerstört werden. - atexit(ImageLoader::_DeinitializeLoaderList); + atexit(ImageLoader::deinitializeLoaderList); } -void ImageLoader::_DeinitializeLoaderList() { - while (!_ImageLoaderList.empty()) { - delete _ImageLoaderList.back(); - _ImageLoaderList.pop_back(); +void ImageLoader::deinitializeLoaderList() { + while (!_imageLoaderList.empty()) { + delete _imageLoaderList.back(); + _imageLoaderList.pop_back(); } } -ImageLoader *ImageLoader::_FindSuitableImageLoader(const byte *pFileData, uint FileSize) { +ImageLoader *ImageLoader::findSuitableImageLoader(const byte *pFileData, uint fileSize) { // Alle BS_ImageLoader-Objekte durchgehen, bis eins gefunden wurde, dass das Bild laden kann - Common::List<ImageLoader *>::iterator Iter = _ImageLoaderList.begin(); - for (; Iter != _ImageLoaderList.end(); ++Iter) { + 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)) { - return (*Iter); + if ((*iter)->isCorrectImageFormat(pFileData, fileSize)) { + return (*iter); } } |