texlive[45555] Build/source/texk/web2c/pdftexdir: pdftexdir: remove

[commits+kakuto at tug.org]

Revision: 45555
          http://tug.org/svn/texlive?view=revision&revision=45555
Author:   kakuto
Date:     2017-10-17 23:52:13 +0200 (Tue, 17 Oct 2017)
Log Message:
-----------
pdftexdir: remove unused lines in new files

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
    trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc

Modified: trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc	2017-10-17 20:42:12 UTC (rev 45554)
+++ trunk/Build/source/texk/web2c/pdftexdir/pdftoepdf-newpoppler.cc	2017-10-17 21:52:13 UTC (rev 45555)
@@ -48,10 +48,7 @@
 #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 @@
 #ifdef POPPLER_VERSION
         r->font->decRefCnt();
 #else
-        delete r->font;
+#error POPPLER_VERSION should be defined.
 #endif
         delete r;
     }
@@ -722,7 +719,7 @@
 #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 @@
         }
     }
 #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) {

Modified: trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc	2017-10-17 20:42:12 UTC (rev 45554)
+++ trunk/Build/source/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc	2017-10-17 21:52:13 UTC (rev 45555)
@@ -40,10 +40,7 @@
 #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>