diff options
| author | Einar Johan Trøan Sømåen | 2012-07-08 19:08:05 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-07-08 19:08:05 +0200 |
| commit | 7a40ed244626218d654daaf85d54294d652f0ab7 (patch) | |
| tree | 5c7f94b78c9bc357ac345199951ad4fc77fa4396 /engines | |
| parent | 2ac6cfbc8ad7f57dcd8a74479451276e700102a2 (diff) | |
| download | scummvm-rg350-7a40ed244626218d654daaf85d54294d652f0ab7.tar.gz scummvm-rg350-7a40ed244626218d654daaf85d54294d652f0ab7.tar.bz2 scummvm-rg350-7a40ed244626218d654daaf85d54294d652f0ab7.zip | |
WINTERMUTE: Rename FuncName/VarName->funcName/varName in BImage
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/Base/BGame.cpp | 6 | ||||
| -rw-r--r-- | engines/wintermute/Base/BImage.cpp | 14 | ||||
| -rw-r--r-- | engines/wintermute/Base/BImage.h | 6 | ||||
| -rw-r--r-- | engines/wintermute/Base/BSaveThumbHelper.cpp | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/engines/wintermute/Base/BGame.cpp b/engines/wintermute/Base/BGame.cpp index 220f3359bc..6b3d9fdbed 100644 --- a/engines/wintermute/Base/BGame.cpp +++ b/engines/wintermute/Base/BGame.cpp @@ -1807,7 +1807,7 @@ HRESULT CBGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisS bool ret = false;
CBImage *Image = Game->_renderer->takeScreenshot();
if (Image) {
- ret = SUCCEEDED(Image->SaveBMPFile(filename));
+ ret = SUCCEEDED(Image->saveBMPFile(filename));
delete Image;
} else ret = false;
@@ -1827,8 +1827,8 @@ HRESULT CBGame::scCallMethod(CScScript *script, CScStack *stack, CScStack *thisS bool ret = false;
CBImage *Image = Game->_renderer->takeScreenshot();
if (Image) {
- ret = SUCCEEDED(Image->Resize(SizeX, SizeY));
- if (ret) ret = SUCCEEDED(Image->SaveBMPFile(filename));
+ ret = SUCCEEDED(Image->resize(SizeX, SizeY));
+ if (ret) ret = SUCCEEDED(Image->saveBMPFile(filename));
delete Image;
} else ret = false;
diff --git a/engines/wintermute/Base/BImage.cpp b/engines/wintermute/Base/BImage.cpp index 11be19683f..c119e023c1 100644 --- a/engines/wintermute/Base/BImage.cpp +++ b/engines/wintermute/Base/BImage.cpp @@ -112,7 +112,7 @@ void CBImage::copyFrom(Graphics::Surface *surface) { }
//////////////////////////////////////////////////////////////////////////
-HRESULT CBImage::SaveBMPFile(const char *filename) {
+HRESULT CBImage::saveBMPFile(const char *filename) {
#if 0
if (!_bitmap) return E_FAIL;
@@ -124,12 +124,12 @@ HRESULT CBImage::SaveBMPFile(const char *filename) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBImage::Resize(int NewWidth, int NewHeight) {
+HRESULT CBImage::resize(int newWidth, int newHeight) {
#if 0
if (!_bitmap) return E_FAIL;
- if (NewWidth == 0) NewWidth = FreeImage_GetWidth(_bitmap);
- if (NewHeight == 0) NewHeight = FreeImage_GetHeight(_bitmap);
+ if (newWidth == 0) NewWidth = FreeImage_GetWidth(_bitmap);
+ if (newHeight == 0) NewHeight = FreeImage_GetHeight(_bitmap);
FIBITMAP *newImg = FreeImage_Rescale(_bitmap, NewWidth, NewHeight, FILTER_BILINEAR);
@@ -248,7 +248,7 @@ bool CBImage::writeBMPToStream(Common::WriteStream *stream) { //////////////////////////////////////////////////////////////////////////
-HRESULT CBImage::CopyFrom(CBImage *OrigImage, int NewWidth, int NewHeight) {
+HRESULT CBImage::copyFrom(CBImage *origImage, int newWidth, int newHeight) {
#if 0
if (_bitmap) FreeImage_Unload(_bitmap);
@@ -257,13 +257,13 @@ HRESULT CBImage::CopyFrom(CBImage *OrigImage, int NewWidth, int NewHeight) { _bitmap = FreeImage_Rescale(OrigImage->GetBitmap(), NewWidth, NewHeight, FILTER_BILINEAR);
#endif
- TransparentSurface temp(*OrigImage->_surface, false);
+ TransparentSurface temp(*origImage->_surface, false);
if (_deletableSurface) {
_deletableSurface->free();
delete _deletableSurface;
_deletableSurface = NULL;
}
- _surface = _deletableSurface = temp.scale(NewWidth, NewHeight);
+ _surface = _deletableSurface = temp.scale(newWidth, newHeight);
return S_OK;
}
diff --git a/engines/wintermute/Base/BImage.h b/engines/wintermute/Base/BImage.h index 2472af718c..8edde54d3f 100644 --- a/engines/wintermute/Base/BImage.h +++ b/engines/wintermute/Base/BImage.h @@ -56,9 +56,9 @@ public: }
byte getAlphaAt(int x, int y);
bool writeBMPToStream(Common::WriteStream *stream);
- HRESULT Resize(int NewWidth, int NewHeight);
- HRESULT SaveBMPFile(const char *filename);
- HRESULT CopyFrom(CBImage *OrigImage, int NewWidth = 0, int NewHeight = 0);
+ HRESULT resize(int newWidth, int newHeight);
+ HRESULT saveBMPFile(const char *filename);
+ HRESULT copyFrom(CBImage *origImage, int newWidth = 0, int newHeight = 0);
void copyFrom(Graphics::Surface *surface);
private:
Common::String _filename;
diff --git a/engines/wintermute/Base/BSaveThumbHelper.cpp b/engines/wintermute/Base/BSaveThumbHelper.cpp index 9e5466b323..60bb2d9dfa 100644 --- a/engines/wintermute/Base/BSaveThumbHelper.cpp +++ b/engines/wintermute/Base/BSaveThumbHelper.cpp @@ -66,7 +66,7 @@ HRESULT CBSaveThumbHelper::StoreThumbnail(bool DoFlip) { // normal thumbnail
if (Game->_thumbnailWidth > 0 && Game->_thumbnailHeight > 0) {
_thumbnail = new CBImage(Game);
- _thumbnail->CopyFrom(Screenshot, Game->_thumbnailWidth, Game->_thumbnailHeight);
+ _thumbnail->copyFrom(Screenshot, Game->_thumbnailWidth, Game->_thumbnailHeight);
}
|