[Scummvm-cvs-logs] SF.net SVN: scummvm:[42566] tools/branches/gsoc2009-gui

[Remere at users.sourceforge.net]

Revision: 42566
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42566&view=rev
Author:   Remere
Date:     2009-07-17 15:40:20 +0000 (Fri, 17 Jul 2009)

Log Message:
-----------
*Compiler error and warning fixes.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress.cpp
    tools/branches/gsoc2009-gui/compress_scumm_san.cpp
    tools/branches/gsoc2009-gui/compress_scumm_sou.cpp

Modified: tools/branches/gsoc2009-gui/compress.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress.cpp	2009-07-17 14:05:22 UTC (rev 42565)
+++ tools/branches/gsoc2009-gui/compress.cpp	2009-07-17 15:40:20 UTC (rev 42566)
@@ -190,7 +190,7 @@
 			err = spawnSubprocess(fbuf) != 0;
 
 			if (err) {
-				char buf[2048];35xk'x25uk
+				char buf[2048];
 				sprintf(buf, "Error in Vorbis encoder. (check parameters)\nVorbis Encoder Commandline:%s\n", fbuf);
 				throw ToolException(buf, err);
 			} else {

Modified: tools/branches/gsoc2009-gui/compress_scumm_san.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-17 14:05:22 UTC (rev 42565)
+++ tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-17 15:40:20 UTC (rev 42566)
@@ -327,7 +327,7 @@
 	sprintf(wavPath, "%s/%s.wav", outputDir, inputFilename);
 	File wavFile(wavPath, "wb+");
 
-	int frameAudioSize;
+	int frameAudioSize = 0;
 	if (fps == 12) {
 		frameAudioSize = 7352;
 	} else if (fps == 10) {

Modified: tools/branches/gsoc2009-gui/compress_scumm_sou.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-17 14:05:22 UTC (rev 42565)
+++ tools/branches/gsoc2009-gui/compress_scumm_sou.cpp	2009-07-17 15:40:20 UTC (rev 42566)
@@ -75,7 +75,6 @@
 
 void CompressScummSou::get_part(const char *inputPath) {
 	uint32 tot_size;
-	char outname[256];
 	int size;
 	char fbuf[2048];
 
@@ -120,8 +119,7 @@
 	extractAndEncodeVOC(TEMP_RAW, _input, _format);
 
 	/* Append the converted data to the master output file */
-	sprintf(outname, tempEncoded);
-	File f(outname, "rb");
+	File f(tempEncoded, "rb");
 	tot_size = 0;
 	while ((size = f.read(fbuf, 1, 2048)) > 0) {
 		tot_size += size;
@@ -145,7 +143,7 @@
 	char buf[2048];
 
 	Filename inpath(_inputPaths[0].path);
-	Filename &outpath = _outputPath;
+	//Filename &outpath = _outputPath;
 
 	switch (_format) {
 	case AUDIO_MP3:


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