Attachment #185568 for bug #263070

Lines 3-9 Link Here

(-)config-scripts/cups-pdf.m4 (-7 / +46 lines)
3	dnl	3	dnl
4	dnl PDF filter configuration stuff for the Common UNIX Printing System (CUPS).	4	dnl PDF filter configuration stuff for the Common UNIX Printing System (CUPS).
5	dnl	5	dnl
6	dnl Copyright 2007 by Apple Inc.	6	dnl Copyright 2007-2009 by Apple Inc.
7	dnl Copyright 2006 by Easy Software Products, all rights reserved.	7	dnl Copyright 2006 by Easy Software Products, all rights reserved.
8	dnl	8	dnl
9	dnl These coded instructions, statements, and computer programs are the	9	dnl These coded instructions, statements, and computer programs are the
Lines 14-32 Link Here
14	dnl	14	dnl
15		15
16	AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])	16	AC_ARG_ENABLE(pdftops, [ --enable-pdftops build pdftops filter, default=auto ])
		17	AC_ARG_WITH(pdftops, [ --with-pdftops set pdftops filter (gs,pdftops,none), default=pdftops ])
17		18
		19	if test "x$enable_pdftops" = xno -a "x$with_pdftops" = x; then
		20	with_pdftops=no
		21	fi
		22
18	PDFTOPS=""	23	PDFTOPS=""
		24	CUPS_PDFTOPS=""
		25	CUPS_GHOSTSCRIPT=""
19		26
20	if test "x$enable_pdftops" != xno; then	27	case "x$with_pdftops" in
21	AC_MSG_CHECKING(whether to build pdftops filter)	28	x) # Default/auto
22	if test "x$enable_pdftops" = xyes -o $uname != Darwin; then	29	if test $uname != Darwin; then
		30	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
		31	if test "x$CUPS_PDFTOPS" != x; then
		32	AC_DEFINE(HAVE_PDFTOPS)
		33	PDFTOPS="pdftops"
		34	else
		35	AC_PATH_PROG(CUPS_GHOSTSCRIPT, gs)
		36	if test "x$CUPS_GHOSTSCRIPT" != x; then
		37	AC_DEFINE(HAVE_GHOSTSCRIPT)
		38	PDFTOPS="pdftops"
		39	fi
		40	fi
		41	fi
		42	;;
		43
		44	xgs)
		45	AC_PATH_PROG(CUPS_GHOSTSCRIPT, gs)
		46	if test "x$CUPS_GHOSTSCRIPT" != x; then
		47	AC_DEFINE(HAVE_GHOSTSCRIPT)
23	PDFTOPS="pdftops"	48	PDFTOPS="pdftops"
24	AC_MSG_RESULT(yes)
25	else	49	else
26	AC_MSG_RESULT(no)	50	AC_MSG_ERROR(Unable to find gs program!)
		51	exit 1
27	fi	52	fi
28	fi	53	;;
29		54
		55	xpdftops)
		56	AC_PATH_PROG(CUPS_PDFTOPS, pdftops)
		57	if test "x$CUPS_PDFTOPS" != x; then
		58	AC_DEFINE(HAVE_PDFTOPS)
		59	PDFTOPS="pdftops"
		60	else
		61	AC_MSG_ERROR(Unable to find pdftops program!)
		62	exit 1
		63	fi
		64	;;
		65	esac
		66
		67	AC_DEFINE_UNQUOTED(CUPS_PDFTOPS, "$CUPS_PDFTOPS")
		68	AC_DEFINE_UNQUOTED(CUPS_GHOSTSCRIPT, "$CUPS_GHOSTSCRIPT")
30	AC_SUBST(PDFTOPS)	69	AC_SUBST(PDFTOPS)
31		70
32	dnl	71	dnl

Lines 3-9 Link Here

(-)Makefile (-2 / +2 lines)
3	#	3	#
4	# Top-level Makefile for the Common UNIX Printing System (CUPS).	4	# Top-level Makefile for the Common UNIX Printing System (CUPS).
5	#	5	#
6	# Copyright 2007-2008 by Apple Inc.	6	# Copyright 2007-2009 by Apple Inc.
7	# Copyright 1997-2007 by Easy Software Products, all rights reserved.	7	# Copyright 1997-2007 by Easy Software Products, all rights reserved.
8	#	8	#
9	# These coded instructions, statements, and computer programs are the	9	# These coded instructions, statements, and computer programs are the
Lines 20-26 Link Here
20	#	20	#
21		21
22	DIRS = cups backend berkeley cgi-bin filter locale man monitor \	22	DIRS = cups backend berkeley cgi-bin filter locale man monitor \
23	notifier $(PDFTOPS) scheduler systemv test \	23	notifier scheduler systemv test \
24	$(PHPDIR) \	24	$(PHPDIR) \
25	conf data doc $(FONTS) ppd templates	25	conf data doc $(FONTS) ppd templates
26		26




