Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 17:08:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

render/d3d: Replaced some locale-sensitive configuration parsing code.

Browse Source
This commit is contained in:
Vas Crabb 2021-10-26 23:35:36 +11:00
parent 60706c1e93
commit 11f7c24c2e
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/osd/modules/render/d3d/d3dhlsl.cpp
View File

@ -26,9 +26,13 @@
#include "strconv.h" #include "strconv.h"
#include "d3dhlsl.h" #include "d3dhlsl.h"
#include "../frontend/mame/ui/slider.h" #include "../frontend/mame/ui/slider.h"
#include <array> #include <array>
#include <locale>
#include <sstream>
#include <utility> #include <utility>
//============================================================ //============================================================
// PROTOTYPES // PROTOTYPES
//============================================================ //============================================================
@ -1958,25 +1962,24 @@ void shaders::delete_resources()
static void get_vector(const char *data, int count, float *out, bool report_error) static void get_vector(const char *data, int count, float *out, bool report_error)
{ {
if (count > 3 && std::istringstream is(data);
sscanf(data, "%f,%f,%f,%f", &out[0], &out[1], &out[2], &out[3]) < 4 && report_error) is.imbue(std::locale::classic());
for (int i = 0; count > i; )
{ {
osd_printf_error("Illegal quad vector value = %s\n", data); is >> out[i];
bool bad = !is;
if (++i < count)
{
char ch;
is >> ch;
bad = bad || !is || (',' != ch);
} }
else if (count > 2 && if (bad)
sscanf(data, "%f,%f,%f", &out[0], &out[1], &out[2]) < 3 && report_error)
{ {
osd_printf_error("Illegal triple vector value = %s\n", data); if (report_error)
osd_printf_error("Illegal %d-item vector value = %s\n", count, data);
return;
} }
else if (count > 1 &&
sscanf(data, "%f,%f", &out[0], &out[1]) < 2 && report_error)
{
osd_printf_error("Illegal double vector value = %s\n", data);
}
else if (count > 0 &&
sscanf(data, "%f", &out[0]) < 1 && report_error)
{
osd_printf_error("Illegal single vector value = %s\n", data);
} }
} }