|
 |
ac0adc8 |
From b14146667f4cd6cbc5d5821c88e47096df3c78b5 Mon Sep 17 00:00:00 2001
|
|
|
ac0adc8 |
From: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
|
|
ac0adc8 |
Date: Sat, 28 Apr 2018 07:36:22 +0000
|
|
|
ac0adc8 |
Subject: support poppler-0.64.0
|
|
|
ac0adc8 |
|
|
|
ac0adc8 |
git-svn-id: svn://tug.org/texlive/trunk@47470 c570f23f-e606-0410-a88d-b1316a301751
|
|
|
ac0adc8 |
---
|
|
|
ac0adc8 |
Build/source/texk/web2c/luatexdir/image/pdftoepdf.w | 4 ++--
|
|
|
ac0adc8 |
Build/source/texk/web2c/luatexdir/lua/lepdflib.cc | 4 ++--
|
|
|
ac0adc8 |
Build/source/texk/web2c/pdftexdir/ChangeLog | 5 +++++
|
|
|
ac0adc8 |
Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc | 14 +++++++-------
|
|
|
ac0adc8 |
Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc | 2 +-
|
|
|
ac0adc8 |
5 files changed, 17 insertions(+), 12 deletions(-)
|
|
|
ac0adc8 |
|
|
|
ac0adc8 |
diff --git a/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w b/Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
|
|
|
ac0adc8 |
index 7ba2973..d697959 100644
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/luatexdir/image/pdftoepdf.w
|
|
|
ac0adc8 |
@@ -472,10 +472,10 @@ static void copyObject(PDF pdf, PdfDocument * pdf_doc, Object * obj)
|
|
|
ac0adc8 |
break;
|
|
|
ac0adc8 |
*/
|
|
|
ac0adc8 |
case objString:
|
|
|
ac0adc8 |
- copyString(pdf, obj->getString());
|
|
|
ac0adc8 |
+ copyString(pdf, (GooString *)obj->getString());
|
|
|
ac0adc8 |
break;
|
|
|
ac0adc8 |
case objName:
|
|
|
ac0adc8 |
- copyName(pdf, obj->getName());
|
|
|
ac0adc8 |
+ copyName(pdf, (char *)obj->getName());
|
|
|
ac0adc8 |
break;
|
|
|
ac0adc8 |
case objNull:
|
|
|
ac0adc8 |
pdf_add_null(pdf);
|
|
|
ac0adc8 |
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
|
|
|
ac0adc8 |
index a16bf3b..32bcdab 100644
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
|
|
|
ac0adc8 |
@@ -674,7 +674,7 @@ static int m_##in##_##function(lua_State * L) \
|
|
|
ac0adc8 |
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \
|
|
|
ac0adc8 |
if (uin->pd != NULL && uin->pd->pc != uin->pc) \
|
|
|
ac0adc8 |
pdfdoc_changed_error(L); \
|
|
|
ac0adc8 |
- gs = ((in *) uin->d)->function(); \
|
|
|
ac0adc8 |
+ gs = (GooString *)((in *) uin->d)->function(); \
|
|
|
ac0adc8 |
if (gs != NULL) \
|
|
|
ac0adc8 |
lua_pushlstring(L, gs->getCString(), gs->getLength()); \
|
|
|
ac0adc8 |
else \
|
|
|
ac0adc8 |
@@ -1813,7 +1813,7 @@ static int m_Object_getString(lua_State * L)
|
|
|
ac0adc8 |
if (uin->pd != NULL && uin->pd->pc != uin->pc)
|
|
|
ac0adc8 |
pdfdoc_changed_error(L);
|
|
|
ac0adc8 |
if (((Object *) uin->d)->isString()) {
|
|
|
ac0adc8 |
- gs = ((Object *) uin->d)->getString();
|
|
|
ac0adc8 |
+ gs = (GooString *)((Object *) uin->d)->getString();
|
|
|
ac0adc8 |
lua_pushlstring(L, gs->getCString(), gs->getLength());
|
|
|
ac0adc8 |
} else
|
|
|
ac0adc8 |
lua_pushnil(L);
|
|
|
ac0adc8 |
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
|
|
|
ac0adc8 |
index c022bc2..f4af035 100644
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/pdftexdir/ChangeLog
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/pdftexdir/ChangeLog
|
|
|
ac0adc8 |
@@ -1,3 +1,8 @@
|
|
|
ac0adc8 |
+2018-04-28 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
|
|
|
ac0adc8 |
+
|
|
|
ac0adc8 |
+ * pdftoepdf-newpoppler.cc, pdftosrc-newpoppler.cc:
|
|
|
ac0adc8 |
+ Support poppler 0.64.0.
|
|
|
ac0adc8 |
+
|
|
|
ac0adc8 |
2018-04-14 Karl Berry <karl@tug.org>
|
|
|
ac0adc8 |
|
|
|
ac0adc8 |
* TeX Live 2018 release, pdftex 1.40.19.
|
|
|
ac0adc8 |
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
|
|
|
ac0adc8 |
index 10fea29..750579d 100644
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
|
|
|
ac0adc8 |
@@ -290,7 +290,7 @@ static void copyName(char *s)
|
|
|
ac0adc8 |
static void copyDictEntry(Object * obj, int i)
|
|
|
ac0adc8 |
{
|
|
|
ac0adc8 |
Object obj1;
|
|
|
ac0adc8 |
- copyName(obj->dictGetKey(i));
|
|
|
ac0adc8 |
+ copyName((char *)obj->dictGetKey(i));
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
obj1 = obj->dictGetValNF(i);
|
|
|
ac0adc8 |
copyObject(&obj1);
|
|
|
ac0adc8 |
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
|
|
|
ac0adc8 |
if (!procset.isName())
|
|
|
ac0adc8 |
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
|
|
|
ac0adc8 |
procset.getTypeName());
|
|
|
ac0adc8 |
- copyName(procset.getName());
|
|
|
ac0adc8 |
+ copyName((char *)procset.getName());
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
pdf_puts("]\n");
|
|
|
ac0adc8 |
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
|
|
|
ac0adc8 |
&& fontdescRef.isRef()
|
|
|
ac0adc8 |
&& fontdesc.isDict()
|
|
|
ac0adc8 |
&& embeddableFont(&fontdesc)
|
|
|
ac0adc8 |
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
|
|
|
ac0adc8 |
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
|
|
|
ac0adc8 |
// round /StemV value, since the PDF input is a float
|
|
|
ac0adc8 |
// (see Font Descriptors in PDF reference), but we only store an
|
|
|
ac0adc8 |
// integer, since we don't want to change the struct.
|
|
|
ac0adc8 |
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
|
|
|
ac0adc8 |
charset = fontdesc.dictLookup("CharSet");
|
|
|
ac0adc8 |
if (!charset.isNull() &&
|
|
|
ac0adc8 |
charset.isString() && is_subsetable(fontmap))
|
|
|
ac0adc8 |
- epdf_mark_glyphs(fd, charset.getString()->getCString());
|
|
|
ac0adc8 |
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
|
|
|
ac0adc8 |
else
|
|
|
ac0adc8 |
embed_whole_font(fd);
|
|
|
ac0adc8 |
addFontDesc(fontdescRef.getRef(), fd);
|
|
|
ac0adc8 |
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
|
|
|
ac0adc8 |
if (fontRef.isRef())
|
|
|
ac0adc8 |
copyFont(obj->dictGetKey(i), &fontRef);
|
|
|
ac0adc8 |
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
|
|
|
ac0adc8 |
- copyName(obj->dictGetKey(i));
|
|
|
ac0adc8 |
+ copyName((char *)obj->dictGetKey(i));
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
copyObject(&fontRef);
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
|
|
|
ac0adc8 |
} else if (obj->isNum()) {
|
|
|
ac0adc8 |
pdf_printf("%s", convertNumToPDF(obj->getNum()));
|
|
|
ac0adc8 |
} else if (obj->isString()) {
|
|
|
ac0adc8 |
- s = obj->getString();
|
|
|
ac0adc8 |
+ s = (GooString *)obj->getString();
|
|
|
ac0adc8 |
p = s->getCString();
|
|
|
ac0adc8 |
l = s->getLength();
|
|
|
ac0adc8 |
if (strlen(p) == (unsigned int) l) {
|
|
|
ac0adc8 |
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
|
|
|
ac0adc8 |
pdf_puts(">");
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
} else if (obj->isName()) {
|
|
|
ac0adc8 |
- copyName(obj->getName());
|
|
|
ac0adc8 |
+ copyName((char *)obj->getName());
|
|
|
ac0adc8 |
} else if (obj->isNull()) {
|
|
|
ac0adc8 |
pdf_puts("null");
|
|
|
ac0adc8 |
} else if (obj->isArray()) {
|
|
|
ac0adc8 |
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
|
|
|
ac0adc8 |
index 4e2bcad..0db154b 100644
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
|
|
|
ac0adc8 |
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
|
|
|
ac0adc8 |
fprintf(stderr, "No SourceName found\n");
|
|
|
ac0adc8 |
exit(1);
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
- outname = srcName.getString()->getCString();
|
|
|
ac0adc8 |
+ outname = (char *)srcName.getString()->getCString();
|
|
|
ac0adc8 |
// We cannot free srcName, as objname shares its string.
|
|
|
ac0adc8 |
// srcName.free();
|
|
|
ac0adc8 |
} else if (objnum > 0) {
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/pdftexdir/pdftosrc.cc
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/pdftexdir/pdftosrc.cc
|
|
|
ac0adc8 |
@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
|
|
|
ac0adc8 |
fprintf(stderr, "No SourceName found\n");
|
|
|
ac0adc8 |
exit(1);
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
- outname = srcName.getString()->getCString();
|
|
|
ac0adc8 |
+ outname = (char *)srcName.getString()->getCString();
|
|
|
ac0adc8 |
// We cannot free srcName, as objname shares its string.
|
|
|
ac0adc8 |
// srcName.free();
|
|
|
ac0adc8 |
} else if (objnum > 0) {
|
|
|
ac0adc8 |
--- Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
|
|
|
ac0adc8 |
+++ Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
|
|
|
ac0adc8 |
@@ -290,7 +290,7 @@ static void copyName(char *s)
|
|
|
ac0adc8 |
static void copyDictEntry(Object * obj, int i)
|
|
|
ac0adc8 |
{
|
|
|
ac0adc8 |
Object obj1;
|
|
|
ac0adc8 |
- copyName(obj->dictGetKey(i));
|
|
|
ac0adc8 |
+ copyName((char *)obj->dictGetKey(i));
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
obj1 = obj->dictGetValNF(i);
|
|
|
ac0adc8 |
copyObject(&obj1);
|
|
|
ac0adc8 |
@@ -355,7 +355,7 @@ static void copyProcSet(Object * obj)
|
|
|
ac0adc8 |
if (!procset.isName())
|
|
|
ac0adc8 |
pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
|
|
|
ac0adc8 |
procset.getTypeName());
|
|
|
ac0adc8 |
- copyName(procset.getName());
|
|
|
ac0adc8 |
+ copyName((char *)procset.getName());
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
pdf_puts("]\n");
|
|
|
ac0adc8 |
@@ -418,7 +418,7 @@ static void copyFont(char *tag, Object * fontRef)
|
|
|
ac0adc8 |
&& fontdescRef.isRef()
|
|
|
ac0adc8 |
&& fontdesc.isDict()
|
|
|
ac0adc8 |
&& embeddableFont(&fontdesc)
|
|
|
ac0adc8 |
- && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
|
|
|
ac0adc8 |
+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
|
|
|
ac0adc8 |
// round /StemV value, since the PDF input is a float
|
|
|
ac0adc8 |
// (see Font Descriptors in PDF reference), but we only store an
|
|
|
ac0adc8 |
// integer, since we don't want to change the struct.
|
|
|
ac0adc8 |
@@ -427,7 +427,7 @@ static void copyFont(char *tag, Object * fontRef)
|
|
|
ac0adc8 |
charset = fontdesc.dictLookup("CharSet");
|
|
|
ac0adc8 |
if (!charset.isNull() &&
|
|
|
ac0adc8 |
charset.isString() && is_subsetable(fontmap))
|
|
|
ac0adc8 |
- epdf_mark_glyphs(fd, charset.getString()->getCString());
|
|
|
ac0adc8 |
+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
|
|
|
ac0adc8 |
else
|
|
|
ac0adc8 |
embed_whole_font(fd);
|
|
|
ac0adc8 |
addFontDesc(fontdescRef.getRef(), fd);
|
|
|
ac0adc8 |
@@ -456,7 +456,7 @@ static void copyFontResources(Object * obj)
|
|
|
ac0adc8 |
if (fontRef.isRef())
|
|
|
ac0adc8 |
copyFont(obj->dictGetKey(i), &fontRef);
|
|
|
ac0adc8 |
else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
|
|
|
ac0adc8 |
- copyName(obj->dictGetKey(i));
|
|
|
ac0adc8 |
+ copyName((char *)obj->dictGetKey(i));
|
|
|
ac0adc8 |
pdf_puts(" ");
|
|
|
ac0adc8 |
copyObject(&fontRef);
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
@@ -565,7 +565,7 @@ static void copyObject(Object * obj)
|
|
|
ac0adc8 |
} else if (obj->isNum()) {
|
|
|
ac0adc8 |
pdf_printf("%s", convertNumToPDF(obj->getNum()));
|
|
|
ac0adc8 |
} else if (obj->isString()) {
|
|
|
ac0adc8 |
- s = obj->getString();
|
|
|
ac0adc8 |
+ s = (GooString *)obj->getString();
|
|
|
ac0adc8 |
p = s->getCString();
|
|
|
ac0adc8 |
l = s->getLength();
|
|
|
ac0adc8 |
if (strlen(p) == (unsigned int) l) {
|
|
|
ac0adc8 |
@@ -589,7 +589,7 @@ static void copyObject(Object * obj)
|
|
|
ac0adc8 |
pdf_puts(">");
|
|
|
ac0adc8 |
}
|
|
|
ac0adc8 |
} else if (obj->isName()) {
|
|
|
ac0adc8 |
- copyName(obj->getName());
|
|
|
ac0adc8 |
+ copyName((char *)obj->getName());
|
|
|
ac0adc8 |
} else if (obj->isNull()) {
|
|
|
ac0adc8 |
pdf_puts("null");
|
|
|
ac0adc8 |
} else if (obj->isArray()) {
|
|
|
ac0adc8 |
--
|
|
|
ac0adc8 |
cgit v1.1
|
|
|
ac0adc8 |
|