support system poppler-0.73.0

git-svn-id: svn://tug.org/texlive/trunk@49639 c570f23f-e606-0410-a88d-b1316a301751

4 files changed, 3 insertions, 211 deletions

diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 6fb0e21f199..a46cec1b89c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,6 +1,6 @@
 2019-01-08  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
-	* pdftosrc-poppler0.73.0.cc: Add to support poppler-0.73.0.
+	* pdftosrc-poppler0.72.0.cc: Support poppler-0.73.0.
 
 2019-01-07  Hironobu Yamashita  <h.y.acetaminophen@gmail.com>
 
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index 53632681573..c0629e00945 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -25,8 +25,7 @@ pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018)  (April 14, 2018)
   Provide new files:
   pdftosrc-newpoppler.cc for poppler-0.59.0 upto poppler-0.70.1.
   pdftosrc-poppler0.71.0 for poppler-0.71.0.
-  pdftosrc-poppler0.72.0 for poppler-0.72.0.
-  pdftosrc-poppler0.73.0 for poppler-0.73.0 and newer.
+  pdftosrc-poppler0.72.0 for poppler-0.72.0 and newer.
   pdftoepdf-poppler0.68.0.cc for poppler-0.59.0 upto poppler-0.68.0.
   pdftoepdf-poppler0.69.0.cc for poppler-0.69.0.
   pdftoepdf-poppler0.70.0.cc for poppler-0.70.0 and poppler-0.70.1.
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
index 6089e68d943..d4e247ef62d 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.72.0.cc
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
                 Object objStr, obj1, obj2;
                 int nObjects, first, n;
                 int localOffset = 0;
