libcupsfilters: Renamed cfFilterRasterToPDF() to cfFilterPWGToPDF()

Renamed the filter function cfFilterRasterToPDF() to
cfFilterPWGToPDF() as it actually does not work with CUPS Raster input
but only with PWG Raster input (or URF/Apple Raster).

Also renamed the corresponding CUPS filters to pwgtopdf and pwgtopclm.

diff --git a/Makefile.am b/Makefile.am
index f43f304161d87092047ed412a37fe8724018da74..d57df82e477c9640b3c5d95015d2b080c3b35086 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -326,9 +326,9 @@ libcupsfilters_la_SOURCES = \
        cupsfilters/pdftopdf/qpdf-cm-private.h \
        cupsfilters/pdftoraster.cxx \
        cupsfilters/pdfutils.c \
+       cupsfilters/pwgtopdf.cxx \
        cupsfilters/pwgtoraster.c \
        cupsfilters/raster.c \
-       cupsfilters/rastertopdf.cxx \
        cupsfilters/rastertopwg.c \
        cupsfilters/rgb.c \
        cupsfilters/srgb.c \
@@ -832,8 +832,8 @@ endif
 pkgfilter_PROGRAMS += \
        pdftops \
        texttopdf \
-       rastertopclm \
-       rastertopdf \
+       pwgtopclm \
+       pwgtopdf \
        bannertopdf \
        rastertops \
        pwgtoraster \
@@ -1024,24 +1024,24 @@ pclmtoraster_LDADD = \
        libppd.la \
        $(CUPS_LIBS)
 
-rastertopclm_SOURCES = \
-       filter/rastertopclm.c
-rastertopclm_CFLAGS = \
+pwgtopclm_SOURCES = \
+       filter/pwgtopclm.c
+pwgtopclm_CFLAGS = \
        $(CUPS_CFLAGS) \
        -I$(srcdir)/cupsfilters/ \
        -I$(srcdir)/ppd/
-rastertopclm_LDADD = \
+pwgtopclm_LDADD = \
        $(CUPS_LIBS) \
        libcupsfilters.la \
        libppd.la
 
-rastertopdf_SOURCES = \
-       filter/rastertopdf.c
-rastertopdf_CFLAGS = \
+pwgtopdf_SOURCES = \
+       filter/pwgtopdf.c
+pwgtopdf_CFLAGS = \
        $(CUPS_CFLAGS) \
        -I$(srcdir)/cupsfilters/ \
        -I$(srcdir)/ppd/
-rastertopdf_LDADD = \
+pwgtopdf_LDADD = \
        $(CUPS_LIBS) \
        libcupsfilters.la \
        libppd.la

