Bug 705931: Avoid double encoding filenames with gs under gpdl.

When the postscript interpreter is run by itself, it has to
cope with decoding arguments supplied on the command line
into our internal format of utf8. For windows, this means
that it has to cope with converting from 'local' encoding to
utf8.

When we run gs under gpdl this decoding is done under the
pl level, so it's important that gs does not do such decoding
otherwise it will 'double decode'. Accordingly, disable the
decoding in the psitop.c layer.

1 files changed, 7 insertions, 0 deletions

diff --git a/gpdl/psitop.c b/gpdl/psitop.c
index 7f6a0e3c6..94dfa2a8b 100644
--- a/gpdl/psitop.c
+++ b/gpdl/psitop.c
@@ -344,6 +344,13 @@ ps_impl_allocate_interp_instance(pl_interp_implementation_t *impl, gs_memory_t *
         return code;
     }
 
+    /* The above call to psapi_new_instance will have set the ps interpreter
+     * to expect 'local' encoding. When running under PL, this means we'll
+     * end up decoding the input stuff to utf8, and then feed that into the
+     * gs instance, where it will decode it again! Avoid this, by setting
+     * gs to expect UTF8 input. */
+    psapi_set_arg_encoding(psi->psapi_instance, PS_ARG_ENCODING_UTF8);
+
     impl->interp_client_data = psi;
 
     /* Tell gs not to ignore a UEL, but do an interpreter exit */