From be6f2602c0bb529f894248164704da159128d797 Mon Sep 17 00:00:00 2001 From: c-mendoza Date: Thu, 30 Nov 2017 17:13:27 -0500 Subject: [PATCH] Rename ResizeOption enum item to play nice with GCC --- example/src/magSlide.h | 8 ++++---- example/src/magSlideShowSource.cpp | 2 +- example/src/magSlideShowSource.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/example/src/magSlide.h b/example/src/magSlide.h index bff6d27..c1889cb 100644 --- a/example/src/magSlide.h +++ b/example/src/magSlide.h @@ -30,7 +30,7 @@ public: * No resizing applied, displays the slide in its native pixel dimensions. * This is the default behavior. */ - None = 0, + NoResize = 0, /** * Explicitly set a slide to display in its native dimension. * None and NoResize result in the same output, but if you specify @@ -38,7 +38,7 @@ public: * slide not to resize, you must specify this option. Otherwise the * slide show option will apply. */ - NoResize, + Native, /** * Sets width and height to match the source's. @@ -136,9 +136,9 @@ protected: float width; float height; ofPoint position; - ResizeOptions resizeOption = None; + ResizeOptions resizeOption = NoResize; SlideState slideState = Off; - bool isComplete; + bool isComplete = false; std::shared_ptr buildIn = nullptr; std::shared_ptr buildOut = nullptr; diff --git a/example/src/magSlideShowSource.cpp b/example/src/magSlideShowSource.cpp index a417da4..5cc8a64 100644 --- a/example/src/magSlideShowSource.cpp +++ b/example/src/magSlideShowSource.cpp @@ -203,7 +203,7 @@ void magSlideShowSource::addSlide(std::shared_ptr slide) // If the slide does not have a resize option assign // the slide show's option - if (rOption == magSlide::ResizeOptions::None) + if (rOption == magSlide::ResizeOptions::NoResize) { rOption = settings.resizeOption; } diff --git a/example/src/magSlideShowSource.h b/example/src/magSlideShowSource.h index 1e808ef..bfa6377 100644 --- a/example/src/magSlideShowSource.h +++ b/example/src/magSlideShowSource.h @@ -110,7 +110,7 @@ public: * already has a resizing option applied, that option will be respected and * this resizeOption will not be used. */ - magSlide::ResizeOptions resizeOption = magSlide::ResizeOptions::None; + magSlide::ResizeOptions resizeOption = magSlide::ResizeOptions::NoResize; }; ////////////////////////////////////////////