Commit df24468f authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Martin Nordholts

Bug 544560 - Loading PDF file fails if its path contains non-ascii characters

Use poppler_document_new_from_data() instead of
poppler_document_new_from_file() to work around filename encoding
parent 1ca7c6df
...@@ -526,28 +526,34 @@ open_document (const gchar *filename, ...@@ -526,28 +526,34 @@ open_document (const gchar *filename,
GError **load_error) GError **load_error)
{ {
PopplerDocument *doc; PopplerDocument *doc;
gchar *uri; GMappedFile *mapped_file;
GError *error = NULL; GError *error = NULL;
uri = g_filename_to_uri (filename, NULL, &error); mapped_file = g_mapped_file_new (filename, FALSE, &error);
if (! uri) if (! mapped_file)
{ {
g_set_error (load_error, 0, 0, g_set_error (load_error, 0, 0,
"Could not convert '%s' to an URI: %s", "Could not load '%s' %s",
gimp_filename_to_utf8 (filename), error->message); gimp_filename_to_utf8 (filename), error->message);
g_error_free (error); g_error_free (error);
return NULL; return NULL;
} }
doc = poppler_document_new_from_file (uri, NULL, &error); doc = poppler_document_new_from_data (g_mapped_file_get_contents (mapped_file),
g_mapped_file_get_length (mapped_file),
g_free (uri); /* We can't g_mapped_file_unref(mapped_file) as apparently doc has
* references to data in there. No big deal, this is just a
* short-lived plug-in.
if (! doc) if (! doc)
{ {
g_set_error (load_error, G_FILE_ERROR, G_FILE_ERROR_FAILED, g_set_error (load_error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
_("Could not open '%s' for reading: %s"), _("Could not load '%s': %s"),
gimp_filename_to_utf8 (filename), gimp_filename_to_utf8 (filename),
error->message); error->message);
g_error_free (error); g_error_free (error);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment