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

[strangerke at users.sourceforge.net]

Revision: 46397
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46397&view=rev
Author:   strangerke
Date:     2009-12-16 23:11:34 +0000 (Wed, 16 Dec 2009)

Log Message:
-----------
compress_gob : Fixed an inversion in the in and out directories 

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

Modified: tools/branches/gsoc2009-gui/compress_gob.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress_gob.cpp	2009-12-16 22:39:41 UTC (rev 46396)
+++ tools/branches/gsoc2009-gui/compress_gob.cpp	2009-12-16 23:11:34 UTC (rev 46397)
@@ -70,26 +70,24 @@
 
 
 	Filename inpath(_inputPaths[0].path);
-	Filename outpath("");
 
 // We output with .stk extension, if there is no specific out file
-	if (outpath.empty()) {
-		outpath = inpath;
-		outpath.setExtension(".stk");
+	if (_outputPath.empty()) {
+		_outputPath = inpath;
+		_outputPath.setExtension(".stk");
 	}
-
 	if (_outputPath.directory()) {
-		_outputPath.setFullName(inpath.getFullName());
+		_outputPath.setFullName(inpath.getName());
 		_outputPath.setExtension(".stk");
 	}
 
 	// Open input (config) file
 	gobConf.open(inpath, "r");
 	// Read the input into memory
-	_chunks = readChunkConf(gobConf, outpath, chunkCount);
+	_chunks = readChunkConf(gobConf, inpath, chunkCount);
 	gobConf.close();
 
-	stk.open(outpath, "wb");
+	stk.open(_outputPath, "wb");
 
 	// Output in compressed format
 	writeEmptyHeader (stk, chunkCount);


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