From d6b7480872eb2e4f0bdf83c496902a3ab64ea034 Mon Sep 17 00:00:00 2001
From: Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Date: Tue, 17 Oct 2017 21:52:13 +0000
Subject: pdftexdir: remove unused lines in new files

git-svn-id: svn://tug.org/texlive/trunk@45555 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc   | 23 ++++------------------
 .../texk/web2c/pdftexdir/pdftosrc-newpoppler.cc    |  5 +----
 2 files changed, 5 insertions(+), 23 deletions(-)

(limited to 'Build')

diff --git a/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
index 01646b60988..d01960fb108 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
@@ -48,10 +48,7 @@ POPPLER_VERSION should be defined.
 #include <goo/gfile.h>
 #define GString GooString
 #else
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+#error POPPLER_VERSION should be defined.
 #endif
 #include <assert.h>
 
@@ -679,7 +676,7 @@ static void writeEncodings()
 #ifdef POPPLER_VERSION
         r->font->decRefCnt();
 #else
-        delete r->font;
+#error POPPLER_VERSION should be defined.
 #endif
         delete r;
     }
@@ -722,7 +719,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
 #ifdef POPPLER_VERSION
     int pdf_major_version_found, pdf_minor_version_found;
 #else
-    float pdf_version_found, pdf_version_wanted;
+#error POPPLER_VERSION should be defined.
 #endif
     // initialize
     if (!isInit) {
@@ -754,19 +751,7 @@ read_pdf_info(char *image_name, char *page_name, int page_num,
         }
     }
 #else
-    pdf_version_found = pdf_doc->doc->getPDFVersion();
-    pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-    if (pdf_version_found > pdf_version_wanted + 0.01) {
-        char msg[] =
-            "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
-        if (pdf_inclusion_errorlevel > 0) {
-            pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
-        } else if (pdf_inclusion_errorlevel < 0) {
-            ; /* do nothing */
-        } else { /* = 0, give warning */
-            pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
-        }
-    }
+#error POPPLER_VERSION should be defined.
 #endif
     epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
     if (page_name) {
diff --git a/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc b/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
index 99109695bab..4e2bcadbd68 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
@@ -40,10 +40,7 @@ POPPLER_VERSION should be defined.
 #include <goo/gmem.h>
 #include <goo/gfile.h>
 #else
-#include <aconf.h>
-#include <GString.h>
-#include <gmem.h>
-#include <gfile.h>
+#error POPPLER_VERSION should be defined.
 #endif
 #include <assert.h>
 
-- 
cgit v1.2.3