From ddb290d5f615019c33c42b8d94e5a5254cabcf33 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 22 Oct 2016 13:13:17 +0200 Subject: NOTICE (TYPE NAME CONSOLIDATION) Use standard uint64_t, uint32_t, uint16_t or uint8_t instead of UINT64, UINT32, UINT16 or UINT8 also use standard int64_t, int32_t, int16_t or int8_t instead of INT64, INT32, INT16 or INT8 --- src/osd/sdl/window.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/osd/sdl/window.cpp') diff --git a/src/osd/sdl/window.cpp b/src/osd/sdl/window.cpp index 83c967e4306..38cef1d496c 100644 --- a/src/osd/sdl/window.cpp +++ b/src/osd/sdl/window.cpp @@ -256,7 +256,7 @@ void sdl_window_info::show_pointer() // sdlwindow_resize //============================================================ -void sdl_window_info::resize(INT32 width, INT32 height) +void sdl_window_info::resize(int32_t width, int32_t height) { osd_dim cd = get_size(); @@ -518,7 +518,7 @@ osd_dim sdl_window_info::pick_best_mode() SDL_GetDisplayMode(m_monitor->oshandle(), i, &mode); // compute initial score based on difference between target and current - size_score = 1.0f / (1.0f + abs((INT32)mode.w - target_width) + abs((INT32)mode.h - target_height)); + size_score = 1.0f / (1.0f + abs((int32_t)mode.w - target_width) + abs((int32_t)mode.h - target_height)); // if the mode is too small, give a big penalty if (mode.w < minimum_width || mode.h < minimum_height) @@ -903,13 +903,13 @@ int sdl_window_info::wnd_extra_height() osd_rect sdl_window_info::constrain_to_aspect_ratio(const osd_rect &rect, int adjustment) { - INT32 extrawidth = wnd_extra_width(); - INT32 extraheight = wnd_extra_height(); - INT32 propwidth, propheight; - INT32 minwidth, minheight; - INT32 maxwidth, maxheight; - INT32 viswidth, visheight; - INT32 adjwidth, adjheight; + int32_t extrawidth = wnd_extra_width(); + int32_t extraheight = wnd_extra_height(); + int32_t propwidth, propheight; + int32_t minwidth, minheight; + int32_t maxwidth, maxheight; + int32_t viswidth, visheight; + int32_t adjwidth, adjheight; float pixel_aspect; std::shared_ptr monitor = m_monitor; @@ -1020,7 +1020,7 @@ osd_rect sdl_window_info::constrain_to_aspect_ratio(const osd_rect &rect, int ad osd_dim sdl_window_info::get_min_bounds(int constrain) { - INT32 minwidth, minheight; + int32_t minwidth, minheight; //assert(GetCurrentThreadId() == window_threadid); -- cgit v1.2.3-70-g09d2