From 14dafc8d65c0e21fd9ea523c74d6d7a265edcb18 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 4 Sep 2020 21:36:59 +0000 Subject: change operation to resource dict. (S. Hirata) git-svn-id: svn://tug.org/texlive/trunk@56265 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/dvipdfm-x/ChangeLog | 8 ++++++++ Build/source/texk/dvipdfm-x/configure | 22 +++++++++++----------- Build/source/texk/dvipdfm-x/configure.ac | 2 +- Build/source/texk/dvipdfm-x/spc_pdfm.c | 14 ++++++++++++++ 4 files changed, 34 insertions(+), 12 deletions(-) diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index bc8925b18a8..f4197108dbd 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,11 @@ +2020-09-05 Shunsaku Hirata + + * spc_pdfm.c: Workaround for an issue that occurs when an + indirect object (object reference) is used for a resource + dictionary entry in pdf:put command. The content of an already + existing resource dictionary is copied to the new dictionary. + * configure.ac: Version 20200905. + 2020-09-02 Shunsaku Hirata * pdfnames.c: Fix an incompatible behavior introduced by the diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 01cb68dfe1e..f2025851e08 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) 20200902. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20200905. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dvipdfm-x (TeX Live)' PACKAGE_TARNAME='dvipdfm-x--tex-live-' -PACKAGE_VERSION='20200902' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20200902' +PACKAGE_VERSION='20200905' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20200905' PACKAGE_BUGREPORT='dvipdfmx@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) 20200902 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20200905 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) 20200902:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20200905:";; 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 20200902 +dvipdfm-x (TeX Live) configure 20200905 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 20200902, which was +It was created by dvipdfm-x (TeX Live) $as_me 20200905, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -8077,7 +8077,7 @@ fi # Define the identity of the package. PACKAGE='dvipdfm-x--tex-live-' - VERSION='20200902' + VERSION='20200905' cat >>confdefs.h <<_ACEOF @@ -14746,7 +14746,7 @@ Usage: $0 [OPTIONS] Report bugs to ." lt_cl_version="\ -dvipdfm-x (TeX Live) config.lt 20200902 +dvipdfm-x (TeX Live) config.lt 20200905 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -16636,7 +16636,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 20200902, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20200905, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16706,7 +16706,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 20200902 +dvipdfm-x (TeX Live) config.status 20200905 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 dc047231bf5..78faac00e6f 100644 --- a/Build/source/texk/dvipdfm-x/configure.ac +++ b/Build/source/texk/dvipdfm-x/configure.ac @@ -8,7 +8,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)], [20200902], [dvipdfmx@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20200905], [dvipdfmx@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/spc_pdfm.c b/Build/source/texk/dvipdfm-x/spc_pdfm.c index 477a22c39f8..fbe57618f08 100644 --- a/Build/source/texk/dvipdfm-x/spc_pdfm.c +++ b/Build/source/texk/dvipdfm-x/spc_pdfm.c @@ -194,6 +194,20 @@ safeputresdict (pdf_obj *kp, pdf_obj *vp, void *dp) dict = pdf_lookup_dict(dp, key); if (pdf_obj_typeof(vp) == PDF_INDIRECT) { + /* Copy the content of old resource category dict (if exists) */ + if (dict) { + pdf_obj *dst = pdf_deref_obj(vp); + if (dst) { + if (pdf_obj_typeof(dst) == PDF_DICT) { + pdf_foreach_dict(dict, safeputresdent, dst); + pdf_release_obj(dst); + } else { + WARN("Invalid type (not DICT) for page/form resource dict entry: key=\"%s\"", key); + pdf_release_obj(dst); + return -1; + } + } + } pdf_add_dict(dp, pdf_new_name(key), pdf_link_obj(vp)); } else if (pdf_obj_typeof(vp) == PDF_DICT) { if (dict) -- cgit v1.2.3