/*
 * "$Id$"
 *
 *   PDF to PostScript filter front-end for the Common UNIX Printing
 *   System (CUPS).
 *
 *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2006 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the
 *   property of Apple Inc. and are protected by Federal copyright
 *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
 *   which should have been included with this file.  If this file is
 *   file is missing or damaged, see the license at "http://www.cups.org/".
 *
 * Contents:
 *
 *   main()       - Main entry for filter...
 *   cancel_job() - Flag the job as canceled.
 */

/*
 * Include necessary headers...
 */

#include <cups/cups.h>
#include <cups/string.h>
#include <cups/i18n.h>
#include <signal.h>
#include <sys/wait.h>
#include <errno.h>


/*
 * Local functions...
 */

static void		cancel_job(int sig);


/*
 * Local globals...
 */

static int		job_canceled = 0;


/*
 * 'main()' - Main entry for filter...
 */

int					/* O - Exit status */
main(int  argc,				/* I - Number of command-line args */
     char *argv[])			/* I - Command-line arguments */
{
  int		fd;			/* Copy file descriptor */
  char		*filename,		/* PDF file to convert */
		tempfile[1024];		/* Temporary file */
  char		buffer[8192];		/* Copy buffer */
  int		bytes;			/* Bytes copied */
  int		num_options;		/* Number of options */
  cups_option_t	*options;		/* Options */
  const char	*val;			/* Option value */
  int		orientation,		/* Output orientation */
		fit;			/* Fit output to default page size? */
  ppd_file_t	*ppd;			/* PPD file */
  ppd_size_t	*size;			/* Current page size */
  int		pdfpid,			/* Process ID for pdftops */
		pdfwaitpid,		/* Process ID from wait() */
		pdfstatus,		/* Status from pdftops */
		pdfargc;		/* Number of args for pdftops */
  char		*pdfargv[100],		/* Arguments for pdftops/gs */
		pdfwidth[255],		/* Paper width */
		pdfheight[255];		/* Paper height */
#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
  struct sigaction action;		/* Actions for POSIX signals */
#endif /* HAVE_SIGACTION && !HAVE_SIGSET */


 /*
  * Make sure status messages are not buffered...
  */

  setbuf(stderr, NULL);

 /*
  * Make sure we have the right number of arguments for CUPS!
  */

  if (argc < 6 || argc > 7)
  {
    _cupsLangPrintf(stderr,
                    _("Usage: %s job user title copies options [filename]\n"),
                    argv[0]);
    return (1);
  }

 /*
  * Register a signal handler to cleanly cancel a job.
  */

#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
  sigset(SIGTERM, cancel_job);
#elif defined(HAVE_SIGACTION)
  memset(&action, 0, sizeof(action));

  sigemptyset(&action.sa_mask);
  action.sa_handler = cancel_job;
  sigaction(SIGTERM, &action, NULL);
#else
  signal(SIGTERM, cancel_job);
#endif /* HAVE_SIGSET */

 /*
  * Copy stdin if needed...
  */

  if (argc == 6)
  {
   /*
    * Copy stdin to a temp file...
    */

    if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
    {
      _cupsLangPrintf(stderr, _("ERROR: Unable to copy PDF file: %s\n"),
		      strerror(errno));
      return (1);
    }

    fprintf(stderr, "DEBUG: pdftops - copying to temp print file \"%s\"\n",
            tempfile);

    while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
      write(fd, buffer, bytes);

    close(fd);

    filename = tempfile;
  }
  else
  {
   /*
    * Use the filename on the command-line...
    */

    filename    = argv[6];
    tempfile[0] = '\0';
  }

 /*
  * Load the PPD file and mark options...
  */

  ppd         = ppdOpenFile(getenv("PPD"));
  num_options = cupsParseOptions(argv[5], 0, &options);

  ppdMarkDefaults(ppd);
  cupsMarkOptions(ppd, num_options, options);

 /*
  * Build the command-line for the pdftops or gs filter...
  */

#ifdef HAVE_PDFTOPS
  pdfargv[0] = (char *)"pdftops";
  pdfargc    = 1;
#else
  pdfargv[0] = (char *)"gs";
  pdfargv[1] = (char *)"-q";
  pdfargv[2] = (char *)"-dNOPAUSE";
  pdfargv[3] = (char *)"-dBATCH";
  pdfargv[4] = (char *)"-dSAFER";
  pdfargv[5] = (char *)"-sDEVICE=pswrite";
  pdfargv[6] = (char *)"-sOUTPUTFILE=%stdout";
  pdfargc    = 7;
#endif /* HAVE_PDFTOPS */

  if (ppd)
  {
   /*
    * Set language level and TrueType font handling...
    */

    if (ppd->language_level == 1)
    {
#ifdef HAVE_PDFTOPS
      pdfargv[pdfargc++] = (char *)"-level1";
      pdfargv[pdfargc++] = (char *)"-noembtt";
#else
      pdfargv[pdfargc++] = (char *)"-dLanguageLevel=1";
#endif /* HAVE_PDFTOPS */
    }
    else if (ppd->language_level == 2)
    {
#ifdef HAVE_PDFTOPS
      pdfargv[pdfargc++] = (char *)"-level2";
      if (!ppd->ttrasterizer)
	pdfargv[pdfargc++] = (char *)"-noembtt";
#else
      pdfargv[pdfargc++] = (char *)"-dLanguageLevel=2";
#endif /* HAVE_PDFTOPS */
    }
    else
#ifdef HAVE_PDFTOPS
      pdfargv[pdfargc++] = (char *)"-level3";
#else
      pdfargv[pdfargc++] = (char *)"-dLanguageLevel=3";
#endif /* HAVE_PDFTOPS */

    if ((val = cupsGetOption("fitplot", num_options, options)) == NULL)
      val = cupsGetOption("fit-to-page", num_options, options);

    if (val && strcasecmp(val, "no") && strcasecmp(val, "off") &&
	strcasecmp(val, "false"))
      fit = 1;
    else
      fit = 0;

   /*
    * Set output page size...
    */

    size = ppdPageSize(ppd, NULL);
    if (size && fit)
    {
     /*
      * Got the size, now get the orientation...
      */

      orientation = 0;

      if ((val = cupsGetOption("landscape", num_options, options)) != NULL)
      {
	if (strcasecmp(val, "no") != 0 && strcasecmp(val, "off") != 0 &&
	    strcasecmp(val, "false") != 0)
	  orientation = 1;
      }
      else if ((val = cupsGetOption("orientation-requested", num_options, options)) != NULL)
      {
       /*
	* Map IPP orientation values to 0 to 3:
	*
	*   3 = 0 degrees   = 0
	*   4 = 90 degrees  = 1
	*   5 = -90 degrees = 3
	*   6 = 180 degrees = 2
	*/

	orientation = atoi(val) - 3;
	if (orientation >= 2)
	  orientation ^= 1;
      }

#ifdef HAVE_PDFTOPS
      if (orientation & 1)
      {
	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->length);
	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->width);
      }
      else
      {
	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->width);
	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->length);
      }

      pdfargv[pdfargc++] = (char *)"-paperw";
      pdfargv[pdfargc++] = pdfwidth;
      pdfargv[pdfargc++] = (char *)"-paperh";
      pdfargv[pdfargc++] = pdfheight;
      pdfargv[pdfargc++] = (char *)"-expand";

