From 449c33ee8bbde7de84da1e671f0adf7762c51256 Mon Sep 17 00:00:00 2001 From: Thomas Harte Date: Fri, 21 Jul 2017 21:28:04 -0400 Subject: [PATCH] Signedness fixes. --- Outputs/CRT/Internals/CRTOpenGL.cpp | 2 +- Outputs/Speaker.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Outputs/CRT/Internals/CRTOpenGL.cpp b/Outputs/CRT/Internals/CRTOpenGL.cpp index 0b5c3f275..81a2d7a55 100644 --- a/Outputs/CRT/Internals/CRTOpenGL.cpp +++ b/Outputs/CRT/Internals/CRTOpenGL.cpp @@ -102,7 +102,7 @@ void OpenGLOutputBuilder::draw_frame(unsigned int output_width, unsigned int out } // make sure there's a target to draw to - if(!framebuffer_ || framebuffer_->get_height() != output_height || framebuffer_->get_width() != output_width) { + if(!framebuffer_ || (unsigned int)framebuffer_->get_height() != output_height || (unsigned int)framebuffer_->get_width() != output_width) { std::unique_ptr new_framebuffer(new OpenGL::TextureTarget((GLsizei)output_width, (GLsizei)output_height, pixel_accumulation_texture_unit, GL_LINEAR)); if(framebuffer_) { new_framebuffer->bind_framebuffer(); diff --git a/Outputs/Speaker.hpp b/Outputs/Speaker.hpp index 4fd2b0fd8..72e0970fb 100644 --- a/Outputs/Speaker.hpp +++ b/Outputs/Speaker.hpp @@ -104,8 +104,8 @@ class Speaker { std::vector buffer_in_progress_; float high_frequency_cut_off_; - int buffer_in_progress_pointer_; - int number_of_taps_, requested_number_of_taps_; + size_t buffer_in_progress_pointer_; + size_t number_of_taps_, requested_number_of_taps_; bool coefficients_are_dirty_; Delegate *delegate_;