summaryrefslogtreecommitdiff
path: root/Build/source/texk/xdvipdfmx
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-10 12:07:25 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-03-10 12:07:25 +0000
commit7890e58007d42e412ae6bfc5f1958552a42f811f (patch)
treeee3b8b61d198efe3304c44f1af1318fed48020fa /Build/source/texk/xdvipdfmx
parent18f6dab12c9c66182feca3c32b3dc5c79baaf71e (diff)
More trivial diffs between dvipdfmx and xdvipdfmx
git-svn-id: svn://tug.org/texlive/trunk@21675 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/xdvipdfmx')
-rw-r--r--Build/source/texk/xdvipdfmx/ChangeLog.TL9
-rw-r--r--Build/source/texk/xdvipdfmx/src/dvipdfmx.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfencrypt.c2
-rw-r--r--Build/source/texk/xdvipdfmx/src/pdfencrypt.h6
4 files changed, 10 insertions, 9 deletions
diff --git a/Build/source/texk/xdvipdfmx/ChangeLog.TL b/Build/source/texk/xdvipdfmx/ChangeLog.TL
index 2d9d9742c60..8be817b3427 100644
--- a/Build/source/texk/xdvipdfmx/ChangeLog.TL
+++ b/Build/source/texk/xdvipdfmx/ChangeLog.TL
@@ -4,10 +4,11 @@ ChangeLog.TL: TeX Live (TL) changes for xdvipdfmx
2011-03-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* src/cff_dict.h, src/cff_types.h, src/cmap.c, src/cmap_write.c,
- src/dpxcrypt.[ch], src/mfileio.c, src/mpost.h, src/otl_conf.c,
- src/otl_opt.c, src/pdfencoding.[ch], src/pdflimits.h,
- src/pdfparse.h, src/specials.h, src/subfont.c, src/t1_char.c,
- src/tt_post.h, src/vf.c: Remove trivial diffs with dvipdfmx.
+ src/dpxcrypt.[ch], src/dvipdfmx.c, src/mfileio.c, src/mpost.h,
+ src/otl_conf.c, src/otl_opt.c, src/pdfencoding.[ch],
+ src/pdfencrypt.[ch], src/pdflimits.h, src/pdfparse.h,
+ src/specials.h, src/subfont.c, src/t1_char.c, src/tt_post.h,
+ src/vf.c: Remove trivial diffs with dvipdfmx.
* src/Makefile.am: Mark asl_charset.h as unused.
diff --git a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
index 8401fcbd863..2f18b448375 100644
--- a/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
+++ b/Build/source/texk/xdvipdfmx/src/dvipdfmx.c
@@ -858,7 +858,7 @@ main (int argc, char *argv[])
if (pdf_filename == NULL && dvi_filename != NULL)
set_default_pdf_filename();
- compute_id_string (dvi_filename, pdf_filename);
+ pdf_enc_compute_id_string(dvi_filename, pdf_filename);
if (do_encryption) {
pdf_enc_set_passwd(key_bits, permission, NULL, NULL);
if (key_bits > 40 && pdf_get_version() < 4)
diff --git a/Build/source/texk/xdvipdfmx/src/pdfencrypt.c b/Build/source/texk/xdvipdfmx/src/pdfencrypt.c
index 3f0cb4fcdfc..7f358082cc3 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfencrypt.c
+++ b/Build/source/texk/xdvipdfmx/src/pdfencrypt.c
@@ -79,7 +79,7 @@ void pdf_enc_set_verbose (void)
}
#define PRODUCER "%s-%s, Copyright \251 2002-2010 by Jin-Hwan Cho, Matthias Franz, and Shunsaku Hirata"
-void compute_id_string (char *dviname, char *pdfname)
+void pdf_enc_compute_id_string (char *dviname, char *pdfname)
{
char *date_string, *producer;
time_t current_time;
diff --git a/Build/source/texk/xdvipdfmx/src/pdfencrypt.h b/Build/source/texk/xdvipdfmx/src/pdfencrypt.h
index 87ede2cd974..7e3ae60a3a4 100644
--- a/Build/source/texk/xdvipdfmx/src/pdfencrypt.h
+++ b/Build/source/texk/xdvipdfmx/src/pdfencrypt.h
@@ -1,8 +1,8 @@
-/* $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.h,v 1.3 2007/04/03 05:25:50 chofchof Exp $
+/* $Header: /home/cvsroot/dvipdfmx/src/pdfencrypt.h,v 1.5 2011/03/08 00:20:51 matthias Exp $
This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
- Copyright (C) 2002 by Jin-Hwan Cho and Shunsaku Hirata,
+ Copyright (C) 2007 by Jin-Hwan Cho and Shunsaku Hirata,
the dvipdfmx project team <dvipdfmx@project.ktug.or.kr>
This program is free software; you can redistribute it and/or modify
@@ -29,7 +29,7 @@
extern void pdf_enc_set_verbose (void);
extern pdf_obj *pdf_enc_id_array (void);
-extern void compute_id_string (char *dviname, char *pdfname);
+extern void pdf_enc_compute_id_string (char *dviname, char *pdfname);
extern void pdf_enc_set_label (unsigned long label);
extern void pdf_enc_set_generation (unsigned generation);
extern void pdf_enc_set_passwd (unsigned size, unsigned perm, const char *owner, const char *user);