Browse Source

Rename ResizeOption enum item to play nice with GCC

master
c-mendoza 8 years ago
parent
commit
be6f2602c0
  1. 8
      example/src/magSlide.h
  2. 2
      example/src/magSlideShowSource.cpp
  3. 2
      example/src/magSlideShowSource.h

8
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<magSlideTransition> buildIn = nullptr;
std::shared_ptr<magSlideTransition> buildOut = nullptr;

2
example/src/magSlideShowSource.cpp

@ -203,7 +203,7 @@ void magSlideShowSource::addSlide(std::shared_ptr<magSlide> 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;
}

2
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;
};
////////////////////////////////////////////

Loading…
Cancel
Save