Commit be823281 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import texlive-20180414-19.el8

parents
This diff is collapsed.
This diff is collapsed.
# macros to keep trees in texlive consistent
%_texmf /usr/share/texlive/texmf-local
%_texmf_main /usr/share/texlive/texmf-dist
%_texmf_vendor /usr/share/texlive/texmf-dist
%_texmf_var /var/lib/texmf
%_texmf_conf /usr/share/texlive/texmf-config
%texlive_post \
mkdir -p /var/run/texlive \
touch /var/run/texlive/run-texhash \
touch /var/run/texlive/run-mtxrun \
:
%texlive_postun \
if [ $1 == 1 ]; then \
mkdir -p /var/run/texlive \
touch /var/run/run-texhash \
else \
%{_bindir}/texhash 2> /dev/null \
fi \
:
%texlive_posttrans \
if [ -e /var/run/texlive/run-texhash ] && [ -e %{_bindir}/texhash ]; then %{_bindir}/texhash 2> /dev/null; rm -f /var/run/texlive/run-texhash; fi \
if [ -e /var/run/texlive/run-mtxrun ]; then export TEXMF=/usr/share/texlive/texmf-dist; export TEXMFCNF=/usr/share/texlive/texmf-dist/web2c; export TEXMFCACHE=/var/lib/texmf; %{_bindir}/mtxrun --generate &> /dev/null; rm -f /var/run/texlive/run-mtxrun; fi \
:
diff -up source/texk/kpathsea/texmf.cnf.fixme source/texk/kpathsea/texmf.cnf
--- source/texk/kpathsea/texmf.cnf.fixme 2016-10-19 15:35:25.804218872 -0400
+++ source/texk/kpathsea/texmf.cnf 2016-10-19 15:37:19.308035612 -0400
@@ -491,17 +491,17 @@ RUBYINPUTS = .;$TEXMF/scripts/{$progna
%
TEXMFCNF = {\
$SELFAUTOLOC,\
-$SELFAUTOLOC/share/texmf-local/web2c,\
-$SELFAUTOLOC/share/texmf-dist/web2c,\
-$SELFAUTOLOC/share/texmf/web2c,\
+$SELFAUTOLOC/share/texlive/texmf-local/web2c,\
+$SELFAUTOLOC/share/texlive/texmf-dist/web2c,\
+$SELFAUTOLOC/share/texlive/texmf/web2c,\
$SELFAUTOLOC/texmf-local/web2c,\
$SELFAUTOLOC/texmf-dist/web2c,\
$SELFAUTOLOC/texmf/web2c,\
\
$SELFAUTODIR,\
-$SELFAUTODIR/share/texmf-local/web2c,\
-$SELFAUTODIR/share/texmf-dist/web2c,\
-$SELFAUTODIR/share/texmf/web2c,\
+$SELFAUTODIR/share/texlive/texmf-local/web2c,\
+$SELFAUTODIR/share/texlive/texmf-dist/web2c,\
+$SELFAUTODIR/share/texlive/texmf/web2c,\
$SELFAUTODIR/texmf-local/web2c,\
$SELFAUTODIR/texmf-dist/web2c,\
$SELFAUTODIR/texmf/web2c,\
@@ -509,9 +509,9 @@ $SELFAUTODIR/texmf/web2c,\
$SELFAUTOGRANDPARENT/texmf-local/web2c,\
$SELFAUTOPARENT,\
\
-$SELFAUTOPARENT/share/texmf-local/web2c,\
-$SELFAUTOPARENT/share/texmf-dist/web2c,\
-$SELFAUTOPARENT/share/texmf/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf-local/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf-dist/web2c,\
+$SELFAUTOPARENT/share/texlive/texmf/web2c,\
$SELFAUTOPARENT/texmf-local/web2c,\
$SELFAUTOPARENT/texmf-dist/web2c,\
$SELFAUTOPARENT/texmf/web2c\
diff -up doc/xelatex/xepersian/dkun-0.3.py.than doc/xelatex/xepersian/dkun-0.3.py
--- doc/xelatex/xepersian/dkun-0.3.py.than 2018-05-07 11:52:01.795308478 +0200
+++ doc/xelatex/xepersian/dkun-0.3.py 2018-05-07 11:53:32.984620222 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#########################################
# General Public License #
@@ -311,7 +311,7 @@ def dk_adjust_shaping(text, i):
try:
u = table_DK_UN[current][0]
except KeyError:
- print 'ERROR: unmapped character'
+ print('ERROR: unmapped character')
return u''
#if you don't want shaping remove the following comment
@@ -407,7 +407,7 @@ def needs_english_wrapper(part):
# Main body of the program
if len(sys.argv) <= 2:
- print 'usage: python dkun in_filename out_filename'
+ print('usage: python dkun in_filename out_filename')
exit(0)
filename = sys.argv[1]
@@ -416,13 +416,13 @@ outfile = sys.argv[2]
try:
f = open(filename, 'r')
except IOError:
- print "Can not open the input file: " + filename
+ print("Can not open the input file: " + filename)
exit(0)
try:
of = codecs.open(outfile, encoding='utf-8', mode='w')
except IOError:
- print "Can not open the output file: " + outfile
+ print("Can not open the output file: " + outfile)
exit(0)
line_number = 0
diff -up doc/xelatex/xepersian/dkun-0.4.py.than doc/xelatex/xepersian/dkun-0.4.py
--- doc/xelatex/xepersian/dkun-0.4.py.than 2018-05-07 11:53:54.187692708 +0200
+++ doc/xelatex/xepersian/dkun-0.4.py 2018-05-07 11:54:32.272822907 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#########################################
# General Public License #
@@ -311,7 +311,7 @@ def dk_adjust_shaping(text, i):
try:
u = table_DK_UN[current][0]
except KeyError:
- print 'ERROR: unmapped character'
+ print('ERROR: unmapped character')
return u''
#if you don't want shaping remove the following comment
@@ -407,7 +407,7 @@ def needs_english_wrapper(part):
# Main body of the program
if len(sys.argv) <= 2:
- print 'usage: python dkun in_filename out_filename'
+ print('usage: python dkun in_filename out_filename')
exit(0)
filename = sys.argv[1]
@@ -416,13 +416,13 @@ outfile = sys.argv[2]
try:
f = open(filename, 'r')
except IOError:
- print "Can not open the input file: " + filename
+ print("Can not open the input file: " + filename)
exit(0)
try:
of = codecs.open(outfile, encoding='utf-8', mode='w')
except IOError:
- print "Can not open the output file: " + outfile
+ print("Can not open the output file: " + outfile)
exit(0)
line_number = 0
diff -up doc/xelatex/xepersian/ftxe-0.12.py.than doc/xelatex/xepersian/ftxe-0.12.py
--- doc/xelatex/xepersian/ftxe-0.12.py.than 2018-05-07 11:54:55.163901164 +0200
+++ doc/xelatex/xepersian/ftxe-0.12.py 2018-05-07 11:57:58.063526433 +0200
@@ -1,4 +1,6 @@
-# This program is free software: you can redistribute it and/or modify
+#! /usr/bin/python3
+
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
@@ -488,7 +490,7 @@ def read_size(input,index,last_index):
dim_index = pt_index
next_cmd = input.find(u'\\', index)
if (next_cmd == -1 and dim_index == -1):
- print "Error in parsing \epsfxsize command at " + str(line_number) + "\n"
+ print("Error in parsing \epsfxsize command at " + str(line_number) + "\n")
return -1
elif (next_cmd == -1 or (dim_index != -1 and next_cmd > dim_index)):
epsfxsize = input[index:dim_index+2]
@@ -499,7 +501,7 @@ def read_size(input,index,last_index):
end_cmd += 1
return end_cmd
else:
- print "Error in parsing \epsfxsize command at " + str(line_number) + "\n"
+ print("Error in parsing \epsfxsize command at " + str(line_number) + "\n")
return -1
@@ -567,7 +569,7 @@ def generate_farsitex_cmds_file(helper_f
try:
of = codecs.open(helper_filename, encoding='utf-8', mode='w')
except IOError:
- print "Can not open the output file: " + helper_filename
+ print("Can not open the output file: " + helper_filename)
exit(0)
of.write(preamble)
of.close
@@ -875,7 +877,7 @@ def convert_file(f, of, convert_cmds):
for line in f:
line_number += 1
- print line_number,
+ print (line_number)
output_line = u''
line_len = len(line)
@@ -888,7 +890,7 @@ def convert_file(f, of, convert_cmds):
# check line-direction character
line_direction_rtl = (line[0] == '<')
if (line[0] != '>') and (line[0] != '<'):
- print "FORMAT ERROR AT LINE: " + str(line_number)
+ print("FORMAT ERROR AT LINE: " + str(line_number))
exit(0)
i = 1
@@ -970,11 +972,11 @@ def convert_file(f, of, convert_cmds):
# end of file processing
def print_usage():
- print 'usage: python ftxe-0-11 [-r] [-s] [-x] [-u] in_filename1 in_filename2'
- print '-r: (DEFAULT) recursively consider files included in the given files'
- print '-s: do not recursively consider files'
- print '-x: (DEFAULT) insert xepersian related commands'
- print '-u: only convert to unicode'
+ print('usage: python ftxe-0-11 [-r] [-s] [-x] [-u] in_filename1 in_filename2')
+ print('-r: (DEFAULT) recursively consider files included in the given files')
+ print('-s: do not recursively consider files')
+ print('-x: (DEFAULT) insert xepersian related commands')
+ print('-u: only convert to unicode')
###################################
# Begin of main body of the program
@@ -1011,7 +1013,7 @@ while (options_index < len(sys.argv)):
options_index += 1
if (len(filenames) == 0):
- print 'error: no input filename is specified!'
+ print('error: no input filename is specified!')
print_usage()
exit(0)
@@ -1026,17 +1028,17 @@ while (index < len(filenames)):
else:
outfile = filename + '.tex'
- print '\n\nConverting "' + filename + '" into "' + outfile + '"'
+ print('\n\nConverting "' + filename + '" into "' + outfile + '"')
try:
f = open(filename, 'r')
except IOError:
- print "Can not open the input file: " + filename
+ print("Can not open the input file: " + filename)
exit(0)
try:
of = codecs.open(outfile, encoding='utf-8', mode='w')
except IOError:
- print "Can not open the output file: " + outfile
+ print("Can not open the output file: " + outfile)
exit(0)
convert_file(f, of, convert_xepersian)
diff -up doc/xelatex/xepersian/undk-0.6.py.than doc/xelatex/xepersian/undk-0.6.py
--- doc/xelatex/xepersian/undk-0.6.py.than 2018-05-07 11:58:18.706597005 +0200
+++ doc/xelatex/xepersian/undk-0.6.py 2018-05-07 11:59:18.079799981 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#########################################
# General Public License #
# Author: Mostafa Vahedi #
@@ -328,7 +328,7 @@ def find_form(line, i):
def map_char_unicode_DK(c, form):
try:
n = table_UN_DK[c][0]
- except KeyError:
+ except KeyError:
return c.encode('latin-1')
if (n == 1):
return table_UN_DK[c][1]
@@ -371,7 +371,7 @@ def is_farsi_numerical(c):
# Main body of the program
if len(sys.argv) <= 2:
- print 'usage: python undk in_filename out_filename'
+ print('usage: python undk in_filename out_filename')
exit(0)
filename = sys.argv[1]
@@ -380,13 +380,13 @@ outfile = sys.argv[2]
try:
f = codecs.open(filename, 'r', 'utf-8')
except IOError:
- print "Can not open the input file: " + filename
+ print("Can not open the input file: " + filename)
exit(0)
try:
of = open(outfile, 'w')
except IOError:
- print "Can not open the output file: " + outfile
+ print("Can not open the output file: " + outfile)
exit(0)
# this is an option
@@ -425,7 +425,7 @@ for line in f:
this_line += auto_english_part[::-1]
auto_english_part = ''
inAutoEnglish = 0
- print 'Warning: mixed Auto-English and Forced-English'
+ print('Warning: mixed Auto-English and Forced-English')
if (inFarsiNumber == 1):
this_line += number_part[::-1]
number_part = ''
diff -up doc/xelatex/xepersian/unldk-0.2.py.than doc/xelatex/xepersian/unldk-0.2.py
--- doc/xelatex/xepersian/unldk-0.2.py.than 2018-05-07 11:59:41.522880125 +0200
+++ doc/xelatex/xepersian/unldk-0.2.py 2018-05-07 12:00:21.999018500 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
#########################################
# General Public License #
# Author: Mostafa Vahedi #
@@ -328,7 +328,7 @@ def find_form(line, i):
def map_char_unicode_DK(c, form):
try:
n = table_UN_DK[c][0]
- except KeyError:
+ except KeyError:
return c.encode('latin-1')
if (n == 1):
return table_UN_DK[c][1]
@@ -364,7 +364,7 @@ def is_farsi_numerical(c):
# Main body of the program
if len(sys.argv) <= 2:
- print 'usage: python unldk in_filename out_filename'
+ print('usage: python unldk in_filename out_filename')
exit(0)
filename = sys.argv[1]
@@ -373,13 +373,13 @@ outfile = sys.argv[2]
try:
f = codecs.open(filename, 'r', 'utf-8')
except IOError:
- print "Can not open the input file: " + filename
+ print("Can not open the input file: " + filename)
exit(0)
try:
of = open(outfile, 'w')
except IOError:
- print "Can not open the output file: " + outfile
+ print("Can not open the output file: " + outfile)
exit(0)
inFarsi = 0
diff -up texlive-20180414/source/texk/dvipsk/writet1.c.CVE-2018-17407 texlive-20180414/source/texk/dvipsk/writet1.c
--- texlive-20180414/source/texk/dvipsk/writet1.c.CVE-2018-17407 2018-09-26 08:37:29.964110003 +0100
+++ texlive-20180414/source/texk/dvipsk/writet1.c 2018-09-26 08:38:06.454784619 +0100
@@ -1449,7 +1449,9 @@ static void t1_check_unusual_charstring(
*(strend(t1_buf_array) - 1) = ' ';
t1_getline();
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}
diff -up texlive-20180414/source/texk/web2c/luatexdir/font/writet1.w.CVE-2018-17407 texlive-20180414/source/texk/web2c/luatexdir/font/writet1.w
--- texlive-20180414/source/texk/web2c/luatexdir/font/writet1.w.CVE-2018-17407 2018-09-26 08:34:35.340880599 +0100
+++ texlive-20180414/source/texk/web2c/luatexdir/font/writet1.w 2018-09-26 08:35:45.992187544 +0100
@@ -1624,8 +1624,10 @@ static void t1_check_unusual_charstring(
/* if no number follows "/CharStrings", let's read the next line */
if (sscanf(p, "%i", &i) != 1) {
strcpy(t1_buf_array, t1_line_array);
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
t1_getline();
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}
diff -up texlive-20180414/source/texk/web2c/pdftexdir/writet1.c.CVE-2018-17407 texlive-20180414/source/texk/web2c/pdftexdir/writet1.c
--- texlive-20180414/source/texk/web2c/pdftexdir/writet1.c.CVE-2018-17407 2018-09-26 08:36:06.382564736 +0100
+++ texlive-20180414/source/texk/web2c/pdftexdir/writet1.c 2018-09-26 08:37:12.213781850 +0100
@@ -1598,7 +1598,9 @@ static void t1_check_unusual_charstring(
*(strend(t1_buf_array) - 1) = ' ';
t1_getline();
+ alloc_array(t1_buf, strlen(t1_line_array) + strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcat(t1_buf_array, t1_line_array);
+ alloc_array(t1_line, strlen(t1_buf_array) + 1, T1_BUF_SIZE);
strcpy(t1_line_array, t1_buf_array);
t1_line_ptr = eol(t1_line_array);
}
--- texlive-20180414/source/libs/luajit/Makefile.in.annocheck 2018-01-10 01:37:05.000000000 +0100
+++ texlive-20180414/source/libs/luajit/Makefile.in 2019-01-11 22:45:34.503080977 +0100
@@ -680,7 +680,7 @@
NEVER_NAMES_LT = -o -name .libs -o -name '*.lo'
AM_CPPFLAGS = -I$(srcdir)/$(LUAJIT_TREE)/src $(LUAJIT_DEFINES) -U_FORTIFY_SOURCE
AM_CFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2) -Wall
-AM_CCASFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2)
+AM_CCASFLAGS = $(LUAJIT_CFLAGS) $(LUAJIT_HAS_NOT_LOG2) -Wa,--generate-missing-build-notes=yes
SUBDIRS = . native include
lib_LTLIBRARIES = libtexluajit.la
libtexluajit_la_LDFLAGS = -bindir @bindir@ -no-undefined -version-info $(LUAJIT_LT_VERSINFO) $(LIBLUAJIT_LDEXTRA)
This diff is collapsed.
This diff is collapsed.
From b14146667f4cd6cbc5d5821c88e47096df3c78b5 Mon Sep 17 00:00:00 2001
From: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Date: Sat, 28 Apr 2018 07:36:22 +0000
Subject: support poppler-0.64.0
git-svn-id: svn://tug.org/texlive/trunk@47470 c570f23f-e606-0410-a88d-b1316a301751
---
Build/source/texk/web2c/luatexdir/image/pdftoepdf.w | 4 ++--
Build/source/texk/web2c/luatexdir/lua/lepdflib.cc | 4 ++--
Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++
Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc | 14 +++++++-------
Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 2 +-
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
index 7ba2973..d697959 100644
--- Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
+++ Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
@@ -472,10 +472,10 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
break;
*/
case objString:
- copyString(pdf, obj->getString());
+ copyString(pdf, (GooString *)obj->getString());
break;
case objName:
- copyName(pdf, obj->getName());
+ copyName(pdf, (char *)obj->getName());
break;
case objNull:
pdf_add_null(pdf);
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
index a16bf3b..32bcdab 100644
--- Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -674,7 +674,7 @@ static int m_##in##_##function(lua_State * L) \
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
pdfdoc_changed_error(L); \
- gs = ((in *) uin->d)->function(); \
+ gs = (GooString *)((in *) uin->d)->function(); \
if (gs != NULL) \
lua_pushlstring(L, gs->getCString(), gs->getLength()); \
else \
@@ -1813,7 +1813,7 @@ static int m_Object_getString(lua_State * L)
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
if (((Object *) uin->d)->isString()) {
- gs = ((Object *) uin->d)->getString();
+ gs = (GooString *)((Object *) uin->d)->getString();
lua_pushlstring(L, gs->getCString(), gs->getLength());
} else
lua_pushnil(L);
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index c022bc2..f4af035 100644
--- Build/source/texk/web2c/pdftexdir/ChangeLog
+++ Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,8 @@
+2018-04-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * pdftoepdf-newpoppler.cc, pdftosrc-newpoppler.cc:
+ Support poppler 0.64.0.
+
2018-04-14 Karl Berry <karl@tug.org>
* TeX Live 2018 release, pdftex 1.40.19.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
index 10fea29..750579d 100644
--- Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
@@ -290,7 +290,7 @@ static void copyName(char *s)
static void copyDictEntry(Object * obj, int i)
{
Object obj1;
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
obj1 = obj->dictGetValNF(i);
copyObject(&obj1);
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
if (!procset.isName())
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
procset.getTypeName());
- copyName(procset.getName());
+ copyName((char *)procset.getName());
pdf_puts(" ");
}
pdf_puts("]\n");
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
&& fontdescRef.isRef()
&& fontdesc.isDict()
&& embeddableFont(&fontdesc)
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
// round /StemV value, since the PDF input is a float
// (see Font Descriptors in PDF reference), but we only store an
// integer, since we don't want to change the struct.
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
if (fontRef.isRef())
copyFont(obj->dictGetKey(i), &fontRef);
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
copyObject(&fontRef);
}
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
} else if (obj->isNum()) {
pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) {
- s = obj->getString();
+ s = (GooString *)obj->getString();
p = s->getCString();
l = s->getLength();
if (strlen(p) == (unsigned int) l) {
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
pdf_puts(">");
}
} else if (obj->isName()) {
- copyName(obj->getName());
+ copyName((char *)obj->getName());
} else if (obj->isNull()) {
pdf_puts("null");
} else if (obj->isArray()) {
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
index 4e2bcad..0db154b 100644
--- Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->getCString();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
--- Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
- outname = srcName.getString()->getCString();
+ outname = (char *)srcName.getString()->getCString();
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
--- Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -290,7 +290,7 @@ static void copyName(char *s)
static void copyDictEntry(Object * obj, int i)
{
Object obj1;
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
obj1 = obj->dictGetValNF(i);
copyObject(&obj1);
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
if (!procset.isName())
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
procset.getTypeName());
- copyName(procset.getName());
+ copyName((char *)procset.getName());
pdf_puts(" ");
}
pdf_puts("]\n");
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
&& fontdescRef.isRef()
&& fontdesc.isDict()
&& embeddableFont(&fontdesc)
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
// round /StemV value, since the PDF input is a float
// (see Font Descriptors in PDF reference), but we only store an
// integer, since we don't want to change the struct.
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
charset = fontdesc.dictLookup("CharSet");
if (!charset.isNull() &&
charset.isString() && is_subsetable(fontmap))
- epdf_mark_glyphs(fd, charset.getString()->getCString());
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
else
embed_whole_font(fd);
addFontDesc(fontdescRef.getRef(), fd);
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
if (fontRef.isRef())
copyFont(obj->dictGetKey(i), &fontRef);
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
- copyName(obj->dictGetKey(i));
+ copyName((char *)obj->dictGetKey(i));
pdf_puts(" ");
copyObject(&fontRef);
}
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
} else if (obj->isNum()) {
pdf_printf("%s", convertNumToPDF(obj->getNum()));
} else if (obj->isString()) {
- s = obj->getString();
+ s = (GooString *)obj->getString();
p = s->getCString();
l = s->getLength();
if (strlen(p) == (unsigned int) l) {
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
pdf_puts(">");
}