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

Remere at users.sourceforge.net Remere at users.sourceforge.net
Wed Jul 15 02:45:06 CEST 2009


Revision: 42497
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42497&view=rev
Author:   Remere
Date:     2009-07-15 00:45:05 +0000 (Wed, 15 Jul 2009)

Log Message:
-----------
*Fixed error in compress_gob where filename would not update.
*Fixed error in compress_scumm_san where it would accept anything but one input file.

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress_gob.cpp
    tools/branches/gsoc2009-gui/compress_gob.h
    tools/branches/gsoc2009-gui/compress_scumm_san.cpp

Modified: tools/branches/gsoc2009-gui/compress_gob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.cpp	2009-07-15 00:41:39 UTC (rev 42496)
+++ tools/branches/gsoc2009-gui/compress_gob.cpp	2009-07-15 00:45:05 UTC (rev 42497)
@@ -101,7 +101,7 @@
  * In order to have a slightly better compression ration in some cases (Playtoons), it
  * also detects duplicate files.
  */
-CompressGob::Chunk *CompressGob::readChunkConf(File &gobConf, Filename stkName, uint16 &chunkCount) {
+CompressGob::Chunk *CompressGob::readChunkConf(File &gobConf, Filename &stkName, uint16 &chunkCount) {
 	Chunk *chunks = new Chunk;
 	Chunk *curChunk = chunks;
 	Chunk *parseChunk;

Modified: tools/branches/gsoc2009-gui/compress_gob.h
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.h	2009-07-15 00:41:39 UTC (rev 42496)
+++ tools/branches/gsoc2009-gui/compress_gob.h	2009-07-15 00:45:05 UTC (rev 42497)
@@ -49,7 +49,7 @@
 
 	void parseExtraArguments();
 
-	Chunk *readChunkConf(File &gobconf, Filename stkName, uint16 &chunkCount);
+	Chunk *readChunkConf(File &gobconf, Filename &stkName, uint16 &chunkCount);
 	void writeEmptyHeader(File &stk, uint16 chunkCount);
 	void writeBody(Filename *inpath, File &stk, Chunk *chunks);
 	uint32 writeBodyStoreFile(File &stk, File &src);

Modified: tools/branches/gsoc2009-gui/compress_scumm_san.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-15 00:41:39 UTC (rev 42496)
+++ tools/branches/gsoc2009-gui/compress_scumm_san.cpp	2009-07-15 00:45:05 UTC (rev 42497)
@@ -585,7 +585,7 @@
 		error("Only ogg vorbis and MP3 is supported for this tool.");
 
 	// Check input
-	if (_inputPaths.size() == 1)
+	if (_inputPaths.size() != 1)
 		error("One input file expected!");
 	Filename inpath(_inputPaths[0]);
 	Filename &outpath = _outputPath;


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