Henrik Grimler
6 years ago
committed by
Fredrik Fornwall
Fredrik Fornwall
5 changed files with 448 additions and 62 deletions
@ -1,35 +0,0 @@ |
|||||
--- ../pdftoepdf.w 2018-04-30 19:38:03.041290335 +0000
|
|
||||
+++ ./texk/web2c/luatexdir/image/pdftoepdf.w 2018-04-30 20:27:50.631512751 +0000
|
|
||||
@@ -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); |
|
||||
--- ../lepdflib.cc 2018-04-30 19:37:10.553331209 +0000
|
|
||||
+++ ./texk/web2c/luatexdir/lua/lepdflib.cc 2018-04-30 20:40:55.079059154 +0000
|
|
||||
@@ -674,7 +674,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 \ |
|
||||
@@ -1813,7 +1813,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); |
|
||||
@ -0,0 +1,315 @@ |
|||||
|
Patch assimilated from archlinux |
||||
|
|
||||
|
diff -u -r ../texlive-source-texlive-2018.2.orig/texk/web2c/luatexdir/image/pdftoepdf.w ./texk/web2c/luatexdir/image/pdftoepdf.w
|
||||
|
--- ../texlive-source-texlive-2018.2.orig/texk/web2c/luatexdir/image/pdftoepdf.w 2018-12-23 10:51:16.142985550 +0100
|
||||
|
+++ ./texk/web2c/luatexdir/image/pdftoepdf.w 2018-12-23 10:56:23.056297860 +0100
|
||||
|
@@ -35,7 +35,7 @@
|
||||
|
|
||||
|
extern void md5(Guchar *msg, int msgLen, Guchar *digest); |
||||
|
|
||||
|
-static GBool isInit = gFalse;
|
||||
|
+static bool isInit = false;
|
||||
|
|
||||
|
/* Maintain AVL tree of all PDF files for embedding */ |
||||
|
|
||||
|
@@ -363,10 +363,10 @@
|
||||
|
|
||||
|
static void copyString(PDF pdf, GooString * string) |
||||
|
{ |
||||
|
- char *p;
|
||||
|
+ const char *p;
|
||||
|
unsigned char c; |
||||
|
size_t i, l; |
||||
|
- p = string->getCString();
|
||||
|
+ p = string->c_str();
|
||||
|
l = (size_t) string->getLength(); |
||||
|
if (pdf->cave) |
||||
|
pdf_out(pdf, ' '); |
||||
|
@@ -393,7 +393,7 @@
|
||||
|
pdf->cave = true; |
||||
|
} |
||||
|
|
||||
|
-static void copyName(PDF pdf, char *s)
|
||||
|
+static void copyName(PDF pdf, const char *s)
|
||||
|
{ |
||||
|
pdf_out(pdf, '/'); |
||||
|
for (; *s != 0; s++) { |
||||
|
@@ -468,11 +468,11 @@
|
||||
|
break; |
||||
|
/* |
||||
|
case objNum: |
||||
|
- GBool isNum() { return type == objInt || type == objReal; }
|
||||
|
+ bool isNum() { return type == objInt || type == objReal; }
|
||||
|
break; |
||||
|
*/ |
||||
|
case objString: |
||||
|
- copyString(pdf, obj->getString());
|
||||
|
+ copyString(pdf, (GooString *)obj->getString());
|
||||
|
break; |
||||
|
case objName: |
||||
|
copyName(pdf, obj->getName()); |
||||
|
@@ -531,22 +531,22 @@
|
||||
|
{ |
||||
|
switch (pagebox_spec) { |
||||
|
case PDF_BOX_SPEC_MEDIA: |
||||
|
- return page->getMediaBox();
|
||||
|
+ return (PDFRectangle *) page->getMediaBox();
|
||||
|
break; |
||||
|
case PDF_BOX_SPEC_CROP: |
||||
|
- return page->getCropBox();
|
||||
|
+ return (PDFRectangle *) page->getCropBox();
|
||||
|
break; |
||||
|
case PDF_BOX_SPEC_BLEED: |
||||
|
- return page->getBleedBox();
|
||||
|
+ return (PDFRectangle *) page->getBleedBox();
|
||||
|
break; |
||||
|
case PDF_BOX_SPEC_TRIM: |
||||
|
- return page->getTrimBox();
|
||||
|
+ return (PDFRectangle *) page->getTrimBox();
|
||||
|
break; |
||||
|
case PDF_BOX_SPEC_ART: |
||||
|
- return page->getArtBox();
|
||||
|
+ return (PDFRectangle *) page->getArtBox();
|
||||
|
break; |
||||
|
default: |
||||
|
- return page->getMediaBox();
|
||||
|
+ return (PDFRectangle *) page->getMediaBox();
|
||||
|
break; |
||||
|
} |
||||
|
} |
||||
|
@@ -587,11 +587,11 @@
|
||||
|
PDFRectangle *pagebox; |
||||
|
int pdf_major_version_found, pdf_minor_version_found; |
||||
|
float xsize, ysize, xorig, yorig; |
||||
|
- if (isInit == gFalse) {
|
||||
|
+ if (isInit == false) {
|
||||
|
if (!(globalParams)) |
||||
|
globalParams = new GlobalParams(); |
||||
|
- globalParams->setErrQuiet(gFalse);
|
||||
|
- isInit = gTrue;
|
||||
|
+ globalParams->setErrQuiet(false);
|
||||
|
+ isInit = true;
|
||||
|
} |
||||
|
if (img_type(idict) == IMG_TYPE_PDF) |
||||
|
pdf_doc = refPdfDocument(img_filepath(idict), FE_FAIL); |
||||
|
@@ -966,7 +966,7 @@
|
||||
|
if (PdfDocumentTree != NULL) |
||||
|
avl_destroy(PdfDocumentTree, destroyPdfDocument); |
||||
|
PdfDocumentTree = NULL; |
||||
|
- if (isInit == gTrue)
|
||||
|
+ if (isInit == true)
|
||||
|
delete globalParams; |
||||
|
- isInit = gFalse;
|
||||
|
+ isInit = false;
|
||||
|
} |
||||
|
diff -u -r ../texlive-source-texlive-2018.2.orig/texk/web2c/luatexdir/lua/lepdflib.cc ./texk/web2c/luatexdir/lua/lepdflib.cc
|
||||
|
--- ../texlive-source-texlive-2018.2.orig/texk/web2c/luatexdir/lua/lepdflib.cc 2018-12-23 10:51:16.142985550 +0100
|
||||
|
+++ ./texk/web2c/luatexdir/lua/lepdflib.cc 2018-12-23 10:56:23.056297860 +0100
|
||||
|
@@ -240,7 +240,7 @@
|
||||
|
if (uobj->pd != NULL && uobj->pd->pc != uobj->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
uout = new_Attribute_userdata(L); |
||||
|
- uout->d = new Attribute(n, nlen, (Object *)uobj->d);
|
||||
|
+ uout->d = new Attribute((GooString)n, (Object *)uobj->d);
|
||||
|
uout->atype = ALLOC_LEPDF; |
||||
|
uout->pc = uobj->pc; |
||||
|
uout->pd = uobj->pd; |
||||
|
@@ -439,7 +439,7 @@
|
||||
|
break; |
||||
|
case 1: |
||||
|
if (lua_isboolean (L,1)) { |
||||
|
- uout->d = new Object(lua_toboolean(L, 1)? gTrue : gFalse);
|
||||
|
+ uout->d = new Object(lua_toboolean(L, 1)? true : false);
|
||||
|
uout->atype = ALLOC_LEPDF; |
||||
|
uout->pc = 0; |
||||
|
uout->pd = NULL; |
||||
|
@@ -596,7 +596,7 @@
|
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_##in); \ |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) \ |
||||
|
pdfdoc_changed_error(L); \ |
||||
|
- o = ((in *) uin->d)->function(); \
|
||||
|
+ o = (out *) ((in *) uin->d)->function(); \
|
||||
|
if (o != NULL) { \ |
||||
|
uout = new_##out##_userdata(L); \ |
||||
|
uout->d = o; \ |
||||
|
@@ -674,9 +674,9 @@
|
||||
|
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()); \
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength()); \
|
||||
|
else \ |
||||
|
lua_pushnil(L); \ |
||||
|
return 1; \ |
||||
|
@@ -911,7 +911,7 @@
|
||||
|
if (i > 0 && i <= len) { |
||||
|
gs = new GooString(); |
||||
|
if (((Array *) uin->d)->getString(i - 1, gs)) |
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
else |
||||
|
lua_pushnil(L); |
||||
|
delete gs; |
||||
|
@@ -1063,7 +1063,7 @@
|
||||
|
if (i > 0 && i <= len) { |
||||
|
gs = ((Catalog *) uin->d)->getJS(i - 1); |
||||
|
if (gs != NULL) |
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
else |
||||
|
lua_pushnil(L); |
||||
|
delete gs; |
||||
|
@@ -1125,12 +1125,12 @@
|
||||
|
|
||||
|
static int m_Dict_add(lua_State * L) |
||||
|
{ |
||||
|
- char *s;
|
||||
|
+ const char *s;
|
||||
|
udstruct *uin, *uobj; |
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_Dict); |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
- s = copyString(luaL_checkstring(L, 2));
|
||||
|
+ s = luaL_checkstring(L, 2);
|
||||
|
uobj = (udstruct *) luaL_checkudata(L, 3, M_Object); |
||||
|
((Dict *) uin->d)->add(s, std::move(*((Object *) uobj->d))); |
||||
|
return 0; |
||||
|
@@ -1378,7 +1378,7 @@
|
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_GooString); |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
- lua_pushlstring(L, ((GooString *) uin->d)->getCString(),
|
||||
|
+ lua_pushlstring(L, ((GooString *) uin->d)->c_str(),
|
||||
|
((GooString *) uin->d)->getLength()); |
||||
|
return 1; |
||||
|
} |
||||
|
@@ -1527,9 +1527,9 @@
|
||||
|
pdfdoc_changed_error(L); |
||||
|
luaL_checktype(L, 2, LUA_TBOOLEAN); |
||||
|
if (lua_toboolean(L, 2) != 0) |
||||
|
- *((Object *) uin->d) = Object(gTrue);
|
||||
|
+ *((Object *) uin->d) = Object(true);
|
||||
|
else |
||||
|
- *((Object *) uin->d) = Object(gFalse);
|
||||
|
+ *((Object *) uin->d) = Object(false);
|
||||
|
return 0; |
||||
|
} |
||||
|
|
||||
|
@@ -1813,8 +1813,8 @@
|
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
if (((Object *) uin->d)->isString()) { |
||||
|
- gs = ((Object *) uin->d)->getString();
|
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ gs = (GooString *)((Object *) uin->d)->getString();
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
} else |
||||
|
lua_pushnil(L); |
||||
|
return 1; |
||||
|
@@ -2051,7 +2051,7 @@
|
||||
|
pdfdoc_changed_error(L); |
||||
|
if (!((Object *) uin->d)->isDict()) |
||||
|
luaL_error(L, "Object is not a Dict"); |
||||
|
- ((Object *) uin->d)->dictAdd(copyString(s), std::move(*((Object *) uobj->d)));
|
||||
|
+ ((Object *) uin->d)->dictAdd(s, std::move(*((Object *) uobj->d)));
|
||||
|
return 0; |
||||
|
} |
||||
|
|
||||
|
@@ -2470,9 +2470,9 @@
|
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
- gs = ((PdfDocument *) uin->d)->doc->getFileName();
|
||||
|
+ gs = (GooString *) ((PdfDocument *) uin->d)->doc->getFileName();
|
||||
|
if (gs != NULL) |
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
else |
||||
|
lua_pushnil(L); |
||||
|
return 1; |
||||
|
@@ -2559,9 +2559,9 @@
|
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { |
||||
|
- gs = ((PdfDocument *) uin->d)->doc->readMetadata();
|
||||
|
+ gs = (GooString *) ((PdfDocument *) uin->d)->doc->readMetadata();
|
||||
|
if (gs != NULL) |
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
else |
||||
|
lua_pushnil(L); |
||||
|
} else |
||||
|
@@ -2577,7 +2577,7 @@
|
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) { |
||||
|
- obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
|
||||
|
+ obj = (StructTreeRoot *) ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
|
||||
|
uout = new_StructTreeRoot_userdata(L); |
||||
|
uout->d = obj; |
||||
|
uout->pc = uin->pc; |
||||
|
@@ -3038,12 +3038,12 @@
|
||||
|
|
||||
|
static int m_Attribute_setHidden(lua_State * L) |
||||
|
{ |
||||
|
- GBool i;
|
||||
|
+ bool i;
|
||||
|
udstruct *uin; |
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_Attribute); |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
- i = (GBool) lua_toboolean(L, 2);
|
||||
|
+ i = (bool) lua_toboolean(L, 2);
|
||||
|
((Attribute *) uin->d)->setHidden(i); |
||||
|
return 0; |
||||
|
} |
||||
|
@@ -3180,7 +3180,7 @@
|
||||
|
// Ref is false if the C++ functione return false |
||||
|
static int m_StructElement_getPageRef(lua_State * L) |
||||
|
{ |
||||
|
- GBool b;
|
||||
|
+ bool b;
|
||||
|
Ref *r; |
||||
|
udstruct *uin, *uout; |
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
||||
|
@@ -3226,16 +3226,16 @@
|
||||
|
|
||||
|
static int m_StructElement_getText(lua_State * L) |
||||
|
{ |
||||
|
- GBool i;
|
||||
|
+ bool i;
|
||||
|
GooString *gs; |
||||
|
udstruct *uin; |
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
||||
|
if (uin->pd != NULL && uin->pd->pc != uin->pc) |
||||
|
pdfdoc_changed_error(L); |
||||
|
- i = (GBool) lua_toboolean(L, 2);
|
||||
|
+ i = (bool) lua_toboolean(L, 2);
|
||||
|
gs = ((StructElement *) uin->d)->getText(i); |
||||
|
if (gs != NULL) |
||||
|
- lua_pushlstring(L, gs->getCString(), gs->getLength());
|
||||
|
+ lua_pushlstring(L, gs->c_str(), gs->getLength());
|
||||
|
else |
||||
|
lua_pushnil(L); |
||||
|
return 1; |
||||
|
@@ -3321,7 +3321,7 @@
|
||||
|
{ |
||||
|
Attribute::Type t; |
||||
|
Attribute::Owner o; |
||||
|
- GBool g;
|
||||
|
+ bool g;
|
||||
|
udstruct *uin, *uout; |
||||
|
const Attribute *a; |
||||
|
uin = (udstruct *) luaL_checkudata(L, 1, M_StructElement); |
||||
|
@@ -3329,7 +3329,7 @@
|
||||
|
pdfdoc_changed_error(L); |
||||
|
t = (Attribute::Type) luaL_checkint(L,1); |
||||
|
o = (Attribute::Owner) luaL_checkint(L,2); |
||||
|
- g = (GBool) lua_toboolean(L, 3);
|
||||
|
+ g = (bool) lua_toboolean(L, 3);
|
||||
|
a = ((StructElement *) uin->d)->findAttribute(t,g,o); |
||||
|
|
||||
|
if (a!=NULL){ |
||||
@ -0,0 +1,28 @@ |
|||||
|
diff -u -r ../texlive-source-texlive-2018.2.orig/texk/web2c/xetexdir/pdfimage.cpp ./texk/web2c/xetexdir/pdfimage.cpp
|
||||
|
--- ../texlive-source-texlive-2018.2.orig/texk/web2c/xetexdir/pdfimage.cpp 2018-12-23 10:51:16.249652209 +0100
|
||||
|
+++ ./texk/web2c/xetexdir/pdfimage.cpp 2018-12-23 12:00:04.419369459 +0100
|
||||
|
@@ -82,19 +82,19 @@
|
||||
|
switch (pdf_box) { |
||||
|
default: |
||||
|
case pdfbox_crop: |
||||
|
- r = page->getCropBox();
|
||||
|
+ r = (PDFRectangle *)page->getCropBox();
|
||||
|
break; |
||||
|
case pdfbox_media: |
||||
|
- r = page->getMediaBox();
|
||||
|
+ r = (PDFRectangle *)page->getMediaBox();
|
||||
|
break; |
||||
|
case pdfbox_bleed: |
||||
|
- r = page->getBleedBox();
|
||||
|
+ r = (PDFRectangle *)page->getBleedBox();
|
||||
|
break; |
||||
|
case pdfbox_trim: |
||||
|
- r = page->getTrimBox();
|
||||
|
+ r = (PDFRectangle *)page->getTrimBox();
|
||||
|
break; |
||||
|
case pdfbox_art: |
||||
|
- r = page->getArtBox();
|
||||
|
+ r = (PDFRectangle *)page->getArtBox();
|
||||
|
break; |
||||
|
} |
||||
|
|
||||
Loading…
Reference in new issue