diff --git a/cupsfilters/filter.h b/cupsfilters/filter.h
index 5ae80b1af7d8a739c5bfe677d34ad5bd88670842..0719e46ac54af14dc470550563ecedc782fdb26a 100644 (file)
--- a/cupsfilters/filter.h
+++ b/cupsfilters/filter.h
@@ -243,7 +243,7 @@ extern int cfFilterImageToRaster(int inputfd,
    color spaces and depths is taken from the urf-supported or
    pwg-raster-document-type-supported printer IPP attributes or from a
    supplied CUPS Raster sample header. This mode is for further
-   processing with rastertopwg or rastertopclm. This can change in the
+   processing with rastertopwg or pwgtopclm. This can change in the
    future when we add Apple Raster and PWG Raster output support to
    this filter function. */
 
@@ -263,7 +263,7 @@ extern int cfFilterMuPDFToPWG(int inputfd,
    and depths is taken from the urf-supported printer IPP attribute,
    the pclm- attributes, or from a supplied CUPS Raster sample header
    (PCLM is always sGray/sRGB 8-bit). These modes are for further
-   processing with pwgtoraster or rastertopclm. This can change in the
+   processing with pwgtoraster or pwgtopclm. This can change in the
    future when MuPDF adds further output formats. */
 
 
@@ -309,7 +309,7 @@ extern int cfFilterPDFToRaster(int inputfd,
    Note: With PCLm selection the output is actually CUPS Raster but
    color space and depth will be 8-bit sRGB or SGray, the only color
    spaces supported by PCLm. This mode is for further processing with
-   rastertopclm. */
+   pwgtopclm. */
 
 
 extern int cfFilterPWGToRaster(int inputfd,
@@ -325,10 +325,10 @@ extern int cfFilterPWGToRaster(int inputfd,
    Note: On the PCLM selection the output is actually CUPS Raster but
    information about available color spaces and depths is taken from
    the pclm-... printer IPP attributes. This mode is for further
-   processing with rastertopclm. */
+   processing with pwgtopclm. */
 
 
-extern int cfFilterRasterToPDF(int inputfd,
+extern int cfFilterPWGToPDF(int inputfd,
                               int outputfd,
                               int inputseekable,
                               cf_filter_data_t *data,

diff --git a/cupsfilters/imagetoraster.c b/cupsfilters/imagetoraster.c
index a749aa885cf7e049d8dbdce199e7dc69956f3798..c45d5ea30ea1e9b809c2d859b27aceb3ecd89c46 100644 (file)
--- a/cupsfilters/imagetoraster.c
+++ b/cupsfilters/imagetoraster.c
@@ -267,7 +267,7 @@ cfFilterImageToRaster(int inputfd,         /* I - File descriptor input stream *
      about available color spaces and depths are taken from the
      urf-supported or pwg-raster-document-type-supported printer IPP
      attributes (PCLM is always sRGB 8-bit). These modes are for
-     further processing with rastertopwg or rastertopclm. This can
+     further processing with rastertopwg or pwgtopclm. This can
      change in the future when we add Apple Raster and PWG Raster
      output support to this filter. */
 

diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
index bc3537d692befe553e6e4d93e563729033d72af4..e508b6b4e7ccc39f0a8f8dbb388b8d8facbd3082 100644 (file)
--- a/cupsfilters/pdftoraster.cxx
+++ b/cupsfilters/pdftoraster.cxx
@@ -1595,7 +1595,7 @@ int cfFilterPDFToRaster(int inputfd,         /* I - File descriptor input stream
   /* Note: With the CF_FILTER_OUT_FORMAT_PCLM selection the output is
      actually PWG Raster but color spaces and depth are always
      assumed to be 8-bit sRGB or sGray, the only color spaces in
-     PCLm. This mode is for further processing with rastertopclm. */
+     PCLm. This mode is for further processing with pwgtopclm. */
 
   if (log) log(ld, CF_LOGLEVEL_DEBUG,
               "cfFilterPDFToRaster: Final output format: %s",

diff --git a/cupsfilters/rastertopdf.cxx b/cupsfilters/pwgtopdf.cxx
similarity index 93%
rename from cupsfilters/rastertopdf.cxx
rename to cupsfilters/pwgtopdf.cxx
index 29702bee89d5d9d822b10bd9a109f21c348cb8d2..2d8f850cf7458f2d2ca9156307ce7c68cac6b9e0 100644 (file)
--- a/cupsfilters/rastertopdf.cxx
+++ b/cupsfilters/pwgtopdf.cxx
@@ -13,7 +13,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @brief Convert PWG Raster to a PDF/PCLm file
- * @file rastertopdf.cpp
+ * @file pwgtopdf.cpp
  * @author Neil 'Superna' Armstrong <superna9999@gmail.com> (C) 2010
  * @author Tobias Hoffmann <smilingthax@gmail.com> (c) 2012
  * @author Till Kamppeter <till.kamppeter@gmail.com> (c) 2014
@@ -86,7 +86,7 @@
 
 #define DEFAULT_PDF_UNIT 72   // 1/72 inch
 
-#define PROGRAM "rastertopdf"
+#define PROGRAM "pwgtopdf"
 
 // Compression method for providing data to PCLm Streams.
 typedef enum compression_method_e {
@@ -103,7 +103,7 @@ typedef unsigned char *(*convert_function)(unsigned char *src,
 typedef unsigned char *(*bit_convert_function)(unsigned char *src,
   unsigned char *dst, unsigned int pixels);
 
-typedef struct rastertopdf_doc_s               /**** Document information ****/
+typedef struct pwgtopdf_doc_s               /**** Document information ****/
 {
   cmsHPROFILE         colorProfile = NULL;     /* ICC Profile to be applied to
                                                  PDF */
@@ -122,11 +122,11 @@ typedef struct rastertopdf_doc_s               /**** Document information ****/
                                                   supporting stop on cancel */
   void *iscanceleddata;                        /* User data for is-canceled
                                                  function, can be NULL */
-} rastertopdf_doc_t;
+} pwgtopdf_doc_t;
 
 // PDF color conversion function
 typedef void (*pdf_convert_function)(struct pdf_info * info,
-                                  rastertopdf_doc_t *doc);
+                                  pwgtopdf_doc_t *doc);
 
 
 // Bit conversion functions
@@ -350,7 +350,7 @@ static QPDFObjectHandle make_integer_box(int x1, int y1, int x2, int y2)
 // PDF color conversion functons...
 
 static void modify_pdf_color(struct pdf_info * info, int bpp, int bpc,
-                     convert_function fn, rastertopdf_doc_t *doc)
+                     convert_function fn, pwgtopdf_doc_t *doc)
 {
     unsigned old_bpp = info->bpp;
     unsigned old_bpc = info->bpc;
@@ -368,49 +368,49 @@ static void modify_pdf_color(struct pdf_info * info, int bpp, int bpc,
     return;
 }
 
-static void convert_pdf_no_conversion(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_no_conversion(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     doc->conversion_function = no_color_conversion;
     doc->bit_function = no_bit_conversion;
 }
 
-static void convert_pdf_cmyk_8_to_white_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_cmyk_8_to_white_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 8, 8, cmyk_to_white, doc);
     doc->bit_function = no_bit_conversion;
 }
 
-static void convert_pdf_rgb_8_to_white_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_rgb_8_to_white_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 8, 8, rgb_to_white, doc);
     doc->bit_function = no_bit_conversion;
 }
 
-static void convert_pdf_cmyk_8_to_rgb_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_cmyk_8_to_rgb_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 24, 8, cmyk_to_rgb, doc);
     doc->bit_function = no_bit_conversion;
 }
 
-static void convert_pdf_white_8_to_rgb_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_white_8_to_rgb_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 24, 8, white_to_rgb, doc);
     doc->bit_function = invert_bits;
 }
 
-static void convert_pdf_rgb_8_to_cmyk_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_rgb_8_to_cmyk_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 32, 8, rgb_to_cmyk, doc);
     doc->bit_function = no_bit_conversion;
 }
 
-static void convert_pdf_white_8_to_cmyk_8(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_white_8_to_cmyk_8(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     modify_pdf_color(info, 32, 8, white_to_cmyk, doc);
     doc->bit_function = invert_bits;
 }
 
-static void convert_pdf_invert_colors(struct pdf_info * info, rastertopdf_doc_t *doc)
+static void convert_pdf_invert_colors(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     doc->conversion_function = no_color_conversion;
     doc->bit_function = invert_bits;
@@ -421,7 +421,7 @@ static void convert_pdf_invert_colors(struct pdf_info * info, rastertopdf_doc_t
 
 // Create an '/ICCBased' array and embed a previously 
 // set ICC Profile in the PDF
-static QPDFObjectHandle embed_icc_profile(QPDF &pdf, rastertopdf_doc_t *doc)
+static QPDFObjectHandle embed_icc_profile(QPDF &pdf, pwgtopdf_doc_t *doc)
 {
     if (doc->colorProfile == NULL) {
       return QPDFObjectHandle::newNull();
@@ -464,7 +464,7 @@ static QPDFObjectHandle embed_icc_profile(QPDF &pdf, rastertopdf_doc_t *doc)
         break;
       default:
         if (doc->logfunc) doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                     "cfFilterRasterToPDF: Failed to embed ICC Profile.");
+                     "cfFilterPWGToPDF: Failed to embed ICC Profile.");
         return QPDFObjectHandle::newNull();
     }
 
@@ -490,12 +490,12 @@ static QPDFObjectHandle embed_icc_profile(QPDF &pdf, rastertopdf_doc_t *doc)
 
     free(buff);
     if (doc->logfunc) doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                     "cfFilterRasterToPDF: ICC Profile embedded in PDF.");
+                     "cfFilterPWGToPDF: ICC Profile embedded in PDF.");
 
     return ret;
 }
 
