diff options
| -rw-r--r-- | svg-flatten/src/nopencv.cpp | 12 | ||||
| m--------- | upstream/filesystem | 0 | ||||
| m--------- | upstream/minunit | 0 | ||||
| m--------- | upstream/pugixml | 0 | ||||
| m--------- | upstream/stb | 0 | ||||
| m--------- | upstream/subprocess.h | 0 | ||||
| m--------- | upstream/voronoi | 0 |
7 files changed, 7 insertions, 5 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 -Subproject cd6805e94dd5d6346be1b75a54cdc27787319dd +Subproject fcea331ebb8273581cef3e91a131e3d7877f7df diff --git a/upstream/minunit b/upstream/minunit -Subproject b15ad0ae28f1a7a43881ea17defb0a4367d9582 +Subproject a0586569bd8abfb7a37390d670484c201e9173b diff --git a/upstream/pugixml b/upstream/pugixml -Subproject 2639dfd053221d3e8c9e9ff013e58699d9c1af1 +Subproject 6909df2478f7eb092e8e5b5cda097616b2595cc diff --git a/upstream/stb b/upstream/stb -Subproject af1a5bc352164740c1cc1354942b1c6b72eacb8 +Subproject beebb24b945efdea3b9bba23affb8eb3ba8982e diff --git a/upstream/subprocess.h b/upstream/subprocess.h -Subproject d4d5c01ba9ffbb19fd552f8f3664691b44ff0ea +Subproject cf95c9615953c90177498aed43621cb1cbc8f3e diff --git a/upstream/voronoi b/upstream/voronoi -Subproject fc9ed1ce6661ccc73783ee9193fa77e8a673b83 +Subproject d9bfd6ce3ddb75b947e1fea2f9b522addc9d49d |