[Scummvm-cvs-logs] scummvm master -> 59cd015fc90fcbb92c365ae33fe767cdf7ae863f

[clone2727]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bed532587b VIDEO: Fix check to see if the frame rate is a whole number
59cd015fc9 SCI: Silence a gcc warning


Commit: bed532587b4235a3cb9f2596bf7e65afdf33568a
    https://github.com/scummvm/scummvm/commit/bed532587b4235a3cb9f2596bf7e65afdf33568a
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-12-24T10:38:28-05:00

Commit Message:
VIDEO: Fix check to see if the frame rate is a whole number

Thanks to Marisa-Chan for spotting

Changed paths:
    video/video_decoder.cpp



diff --git a/video/video_decoder.cpp b/video/video_decoder.cpp
index dce96aa..a4bc5b8 100644
--- a/video/video_decoder.cpp
+++ b/video/video_decoder.cpp
@@ -530,7 +530,9 @@ Audio::Timestamp VideoDecoder::FixedRateVideoTrack::getFrameTime(uint frame) con
 	// (which Audio::Timestamp doesn't support).
 	Common::Rational frameRate = getFrameRate();
 
-	if (frameRate == frameRate.toInt()) // The nice case (a whole number)
+	// Try to keep it in terms of the frame rate, if the frame rate is a whole
+	// number.
+	if (frameRate.getDenominator() == 1)
 		return Audio::Timestamp(0, frame, frameRate.toInt());
 
 	// Convert as best as possible


Commit: 59cd015fc90fcbb92c365ae33fe767cdf7ae863f
    https://github.com/scummvm/scummvm/commit/59cd015fc90fcbb92c365ae33fe767cdf7ae863f
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-12-24T10:38:28-05:00

Commit Message:
SCI: Silence a gcc warning

Changed paths:
    engines/sci/graphics/screen.cpp



diff --git a/engines/sci/graphics/screen.cpp b/engines/sci/graphics/screen.cpp
index 8b0e763..2f95bf7 100644
--- a/engines/sci/graphics/screen.cpp
+++ b/engines/sci/graphics/screen.cpp
@@ -238,6 +238,8 @@ GfxScreen::GfxScreen(ResourceManager *resMan) : _resMan(resMan) {
 		_vectorPutPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
 		_putPixelPtr = &GfxScreen::putPixelDisplayUpscaled;
 		break;
+	case GFX_SCREEN_UPSCALED_DISABLED:
+		break;
 	}
 }