-static QPDFObjectHandle embed_srgb_profile(QPDF &pdf, rastertopdf_doc_t *doc)
+static QPDFObjectHandle embed_srgb_profile(QPDF &pdf, pwgtopdf_doc_t *doc)
 {
     QPDFObjectHandle iccbased_reference;
 
@@ -618,7 +618,7 @@ make_pclm_strips(QPDF &pdf, unsigned num_strips,
                std::vector< PointerHolder<Buffer> > &strip_data,
                std::vector<compression_method_t> &compression_methods,
                unsigned width, std::vector<unsigned>& strip_height,
-              cups_cspace_t cs, unsigned bpc, rastertopdf_doc_t *doc)
+              cups_cspace_t cs, unsigned bpc, pwgtopdf_doc_t *doc)
 {
     std::vector<QPDFObjectHandle> ret(num_strips);
     for (size_t i = 0; i < num_strips; i ++)
@@ -651,7 +651,7 @@ make_pclm_strips(QPDF &pdf, unsigned num_strips,
         break;
       default:
         if (doc->logfunc) doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                     "cfFilterRasterToPDF: Color space not supported.");
+                     "cfFilterPWGToPDF: Color space not supported.");
         return std::vector<QPDFObjectHandle>(num_strips, QPDFObjectHandle());
     }
 
