Browse Source

Fix warnings in magSlide regarding unhandled switch cases

master
Krisjanis Rijnieks 8 years ago
parent
commit
e92f95c7ef
  1. 12
      src/Sources/magSlide.cpp
  2. 6
      src/Sources/magSlideShowSource.cpp

12
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)

6
src/Sources/magSlideShowSource.cpp

@ -323,8 +323,7 @@ void magSlideShowSource::addSlide(std::shared_ptr<magSlide> 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<magSlide> slide) {
case magSlide::Fit:
slide->setSize(getWidth(), getHeight());
break;
default:
break;
}
// Add transitions:

Loading…
Cancel
Save