updated to latest trunk

(bzr r14876.2.4)

1 files changed, 11 insertions, 1 deletions

diff --git a/src/extension/internal/wpg-input.cpp b/src/extension/internal/wpg-input.cpp
index 54a14fc72..299614c94 100644
--- a/src/extension/internal/wpg-input.cpp
+++ b/src/extension/internal/wpg-input.cpp
@@ -81,7 +81,17 @@ namespace Internal {
 
 SPDocument *WpgInput::open(Inkscape::Extension::Input * /*mod*/, const gchar * uri)
 {
-    RVNGInputStream* input = new RVNGFileStream(uri);
+    #ifdef WIN32
+        // RVNGFileStream uses fopen() internally which unfortunately only uses ANSI encoding on Windows
+        // therefore attempt to convert uri to the system codepage
+        // even if this is not possible the alternate short (8.3) file name will be used if available
+        gchar * converted_uri = g_win32_locale_filename_from_utf8(uri);
+        RVNGInputStream* input = new RVNGFileStream(converted_uri);
+        g_free(converted_uri);
+    #else
+        RVNGInputStream* input = new RVNGFileStream(uri);
+    #endif
+
 #if WITH_LIBWPG03
     if (input->isStructured()) {
         RVNGInputStream* olestream = input->getSubStreamByName("PerfectOffice_MAIN");