#else
      if (orientation & 1)
      {
	snprintf(pdfwidth, sizeof(pdfwidth), "-dDEVICEWIDTHPOINTS=%.0f",
	         size->length);
	snprintf(pdfheight, sizeof(pdfheight), "-dDEVICEHEIGHTPOINTS=%.0f",
	         size->width);
      }
      else
      {
	snprintf(pdfwidth, sizeof(pdfwidth), "-dDEVICEWIDTHPOINTS=%.0f",
	         size->width);
	snprintf(pdfheight, sizeof(pdfheight), "-dDEVICEHEIGHTPOINTS=%.0f",
	         size->length);
      }

      pdfargv[pdfargc++] = pdfwidth;
      pdfargv[pdfargc++] = pdfheight;
#endif /* HAVE_PDFTOPS */
    }
  }

#ifdef HAVE_PDFTOPS
  pdfargv[pdfargc++] = filename;
  pdfargv[pdfargc++] = (char *)"-";
#else
  pdfargv[pdfargc++] = (char *)"-c";
  pdfargv[pdfargc++] = (char *)"save pop";
  pdfargv[pdfargc++] = (char *)"-f";
  pdfargv[pdfargc++] = filename;
#endif /* HAVE_PDFTOPS */

  pdfargv[pdfargc] = NULL;

  if ((pdfpid = fork()) == 0)
  {
   /*
    * Child comes here...
    */

#ifdef HAVE_PDFTOPS
    execv(CUPS_PDFTOPS, pdfargv);
    _cupsLangPrintf(stderr, _("ERROR: Unable to execute pdftops program: %s\n"),
                    strerror(errno));
#else
    execv(CUPS_GHOSTSCRIPT, pdfargv);
    _cupsLangPrintf(stderr, _("ERROR: Unable to execute gs program: %s\n"),
                    strerror(errno));
#endif /* HAVE_PDFTOPS */

    exit(1);
  }
  else if (pdfpid < 0)
  {
   /*
    * Unable to fork!
    */

#ifdef HAVE_PDFTOPS
    _cupsLangPrintf(stderr, _("ERROR: Unable to execute pdftops program: %s\n"),
                    strerror(errno));
#else
    _cupsLangPrintf(stderr, _("ERROR: Unable to execute gs program: %s\n"),
                    strerror(errno));
#endif /* HAVE_PDFTOPS */

    pdfstatus = 1;
  }
  else
  {
   /*
    * Parent comes here...
    */

    while ((pdfwaitpid = wait(&pdfstatus)) != pdfpid && errno == EINTR)
    {
     /*
      * Wait until we get a valid process ID or the job is canceled...
      */

      if (job_canceled)
      {
        kill(pdfpid, SIGTERM);
	job_canceled = 0;
      }
    }

    if (pdfstatus)
    {
      if (WIFEXITED(pdfstatus))
      {
	pdfstatus = WEXITSTATUS(pdfstatus);

	_cupsLangPrintf(stderr,
			_("ERROR: pdftops filter exited with status %d!\n"),
			pdfstatus);
      }
      else
      {
	pdfstatus = WTERMSIG(pdfstatus);

	_cupsLangPrintf(stderr,
			_("ERROR: pdftops filter crashed on signal %d!\n"),
			pdfstatus);
      }
    }
  }

 /*
  * Cleanup and exit...
  */

  if (tempfile[0])
    unlink(tempfile);

  return (pdfstatus);
}


