aboutsummaryrefslogtreecommitdiff
path: root/graphics/surface.cpp
diff options
context:
space:
mode:
authorRichieSams2013-09-22 15:53:15 -0500
committerRichieSams2013-09-22 15:54:06 -0500
commit701250efb57ef94e35d2b7b6f0d6d045b713e6f5 (patch)
tree09d7cca27b7ecb2b17cfe5f20dbb162062aa43f6 /graphics/surface.cpp
parent9d1b0e1f8bf991abb8eb0cd484ce5025757e1efe (diff)
downloadscummvm-rg350-701250efb57ef94e35d2b7b6f0d6d045b713e6f5.tar.gz
scummvm-rg350-701250efb57ef94e35d2b7b6f0d6d045b713e6f5.tar.bz2
scummvm-rg350-701250efb57ef94e35d2b7b6f0d6d045b713e6f5.zip
GRAPHICS: Remove variable shadowing
Diffstat (limited to 'graphics/surface.cpp')
-rw-r--r--graphics/surface.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/surface.cpp b/graphics/surface.cpp
index a8173f0e9c..777c1058fb 100644
--- a/graphics/surface.cpp
+++ b/graphics/surface.cpp
@@ -133,7 +133,7 @@ const Surface Surface::getSubArea(const Common::Rect &area) const {
return subSurface;
}
-void Surface::copyRectToSurface(const void *buffer, int pitch, int destX, int destY, int width, int height) {
+void Surface::copyRectToSurface(const void *buffer, int srcPitch, int destX, int destY, int width, int height) {
assert(buffer);
assert(destX >= 0 && destX < w);
@@ -146,8 +146,8 @@ void Surface::copyRectToSurface(const void *buffer, int pitch, int destX, int de
byte *dst = (byte *)getBasePtr(destX, destY);
for (int i = 0; i < height; i++) {
memcpy(dst, src, width * format.bytesPerPixel);
- src += pitch;
- dst += this->pitch;
+ src += srcPitch;
+ dst += pitch;
}
}