Merge changes from CUPS 1.5svn-r9198.

[thirdparty/cups.git] / cups / pwg-private.h

diff --git a/cups/pwg-private.h b/cups/pwg-private.h
index 623fc5801ec40a9ddb7ea5dd40bd66a9e3cea9d6..33a0790aff4fe8a8c56051411009eea85537f01c 100644 (file)
--- a/cups/pwg-private.h
+++ b/cups/pwg-private.h
@@ -48,9 +48,11 @@ extern "C" {
  * Types and structures...
  */
 
-#  ifndef _CUPS_PPD_H_
-typedef struct ppd_file_s ppd_file_t;
-#  endif /* _CUPS_PPD_H_ */
+typedef struct _pwg_map_s              /**** Map element - PPD to/from PWG */
+{
+  char         *pwg,                   /* PWG media keyword */
+               *ppd;                   /* PPD option keyword */
+} _pwg_map_t;
 
 typedef struct _pwg_media_s            /**** Common media size data ****/
 {
@@ -61,12 +63,6 @@ typedef struct _pwg_media_s          /**** Common media size data ****/
                length;                 /* Length in 2540ths */
 } _pwg_media_t;
 
-typedef struct _pwg_map_s              /**** Map element - PPD to/from PWG */
-{
-  char         *pwg,                   /* PWG media keyword */
-               *ppd;                   /* PPD option keyword */
-} _pwg_map_t;
-
 typedef struct _pwg_size_s             /**** Size element - PPD to/from PWG */
 {
   _pwg_map_t   map;                    /* Map element */
@@ -78,43 +74,20 @@ typedef struct _pwg_size_s          /**** Size element - PPD to/from PWG */
                top;                    /* Top margin in 2540ths */
 } _pwg_size_t;
 
-typedef struct _pwg_s                  /**** PWG-PPD conversion data ****/
-{
-  int          num_bins;               /* Number of output bins */
-  _pwg_map_t   *bins;                  /* Output bins */
-  int          num_sizes;              /* Number of media sizes */
-  _pwg_size_t  *sizes;                 /* Media sizes */
-  int          custom_max_width,       /* Maximum custom width in 2540ths */
-               custom_max_length,      /* Maximum custom length in 2540ths */
-               custom_min_width,       /* Minimum custom width in 2540ths */
-               custom_min_length;      /* Minimum custom length in 2540ths */
-  char         *custom_max_keyword,    /* Maximum custom size PWG keyword */
-               *custom_min_keyword,    /* Minimum custom size PWG keyword */
-               custom_ppd_size[41];    /* Custom PPD size name */
-  _pwg_size_t  custom_size;            /* Custom size record */
-  int          num_sources;            /* Number of media sources */
-  _pwg_map_t   *sources;               /* Media sources */
-  int          num_types;              /* Number of media types */
-  _pwg_map_t   *types;                 /* Media types */
-} _pwg_t;
-
 
 /*
  * Functions...
  */
 
-extern _pwg_t          *_pwgCreateWithFile(const char *filename);
-extern void            _pwgDestroy(_pwg_t *pwg);
 extern void            _pwgGenerateSize(char *keyword, size_t keysize,
                                         const char *prefix,
-                                        const char *ppdname,
+                                        const char *name,
                                         int width, int length);
 extern int             _pwgInitSize(_pwg_size_t *size, ipp_t *job,
                                     int *margins_set);
 extern _pwg_media_t    *_pwgMediaForLegacy(const char *legacy);
 extern _pwg_media_t    *_pwgMediaForPWG(const char *pwg);
 extern _pwg_media_t    *_pwgMediaForSize(int width, int length);
-extern int             _pwgWriteFile(_pwg_t *pwg, const char *filename);
 
 
 #  ifdef __cplusplus