From d3cc7f0ba7961ecf858d86999bd2ccc527b7a8e1 Mon Sep 17 00:00:00 2001
From: Chris Broome <ChrisBroome7@gmail.com>
Date: Tue, 19 Jun 2018 21:42:07 -0400
Subject: [PATCH] Fix yscale out of bounds rounding error (#12)

* Fix rounding error causing yscale out of bounds
* Ignore linux build output
---
 .gitignore                    | 10 ++++++++++
 src/attic/pc/sdl-video.c      |  2 +-
 src/drivers/sdl/sdl-video.cpp |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 452cb071..2a8d92f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,13 @@
 /output/sav/*.sav
 /output/fcs/*.fc*
 /vc/userconfig/scmrev.h
+
+# linux build output
+bin
+src/fceux
+fceux-net-server
+*.o
+.sconf_temp/
+.sconsign.dblite
+.deps
+.dirstamp
\ No newline at end of file
diff --git a/src/attic/pc/sdl-video.c b/src/attic/pc/sdl-video.c
index 5886f0fb..b1860c4b 100644
--- a/src/attic/pc/sdl-video.c
+++ b/src/attic/pc/sdl-video.c
@@ -174,7 +174,7 @@ int InitVideo(FCEUGI *gi)
   #ifdef OPENGL
   if( (usingogl && !_stretchy) || !usingogl)
   #endif
-   if(_yres<tlines*eys || eys <= 0.01)
+   if(_yres < (int)(tlines*eys) || eys <= 0.01)
    {
     FCEUD_PrintError("yscale out of bounds.");
     KillVideo();
diff --git a/src/drivers/sdl/sdl-video.cpp b/src/drivers/sdl/sdl-video.cpp
index 35970e96..ea69ebfa 100644
--- a/src/drivers/sdl/sdl-video.cpp
+++ b/src/drivers/sdl/sdl-video.cpp
@@ -319,7 +319,7 @@ InitVideo(FCEUGI *gi)
 #ifdef OPENGL
 		if((s_useOpenGL && !ystretch) || !s_useOpenGL)
 #endif
-			if(yres < s_tlines * s_eys || s_eys <= 0.01) {
+			if(yres < int(s_tlines * s_eys) || s_eys <= 0.01) {
 				FCEUD_PrintError("yscale out of bounds.");
 				KillVideo();
 				return -1;