From 1dfef4538f454146497c9fadecf616f736a2a288 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sun, 29 Dec 2002 08:55:35 +0000 Subject: [PATCH] minor syntax --- src/flac/decode.c | 6 +++--- src/share/grabbag/cuesheet.c | 2 +- src/test_streams/main.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/flac/decode.c b/src/flac/decode.c index 64d901b..3179780 100644 --- a/src/flac/decode.c +++ b/src/flac/decode.c @@ -782,7 +782,7 @@ FLAC__StreamDecoderWriteStatus write_callback(const void *decoder, const FLAC__F const FLAC__uint64 input_samples_passed = skip + decoder_session->samples_processed; FLAC__ASSERT(until >= input_samples_passed); if(input_samples_passed + wide_samples > until) - wide_samples = until - input_samples_passed; + wide_samples = (unsigned)(until - input_samples_passed); } if(wide_samples > 0) { @@ -994,7 +994,7 @@ void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata decoder_session->abort_flag = true; } else { - const FLAC__uint32 aligned_data_size = (data_size+1) & (~1U); + const FLAC__uint32 aligned_data_size = (FLAC__uint32)((data_size+1) & (~1U)); if(flac__utils_fwrite("FORM", 1, 4, decoder_session->fout) != 4) decoder_session->abort_flag = true; @@ -1017,7 +1017,7 @@ void metadata_callback(const void *decoder, const FLAC__StreamMetadata *metadata if(decoder_session->wave_chunk_size_fixup.needs_fixup) decoder_session->wave_chunk_size_fixup.frames_offset = ftell(decoder_session->fout); - if(!write_big_endian_uint32(decoder_session->fout, decoder_session->total_samples)) + if(!write_big_endian_uint32(decoder_session->fout, (FLAC__uint32)decoder_session->total_samples)) decoder_session->abort_flag = true; if(!write_big_endian_uint16(decoder_session->fout, (FLAC__uint16)(decoder_session->bps))) diff --git a/src/share/grabbag/cuesheet.c b/src/share/grabbag/cuesheet.c index 7b96ca6..3c8bd9a 100644 --- a/src/share/grabbag/cuesheet.c +++ b/src/share/grabbag/cuesheet.c @@ -540,7 +540,7 @@ void grabbag__cuesheet_emit(FILE *file, const FLAC__StreamMetadata *cuesheet, co fprintf(file, " INDEX %02u ", (unsigned)index->number); if(cs->is_cd) { - const unsigned logical_frame = (track->offset + index->offset) / (44100 / 75); + const unsigned logical_frame = (unsigned)((track->offset + index->offset) / (44100 / 75)); unsigned m, s, f; grabbag__cuesheet_frame_to_msf(logical_frame, &m, &s, &f); fprintf(file, "%02u:%02u:%02u\n", m, s, f); diff --git a/src/test_streams/main.c b/src/test_streams/main.c index 41dc3f6..26cd463 100644 --- a/src/test_streams/main.c +++ b/src/test_streams/main.c @@ -576,7 +576,7 @@ static FLAC__bool generate_aiff(const char *filename, unsigned sample_rate, unsi goto foo; if(fwrite("AIFFCOMM\000\000\000\022", 1, 12, f) < 12) goto foo; - if(!write_big_endian_uint16(f, channels)) + if(!write_big_endian_uint16(f, (FLAC__uint16)channels)) goto foo; if(!write_big_endian_uint32(f, samples)) goto foo; @@ -619,7 +619,7 @@ static FLAC__bool generate_wav(const char *filename, unsigned sample_rate, unsig goto foo; if(fwrite("WAVEfmt \020\000\000\000\001\000", 1, 14, f) < 14) goto foo; - if(!write_little_endian_uint16(f, channels)) + if(!write_little_endian_uint16(f, (FLAC__uint16)channels)) goto foo; if(!write_little_endian_uint32(f, sample_rate)) goto foo; -- 2.7.4