[Scummvm-cvs-logs] SF.net SVN: scummvm: [22211] tools/trunk/encode_dxa.cpp

[cyx at users.sourceforge.net]

Revision: 22211
Author:   cyx
Date:     2006-04-29 05:15:23 -0700 (Sat, 29 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22211&view=rev

Log Message:
-----------
some endianness fixes

Modified Paths:
--------------
    tools/trunk/encode_dxa.cpp
Modified: tools/trunk/encode_dxa.cpp
===================================================================
--- tools/trunk/encode_dxa.cpp	2006-04-29 11:56:59 UTC (rev 22210)
+++ tools/trunk/encode_dxa.cpp	2006-04-29 12:15:23 UTC (rev 22211)
@@ -96,10 +96,10 @@
 
 void DxaEncoder::writeHeader() {
 	//DEXA
-	uint8 unk = 0;
+	uint8 version = 0;
 
-	fwrite(&typeDEXA, 4, 1, _dxa);
-	fwrite(&unk, 1, 1, _dxa);
+	writeUint32LE(_dxa, typeDEXA);
+	writeByte(_dxa, version);
 
 	writeUint16BE(_dxa, _framecount);
 	writeUint32BE(_dxa, _framerate);
@@ -109,7 +109,7 @@
 
 void DxaEncoder::writeNULL() {
 	//NULL
-	fwrite(&typeNULL, 4, 1, _dxa);
+	writeUint32LE(_dxa, typeNULL);
 }
 
 void DxaEncoder::addAudio(char* wavfilename) {
@@ -125,7 +125,7 @@
 
 	fseek(wav, 0, SEEK_SET);
 
-	fwrite(&typeWAVE, 4, 1, _dxa);
+	writeUint32LE(_dxa, typeWAVE);
 
 	writeUint32BE(_dxa, wavsize);
 
@@ -153,7 +153,7 @@
 	uint8 cpalette[1024];
 
 	if (_framecount == 0 || memcmp(_prevpalette, palette, 768)) {
-		fwrite(&typeCMAP, 4, 1, _dxa);
+		writeUint32LE(_dxa, typeCMAP);
 		fwrite(palette, 768, 1, _dxa);
 
 		memcpy(_prevpalette, palette, 768);
@@ -176,7 +176,7 @@
 		//FRAM
 		uint8 compType;
 
-		fwrite(&typeFRAM, 4, 1, _dxa);
+		writeUint32LE(_dxa, typeFRAM);
 
 		if (_framecount == 0)
 			compType = 2;
@@ -187,7 +187,7 @@
 		compType = 10;
 #endif
 
-		fwrite(&compType, 1, 1, _dxa);
+		writeByte(_dxa, compType);
 
 		switch (compType) {
 		case 2:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.