Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Visual Studio compile fix. (nw)

Browse Source
This commit is contained in:
dankan1890 2016-03-28 22:57:35 +02:00
parent b312f1bb3c
commit 68ebc2b0e5
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/src/netlist.lua
View File

@ -73,7 +73,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp",
MAME_DIR .. "src/lib/netlist/solver/nld_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h",
@ -81,6 +81,7 @@ project "netlist"
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h",
MAME_DIR .. "src/lib/netlist/solver/mat_cr.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h",
MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h",
MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",

9
src/emu/rendutil.cpp
View File

@ -541,9 +541,7 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname
else
fname.assign(dirname).append(PATH_SEPARATOR).append(filename);
osd_file::error filerr = file.open(fname.c_str());
if (filerr != osd_file::error::NONE)
if (file.open(fname.c_str()) != osd_file::error::NONE)
return;
// define standard JPEG structures
@ -553,8 +551,8 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname
jpeg_create_decompress(&cinfo);
// allocates a buffer for the image
UINT64 jpg_size = file.size();
unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size + 100);
UINT32 jpg_size = file.size();
unsigned char *jpg_buffer = global_alloc_array(unsigned char, jpg_size);
// read data from the file and set them in the buffer
file.read(jpg_buffer, jpg_size);
@ -587,7 +585,6 @@ void render_load_jpeg(bitmap_argb32 &bitmap, emu_file &file, const char *dirname
else if (s == 3)
for (int i = 0; i < w; ++i)
bitmap.pix32(j, i) = rgb_t(0xFF, buffer[0][i * s], buffer[0][i * s + 1], buffer[0][i * s + 2]);
else
{
osd_printf_error("Cannot read JPEG data from %s file.\n", fname.c_str());

2
src/lib/netlist/solver/nld_ms_sm.h
View File

@ -548,7 +548,7 @@ int matrix_solver_sm_t<m_N, _storage_N>::solve_non_dynamic(ATTR_UNUSED const boo
{
const auto iN = N();
if (not incremental)
if (!incremental)
{
for (int row = 0; row < iN; row ++)
for (int k = 0; k < iN; k++)