From 333db2b17e898e42dcaf704676dd2056d4fd7117 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 29 Apr 2019 22:28:59 +0200 Subject: [PATCH] movies: fix compilation issue in MSVC 2015 --- panda/src/movies/vorbisAudioCursor.cxx | 2 +- panda/src/movies/wavAudioCursor.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/panda/src/movies/vorbisAudioCursor.cxx b/panda/src/movies/vorbisAudioCursor.cxx index 80c5613b0c..c84dd37aa7 100644 --- a/panda/src/movies/vorbisAudioCursor.cxx +++ b/panda/src/movies/vorbisAudioCursor.cxx @@ -104,7 +104,7 @@ seek(double t) { if (result == OV_ENOSEEK && t == 0.0) { std::istream *stream = (std::istream *)_ov.datasource; - if (stream->rdbuf()->pubseekpos(0, std::ios::in) == 0) { + if (stream->rdbuf()->pubseekpos(0, std::ios::in) == (std::streampos)0) { // Back up the callbacks, then destroy the stream, making sure to first // unset the datasource so that it won't close the file. ov_callbacks callbacks = _ov.callbacks; diff --git a/panda/src/movies/wavAudioCursor.cxx b/panda/src/movies/wavAudioCursor.cxx index 4b58794d46..92fa9dc4a9 100644 --- a/panda/src/movies/wavAudioCursor.cxx +++ b/panda/src/movies/wavAudioCursor.cxx @@ -315,7 +315,7 @@ seek(double t) { } else if (pos < current) { // Can we seek to the beginning? Some streams, such as ZStream, let us // rewind the stream. - if (buf->pubseekpos(0, std::ios::in) == 0) { + if (buf->pubseekpos(0, std::ios::in) == (std::streampos)0) { if (pos > _data_start && movies_cat.is_info()) { Filename fn = get_source()->get_filename(); movies_cat.info()