Merge changes from CUPS 1.4svn-r8162.

[thirdparty/cups.git] / filter / imagetops.c

diff --git a/filter/imagetops.c b/filter/imagetops.c
index 95e647ddc9b0c0d35fecf8a009b59117cbec2ce5..93a41bfaa84d1f8c7a5b34f13ec6b6dbdb57f3ff 100644 (file)
--- a/filter/imagetops.c
+++ b/filter/imagetops.c
@@ -3,7 +3,7 @@
  *
  *   Image file to PostScript filter for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 2007 by Apple Inc.
+ *   Copyright 2007-2008 by Apple Inc.
  *   Copyright 1993-2007 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
@@ -212,7 +212,11 @@ main(int  argc,                            /* I - Number of command-line arguments */
 
   if ((val = cupsGetOption("scaling", num_options, options)) != NULL)
     zoom = atoi(val) * 0.01;
-  else if (cupsGetOption("fitplot", num_options, options))
+  else if ((val = cupsGetOption("fitplot", num_options, options)) != NULL &&
+           !strcasecmp(val, "true"))
+    zoom = 1.0;
+  else if ((val = cupsGetOption("fit-to-page", num_options, options)) != NULL &&
+           !strcasecmp(val, "true"))
     zoom = 1.0;
 
   if ((val = cupsGetOption("ppi", num_options, options)) != NULL)