-                Guint firstOffset;
+                unsigned int firstOffset;
 
                 objStr = xref->fetch(e->offset, 0);
                 assert(objStr.isStream());
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.73.0.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.73.0.cc
deleted file mode 100644
index d4e247ef62d..00000000000
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc-poppler0.73.0.cc
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
-Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
-
-This file is part of pdfTeX.
-
-pdfTeX 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 2 of the License, or
-(at your option) any later version.
-
-pdfTeX is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-/*
-This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
-https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
-by Arch Linux. The poppler should be 0.72.0 or newer versions.
-POPPLER_VERSION should be defined.
-*/
-
-#include <w2c/config.h>
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifdef POPPLER_VERSION
-#define GString GooString
-#define xpdfVersion POPPLER_VERSION
-#include <dirent.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#else
-#error POPPLER_VERSION should be defined.
-#endif
-#include <assert.h>
-
-#include "Object.h"
-#include "Stream.h"
-#include "Lexer.h"
-#include "Parser.h"
-#include "Array.h"
-#include "Dict.h"
-#include "XRef.h"
-#include "Catalog.h"
-#include "Page.h"
-#include "GfxFont.h"
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
-
-static XRef *xref = 0;
-
-int main(int argc, char *argv[])
-{
-    char *p, buf[1024];
-    PDFDoc *doc;
-    GString *fileName;
-    Stream *s;
-    Object srcStream, srcName, catalogDict;
-    FILE *outfile;
-    char *outname;
-    int objnum = 0, objgen = 0;
-    bool extract_xref_table = false;
-    int c;
-    fprintf(stderr, "pdftosrc version %s\n", xpdfVersion);
-    if (argc < 2) {
-        fprintf(stderr,
-                "Usage: pdftosrc <PDF-file> [<stream-object-number>]\n");
-        exit(1);
-    }
-    fileName = new GString(argv[1]);
-    globalParams = new GlobalParams();
-    doc = new PDFDoc(fileName);
-    if (!doc->isOk()) {
-        fprintf(stderr, "Invalid PDF file\n");
-        exit(1);
-    }
-    if (argc >= 3) {
-        objnum = atoi(argv[2]);
-        if (argc >= 4)
-            objgen = atoi(argv[3]);
-    }
-    xref = doc->getXRef();
-    catalogDict = xref->getCatalog();
-    if (!catalogDict.isDict("Catalog")) {
-        fprintf(stderr, "No Catalog found\n");
-        exit(1);
-    }
-    srcStream = Object(objNull);
-    if (objnum == 0) {
-        srcStream = catalogDict.dictLookup("SourceObject");
-        static char const_SourceFile[] = "SourceFile";
-        if (!srcStream.isStream(const_SourceFile)) {
-            fprintf(stderr, "No SourceObject found\n");
-            exit(1);
-        }
-        srcName = srcStream.getStream()->getDict()->lookup("SourceName");
-        if (!srcName.isString()) {
-            fprintf(stderr, "No SourceName found\n");
-            exit(1);
-        }
-        outname = (char *)srcName.getString()->c_str();
-        // We cannot free srcName, as objname shares its string.
-        // srcName.free();
-    } else if (objnum > 0) {
-        srcStream = xref->fetch(objnum, objgen);
-        if (!srcStream.isStream()) {
-            fprintf(stderr, "Not a Stream object\n");
-            exit(1);
-        }
-        sprintf(buf, "%s", fileName->c_str());
-        if ((p = strrchr(buf, '.')) == 0)
-            p = strchr(buf, 0);
-        if (objgen == 0)
-            sprintf(p, ".%i", objnum);
-        else
-            sprintf(p, ".%i+%i", objnum, objgen);
-        outname = buf;
-    } else {                    // objnum < 0 means we are extracting the XRef table
-        extract_xref_table = true;
-        sprintf(buf, "%s", fileName->c_str());
-        if ((p = strrchr(buf, '.')) == 0)
-            p = strchr(buf, 0);
-        sprintf(p, ".xref");
-        outname = buf;
-    }
-    if (!(outfile = fopen(outname, "wb"))) {
-        fprintf(stderr, "Cannot open file \"%s\" for writing\n", outname);
-        exit(1);
-    }
-    if (extract_xref_table) {
-        int size = xref->getNumObjects();
-        int i;
-        for (i = 0; i < size; i++) {
-            if (xref->getEntry(i)->offset == 0xffffffff)
-                break;
-        }
-        size = i;
-        fprintf(outfile, "xref\n");
-        fprintf(outfile, "0 %i\n", size);
-        for (i = 0; i < size; i++) {
-            XRefEntry *e = xref->getEntry(i);
-            if (e->type != xrefEntryCompressed)
-                fprintf(outfile, "%.10lu %.5i %s\n",
-                        (long unsigned) e->offset, e->gen,
-                        (e->type == xrefEntryFree ? "f" : "n"));
-            else {              // e->offset is the object number of the object stream
-                Stream *str;
-                Lexer *lexer;
-                Parser *parser;
-                Object objStr, obj1, obj2;
-                int nObjects, first, n;
-                int localOffset = 0;
-                unsigned int firstOffset;
-
-                objStr = xref->fetch(e->offset, 0);
-                assert(objStr.isStream());
-                obj1 = objStr.streamGetDict()->lookup("N");
-                nObjects = obj1.getInt();
-                obj1 = objStr.streamGetDict()->lookup("First");
-                first = obj1.getInt();
-                firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
-
-                // parse the header: object numbers and offsets
-                objStr.streamReset();
-                str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
-                lexer = new Lexer(xref, str);
-                parser = new Parser(xref, lexer, false);
-                for (n = 0; n < nObjects; ++n) {
-                    obj1 = parser->getObj();
-                    obj2 = parser->getObj();
-                    if (n == e->gen)
-                        localOffset = obj2.getInt();
-                }
-                while (str->getChar() != EOF) ;
-                delete parser;
-
-                fprintf(outfile, "%.10lu 00000 n\n",
-                        (long unsigned)(firstOffset + localOffset));
-            }
-        }
-    } else {
-        s = srcStream.getStream();
-        s->reset();
-        while ((c = s->getChar()) != EOF)
-            fputc(c, outfile);
-    }
-    if (objnum == 0)
-        fprintf(stderr, "Source file extracted to %s\n", outname);
-    else if (objnum > 0)
-        fprintf(stderr, "Stream object extracted to %s\n", outname);
-    else
-        fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
-    fclose(outfile);
-    delete doc;
-    delete globalParams;
-}