From 86e137664c7f045d73c1cff3adca63f3ef7690f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 5 Aug 2014 14:53:56 +0200 Subject: [PATCH] use trinary operator rather than || since c++ semantics for || is different --- src/text/collision.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/text/collision.cpp b/src/text/collision.cpp index 9ff67b715..0999b995d 100644 --- a/src/text/collision.cpp +++ b/src/text/collision.cpp @@ -126,7 +126,7 @@ float Collision::getPlacementScale(const GlyphBoxes &glyphs, float minPlacementS } float minScale = std::fmax(minPlacementScale, glyph.minScale); - float maxScale = glyph.maxScale || std::numeric_limits::infinity(); + float maxScale = glyph.maxScale != 0 ? glyph.maxScale : std::numeric_limits::infinity(); if (minScale >= maxScale) { continue; @@ -270,7 +270,7 @@ void Collision::insert(const GlyphBoxes &glyphs, const CollisionAnchor &anchor, const CollisionRect &bbox = glyph.hBox ? glyph.hBox.get() : glyph.box; const float minScale = util::max(placementScale, glyph.minScale); - const float maxScale = glyph.maxScale || std::numeric_limits::infinity(); + const float maxScale = glyph.maxScale != 0 ? glyph.maxScale : std::numeric_limits::infinity(); const Box bounds = getBox(anchor, bbox, minScale, maxScale);