[Scummvm-cvs-logs] scummvm master -> a1f12c25cae2dbcc8a904d628827dd4789b738cc

[CeRiAl]

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

Summary:
9034bee98e COMMON: Add (another) Eclipse project file to .gitignore
ef3484646a SCALERS: Fix for compiling for ARM without using ASM scalers
a1f12c25ca ARM: Fix normal2x scaler for width % 4 != 0


Commit: 9034bee98e3173bcd0a578c7e868e6a437a18620
    https://github.com/scummvm/scummvm/commit/9034bee98e3173bcd0a578c7e868e6a437a18620
Author: CeRiAl (ikhatib at gmail.com)
Date: 2011-06-10T12:30:26-07:00

Commit Message:
COMMON: Add (another) Eclipse project file to .gitignore

Changed paths:
    .gitignore



diff --git a/.gitignore b/.gitignore
index ef40404..6294cb4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,7 @@ lib*.a
 /.project
 /.cproject
 /.settings
+/.autotools
 /Icon.*
 
 /build


Commit: ef3484646a837ff898fe1e4e2d203f8c0ce4b6af
    https://github.com/scummvm/scummvm/commit/ef3484646a837ff898fe1e4e2d203f8c0ce4b6af
Author: CeRiAl (ikhatib at gmail.com)
Date: 2011-06-10T12:30:45-07:00

Commit Message:
SCALERS: Fix for compiling for ARM without using ASM scalers

Changed paths:
    graphics/scaler/downscaler.cpp



diff --git a/graphics/scaler/downscaler.cpp b/graphics/scaler/downscaler.cpp
index fa17490..65400cc 100644
--- a/graphics/scaler/downscaler.cpp
+++ b/graphics/scaler/downscaler.cpp
@@ -22,7 +22,7 @@
 #include "graphics/scaler/downscaler.h"
 #include "graphics/scaler/intern.h"
 
-#ifdef ARM
+#ifdef USE_ARM_SCALER_ASM
 extern "C" {
 	void DownscaleAllByHalfARM(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height, int mask, int round);
 }


Commit: a1f12c25cae2dbcc8a904d628827dd4789b738cc
    https://github.com/scummvm/scummvm/commit/a1f12c25cae2dbcc8a904d628827dd4789b738cc
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2011-06-10T12:31:03-07:00

Commit Message:
ARM: Fix normal2x scaler for width % 4 != 0

The first jump to 'thin:' didn't leave r14 (remaining width)
in the right state.

Changed paths:
    graphics/scaler/Normal2xARM.s



diff --git a/graphics/scaler/Normal2xARM.s b/graphics/scaler/Normal2xARM.s
index 9afe3f3..e359229 100644
--- a/graphics/scaler/Normal2xARM.s
+++ b/graphics/scaler/Normal2xARM.s
@@ -44,6 +44,7 @@ Normal2xARM:
 	ADD	r3, r3, r6
 yloop:
 	SUBS	r14,r4, #4
+	ADDLT	r14,r14, #4
 	BLT	thin
 xloop:
 	LDRH	r6, [r0], #2