JANITORIAL: Whitespace fixes

4 files changed, 80 insertions, 81 deletions

diff --git a/image/codecs/indeo/indeo.cpp b/image/codecs/indeo/indeo.cpp
index 2bc699ecf5..0e1a678c70 100644
--- a/image/codecs/indeo/indeo.cpp
+++ b/image/codecs/indeo/indeo.cpp
@@ -20,8 +20,8 @@
  *
  */
 
-/* Common structures, macros, and base class shared by both Indeo4 and 
- * Indeo5 decoders, derived from ffmpeg. We don't currently support Indeo5 
+/* Common structures, macros, and base class shared by both Indeo4 and
+ * Indeo5 decoders, derived from ffmpeg. We don't currently support Indeo5
  * decoding, but just in case we eventually need it, this is kept as a separate
  * file like it is in ffmpeg.
  *
@@ -40,7 +40,7 @@
 
 namespace Image {
 namespace Indeo {
-	
+
 /**
  * These are 2x8 predefined Huffman codebooks for coding macroblock/block
  * signals. They are specified using "huffman descriptors" in order to
@@ -202,7 +202,7 @@ IVIBandDesc::IVIBandDesc() : _plane(0), _bandNum(0), _width(0), _height(0),
 		_inheritQDelta(false), _qdeltaPresent(false), _quantMat(0), _globQuant(0),
 		_scan(nullptr), _scanSize(0), _numCorr(0), _rvmapSel(0), _rvMap(nullptr),
 		_numTiles(0), _tiles(nullptr), _invTransform(nullptr), _transformSize(0),
-		_dcTransform(nullptr), _is2dTrans(0), _checksum(0), _checksumPresent(false), 
+		_dcTransform(nullptr), _is2dTrans(0), _checksum(0), _checksumPresent(false),
 		_intraBase(nullptr), _interBase(nullptr), _intraScale(nullptr),
 		_interScale(nullptr) {
 	Common::fill(&_bufs[0], &_bufs[4], (int16 *)nullptr);
@@ -427,7 +427,7 @@ int AVFrame::getBuffer(int flags) {
 
 	// Luminance channel
 	_data[0] = (uint8 *)avMallocZ(_width * _height);
-	
+
 	// UV Chroma Channels
 	_data[1] = (uint8 *)malloc(_width * _height);
 	_data[2] = (uint8 *)malloc(_width * _height);
@@ -591,7 +591,7 @@ int IndeoDecoderBase::decodeIndeoFrame() {
 
 	// Merge the planes into the final surface
 	Graphics::Surface s = _surface->getSubArea(Common::Rect(0, 0, _surface->w, _surface->h));
-	YUVToRGBMan.convert410(&s, Graphics::YUVToRGBManager::kScaleITU,		
+	YUVToRGBMan.convert410(&s, Graphics::YUVToRGBManager::kScaleITU,
 		frame->_data[0], frame->_data[1], frame->_data[2], frame->_width, frame->_height,
 		frame->_width, frame->_width);
 
@@ -977,21 +977,20 @@ int IndeoDecoderBase::processEmptyTile(IVIBandDesc *band,
 					mb->_mvY = refMb->_mvY;
 				}
 				needMc |= mb->_mvX || mb->_mvY; // tracking non-zero motion vectors
-				{
-					int dmv_x, dmv_y, cx, cy;
-
-					dmv_x = mb->_mvX >> band->_isHalfpel;
-					dmv_y = mb->_mvY >> band->_isHalfpel;
-					cx = mb->_mvX &  band->_isHalfpel;
-					cy = mb->_mvY &  band->_isHalfpel;
-
-					if (mb->_xPos + dmv_x < 0
-						|| mb->_xPos + dmv_x + band->_mbSize + cx > band->_pitch
-						|| mb->_yPos + dmv_y < 0
-						|| mb->_yPos + dmv_y + band->_mbSize + cy > band->_aHeight) {
-						warning("MV out of bounds");
-						return -1;
-					}
+
+				int dmv_x, dmv_y, cx, cy;
+
+				dmv_x = mb->_mvX >> band->_isHalfpel;
+				dmv_y = mb->_mvY >> band->_isHalfpel;
+				cx = mb->_mvX &  band->_isHalfpel;
+				cy = mb->_mvY &  band->_isHalfpel;
+
+				if (mb->_xPos + dmv_x < 0
+					|| mb->_xPos + dmv_x + band->_mbSize + cx > band->_pitch
+					|| mb->_yPos + dmv_y < 0
+					|| mb->_yPos + dmv_y + band->_mbSize + cy > band->_aHeight) {
+					warning("MV out of bounds");
+					return -1;
 				}
 			}
 
diff --git a/image/codecs/indeo/indeo_dsp.cpp b/image/codecs/indeo/indeo_dsp.cpp
index 15626e9473..56a720a19f 100644
--- a/image/codecs/indeo/indeo_dsp.cpp
+++ b/image/codecs/indeo/indeo_dsp.cpp
@@ -73,11 +73,11 @@ namespace Indeo {
 
 void IndeoDSP::ffIviInverseHaar8x8(const int32 *in, int16 *out, uint32 pitch,
 							 const uint8 *flags) {
-	int			i, shift, sp1, sp2, sp3, sp4;
+	int i, shift, sp1, sp2, sp3, sp4;
 	const int32 *src;
-	int32 *		dst;
-	int			tmp[64];
-	int			t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int32 *dst;
+	int tmp[64];
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 	// apply the InvHaar8 to all columns
 #define COMPENSATE(x) (x)
@@ -128,8 +128,8 @@ void IndeoDSP::ffIviInverseHaar8x8(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviRowHaar8(const int32 *in, int16 *out, uint32 pitch,
 					  const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int i;
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 	// apply the InvHaar8 to all rows
 #define COMPENSATE(x) (x)
@@ -152,8 +152,8 @@ void IndeoDSP::ffIviRowHaar8(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviColHaar8(const int32 *in, int16 *out, uint32 pitch,
 					  const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int i;
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 	// apply the InvHaar8 to all columns
 #define COMPENSATE(x) (x)
@@ -181,11 +181,11 @@ void IndeoDSP::ffIviColHaar8(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviInverseHaar4x4(const int32 *in, int16 *out, uint32 pitch,
 							 const uint8 *flags) {
-	int		i, shift, sp1, sp2;
+	int i, shift, sp1, sp2;
 	const int32 *src;
-	int32 *	dst;
-	int		tmp[16];
-	int		t0, t1, t2, t3, t4;
+	int32 *dst;
+	int tmp[16];
+	int t0, t1, t2, t3, t4;
 
 	// apply the InvHaar4 to all columns
 #define COMPENSATE(x) (x)
@@ -228,8 +228,8 @@ void IndeoDSP::ffIviInverseHaar4x4(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviRowHaar4(const int32 *in, int16 *out, uint32 pitch,
 					  const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4;
+	int i;
+	int t0, t1, t2, t3, t4;
 
 	// apply the InvHaar4 to all rows
 #define COMPENSATE(x) (x)
@@ -249,8 +249,8 @@ void IndeoDSP::ffIviRowHaar4(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviColHaar4(const int32 *in, int16 *out, uint32 pitch,
 					  const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4;
+	int i;
+	int t0, t1, t2, t3, t4;
 
 	// apply the InvHaar8 to all columns
 #define COMPENSATE(x) (x)
@@ -273,8 +273,8 @@ void IndeoDSP::ffIviColHaar4(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviDcHaar2d(const int32 *in, int16 *out, uint32 pitch,
 					   int blkSize) {
-	int		x, y;
-	int16	dcCoeff;
+	int x, y;
+	int16 dcCoeff;
 
 	dcCoeff = (*in + 0) >> 3;
 
@@ -335,11 +335,11 @@ void IndeoDSP::ffIviDcHaar2d(const int32 *in, int16 *out, uint32 pitch,
 	d4 = COMPENSATE(t4);}
 
 void IndeoDSP::ffIviInverseSlant8x8(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) {
-	int		i;
+	int i;
 	const int32 *src;
-	int32 *	dst;
-	int		tmp[64];
-	int		t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int32 *dst;
+	int tmp[64];
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 #define COMPENSATE(x) (x)
 	src = in;
@@ -375,11 +375,11 @@ void IndeoDSP::ffIviInverseSlant8x8(const int32 *in, int16 *out, uint32 pitch, c
 }
 
 void IndeoDSP::ffIviInverseSlant4x4(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) {
-	int		i;
+	int i;
 	const int32 *src;
-	int32 *	dst;
-	int		tmp[16];
-	int		t0, t1, t2, t3, t4;
+	int32 *dst;
+	int tmp[16];
+	int t0, t1, t2, t3, t4;
 
 #define COMPENSATE(x) (x)
 	src = in;
@@ -415,8 +415,8 @@ void IndeoDSP::ffIviInverseSlant4x4(const int32 *in, int16 *out, uint32 pitch, c
 
 void IndeoDSP::ffIviDcSlant2d(const int32 *in, int16 *out, uint32 pitch,
 		int blkSize) {
-	int		x, y;
-	int16	dcCoeff;
+	int x, y;
+	int16 dcCoeff;
 
 	dcCoeff = (*in + 1) >> 1;
 
@@ -428,8 +428,8 @@ void IndeoDSP::ffIviDcSlant2d(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviRowSlant8(const int32 *in, int16 *out, uint32 pitch,
 		const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int i;
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 #define COMPENSATE(x) (((x) + 1)>>1)
 	for (i = 0; i < 8; i++) {
@@ -447,8 +447,8 @@ void IndeoDSP::ffIviRowSlant8(const int32 *in, int16 *out, uint32 pitch,
 }
 
 void IndeoDSP::ffIviDcRowSlant(const int32 *in, int16 *out, uint32 pitch, int blkSize) {
-	int		x, y;
-	int16	dcCoeff;
+	int x, y;
+	int16 dcCoeff;
 
 	dcCoeff = (*in + 1) >> 1;
 
@@ -464,8 +464,8 @@ void IndeoDSP::ffIviDcRowSlant(const int32 *in, int16 *out, uint32 pitch, int bl
 }
 
 void IndeoDSP::ffIviColSlant8(const int32 *in, int16 *out, uint32 pitch, const uint8 *flags) {
-	int		i, row2, row4, row8;
-	int		t0, t1, t2, t3, t4, t5, t6, t7, t8;
+	int i, row2, row4, row8;
+	int t0, t1, t2, t3, t4, t5, t6, t7, t8;
 
 	row2 = pitch << 1;
 	row4 = pitch << 2;
@@ -490,8 +490,8 @@ void IndeoDSP::ffIviColSlant8(const int32 *in, int16 *out, uint32 pitch, const u
 }
 
 void IndeoDSP::ffIviDcColSlant(const int32 *in, int16 *out, uint32 pitch, int blkSize) {
-	int		x, y;
-	int16	dcCoeff;
+	int x, y;
+	int16 dcCoeff;
 
 	dcCoeff = (*in + 1) >> 1;
 
@@ -504,8 +504,8 @@ void IndeoDSP::ffIviDcColSlant(const int32 *in, int16 *out, uint32 pitch, int bl
 
 void IndeoDSP::ffIviRowSlant4(const int32 *in, int16 *out,
 		uint32 pitch, const uint8 *flags) {
-	int		i;
-	int		t0, t1, t2, t3, t4;
+	int i;
+	int t0, t1, t2, t3, t4;
 
 #define COMPENSATE(x) (((x) + 1)>>1)
 	for (i = 0; i < 4; i++) {
@@ -524,8 +524,8 @@ void IndeoDSP::ffIviRowSlant4(const int32 *in, int16 *out,
 
 void IndeoDSP::ffIviColSlant4(const int32 *in, int16 *out, uint32 pitch,
 		const uint8 *flags) {
-	int		i, row2;
-	int		t0, t1, t2, t3, t4;
+	int i, row2;
+	int t0, t1, t2, t3, t4;
 
 	row2 = pitch << 1;
 
@@ -547,7 +547,7 @@ void IndeoDSP::ffIviColSlant4(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviPutPixels8x8(const int32 *in, int16 *out, uint32 pitch,
 		const uint8 *flags) {
-	int		x, y;
+	int x, y;
 
 	for (y = 0; y < 8; out += pitch, in += 8, y++)
 		for (x = 0; x < 8; x++)
@@ -556,7 +556,7 @@ void IndeoDSP::ffIviPutPixels8x8(const int32 *in, int16 *out, uint32 pitch,
 
 void IndeoDSP::ffIviPutDcPixel8x8(const int32 *in, int16 *out, uint32 pitch,
 		int blkSize) {
-	int		y;
+	int y;
 
 	out[0] = in[0];
 	memset(out + 1, 0, 7*sizeof(out[0]));
diff --git a/image/codecs/indeo/mem.cpp b/image/codecs/indeo/mem.cpp
index 9db37ec601..ab28c34cb6 100644
--- a/image/codecs/indeo/mem.cpp
+++ b/image/codecs/indeo/mem.cpp
@@ -32,22 +32,22 @@ namespace Image {
 namespace Indeo {
 
 const uint8 ffReverse[256] = {
-	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, 
-	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8, 
-	0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4, 
-	0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC, 
-	0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2, 
-	0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA, 
-	0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6, 
-	0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE, 
-	0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1, 
-	0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9, 
-	0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5, 
-	0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD, 
-	0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3, 
-	0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB, 
-	0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7, 
-	0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF, 
+	0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
+	0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, 0x18, 0x98, 0x58, 0xD8, 0x38, 0xB8, 0x78, 0xF8,
+	0x04, 0x84, 0x44, 0xC4, 0x24, 0xA4, 0x64, 0xE4, 0x14, 0x94, 0x54, 0xD4, 0x34, 0xB4, 0x74, 0xF4,
+	0x0C, 0x8C, 0x4C, 0xCC, 0x2C, 0xAC, 0x6C, 0xEC, 0x1C, 0x9C, 0x5C, 0xDC, 0x3C, 0xBC, 0x7C, 0xFC,
+	0x02, 0x82, 0x42, 0xC2, 0x22, 0xA2, 0x62, 0xE2, 0x12, 0x92, 0x52, 0xD2, 0x32, 0xB2, 0x72, 0xF2,
+	0x0A, 0x8A, 0x4A, 0xCA, 0x2A, 0xAA, 0x6A, 0xEA, 0x1A, 0x9A, 0x5A, 0xDA, 0x3A, 0xBA, 0x7A, 0xFA,
+	0x06, 0x86, 0x46, 0xC6, 0x26, 0xA6, 0x66, 0xE6, 0x16, 0x96, 0x56, 0xD6, 0x36, 0xB6, 0x76, 0xF6,
+	0x0E, 0x8E, 0x4E, 0xCE, 0x2E, 0xAE, 0x6E, 0xEE, 0x1E, 0x9E, 0x5E, 0xDE, 0x3E, 0xBE, 0x7E, 0xFE,
+	0x01, 0x81, 0x41, 0xC1, 0x21, 0xA1, 0x61, 0xE1, 0x11, 0x91, 0x51, 0xD1, 0x31, 0xB1, 0x71, 0xF1,
+	0x09, 0x89, 0x49, 0xC9, 0x29, 0xA9, 0x69, 0xE9, 0x19, 0x99, 0x59, 0xD9, 0x39, 0xB9, 0x79, 0xF9,
+	0x05, 0x85, 0x45, 0xC5, 0x25, 0xA5, 0x65, 0xE5, 0x15, 0x95, 0x55, 0xD5, 0x35, 0xB5, 0x75, 0xF5,
+	0x0D, 0x8D, 0x4D, 0xCD, 0x2D, 0xAD, 0x6D, 0xED, 0x1D, 0x9D, 0x5D, 0xDD, 0x3D, 0xBD, 0x7D, 0xFD,
+	0x03, 0x83, 0x43, 0xC3, 0x23, 0xA3, 0x63, 0xE3, 0x13, 0x93, 0x53, 0xD3, 0x33, 0xB3, 0x73, 0xF3,
+	0x0B, 0x8B, 0x4B, 0xCB, 0x2B, 0xAB, 0x6B, 0xEB, 0x1B, 0x9B, 0x5B, 0xDB, 0x3B, 0xBB, 0x7B, 0xFB,
+	0x07, 0x87, 0x47, 0xC7, 0x27, 0xA7, 0x67, 0xE7, 0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
+	0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF, 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF,
 };
 
 const uint8 ffZigZagDirect[64] = {
diff --git a/image/codecs/indeo/vlc.h b/image/codecs/indeo/vlc.h
index a6dd692732..8269b72d07 100644
--- a/image/codecs/indeo/vlc.h
+++ b/image/codecs/indeo/vlc.h
@@ -46,7 +46,7 @@ enum VLCFlag {
 struct VLCcode {
 	uint8 bits;
 	uint16 symbol;
-	
+
 	/**
 	 * codeword, with the first bit-to-be-read in the msb
 	 * (even if intended for a little-endian bitstream reader)
@@ -111,7 +111,7 @@ public:
 	 */
 	void freeVlc();
 
-	
+
 	/**
 	 * Build VLC decoding tables suitable for use with get_vlc().
 	 *