Fix a bug in inline PS code handling (S. Hirata)

git-svn-id: svn://tug.org/texlive/trunk@48853 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 38 insertions, 43 deletions

diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog
index 07ac818ab04..310a8fc0f87 100644
--- a/Build/source/texk/dvipdfm-x/ChangeLog
+++ b/Build/source/texk/dvipdfm-x/ChangeLog
@@ -1,3 +1,10 @@
+2018-10-08  Shunsaku Hirata  <shunsaku.hirata74@gmail.com>
+
+	* mpost.c: Fix a bug in inline PS code handling.
+	* dpxfile.c, pdfencrypt.c, type0.c: Avoid compiler warnings.
+	* pdfobj.c: Fix a bug in (unused) TIFF predictor code.
+	* configure.ac: Version 20181008.
+
 2018-10-07  Simon Cozens  <simon@simon-cozens.org>
 
 	* pdfobj.c: Clear static variables to allow PDF funcfions to
diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure
index 3f0871d7980..8aa9df2c384 100755
--- a/Build/source/texk/dvipdfm-x/configure
+++ b/Build/source/texk/dvipdfm-x/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20181002.
+# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20181008.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dvipdfm-x (TeX Live)'
 PACKAGE_TARNAME='dvipdfm-x--tex-live-'
