From b6b34d538398f8214daa5b160f764dc8b82ff9c5 Mon Sep 17 00:00:00 2001 From: Muhammet Kara Date: Mon, 30 May 2016 17:20:50 +0300 Subject: Clarify calculation precedence tdf#39440 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use parentheses to clarify the code. Change-Id: I864dc6dacadb5b9ba9dca8e0abd9fa4e6db1eddc Reviewed-on: https://gerrit.libreoffice.org/25677 Tested-by: Jenkins Reviewed-by: jan iversen Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'slideshow') diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx index 6b7cd6011dc2..cd43fedac4a3 100644 --- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx +++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx @@ -2186,7 +2186,7 @@ std::shared_ptr makeHoneycomb() Primitive aHexagon; for (int y = 0; y < NY+2; y+=2) for (int x = 0; x < NX+2; x+=2) - aHexagon.pushTriangle(glm::vec2(y % 4 ? fdiv(x, NX) : fdiv(x + 1, NX), fdiv(y, NY)), glm::vec2(1, 0), glm::vec2(0, 0)); + aHexagon.pushTriangle(glm::vec2((y % 4) ? fdiv(x, NX) : fdiv(x + 1, NX), fdiv(y, NY)), glm::vec2(1, 0), glm::vec2(0, 0)); aSlide.push_back(aHexagon); return makeHoneycombTransition(aSlide, aSlide, aSettings); -- cgit