diff options
| author | Einar Johan Trøan Sømåen | 2012-08-31 14:21:33 +0200 |
|---|---|---|
| committer | Einar Johan Trøan Sømåen | 2012-08-31 14:21:33 +0200 |
| commit | 764ca7a51a27210ca7a66a6ab2f01714029af09c (patch) | |
| tree | 8dca562ceb2279450028199735b1914384c0613c /engines/wintermute/base/gfx | |
| parent | 2039ea6b8df36c960ff25ae56930357d40e95d1d (diff) | |
| download | scummvm-rg350-764ca7a51a27210ca7a66a6ab2f01714029af09c.tar.gz scummvm-rg350-764ca7a51a27210ca7a66a6ab2f01714029af09c.tar.bz2 scummvm-rg350-764ca7a51a27210ca7a66a6ab2f01714029af09c.zip | |
WINTERMUTE: Fix some of the clang++ warnings listed by LordHoto
Diffstat (limited to 'engines/wintermute/base/gfx')
3 files changed, 4 insertions, 3 deletions
diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h index 5859fec74e..44acca0267 100644 --- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h @@ -83,6 +83,7 @@ public: void drawFromTicket(RenderTicket *renderTicket);
bool setViewport(int left, int top, int right, int bottom);
+ bool setViewport(Rect32 *rect) { return BaseRenderer::setViewport(rect); }
Rect32 getViewPort();
void modTargetRect(Common::Rect *rect);
void pointFromScreen(Point32 *point);
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp index f0ec41a265..ea88f19065 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.cpp @@ -196,7 +196,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) { bool hasTransparency = false;
for (int y = 0; y < surface->h; y++) {
for (int x = 0; x < surface->w; x++) {
- uint32 pixel = getPixel(surface, x, y);
+ uint32 pixel = getPixelAt(surface, x, y);
uint8 r, g, b, a;
surface->format.colorToARGB(pixel, a, r, g, b);
@@ -220,7 +220,7 @@ void BaseSurfaceOSystem::genAlphaMask(Graphics::Surface *surface) { }
//////////////////////////////////////////////////////////////////////////
-uint32 BaseSurfaceOSystem::getPixel(Graphics::Surface *surface, int x, int y) {
+uint32 BaseSurfaceOSystem::getPixelAt(Graphics::Surface *surface, int x, int y) {
warning("BaseSurfaceOSystem::GetPixel - Not ported yet");
int bpp = surface->format.bytesPerPixel;
/* Here p is the address to the pixel we want to retrieve */
diff --git a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h index 27f9ad047e..1b7146632e 100644 --- a/engines/wintermute/base/gfx/osystem/base_surface_osystem.h +++ b/engines/wintermute/base/gfx/osystem/base_surface_osystem.h @@ -86,7 +86,7 @@ private: bool finishLoad();
bool drawSprite(int x, int y, Rect32 *rect, float zoomX, float zoomY, uint32 alpha, bool alphaDisable, TSpriteBlendMode blendMode, bool mirrorX, bool mirrorY, int offsetX = 0, int offsetY = 0);
void genAlphaMask(Graphics::Surface *surface);
- uint32 getPixel(Graphics::Surface *surface, int x, int y);
+ uint32 getPixelAt(Graphics::Surface *surface, int x, int y);
bool _hasAlpha;
void *_lockPixels;
|