[Scummvm-cvs-logs] scummvm-tools master -> 60cfdba75bd5bd17824150cb8db6298270674034

bluegr md5 at scummvm.org
Wed Aug 24 23:23:40 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
60cfdba75b TOOLS: Removed unneeded reference to Common::String in encode_dxa


Commit: 60cfdba75bd5bd17824150cb8db6298270674034
    https://github.com/scummvm/scummvm-tools/commit/60cfdba75bd5bd17824150cb8db6298270674034
Author: md5 (md5 at scummvm.org)
Date: 2011-08-24T14:20:34-07:00

Commit Message:
TOOLS: Removed unneeded reference to Common::String in encode_dxa

Common::String usage is superfluous here. This also fixes tools build under
MSVC for me

Changed paths:
    encode_dxa.cpp



diff --git a/encode_dxa.cpp b/encode_dxa.cpp
index 79ec5bd..8d59be3 100644
--- a/encode_dxa.cpp
+++ b/encode_dxa.cpp
@@ -28,7 +28,6 @@
 
 #include "encode_dxa.h"
 #include "common/endian.h"
-#include "common/str.h"
 
 const uint32 typeDEXA = 0x41584544;
 const uint32 typeFRAM = 0x4d415246;
@@ -591,12 +590,13 @@ void EncodeDXA::execute() {
 
 	// Check starting frame (binkconv starts at 0, ffmpeg starts at 1)
 	int framenum = 0;
-	if (!Common::Filename(Common::String::printf("%s%04d.png", fullname, framenum).c_str()).exists())
+	char strbuf[1024];
+	sprintf(strbuf, "%s%04d.png", fullname, framenum);
+	if (!Common::Filename(strbuf).exists())
 		framenum++;
 
 	print("Encoding video...");
 	for (int f = 0; f < frames; f++) {
-		char strbuf[1024];
 		if (frames > 999)
 			sprintf(strbuf, "%s%04d.png", fullname, framenum);
 		else if (frames > 99)






More information about the Scummvm-git-logs mailing list