libcupsfilters: Rename API functions of bitmap.h to "cf..."

API functions should all be named "cf" + camel-case, like CUPS'
API functions are named "cups" + camel-case.

diff --git a/cupsfilters/bitmap.c b/cupsfilters/bitmap.c
index f261d2c11b4c83482c34c2b3fde0a46cf3815389..204f887fd524b30b96b2eae48bb4ce7a32c12e88 100644 (file)
--- a/cupsfilters/bitmap.c
+++ b/cupsfilters/bitmap.c
@@ -82,12 +82,12 @@ unsigned char revTable[256] = {
 };
 
 /*
- * 'convertbits()' - Convert 8 bit raster data to bitspercolor raster data using
+ * 'cfConvertBits()' - Convert 8 bit raster data to bitspercolor raster data using
  *                   ordered dithering.
  */
 
 unsigned char *                        /* O - Output string */
-convertbits(unsigned char *src,        /* I - Input string */
+cfConvertBits(unsigned char *src,        /* I - Input string */
            unsigned char *dst,        /* I - Destination string */
            unsigned int x,            /* I - Column */
            unsigned int y,            /* I - Row */
@@ -156,11 +156,11 @@ convertbits(unsigned char *src,        /* I - Input string */
 }
 
 /*
- * 'writepixel()' - Write a pixel from pixelBuf to dst based on color order.
+ * 'cfWritePixel()' - Write a pixel from pixelBuf to dst based on color order.
  */
 
 void                                  /* O - Exit status */
-writepixel(unsigned char *dst,        /* I - Destination string */
+cfWritePixel(unsigned char *dst,        /* I - Destination string */
           unsigned int plane,        /* I - Plane/Band */
           unsigned int pixeli,       /* I - Pixel */
           unsigned char *pixelBuf,   /* I - Input string */
@@ -290,11 +290,11 @@ writepixel(unsigned char *dst,        /* I - Destination string */
 }
 
 /*
- * 'reverseOneBitLine()' - Reverse the order of pixels in one line of 1-bit raster data.
+ * 'cfReverseOneBitLine()' - Reverse the order of pixels in one line of 1-bit raster data.
  */
 
 unsigned char *                       /* O - Output string */
-reverseOneBitLine(unsigned char *src, /* I - Input line */
+cfReverseOneBitLine(unsigned char *src, /* I - Input line */
                  unsigned char *dst, /* I - Destination string */
                  unsigned int pixels,/* I - Number of pixels */
                  unsigned int size)  /* I - Bytesperline */
@@ -331,12 +331,12 @@ reverseOneBitLine(unsigned char *src, /* I - Input line */
 
 
 /*
- * 'reverseOneBitLineSwap()' - Reverse the order of pixels in one line of 1-bit raster data
+ * 'cfReverseOneBitLineSwap()' - Reverse the order of pixels in one line of 1-bit raster data
  *                             and invert the colors.
  */
 
 unsigned char *                           /* O - Output string */
-reverseOneBitLineSwap(unsigned char *src, /* I - Input line */
+cfReverseOneBitLineSwap(unsigned char *src, /* I - Input line */
                      unsigned char *dst, /* I - Destination string */
                      unsigned int pixels,/* I - Number of pixels */
                      unsigned int size)  /* I - Bytesperline */
@@ -372,11 +372,11 @@ reverseOneBitLineSwap(unsigned char *src, /* I - Input line */
 }
 
 /*
- * 'oneBitLine()' - Convert one line of 8-bit raster data to 1-bit raster data using ordered dithering.
+ * 'cfOneBitLine()' - Convert one line of 8-bit raster data to 1-bit raster data using ordered dithering.
  */
 
 void                           /* O - Output line */
-oneBitLine(unsigned char *src,  /* I - Input line */
+cfOneBitLine(unsigned char *src,  /* I - Input line */
           unsigned char *dst,  /* O - Destination line */
           unsigned int width,  /* I - Width of raster image in pixels */
           unsigned int row,    /* I - Current Row */
@@ -406,12 +406,12 @@ oneBitLine(unsigned char *src,  /* I - Input line */
 }
 
 /*
- * 'oneBitToGrayLine()' - Convert one line of 1-bit raster data to 8-bit
+ * 'cfOneBitToGrayLine()' - Convert one line of 1-bit raster data to 8-bit
  *                        raster data.
  */
 
 void                                 /* O - Output line */
-oneBitToGrayLine(unsigned char *src,  /* I - Input line */
+cfOneBitToGrayLine(unsigned char *src,  /* I - Input line */
                 unsigned char *dst,  /* O - Destination line */
                 unsigned int width)  /* I - Width of raster image in pixels */
 {
@@ -428,10 +428,10 @@ oneBitToGrayLine(unsigned char *src,  /* I - Input line */
 }
 
 /*
- * 'RGB8toKCMYcm()' - Convert one pixel of 8-bit RGB data to KCMYcm raster data.
+ * 'cfRGB8toKCMYcm()' - Convert one pixel of 8-bit RGB data to KCMYcm raster data.
  */
 
-unsigned char *RGB8toKCMYcm(unsigned char *src,
+unsigned char *cfRGB8toKCMYcm(unsigned char *src,
                            unsigned char *dst,
                            unsigned int x,
                            unsigned int y)

diff --git a/cupsfilters/bitmap.h b/cupsfilters/bitmap.h
index d8c5e0b2a7257aebdf2e0cd58a3282ba65c5b032..b85ec5da581f97200219dada33001ff257decc60 100644 (file)
--- a/cupsfilters/bitmap.h
+++ b/cupsfilters/bitmap.h
@@ -32,16 +32,22 @@ extern "C" {
 
 #include <cups/raster.h>
 
-unsigned char  *convertbits            (unsigned char *src, unsigned char *dst,
-                                       unsigned int x, unsigned int y, unsigned int cupsNumColors,unsigned int bits);
-void           writepixel              (unsigned char *dst, unsigned int plane, unsigned int pixeli, unsigned char *pixelBuf,
-                                       unsigned int cupsNumColors, unsigned int bits, cups_order_t colororder);
-unsigned char  *reverseOneBitLine      (unsigned char *src, unsigned char *dst, unsigned int pixels, unsigned int size);
-unsigned char  *reverseOneBitLineSwap  (unsigned char *src, unsigned char *dst, unsigned int pixels, unsigned int size);
-void           *oneBitLine             (unsigned char *src, unsigned char *dst, unsigned int width,
-                                       unsigned int row, int bi_level);
-  void                 *oneBitToGrayLine       (unsigned char *src, unsigned char *dst, unsigned int width);
-unsigned char  *RGB8toKCMYcm           (unsigned char *src, unsigned char *dst, unsigned int x, unsigned int y);
+unsigned char *cfConvertBits(unsigned char *src, unsigned char *dst,
+                            unsigned int x, unsigned int y,
+                            unsigned int cupsNumColors,unsigned int bits);
+void cfWritePixel(unsigned char *dst, unsigned int plane, unsigned int pixeli,
+                 unsigned char *pixelBuf, unsigned int cupsNumColors,
+                 unsigned int bits, cups_order_t colororder);
+unsigned char *cfReverseOneBitLine(unsigned char *src, unsigned char *dst,
+                                  unsigned int pixels, unsigned int size);
+unsigned char *cfReverseOneBitLineSwap(unsigned char *src, unsigned char *dst,
+                                      unsigned int pixels, unsigned int size);
+void *cfOneBitLine(unsigned char *src, unsigned char *dst, unsigned int width,
+                  unsigned int row, int bi_level);
+void *cfOneBitToGrayLine(unsigned char *src, unsigned char *dst,
+                        unsigned int width);
+unsigned char *cfRGB8toKCMYcm(unsigned char *src, unsigned char *dst,
+                             unsigned int x, unsigned int y);
 
 #  ifdef __cplusplus
 }

diff --git a/cupsfilters/pclmtoraster.cxx b/cupsfilters/pclmtoraster.cxx
index 55ffe36ee0348b4fd8a7dea4d80b3a6faf842e12..034ff1d145a29aa63c50ce87cce74c3868fe7929 100644 (file)
--- a/cupsfilters/pclmtoraster.cxx
+++ b/cupsfilters/pclmtoraster.cxx
@@ -488,7 +488,7 @@ RGBtoWhiteLine(unsigned char *src,
     cupsImageRGBToWhite(src,dst,pixels);
   } else {
     cupsImageRGBToWhite(src,src,pixels);
-    oneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
+    cfOneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
   }
 
   return dst;
@@ -505,7 +505,7 @@ RGBtoBlackLine(unsigned char *src,
     cupsImageRGBToBlack(src,dst,pixels);
   } else {
     cupsImageRGBToBlack(src,src,pixels);
-    oneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
+    cfOneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
   }
   return dst;
 }
@@ -545,7 +545,7 @@ CMYKtoWhiteLine(unsigned char *src,
     cupsImageCMYKToWhite(src,dst,pixels);
   } else {
     cupsImageCMYKToWhite(src,src,pixels);
-    oneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
+    cfOneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
   }
   return dst;
 }
@@ -561,7 +561,7 @@ CMYKtoBlackLine(unsigned char *src,
     cupsImageCMYKToBlack(src,dst,pixels);
   } else {
     cupsImageCMYKToBlack(src,src,pixels);
-    oneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
+    cfOneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
   }
   return dst;
 }
@@ -610,7 +610,7 @@ GraytoBlackLine(unsigned char *src,
     cupsImageWhiteToBlack(src, dst, pixels);
   } else {
     cupsImageWhiteToBlack(src, src, pixels);
-    oneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
+    cfOneBitLine(src, dst, data->header.cupsWidth, row, data->bi_level);
   }
   return dst;
 }
@@ -660,9 +660,9 @@ convertLine(unsigned char   *src,   /* I - Input line */
       unsigned char pixelBuf2[MAX_BYTES_PER_PIXEL];
       unsigned char *pb;
       pb = convertcspace(src + i*(data->numcolors), pixelBuf1, row, 1, data);
-      pb = convertbits(pb, pixelBuf2, i, row, data->header.cupsNumColors,
+      pb = cfConvertBits(pb, pixelBuf2, i, row, data->header.cupsNumColors,
                       data->header.cupsBitsPerColor);
-      writepixel(dst, plane, i, pb, data->header.cupsNumColors,
+      cfWritePixel(dst, plane, i, pb, data->header.cupsNumColors,
                 data->header.cupsBitsPerColor, data->header.cupsColorOrder);
     }
   }
@@ -697,7 +697,7 @@ convertReverseLine(unsigned char    *src,           /* I - Input line */
   if (data->header.cupsBitsPerColor == 1 && data->header.cupsNumColors == 1)
   {
     buf = convertcspace(src, buf, row, pixels, data);
-    dst = reverseOneBitLine(buf, dst, pixels, data->bytesPerLine);
+    dst = cfReverseOneBitLine(buf, dst, pixels, data->bytesPerLine);
   }
   else if (data->header.cupsBitsPerColor == 8 &&
           data->header.cupsColorOrder == CUPS_ORDER_CHUNKED)
@@ -724,9 +724,9 @@ convertReverseLine(unsigned char    *src,           /* I - Input line */
       unsigned char *pb;
       pb = convertcspace(src + (pixels - i - 1)*(data->numcolors), pixelBuf1,
                         row, 1, data);
-      pb = convertbits(pb, pixelBuf2, i, row, data->header.cupsNumColors,
+      pb = cfConvertBits(pb, pixelBuf2, i, row, data->header.cupsNumColors,
                       data->header.cupsBitsPerColor);
-      writepixel(dst, plane, i, pb, data->header.cupsNumColors,
+      cfWritePixel(dst, plane, i, pb, data->header.cupsNumColors,
                 data->header.cupsBitsPerColor, data->header.cupsColorOrder);
     }
   }

diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx
index 1c60aa99bf4c03bde9122e69303c422f6b08dbb9..9aeef8fad9d9c500c4287fd32eaa70770502b1ed 100644 (file)
--- a/cupsfilters/pdftoraster.cxx
+++ b/cupsfilters/pdftoraster.cxx
@@ -591,7 +591,7 @@ static unsigned char *reverseLineSwapBit(unsigned char *src,
   unsigned char *dst, unsigned int row, unsigned int plane,
   unsigned int pixels, unsigned int size, pdftoraster_doc_t* doc, ConvertCSpaceFunc convertCSpace)
 {
-  dst = reverseOneBitLineSwap(src, dst, pixels, size);
+  dst = cfReverseOneBitLineSwap(src, dst, pixels, size);
   return dst;
 }
 
@@ -717,7 +717,7 @@ static unsigned char *lineSwapBit(unsigned char *src, unsigned char *dst,
      unsigned int row, unsigned int plane, unsigned int pixels,
      unsigned int size, pdftoraster_doc_t* doc, ConvertCSpaceFunc convertCSpace)
 {
-  dst = reverseOneBitLine(src, dst, pixels, size);
+  dst = cfReverseOneBitLine(src, dst, pixels, size);
   return dst;
 }
 
@@ -895,7 +895,7 @@ static unsigned char *RGB8toKCMY(unsigned char *src, unsigned char *pixelBuf,
 static unsigned char *RGB8toKCMYcmTemp(unsigned char *src, unsigned char *pixelBuf,
   unsigned int x, unsigned int y, pdftoraster_doc_t* doc)
 {
-  return RGB8toKCMYcm(src, pixelBuf, x, y);
+  return cfRGB8toKCMYcm(src, pixelBuf, x, y);
 }
 
 static unsigned char *RGB8toYMCK(unsigned char *src, unsigned char *pixelBuf,
@@ -927,8 +927,8 @@ static unsigned char *convertLineChunked(unsigned char *src, unsigned char *dst,
       unsigned char *pb;
 
       pb = convertCSpace(src+i*(doc->popplerNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,0,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,0,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
   }
   return dst;
 }
@@ -944,8 +944,8 @@ static unsigned char *convertLineChunkedSwap(unsigned char *src,
       unsigned char *pb;
 
       pb = convertCSpace(src+(pixels-i-1)*(doc->popplerNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,0,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,0,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
   }
   return dst;
 }
@@ -961,8 +961,8 @@ static unsigned char *convertLinePlane(unsigned char *src, unsigned char *dst,
       unsigned char *pb;
 
       pb = convertCSpace(src+i*(doc->popplerNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,plane,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,plane,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
   }
   return dst;
 }
@@ -977,8 +977,8 @@ static unsigned char *convertLinePlaneSwap(unsigned char *src,
       unsigned char *pb;
 
       pb = convertCSpace(src+(pixels-i-1)*(doc->popplerNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,plane,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->header.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,plane,i,pb, doc->header.cupsNumColors, doc->header.cupsBitsPerColor, doc->header.cupsColorOrder);
   }
   return dst;
 }
@@ -1229,7 +1229,7 @@ static int selectConvertFunc(cups_raster_t *raster, pdftoraster_doc_t* doc, conv
   if (doc->header.cupsBitsPerColor == 1 &&
      (doc->header.cupsNumColors == 1 ||
      doc->header.cupsColorSpace == CUPS_CSPACE_KCMYcm ))
-    doc->bitspercolor = 0; /*Do not convertbits*/
+    doc->bitspercolor = 0; /* Do not convert the bits */
 
   return (0);
 }
@@ -1238,7 +1238,7 @@ static unsigned char *onebitpixel(unsigned char *src, unsigned char *dst, unsign
   unsigned char *temp;
   temp=dst;
   for(unsigned int i=0;i<height;i++){
-    oneBitLine(src + (doc->bytesPerLine)*8*i, dst + (doc->bytesPerLine)*i, doc->header.cupsWidth, i, doc->bi_level);
+    cfOneBitLine(src + (doc->bytesPerLine)*8*i, dst + (doc->bytesPerLine)*i, doc->header.cupsWidth, i, doc->bi_level);
   }
   return temp;
 }

diff --git a/cupsfilters/pwgtoraster.c b/cupsfilters/pwgtoraster.c
index 1112876189b7bfc35a0e8ba32cb91bac6c0870b4..21c1296ab0d680eee5d4d05a608e0d350d06bc38 100644 (file)
--- a/cupsfilters/pwgtoraster.c
+++ b/cupsfilters/pwgtoraster.c
@@ -454,7 +454,7 @@ static unsigned char *reverseLineSwapBit(unsigned char *src,
   unsigned char *dst, unsigned int row, unsigned int plane,
   unsigned int pixels, unsigned int size, pwgtoraster_doc_t* doc, ConvertCSpaceFunc convertCSpace)
 {
-  dst = reverseOneBitLineSwap(src, dst, pixels, size);
+  dst = cfReverseOneBitLineSwap(src, dst, pixels, size);
   return dst;
 }
 
@@ -580,7 +580,7 @@ static unsigned char *lineSwapBit(unsigned char *src, unsigned char *dst,
      unsigned int row, unsigned int plane, unsigned int pixels,
      unsigned int size, pwgtoraster_doc_t* doc, ConvertCSpaceFunc convertCSpace)
 {
-  dst = reverseOneBitLine(src, dst, pixels, size);
+  dst = cfReverseOneBitLine(src, dst, pixels, size);
   return dst;
 }
 
@@ -758,7 +758,7 @@ static unsigned char *RGB8toKCMY(unsigned char *src, unsigned char *pixelBuf,
 static unsigned char *RGB8toKCMYcmTemp(unsigned char *src, unsigned char *pixelBuf,
   unsigned int x, unsigned int y, pwgtoraster_doc_t* doc)
 {
-  return RGB8toKCMYcm(src, pixelBuf, x, y);
+  return cfRGB8toKCMYcm(src, pixelBuf, x, y);
 }
 
 static unsigned char *RGB8toYMCK(unsigned char *src, unsigned char *pixelBuf,
@@ -790,8 +790,8 @@ static unsigned char *convertLineChunked(unsigned char *src, unsigned char *dst,
       unsigned char *pb;
 
       pb = convertCSpace(src+i*(doc->outputNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,0,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,0,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
   }
   return dst;
 }
@@ -807,8 +807,8 @@ static unsigned char *convertLineChunkedSwap(unsigned char *src,
       unsigned char *pb;
 
       pb = convertCSpace(src+(pixels-i-1)*(doc->outputNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,0,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,0,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
   }
   return dst;
 }
@@ -824,8 +824,8 @@ static unsigned char *convertLinePlane(unsigned char *src, unsigned char *dst,
       unsigned char *pb;
 
       pb = convertCSpace(src+i*(doc->outputNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,plane,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,plane,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
   }
   return dst;
 }
@@ -840,8 +840,8 @@ static unsigned char *convertLinePlaneSwap(unsigned char *src,
       unsigned char *pb;
 
       pb = convertCSpace(src+(pixels-i-1)*(doc->outputNumColors),pixelBuf1,i,row, doc);
-      pb = convertbits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
-      writepixel(dst,plane,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
+      pb = cfConvertBits(pb,pixelBuf2,i,row, doc->outheader.cupsNumColors, doc->bitspercolor);
+      cfWritePixel(dst,plane,i,pb, doc->outheader.cupsNumColors, doc->outheader.cupsBitsPerColor, doc->outheader.cupsColorOrder);
   }
   return dst;
 }
@@ -1091,7 +1091,7 @@ static int selectConvertFunc(cups_raster_t *raster,
   if (doc->outheader.cupsBitsPerColor == 1 &&
      (doc->outheader.cupsNumColors == 1 ||
      doc->outheader.cupsColorSpace == CUPS_CSPACE_KCMYcm ))
-    doc->bitspercolor = 0; /*Do not convertbits*/
+    doc->bitspercolor = 0; /* Do not convert the bits */
 
   return (0);
 }
@@ -1941,7 +1941,7 @@ static bool outPage(pwgtoraster_doc_t *doc,
        {
          preBuf1 = (unsigned char *)calloc(doc->outheader.cupsWidth,
                                            sizeof(unsigned char));
-         oneBitToGrayLine(bp, preBuf1, doc->outheader.cupsWidth);
+         cfOneBitToGrayLine(bp, preBuf1, doc->outheader.cupsWidth);
          bp = preBuf1;
        }
        // We are always on color mode 1 (8-bit gray) at this point
@@ -1956,7 +1956,7 @@ static bool outPage(pwgtoraster_doc_t *doc,
        {
          preBuf2 = (unsigned char *)calloc((doc->outheader.cupsWidth + 7) / 8,
                                            sizeof(unsigned char));
-         oneBitLine(bp, preBuf2, doc->outheader.cupsWidth,
+         cfOneBitLine(bp, preBuf2, doc->outheader.cupsWidth,
                     y - doc->bitmapoffset[1], doc->bi_level);
          bp = preBuf2;
        }