tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use trinary operator rather than || since c++ semantics for || is different

Browse Source
This commit is contained in:
Konstantin Käfer
2014-08-05 14:53:56 +02:00
parent 3946437d87
commit 86e137664c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/text/collision.cpp
View File

@@ -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<float>::infinity();
float maxScale = glyph.maxScale != 0 ? glyph.maxScale : std::numeric_limits<float>::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<float>::infinity();
const float maxScale = glyph.maxScale != 0 ? glyph.maxScale : std::numeric_limits<float>::infinity();
const Box bounds = getBox(anchor, bbox, minScale, maxScale);