From d08ec87c34aeb917a62e8717a9a9ef2bd58cabe1 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 22 Nov 2025 11:11:24 +0300
Subject: [PATCH] nanosvgrast.h: update from mainstream
- Add missing NaN check in nsvg__clampf()
- Add missing call to nsvg__prepareStroke() in leftover
stroke path in nsvg__flattenShapeStroke()
TODO: merge the new paint order parsing stuff [1], too?
[1] https://github.com/memononen/nanosvg/commit/d55a1fe69b1c7f41cf555a7135d54761efb1e56b
---
src/IMG_svg.c | 1 +
src/nanosvgrast.h | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/IMG_svg.c b/src/IMG_svg.c
index cf7fe7f1..076e232a 100644
--- a/src/IMG_svg.c
+++ b/src/IMG_svg.c
@@ -64,6 +64,7 @@
#define sqrtf SDL_sqrtf
#define tanf SDL_tanf
#define roundf SDL_roundf
+#define isnan SDL_isnanf
#ifndef FLT_MAX
#define FLT_MAX 3.402823466e+38F
#endif
diff --git a/src/nanosvgrast.h b/src/nanosvgrast.h
index 9dca93fc..471ce7b4 100644
--- a/src/nanosvgrast.h
+++ b/src/nanosvgrast.h
@@ -840,8 +840,10 @@ static void nsvg__flattenShapeStroke(NSVGrasterizer* r, NSVGshape* shape, float
}
}
// Stroke any leftover path
- if (r->npoints > 1 && dashState)
+ if (r->npoints > 1 && dashState) {
+ nsvg__prepareStroke(r, miterLimit, lineJoin);
nsvg__expandStroke(r, r->points, r->npoints, 0, lineJoin, lineCap, lineWidth);
+ }
} else {
nsvg__prepareStroke(r, miterLimit, lineJoin);
nsvg__expandStroke(r, r->points, r->npoints, closed, lineJoin, lineCap, lineWidth);
@@ -962,7 +964,11 @@ static void nsvg__fillActiveEdges(unsigned char* scanline, int len, NSVGactiveEd
}
}
-static float nsvg__clampf(float a, float mn, float mx) { return a < mn ? mn : (a > mx ? mx : a); }
+static float nsvg__clampf(float a, float mn, float mx) {
+ if (isnan(a))
+ return mn;
+ return a < mn ? mn : (a > mx ? mx : a);
+}
static unsigned int nsvg__RGBA(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
{