libcupsfilters: In 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

diff --git a/cupsfilters/pdftops.c b/cupsfilters/pdftops.c
index fcadb175d8678dea90ce031b32cb58b2212e8ace..900d3b1a25cbc9de0761d913cab80e3df2d8c4af 100644 (file)
--- a/cupsfilters/pdftops.c
+++ b/cupsfilters/pdftops.c
@@ -462,20 +462,13 @@ pdftops(int inputfd,         /* I - File descriptor input stream */
         !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")))))
     {
       if (log) log(ld, FILTER_LOGLEVEL_DEBUG,
                   "pdftops: 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");
+                  "and Apple LaserWriter printers to work around bugs in the "
+                  "printer's PS interpreters");
       renderer = PDFTOPS;
     }
     else