[Scummvm-cvs-logs] scummvm master -> 00edd712e85c7811c1b6f1119ad2abcad6999ce9

[dreammaster]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
00edd712e8 SHERLOCK: Fix overloaded setPixels warning


Commit: 00edd712e85c7811c1b6f1119ad2abcad6999ce9
    https://github.com/scummvm/scummvm/commit/00edd712e85c7811c1b6f1119ad2abcad6999ce9
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-03-20T19:42:08-04:00

Commit Message:
SHERLOCK: Fix overloaded setPixels warning

Changed paths:
    engines/sherlock/screen.cpp
    engines/sherlock/surface.cpp
    engines/sherlock/surface.h



diff --git a/engines/sherlock/screen.cpp b/engines/sherlock/screen.cpp
index 85d47c8..33e1253 100644
--- a/engines/sherlock/screen.cpp
+++ b/engines/sherlock/screen.cpp
@@ -319,7 +319,7 @@ void Screen::vgaBar(const Common::Rect &r, int color) {
 }
 
 void Screen::setDisplayBounds(const Common::Rect &r) {
-	_sceneSurface.setPixels((byte *)_backBuffer1.getBasePtr(r.left, r.top),
+	_sceneSurface.setPixelsData((byte *)_backBuffer1.getBasePtr(r.left, r.top),
 		r.width(), r.height(), _backBuffer1.format);
 
 	_backBuffer = &_sceneSurface;
diff --git a/engines/sherlock/surface.cpp b/engines/sherlock/surface.cpp
index 46304e1..b9df33a 100644
--- a/engines/sherlock/surface.cpp
+++ b/engines/sherlock/surface.cpp
@@ -33,7 +33,7 @@ Surface::Surface(int width, int height) : Graphics::ManagedSurface(width, height
 	create(width, height);
 }
 
-void Surface::setPixels(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat) {
+void Surface::setPixelsData(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat) {
 	Graphics::ManagedSurface::setPixels(pixelsPtr);
 	this->format = pixFormat;
 	this->w = sizeX;
diff --git a/engines/sherlock/surface.h b/engines/sherlock/surface.h
index 648b121..856d0ed 100644
--- a/engines/sherlock/surface.h
+++ b/engines/sherlock/surface.h
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Set the surface details
 	 */
-	void setPixels(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat);
+	void setPixelsData(byte *pixelsPtr, int sizeX, int sizeY, const Graphics::PixelFormat &pixFormat);
 
 	/**
 	 * Draws a surface on this surface