diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/dvipdfm-x/ChangeLog | 5 | ||||
| -rwxr-xr-x | Build/source/texk/dvipdfm-x/configure | 22 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/configure.ac | 2 | ||||
| -rw-r--r-- | Build/source/texk/dvipdfm-x/pdfobj.c | 34 |
4 files changed, 31 insertions, 32 deletions
diff --git a/Build/source/texk/dvipdfm-x/ChangeLog b/Build/source/texk/dvipdfm-x/ChangeLog index bed9d8472e0..9a9ffbdc3f9 100644 --- a/Build/source/texk/dvipdfm-x/ChangeLog +++ b/Build/source/texk/dvipdfm-x/ChangeLog @@ -1,3 +1,8 @@ +2018-09-04 Shunsaku Hirata <shunsaku.hirata74@gmail.com> + + * pdfobj.c: More fix on circular reference issue. + * configure.ac: Version 20180904. + 2018-09-02 Shunsaku Hirata <shunsaku.hirata74@gmail.com> * dvi.c: Experimental support for XeTeX transparency font feature. diff --git a/Build/source/texk/dvipdfm-x/configure b/Build/source/texk/dvipdfm-x/configure index 8fc5062ff0a..c4be7f65c61 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) 20180902. +# Generated by GNU Autoconf 2.69 for dvipdfm-x (TeX Live) 20180904. # # 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='20180902' -PACKAGE_STRING='dvipdfm-x (TeX Live) 20180902' +PACKAGE_VERSION='20180904' +PACKAGE_STRING='dvipdfm-x (TeX Live) 20180904' 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) 20180902 to adapt to many kinds of systems. +\`configure' configures dvipdfm-x (TeX Live) 20180904 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) 20180902:";; + short | recursive ) echo "Configuration of dvipdfm-x (TeX Live) 20180904:";; 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 20180902 +dvipdfm-x (TeX Live) configure 20180904 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 20180902, which was +It was created by dvipdfm-x (TeX Live) $as_me 20180904, 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='20180902' + VERSION='20180904' 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 20180902 +dvipdfm-x (TeX Live) config.lt 20180904 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 20180902, which was +This file was extended by dvipdfm-x (TeX Live) $as_me 20180904, 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 20180902 +dvipdfm-x (TeX Live) config.status 20180904 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 7d2ad243d38..8ed036e0354 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)], [20180902], [tex-k@tug.org]) +AC_INIT([dvipdfm-x (TeX Live)], [20180904], [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/pdfobj.c b/Build/source/texk/dvipdfm-x/pdfobj.c index 29fa4f6af8e..f503a38d6b8 100644 --- a/Build/source/texk/dvipdfm-x/pdfobj.c +++ b/Build/source/texk/dvipdfm-x/pdfobj.c @@ -3901,9 +3901,8 @@ pdf_import_indirect (pdf_obj *object) return pdf_new_null(); } - if ((ref = pf->xref_table[obj_num].indirect)) { - return pdf_link_obj(ref); - } else { + ref = pf->xref_table[obj_num].indirect; + if (!ref) { pdf_obj *obj, *reserved, *imported; obj = pdf_get_object(pf, obj_num, obj_gen); @@ -3920,32 +3919,27 @@ pdf_import_indirect (pdf_obj *object) * obj #2 --> << /Parents [1 0 R] >> * The problem is in that dvipdfmx gives new labels to objects after they * are completely read. - * - * Dirty hack though... */ reserved = pdf_new_null(); /* for reservation of label */ pf->xref_table[obj_num].indirect = ref = pdf_new_ref(reserved); imported = pdf_import_object(obj); - /* Substitute object here... - * We can't use pdf_transfer_label() here, since "reserved" object may - * have already be referenced by others and possibly be deref'ed later. - */ - reserved->refcount = imported->refcount; - reserved->type = imported->type; - reserved->flags = imported->flags; - reserved->data = imported->data; - /* Object returned by pdf_import_object(obj) might be simply a link to "obj". - * In that case we can't simply delete that object. - */ - if (imported->refcount == 1) { - RELEASE(imported); - imported = NULL; + if (imported) { + if (imported->label) { + WARN("Imported object already has a label: obj_id=%lu", imported->label); + } + OBJ_OBJ(ref) = imported; + imported->label = reserved->label; + imported->generation = reserved->generation; + reserved->label = 0; + reserved->generation = 0; + pdf_release_obj(imported); } + pdf_release_obj(reserved); pdf_release_obj(obj); + } return pdf_link_obj(ref); - } } /* |