@@ -713,7 +713,7 @@ make_pclm_strips(QPDF &pdf, unsigned num_strips,
 static QPDFObjectHandle make_image(QPDF &pdf, PointerHolder<Buffer> page_data,
                           unsigned width, unsigned height,
                           std::string render_intent, cups_cspace_t cs,
-                          unsigned bpc, rastertopdf_doc_t *doc)
+                          unsigned bpc, pwgtopdf_doc_t *doc)
 {
     QPDFObjectHandle ret = QPDFObjectHandle::newStream(&pdf);
 
@@ -810,7 +810,7 @@ static QPDFObjectHandle make_image(QPDF &pdf, PointerHolder<Buffer> page_data,
             default:
                 if (doc->logfunc)
                  doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                              "cfFilterRasterToPDF: Color space not supported.");
+                              "cfFilterPWGToPDF: Color space not supported.");
                 return QPDFObjectHandle();
         }
     } else if (doc->cm_disabled) {
@@ -845,7 +845,7 @@ static QPDFObjectHandle make_image(QPDF &pdf, PointerHolder<Buffer> page_data,
           default:
             if (doc->logfunc)
              doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                          "cfFilterRasterToPDF: Color space not supported.");
+                          "cfFilterPWGToPDF: Color space not supported.");
             return QPDFObjectHandle();
         }
     } else
@@ -873,7 +873,7 @@ static QPDFObjectHandle make_image(QPDF &pdf, PointerHolder<Buffer> page_data,
     return ret;
 }
 
-static int finish_page(struct pdf_info * info, rastertopdf_doc_t *doc)
+static int finish_page(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     if (info->outformat == CF_FILTER_OUT_FORMAT_PDF)
     {
@@ -889,7 +889,7 @@ static int finish_page(struct pdf_info * info, rastertopdf_doc_t *doc)
       {
         if (doc->logfunc)
          doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                      "cfFilterRasterToPDF: Unable to load image data");
+                      "cfFilterPWGToPDF: Unable to load image data");
         return 1;
       }
 
@@ -916,7 +916,7 @@ static int finish_page(struct pdf_info * info, rastertopdf_doc_t *doc)
         {
           if (doc->logfunc)
            doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                        "cfFilterRasterToPDF: Unable to load strip data");
+                        "cfFilterPWGToPDF: Unable to load strip data");
           return 1;
         }
 
@@ -982,7 +982,7 @@ static int finish_page(struct pdf_info * info, rastertopdf_doc_t *doc)
 static int prepare_pdf_page(struct pdf_info * info, unsigned width, unsigned height,
                     unsigned bpl, unsigned bpp, unsigned bpc,
                     std::string render_intent, cups_cspace_t color_space,
-                    rastertopdf_doc_t *doc)
+                    pwgtopdf_doc_t *doc)
 {
 #define IMAGE_CMYK_8   (bpp == 32 && bpc == 8)
 #define IMAGE_CMYK_16  (bpp == 64 && bpc == 16)
@@ -1059,7 +1059,7 @@ static int prepare_pdf_page(struct pdf_info * info, unsigned width, unsigned hei
         default:
           if (doc->logfunc)
            doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                        "cfFilterRasterToPDF: Unable to convert PDF from profile.");
+                        "cfFilterPWGToPDF: Unable to convert PDF from profile.");
           doc->colorProfile = NULL;
           error = 1;
       }
@@ -1123,7 +1123,7 @@ static int prepare_pdf_page(struct pdf_info * info, unsigned width, unsigned hei
          default:
            if (doc->logfunc)
             doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                         "cfFilterRasterToPDF: Color space not supported.");
+                         "cfFilterPWGToPDF: Color space not supported.");
            error = 1;
            break;
       }
@@ -1138,7 +1138,7 @@ static int prepare_pdf_page(struct pdf_info * info, unsigned width, unsigned hei
 static int add_pdf_page(struct pdf_info * info, int pagen, unsigned width,
                 unsigned height, int bpp, int bpc, int bpl,
                 std::string render_intent, cups_cspace_t color_space,
-                unsigned xdpi, unsigned ydpi, rastertopdf_doc_t *doc)
+                unsigned xdpi, unsigned ydpi, pwgtopdf_doc_t *doc)
 {
     try {
         if (finish_page(info, doc)) // any active
@@ -1151,7 +1151,7 @@ static int add_pdf_page(struct pdf_info * info, int pagen, unsigned width,
                            info->line_bytes)) {
             if (doc->logfunc)
              doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                          "cfFilterRasterToPDF: Page too big");
+                          "cfFilterPWGToPDF: Page too big");
             return 1;
         }
         if (info->outformat == CF_FILTER_OUT_FORMAT_PDF)
@@ -1205,7 +1205,7 @@ static int add_pdf_page(struct pdf_info * info, int pagen, unsigned width,
     } catch (std::bad_alloc &ex) {
         if (doc->logfunc)
          doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                      "cfFilterRasterToPDF: Unable to allocate page data");
