From f62f3eea89afd5620e1ef411232d74c7999f4971 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 17 Oct 2009 22:47:21 +0000
Subject: Fix valgrind warning.

svn-id: r45207
---
 engines/kyra/screen.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'engines/kyra/screen.cpp')

diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp
index 9216b5e432..f190c6ab3d 100644
--- a/engines/kyra/screen.cpp
+++ b/engines/kyra/screen.cpp
@@ -3438,13 +3438,10 @@ void Palette::copy(const Palette &source, int firstCol, int numCols, int dstStar
 	assert(firstCol >= 0 && firstCol <= source.getNumColors());
 	assert(dstStart >= 0 && dstStart + numCols <= _numColors);
 
-	memcpy(_palData + dstStart * 3, source._palData + firstCol * 3, numCols * 3);
+	memmove(_palData + dstStart * 3, source._palData + firstCol * 3, numCols * 3);
 }
 
 void Palette::copy(const uint8 *source, int firstCol, int numCols, int dstStart) {
-	if (source == _palData)
-		return;
-
 	if (dstStart == -1)
 		dstStart = firstCol;
 
@@ -3452,7 +3449,7 @@ void Palette::copy(const uint8 *source, int firstCol, int numCols, int dstStart)
 	assert(firstCol >= 0);
 	assert(dstStart >= 0 && dstStart + numCols <= _numColors);
 
-	memcpy(_palData + dstStart * 3, source + firstCol * 3, numCols * 3);
+	memmove(_palData + dstStart * 3, source + firstCol * 3, numCols * 3);
 }
 
 uint8 *Palette::fetchRealPalette() const {
-- 
cgit v1.2.3