remove support of poppler

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

4 files changed, 6 insertions, 65 deletions

diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 745ea3b05ed..725290cec70 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-15  Akira Kakuto  <kakuto@w32tex.org>
+
+	* pdftoepdf.cc, pdftosrc.cc, NEWS: remove support of poppler.
+
 2020-05-14  Karl Berry  <karl@freefriends.org>
 
 	* pdftoepdf-poppler0.68.0.cc,
diff --git a/Build/source/texk/web2c/pdftexdir/NEWS b/Build/source/texk/web2c/pdftexdir/NEWS
index d8982fea554..412b4690543 100644
--- a/Build/source/texk/web2c/pdftexdir/NEWS
+++ b/Build/source/texk/web2c/pdftexdir/NEWS
@@ -34,27 +34,7 @@ pdfTeX 3.14159265-2.6-1.40.19 (TeX Live 2018)  (April 14, 2018)
     range for Unicode; the implication is that multiple code points must
     now be separated by spaces (as has always been documented).
 
-- source: support xpdf-4 by default, or xpdf-3.04, or poppler-0.57.0
-  and older, via #defines.
-  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 upto poppler-0.75.0.
-  pdftosrc-poppler0.76.0 for poppler-0.76.0 upto poppler-0.82.0.
-  pdftosrc-poppler0.83.0 for poppler-0.83.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.
-  pdftoepdf-poppler0.71.0.cc for poppler-0.71.0.
-  pdftoepdf-poppler0.72.0.cc for poppler-0.72.0 upto poppler-0.74.0.
-  pdftoepdf-poppler0.75.0.cc for poppler-0.75.0.
-  pdftoepdf-poppler0.76.0.cc for poppler-0.76.0 upto poppler-0.82.0.
-  pdftoepdf-poppler0.83.0.cc for poppler-0.83.0 upto poppler-0.85.0.
-  pdftoepdf-poppler0.86.0.cc for poppler-0.86.0 and newer.
-  Note that pdftosrc-*.cc and pdftoepdf-*.cc should be
-  renamed as pdftosrc.cc, and pdftoepdf.cc, respectively, before
-  compilation. Further, POPPLER_VERSION should be defined properly
-  like -DPOPPLER_VERSION='"0.86.0"'.
+- source: support xpdf-4 by default, or xpdf-3.04, via #defines.
 
 ---------------------------------------------------------------
 pdfTeX 3.14159265-2.6-1.40.18 (TeX Live 2017)  (April 27, 2017)
diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
index 4242ce3e340..e0ce148834f 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf.cc
@@ -31,19 +31,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <string.h>
 #include <ctype.h>
 
-#ifdef POPPLER_VERSION
-#include <dirent.h>
-#include <poppler-config.h>
-#include <goo/GooString.h>
-#include <goo/gmem.h>
-#include <goo/gfile.h>
-#define GString GooString
-#else
 #include <aconf.h>
 #include <GString.h>
 #include <gmem.h>
 #include <gfile.h>
-#endif
 #include <assert.h>
 
 #include "Object.h"
@@ -682,11 +673,7 @@ static void writeEncodings()
     }
     for (r = encodingList; r != 0; r = n) {
         n = r->next;
-#ifdef POPPLER_VERSION
-        r->font->decRefCnt();
-#else
         delete r->font;
-#endif
         delete r;
     }
 }
@@ -725,11 +712,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
     PdfDocument *pdf_doc;
     Page *page;
     PDFRectangle *pagebox;
-#ifdef POPPLER_VERSION
-    int pdf_major_version_found, pdf_minor_version_found;
-#else
     float pdf_version_found, pdf_version_wanted;
-#endif
     // initialize
     if (!isInit) {
         globalParams = new GlobalParams();
@@ -744,22 +727,6 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
     // this works only for PDF 1.x -- but since any versions of PDF newer
     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
     // then have to changed drastically anyway.
-#ifdef POPPLER_VERSION
-    pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
-    pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-    if ((pdf_major_version_found > major_pdf_version_wanted)
-     || (pdf_minor_version_found > minor_pdf_version_wanted)) {
-        const char *msg =
-            "PDF inclusion: found PDF version <%d.%d>, but at most version <%d.%d> allowed";
-        if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
-        } else if (pdf_inclusion_errorlevel < 0) {
-            ; /* do nothing */
-        } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
-        }
-    }
-#else
     pdf_version_found = pdf_doc->doc->getPDFVersion();
     pdf_version_wanted = major_pdf_version_wanted + (minor_pdf_version_wanted * 0.1);
     if (pdf_version_found > pdf_version_wanted + 0.01) {
@@ -773,7 +740,6 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
             pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
         }
     }
-#endif
     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
     if (page_name) {
         // get page by name
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
index 67be229ed8c..2fd9d5f9283 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc.cc
@@ -24,19 +24,10 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #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
 #include <aconf.h>
 #include <GString.h>
 #include <gmem.h>
 #include <gfile.h>
-#endif
 #include <assert.h>
 
 #include "Object.h"
@@ -181,7 +172,7 @@ int main(int argc, char *argv[])
                     obj1.free();
                     obj2.free();
                 }
-#if defined(POPPLER_VERSION) || defined(XPDF304)
+#if defined(XPDF304)
                 while (str->getChar() != EOF) ;
 #else /* xpdf 4.00 */
                 lexer->skipToEOF();