From 605f9208165e9da36753bc22d2b0ae75c90cc3dd Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Tue, 8 May 2012 20:08:06 +1000 Subject: [PATCH] Fix more compiler warnings. --- examples/cpp/decode/file/main.cpp | 10 +++++----- examples/cpp/encode/file/main.cpp | 13 ++++++------- src/test_libFLAC++/metadata_object.cpp | 2 +- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/examples/cpp/decode/file/main.cpp b/examples/cpp/decode/file/main.cpp index bd94d2e..417c298 100644 --- a/examples/cpp/decode/file/main.cpp +++ b/examples/cpp/decode/file/main.cpp @@ -30,6 +30,10 @@ #include #include + +#define __STDC_FORMAT_MACROS +#include + #include "FLAC++/decoder.h" static FLAC__uint64 total_samples = 0; @@ -175,11 +179,7 @@ void OurDecoder::metadata_callback(const ::FLAC__StreamMetadata *metadata) fprintf(stderr, "sample rate : %u Hz\n", sample_rate); fprintf(stderr, "channels : %u\n", channels); fprintf(stderr, "bits per sample: %u\n", bps); -#ifdef _MSC_VER - fprintf(stderr, "total samples : %I64u\n", total_samples); -#else - fprintf(stderr, "total samples : %llu\n", total_samples); -#endif + fprintf(stderr, "total samples : %" PRIu64 "\n", total_samples); } } diff --git a/examples/cpp/encode/file/main.cpp b/examples/cpp/encode/file/main.cpp index a6eeaa4..007899e 100644 --- a/examples/cpp/encode/file/main.cpp +++ b/examples/cpp/encode/file/main.cpp @@ -31,6 +31,10 @@ #include #include #include + +#define __STDC_FORMAT_MACROS +#include + #include "FLAC++/metadata.h" #include "FLAC++/encoder.h" @@ -48,7 +52,6 @@ protected: static unsigned total_samples = 0; /* can use a 32-bit number due to WAVE size limitations */ static FLAC__byte buffer[READSIZE/*samples*/ * 2/*bytes_per_sample*/ * 2/*channels*/]; /* we read the WAVE data into here */ static FLAC__int32 pcm[READSIZE/*samples*/ * 2/*channels*/]; -static FLAC__int32 *pcm_[2] = { pcm, pcm+READSIZE }; int main(int argc, char *argv[]) { @@ -87,7 +90,7 @@ int main(int argc, char *argv[]) channels = 2; bps = 16; total_samples = (((((((unsigned)buffer[43] << 8) | buffer[42]) << 8) | buffer[41]) << 8) | buffer[40]) / 4; - + /* check the encoder */ if(!encoder) { fprintf(stderr, "ERROR: allocating encoder\n"); @@ -170,9 +173,5 @@ int main(int argc, char *argv[]) void OurEncoder::progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate) { -#ifdef _MSC_VER - fprintf(stderr, "wrote %I64u bytes, %I64u/%u samples, %u/%u frames\n", bytes_written, samples_written, total_samples, frames_written, total_frames_estimate); -#else - fprintf(stderr, "wrote %llu bytes, %llu/%u samples, %u/%u frames\n", bytes_written, samples_written, total_samples, frames_written, total_frames_estimate); -#endif + fprintf(stderr, "wrote %" PRIu64 " bytes, %" PRIu64 "/%u samples, %u/%u frames\n", bytes_written, samples_written, total_samples, frames_written, total_frames_estimate); } diff --git a/src/test_libFLAC++/metadata_object.cpp b/src/test_libFLAC++/metadata_object.cpp index 76ed07e..b5debd3 100644 --- a/src/test_libFLAC++/metadata_object.cpp +++ b/src/test_libFLAC++/metadata_object.cpp @@ -2020,7 +2020,7 @@ bool test_metadata_object_picture() printf("testing Picture::set_colors()... +\n"); printf(" Picture::get_colors()... "); block.set_colors(1u>16); - if(block.get_colors() != 1u>16) + if(block.get_colors() != (1u>16)) return die_("value mismatch, expected 2^16"); printf("OK\n"); -- 2.7.4