From e92f95c7ef49d8cc799b2ae75ea0575cb93d98db Mon Sep 17 00:00:00 2001 From: Krisjanis Rijnieks Date: Sun, 31 Dec 2017 15:14:40 +0100 Subject: [PATCH] Fix warnings in magSlide regarding unhandled switch cases --- src/Sources/magSlide.cpp | 12 +++++------- src/Sources/magSlideShowSource.cpp | 6 ++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Sources/magSlide.cpp b/src/Sources/magSlide.cpp index c334cbe..206a86c 100644 --- a/src/Sources/magSlide.cpp +++ b/src/Sources/magSlide.cpp @@ -24,8 +24,7 @@ void magSlide::update(u_int64_t deltaTime) transition->update(deltaTime); runningTime += deltaTime; - switch (slideState) - { + switch (slideState){ // case SlideState::BuildIn: // if (runningTime >= buildInDuration) // { @@ -35,20 +34,19 @@ void magSlide::update(u_int64_t deltaTime) // break; case SlideState::Normal: - if (runningTime >= buildOutStartTime) - { + if (runningTime >= buildOutStartTime){ setState(BuildOut); } break; case SlideState::BuildOut: - if (runningTime >= endTime) - { + if (runningTime >= endTime){ setState(Complete); } break; + default: + break; } - } void magSlide::setSize(float w, float h) diff --git a/src/Sources/magSlideShowSource.cpp b/src/Sources/magSlideShowSource.cpp index 6f8d9da..48b9359 100644 --- a/src/Sources/magSlideShowSource.cpp +++ b/src/Sources/magSlideShowSource.cpp @@ -323,8 +323,7 @@ void magSlideShowSource::addSlide(std::shared_ptr slide) { } // Resize the slide according to the resize option: - switch (rOption) - { + switch (rOption){ float sw, sh, ratio; case magSlide::ResizeOptions::FitProportionally: @@ -362,6 +361,9 @@ void magSlideShowSource::addSlide(std::shared_ptr slide) { case magSlide::Fit: slide->setSize(getWidth(), getHeight()); break; + + default: + break; } // Add transitions: