[Scummvm-cvs-logs] CVS: scummvm/common scaler.cpp,1.20,1.21

[Max Horn]

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

Modified Files:
	scaler.cpp 
Log Message:
indention

Index: scaler.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- scaler.cpp	11 Jun 2003 05:08:41 -0000	1.20
+++ scaler.cpp	12 Jun 2003 15:20:58 -0000	1.21
@@ -359,34 +359,30 @@
 			colorP = *(bP + 2 * nextlineSrc + 2);
 
 			if ((colorA == colorD) && (colorB != colorC)) {
-				if (((colorA == colorE) && (colorB == colorL)) || ((colorA == colorC) && (colorA == colorF)
-																													 && (colorB != colorE)
-																													 && (colorB == colorJ))) {
+				if (((colorA == colorE) && (colorB == colorL)) ||
+					((colorA == colorC) && (colorA == colorF) && (colorB != colorE) && (colorB == colorJ))) {
 					product = colorA;
 				} else {
 					product = INTERPOLATE(colorA, colorB);
 				}
 
-				if (((colorA == colorG) && (colorC == colorO)) || ((colorA == colorB) && (colorA == colorH)
-																													 && (colorG != colorC)
-																													 && (colorC == colorM))) {
+				if (((colorA == colorG) && (colorC == colorO)) ||
+					((colorA == colorB) && (colorA == colorH) && (colorG != colorC)  && (colorC == colorM))) {
 					product1 = colorA;
 				} else {
 					product1 = INTERPOLATE(colorA, colorC);
 				}
 				product2 = colorA;
 			} else if ((colorB == colorC) && (colorA != colorD)) {
-				if (((colorB == colorF) && (colorA == colorH)) || ((colorB == colorE) && (colorB == colorD)
-																													 && (colorA != colorF)
-																													 && (colorA == colorI))) {
+				if (((colorB == colorF) && (colorA == colorH)) ||
+					((colorB == colorE) && (colorB == colorD) && (colorA != colorF) && (colorA == colorI))) {
 					product = colorB;
 				} else {
 					product = INTERPOLATE(colorA, colorB);
 				}
 
-				if (((colorC == colorH) && (colorA == colorF)) || ((colorC == colorG) && (colorC == colorD)
-																													 && (colorA != colorH)
-																													 && (colorA == colorI))) {
+				if (((colorC == colorH) && (colorA == colorF)) ||
+					((colorC == colorG) && (colorC == colorD) && (colorA != colorH) && (colorA == colorI))) {
 					product1 = colorC;
 				} else {
 					product1 = INTERPOLATE(colorA, colorC);