Browse Source

fix Linux compile error

rdb 12 years ago
parent
commit
e5c4c10e20
1 changed files with 2 additions and 2 deletions
  1. 2 2
      panda/src/movies/wavAudioCursor.cxx

+ 2 - 2
panda/src/movies/wavAudioCursor.cxx

@@ -298,7 +298,7 @@ WavAudioCursor::
 void WavAudioCursor::
 void WavAudioCursor::
 seek(double t) {
 seek(double t) {
   t = max(t, 0.0);
   t = max(t, 0.0);
-  streampos pos = _data_start + (streampos) min(t * _byte_rate, _data_size);
+  streampos pos = _data_start + min((size_t) (t * _byte_rate), _data_size);
 
 
   if (_can_seek_fast) {
   if (_can_seek_fast) {
     _stream->seekg(pos);
     _stream->seekg(pos);
@@ -338,7 +338,7 @@ seek(double t) {
 void WavAudioCursor::
 void WavAudioCursor::
 read_samples(int n, PN_int16 *data) {
 read_samples(int n, PN_int16 *data) {
   int desired = n * _audio_channels;
   int desired = n * _audio_channels;
-  int read_samples = min(desired, (_data_size - _data_pos) / _bytes_per_sample);
+  int read_samples = min(desired, ((int) (_data_size - _data_pos)) / _bytes_per_sample);
 
 
   if (read_samples <= 0) {
   if (read_samples <= 0) {
     return;
     return;