diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-11 23:47:36 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-05-11 23:47:36 -0400 |
commit | 2f4f182f6c50fcf5bf0316c10ccd0c0f773fc292 (patch) | |
tree | d1f62f95f3202d2f802138888ce4b994cd22e574 /libre/texlive-bin-libre/poppler-0.26.patch | |
parent | ea735e9d809fb9e151b00660cf6c708f570c602d (diff) | |
parent | 4d73eaaa8e2c324c73df2f1bc819b0ebe1db3fd3 (diff) | |
download | abslibre-2f4f182f6c50fcf5bf0316c10ccd0c0f773fc292.tar.gz abslibre-2f4f182f6c50fcf5bf0316c10ccd0c0f773fc292.tar.bz2 abslibre-2f4f182f6c50fcf5bf0316c10ccd0c0f773fc292.zip |
Merge branch 'master' of git://projects.parabolagnulinux.org/abslibre
Diffstat (limited to 'libre/texlive-bin-libre/poppler-0.26.patch')
-rw-r--r-- | libre/texlive-bin-libre/poppler-0.26.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/libre/texlive-bin-libre/poppler-0.26.patch b/libre/texlive-bin-libre/poppler-0.26.patch new file mode 100644 index 000000000..fde123f62 --- /dev/null +++ b/libre/texlive-bin-libre/poppler-0.26.patch @@ -0,0 +1,104 @@ +--- trunk/source/texk/web2c/luatexdir/image/epdf.h 2013/01/20 19:58:26 4559 ++++ trunk/source/texk/web2c/luatexdir/image/epdf.h 2014/01/02 15:35:31 4718 +@@ -40,21 +40,22 @@ + # include <goo/GooString.h> + # include <goo/gmem.h> + # include <goo/gfile.h> +-# include "Object.h" +-# include "Stream.h" +-# include "Gfx.h" +-# include "Annot.h" +-# include "Array.h" +-# include "Dict.h" +-# include "XRef.h" +-# include "Catalog.h" +-# include "Link.h" +-# include "Page.h" +-# include "GfxFont.h" +-# include "PDFDoc.h" +-# include "GlobalParams.h" +-# include "Error.h" +-# include "FileSpec.h" ++# include <Object.h> ++# include <Stream.h> ++# include <Gfx.h> ++# include <Annot.h> ++# include <Array.h> ++# include <Dict.h> ++# include <XRef.h> ++# include <Catalog.h> ++# include <StructTreeRoot.h> ++# include <Link.h> ++# include <Page.h> ++# include <GfxFont.h> ++# include <PDFDoc.h> ++# include <GlobalParams.h> ++# include <Error.h> ++# include <FileSpec.h> + + extern "C" { + +@@ -81,8 +82,8 @@ + # include "utils/avlstuff.h" + # include "pdf/pdftypes.h" + +-# include "lua52/lua.h" +-# include "lua52/lauxlib.h" ++# include "lua.h" ++# include "lauxlib.h" + + /* pdfgen.w */ + extern int ten_pow[10]; +--- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013/04/05 10:54:08 4629 ++++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014/01/02 15:35:31 4718 +@@ -65,6 +65,7 @@ + #define M_PDFRectangle "PDFRectangle" + #define M_Ref "Ref" + #define M_Stream "Stream" ++#define M_StructTreeRoot "StructTreeRoot" + #define M_XRefEntry "XRefEntry" + #define M_XRef "XRef" + +@@ -96,6 +97,7 @@ + new_poppler_userdata(PDFRectangle); + new_poppler_userdata(Ref); + new_poppler_userdata(Stream); ++new_poppler_userdata(StructTreeRoot); + new_poppler_userdata(XRef); + + //********************************************************************** +@@ -573,7 +575,11 @@ + + m_poppler_get_GOOSTRING(Catalog, getBaseURI); + m_poppler_get_GOOSTRING(Catalog, readMetadata); ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + m_poppler_get_poppler(Catalog, Object, getStructTreeRoot); ++#else ++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot); ++#endif + + static int m_Catalog_findPage(lua_State * L) + { +@@ -2146,14 +2152,22 @@ + + static int m_PDFDoc_getStructTreeRoot(lua_State * L) + { ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + Object *obj; ++#else ++ StructTreeRoot *obj; ++#endif + udstruct *uin, *uout; + uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc); + 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(); ++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT + uout = new_Object_userdata(L); ++#else ++ uout = new_StructTreeRoot_userdata(L); ++#endif + uout->d = obj; + uout->pc = uin->pc; + uout->pd = uin->pd; |