[Scummvm-cvs-logs] SF.net SVN: scummvm: [22473] residual/trunk/smush.cpp
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Sun May 14 08:20:41 CEST 2006
Revision: 22473
Author: aquadran
Date: 2006-05-14 08:13:22 -0700 (Sun, 14 May 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=22473&view=rev
Log Message:
-----------
formating
Modified Paths:
--------------
residual/trunk/smush.cpp
Modified: residual/trunk/smush.cpp
===================================================================
--- residual/trunk/smush.cpp 2006-05-14 14:58:21 UTC (rev 22472)
+++ residual/trunk/smush.cpp 2006-05-14 15:13:22 UTC (rev 22473)
@@ -35,7 +35,7 @@
#include <zlib.h>
#define SMUSH_LOOPMOVIE(x) (x & 0x000001)
-#define SMUSH_ALTSPEED(x) (x & 0x000004)
+#define SMUSH_ALTSPEED(x) (x & 0x000004)
#define ANNO_HEADER "MakeAnim animation type 'Bl16' parameters: "
#define BUFFER_SIZE 16385
@@ -199,11 +199,9 @@
pos += READ_BE_UINT32(frame + pos + 4) + 8;
} else if (READ_BE_UINT32(frame + pos) == MKID_BE('Wave')) {
int decompressed_size = READ_BE_UINT32(frame + pos + 8);
-
if (decompressed_size < 0)
handleWave(frame + pos + 8 + 4 + 8, READ_BE_UINT32(frame + pos + 8 + 8));
else
-
handleWave(frame + pos + 8 + 4, decompressed_size);
pos += READ_BE_UINT32(frame + pos + 4) + 8;
} else if (debugLevel == DEBUG_SMUSH || debugLevel == DEBUG_ERROR || debugLevel == DEBUG_ALL) {
@@ -297,7 +295,7 @@
// does not quite do it.
// TODO: Find out what needs to go on here.
if (SMUSH_ALTSPEED(flags)) {
- printf("Bad time: %d, suggested: %d\n", _speed, 2*_speed);
+ printf("Bad time: %d, suggested: %d\n", _speed, 2 * _speed);
_speed = 66667;
}
_videoLooping = SMUSH_LOOPMOVIE(flags);
@@ -424,7 +422,7 @@
if ((flags & 0x02) != 0) // CRC
fread(_inBuf, 2, sizeof(char), _handle);
- memset(_inBuf, 0, BUFFER_SIZE-1); // Zero buffer (debug)
+ memset(_inBuf, 0, BUFFER_SIZE - 1); // Zero buffer (debug)
_stream.zalloc = NULL;
_stream.zfree = NULL;
_stream.opaque = Z_NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list