/*
- * "$Id: image-sun.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id: image-sun.c 6649 2007-07-11 21:46:42Z mike $"
*
* Sun Raster image file routines for the Common UNIX Printing System (CUPS).
*
- * Copyright 1993-2006 by Easy Software Products.
+ * Copyright 2007 by Apple Inc.
+ * Copyright 1993-2007 by Easy Software Products.
*
* These coded instructions, statements, and computer programs are the
- * property of Easy Software Products and are protected by Federal
- * copyright law. Distribution and use rights are outlined in the file
- * "LICENSE.txt" which should have been included with this file. If this
- * file is missing or damaged please contact Easy Software Products
- * at:
- *
- * Attn: CUPS Licensing Information
- * Easy Software Products
- * 44141 Airport View Drive, Suite 204
- * Hollywood, Maryland 20636 USA
- *
- * Voice: (301) 373-9600
- * EMail: cups-info@cups.org
- * WWW: http://www.cups.org
+ * property of Apple Inc. and are protected by Federal copyright
+ * law. Distribution and use rights are outlined in the file "LICENSE.txt"
+ * which should have been included with this file. If this file is
+ * file is missing or damaged, see the license at "http://www.cups.org/".
*
* This file is subject to the Apple OS-Developed Software exception.
*
img->ysize == 0 || img->ysize > CUPS_IMAGE_MAX_HEIGHT ||
ras_depth == 0 || ras_depth > 32)
{
- fputs("ERROR: Raster image cannot be loaded!\n", stderr);
+ fputs("DEBUG: Raster image cannot be loaded!\n", stderr);
return (1);
}
for (y = 0; y < img->ysize; y ++)
{
- if (ras_depth != 8 || ras_maplength > 0)
+ if ((ras_depth != 8 && ras_depth != 24) || ras_maplength > 0)
p = scanline;
else
p = in;
*p = 0;
if (bit > 1)
+ bit >>= 1;
+ else
{
bit = 128;
scanptr ++;
}
- else
- bit >>= 1;
}
}
else if (ras_depth == 1)
}
if (bit > 1)
+ bit >>= 1;
+ else
{
bit = 128;
scanptr ++;
}
- else
- bit >>= 1;
}
}
else if (ras_depth == 8 && ras_maplength > 0)
/*
- * End of "$Id: image-sun.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id: image-sun.c 6649 2007-07-11 21:46:42Z mike $".
*/