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

bluegr md5 at scummvm.org
Wed Mar 9 14:15:18 CET 2011


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

Summary:
cd816b24d7 SCI: Whitespace fixes


Commit: cd816b24d786935b30fab1ead5cc82f13a11385e
    https://github.com/scummvm/scummvm/commit/cd816b24d786935b30fab1ead5cc82f13a11385e
Author: md5 (md5 at scummvm.org)
Date: 2011-03-09T05:14:12-08:00

Commit Message:
SCI: Whitespace fixes

Changed paths:
    engines/sci/graphics/view.cpp



diff --git a/engines/sci/graphics/view.cpp b/engines/sci/graphics/view.cpp
index 870e3c9..b998613 100644
--- a/engines/sci/graphics/view.cpp
+++ b/engines/sci/graphics/view.cpp
@@ -445,7 +445,7 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 		while (pixelNr < pixelCount) {
 			curByte = *rlePtr++;
 			runLength = curByte >> 4;
-			memset(outPtr + pixelNr, curByte & 0x0F, MIN<uint16>(runLength, pixelCount - pixelNr));
+			memset(outPtr + pixelNr,        curByte & 0x0F, MIN<uint16>(runLength, pixelCount - pixelNr));
 			pixelNr += runLength;
 		}
 		break;
@@ -455,7 +455,7 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 			if (curByte & 0x07) { // fill with color
 				runLength = curByte & 0x07;
 				curByte = curByte >> 3;
-				memset(outPtr + pixelNr, curByte, MIN<uint16>(runLength, pixelCount - pixelNr));
+				memset(outPtr + pixelNr,           curByte, MIN<uint16>(runLength, pixelCount - pixelNr));
 			} else { // skip the next pixels (transparency)
 				runLength = curByte >> 3;
 			}
@@ -467,7 +467,7 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 			curByte = *rlePtr++;
 			if (curByte & 0xC0) { // fill with color
 				runLength = curByte >> 6;
-				memset(outPtr + pixelNr, curByte & 0x3F, MIN<uint16>(runLength, pixelCount - pixelNr));
+				memset(outPtr + pixelNr,    curByte & 0x3F, MIN<uint16>(runLength, pixelCount - pixelNr));
 			} else { // skip the next pixels (transparency)
 				runLength = curByte & 0x3F;
 			}
@@ -485,10 +485,10 @@ void unpackCelData(byte *inBuffer, byte *celBitmap, byte clearColor, int pixelCo
 				runLength += 64;
 			case 0x00: // copy bytes as-is
 				if (!literalPos) {
-					memcpy(outPtr + pixelNr, rlePtr, MIN<uint16>(runLength, pixelCount - pixelNr));
+					memcpy(outPtr + pixelNr,        rlePtr, MIN<uint16>(runLength, pixelCount - pixelNr));
 					rlePtr += runLength;
 				} else {
-					memcpy(outPtr + pixelNr, literalPtr, MIN<uint16>(runLength, pixelCount - pixelNr));
+					memcpy(outPtr + pixelNr,    literalPtr, MIN<uint16>(runLength, pixelCount - pixelNr));
 					literalPtr += runLength;
 				}			
 				break;






More information about the Scummvm-git-logs mailing list