From 13928ae7d4bd68189817c2aa69f546f55afa97a8 Mon Sep 17 00:00:00 2001 From: Ulrich Huber Date: Mon, 11 Feb 2019 14:47:18 +0100 Subject: [PATCH] Fix sign compare issues --- src/util/audio/AudioQueue.h | 2 +- src/util/audio/PortAudioConsumer.cpp | 4 ++-- src/util/audio/VorbisConsumer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/audio/AudioQueue.h b/src/util/audio/AudioQueue.h index d2c863e7..99930db1 100644 --- a/src/util/audio/AudioQueue.h +++ b/src/util/audio/AudioQueue.h @@ -62,7 +62,7 @@ public: { XOJ_CHECK_TYPE(AudioQueue); - for (long i = 0; i < nSamples; i++) + for (unsigned long i = 0; i < nSamples; i++) { this->push_front(samples[i]); } diff --git a/src/util/audio/PortAudioConsumer.cpp b/src/util/audio/PortAudioConsumer.cpp index 0bc529d6..989bdee9 100644 --- a/src/util/audio/PortAudioConsumer.cpp +++ b/src/util/audio/PortAudioConsumer.cpp @@ -78,7 +78,7 @@ void PortAudioConsumer::startPlaying(double sampleRate, unsigned int channels) return; } - if (device->maxOutputChannels() < channels) + if ((unsigned int) device->maxOutputChannels() < channels) { this->audioQueue->signalEndOfStream(); g_warning("Output device has not enough channels to play audio file. (Requires at least 2 channels)"); @@ -129,7 +129,7 @@ int PortAudioConsumer::playCallback(const void* inputBuffer, void* outputBuffer, // Fill buffer to requested length if necessary - if (outputBufferLength < framesPerBuffer * this->outputChannels) + if ((unsigned int) outputBufferLength < framesPerBuffer * this->outputChannels) { g_warning("PortAudioConsumer: Frame underflow"); diff --git a/src/util/audio/VorbisConsumer.cpp b/src/util/audio/VorbisConsumer.cpp index 96bfd490..ab8dc833 100644 --- a/src/util/audio/VorbisConsumer.cpp +++ b/src/util/audio/VorbisConsumer.cpp @@ -51,7 +51,7 @@ bool VorbisConsumer::start(string filename, unsigned int inputChannels) // apply gain if (audioGain != 1.0) { - for (int i = 0; i < 64 * inputChannels; ++i) + for (unsigned int i = 0; i < 64 * inputChannels; ++i) { // check for overflow if (std::abs(buffer[i]) < std::floor(INT_MAX / audioGain))