Remove warnings from NDS build.

svn-id: r35172

2 files changed, 7 insertions, 1 deletions

diff --git a/graphics/scaler.cpp b/graphics/scaler.cpp
index 395ea31e75..868ecb6ab7 100644
--- a/graphics/scaler.cpp
+++ b/graphics/scaler.cpp
@@ -127,6 +127,12 @@ void DestroyScalers(){
  */
 void Normal1x(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch,
 							int width, int height) {
+        /* Spot the case when it can all be done in 1 hit */
+        if (((int)srcPitch == 2*width) && ((int)dstPitch == 2*width))
+        {
+            width *= height;
+            height = 1;
+        }
 	while (height--) {
 		memcpy(dstPtr, srcPtr, 2 * width);
 		srcPtr += srcPitch;
diff --git a/graphics/scaler/scalebit.cpp b/graphics/scaler/scalebit.cpp
index 2210697d71..a6fd8df58f 100644
--- a/graphics/scaler/scalebit.cpp
+++ b/graphics/scaler/scalebit.cpp
@@ -131,7 +131,7 @@ static void scale2x(void* void_dst, unsigned dst_slice, const void* void_src, un
 }
 
 /**
- * Apply the Scale32x effect on a bitmap.
+ * Apply the Scale3x effect on a bitmap.
  * The destination bitmap is filled with the scaled version of the source bitmap.
  * The source bitmap isn't modified.
  * The destination bitmap must be manually allocated before calling the function,