texlive[56265] Build/source/texk/dvipdfm-x: change operation to

commits+kakuto at tug.org commits+kakuto at tug.org
Fri Sep 4 23:36:59 CEST 2020


Revision: 56265
          http://tug.org/svn/texlive?view=revision&revision=56265
Author:   kakuto
Date:     2020-09-04 23:36:59 +0200 (Fri, 04 Sep 2020)
Log Message:
-----------
change operation to resource dict. (S. Hirata)

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/configure
    trunk/Build/source/texk/dvipdfm-x/configure.ac
    trunk/Build/source/texk/dvipdfm-x/spc_pdfm.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2020-09-04 21:02:55 UTC (rev 56264)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2020-09-04 21:36:59 UTC (rev 56265)
@@ -1,3 +1,11 @@
+2020-09-05  Shunsaku Hirata  <shunsaku.hirata74 at gmail.com>
+
+	* 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  <shunsaku.hirata74 at gmail.com>
 
 	* pdfnames.c: Fix an incompatible behavior introduced by the

Modified: trunk/Build/source/texk/dvipdfm-x/configure
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure	2020-09-04 21:02:55 UTC (rev 56264)
+++ trunk/Build/source/texk/dvipdfm-x/configure	2020-09-04 21:36:59 UTC (rev 56265)
@@ -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 <dvipdfmx at tug.org>.
 #
@@ -590,8 +590,8 @@
 # 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 at tug.org'
 PACKAGE_URL=''
 
@@ -1350,7 +1350,7 @@
   # 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 @@
 
 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 @@
 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 @@
 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 @@
 
 # Define the identity of the package.
  PACKAGE='dvipdfm-x--tex-live-'
- VERSION='20200902'
+ VERSION='20200905'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14746,7 +14746,7 @@
 Report bugs to <bug-libtool at gnu.org>."
 
 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 @@
 # 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 @@
 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\\"
 

Modified: trunk/Build/source/texk/dvipdfm-x/configure.ac
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/configure.ac	2020-09-04 21:02:55 UTC (rev 56264)
+++ trunk/Build/source/texk/dvipdfm-x/configure.ac	2020-09-04 21:36:59 UTC (rev 56265)
@@ -8,7 +8,7 @@
 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 at tug.org])
+AC_INIT([dvipdfm-x (TeX Live)], [20200905], [dvipdfmx at tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])

Modified: trunk/Build/source/texk/dvipdfm-x/spc_pdfm.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/spc_pdfm.c	2020-09-04 21:02:55 UTC (rev 56264)
+++ trunk/Build/source/texk/dvipdfm-x/spc_pdfm.c	2020-09-04 21:36:59 UTC (rev 56265)
@@ -194,6 +194,20 @@
   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)



More information about the tex-live-commits mailing list.