gstoraster, foomatic-rip: gs command line for counting pages takes too long

diff --git a/NEWS b/NEWS
index b0a87143c4d6b6b0b9b697e858b2a3c57468fcb5..433061fcd074fb2995da243892fde96df91c8fbf 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,10 @@ NEWS - OpenPrinting CUPS Filters v1.28.8 - 2021-03-25
 
 CHANGES IN V1.28.9
 
+       - gstoraster, foomatic-rip: Fixed Ghostscript command line for
+         counting pages as it took too long on PDFs from evince when
+         printing DjVu files (Issue #354, Pull request #371, Ubuntu
+         bug #1920730).
        - cups-browsed: Renamed ldap_connect() due to conflict in
          new openldap (Issue #367, Pull request #370).
        - pdftoraster: Free color data after processing of each page

diff --git a/filter/foomatic-rip/postscript.c b/filter/foomatic-rip/postscript.c
index bcff56aa36d8d79a0fcd12d58dc7bcad13407d1e..f68860cc781310ee9ec41cbaf0bf783be563e3b4 100644 (file)
--- a/filter/foomatic-rip/postscript.c
+++ b/filter/foomatic-rip/postscript.c
@@ -174,7 +174,10 @@ int ps_pages(const char *filename)
     char output[31] = "";
     int pagecount;
     size_t bytes;
-    snprintf(gscommand, 65536, "%s -q -dNOPAUSE -dBATCH -sDEVICE=bbox %s 2>&1 | grep -c HiResBoundingBox",
+    /* Ghostscript runs too long while printing PDF fikes converted from
+       djvu files. Using -dDEVICEWIDTHPOINTS=1 -dDEVICEHEIGHTPOINTS=1
+       solves the problem */
+    snprintf(gscommand, 65536, "%s -q -dNOPAUSE -dBATCH -sDEVICE=bbox -dDEVICEWIDTHPOINTS=1 -dDEVICEHEIGHTPOINTS=1 %s 2>&1 | grep -c HiResBoundingBox",
               CUPS_GHOSTSCRIPT, filename);
     FILE *pd = popen(gscommand, "r");
     bytes = fread(output, 1, 31, pd);

diff --git a/filter/gstoraster.c b/filter/gstoraster.c
index e0ef2a0dd342ee76264f2bb870b9fd094832633a..1669603e5435d02dbeba6bc01b7394d7c7e2a4eb 100644 (file)
--- a/filter/gstoraster.c
+++ b/filter/gstoraster.c
@@ -733,7 +733,10 @@ main (int argc, char **argv, char *envp[])
     char output[31] = "";
     int pagecount;
     size_t bytes;
-    snprintf(gscommand, 65536, "%s -q -dNOPAUSE -dBATCH -sDEVICE=bbox %s 2>&1 | grep -c HiResBoundingBox",
+    /* Ghostscript runs too long while printing PDF fikes converted from
+       djvu files. Using -dDEVICEWIDTHPOINTS=1 -dDEVICEHEIGHTPOINTS=1
+       solves the problem */
+    snprintf(gscommand, 65536, "%s -q -dNOPAUSE -dBATCH -sDEVICE=bbox -dDEVICEWIDTHPOINTS=1 -dDEVICEHEIGHTPOINTS=1 %s 2>&1 | grep -c HiResBoundingBox",
             CUPS_GHOSTSCRIPT, filename);
 
     FILE *pd = popen(gscommand, "r");