+                      "cfFilterPWGToPDF: Unable to allocate page data");
         return 1;
     } catch (...) {
         return 1;
@@ -1214,7 +1214,7 @@ static int add_pdf_page(struct pdf_info * info, int pagen, unsigned width,
     return 0;
 }
 
-static int close_pdf_file(struct pdf_info * info, rastertopdf_doc_t *doc)
+static int close_pdf_file(struct pdf_info * info, pwgtopdf_doc_t *doc)
 {
     try {
         if (finish_page(info, doc)) // any active
@@ -1233,13 +1233,13 @@ static int close_pdf_file(struct pdf_info * info, rastertopdf_doc_t *doc)
 }
 
 static void pdf_set_line(struct pdf_info * info, unsigned line_n,
-                 unsigned char *line, rastertopdf_doc_t *doc)
+                 unsigned char *line, pwgtopdf_doc_t *doc)
 {
     if(line_n > info->height)
     {
         if (doc->logfunc)
          doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                      "cfFilterRasterToPDF: Bad line %d", line_n);
+                      "cfFilterPWGToPDF: Bad line %d", line_n);
         return;
     }
 
@@ -1258,7 +1258,7 @@ static void pdf_set_line(struct pdf_info * info, unsigned line_n,
 
 static int convert_raster(cups_raster_t *ras, unsigned width, unsigned height,
                   int bpp, int bpl, struct pdf_info * info,
-                  rastertopdf_doc_t *doc)
+                  pwgtopdf_doc_t *doc)
 {
     // We should be at raster start
     int i;
@@ -1305,7 +1305,7 @@ static int convert_raster(cups_raster_t *ras, unsigned width, unsigned height,
     return 0;
 }
 
-static int set_profile(const char * path, rastertopdf_doc_t *doc) 
+static int set_profile(const char * path, pwgtopdf_doc_t *doc) 
 {
     if (path != NULL) 
       doc->colorProfile = cmsOpenProfileFromFile(path,"r");
@@ -1313,19 +1313,19 @@ static int set_profile(const char * path, rastertopdf_doc_t *doc)
     if (doc->colorProfile != NULL) {
       if (doc->logfunc)
        doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                    "cfFilterRasterToPDF: Load profile successful.");
+                    "cfFilterPWGToPDF: Load profile successful.");
       return 0;
     }
     else {
       if (doc->logfunc)
        doc->logfunc(doc->logdata, CF_LOGLEVEL_DEBUG,
-                    "cfFilterRasterToPDF: Unable to load profile.");
+                    "cfFilterPWGToPDF: Unable to load profile.");
       return 1;
     }
 }
 
 int                         /* O - Error status */
-cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
+cfFilterPWGToPDF(int inputfd,    /* I - File descriptor input stream */
        int outputfd,        /* I - File descriptor output stream */
        int inputseekable,   /* I - Is input stream seekable? (unused) */
        cf_filter_data_t *data, /* I - Job and printer data */
@@ -1333,7 +1333,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
 {
   int i;
   char *t;
-  rastertopdf_doc_t    doc;            /* Document information */
+  pwgtopdf_doc_t       doc;            /* Document information */
   FILE          *outputfp;              /* Output data stream */
   cf_filter_out_format_t outformat; /* Output format */
   int Page, empty = 1;
@@ -1379,7 +1379,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
   }
 
   if (log) log(ld, CF_LOGLEVEL_DEBUG,
-              "cfFilterRasterToPDF: OUTFORMAT=\"%s\"",
+              "cfFilterPWGToPDF: OUTFORMAT=\"%s\"",
               outformat == CF_FILTER_OUT_FORMAT_PDF ? "PDF" : "PCLM");
 
  /*
@@ -1391,7 +1391,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if (!iscanceled || !iscanceled(icd))
     {
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Unable to open output data stream.");
+                  "cfFilterPWGToPDF: Unable to open output data stream.");
     }
 
     return (1);
@@ -1417,7 +1417,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
   if (outformat == CF_FILTER_OUT_FORMAT_PCLM && printer_attrs == NULL)
   {
     if (log) log(ld, CF_LOGLEVEL_ERROR,
-      "cfFilterRasterToPDF: PCLm output: No printer IPP attributes are supplied, PCLm output not possible.");
+      "cfFilterPWGToPDF: PCLm output: No printer IPP attributes are supplied, PCLm output not possible.");
     return 1;
   }
 
@@ -1456,7 +1456,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if ((ipp_attr = ippFindAttribute(printer_attrs, attr_name, IPP_TAG_ZERO)) != NULL)
     {
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                 "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" with value %d",
+                 "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" with value %d",
                  attr_name, ippGetInteger(ipp_attr, 0));
       pdf.pclm_strip_height_preferred = ippGetInteger(ipp_attr, 0);
     }
@@ -1467,7 +1467,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if ((ipp_attr = ippFindAttribute(printer_attrs, attr_name, IPP_TAG_ZERO)) != NULL)
     {
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-      "cfFilterRasterToPDF: Printer PCLm attribute \"%s\"",
+      "cfFilterPWGToPDF: Printer PCLm attribute \"%s\"",
       attr_name);
       pdf.pclm_strip_height_supported.clear();  // remove default value = 16
       for (int i = 0; i < ippGetCount(ipp_attr); i ++)
@@ -1478,7 +1478,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if ((ipp_attr = ippFindAttribute(printer_attrs, attr_name, IPP_TAG_ZERO)) != NULL)
     {
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-      "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
+      "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
       attr_name, ippGetString(ipp_attr, 0, NULL));
       pdf.pclm_raster_back_side = ippGetString(ipp_attr, 0, NULL);
     }
@@ -1488,7 +1488,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     {
       ippAttributeString(ipp_attr, buf, sizeof(buf));
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
+                  "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
                   attr_name, buf);
       pdf.pclm_source_resolution_supported = split_strings(buf, ",");
     }
@@ -1498,7 +1498,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     {
       ippAttributeString(ipp_attr, buf, sizeof(buf));
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
+                  "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
                   attr_name, buf);
       pdf.pclm_source_resolution_default = buf;
     }
@@ -1507,13 +1507,13 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
       pdf.pclm_source_resolution_default =
        pdf.pclm_source_resolution_supported[0];
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" missing, taking first item of \"pclm-source-resolution-supported\" as default resolution",
+                  "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" missing, taking first item of \"pclm-source-resolution-supported\" as default resolution",
                   attr_name);
     }
     else
     {
       if (log) log(ld, CF_LOGLEVEL_ERROR,
-                  "cfFilterRasterToPDF: PCLm output: Printer IPP attributes do not contain printer resolution information for PCLm.");
+                  "cfFilterPWGToPDF: PCLm output: Printer IPP attributes do not contain printer resolution information for PCLm.");
       return 1;
     }
 
@@ -1522,7 +1522,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     {
       ippAttributeString(ipp_attr, buf, sizeof(buf));
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
+                  "cfFilterPWGToPDF: Printer PCLm attribute \"%s\" with value \"%s\"",
                   attr_name, buf);
       std::vector<std::string> vec = split_strings(buf, ",");
 
@@ -1547,7 +1547,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if (pdf.pclm_compression_method_preferred.empty())
     {
       if (log) log(ld, CF_LOGLEVEL_WARN,
-                  "(rastertopclm) Unable parse Printer attribute \"%s\". "
+                  "(pwgtopclm) Unable parse Printer attribute \"%s\". "
                   "Using FLATE for encoding image streams.", attr_name);
       pdf.pclm_compression_method_preferred.push_back(FLATE_DECODE);
       }
@@ -1558,7 +1558,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     if (iscanceled && iscanceled(icd))
     {
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: Job canceled");
+                  "cfFilterPWGToPDF: Job canceled");
       break;
     }
 
@@ -1569,7 +1569,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
       if (create_pdf_file(&pdf, outformat) != 0)
       {
        if (log) log(ld, CF_LOGLEVEL_ERROR,
-                    "cfFilterRasterToPDF: Unable to create PDF file");
+                    "cfFilterPWGToPDF: Unable to create PDF file");
        return 1;
       }
     }
@@ -1577,7 +1577,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     // Write a status message with the page number
     Page ++;
     if (log) log(ld, CF_LOGLEVEL_INFO,
-                "cfFilterRasterToPDF: Starting page %d.", Page);
+                "cfFilterPWGToPDF: Starting page %d.", Page);
 
     // Update rendering intent with user settings or the default
     cfGetPrintRenderIntent(data, header.cupsRenderingIntent,
@@ -1593,7 +1593,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
     }
     if (doc.colorProfile != NULL)       
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                  "cfFilterRasterToPDF: TEST ICC Profile specified (color "
+                  "cfFilterPWGToPDF: TEST ICC Profile specified (color "
                   "management forced ON): \n[%s]", profile_name);
 
     // Add a new page to PDF file
@@ -1604,7 +1604,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
           header.HWResolution[1], &doc) != 0)
     {
       if (log) log(ld, CF_LOGLEVEL_ERROR,
-                   "cfFilterRasterToPDF: Unable to start new PDF page");
+                   "cfFilterPWGToPDF: Unable to start new PDF page");
       return 1;
     }
 
@@ -1614,7 +1614,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
       &pdf, &doc) != 0)
     {
       if (log) log(ld, CF_LOGLEVEL_ERROR,
-                  "cfFilterRasterToPDF: Failed to convert page bitmap");
+                  "cfFilterPWGToPDF: Failed to convert page bitmap");
       return 1;
     }
   }
@@ -1622,7 +1622,7 @@ cfFilterRasterToPDF(int inputfd,    /* I - File descriptor input stream */
   if (empty)
   {
     if (log) log(ld, CF_LOGLEVEL_DEBUG,
-                "cfFilterRasterToPDF: Input is empty, outputting empty file.");
+                "cfFilterPWGToPDF: Input is empty, outputting empty file.");
     cupsRasterClose(ras);
     return 0;
   }

