/*
- * "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $"
+ * "$Id: image-bmp.c 7221 2008-01-16 22:20:08Z mike $"
*
- * BMP image routines for the Common UNIX Printing System (CUPS).
+ * BMP image routines for CUPS.
*
- * Copyright 1993-2006 by Easy Software Products.
+ * Copyright 2007-2011 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.
*
if (offset < 0)
{
- fprintf(stderr, "ERROR: Bad BMP offset %d\n", offset);
+ fprintf(stderr, "DEBUG: Bad BMP offset %d\n", offset);
fclose(fp);
return (1);
}
img->ysize == 0 || img->ysize > CUPS_IMAGE_MAX_HEIGHT ||
(depth != 1 && depth != 4 && depth != 8 && depth != 24))
{
- fprintf(stderr, "ERROR: Bad BMP dimensions %ux%ux%d\n",
+ fprintf(stderr, "DEBUG: Bad BMP dimensions %ux%ux%d\n",
img->xsize, img->ysize, depth);
fclose(fp);
return (1);
if (colors_used < 0 || colors_used > 256)
{
- fprintf(stderr, "ERROR: Bad BMP colormap size %d\n", colors_used);
+ fprintf(stderr, "DEBUG: Bad BMP colormap size %d\n", colors_used);
fclose(fp);
return (1);
}
if (img->xppi == 0 || img->yppi == 0)
{
- fprintf(stderr, "ERROR: Bad BMP resolution %dx%d PPI.\n",
+ fprintf(stderr, "DEBUG: Bad BMP resolution %dx%d PPI.\n",
img->xppi, img->yppi);
img->xppi = img->yppi = 128;
}
if (colors_used > 0)
fread(colormap, colors_used, 4, fp);
+ else
+ memset(colormap, 0, sizeof(colormap));
/*
* Setup image and buffers...
cupsImageSetMaxTiles(img, 0);
- in = malloc(img->xsize * 3);
bpp = cupsImageGetDepth(img);
- out = malloc(img->xsize * bpp);
+
+ if ((in = malloc(img->xsize * 3)) == NULL)
+ {
+ fputs("DEBUG: Unable to allocate memory!\n", stderr);
+ fclose(fp);
+ return (1);
+ }
+
+ if ((out = malloc(img->xsize * bpp)) == NULL)
+ {
+ fputs("DEBUG: Unable to allocate memory!\n", stderr);
+ free(in);
+ fclose(fp);
+ return (1);
+ }
/*
* Read the image data...
/*
- * End of "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $".
+ * End of "$Id: image-bmp.c 7221 2008-01-16 22:20:08Z mike $".
*/