texlive[53338] Build/source/texk/dvipng: dvipng-1.17

[commits+kakuto at tug.org]

Revision: 53338
          http://tug.org/svn/texlive?view=revision&revision=53338
Author:   kakuto
Date:     2020-01-06 11:17:52 +0100 (Mon, 06 Jan 2020)
Log Message:
-----------
dvipng-1.17

Modified Paths:
--------------
    trunk/Build/source/texk/dvipng/ChangeLog
    trunk/Build/source/texk/dvipng/TLpatches/ChangeLog
    trunk/Build/source/texk/dvipng/dvipng-src/special.c

Added Paths:
-----------
    trunk/Build/source/texk/dvipng/TLpatches/patch-08-win32

Modified: trunk/Build/source/texk/dvipng/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipng/ChangeLog	2020-01-06 02:34:31 UTC (rev 53337)
+++ trunk/Build/source/texk/dvipng/ChangeLog	2020-01-06 10:17:52 UTC (rev 53338)
@@ -1,5 +1,6 @@
 2020-01-06  Akira Kakuto  <kakuto at w32tex.org>
 
+	* version.ac (dvipng_version): 1.17.
 	* Import dvipng 1.17.
 
 2019-04-07  Karl Berry  <karl at freefriends.org>

Modified: trunk/Build/source/texk/dvipng/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipng/TLpatches/ChangeLog	2020-01-06 02:34:31 UTC (rev 53337)
+++ trunk/Build/source/texk/dvipng/TLpatches/ChangeLog	2020-01-06 10:17:52 UTC (rev 53338)
@@ -1,6 +1,8 @@
 2020-01-06  Akira Kakuto  <kakuto at w32tex.org>
 
 	Import dvipng-1.17.
+	* patch-08-win32: add to support non-ascii image file names
+	on Windows (Windows only).
 
 2019-04-07  Karl Berry  <karl at freefriends.org>
 

Added: trunk/Build/source/texk/dvipng/TLpatches/patch-08-win32
===================================================================
--- trunk/Build/source/texk/dvipng/TLpatches/patch-08-win32	                        (rev 0)
+++ trunk/Build/source/texk/dvipng/TLpatches/patch-08-win32	2020-01-06 10:17:52 UTC (rev 53338)
@@ -0,0 +1,28 @@
+--- special.c.orig	Fri Aug 31 16:39:04 2018
++++ special.c	Mon Jan 06 18:53:34 2020
+@@ -492,6 +492,25 @@
+ 
+       PSCodeInit(&image, NULL);
+       image.filename=kpse_find_file(psname,kpse_pict_format,0);
++#if !defined(MIKTEX) && defined(WIN32)
++      if (image.filename == NULL) {
++        wchar_t *wnam;
++        char *tmpnam;
++        int tmpcp;
++        tmpcp = file_system_codepage;
++        file_system_codepage = CP_UTF8;
++        tmpnam = kpse_find_file(psname,kpse_pict_format,0);
++        if (tmpnam) {
++          wnam = get_wstring_from_mbstring(CP_UTF8, tmpnam, wnam=NULL);
++          if (wnam) {
++            image.filename = get_mbstring_from_wstring(tmpcp, wnam, image.filename=NULL);
++            free(wnam);
++          }
++          free(tmpnam);
++        }
++        file_system_codepage = tmpcp;
++      }
++#endif
+       if (MmapFile(image.filename,&(image.fmmap)) || image.fmmap.size==0) {
+ 	Warning("Image file %s unusable, image will be left blank",
+ 		image.filename);

Modified: trunk/Build/source/texk/dvipng/dvipng-src/special.c
===================================================================
--- trunk/Build/source/texk/dvipng/dvipng-src/special.c	2020-01-06 02:34:31 UTC (rev 53337)
+++ trunk/Build/source/texk/dvipng/dvipng-src/special.c	2020-01-06 10:17:52 UTC (rev 53338)
@@ -492,6 +492,25 @@
 
       PSCodeInit(&image, NULL);
       image.filename=kpse_find_file(psname,kpse_pict_format,0);
+#if !defined(MIKTEX) && defined(WIN32)
+      if (image.filename == NULL) {
+        wchar_t *wnam;
+        char *tmpnam;
+        int tmpcp;
+        tmpcp = file_system_codepage;
+        file_system_codepage = CP_UTF8;
+        tmpnam = kpse_find_file(psname,kpse_pict_format,0);
+        if (tmpnam) {
+          wnam = get_wstring_from_mbstring(CP_UTF8, tmpnam, wnam=NULL);
+          if (wnam) {
+            image.filename = get_mbstring_from_wstring(tmpcp, wnam, image.filename=NULL);
+            free(wnam);
+          }
+          free(tmpnam);
+        }
+        file_system_codepage = tmpcp;
+      }
+#endif
       if (MmapFile(image.filename,&(image.fmmap)) || image.fmmap.size==0) {
 	Warning("Image file %s unusable, image will be left blank",
 		image.filename);