diff options
Diffstat (limited to 'slideshow/source/engine/opengl/TransitionImpl.cxx')
| -rw-r--r-- | slideshow/source/engine/opengl/TransitionImpl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/opengl/TransitionImpl.cxx b/slideshow/source/engine/opengl/TransitionImpl.cxx index bb6557f4638f..927e0d72130d 100644 --- a/slideshow/source/engine/opengl/TransitionImpl.cxx +++ b/slideshow/source/engine/opengl/TransitionImpl.cxx @@ -1094,9 +1094,9 @@ float fdiv(int a, int b) glm::vec2 vec(float x, float y, float nx, float ny) { x = x < 0.0 ? 0.0 : x; - x = x > nx ? nx : x; + x = std::min(x, nx); y = y < 0.0 ? 0.0 : y; - y = y > ny ? ny : y; + y = std::min(y, ny); return glm::vec2(fdiv(x, nx), fdiv(y, ny)); } |