/*
 * 'cancel_job()' - Flag the job as canceled.
 */

static void
cancel_job(int sig)			/* I - Signal number (unused) */
{
  (void)sig;

  job_canceled = 1;
}


/*
 * End of "$Id$".
 */
  + native
  + Id




#
#   Filter makefile for the Common UNIX Printing System (CUPS).
#
#   Copyright 2007-2009 by Apple Inc.
#   Copyright 1997-2006 by Easy Software Products.
#
#   These coded instructions, statements, and computer programs are the



FILTERS	=	gziptoany hpgltops texttops pstops $(IMGFILTERS) \
		$(PDFTOPS) rastertolabel rastertoepson rastertohp
TARGETS	=	$(FILTERS) \
		$(LIBCUPSIMAGE) \
		libcupsimage.a \

IMAGE64OBJS =	$(IMAGEOBJS:.o=.64.o)
FORMOBJS =	form-attr.o form-main.o form-ps.o form-text.o form-tree.o
OBJS	=	$(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
		gziptoany.o imagetops.o imagetoraster.o common.o pdftops.o \
		pstops.o rasterbench.o rastertoepson.o rastertohp.o \
		rastertolabel.o testimage.o testraster.o textcommon.o texttops.o


#



#
# pdftops
#

pdftops:	pdftops.o common.o ../cups/$(LIBCUPS)
	echo Linking $@...
	$(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)


#
# rastertolabel
#





 *
 *   Configuration file for the Common UNIX Printing System (CUPS).
 *
 *   Copyright 2007-2009 by Apple Inc.
 *   Copyright 1997-2007 by Easy Software Products.
 *
 *   These coded instructions, statements, and computer programs are the



/*
 * Location of the poppler/Xpdf pdftops program...
 */

#undef HAVE_PDFTOPS
#define CUPS_PDFTOPS	"/usr/bin/pdftops"


/*
 * Location of the Ghostscript gs program...
 */

#undef HAVE_GHOSTSCRIPT
#define CUPS_GHOSTSCRIPT "/usr/bin/gs"


/*
 * Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
 */


Return to bug 263070

Lines 3-9 Link Here

(-)config.h.in (-1 / +17 lines)
3	*	3	*
4	* Configuration file for the Common UNIX Printing System (CUPS).	4	* Configuration file for the Common UNIX Printing System (CUPS).
5	*	5	*
6	* Copyright 2007 by Apple Inc.	6	* Copyright 2007-2009 by Apple Inc.
7	* Copyright 1997-2007 by Easy Software Products.	7	* Copyright 1997-2007 by Easy Software Products.
8	*	8	*
9	* These coded instructions, statements, and computer programs are the	9	* These coded instructions, statements, and computer programs are the
Lines 436-441 Link Here
436		436
437		437
438	/*	438	/*
		439	* Location of the poppler/Xpdf pdftops program...
		440	*/
		441
		442	#undef HAVE_PDFTOPS
		443	#define CUPS_PDFTOPS "/usr/bin/pdftops"
		444
		445
		446	/*
		447	* Location of the Ghostscript gs program...
		448	*/
		449
		450	#undef HAVE_GHOSTSCRIPT
		451	#define CUPS_GHOSTSCRIPT "/usr/bin/gs"
		452
		453
		454	/*
439	* Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?	455	* Do we have Darwin's CoreFoundation and SystemConfiguration frameworks?
440	*/	456	*/
441		457

Line 0 Link Here

(-)filter/pdftops.c (+407 lines)
		1	/*
		2	* "$Id$"
		3	*
		4	* PDF to PostScript filter front-end for the Common UNIX Printing
		5	* System (CUPS).
		6	*
		7	* Copyright 2007-2009 by Apple Inc.
		8	* Copyright 1997-2006 by Easy Software Products.
		9	*
		10	* These coded instructions, statements, and computer programs are the
		11	* property of Apple Inc. and are protected by Federal copyright
		12	* law. Distribution and use rights are outlined in the file "LICENSE.txt"
		13	* which should have been included with this file. If this file is
		14	* file is missing or damaged, see the license at "http://www.cups.org/".
		15	*
		16	* Contents:
		17	*
		18	* main() - Main entry for filter...
		19	* cancel_job() - Flag the job as canceled.
		20	*/
		21
		22	/*
		23	* Include necessary headers...
		24	*/
		25
		26	#include <cups/cups.h>
		27	#include <cups/string.h>
		28	#include <cups/i18n.h>
		29	#include <signal.h>
		30	#include <sys/wait.h>
		31	#include <errno.h>
		32
		33
		34	/*
		35	* Local functions...
		36	*/
		37
		38	static void cancel_job(int sig);
		39
		40
		41	/*
		42	* Local globals...
		43	*/
		44
		45	static int job_canceled = 0;
		46
		47
		48	/*
		49	* 'main()' - Main entry for filter...
		50	*/
		51
		52	int /* O - Exit status */
		53	main(int argc, /* I - Number of command-line args */
		54	char argv[]) / I - Command-line arguments */
		55	{
		56	int fd; /* Copy file descriptor */
		57	char filename, / PDF file to convert */
		58	tempfile[1024]; /* Temporary file */
		59	char buffer[8192]; /* Copy buffer */
		60	int bytes; /* Bytes copied */
		61	int num_options; /* Number of options */
		62	cups_option_t options; / Options */
		63	const char val; / Option value */
		64	int orientation, /* Output orientation */
65	fit; /* Fit output to default page size? */
66	ppd_file_t ppd; / PPD file */
67	ppd_size_t size; / Current page size */
68	int pdfpid, /* Process ID for pdftops */
69	pdfwaitpid, /* Process ID from wait() */
70	pdfstatus, /* Status from pdftops */
71	pdfargc; /* Number of args for pdftops */
72	char pdfargv[100], / Arguments for pdftops/gs */
73	pdfwidth[255], /* Paper width */
74	pdfheight[255]; /* Paper height */
75	#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
76	struct sigaction action; /* Actions for POSIX signals */
77	#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
78
79
80	/*
81	* Make sure status messages are not buffered...
82	*/
83
84	setbuf(stderr, NULL);
85
86	/*
87	* Make sure we have the right number of arguments for CUPS!
88	*/
89
90	if (argc < 6 \|\| argc > 7)
91	{
92	_cupsLangPrintf(stderr,
93	_("Usage: %s job user title copies options [filename]\n"),
94	argv[0]);
95	return (1);
96	}
97
98	/*
99	* Register a signal handler to cleanly cancel a job.
100	*/
101
102	#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
103	sigset(SIGTERM, cancel_job);
104	#elif defined(HAVE_SIGACTION)
105	memset(&action, 0, sizeof(action));
106
107	sigemptyset(&action.sa_mask);
108	action.sa_handler = cancel_job;
109	sigaction(SIGTERM, &action, NULL);
110	#else
111	signal(SIGTERM, cancel_job);
112	#endif /* HAVE_SIGSET */
113
114	/*
115	* Copy stdin if needed...
116	*/
117
118	if (argc == 6)
119	{
120	/*
121	* Copy stdin to a temp file...
122	*/
123
124	if ((fd = cupsTempFd(tempfile, sizeof(tempfile))) < 0)
125	{
126	_cupsLangPrintf(stderr, _("ERROR: Unable to copy PDF file: %s\n"),
127	strerror(errno));
128	return (1);
129	}
130
131	fprintf(stderr, "DEBUG: pdftops - copying to temp print file \"%s\"\n",
132	tempfile);
133
134	while ((bytes = fread(buffer, 1, sizeof(buffer), stdin)) > 0)
135	write(fd, buffer, bytes);
136
137	close(fd);
138
139	filename = tempfile;
140	}
141	else
142	{
143	/*
144	* Use the filename on the command-line...
145	*/
146
147	filename = argv[6];
148	tempfile[0] = '\0';
149	}
150
151	/*
152	* Load the PPD file and mark options...
153	*/
154
155	ppd = ppdOpenFile(getenv("PPD"));
156	num_options = cupsParseOptions(argv[5], 0, &options);
157
158	ppdMarkDefaults(ppd);
159	cupsMarkOptions(ppd, num_options, options);
160
161	/*
162	* Build the command-line for the pdftops or gs filter...
163	*/
164
165	#ifdef HAVE_PDFTOPS
166	pdfargv[0] = (char *)"pdftops";
167	pdfargc = 1;
168	#else
169	pdfargv[0] = (char *)"gs";
170	pdfargv[1] = (char *)"-q";
171	pdfargv[2] = (char *)"-dNOPAUSE";
172	pdfargv[3] = (char *)"-dBATCH";
173	pdfargv[4] = (char *)"-dSAFER";
174	pdfargv[5] = (char *)"-sDEVICE=pswrite";
175	pdfargv[6] = (char *)"-sOUTPUTFILE=%stdout";
176	pdfargc = 7;
177	#endif /* HAVE_PDFTOPS */
178
179	if (ppd)
180	{
181	/*
182	* Set language level and TrueType font handling...
183	*/
184
185	if (ppd->language_level == 1)
186	{
187	#ifdef HAVE_PDFTOPS
188	pdfargv[pdfargc++] = (char *)"-level1";
189	pdfargv[pdfargc++] = (char *)"-noembtt";
190	#else
191	pdfargv[pdfargc++] = (char *)"-dLanguageLevel=1";
192	#endif /* HAVE_PDFTOPS */
193	}
194	else if (ppd->language_level == 2)
195	{
196	#ifdef HAVE_PDFTOPS
197	pdfargv[pdfargc++] = (char *)"-level2";
198	if (!ppd->ttrasterizer)
199	pdfargv[pdfargc++] = (char *)"-noembtt";
200	#else
201	pdfargv[pdfargc++] = (char *)"-dLanguageLevel=2";
202	#endif /* HAVE_PDFTOPS */
203	}
204	else
205	#ifdef HAVE_PDFTOPS
206	pdfargv[pdfargc++] = (char *)"-level3";
207	#else
208	pdfargv[pdfargc++] = (char *)"-dLanguageLevel=3";
209	#endif /* HAVE_PDFTOPS */
210
211	if ((val = cupsGetOption("fitplot", num_options, options)) == NULL)
212	val = cupsGetOption("fit-to-page", num_options, options);
213
214	if (val && strcasecmp(val, "no") && strcasecmp(val, "off") &&
215	strcasecmp(val, "false"))
216	fit = 1;
217	else
218	fit = 0;
219
220	/*
221	* Set output page size...
222	*/
223
224	size = ppdPageSize(ppd, NULL);
225	if (size && fit)
226	{
227	/*
228	* Got the size, now get the orientation...
229	*/
230
231	orientation = 0;
232
233	if ((val = cupsGetOption("landscape", num_options, options)) != NULL)
234	{
235	if (strcasecmp(val, "no") != 0 && strcasecmp(val, "off") != 0 &&
236	strcasecmp(val, "false") != 0)
237	orientation = 1;
238	}
239	else if ((val = cupsGetOption("orientation-requested", num_options, options)) != NULL)
240	{
241	/*
242	* Map IPP orientation values to 0 to 3:
243	*
244	* 3 = 0 degrees = 0
245	* 4 = 90 degrees = 1
246	* 5 = -90 degrees = 3
247	* 6 = 180 degrees = 2
248	*/
249
250	orientation = atoi(val) - 3;
251	if (orientation >= 2)
252	orientation ^= 1;
253	}
254
255	#ifdef HAVE_PDFTOPS
256	if (orientation & 1)
257	{
258	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->length);
259	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->width);
260	}
261	else
262	{
263	snprintf(pdfwidth, sizeof(pdfwidth), "%.0f", size->width);
264	snprintf(pdfheight, sizeof(pdfheight), "%.0f", size->length);
265	}
266
267	pdfargv[pdfargc++] = (char *)"-paperw";
268	pdfargv[pdfargc++] = pdfwidth;
269	pdfargv[pdfargc++] = (char *)"-paperh";
270	pdfargv[pdfargc++] = pdfheight;
271	pdfargv[pdfargc++] = (char *)"-expand";
272
273	#else
274	if (orientation & 1)
275	{
276	snprintf(pdfwidth, sizeof(pdfwidth), "-dDEVICEWIDTHPOINTS=%.0f",
277	size->length);
278	snprintf(pdfheight, sizeof(pdfheight), "-dDEVICEHEIGHTPOINTS=%.0f",
279	size->width);
280	}
281	else
282	{
283	snprintf(pdfwidth, sizeof(pdfwidth), "-dDEVICEWIDTHPOINTS=%.0f",
284	size->width);
285	snprintf(pdfheight, sizeof(pdfheight), "-dDEVICEHEIGHTPOINTS=%.0f",
286	size->length);
287	}
288
289	pdfargv[pdfargc++] = pdfwidth;
290	pdfargv[pdfargc++] = pdfheight;
291	#endif /* HAVE_PDFTOPS */
292	}
293	}
294
295	#ifdef HAVE_PDFTOPS
296	pdfargv[pdfargc++] = filename;
297	pdfargv[pdfargc++] = (char *)"-";
298	#else
299	pdfargv[pdfargc++] = (char *)"-c";
300	pdfargv[pdfargc++] = (char *)"save pop";
301	pdfargv[pdfargc++] = (char *)"-f";
302	pdfargv[pdfargc++] = filename;
303	#endif /* HAVE_PDFTOPS */
304
305	pdfargv[pdfargc] = NULL;
306
307	if ((pdfpid = fork()) == 0)
308	{
309	/*
310	* Child comes here...
311	*/
312
313	#ifdef HAVE_PDFTOPS
314	execv(CUPS_PDFTOPS, pdfargv);
315	_cupsLangPrintf(stderr, _("ERROR: Unable to execute pdftops program: %s\n"),
316	strerror(errno));
317	#else
318	execv(CUPS_GHOSTSCRIPT, pdfargv);
319	_cupsLangPrintf(stderr, _("ERROR: Unable to execute gs program: %s\n"),
320	strerror(errno));
321	#endif /* HAVE_PDFTOPS */
322
323	exit(1);
324	}
325	else if (pdfpid < 0)
326	{
327	/*
328	* Unable to fork!
329	*/
330
331	#ifdef HAVE_PDFTOPS
332	_cupsLangPrintf(stderr, _("ERROR: Unable to execute pdftops program: %s\n"),
333	strerror(errno));
334	#else
335	_cupsLangPrintf(stderr, _("ERROR: Unable to execute gs program: %s\n"),
336	strerror(errno));
337	#endif /* HAVE_PDFTOPS */
338
339	pdfstatus = 1;
340	}
341	else
342	{
343	/*
344	* Parent comes here...
345	*/
346
347	while ((pdfwaitpid = wait(&pdfstatus)) != pdfpid && errno == EINTR)
348	{
349	/*
350	* Wait until we get a valid process ID or the job is canceled...
351	*/
352
353	if (job_canceled)
354	{
355	kill(pdfpid, SIGTERM);
356	job_canceled = 0;
357	}
358	}
359
360	if (pdfstatus)
361	{
362	if (WIFEXITED(pdfstatus))
363	{
364	pdfstatus = WEXITSTATUS(pdfstatus);
365
366	_cupsLangPrintf(stderr,
367	_("ERROR: pdftops filter exited with status %d!\n"),
368	pdfstatus);
369	}
370	else
371	{
372	pdfstatus = WTERMSIG(pdfstatus);
373
374	_cupsLangPrintf(stderr,
375	_("ERROR: pdftops filter crashed on signal %d!\n"),
376	pdfstatus);
377	}
378	}
379	}
380
381	/*
382	* Cleanup and exit...
383	*/
384
385	if (tempfile[0])
386	unlink(tempfile);
387
388	return (pdfstatus);
389	}
390
391
392	/*
393	* 'cancel_job()' - Flag the job as canceled.
394	*/
395
396	static void
397	cancel_job(int sig) /* I - Signal number (unused) */
398	{
399	(void)sig;
400
401	job_canceled = 1;
402	}
403
404
405	/*
406	* End of "$Id$".
407	*/
0	+ native	408	+ native
1	+ Id	409	+ Id

