Fix printing of PBM files

[michaelrsweet]

Version: 1.3.6
CUPS.org User: martin.pitt.canonical

"lpr file.pbm" currently only produces garbage output for plain PBM (type "P1") files, and inverted output for normal PBM (type "P4") files.

Patch by Eugeniy Meshcheryakov. I tested it with the two attached example files.

[michaelrsweet]

CUPS.org User: mike

Fixed in Subversion repository.

[michaelrsweet]

"str2746.patch":

Index: image-pnm.c

--- image-pnm.c (revision 7370)
+++ image-pnm.c (working copy)
@@ -178,6 +178,11 @@
switch (format)
{
case 1 :

•      for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
  

•        if (fscanf(fp, "%d", &val) == 1)
  

•          *inptr = val ? 0 : 255;
  

•      break;
  

  • case 2 :
    for (x = img->xsize, inptr = in; x > 0; x --, inptr ++)
    if (fscanf(fp, "%d", &val) == 1)
    @@ -203,9 +208,9 @@
    x --, inptr ++)
    {
    if (*outptr & bit)

•          *inptr = 0;
  

•        else
         *inptr = 255;
  

•        else
  

•          *inptr = 0;
  
       if (bit > 1)
         bit >>= 1;