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

[Remere at users.sourceforge.net]

Revision: 42979
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42979&view=rev
Author:   Remere
Date:     2009-08-01 21:17:38 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
*Small fixes to many of the tools.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_agos.h
    tools/branches/gsoc2009-gui/compress_sword1.h
    tools/branches/gsoc2009-gui/compress_sword2.cpp
    tools/branches/gsoc2009-gui/compress_sword2.h
    tools/branches/gsoc2009-gui/extract_agos.cpp
    tools/branches/gsoc2009-gui/extract_kyra.h
    tools/branches/gsoc2009-gui/extract_mm_c64.h
    tools/branches/gsoc2009-gui/extract_parallaction.h
    tools/branches/gsoc2009-gui/extract_zak_c64.h

Modified: tools/branches/gsoc2009-gui/compress_agos.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_agos.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/compress_agos.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -31,11 +31,12 @@
 
 	virtual void execute();
 
+	bool _convertMac;
+
 protected:
 	void parseExtraArguments();
 
 	File _input, _output_idx, _output_snd;
-	bool _convertMac;
 
 	void end();
 	int get_offsets(uint32 filenums[], uint32 offsets[]);

Modified: tools/branches/gsoc2009-gui/compress_sword1.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword1.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/compress_sword1.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -32,12 +32,13 @@
 
 	virtual void execute();
 
+	bool _compSpeech;
+	bool _compMusic;
+
 protected:
 	void parseExtraArguments();
 
 	std::string _audioOuputFilename;
-	bool _compSpeech;
-	bool _compMusic;
 
 	int16 *uncompressSpeech(File &clu, uint32 idx, uint32 cSize, uint32 *returnSize);
 	uint8 *convertData(uint8 *rawData, uint32 rawSize, uint32 *resSize);

Modified: tools/branches/gsoc2009-gui/compress_sword2.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword2.cpp	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/compress_sword2.cpp	2009-08-01 21:17:38 UTC (rev 42979)
@@ -71,13 +71,13 @@
 
 	switch (_format) {
 	case AUDIO_MP3:
-		_audioOuputFilename = TEMP_MP3;
+		_audioOutputFilename = TEMP_MP3;
 		break;
 	case AUDIO_VORBIS:
-		_audioOuputFilename = TEMP_OGG;
+		_audioOutputFilename = TEMP_OGG;
 		break;
 	case AUDIO_FLAC:
-		_audioOuputFilename = TEMP_FLAC;
+		_audioOutputFilename = TEMP_FLAC;
 		break;
 	default:
 		throw ToolException("Unknown audio format");

Modified: tools/branches/gsoc2009-gui/compress_sword2.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_sword2.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/compress_sword2.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -36,7 +36,7 @@
 protected:
 
 	File _input, _output_snd, _output_idx;
-	std::string _audioOuputFilename;
+	std::string _audioOutputFilename;
 
 	
 	uint32 append_to_file(File &f1, const char *filename);

Modified: tools/branches/gsoc2009-gui/extract_agos.cpp
===================================================================
--- tools/branches/gsoc2009-gui/extract_agos.cpp	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/extract_agos.cpp	2009-08-01 21:17:38 UTC (rev 42979)
@@ -54,7 +54,9 @@
 		if (simon_decr(x, out, _filelen)) {
 			savefile(_outputPath.getFullPath(), out, decrlen);
 		} else {
-			print("%s: decrunch error\n", infilename.getFullPath().c_str());
+			free(x);
+			free(out);
+			error("%s: decrunch error\n", infilename.getFullPath().c_str());
 		}
 
 		free(x);
@@ -180,7 +182,7 @@
  * @param name The name of the file to be loaded
  */
 void *ExtractAgos::loadfile(const Filename &name) {
-	File file(name, FILEMODE_READ);
+	File file(name, "rb");
 
 	// Using global here is not pretty
 	_filelen = file.size();

Modified: tools/branches/gsoc2009-gui/extract_kyra.h
===================================================================
--- tools/branches/gsoc2009-gui/extract_kyra.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/extract_kyra.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -33,7 +33,6 @@
 	
 	void parseExtraArguments();
 
-protected:
 	bool extractAll, extractOne, isAmiga, isHoFInstaller;
 	std::string singleFilename;
 };

Modified: tools/branches/gsoc2009-gui/extract_mm_c64.h
===================================================================
--- tools/branches/gsoc2009-gui/extract_mm_c64.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/extract_mm_c64.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -34,7 +34,6 @@
 
 	virtual void execute();
 
-protected:
 };
 
 #endif

Modified: tools/branches/gsoc2009-gui/extract_parallaction.h
===================================================================
--- tools/branches/gsoc2009-gui/extract_parallaction.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/extract_parallaction.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -82,10 +82,10 @@
 
 	virtual void execute();
 
+	bool _small;
+
 protected:
 	void parseExtraArguments();
-
-	bool _small;
 };
 
 #endif

Modified: tools/branches/gsoc2009-gui/extract_zak_c64.h
===================================================================
--- tools/branches/gsoc2009-gui/extract_zak_c64.h	2009-08-01 19:37:50 UTC (rev 42978)
+++ tools/branches/gsoc2009-gui/extract_zak_c64.h	2009-08-01 21:17:38 UTC (rev 42979)
@@ -30,9 +30,6 @@
 	ExtractZakC64(const std::string &name = "extract_zak_c64");
 
 	virtual void execute();
-
-protected:
-
 };
 
 #endif


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