Lines 3-9 Link Here

(-)filter/Makefile (-5 / +14 lines)
3	#	3	#
4	# Filter makefile for the Common UNIX Printing System (CUPS).	4	# Filter makefile for the Common UNIX Printing System (CUPS).
5	#	5	#
6	# Copyright 2007 by Apple Inc.	6	# Copyright 2007-2009 by Apple Inc.
7	# Copyright 1997-2006 by Easy Software Products.	7	# Copyright 1997-2006 by Easy Software Products.
8	#	8	#
9	# These coded instructions, statements, and computer programs are the	9	# These coded instructions, statements, and computer programs are the
Lines 19-25 Link Here
19		19
20		20
21	FILTERS = gziptoany hpgltops texttops pstops $(IMGFILTERS) \	21	FILTERS = gziptoany hpgltops texttops pstops $(IMGFILTERS) \
22	rastertolabel rastertoepson rastertohp	22	$(PDFTOPS) rastertolabel rastertoepson rastertohp
23	TARGETS = $(FILTERS) \	23	TARGETS = $(FILTERS) \
24	$(LIBCUPSIMAGE) \	24	$(LIBCUPSIMAGE) \
25	libcupsimage.a \	25	libcupsimage.a \
Lines 39-47 Link Here
39	IMAGE64OBJS = $(IMAGEOBJS:.o=.64.o)	39	IMAGE64OBJS = $(IMAGEOBJS:.o=.64.o)
40	FORMOBJS = form-attr.o form-main.o form-ps.o form-text.o form-tree.o	40	FORMOBJS = form-attr.o form-main.o form-ps.o form-text.o form-tree.o
41	OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \	41	OBJS = $(HPGLOBJS) $(IMAGEOBJS) $(FORMOBJS) \
42	gziptoany.o imagetops.o imagetoraster.o common.o pstops.o \	42	gziptoany.o imagetops.o imagetoraster.o common.o pdftops.o \
43	rasterbench.o rastertoepson.o rastertohp.o rastertolabel.o \	43	pstops.o rasterbench.o rastertoepson.o rastertohp.o \
44	testimage.o testraster.o textcommon.o texttops.o	44	rastertolabel.o testimage.o testraster.o textcommon.o texttops.o
45		45
46		46
47	#	47	#
Lines 324-329 Link Here
324		324
325		325
326	#	326	#
		327	# pdftops
		328	#
		329
		330	pdftops: pdftops.o common.o ../cups/$(LIBCUPS)
		331	echo Linking $@...
		332	$(CC) $(LDFLAGS) -o $@ pdftops.o common.o $(LIBS)
		333
		334
		335	#
