From 4d711a2fe85e5ebe814e4d12cd41badda1e7a046 Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Thu, 26 Oct 2023 00:23:16 +0200
Subject: Update all svg-flatten dependencies

---
 svg-flatten/src/nopencv.cpp | 12 +++++++-----
 upstream/filesystem         |  2 +-
 upstream/minunit            |  2 +-
 upstream/pugixml            |  2 +-
 upstream/stb                |  2 +-
 upstream/subprocess.h       |  2 +-
 upstream/voronoi            |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/svg-flatten/src/nopencv.cpp b/svg-flatten/src/nopencv.cpp
index e157ab5..e5317f5 100644
--- a/svg-flatten/src/nopencv.cpp
+++ b/svg-flatten/src/nopencv.cpp
@@ -9,7 +9,7 @@
 #include <stb_image.h>
 
 #define STB_IMAGE_RESIZE_IMPLEMENTATION
-#include <stb_image_resize.h>
+#include <stb_image_resize2.h>
 
 #define IIR_GAUSS_BLUR_IMPLEMENTATION
 #include "iir_gauss_blur.h"
@@ -574,22 +574,24 @@ template<>
 void gerbolyze::nopencv::Image<float>::resize(int new_w, int new_h) {
     float *old_data = m_data;
     m_data = new float[new_w * new_h];
-    stbir_resize_float(old_data, m_cols, m_rows, 0,
+    stbir_resize_float_linear(old_data, m_cols, m_rows, 0,
                         m_data, new_w, new_h, 0,
-                        1);
+                        STBIR_1CHANNEL);
     m_cols = new_w;
     m_rows = new_h;
+    delete old_data;
 }
 
 template<>
 void gerbolyze::nopencv::Image<uint8_t>::resize(int new_w, int new_h) {
     uint8_t *old_data = m_data;
     m_data = new uint8_t[new_w * new_h];
-    stbir_resize_uint8(old_data, m_cols, m_rows, 0,
+    stbir_resize_uint8_linear(old_data, m_cols, m_rows, 0,
                         m_data, new_w, new_h, 0,
-                        1);
+                        STBIR_1CHANNEL);
     m_cols = new_w;
     m_rows = new_h;
+    delete old_data;
 }
 
 template gerbolyze::nopencv::Image<int32_t>::Image(int size_x, int size_y, const int32_t *data);
diff --git a/upstream/filesystem b/upstream/filesystem
index cd6805e..fcea331 160000
--- a/upstream/filesystem
+++ b/upstream/filesystem
@@ -1 +1 @@
-Subproject commit cd6805e94dd5d6346be1b75a54cdc27787319dd2
+Subproject commit fcea331ebb8273581cef3e91a131e3d7877f7dfd
diff --git a/upstream/minunit b/upstream/minunit
index b15ad0a..a058656 160000
--- a/upstream/minunit
+++ b/upstream/minunit
@@ -1 +1 @@
-Subproject commit b15ad0ae28f1a7a43881ea17defb0a4367d9582d
+Subproject commit a0586569bd8abfb7a37390d670484c201e9173bf
diff --git a/upstream/pugixml b/upstream/pugixml
index 2639dfd..6909df2 160000
--- a/upstream/pugixml
+++ b/upstream/pugixml
@@ -1 +1 @@
-Subproject commit 2639dfd053221d3e8c9e9ff013e58699d9c1af15
+Subproject commit 6909df2478f7eb092e8e5b5cda097616b2595cc6
diff --git a/upstream/stb b/upstream/stb
index af1a5bc..beebb24 160000
--- a/upstream/stb
+++ b/upstream/stb
@@ -1 +1 @@
-Subproject commit af1a5bc352164740c1cc1354942b1c6b72eacb8a
+Subproject commit beebb24b945efdea3b9bba23affb8eb3ba8982e7
diff --git a/upstream/subprocess.h b/upstream/subprocess.h
index d4d5c01..cf95c96 160000
--- a/upstream/subprocess.h
+++ b/upstream/subprocess.h
@@ -1 +1 @@
-Subproject commit d4d5c01ba9ffbb19fd552f8f3664691b44ff0ea0
+Subproject commit cf95c9615953c90177498aed43621cb1cbc8f3e1
diff --git a/upstream/voronoi b/upstream/voronoi
index fc9ed1c..d9bfd6c 160000
--- a/upstream/voronoi
+++ b/upstream/voronoi
@@ -1 +1 @@
-Subproject commit fc9ed1ce6661ccc73783ee9193fa77e8a673b839
+Subproject commit d9bfd6ce3ddb75b947e1fea2f9b522addc9d49df
-- 
cgit