diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2024-03-12 10:26:55 +0200 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2024-03-13 09:12:50 +0200 |
| commit | 0d02568ff8bd59cd9be9f7e09a444e9cf6689ae2 (patch) | |
| tree | 122fe5b3e0f4ddb739602a0fbb218f7f27584920 /thirdparty/msdfgen/core/ShapeDistanceFinder.hpp | |
| parent | 22c20cea6e59a8a95585adb866c007a55c428806 (diff) | |
| download | redot-engine-0d02568ff8bd59cd9be9f7e09a444e9cf6689ae2.tar.gz | |
Update ICU and msdfgen.
Diffstat (limited to 'thirdparty/msdfgen/core/ShapeDistanceFinder.hpp')
| -rw-r--r-- | thirdparty/msdfgen/core/ShapeDistanceFinder.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/thirdparty/msdfgen/core/ShapeDistanceFinder.hpp b/thirdparty/msdfgen/core/ShapeDistanceFinder.hpp index 028738e5c3..07fb5cdc0e 100644 --- a/thirdparty/msdfgen/core/ShapeDistanceFinder.hpp +++ b/thirdparty/msdfgen/core/ShapeDistanceFinder.hpp @@ -9,7 +9,11 @@ ShapeDistanceFinder<ContourCombiner>::ShapeDistanceFinder(const Shape &shape) : template <class ContourCombiner> typename ShapeDistanceFinder<ContourCombiner>::DistanceType ShapeDistanceFinder<ContourCombiner>::distance(const Point2 &origin) { contourCombiner.reset(origin); - typename ContourCombiner::EdgeSelectorType::EdgeCache *edgeCache = &shapeEdgeCache[0]; +#ifdef MSDFGEN_USE_CPP11 + typename ContourCombiner::EdgeSelectorType::EdgeCache *edgeCache = shapeEdgeCache.data(); +#else + typename ContourCombiner::EdgeSelectorType::EdgeCache *edgeCache = shapeEdgeCache.empty() ? NULL : &shapeEdgeCache[0]; +#endif for (std::vector<Contour>::const_iterator contour = shape.contours.begin(); contour != shape.contours.end(); ++contour) { if (!contour->edges.empty()) { |