diff --git a/cupsfilters/pwgtoraster.c b/cupsfilters/pwgtoraster.c
index e10e8e26be2539d47db0fbf0ec7c1bbf6fcdb7f7..c3e15a480b8f2629da614799834b87d5e6a382fd 100644 (file)
--- a/cupsfilters/pwgtoraster.c
+++ b/cupsfilters/pwgtoraster.c
@@ -269,7 +269,7 @@ static int parse_opts(cf_filter_out_format_t outformat,
      cupsGetOption("media-col", num_options, options));
 
   // We can directly create CUPS Raster, PWG Raster, and Apple Raster but
-  // for PCLm we have to output CUPS Raster and feed it into cfFilterRasterToPDF()
+  // for PCLm we have to output CUPS Raster and feed it into cfFilterPWGToPDF()
   cfRasterPrepareHeader(&(doc->outheader), data, outformat,
                          outformat == CF_FILTER_OUT_FORMAT_PCLM ?
                          CF_FILTER_OUT_FORMAT_CUPS_RASTER : outformat, 0, &cspace);

diff --git a/cupsfilters/universal.c b/cupsfilters/universal.c
index 144243a4587c4522f49a33ea267a0cd6833e22e8..44a888ba1a60e9866b131bf1f4ce07d9798937ec 100644 (file)
--- a/cupsfilters/universal.c
+++ b/cupsfilters/universal.c
@@ -121,9 +121,9 @@ cfFilterUniversal(int inputfd,         /* I - File descriptor input stream */
        outformat = malloc(sizeof(cf_filter_out_format_t));
        *outformat = CF_FILTER_OUT_FORMAT_PCLM;
        filter = malloc(sizeof(cf_filter_filter_in_chain_t));
-       filter->function = cfFilterRasterToPDF;
+       filter->function = cfFilterPWGToPDF;
        filter->parameters = outformat;
-       filter->name = "rastertopclm";
+       filter->name = "pwgtopclm";
        cupsArrayAdd(filter_chain, filter);
        if (log) log(ld, CF_LOGLEVEL_DEBUG,
                     "cfFilterUniversal: Adding %s to chain", filter->name);
@@ -191,9 +191,9 @@ cfFilterUniversal(int inputfd,         /* I - File descriptor input stream */
       outformat = malloc(sizeof(cf_filter_out_format_t));
       *outformat = CF_FILTER_OUT_FORMAT_PDF;
       filter = malloc(sizeof(cf_filter_filter_in_chain_t));
-      filter->function = cfFilterRasterToPDF;
+      filter->function = cfFilterPWGToPDF;
       filter->parameters = outformat;
-      filter->name = "rastertopdf";
+      filter->name = "pwgtopdf";
       cupsArrayAdd(filter_chain, filter);
       if (log) log(ld, CF_LOGLEVEL_DEBUG,
                   "cfFilterUniversal: Adding %s to chain", filter->name);
@@ -224,9 +224,9 @@ cfFilterUniversal(int inputfd,         /* I - File descriptor input stream */
        outformat = malloc(sizeof(cf_filter_out_format_t));
        *outformat = CF_FILTER_OUT_FORMAT_PDF;
        filter = malloc(sizeof(cf_filter_filter_in_chain_t));
-       filter->function = cfFilterRasterToPDF;
+       filter->function = cfFilterPWGToPDF;
        filter->parameters = outformat;
-       filter->name = "rastertopdf";
+       filter->name = "pwgtopdf";
        cupsArrayAdd(filter_chain, filter);
        if (log) log(ld, CF_LOGLEVEL_DEBUG,
                     "cfFilterUniversal: Adding %s to chain", filter->name);
@@ -311,9 +311,9 @@ cfFilterUniversal(int inputfd,         /* I - File descriptor input stream */
            outformat = malloc(sizeof(cf_filter_out_format_t));
            *outformat = CF_FILTER_OUT_FORMAT_PCLM;
            filter = malloc(sizeof(cf_filter_filter_in_chain_t));
-           filter->function = cfFilterRasterToPDF;
+           filter->function = cfFilterPWGToPDF;
            filter->parameters = outformat;
-           filter->name = "rastertopclm";
+           filter->name = "pwgtopclm";
            cupsArrayAdd(filter_chain, filter);
            if (log) log(ld, CF_LOGLEVEL_DEBUG,
                         "cfFilterUniversal: Adding %s to chain", filter->name);

diff --git a/filter/rastertopclm.c b/filter/pwgtopclm.c
similarity index 85%
rename from filter/rastertopclm.c
rename to filter/pwgtopclm.c
index fb07c778e1f0485661e0a935953581a9f817a68c..b109c42724c3695c51116a8ebd854015f04c824f 100644 (file)
--- a/filter/rastertopclm.c
+++ b/filter/pwgtopclm.c
@@ -1,5 +1,5 @@
 /*
- * Raster to PCLm filter (based on cfFilterRasterToPDF() filter function).
+ * Raster to PCLm filter (based on cfFilterPWGToPDF() filter function).
  */
 
 
@@ -59,10 +59,10 @@ main(int  argc,                             /* I - Number of command-line args */
    */
 
   cf_filter_out_format_t outformat = CF_FILTER_OUT_FORMAT_PCLM;
-  ret = ppdFilterCUPSWrapper(argc, argv, cfFilterRasterToPDF, &outformat, &JobCanceled);
+  ret = ppdFilterCUPSWrapper(argc, argv, cfFilterPWGToPDF, &outformat, &JobCanceled);
 
   if (ret)
-    fprintf(stderr, "ERROR: rastertopclm filter failed.\n");
+    fprintf(stderr, "ERROR: pwgtopclm filter failed.\n");
 
   return (ret);
 }

diff --git a/filter/rastertopdf.c b/filter/pwgtopdf.c
similarity index 85%
rename from filter/rastertopdf.c
rename to filter/pwgtopdf.c
index 76065b9a900c1be9459f181158e8c441d41278c7..bdc0c53efaab6674398b33f5c5240592011499e9 100644 (file)
--- a/filter/rastertopdf.c
+++ b/filter/pwgtopdf.c
@@ -1,5 +1,5 @@
 /*
- * Raster to PDF filter (based on cfFilterRasterToPDF() filter function).
+ * Raster to PDF filter (based on cfFilterPWGToPDF() filter function).
  */
 
 
@@ -59,10 +59,10 @@ main(int  argc,                             /* I - Number of command-line args */
    */
 
   cf_filter_out_format_t outformat = CF_FILTER_OUT_FORMAT_PDF;
-  ret = ppdFilterCUPSWrapper(argc, argv, cfFilterRasterToPDF, &outformat, &JobCanceled);
+  ret = ppdFilterCUPSWrapper(argc, argv, cfFilterPWGToPDF, &outformat, &JobCanceled);
 
   if (ret)
-    fprintf(stderr, "ERROR: rastertopdf filter failed.\n");
+    fprintf(stderr, "ERROR: pwgtopdf filter failed.\n");
 
   return (ret);
 }

diff --git a/mime/cupsfilters-individual.convs b/mime/cupsfilters-individual.convs
index c3809d02a27d8e18c477c69ddd7c210bb2bbc041..a020652a6d3fa4f5f50cc8718f6af68e70e141b8 100644 (file)
--- a/mime/cupsfilters-individual.convs
+++ b/mime/cupsfilters-individual.convs
@@ -42,7 +42,7 @@
 
 application/pdf                application/vnd.cups-pdf                66      pdftopdf
 text/plain             application/pdf                         32      texttopdf
-image/pwg-raster       application/pdf                         32      rastertopdf
+image/pwg-raster       application/pdf                         32      pwgtopdf
 image/gif              application/vnd.cups-pdf                65      imagetopdf
 image/png              application/vnd.cups-pdf                65      imagetopdf
 image/jpeg             application/vnd.cups-pdf                65      imagetopdf
@@ -59,7 +59,7 @@ image/x-xpixmap               application/vnd.cups-pdf                65      imagetopdf
 image/x-xwindowdump    application/vnd.cups-pdf                65      imagetopdf
 image/x-sun-raster     application/vnd.cups-pdf                65      imagetopdf
 application/vnd.cups-pdf-banner        application/pdf                 32      bannertopdf
-image/urf              application/pdf                         0       rastertopdf
+image/urf              application/pdf                         0       pwgtopdf
 
 ########################################################################
 #
@@ -105,6 +105,5 @@ image/pwg-raster            application/vnd.cups-raster     100     pwgtoraster
 image/urf                      application/vnd.cups-raster     100     pwgtoraster
 image/pwg-raster               image/urf                       100     pwgtoraster
 image/urf                      image/pwg-raster                100     pwgtoraster
-image/pwg-raster               application/PCLm                100     rastertopclm
-image/urf                      application/PCLm                100     rastertopclm
-application/vnd.cups-raster    application/PCLm                100     rastertopclm
+image/pwg-raster               application/PCLm                100     pwgtopclm
+image/urf                      application/PCLm                100     pwgtopclm