Mirror changes from 1.1.x.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@2046 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.1.txt b/CHANGES-1.1.txt
index 0811f66ffc10464489f8edc692c3c513c1147b89..9a88819b10a12e04f337e5f1bebfbca86aa59198 100644 (file)
--- a/CHANGES-1.1.txt
+++ b/CHANGES-1.1.txt
@@ -3,6 +3,8 @@ CHANGES-1.1.txt
 
 CHANGES IN CUPS V1.1.13
 
+       - The text filter now supports non-integer cpi and lpi
+         values.
        - The Margins field in the CUPS raster header was not
          initialized by the pstoraster filter.
        - Added --with-optim="flags" option to configure script.

diff --git a/filter/textcommon.c b/filter/textcommon.c
index b0e80b28236e1e01ce2a1dd2cfa7f22121b46e3d..c9dd7781591ac3e27ec1607f60acfc6e11b9af9a 100644 (file)
--- a/filter/textcommon.c
+++ b/filter/textcommon.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: textcommon.c,v 1.16.2.3 2002/01/02 18:04:48 mike Exp $"
+ * "$Id: textcommon.c,v 1.16.2.4 2002/01/17 21:40:21 mike Exp $"
  *
  *   Common text filter routines for the Common UNIX Printing System (CUPS).
  *
@@ -49,8 +49,8 @@ int   WrapLines = 1,          /* Wrap text in lines */
        Copies = 1;             /* Number of copies */
 lchar_t        **Page = NULL;          /* Page characters */
 int    NumPages = 0;           /* Number of pages in document */
-int    CharsPerInch = 10;      /* Number of character columns per inch */
-int    LinesPerInch = 6;       /* Number of lines per inch */
+float  CharsPerInch = 10;      /* Number of character columns per inch */
+float  LinesPerInch = 6;       /* Number of lines per inch */
 int    UTF8 = 0;               /* Use UTF-8 encoding? */
 int    NumKeywords = 0;        /* Number of known keywords */
 char   **Keywords = NULL;      /* List of known keywords */
@@ -598,10 +598,10 @@ TextMain(const char *name,        /* I - Name of filter */
     PageColumns = atoi(val);
 
   if ((val = cupsGetOption("cpi", num_options, options)) != NULL)
-    CharsPerInch = atoi(val);
+    CharsPerInch = atof(val);
 
   if ((val = cupsGetOption("lpi", num_options, options)) != NULL)
-    LinesPerInch = atoi(val);
+    LinesPerInch = atof(val);
 
   if ((val = cupsGetOption("prettyprint", num_options, options)) != NULL)
     PageTop -= 216.0f / LinesPerInch;
@@ -1151,5 +1151,5 @@ getutf8(FILE *fp) /* I - File to read from */
 
 
 /*
- * End of "$Id: textcommon.c,v 1.16.2.3 2002/01/02 18:04:48 mike Exp $".
+ * End of "$Id: textcommon.c,v 1.16.2.4 2002/01/17 21:40:21 mike Exp $".
  */

diff --git a/filter/textcommon.h b/filter/textcommon.h
index fbd10362a096fb90c1e4fcf0bf5c4f820e9c90ae..a7d202307e16017ed2db0fec2bcf2f62684236ba 100644 (file)
--- a/filter/textcommon.h
+++ b/filter/textcommon.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: textcommon.h,v 1.6.2.2 2002/01/02 18:04:49 mike Exp $"
+ * "$Id: textcommon.h,v 1.6.2.3 2002/01/17 21:40:21 mike Exp $"
  *
  *   Common text filter definitions for the Common UNIX Printing System (CUPS).
  *
@@ -78,10 +78,10 @@ extern int  WrapLines,      /* Wrap text in lines */
                Copies;         /* Number of copies to produce */
 extern lchar_t **Page;         /* Page characters */
 extern int     NumPages;       /* Number of pages in document */
-extern int     CharsPerInch,   /* Number of character columns per inch */
-               LinesPerInch,   /* Number of lines per inch */
-               UTF8;           /* Use UTF-8 encoding? */
-extern int     NumKeywords;    /* Number of known keywords */
+extern float   CharsPerInch,   /* Number of character columns per inch */
+               LinesPerInch;   /* Number of lines per inch */
+extern int     UTF8,           /* Use UTF-8 encoding? */
+               NumKeywords;    /* Number of known keywords */
 extern char    **Keywords;     /* List of known keywords... */
 
 
@@ -98,5 +98,5 @@ extern void   WriteProlog(const char *title, const char *user,
 
 
 /*
- * End of "$Id: textcommon.h,v 1.6.2.2 2002/01/02 18:04:49 mike Exp $".
+ * End of "$Id: textcommon.h,v 1.6.2.3 2002/01/17 21:40:21 mike Exp $".
  */