327	# rastertolabel	336	# rastertolabel
328	#	337	#
329		338

Lines 106-111 Link Here

(-)filter/Dependencies (+9 lines)
106	common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	106	common.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
107	common.o: ../cups/array.h ../cups/file.h ../cups/language.h	107	common.o: ../cups/array.h ../cups/file.h ../cups/language.h
108	common.o: ../cups/language.h ../cups/string.h ../config.h	108	common.o: ../cups/language.h ../cups/string.h ../config.h
		109	pdftops.o: ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
		110	pdftops.o: ../cups/array.h ../cups/file.h ../cups/language.h ../cups/string.h
		111	pdftops.o: ../config.h ../cups/i18n.h ../cups/transcode.h
109	pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	112	pstops.o: common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
110	pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h	113	pstops.o: ../cups/array.h ../cups/file.h ../cups/language.h
111	pstops.o: ../cups/language.h ../cups/string.h ../config.h ../cups/file.h	114	pstops.o: ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
Lines 246-251 Link Here
246	common.32.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	249	common.32.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
247	common.32.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h	250	common.32.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h
248	common.32.o: common.c ../cups/language.h ../cups/string.h ../config.h	251	common.32.o: common.c ../cups/language.h ../cups/string.h ../config.h
		252	pdftops.32.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
		253	pdftops.32.o: pdftops.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/string.h
		254	pdftops.32.o: pdftops.c ../config.h ../cups/i18n.h ../cups/transcode.h
