[Scummvm-cvs-logs] CVS: scummvm/scumm/smush channel.h,1.18,1.19 chunk.cpp,1.37,1.38 codec37.cpp,1.30,1.31 codec47.cpp,1.71,1.72 imuse_channel.cpp,1.31,1.32 saud_channel.cpp,1.28,1.29 smush_font.cpp,1.31,1.32 smush_font.h,1.14,1.15 smush_mixer.cpp,1.44,1.45 smush_player.cpp,1.172,1.173 smush_player.h,1.51,1.52

[Eugene Sandulenko]

Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9428/scumm/smush

Modified Files:
	channel.h chunk.cpp codec37.cpp codec47.cpp imuse_channel.cpp 
	saud_channel.cpp smush_font.cpp smush_font.h smush_mixer.cpp 
	smush_player.cpp smush_player.h 
Log Message:
Remove trailing whitespaces.


Index: channel.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/channel.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- channel.h	1 Jan 2005 16:09:18 -0000	1.18
+++ channel.h	30 Jul 2005 21:11:33 -0000	1.19
@@ -28,7 +28,7 @@
 
 class Chunk;
 class ContChunk;
-	
+
 class SmushChannel {
 public:
 
@@ -81,7 +81,7 @@
 	void getSoundData(int16 *sound_buffer, int32 size);
 	void getSoundData(int8 *sound_buffer, int32 size) { error("8bit request for SAUD channel should never happen"); };
 	int32 getRate() { return _frequency; }
-	bool getParameters(int32 &rate, bool &stereo, bool &is_16bit, int32 &vol, int32 &pan) { 
+	bool getParameters(int32 &rate, bool &stereo, bool &is_16bit, int32 &vol, int32 &pan) {
 		rate = _frequency;
 		stereo = true;
 		is_16bit = true;

Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- chunk.cpp	26 Jun 2005 23:37:59 -0000	1.37
+++ chunk.cpp	30 Jul 2005 21:11:33 -0000	1.38
@@ -39,26 +39,26 @@
 	return data;
 }
 
-BaseChunk::BaseChunk() : 
+BaseChunk::BaseChunk() :
 	_type(0),
 	_size(0),
 	_curPos(0) {
 }
 
 bool BaseChunk::eof() const {
-	return _curPos >= _size; 
+	return _curPos >= _size;
 }
 
 uint32 BaseChunk::tell() const {
-	return _curPos; 
+	return _curPos;
 }
 
-Chunk::type BaseChunk::getType() const { 
-	return _type; 
+Chunk::type BaseChunk::getType() const {
+	return _type;
 }
 
-uint32 BaseChunk::getSize() const { 
-	return _size; 
+uint32 BaseChunk::getSize() const {
+	return _size;
 }
 
 bool BaseChunk::seek(int32 delta, seek_type dir) {

Index: codec37.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec37.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- codec37.cpp	24 Jun 2005 15:23:24 -0000	1.30
+++ codec37.cpp	30 Jul 2005 21:11:33 -0000	1.31
@@ -532,7 +532,7 @@
 		if ((seq_nb & 1) || !(mask_flags & 1)) {
 			_curtable ^= 1;
 		}
-		proc1(_deltaBufs[_curtable], src + 16, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable], 
+		proc1(_deltaBufs[_curtable], src + 16, _deltaBufs[_curtable ^ 1] - _deltaBufs[_curtable],
 										bw, bh, pitch, _offsetTable);
 		break;
 	case 2:

Index: codec47.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/codec47.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- codec47.cpp	24 Jun 2005 15:23:26 -0000	1.71
+++ codec47.cpp	30 Jul 2005 21:11:33 -0000	1.72
@@ -212,7 +212,7 @@
 			} else {
 				b2 = 4;
 			}
-			
+
 			memset(tableSmallBig, 0, param * param * 4);
 
 			variable2 = ABS(value_table47_2_2 - value_table47_2_1);
@@ -339,7 +339,7 @@
 			_tableBig[128 + a + d * 2] = (byte)tmp;
 			_tableBig[128 + a + d * 2 + 1] = tmp >> 8;
 		}
-		
+
 		a += 388;
 		c += 128;
 	} while (c < 32768);

Index: imuse_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/imuse_channel.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- imuse_channel.cpp	24 Jun 2005 15:23:27 -0000	1.31
+++ imuse_channel.cpp	30 Jul 2005 21:11:34 -0000	1.32
@@ -27,24 +27,24 @@
 
 namespace Scumm {
 
-ImuseChannel::ImuseChannel(int32 track, int32 freq) : 
-	_track(track), 
-	_tbuffer(0), 
-	_tbufferSize(0), 
-	_sbuffer(0), 
-	_sbufferSize(0), 
-	_frequency(freq), 
+ImuseChannel::ImuseChannel(int32 track, int32 freq) :
+	_track(track),
+	_tbuffer(0),
+	_tbufferSize(0),
+	_sbuffer(0),
+	_sbufferSize(0),
+	_frequency(freq),
 	_dataSize(-1),
 	_inData(false) {
 }
 
 ImuseChannel::~ImuseChannel() {
 	if (_tbuffer) {
-		delete []_tbuffer; 
+		delete []_tbuffer;
 	}
 	if (_sbuffer) {
 		warning("_sbuffer should be 0 !!!");
-		delete []_sbuffer; 
+		delete []_sbuffer;
 	}
 }
 
@@ -218,7 +218,7 @@
 		uint32 size = READ_BE_UINT32(_tbuffer + offset + 4);
 		uint32 available_size = _tbufferSize - offset;
 		switch(type) {
-		case TYPE_MAP_: 
+		case TYPE_MAP_:
 			_inData = false;
 			if (available_size >= (size + 8)) {
 				MemoryChunk c((byte *)_tbuffer + offset);
@@ -260,9 +260,9 @@
 	assert(_tbufferSize != 0);
 	assert(_sbuffer == 0);
 	assert(_sbufferSize == 0);
-	
+
 	if (_inData) {
-		if (_dataSize < _tbufferSize) {			
+		if (_dataSize < _tbufferSize) {
 			int32 offset= _dataSize;
 			while (handleSubTags(offset));
 			_sbufferSize = _dataSize;
@@ -278,7 +278,7 @@
 				_tbufferSize = 0;
 			}
 			if (_sbufferSize == 0) {
-				delete []_sbuffer; 
+				delete []_sbuffer;
 				_sbuffer = 0;
 			}
 		} else {

Index: saud_channel.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/saud_channel.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- saud_channel.cpp	24 Jun 2005 15:23:27 -0000	1.28
+++ saud_channel.cpp	30 Jul 2005 21:11:34 -0000	1.29
@@ -94,7 +94,7 @@
 	assert(_tbufferSize != 0);
 	assert(_sbuffer == 0);
 	assert(_sbufferSize == 0);
-	
+
 	if (_keepSize) {
 		_sbufferSize = _tbufferSize;
 		_sbuffer = _tbuffer;
@@ -118,7 +118,7 @@
 				_tbufferSize = 0;
 			}
 			if (_sbufferSize == 0) {
-				delete []_sbuffer; 
+				delete []_sbuffer;
 				_sbuffer = 0;
 			}
 		} else {
@@ -156,8 +156,8 @@
 	return true;
 }
 
-SaudChannel::SaudChannel(int32 track, int32 freq) : 
-	_track(track), 
+SaudChannel::SaudChannel(int32 track, int32 freq) :
+	_track(track),
 	_nbframes(0),
 	_dataSize(-1),
 	_frequency(freq),

Index: smush_font.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- smush_font.cpp	25 Jun 2005 19:34:16 -0000	1.31
+++ smush_font.cpp	30 Jul 2005 21:11:34 -0000	1.32
@@ -237,16 +237,16 @@
 	if (y > dst_height - height) {
 		y = dst_height - height;
 	}
-	
+
 	if (center) {
 		max_width = (max_width + 1) / 2;
 		x = left + width / 2;
-	
+
 		if (x < left + max_width)
 			x = left + max_width;
 		if (x > right - max_width)
 			x = right - max_width;
-	
+
 		for (i = 0; i < line_count; i++) {
 			drawSubstring(substrings[i], buffer, dst_width, x - substr_widths[i] / 2, y);
 			y += getStringHeight(substrings[i]);
@@ -254,13 +254,13 @@
 	} else {
 		if (x > dst_width - max_width)
 			x = dst_width - max_width;
-	
+
 		for (i = 0; i < line_count; i++) {
 			drawSubstring(substrings[i], buffer, dst_width, x, y);
 			y += getStringHeight(substrings[i]);
 		}
 	}
-	
+
 	free(s);
 }
 

Index: smush_font.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_font.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- smush_font.h	20 Apr 2005 19:59:18 -0000	1.14
+++ smush_font.h	30 Jul 2005 21:11:34 -0000	1.15
@@ -32,7 +32,7 @@
 	int16 _color;
 	bool _new_colors;
 	bool _original;
-	
+
 
 	int getStringWidth(const char *str);
 	int getStringHeight(const char *str);

Index: smush_mixer.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_mixer.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- smush_mixer.cpp	24 Jun 2005 15:23:27 -0000	1.44
+++ smush_mixer.cpp	30 Jul 2005 21:11:34 -0000	1.45
@@ -81,8 +81,8 @@
 	}
 
 	for (i = 0; i < NUM_CHANNELS; i++) {
-		warning("channel %d : %p(%d, %d)", i, (void *)_channels[i].chan, 
-			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1, 
+		warning("channel %d : %p(%d, %d)", i, (void *)_channels[i].chan,
+			_channels[i].chan ? _channels[i].chan->getTrackIdentifier() : -1,
 			_channels[i].chan ? _channels[i].chan->isTerminated() : 1);
 	}
 

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- smush_player.cpp	19 Jul 2005 17:04:16 -0000	1.172
+++ smush_player.cpp	30 Jul 2005 21:11:34 -0000	1.173
@@ -90,7 +90,7 @@
 			assert(def_end != NULL);
 
 			char *id_end = def_end;
-			while (id_end >= def_start && !isdigit(*(id_end-1))) { 
+			while (id_end >= def_start && !isdigit(*(id_end-1))) {
 				id_end--;
 			}
 
@@ -238,7 +238,7 @@
 	_base = NULL;
 	_frameBuffer = NULL;
 	_specialBuffer = NULL;
-	
+
 	_seekPos = -1;
 
 	_skipNext = false;
@@ -273,7 +273,7 @@
 	_vm->_smushVideoShouldFinish = false;
 	_vm->setDirtyColors(0, 255);
 	_dst = _vm->virtscr[0].getPixels(0, 0);
-	
+
 	// HACK HACK HACK: This is an *evil* trick, beware!
 	// We do this to fix bug #1037052. A proper solution would change all the
 	// drawing code to use the pitch value specified by the virtual screen.
@@ -284,7 +284,7 @@
 	_origNumStrips = _vm->gdi._numStrips;
 	_vm->virtscr[0].pitch = _vm->virtscr[0].w;
 	_vm->gdi._numStrips = _vm->virtscr[0].w / 8;
-	
+
 	_smixer = new SmushMixer(_vm->_mixer);
 	Common::g_timer->installTimerProc(&timerCallback, 1000000 / _speed, this);
 
@@ -338,8 +338,8 @@
 	// some explanation.
 	_vm->virtscr[0].pitch = _origPitch;
 	_vm->gdi._numStrips = _origNumStrips;
-	
-	
+
+
 	_initDone = false;
 }
 
@@ -526,9 +526,9 @@
 				*(_IACToutput + _IACTpos) = *d_src++;
 				_IACTpos++;
 				bsize--;
-			}	
+			}
 		}
-	
+
 		free(src);
 	}
 }
@@ -586,7 +586,7 @@
 			{
 				int id = str[3] - '0';
 				str += 4;
-				sf = _sf[id]; 
+				sf = _sf[id];
 			}
 			break;
 		case 'c':
@@ -613,7 +613,7 @@
 	// bit 2 - ???          4
 	// bit 3 - wrap around  8
 	switch (flags & 9) {
-	case 0: 
+	case 0:
 		sf->drawString(str, _dst, _width, _height, pos_x, pos_y, false);
 		break;
 	case 1:
@@ -1020,25 +1020,25 @@
 		}
 	} else {
 		error("SmushPlayer::setupAnim() Unknown font setup for game");
-	}	
+	}
 }
 
 void SmushPlayer::parseNextFrame() {
 	Common::StackLock lock(_mutex);
-	
+
 	Chunk *sub;
 
 	if (_vm->_smushPaused)
 		return;
-	
+
 	if (_seekPos >= 0) {
 		if (_smixer)
 			_smixer->stop();
-	
+
 		if (_seekFile.size() > 0) {
 			delete _base;
 			_base = new FileChunk(_seekFile);
-	
+
 			if (_seekPos > 0) {
 				assert(_seekPos > 8);
 				// In this case we need to get palette and number of frames
@@ -1046,7 +1046,7 @@
 				checkBlock(*sub, TYPE_AHDR);
 				handleAnimHeader(*sub);
 				delete sub;
-	
+
 				_middleAudio = true;
 				_seekPos -= 8;
 			} else {
@@ -1058,10 +1058,10 @@
 		} else {
 			_skipPalette = true;
 		}
-	
+
 		_base->seek(_seekPos, FileChunk::seek_start);
 		_frame = _seekFrame;
-		
+
 		_seekPos = -1;
 	}
 
@@ -1125,7 +1125,7 @@
 	// change path below for dump png files
 	sprintf(fileName, "/path/to/somethere/%s%04d.png", _vm->getGameName(), _frame);
 	FILE *file = fopen(fileName, "wb");
-	if (file == NULL) 
+	if (file == NULL)
 		error("can't open file for writing png");
 
 	png_structp png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0);
@@ -1145,7 +1145,7 @@
 
 	png_init_io(png_ptr, file);
 
-	png_set_IHDR(png_ptr, info_ptr, _width, _height, 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE, 
+	png_set_IHDR(png_ptr, info_ptr, _width, _height, 8, PNG_COLOR_TYPE_PALETTE, PNG_INTERLACE_NONE,
 							PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
 
 	png_colorp palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH * sizeof (png_color));
@@ -1241,7 +1241,7 @@
 	_warpNeeded = false;
 	_palDirtyMin = 256;
 	_palDirtyMax = -1;
-	
+
 	// Hide mouse
 	bool oldMouseState = _vm->_system->showMouse(false);
 
@@ -1281,7 +1281,7 @@
 		}
 		if (_updateNeeded) {
 			uint32 end_time, start_time;
-			
+
 			start_time = _vm->_system->getMillis();
 			_vm->_system->copyRectToScreen(_dst, _width, 0, 0, _width, _height);
 			_vm->_system->updateScreen();

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- smush_player.h	25 Jun 2005 15:17:14 -0000	1.51
+++ smush_player.h	30 Jul 2005 21:11:34 -0000	1.52
@@ -102,7 +102,7 @@
 protected:
 	SmushFont *_sf[5];
 	int _width, _height;
-	
+
 	int _origPitch, _origNumStrips;
 
 	void insanity(bool);
@@ -138,7 +138,7 @@
 	void handleTextResource(Chunk &);
 	void handleDeltaPalette(Chunk &);
 	void readPalette(byte *, Chunk &);
-	
+
 	static void timerCallback(void *ptr);
 };