From 6c19572dc706a05f45ba200b12d3b4bfdafe2206 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Wed, 14 Mar 2012 21:06:49 +0100 Subject: Imported Upstream version 4.0.14 --- ChangeLog | 12 ++++++++++++ README | 2 +- USAGE | 2 +- VERSION | 2 +- VERSION.full | 2 +- configure | 20 ++++++++++---------- configure.ac | 2 +- foomaticrip.c | 33 +++++++++++++++++++-------------- 8 files changed, 46 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index d375dd4..016afdc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2012-03-14 Till Kamppeter + + * Tagged branch for release 4.0.14. + + * VERSION, README, USAGE, configure.ac: Updated for release 4.0.14. + + * foomaticrip.c: If the input data is PDF but the driver requires + PostScript, use the pdftops CUPS filter when CUPS is the spooler. + This way we always use the same method to convert PDF to PostScript + in the whole system, including any workarounds applied in the CUPS + filter. + 2012-03-02 Till Kamppeter * Tagged branch for release 4.0.13. diff --git a/README b/README index 106a27a..5e16aa0 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -Foomatic 4.0.13 +Foomatic 4.0.14 =============== diff --git a/USAGE b/USAGE index 7f1f35a..3d5fcab 100644 --- a/USAGE +++ b/USAGE @@ -1,5 +1,5 @@ -Foomatic 4.0.13 +Foomatic 4.0.14 =============== foomatic-filters diff --git a/VERSION b/VERSION index 041792e..80c4caf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.13 +4.0.14 diff --git a/VERSION.full b/VERSION.full index 6dc0019..6b6029a 100644 --- a/VERSION.full +++ b/VERSION.full @@ -1 +1 @@ -4.0.13.247 +4.0.14.249 diff --git a/configure b/configure index 46e560d..ed00e18 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.13. +# Generated by GNU Autoconf 2.65 for foomatic-rip 4.0.14. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -549,8 +549,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='foomatic-rip' PACKAGE_TARNAME='foomatic-rip' -PACKAGE_VERSION='4.0.13' -PACKAGE_STRING='foomatic-rip 4.0.13' +PACKAGE_VERSION='4.0.14' +PACKAGE_STRING='foomatic-rip 4.0.14' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1270,7 +1270,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures foomatic-rip 4.0.13 to adapt to many kinds of systems. +\`configure' configures foomatic-rip 4.0.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of foomatic-rip 4.0.13:";; + short | recursive ) echo "Configuration of foomatic-rip 4.0.14:";; esac cat <<\_ACEOF @@ -1440,7 +1440,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -foomatic-rip configure 4.0.13 +foomatic-rip configure 4.0.14 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -1897,7 +1897,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by foomatic-rip $as_me 4.0.13, which was +It was created by foomatic-rip $as_me 4.0.14, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2705,7 +2705,7 @@ fi # Define the identity of the package. PACKAGE='foomatic-rip' - VERSION='4.0.13' + VERSION='4.0.14' # Some tools Automake needs. @@ -6871,7 +6871,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by foomatic-rip $as_me 4.0.13, which was +This file was extended by foomatic-rip $as_me 4.0.14, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6937,7 +6937,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -foomatic-rip config.status 4.0.13 +foomatic-rip config.status 4.0.14 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9c9d551..6a322cc 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.61]) -AC_INIT(foomatic-rip, [4.0.13]) +AC_INIT(foomatic-rip, [4.0.14]) AM_INIT_AUTOMAKE([no-define]) AC_CONFIG_SRCDIR([options.c]) diff --git a/foomaticrip.c b/foomaticrip.c index 799a259..3fdffe4 100644 --- a/foomaticrip.c +++ b/foomaticrip.c @@ -1043,28 +1043,33 @@ int print_file(const char *filename, int convert) filename = tmpfilename; } - /* If the spooler is CUPS we remove the /usr/lib/cups/filter - (CUPS filter directory, can be different, but ends with - "/cups/filter") which CUPS adds to the beginning of $PATH, - so that Poppler's/XPDF's pdftops filter is called and not - the one of CUPS, as the one of CUPS has a different command - line and does undesired page management operations. + /* If the spooler is CUPS we use the pdftops filter of CUPS, + to have always the same PDF->PostScript conversion method + in the whole printing environment, including incompatibility + workarounds in the CUPS filter (so this way we also have to + maintain all these quirks only once). + The "-dNOINTERPOLATE" makes Ghostscript rendering significantly faster. + Note that Ghostscript's "pswrite" output device turns text into bitmaps and therefore produces huge PostScript files. In addition, this output device is deprecated. Therefore we use "ps2write". + We give priority to Ghostscript here and use Poppler if Ghostscript is not available. */ - snprintf(pdf2ps_cmd, PATH_MAX, - "gs -q -sstdout=%%stderr -sDEVICE=ps2write -sOutputFile=- " - "-dBATCH -dNOPAUSE -dPARANOIDSAFER -dNOINTERPOLATE %s 2>/dev/null || " - "%spdftops -level2 -origpagesizes %s - 2>/dev/null", - filename, - (spooler == SPOOLER_CUPS ? - "PATH=${PATH#*/cups/filter:} " : ""), - filename); + if (spooler == SPOOLER_CUPS) + snprintf(pdf2ps_cmd, PATH_MAX, + "pdftops '%s' '%s' '%s' '%s' '%s' '%s'", + job->id, job->user, job->title, "1", job->optstr, + filename); + else + snprintf(pdf2ps_cmd, PATH_MAX, + "gs -q -sstdout=%%stderr -sDEVICE=ps2write -sOutputFile=- " + "-dBATCH -dNOPAUSE -dPARANOIDSAFER -dNOINTERPOLATE %s 2>/dev/null || " + "pdftops -level2 -origpagesizes %s - 2>/dev/null", + filename, filename); renderer_pid = start_system_process("pdf-to-ps", pdf2ps_cmd, &in, &out); -- cgit v1.2.3