You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
119 lines
5.4 KiB
119 lines
5.4 KiB
Source: https://github.com/TeX-Live/texlive-source/commit/ea9e7b25c6566505fe6d994aa5263bd736593be1
|
|
Backport: dilfridge@gentoo.org
|
|
|
|
diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w
|
|
--- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w 2018-05-20 22:11:35.787633516 +0200
|
|
+++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w 2018-05-20 22:12:26.607265149 +0200
|
|
@@ -472,10 +472,10 @@
|
|
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 -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc
|
|
--- texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc 2018-05-20 22:11:35.788633528 +0200
|
|
+++ texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc 2018-05-20 22:12:26.608265161 +0200
|
|
@@ -521,7 +521,7 @@
|
|
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 \
|
|
@@ -1656,7 +1656,7 @@
|
|
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 -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc
|
|
--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc 2018-05-20 22:11:35.788633528 +0200
|
|
+++ texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc 2018-05-20 22:12:34.398361984 +0200
|
|
@@ -284,7 +284,7 @@
|
|
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);
|
|
@@ -349,7 +349,7 @@
|
|
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");
|
|
@@ -412,7 +412,7 @@
|
|
&& 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.
|
|
@@ -421,7 +421,7 @@
|
|
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);
|
|
@@ -450,7 +450,7 @@
|
|
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);
|
|
}
|
|
@@ -559,7 +559,7 @@
|
|
} 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) {
|
|
@@ -583,7 +583,7 @@
|
|
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 -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc
|
|
--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc 2018-05-20 22:11:35.788633528 +0200
|
|
+++ texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc 2018-05-20 22:12:31.369324336 +0200
|
|
@@ -104,7 +104,7 @@
|
|
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) {
|