pdftops: Use Poppler for all Apple LaserWriter models

We had already switched to Poppler to convert PDF to PostScript on
several Apple LaserWriter models as Ghostscript's PostScript did not
work on these printers, probably due to firmware bugs in the printers.

Now more Apple LaserWriter models were found which need the same
workaround. Therefore we use Poppler for all Apple LaserWriter models
now.

Issue #452

(manually backported from commit f93d64bfb6d2aae61ad4a676735c2194775f34c2)

diff --git a/filter/pdftops.c b/filter/pdftops.c
index 7515b80dab905f5023cc547f498a930f3a244d2e..4d4688bd5a21d16fb7d8e1000e8fc817bfa97fac 100644 (file)
--- a/filter/pdftops.c
+++ b/filter/pdftops.c
@@ -495,13 +495,9 @@ main(int  argc,                            /* I - Number of command-line args */
         !strncasecmp(make_model, "Dell", 4) ||
         strcasestr(make_model, "Minolta") ||
         (!strncasecmp(make_model, "Apple", 5) &&
-         (ptr = strcasestr(make_model, "LaserWriter")) &&
-         ((ptr = strcasestr(ptr + 11, "4")) || (ptr = strcasestr(ptr + 11, "12")) ||
-          (ptr = strcasestr(ptr + 11, "16"))) &&
-         ((ptr = strcasestr(ptr + 2, "600")) || (ptr = strcasestr(ptr + 2, "640")) ||
-          (ptr = strcasestr(ptr + 2, "660"))))))
+         (ptr = strcasestr(make_model, "LaserWriter")))))
     {
-      fprintf(stderr, "DEBUG: Switching to Poppler's pdftops instead of Ghostscript for Brother, Minolta, Konica Minolta, Dell, and Apple LaserWriter 16/600, 4/600, 12/640, 12/600, 12/660 to work around bugs in the printer's PS interpreters\n");
+      fprintf(stderr, "DEBUG: Switching to Poppler's pdftops instead of Ghostscript for Brother, Minolta, Konica Minolta, Dell, and Apple LaserWriter printers to work around bugs in the printer's PS interpreters\n");
       renderer = PDFTOPS;
     }
     else