diff options
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 5 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/pdfximage.c | 43 |
2 files changed, 43 insertions, 5 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index da0f098053c..d6e70dabb3f 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2021-05-05 Akira Kakuto <kakuto@w32tex.org> + + * pdfximage.c: Support non-ascii TMP and TEMP to call + Ghostscript. + 2021-04-17 Akira Kakuto <kakuto@w32tex.org> * pkfont.c: Remove all changes in 2020-12-14 and recover the diff --git a/Build/source/texk/dvipdfm-x/pdfximage.c b/Build/source/texk/dvipdfm-x/pdfximage.c index 97b424f82df..01aed38913c 100644 --- a/Build/source/texk/dvipdfm-x/pdfximage.c +++ b/Build/source/texk/dvipdfm-x/pdfximage.c @@ -1092,7 +1092,11 @@ ps_include_page (pdf_ximage *ximage, const char *filename, load_options options) FILE *fp; int error = 0; struct stat stat_o, stat_t; - +#if defined(_WIN32) + char *utf8temp; + wchar_t *wtemp; + char *ftest; +#endif if (!distiller_template) { WARN("No image converter available for converting file \"%s\" to PDF format.", filename); WARN(">> Please check if you have 'D' option in config file."); @@ -1118,8 +1122,8 @@ ps_include_page (pdf_ximage *ximage, const char *filename, load_options options) #endif #if defined(_WIN32) -/* temp is always ASCII only. So fsyscp_stat() is not necessary for - * temp. However, filename can be non-ASCII UTF-8. +/* temp is always win32_codepage only. So fsyscp_stat() is not + * necessary for temp. However, filename can be non-ASCII UTF-8. */ if (dpx_conf.file.keep_cache != -1 && stat(temp, &stat_t)==0 && @@ -1142,16 +1146,39 @@ ps_include_page (pdf_ximage *ximage, const char *filename, load_options options) MESG("pdf_image>> %s\n", distiller_template); MESG("pdf_image>> ..."); } + +/* Support non-ascii TEMP and TMP on Windows to call Ghostscript */ +#if defined(_WIN32) + ftest = dpx_find_file(filename, "_pic_", ""); + if (ftest) { + wtemp = get_wstring_from_mbstring(win32_codepage, + temp, wtemp = NULL); + utf8temp = get_mbstring_from_wstring(file_system_codepage, + wtemp, utf8temp = NULL); + error = dpx_file_apply_filter(distiller_template, filename, + utf8temp, pdf_get_version()); + } else { + utf8name_failed = 1; + error = dpx_file_apply_filter(distiller_template, filename, + temp, pdf_get_version()); + utf8name_failed = 0; + } +#else error = dpx_file_apply_filter(distiller_template, filename, temp, pdf_get_version()); +#endif if (error) { WARN("Image format conversion for \"%s\" failed...", filename); dpx_delete_temp_file(temp, true); return error; } } - +#if defined(_WIN32) +/* Use a simple fopen() since temp is in win32_codepage */ + fp = fopen(temp, FOPEN_RBIN_MODE); +#else fp = MFOPEN(temp, FOPEN_RBIN_MODE); +#endif if (!fp) { WARN("Could not open conversion result \"%s\" for image \"%s\". Why?", temp, filename); dpx_delete_temp_file(temp, true); @@ -1162,7 +1189,13 @@ ps_include_page (pdf_ximage *ximage, const char *filename, load_options options) MFCLOSE(fp); /* See pdf_close_images for why we cannot delete temporary files here. */ - +#if defined(_WIN32) + if (ftest) { + RELEASE(utf8temp); + RELEASE(wtemp); + RELEASE(ftest); + } +#endif RELEASE(temp); if (error) { |