Update lunasvg to 2.3.8

Author: patrikjuvonen

vendor/lunasvg/3rdparty/plutovg/plutovg-blend.c

@@ -2,6 +2,7 @@
 
 #include <limits.h>
 #include <math.h>
+#include <float.h>
 
 #define COLOR_TABLE_SIZE 1024
 typedef struct {
@@ -243,6 +244,7 @@ static void fetch_radial_gradient(uint32_t* buffer, const radial_gradient_values
         while(buffer < end)
         {
             uint32_t result = 0;
+            det = fabs(det) < DBL_EPSILON ? 0.0 : det;
             if(det >= 0)
             {
                 double w = sqrt(det) - b;
@@ -261,7 +263,11 @@ static void fetch_radial_gradient(uint32_t* buffer, const radial_gradient_values
     {
         while(buffer < end)
         {
-            *buffer++ = gradient_pixel(gradient, sqrt(det) - b);
+            det = fabs(det) < DBL_EPSILON ? 0.0 : det;
+            uint32_t result = 0;
+            if (det >= 0)
+                result = gradient_pixel(gradient, sqrt(det) - b);
+            *buffer++ = result;
             det += delta_det;
             delta_det += delta_delta_det;
             b += delta_b;

vendor/lunasvg/3rdparty/plutovg/plutovg-ft-stroker.c

@@ -629,10 +629,12 @@ static void ft_stroke_border_export(PVG_FT_StrokeBorder border,
                                     PVG_FT_Outline*     outline)
 {
     /* copy point locations */
-    memcpy(outline->points + outline->n_points, border->points,
-           border->num_points * sizeof(PVG_FT_Vector));
+    if (outline->points != NULL && border->points != NULL)
+        memcpy(outline->points + outline->n_points, border->points,
+            border->num_points * sizeof(PVG_FT_Vector));
 
     /* copy tags */
+    if (outline->tags)
     {
         PVG_FT_UInt  count = border->num_points;
         PVG_FT_Byte* read = border->tags;
@@ -649,6 +651,7 @@ static void ft_stroke_border_export(PVG_FT_StrokeBorder border,
     }
 
     /* copy contours */
+    if (outline->contours)
     {
         PVG_FT_UInt   count = border->num_points;
         PVG_FT_Byte*  tags = border->tags;

vendor/lunasvg/3rdparty/plutovg/plutovg-rle.c

@@ -6,12 +6,13 @@
 #include <math.h>
 #include <limits.h>
 
+#define ALIGN_SIZE(size) (((size) + 7ul) & ~7ul)
 static void ft_outline_init(PVG_FT_Outline* outline, plutovg_t* pluto, int points, int contours)
 {
-    size_t size_a = (points + contours) * sizeof(PVG_FT_Vector);
-    size_t size_b = (points + contours) * sizeof(char);
-    size_t size_c = contours * sizeof(int);
-    size_t size_d = contours * sizeof(char);
+    size_t size_a = ALIGN_SIZE((points + contours) * sizeof(PVG_FT_Vector));
+    size_t size_b = ALIGN_SIZE((points + contours) * sizeof(char));
+    size_t size_c = ALIGN_SIZE(contours * sizeof(int));
+    size_t size_d = ALIGN_SIZE(contours * sizeof(char));
     size_t size_n = size_a + size_b + size_c + size_d;
     if(size_n > pluto->outline_size) {
         pluto->outline_data = realloc(pluto->outline_data, size_n);
@@ -20,9 +21,13 @@ static void ft_outline_init(PVG_FT_Outline* outline, plutovg_t* pluto, int point
 
     PVG_FT_Byte* data = pluto->outline_data;
     outline->points = (PVG_FT_Vector*)(data);
-    outline->tags = (char*)(data + size_a);
-    outline->contours = (int*)(data + size_a + size_b);
-    outline->contours_flag = (char*)(data + size_a + size_b + size_c);
+    outline->tags = outline->contours_flag = NULL;
+    outline->contours = NULL;
+    if(data){
+        outline->tags = (char*)(data + size_a);
+        outline->contours = (int*)(data + size_a + size_b);
+        outline->contours_flag = (char*)(data + size_a + size_b + size_c);
+    }
     outline->n_points = 0;
     outline->n_contours = 0;
     outline->flags = 0x0;

vendor/lunasvg/3rdparty/plutovg/plutovg.c

@@ -223,7 +223,7 @@ plutovg_texture_t* plutovg_set_texture(plutovg_t* pluto, plutovg_surface_t* surf
 {
     plutovg_paint_t* paint = &pluto->state->paint;
     paint->type = plutovg_paint_type_texture;
-    plutovg_texture_init(&paint->texture, surface, plutovg_texture_type_plain);
+    plutovg_texture_init(&paint->texture, surface, type);
     return &paint->texture;
 }
 

vendor/lunasvg/README.md

@@ -1,4 +1,4 @@
-[![Releases](https://img.shields.io/badge/Version-2.3.5-orange.svg)](https://github.com/sammycage/lunasvg/releases)
+[![Releases](https://img.shields.io/badge/Version-2.3.8-orange.svg)](https://github.com/sammycage/lunasvg/releases)
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sammycage/lunasvg/blob/master/LICENSE)
 [![Build Status](https://github.com/sammycage/lunasvg/actions/workflows/ci.yml/badge.svg)](https://github.com/sammycage/lunasvg/actions)
 

vendor/lunasvg/include/lunasvg.h

@@ -25,6 +25,7 @@
 
 #include <memory>
 #include <string>
+#include <cstdint>
 
 #if defined(_MSC_VER) && defined(LUNASVG_SHARED)
 #ifdef LUNASVG_EXPORT
@@ -41,8 +42,7 @@ namespace lunasvg {
 class Rect;
 class Matrix;
 
-class LUNASVG_API Box
-{
+class LUNASVG_API Box {
 public:
     Box() = default;
     Box(double x, double y, double w, double h);
@@ -60,8 +60,7 @@ class LUNASVG_API Box
 
 class Transform;
 
-class LUNASVG_API Matrix
-{
+class LUNASVG_API Matrix {
 public:
     Matrix() = default;
     Matrix(double a, double b, double c, double d, double e, double f);
@@ -98,8 +97,7 @@ class LUNASVG_API Matrix
     double f{0};
 };
 
-class LUNASVG_API Bitmap
-{
+class LUNASVG_API Bitmap {
 public:
     /**
      * @note Bitmap format is ARGB Premultiplied.
@@ -129,8 +127,7 @@ class LUNASVG_API Bitmap
 
 class LayoutSymbol;
 
-class LUNASVG_API Document
-{
+class LUNASVG_API Document {
 public:
     /**
      * @brief Creates a document from a file
@@ -208,6 +205,7 @@ class LUNASVG_API Document
     Bitmap renderToBitmap(std::uint32_t width = 0, std::uint32_t height = 0, std::uint32_t backgroundColor = 0x00000000) const;
 
     ~Document();
+
 private:
     Document();
 

vendor/lunasvg/source/canvas.cpp

@@ -149,11 +149,9 @@ void Canvas::luminance()
     auto height = plutovg_surface_get_height(surface);
     auto stride = plutovg_surface_get_stride(surface);
     auto data = plutovg_surface_get_data(surface);
-    for(int y = 0;y < height;y++)
-    {
+    for(int y = 0; y < height; y++) {
         auto pixels = reinterpret_cast<uint32_t*>(data + stride * y);
-        for(int x = 0;x < width;x++)
-        {
+        for(int x = 0; x < width; x++) {
             auto pixel = pixels[x];
             auto r = (pixel >> 16) & 0xFF;
             auto g = (pixel >> 8) & 0xFF;
@@ -229,8 +227,7 @@ static plutovg_texture_type_t to_plutovg_texture_type(TextureType type)
 
 static void to_plutovg_stops(plutovg_gradient_t* gradient, const GradientStops& stops)
 {
-    for(const auto& stop : stops)
-    {
+    for(const auto& stop : stops) {
         auto offset = std::get<0>(stop);
         auto& color = std::get<1>(stop);
         plutovg_gradient_add_stop_rgba(gradient, offset, color.red() / 255.0, color.green() / 255.0, color.blue() / 255.0, color.alpha() / 255.0);
@@ -241,8 +238,7 @@ void to_plutovg_path(plutovg_t* pluto, const Path& path)
 {
     PathIterator it(path);
     std::array<Point, 3> p;
-    while(!it.isDone())
-    {
+    while(!it.isDone()) {
         switch(it.currentSegment(p)) {
         case PathCommand::MoveTo:
             plutovg_move_to(pluto, p[0].x, p[0].y);

vendor/lunasvg/source/canvas.h

@@ -13,20 +13,17 @@ using GradientStops = std::vector<GradientStop>;
 
 using DashArray = std::vector<double>;
 
-struct DashData
-{
+struct DashData {
     DashArray array;
     double offset{0.0};
 };
 
-enum class TextureType
-{
+enum class TextureType {
     Plain,
     Tiled
 };
 
-enum class BlendMode
-{
+enum class BlendMode {
     Src,
     Src_Over,
     Dst_In,
@@ -35,8 +32,7 @@ enum class BlendMode
 
 class CanvasImpl;
 
-class Canvas
-{
+class Canvas {
 public:
     static std::shared_ptr<Canvas> create(unsigned char* data, unsigned int width, unsigned int height, unsigned int stride);
     static std::shared_ptr<Canvas> create(double x, double y, double width, double height);
@@ -61,6 +57,7 @@ class Canvas
     Rect box() const;
 
     ~Canvas();
+
 private:
     Canvas(unsigned char* data, int width, int height, int stride);
     Canvas(int x, int y, int width, int height);

vendor/lunasvg/source/clippathelement.h

@@ -7,8 +7,7 @@ namespace lunasvg {
 
 class LayoutClipPath;
 
-class ClipPathElement : public GraphicsElement
-{
+class ClipPathElement : public GraphicsElement {
 public:
     ClipPathElement();
 

vendor/lunasvg/source/defselement.h

@@ -5,8 +5,7 @@
 
 namespace lunasvg {
 
-class DefsElement : public GraphicsElement
-{
+class DefsElement : public GraphicsElement {
 public:
     DefsElement();