-PACKAGE_VERSION='20181002'
-PACKAGE_STRING='dvipdfm-x (TeX Live) 20181002'
+PACKAGE_VERSION='20181008'
+PACKAGE_STRING='dvipdfm-x (TeX Live) 20181008'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dvipdfm-x (TeX Live) 20181002 to adapt to many kinds of systems.
+\`configure' configures dvipdfm-x (TeX Live) 20181008 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1421,7 +1421,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20181002:";;
+     short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20181008:";;
    esac
   cat <<\_ACEOF
 
@@ -1551,7 +1551,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvipdfm-x (TeX Live) configure 20181002
+dvipdfm-x (TeX Live) configure 20181008
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2390,7 +2390,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvipdfm-x (TeX Live) $as_me 20181002, which was
+It was created by dvipdfm-x (TeX Live) $as_me 20181008, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8075,7 +8075,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20181002'
+ VERSION='20181008'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14744,7 +14744,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-dvipdfm-x (TeX Live) config.lt 20181002
+dvipdfm-x (TeX Live) config.lt 20181008
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16624,7 +16624,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvipdfm-x (TeX Live) $as_me 20181002, which was
+This file was extended by dvipdfm-x (TeX Live) $as_me 20181008, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16694,7 +16694,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvipdfm-x (TeX Live) config.status 20181002
+dvipdfm-x (TeX Live) config.status 20181008
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/dvipdfm-x/configure.ac b/Build/source/texk/dvipdfm-x/configure.ac
index ff5b8b53cfe..95d4752ccf8 100644
--- a/Build/source/texk/dvipdfm-x/configure.ac
+++ b/Build/source/texk/dvipdfm-x/configure.ac
@@ -7,7 +7,7 @@ dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20181002], [tex-k@tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20181008], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
diff --git a/Build/source/texk/dvipdfm-x/dpxfile.c b/Build/source/texk/dvipdfm-x/dpxfile.c
index 856422cc1f5..e6f87125ce4 100644
--- a/Build/source/texk/dvipdfm-x/dpxfile.c
+++ b/Build/source/texk/dvipdfm-x/dpxfile.c
@@ -1050,7 +1050,7 @@ if ((l) + (n) >= (m)) { \
         }
         break;
       case  'v': /* Version number, e.g. 1.4 */ {
-       char buf[6];
+       char buf[256];
        sprintf(buf, "%d.%d", version/10, version%10);
        need(cmd, n, size, strlen(buf));
        strcpy(cmd + n, buf);  n += strlen(buf);
diff --git a/Build/source/texk/dvipdfm-x/mpost.c b/Build/source/texk/dvipdfm-x/mpost.c
index f583de88308..a809e53eaaa 100644
--- a/Build/source/texk/dvipdfm-x/mpost.c
+++ b/Build/source/texk/dvipdfm-x/mpost.c
@@ -199,7 +199,7 @@ restore_font (void)
 static void
 clear_fonts (void)
 {
-  while (currentfont >= 0) {
+  while (currentfont > 0) {
     clear_mp_font_struct(&font_stack[currentfont]);
     currentfont--;
   }
diff --git a/Build/source/texk/dvipdfm-x/pdfencrypt.c b/Build/source/texk/dvipdfm-x/pdfencrypt.c
index 7a7f7bff63c..229d7d554ac 100644
--- a/Build/source/texk/dvipdfm-x/pdfencrypt.c
+++ b/Build/source/texk/dvipdfm-x/pdfencrypt.c
@@ -98,13 +98,13 @@ pdf_enc_compute_id_string (const char *producer,
   MD5_init(&md5);
   /* Don't use timezone for compatibility */
   dpx_util_format_asn_date(datestr, 0);
-  MD5_write(&md5, (unsigned char *)datestr, strlen(datestr));
+  MD5_write(&md5, (const unsigned char *)datestr, strlen(datestr));
   if (producer)
-    MD5_write(&md5, (unsigned char *)producer, strlen(producer));
+    MD5_write(&md5, (const unsigned char *)producer, strlen(producer));
   if (dviname)
-    MD5_write(&md5, (unsigned char *)dviname, strlen(dviname));
+    MD5_write(&md5, (const unsigned char *)dviname, strlen(dviname));
   if (pdfname)
-    MD5_write(&md5, (unsigned char *)pdfname, strlen(pdfname));
+    MD5_write(&md5, (const unsigned char *)pdfname, strlen(pdfname));
   MD5_final(p->ID, &md5);
 }
 
@@ -284,17 +284,20 @@ compute_hash_V5 (unsigned char       *hash,
                  const unsigned char *salt,
                  const unsigned char *user_key, int R /* revision */)
 {
-  SHA256_CONTEXT sha;
   unsigned char  K[64];
   size_t         K_len;
   int            nround;
 
-  SHA256_init (&sha);
-  SHA256_write(&sha, (const unsigned char *)passwd, strlen(passwd));
-  SHA256_write(&sha, salt, 8);
-  if (user_key)
-    SHA256_write(&sha, user_key, 48);
-  SHA256_final(hash, &sha);
+  {
+    SHA256_CONTEXT sha;
+
+    SHA256_init (&sha);
+    SHA256_write(&sha, (const unsigned char *)passwd, strlen(passwd));
+    SHA256_write(&sha, salt, 8);
+    if (user_key)
+      SHA256_write(&sha, user_key, 48);
+    SHA256_final(hash, &sha);
+  }
 
   ASSERT( R ==5 || R == 6 );
 
diff --git a/Build/source/texk/dvipdfm-x/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c
index f544cb90f62..a09bb2a41b8 100644
--- a/Build/source/texk/dvipdfm-x/pdfobj.c
+++ b/Build/source/texk/dvipdfm-x/pdfobj.c
@@ -1823,20 +1823,6 @@ filter_PNG15_apply_filter (unsigned char *raster,
   return  dst;
 }
 
-/* TIFF predictor filter support
- *
- * Many PDF viewers seems to have broken TIFF 2 predictor support?
- * Ony GhostScript and MuPDF render 4bpc grayscale image with TIFF 2 predictor
- * filter applied correctly.
- *
- *  Acrobat Reader DC  2015.007.20033  NG
- *  Adobe Acrobat X    10.1.13         NG
- *  Foxit Reader       4.1.5.425       NG
- *  GhostScript        9.16            OK
- *  SumatraPDF(MuPDF)  v3.0            OK
- *  Evince(poppler)    2.32.0.145      NG (1bit and 4bit broken)
- */
-
 /* This modifies "raster" itself! */
 static void
 apply_filter_TIFF2_1_2_4 (unsigned char *raster,
@@ -1890,13 +1876,14 @@ apply_filter_TIFF2_1_2_4 (unsigned char *raster,
         }
       }
     }
-    if (outbits > 0)
+    if (outbits > 0) {
       raster[k] = (outbuf << (8 - outbits)); k++;
+    }
   }
   RELEASE(prev);
 }
 
-unsigned char *
+static unsigned char *
 filter_TIFF2_apply_filter (unsigned char *raster,
                            int32_t columns, int32_t rows,
                            int8_t bpc, int8_t colors, int32_t *length)
diff --git a/Build/source/texk/dvipdfm-x/type0.c b/Build/source/texk/dvipdfm-x/type0.c
index 28fe907127f..2ec4ed28908 100644
--- a/Build/source/texk/dvipdfm-x/type0.c
+++ b/Build/source/texk/dvipdfm-x/type0.c
@@ -221,7 +221,6 @@ Type0Font_attach_ToUnicode_stream (Type0Font *font)
     case CIDFONT_TYPE2:
     /* PLEASE FIX THIS */
       {
-        CIDFont *cidfont = font->descendant;
         tounicode = otf_create_ToUnicode_stream(CIDFont_get_ident(cidfont),
                                                 CIDFont_get_opt_index(cidfont),
                                                 CIDFont_get_fontname(cidfont),
@@ -230,7 +229,6 @@ Type0Font_attach_ToUnicode_stream (Type0Font *font)
       break;
     default:
       if (CIDFont_get_flag(cidfont, CIDFONT_FLAG_TYPE1C)) {
-        CIDFont *cidfont = font->descendant;
         tounicode = otf_create_ToUnicode_stream(CIDFont_get_ident(cidfont),
                                                 CIDFont_get_opt_index(cidfont),
                                                 CIDFont_get_fontname(cidfont),