summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-01-05 22:16:43 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2020-01-05 22:16:43 +0000
commit9ab5b9f807ebbc30a5afe8b97e8caee7f57e809b (patch)
tree55854a7490a28af5c9f465f80eca30cc2c209710
parent8248c2a1559ee05d1ac8d108aa153efdbefc5559 (diff)
dvipng-1.17
git-svn-id: svn://tug.org/texlive/trunk@53328 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/README5
-rw-r--r--Build/source/texk/dvipng/ChangeLog6
-rw-r--r--Build/source/texk/dvipng/TLpatches/ChangeLog4
-rw-r--r--Build/source/texk/dvipng/TLpatches/TL-Changes6
-rwxr-xr-xBuild/source/texk/dvipng/configure22
-rw-r--r--Build/source/texk/dvipng/doc/dvipng.141
-rw-r--r--Build/source/texk/dvipng/doc/dvipng.texi8
-rw-r--r--Build/source/texk/dvipng/dvipng-src/ChangeLog26
-rw-r--r--Build/source/texk/dvipng/dvipng-src/RELEASE6
-rw-r--r--Build/source/texk/dvipng/dvipng-src/acinclude.m4104
-rw-r--r--Build/source/texk/dvipng/dvipng-src/color.c4
-rw-r--r--Build/source/texk/dvipng/dvipng-src/config.h.in3
-rw-r--r--Build/source/texk/dvipng/dvipng-src/configure.ac4
-rw-r--r--Build/source/texk/dvipng/dvipng-src/dvipng.12
-rw-r--r--Build/source/texk/dvipng/dvipng-src/dvipng.c4
-rw-r--r--Build/source/texk/dvipng/dvipng-src/dvipng.texi8
-rw-r--r--Build/source/texk/dvipng/dvipng-src/misc.c2
-rw-r--r--Build/source/texk/dvipng/dvipng-src/pk.c12
-rw-r--r--Build/source/texk/dvipng/version.ac2
19 files changed, 200 insertions, 69 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README
index 8a6bfbc8c0c..d62c910238f 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -56,9 +56,8 @@ dvipdfm-x - maintained here, by us, contains
xdvipdfmx
old info: http://project.ktug.org/dvipdfmx/
-dvipng 1.16 - checked 7apr19
- http://savannah.nongnu.org/files/?group=dvipng
- http://mirror.ctan.org/dviware/dvipng/ (but maybe stale)
+dvipng 1.17 - checked 06jan20
+ http://mirror.ctan.org/dviware/dvipng/
dvipos - maintained here, by us
diff --git a/Build/source/texk/dvipng/ChangeLog b/Build/source/texk/dvipng/ChangeLog
index 49e02efd2a8..9a334bbb25a 100644
--- a/Build/source/texk/dvipng/ChangeLog
+++ b/Build/source/texk/dvipng/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-06 Akira Kakuto <kakuto@w32tex.org>
+
+ * Import dvipng 1.17.
+
2019-04-07 Karl Berry <karl@freefriends.org>
* version.ac (dvipng_version): 1.16.
@@ -16,7 +20,7 @@
so we don't fail to realloc buffer if needed.
Report from Andy Nguyen of ETH Zurich, found using afl-fuzz.
-2016-02-23 Akira Kakuto <kakuto@kakuto.fuk.kindai.ac.jp>
+2016-02-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* Makefile.am, configure.ac: New convention.
diff --git a/Build/source/texk/dvipng/TLpatches/ChangeLog b/Build/source/texk/dvipng/TLpatches/ChangeLog
index 79c1f2a641c..cfcd3888816 100644
--- a/Build/source/texk/dvipng/TLpatches/ChangeLog
+++ b/Build/source/texk/dvipng/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2020-01-06 Akira Kakuto <kakuto@w32tex.org>
+
+ Import dvipng-1.17.
+
2019-04-07 Karl Berry <karl@freefriends.org>
* patch-02-const,
diff --git a/Build/source/texk/dvipng/TLpatches/TL-Changes b/Build/source/texk/dvipng/TLpatches/TL-Changes
index ea1584bb765..54d548f4d8b 100644
--- a/Build/source/texk/dvipng/TLpatches/TL-Changes
+++ b/Build/source/texk/dvipng/TLpatches/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the dvipng-1.16 tree as obtained from:
- http://savannah.nongnu.org/files/?group=dvipng
+Changes applied to the dvipng-1.17 tree as obtained from:
+ http://mirror.ctan.org/dviware/dvipng/
Removed:
configure
@@ -11,8 +11,8 @@ Created Autoconf macro files ../m4/gs-device.m4 and ../m4/makeinfo.m4
adapting code in aclocal.m4.
Copied these files to ../doc/:
+ dvipng.1
dvipng.texi
install.texi
macros.texi
readme.texi
-
diff --git a/Build/source/texk/dvipng/configure b/Build/source/texk/dvipng/configure
index 2723bffb844..28e2c65c420 100755
--- a/Build/source/texk/dvipng/configure
+++ b/Build/source/texk/dvipng/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvipng (TeX Live) 1.16.
+# Generated by GNU Autoconf 2.69 for dvipng (TeX Live) 1.17.
#
# Report bugs to <tex-k@tug.org>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dvipng (TeX Live)'
PACKAGE_TARNAME='dvipng--tex-live-'
-PACKAGE_VERSION='1.16'
-PACKAGE_STRING='dvipng (TeX Live) 1.16'
+PACKAGE_VERSION='1.17'
+PACKAGE_STRING='dvipng (TeX Live) 1.17'
PACKAGE_BUGREPORT='tex-k@tug.org'
PACKAGE_URL=''
@@ -1371,7 +1371,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 dvipng (TeX Live) 1.16 to adapt to many kinds of systems.
+\`configure' configures dvipng (TeX Live) 1.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1442,7 +1442,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dvipng (TeX Live) 1.16:";;
+ short | recursive ) echo "Configuration of dvipng (TeX Live) 1.17:";;
esac
cat <<\_ACEOF
@@ -1575,7 +1575,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dvipng (TeX Live) configure 1.16
+dvipng (TeX Live) configure 1.17
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2231,7 +2231,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 dvipng (TeX Live) $as_me 1.16, which was
+It was created by dvipng (TeX Live) $as_me 1.17, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -7922,7 +7922,7 @@ fi
# Define the identity of the package.
PACKAGE='dvipng--tex-live-'
- VERSION='1.16'
+ VERSION='1.17'
cat >>confdefs.h <<_ACEOF
@@ -15089,7 +15089,7 @@ Usage: $0 [OPTIONS]
Report bugs to <bug-libtool@gnu.org>."
lt_cl_version="\
-dvipng (TeX Live) config.lt 1.16
+dvipng (TeX Live) config.lt 1.17
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -17355,7 +17355,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 dvipng (TeX Live) $as_me 1.16, which was
+This file was extended by dvipng (TeX Live) $as_me 1.17, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17425,7 +17425,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="\\
-dvipng (TeX Live) config.status 1.16
+dvipng (TeX Live) config.status 1.17
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/texk/dvipng/doc/dvipng.1 b/Build/source/texk/dvipng/doc/dvipng.1
index d81d4fcbbb7..613912fea6d 100644
--- a/Build/source/texk/dvipng/doc/dvipng.1
+++ b/Build/source/texk/dvipng/doc/dvipng.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.27 (Pod::Simple 3.28)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -46,7 +46,7 @@
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-. if \nF \{
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{
-. nr % 0
-. nr F 2
-. \}
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
. \}
.\}
-.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -133,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "DVIPNG 1"
-.TH DVIPNG 1 "2015-03-03" "dvipng (TeX Live) 1.15" "User commands"
+.TH DVIPNG 1 "2020-01-05" "dvipng 1.17" "User commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -154,24 +150,24 @@ If \s-1GIF\s0 support is enabled, \s-1GIF\s0 output is chosen by using the
\&\fBdvigif\fR binary or with the \fB\-\-gif\fR option.
.PP
The benefits of \fBdvipng\fR/\fBdvigif\fR include
-.IP "\(bu" 4
+.IP "*" 4
Speed. It is a very fast bitmap-rendering code for \s-1DVI\s0 files, which
makes it suitable for generating large amounts of images on-the-fly,
as needed in preview-latex, WeBWorK and others.
-.IP "\(bu" 4
+.IP "*" 4
It does not read the postamble, so it can be started before TeX
finishes. There is a \fB\-\-follow\fR switch that makes dvipng wait at
end-of-file for further output, unless it finds the \s-1POST\s0 marker that
indicates the end of the \s-1DVI.\s0
-.IP "\(bu" 4
+.IP "*" 4
Interactive query of options. dvipng can read options interactively
through stdin, and all options are usable. It is even possible to change
the input file through this interface.
-.IP "\(bu" 4
+.IP "*" 4
Supports \s-1PK, VF,\s0 PostScript Type1, and TrueType fonts, subfonts (i.e.,
as used in CJK-LaTeX), color specials, and inclusion of PostScript,
\&\s-1PNG, JPEG\s0 or \s-1GIF\s0 images.
-.IP "\(bu" 4
+.IP "*" 4
and more...
.SH "OPTIONS"
.IX Header "OPTIONS"
@@ -295,7 +291,10 @@ for rendering the fonts. If you have PostScript versions of Computer
Modern installed, there will be no need to generate bitmapped (\s-1PK\s0)
variants on disk of these. Then, you can render images at different (and
unusual) resolutions without cluttering the disk with lots of bitmapped
-fonts.
+fonts.
+One reason to disable FreeType font rendering would be to generate
+identical output on different platforms, since FreeType uses the native
+renderer and therefore can give slightly different output on each platform.
.IP "\fB\-\-gamma\fR \fInum\fR" 4
.IX Item "--gamma num"
Control the interpolation of colors in the greyscale anti-aliasing
@@ -504,4 +503,4 @@ This program is released under the \s-1GNU\s0 Lesser General Public License
version 3, see the \s-1COPYING\s0 file in the dvipng distribution or
<\fBhttp://www.gnu.org/licenses/gpl.html\fR>.
.PP
-Copyright (c) 2002\-2015 Jan-AAke Larsson
+Copyright (c) 2002\-2015, 2019 Jan-AAke Larsson
diff --git a/Build/source/texk/dvipng/doc/dvipng.texi b/Build/source/texk/dvipng/doc/dvipng.texi
index b2f58ce5082..2b8e157bdc2 100644
--- a/Build/source/texk/dvipng/doc/dvipng.texi
+++ b/Build/source/texk/dvipng/doc/dvipng.texi
@@ -9,8 +9,8 @@ dvipng [options] [filename] -
@c man end
@end ifset
-@set version 1.16
-@set month-year April 2019
+@set version 1.17
+@set month-year January 2020
@c Put everything in one index (arbitrarily chosen to be the concept index).
@syncodeindex fn cp
@@ -39,7 +39,7 @@ dvipng [options] [filename] -
@author by Jan-@AA{}ke Larsson.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2002-2015, 2019 Jan-@AA{}ke Larsson
+Copyright @copyright{} 2002-2020 Jan-@AA{}ke Larsson
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -938,7 +938,7 @@ Georg Schwarz, Jason Farmer, Brian V. Smith, Samuel Hathaway, Thomas
R. Shemanske, Stephen Gibson, Christian Ridderstr@"om, Ezra Peisach,
William H Wheeler, Thomas Klausner, Harald Koenig, Adrian Bunk, Kevin
Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe,
-Waldeck Schutzer, and Andy Nguyen.
+Waldeck Schutzer, Ahzo, and Andy Nguyen.
@ifset man
@c man begin NOTES
diff --git a/Build/source/texk/dvipng/dvipng-src/ChangeLog b/Build/source/texk/dvipng/dvipng-src/ChangeLog
index c56830ebbf1..f30d538bda1 100644
--- a/Build/source/texk/dvipng/dvipng-src/ChangeLog
+++ b/Build/source/texk/dvipng/dvipng-src/ChangeLog
@@ -1,3 +1,27 @@
+2020-01-05 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Prepare for 1.17
+
+2019-11-29 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Fix typo that cause PK files to fail
+
+2019-07-03 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Fix format for gamma interactive printout. Add credit.
+
+2019-07-01 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Fix segfault when starting interactive mode without DVI. Thanks to Ahzo for finding the issue.
+
+2019-06-29 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Revert change for acinclude.m4, and add test for strncasecmp
+
+2019-06-27 Jan-Åke Larsson <jan-ake.larsson@liu.se>
+
+ Remove segfault for invalid color names
+
2019-04-06 Jan-Åke Larsson <jan-ake.larsson@liu.se>
Release 1.16
@@ -7,8 +31,6 @@
Check for a possible integer addition overflow
Check bounds for mmap access
Update copyright notice
- Check bounds for mmap access
- Update copyright notice
2019-02-26 Jan-Åke Larsson <jan-ake.larsson@liu.se>
diff --git a/Build/source/texk/dvipng/dvipng-src/RELEASE b/Build/source/texk/dvipng/dvipng-src/RELEASE
index 78b1de8a930..5417af0f867 100644
--- a/Build/source/texk/dvipng/dvipng-src/RELEASE
+++ b/Build/source/texk/dvipng/dvipng-src/RELEASE
@@ -1,12 +1,10 @@
-Release notes for version 1.16 of the dvipng package:
+Release notes for version 1.17 of the dvipng package:
This program makes PNG graphics from DVI files as obtained from TeX
and its relatives.
-This is a security release that adds checks for malignant font files.
-It also amends the build process, mostly to adjust for recent FreeType
-versions, and makes a few more small adjustments.
+This is a bugfix release that re-enables PK font rendering and enables gamma printout and interactive mode startup without DVI.
Report any bugs you find, see README for instructions.
diff --git a/Build/source/texk/dvipng/dvipng-src/acinclude.m4 b/Build/source/texk/dvipng/dvipng-src/acinclude.m4
new file mode 100644
index 00000000000..2bc2d6cd870
--- /dev/null
+++ b/Build/source/texk/dvipng/dvipng-src/acinclude.m4
@@ -0,0 +1,104 @@
+# acinclude.m4
+
+#************************************************************************
+#
+# Part of the dvipng distribution
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program. If not, see
+# <http://www.gnu.org/licenses/>.
+#
+# Copyright (C) 2002-2015,2019 Jan-Ã…ke Larsson
+#
+#************************************************************************
+
+
+dnl
+dnl MAKEINFO_CHECK_MACRO( MACRO, [ACTION-IF-FOUND
+dnl [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([MAKEINFO_CHECK_MACRO],
+[if test -n "$MAKEINFO" -a "$makeinfo" != ":"; then
+ AC_MSG_CHECKING([for @$1{}])
+ echo \\\\input texinfo > conftest.texi
+ echo @$1{test} >> conftest.texi
+ if $MAKEINFO conftest.texi > /dev/null 2> /dev/null; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ ifelse([$3], , :, [$3])
+ fi
+ rm -f conftest.texi conftest.info
+fi
+])
+
+dnl
+dnl MAKEINFO_CHECK_MACROS( MACRO ... [, ACTION-IF-FOUND
+dnl [, ACTION-IF-NOT-FOUND]])
+dnl
+AC_DEFUN([MAKEINFO_CHECK_MACROS],
+[for ac_macro in $1; do
+ MAKEINFO_CHECK_MACRO($ac_macro, $2,
+ [MAKEINFO_MACROS="-D no-$ac_macro $MAKEINFO_MACROS"
+ $3])dnl
+ done
+AC_SUBST(MAKEINFO_MACROS)
+])
+
+
+dnl
+dnl Check for enc, cmap, sfd formats
+dnl
+AC_DEFUN([AC_HAS_KPSE_ENC_FORMATS],
+ [AC_MSG_CHECKING([for kpse_enc_format])
+ AC_TRY_COMPILE([
+ #include <stdio.h>
+ #include <kpathsea/kpathsea.h>],
+ [kpse_enc_format;kpse_cmap_format;kpse_sfd_format],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_KPSE_ENC_FORMATS, 1,
+ [Define to 1 if your kpathsea has kpse_enc_format])],
+ [AC_MSG_RESULT(no)])])
+
+
+dnl
+dnl Check devices for GS
+dnl AC_GS_HAS_DEVICE(DEVICE,ACTION-IF-FAILED)
+dnl
+AC_DEFUN([AC_GS_HAS_DEVICE],
+ [AC_MSG_CHECKING([whether $GS has the $1 device])
+ if $GS -h | grep $1 >/dev/null; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ $2
+ fi
+])
+
+dnl
+dnl GS_CHECK_DEVICES
+dnl
+AC_DEFUN([GS_CHECK_DEVICES],
+ [GS_WARN=""
+ AC_GS_HAS_DEVICE(pngalpha,
+ [GS_WARN="Your EPS inclusions will be cropped to the
+ boundingbox, and rendered on an opaque background.
+ Upgrade GhostScript to avoid this."
+ AC_GS_HAS_DEVICE(png16m,
+ [GS_WARN="Your EPS inclusions may not work.
+ Upgrade/install GhostScript to avoid this."])])
+ if test -n "$GS_WARN"; then
+ AC_MSG_WARN([$GS_WARN])
+ fi
+])
diff --git a/Build/source/texk/dvipng/dvipng-src/color.c b/Build/source/texk/dvipng/dvipng-src/color.c
index 63fc29c6c57..76cb7004a4a 100644
--- a/Build/source/texk/dvipng/dvipng-src/color.c
+++ b/Build/source/texk/dvipng/dvipng-src/color.c
@@ -18,7 +18,7 @@
License along with this program. If not, see
<http://www.gnu.org/licenses/>.
- Copyright (C) 2002-2015 Jan-Åke Larsson
+ Copyright (C) 2002-2015,2019 Jan-Åke Larsson
************************************************************************/
@@ -355,7 +355,7 @@ void stringrgb(const char* color,int *r,int *g,int *b)
tmp=tmp->next;
}
}
- if (strcmp(color,tmp->name)==0) {
+ if (tmp!=NULL) {
/* Found: one-level recursion */
DEBUG_PRINT(DEBUG_COLOR,("\n ---RECURSION--- "))
stringrgb(tmp->color,r,g,b);
diff --git a/Build/source/texk/dvipng/dvipng-src/config.h.in b/Build/source/texk/dvipng/dvipng-src/config.h.in
index 4994405b5d0..a8ba47bb6e1 100644
--- a/Build/source/texk/dvipng/dvipng-src/config.h.in
+++ b/Build/source/texk/dvipng/dvipng-src/config.h.in
@@ -126,6 +126,9 @@
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
diff --git a/Build/source/texk/dvipng/dvipng-src/configure.ac b/Build/source/texk/dvipng/dvipng-src/configure.ac
index bcb86b74016..62e252deab5 100644
--- a/Build/source/texk/dvipng/dvipng-src/configure.ac
+++ b/Build/source/texk/dvipng/dvipng-src/configure.ac
@@ -18,12 +18,12 @@
# License along with this program. If not, see
# <http://www.gnu.org/licenses/>.
#
-# Copyright (C) 2002-2015 Jan-Åke Larsson
+# Copyright (C) 2002-2015,2019 Jan-Åke Larsson
#
#************************************************************************
# Process this file with autoconf to produce a configure script.
-AC_INIT([dvipng], [1.16], [dvipng@nongnu.org])
+AC_INIT([dvipng], [1.17], [dvipng@nongnu.org])
AC_CONFIG_SRCDIR([dvipng.c])
AC_ARG_ENABLE(debug,
diff --git a/Build/source/texk/dvipng/dvipng-src/dvipng.1 b/Build/source/texk/dvipng/dvipng-src/dvipng.1
index 3b4b57c72f5..613912fea6d 100644
--- a/Build/source/texk/dvipng/dvipng-src/dvipng.1
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.1
@@ -129,7 +129,7 @@
.\" ========================================================================
.\"
.IX Title "DVIPNG 1"
-.TH DVIPNG 1 "2019-04-07" "dvipng 1.16" "User commands"
+.TH DVIPNG 1 "2020-01-05" "dvipng 1.17" "User commands"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/Build/source/texk/dvipng/dvipng-src/dvipng.c b/Build/source/texk/dvipng/dvipng-src/dvipng.c
index fcd4ef62ad4..c71d1a26695 100644
--- a/Build/source/texk/dvipng/dvipng-src/dvipng.c
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.c
@@ -18,7 +18,7 @@
License along with this program. If not, see
<http://www.gnu.org/licenses/>.
- Copyright (C) 2002-2015 Jan-Åke Larsson
+ Copyright (C) 2002-2015,2019 Jan-Åke Larsson
************************************************************************/
@@ -103,7 +103,7 @@ int main(int argc, char ** argv)
InitPSFontMap();
#endif
- DrawPages();
+ if (dvi!=NULL) DrawPages();
if (parsestdin) {
char line[STRSIZE];
diff --git a/Build/source/texk/dvipng/dvipng-src/dvipng.texi b/Build/source/texk/dvipng/dvipng-src/dvipng.texi
index b2f58ce5082..2b8e157bdc2 100644
--- a/Build/source/texk/dvipng/dvipng-src/dvipng.texi
+++ b/Build/source/texk/dvipng/dvipng-src/dvipng.texi
@@ -9,8 +9,8 @@ dvipng [options] [filename] -
@c man end
@end ifset
-@set version 1.16
-@set month-year April 2019
+@set version 1.17
+@set month-year January 2020
@c Put everything in one index (arbitrarily chosen to be the concept index).
@syncodeindex fn cp
@@ -39,7 +39,7 @@ dvipng [options] [filename] -
@author by Jan-@AA{}ke Larsson.
@page
@vskip 0pt plus 1filll
-Copyright @copyright{} 2002-2015, 2019 Jan-@AA{}ke Larsson
+Copyright @copyright{} 2002-2020 Jan-@AA{}ke Larsson
Permission is granted to make and distribute verbatim copies of
this manual provided the copyright notice and this permission notice
@@ -938,7 +938,7 @@ Georg Schwarz, Jason Farmer, Brian V. Smith, Samuel Hathaway, Thomas
R. Shemanske, Stephen Gibson, Christian Ridderstr@"om, Ezra Peisach,
William H Wheeler, Thomas Klausner, Harald Koenig, Adrian Bunk, Kevin
Smith, Jason Riedy, Wolfram Krause, Reinhard Kotucha, Takeshi Abe,
-Waldeck Schutzer, and Andy Nguyen.
+Waldeck Schutzer, Ahzo, and Andy Nguyen.
@ifset man
@c man begin NOTES
diff --git a/Build/source/texk/dvipng/dvipng-src/misc.c b/Build/source/texk/dvipng/dvipng-src/misc.c
index 3d94099d447..01bd94d33a7 100644
--- a/Build/source/texk/dvipng/dvipng-src/misc.c
+++ b/Build/source/texk/dvipng/dvipng-src/misc.c
@@ -351,7 +351,7 @@ bool DecodeArgs(int argc, char ** argv)
gamma=DEFAULT_GAMMA;
}
Gamma(gamma);
- Message(PARSE_STDIN,"Gamma value is %s\n", gamma);
+ Message(PARSE_STDIN,"Gamma value is %f\n", gamma);
break;
#ifdef HAVE_GDIMAGEGIF
} else if (strncmp(p,"if",2)==0) { /* --gif output */
diff --git a/Build/source/texk/dvipng/dvipng-src/pk.c b/Build/source/texk/dvipng/dvipng-src/pk.c
index 29f5d6d5ede..4e0b0c0e1b1 100644
--- a/Build/source/texk/dvipng/dvipng-src/pk.c
+++ b/Build/source/texk/dvipng/dvipng-src/pk.c
@@ -358,20 +358,18 @@ void InitPK(struct font_entry * tfontp)
tcharptr->data = NULL;
tcharptr->tfmw = 0;
if ((*position & 7) == 7) {
- if (position < end - 9) Fatal("PK file %s ends prematurely",tfontp->name);
+ if (position >= end - 9) Fatal("PK file %s ends prematurely",tfontp->name);
packet_length = UNumRead(position+1,4);
c = UNumRead(position+5, 4);
position += 9;
} else if (*position & 4) {
- if (position < end - 4) Fatal("PK file %s ends prematurely",tfontp->name);
- packet_length = (*position & 3) * 65536l +
- UNumRead(position+1, 2);
+ if (position >= end - 4) Fatal("PK file %s ends prematurely",tfontp->name);
+ packet_length = (*position & 3) * 65536l + UNumRead(position+1, 2);
c = UNumRead(position+3, 1);
position += 4;
} else {
- if (position < end - 3) Fatal("PK file %s ends prematurely",tfontp->name);
- packet_length = (*position & 3) * 256 +
- UNumRead(position+1, 1);
+ if (position >= end - 3) Fatal("PK file %s ends prematurely",tfontp->name);
+ packet_length = (*position & 3) * 256 + UNumRead(position+1, 1);
c = UNumRead(position+2, 1);
position += 3;
}
diff --git a/Build/source/texk/dvipng/version.ac b/Build/source/texk/dvipng/version.ac
index bacb75a4fe7..63e89299a64 100644
--- a/Build/source/texk/dvipng/version.ac
+++ b/Build/source/texk/dvipng/version.ac
@@ -9,4 +9,4 @@ dnl
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current dvipng version
-m4_define([dvipng_version], [1.16])
+m4_define([dvipng_version], [1.17])