[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.36,1.37 scaler.h,1.14,1.15

[Jochen Hoenicke]

Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv11364

Modified Files:
	scaler.cpp scaler.h 
Log Message:
Fixed aspect ratio scaler

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- scaler.cpp	1 Aug 2003 12:18:35 -0000	1.36
+++ scaler.cpp	16 Aug 2003 11:00:12 -0000	1.37
@@ -783,12 +783,16 @@
 				memcpy(dstPtr, srcPtr, width * 2);
 			break;
 		case 1:
-		case 4:
 			interpolate5Line<1>((uint16 *)dstPtr, (const uint16 *)(srcPtr - pitch), (const uint16 *)srcPtr, width);
 			break;
 		case 2:
-		case 3:
 			interpolate5Line<2>((uint16 *)dstPtr, (const uint16 *)(srcPtr - pitch), (const uint16 *)srcPtr, width);
+			break;
+		case 3:
+			interpolate5Line<2>((uint16 *)dstPtr, (const uint16 *)srcPtr, (const uint16 *)(srcPtr - pitch), width);
+			break;
+		case 4:
+			interpolate5Line<1>((uint16 *)dstPtr, (const uint16 *)srcPtr, (const uint16 *)(srcPtr - pitch), width);
 			break;
 		}
 #endif

Index: scaler.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- scaler.h	1 Aug 2003 12:18:35 -0000	1.14
+++ scaler.h	16 Aug 2003 11:00:13 -0000	1.15
@@ -46,7 +46,7 @@
 }
 
 FORCEINLINE int aspect2Real(int y) {
-	return (y * 5 + 3) / 6;
+	return (y * 5 + 4) / 6;
 }
 
 extern void makeRectStretchable(int &x, int &y, int &w, int &h);