VS2017 compiler warning fixup

src/output/output_surface.cpp

@@ -199,7 +199,7 @@ void OUTPUT_SURFACE_EndUpdate(const Bit16u *changedLines)
 #if defined(C_SDL2)
                 SDL_UpdateWindowSurfaceRects(sdl.window, sdl.updateRects, rectCount);
 #else
-                SDL_UpdateRects(sdl.surface, rectCount, sdl.updateRects);
+                SDL_UpdateRects(sdl.surface, (int)rectCount, sdl.updateRects);
 #endif
             }
         }

src/output/output_surface_sdl.cpp

@@ -24,7 +24,7 @@ Bitu OUTPUT_SURFACE_GetBestMode(Bitu flags)
     else testbpp = 0;
 
     if (sdl.desktop.fullscreen)
-        gotbpp = (unsigned int)SDL_VideoModeOK(640, 480, testbpp,
+        gotbpp = (unsigned int)SDL_VideoModeOK(640, 480, (int)testbpp,
         (unsigned int)SDL_FULLSCREEN | (unsigned int)SDL_HWSURFACE | (unsigned int)SDL_HWPALETTE);
     else
         gotbpp = sdl.desktop.bpp;
@@ -96,7 +96,7 @@ retry:
     if (render.aspect) aspectCorrectExtend(width, height);
 #endif
 
-    sdl.clip.w = width; sdl.clip.h = height;
+    sdl.clip.w = (Uint16)width; sdl.clip.h = (Uint16)height;
     if (sdl.desktop.fullscreen)
     {
         Uint32 wflags = SDL_FULLSCREEN | SDL_HWPALETTE |
@@ -113,7 +113,7 @@ retry:
             int fw = (std::max)((int)sdl.desktop.full.width,  (sdl.clip.x+sdl.clip.w));
             int fh = (std::max)((int)sdl.desktop.full.height, (sdl.clip.y+sdl.clip.h));
 
-            sdl.surface = SDL_SetVideoMode(fw, fh, bpp, wflags);
+            sdl.surface = SDL_SetVideoMode(fw, fh, (int)bpp, wflags);
             sdl.deferred_resize = false;
             sdl.must_redraw_all = true;
 
@@ -132,7 +132,7 @@ retry:
         else
         {
             sdl.clip.x = 0; sdl.clip.y = 0;
-            sdl.surface = SDL_SetVideoMode(width, height, bpp, wflags);
+            sdl.surface = SDL_SetVideoMode((int)width, (int)height, (int)bpp, wflags);
             sdl.deferred_resize = false;
             sdl.must_redraw_all = true;
         }
@@ -238,7 +238,7 @@ retry:
                 (unsigned int)final_width,
                 (unsigned int)final_height);
 
-            sdl.surface = SDL_SetVideoMode(final_width, final_height, bpp,
+            sdl.surface = SDL_SetVideoMode((int)final_width, (int)final_height, (int)bpp,
                 (unsigned int)((sdl.draw.flags & GFX_CAN_RANDOM) ? SDL_SWSURFACE : SDL_HWSURFACE) |
 #ifdef SDL_DOSBOX_X_SPECIAL
                 (unsigned int)SDL_HAX_NOREFRESH |
@@ -278,7 +278,7 @@ retry:
             SDL_InitSubSystem(SDL_INIT_VIDEO);
             GFX_SetIcon(); // set icon again
 
-            sdl.surface = SDL_SetVideoMode(width, height, bpp, SDL_HWSURFACE);
+            sdl.surface = SDL_SetVideoMode((int)width, (int)height, (int)bpp, SDL_HWSURFACE);
             sdl.deferred_resize = false;
             sdl.must_redraw_all = true;
 

src/output/output_tools_xbrz.cpp

@@ -84,8 +84,8 @@ void xBRZ_Render(const uint32_t* renderBuf, uint32_t* xbrzBuf, const Bit16u *cha
                 y += changedLines[index];
             else
             {
-                const int sliceFirst = y;
-                const int sliceLast = y + changedLines[index];
+                const int sliceFirst = (int)y;
+                const int sliceLast = (int)y + changedLines[index];
                 y += changedLines[index];
 
                 int yFirst = max(yLast, sliceFirst - 2); // we need to update two adjacent lines as well since they are analyzed by xBRZ!