From 46eafca0eb7538a43ece7db46736dceb334fdfcb Mon Sep 17 00:00:00 2001
From: Enrico Turri <enricoturri@seznam.cz>
Date: Wed, 27 Mar 2019 15:42:01 +0100
Subject: [PATCH] Follow-up of
 https://github.com/prusa3d/Slic3r/commit/8ea8eb67e46b019febcbf5c77f5f4e9786aab57e,
 utf-8 path conversion moved into nanosvg library

---
 src/nanosvg/nanosvg.h        | 6 ++++--
 src/slic3r/GUI/GLTexture.cpp | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/nanosvg/nanosvg.h b/src/nanosvg/nanosvg.h
index 8c8b061cd1..b9063213e0 100644
--- a/src/nanosvg/nanosvg.h
+++ b/src/nanosvg/nanosvg.h
@@ -2897,6 +2897,8 @@ NSVGimage* nsvgParse(char* input, const char* units, float dpi)
 	return ret;
 }
 
+#include <boost/nowide/cstdio.hpp>
+
 NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 {
 	FILE* fp = NULL;
@@ -2904,8 +2906,8 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi)
 	char* data = NULL;
 	NSVGimage* image = NULL;
 
-	fp = fopen(filename, "rb");
-	if (!fp) goto error;
+    fp = boost::nowide::fopen(filename, "rb");
+    if (!fp) goto error;
 	fseek(fp, 0, SEEK_END);
 	size = ftell(fp);
 	fseek(fp, 0, SEEK_SET);
diff --git a/src/slic3r/GUI/GLTexture.cpp b/src/slic3r/GUI/GLTexture.cpp
index c1a0357544..b48ca20448 100644
--- a/src/slic3r/GUI/GLTexture.cpp
+++ b/src/slic3r/GUI/GLTexture.cpp
@@ -108,7 +108,7 @@ bool GLTexture::load_from_svg_files_as_sprites_array(const std::vector<std::stri
         if (!boost::algorithm::iends_with(filename, ".svg"))
             continue;
 
-        NSVGimage* image = nsvgParseFromFile(encode_path(filename.c_str()).c_str(), "px", 96.0f);
+        NSVGimage* image = nsvgParseFromFile(filename.c_str(), "px", 96.0f);
         if (image == nullptr)
             continue;
 
@@ -361,7 +361,7 @@ bool GLTexture::load_from_png(const std::string& filename, bool use_mipmaps)
 
 bool GLTexture::load_from_svg(const std::string& filename, bool use_mipmaps, unsigned int max_size_px)
 {
-    NSVGimage* image = nsvgParseFromFile(encode_path(filename.c_str()).c_str(), "px", 96.0f);
+    NSVGimage* image = nsvgParseFromFile(filename.c_str(), "px", 96.0f);
     if (image == nullptr)
     {
 //        printf("Could not open SVG image.\n");