aboutsummaryrefslogtreecommitdiff
path: root/samples/DX_APIUsage/Main.cpp
diff options
context:
space:
mode:
authorDave Clark <[email protected]>2018-03-08 15:12:56 -0500
committerDave Clark <[email protected]>2018-03-08 15:12:56 -0500
commit1f9ad132c6d6288d9a842120c05a1a4431800e1c (patch)
tree6b9e178c558d1055b1cc4d0d6ab989ee3fc76448 /samples/DX_APIUsage/Main.cpp
parentUpdate CHANGELOG.md (diff)
downloadgfesdk-1f9ad132c6d6288d9a842120c05a1a4431800e1c.tar.xz
gfesdk-1f9ad132c6d6288d9a842120c05a1a4431800e1c.zip
Push GfeSDK 1.1.191
Plus documentation updates
Diffstat (limited to 'samples/DX_APIUsage/Main.cpp')
-rw-r--r--samples/DX_APIUsage/Main.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/samples/DX_APIUsage/Main.cpp b/samples/DX_APIUsage/Main.cpp
index eaed21a..386b4db 100644
--- a/samples/DX_APIUsage/Main.cpp
+++ b/samples/DX_APIUsage/Main.cpp
@@ -33,11 +33,11 @@ using namespace GfeSDK;
void TRACE(const char* format, ...)
{
- char buffer[1000];
+ char buffer[512];
va_list argptr;
va_start(argptr, format);
- vsprintf(buffer, format, argptr);
+ vsprintf_s(buffer, sizeof(buffer) / sizeof(buffer[0]), format, argptr);
va_end(argptr);
OutputDebugStringA(buffer);
@@ -230,7 +230,6 @@ void InitApp()
Json::Value jsonHighlightsConfig;
{
- Json::Reader reader;
std::ifstream inFile(pathStr + "/highlights_config.json");
if (!inFile.good())
{
@@ -240,7 +239,10 @@ void InitApp()
inFile = std::ifstream(pathStr + "/../../highlights_config.json");
}
}
- if (!reader.parse(inFile, jsonHighlightsConfig))
+
+ std::string errs;
+ Json::CharReaderBuilder builder;
+ if (!Json::parseFromStream(builder, inFile, &jsonHighlightsConfig, &errs))
{
TRACE("FAILED to read json file\n");
}
@@ -252,9 +254,9 @@ void InitApp()
g_highlightsConfig.highlightsData.resize(jsonHighlightsConfig["highlights"].size());
g_highlightsConfig.highlights.resize(jsonHighlightsConfig["highlights"].size());
- for (int i = 0; i < jsonHighlightsConfig["highlights"].size(); ++i)
+ for (unsigned int i = 0; i < jsonHighlightsConfig["highlights"].size(); ++i)
{
- Json::Value const& def = jsonHighlightsConfig["highlights"][i];
+ Json::Value const& def = jsonHighlightsConfig["highlights"].get(i, Json::Value());
g_highlightsConfig.highlightsData[i].id = def["id"].asString();
g_highlightsConfig.highlightsData[i].isScreenshot = !def.isMember("startDelta");
g_highlightsConfig.highlightsData[i].startDelta = g_highlightsConfig.highlightsData[i].isScreenshot ? 0 : def["startDelta"].asInt();