From 0edb6463c4b8e642c79f1f80e038bc140433af62 Mon Sep 17 00:00:00 2001 From: Jeffrey Crowell Date: Mon, 20 Jun 2022 13:56:54 -0400 Subject: [PATCH] fix some narrowing issues that clang complains about --- ZAPDTR/ZAPD/ZAudioDecode.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ZAPDTR/ZAPD/ZAudioDecode.cpp b/ZAPDTR/ZAPD/ZAudioDecode.cpp index b8b066474..90ecfe35c 100644 --- a/ZAPDTR/ZAPD/ZAudioDecode.cpp +++ b/ZAPDTR/ZAPD/ZAudioDecode.cpp @@ -461,8 +461,8 @@ char* OldMain(char* infilename) else { char comprType[5] = { - CommChunk.compressionTypeH >> 8, CommChunk.compressionTypeH & 0xFF, - CommChunk.compressionTypeL >> 8, CommChunk.compressionTypeL & 0xFF, 0}; + static_cast(CommChunk.compressionTypeH >> 8), static_cast(CommChunk.compressionTypeH & 0xFF), + static_cast(CommChunk.compressionTypeL >> 8), static_cast(CommChunk.compressionTypeL & 0xFF), 0}; fail_parse("file is of the wrong compression type [got %s (%08x)]", &comprType, cType); } @@ -603,8 +603,8 @@ char* OldMain(char* infilename) { s32 startPos = aloops[0].start, endPos = aloops[0].end; const char* markerNames[2] = {"start", "end"}; - Marker markers[2] = {{1, startPos >> 16, startPos & 0xffff}, - {2, endPos >> 16, endPos & 0xffff}}; + Marker markers[2] = {{1, static_cast(startPos >> 16), static_cast(startPos & 0xffff)}, + {2, static_cast(endPos >> 16), static_cast(endPos & 0xffff)}}; write_header(ofile, "MARK", 2 + 2 * sizeof(Marker) + 1 + 5 + 1 + 3); s16 numMarkers = bswap16(2); fwrite(&numMarkers, sizeof(s16), 1, ofile); @@ -666,4 +666,4 @@ char* OldMain(char* infilename) fclose(ifile); fclose(ofile); return 0; -} \ No newline at end of file +}