From ea3990a41b3ea1a5d2b483ef79029972d7d03b65 Mon Sep 17 00:00:00 2001
From: Matthew Parlane <parlane@gmail.com>
Date: Sun, 17 Nov 2013 11:25:12 +1300
Subject: [PATCH] Don't pass char* to std::string. Windows was fine with this
:(
---
.../Core/VideoBackends/Software/Src/DebugUtil.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/Core/VideoBackends/Software/Src/DebugUtil.cpp b/Source/Core/VideoBackends/Software/Src/DebugUtil.cpp
index bac6ef6152..8e93624b6c 100644
--- a/Source/Core/VideoBackends/Software/Src/DebugUtil.cpp
+++ b/Source/Core/VideoBackends/Software/Src/DebugUtil.cpp
@@ -99,7 +99,7 @@ void DumpActiveTextures()
{
SaveTexture(StringFromFormat("%star%i_ind%i_map%i_mip%i.png",
File::GetUserPath(D_DUMPTEXTURES_IDX),
- swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
+ swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip), texmap, mip);
}
}
@@ -116,12 +116,12 @@ void DumpActiveTextures()
{
SaveTexture(StringFromFormat("%star%i_stage%i_map%i_mip%i.png",
File::GetUserPath(D_DUMPTEXTURES_IDX),
- swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip).c_str(), texmap, mip);
+ swstats.thisFrame.numDrawnObjects, stageNum, texmap, mip), texmap, mip);
}
}
}
-void DumpEfb(const char* filename)
+void DumpEfb(const std::string filename)
{
u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8 *writePtr = data;
@@ -144,7 +144,7 @@ void DumpEfb(const char* filename)
delete[] data;
}
-void DumpDepth(const char* filename)
+void DumpDepth(const std::string filename)
{
u8 *data = new u8[EFB_WIDTH * EFB_HEIGHT * 4];
u8 *writePtr = data;
@@ -225,7 +225,7 @@ void OnObjectEnd()
if (g_SWVideoConfig.bDumpObjects && swstats.thisFrame.numDrawnObjects >= g_SWVideoConfig.drawStart && swstats.thisFrame.numDrawnObjects < g_SWVideoConfig.drawEnd)
DumpEfb(StringFromFormat("%sobject%i.png",
File::GetUserPath(D_DUMPFRAMES_IDX).c_str(),
- swstats.thisFrame.numDrawnObjects).c_str());
+ swstats.thisFrame.numDrawnObjects));
if (g_SWVideoConfig.bHwRasterizer || drawingHwTriangles)
{
@@ -259,9 +259,9 @@ void OnFrameEnd()
if (g_SWVideoConfig.bDumpFrames)
{
DumpEfb(StringFromFormat("%sframe%i_color.png",
- File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
+ File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount));
DumpDepth(StringFromFormat("%sframe%i_depth.png",
- File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount).c_str());
+ File::GetUserPath(D_DUMPFRAMES_IDX).c_str(), swstats.frameCount));
}
}
}