249	pstops.32.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	255	pstops.32.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
250	pstops.32.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h	256	pstops.32.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h
251	pstops.32.o: pstops.c ../cups/language.h ../cups/string.h ../config.h ../cups/file.h	257	pstops.32.o: pstops.c ../cups/language.h ../cups/string.h ../config.h ../cups/file.h
Lines 386-391 Link Here
386	common.64.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	392	common.64.o: common.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
387	common.64.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h	393	common.64.o: common.c ../cups/array.h ../cups/file.h ../cups/language.h
388	common.64.o: common.c ../cups/language.h ../cups/string.h ../config.h	394	common.64.o: common.c ../cups/language.h ../cups/string.h ../config.h
		395	pdftops.64.o: pdftops.c ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
		396	pdftops.64.o: pdftops.c ../cups/array.h ../cups/file.h ../cups/language.h ../cups/string.h
		397	pdftops.64.o: pdftops.c ../config.h ../cups/i18n.h ../cups/transcode.h
389	pstops.64.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h	398	pstops.64.o: pstops.c common.h ../cups/cups.h ../cups/ipp.h ../cups/http.h ../cups/ppd.h
390	pstops.64.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h	399	pstops.64.o: pstops.c ../cups/array.h ../cups/file.h ../cups/language.h
391	pstops.64.o: pstops.c ../cups/language.h ../cups/string.h ../config.h ../cups/file.h	400	pstops.64.o: pstops.c ../cups/language.h ../cups/string.h ../config.h ../cups/file.h