fix linux compile (nw)

This commit is contained in:
Miodrag Milanovic 2016-07-31 14:58:11 +02:00
parent c703235246
commit aeadbfe2b1
2 changed files with 3 additions and 3 deletions

View File

@ -1225,8 +1225,8 @@ void render_target::compute_visible_area(INT32 target_width, INT32 target_height
// first compute scale factors to fit the screen // first compute scale factors to fit the screen
float xscale = (float)target_width / src_width; float xscale = (float)target_width / src_width;
float yscale = (float)target_height / src_height; float yscale = (float)target_height / src_height;
float maxxscale = std::max(1.0f, m_int_overscan? render_round_nearest(xscale) : floor(xscale)); float maxxscale = std::max(double(1.0f), m_int_overscan? render_round_nearest(xscale) : floor(xscale));
float maxyscale = std::max(1.0f, m_int_overscan? render_round_nearest(yscale) : floor(yscale)); float maxyscale = std::max(double(1.0f), m_int_overscan? render_round_nearest(yscale) : floor(yscale));
// now apply desired scale mode and aspect correction // now apply desired scale mode and aspect correction
if (m_keepaspect && target_aspect > src_aspect) xscale *= src_aspect / target_aspect * (maxyscale / yscale); if (m_keepaspect && target_aspect > src_aspect) xscale *= src_aspect / target_aspect * (maxyscale / yscale);

View File

@ -779,7 +779,7 @@ casserr_t cassette_read_modulated_data(cassette_image *cassette, int channel, do
} }
else else
{ {
buffer_length = std::min(length, U64(100000)); buffer_length = std::min(length, UINT64(100000));
alloc_buffer = (UINT8*)malloc(buffer_length); alloc_buffer = (UINT8*)malloc(buffer_length);
if (!alloc_buffer) if (!alloc_buffer)
{ {