Minor clean up: msvc warnings/include order/comment text.

Change-Id: I2b54abcb9f535715d8713930942447c0b0f5f862
This commit is contained in:
Tom Finegan
2014-01-22 14:03:40 -08:00
parent 796c90798a
commit 327e8ab617
4 changed files with 13 additions and 11 deletions

View File

@@ -6,20 +6,16 @@
// in the file PATENTS. All contributing project authors may
// be found in the AUTHORS file in the root of the source tree.
//
// This sample application demonstrates how to use the matroska parser
// library, which allows clients to handle a matroska format file.
// This sample application demonstrates how to use the Matroska parser
// library, which allows clients to handle a Matroska format file.
#include <memory>
#include "mkvreader.hpp"
#include "mkvparser.hpp"
#include <memory>
#ifdef _MSC_VER
// Silences these warnings:
// warning C4996: 'mbstowcs': This function or variable may be unsafe. Consider
// using mbstowcs_s instead. To disable deprecation, use
// _CRT_SECURE_NO_WARNINGS. See online help for details.
// Fixing this warning requires use of a function available only on Windows,
// and this sample code must support non-windows platforms.
// Disable MSVC warnings that suggest making code non-portable.
#pragma warning(disable:4996)
#endif

View File

@@ -26,6 +26,7 @@
using mkvmuxer::uint64;
#ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable.
#pragma warning(disable:4996)
#endif

View File

@@ -8,6 +8,11 @@
#include "./vttreader.h" // NOLINT
#ifdef _MSC_VER
// Disable MSVC warnings that suggest making code non-portable.
#pragma warning(disable:4996)
#endif
namespace libwebvtt {
VttReader::VttReader() : file_(NULL) {

View File

@@ -686,8 +686,8 @@ Time& Time::presentation(presentation_t d) {
return *this;
}
seconds = d / 1000;
milliseconds = d - 1000 * seconds;
seconds = static_cast<int>(d / 1000);
milliseconds = static_cast<int>(d - 1000 * seconds);
minutes = seconds / 60;
seconds -= 60 * minutes;