-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(__linux__)
-#include <stdint.h>
-#else
-#ifdef __CYGWIN__
-#include "elf.h"
-#else
-#include <inttypes.h>
-#endif
-#endif
-
-#ifdef __CYGWIN__
-typedef unsigned short ushort;
-#endif /* __CYGWIN__ */
-
+#include "compiler.h"
typedef struct bitmap_s { /* bitmap description */
uint16_t width;
fgetc (fp);
}
+__attribute__ ((__noreturn__))
+int error (char * msg, FILE *fp)
+{
+ fprintf (stderr, "ERROR: %s\n", msg);
+
+ fclose (fp);
+
+ exit (EXIT_FAILURE);
+}
+
int main (int argc, char *argv[])
{
int i, x;
FILE *fp;
bitmap_t bmp;
bitmap_t *b = &bmp;
- uint16_t n_colors;
+ uint16_t data_offset, n_colors;
if (argc < 2) {
fprintf (stderr, "Usage: %s file\n", argv[0]);
exit (EXIT_FAILURE);
}
- if (fgetc (fp) != 'B' || fgetc (fp) != 'M') {
- fprintf (stderr, "%s is not a bitmap file.\n", argv[1]);
- exit (EXIT_FAILURE);
- }
+ if (fgetc (fp) != 'B' || fgetc (fp) != 'M')
+ error ("Input file is not a bitmap", fp);
/*
* read width and height of the image, and the number of colors used;
* ignore the rest
*/
- skip_bytes (fp, 16);
- fread (&b->width, sizeof (uint16_t), 1, fp);
+ skip_bytes (fp, 8);
+ if (fread (&data_offset, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap data offset", fp);
+ skip_bytes (fp, 6);
+ if (fread (&b->width, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap width", fp);
skip_bytes (fp, 2);
- fread (&b->height, sizeof (uint16_t), 1, fp);
+ if (fread (&b->height, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap height", fp);
skip_bytes (fp, 22);
- fread (&n_colors, sizeof (uint16_t), 1, fp);
+ if (fread (&n_colors, sizeof (uint16_t), 1, fp) != 1)
+ error ("Couldn't read bitmap colors", fp);
skip_bytes (fp, 6);
/*
* Repair endianess.
*/
+ data_offset = le_short(data_offset);
b->width = le_short(b->width);
b->height = le_short(b->height);
n_colors = le_short(n_colors);
DEFAULT_CMAP_SIZE);
/* allocate memory */
- if ((b->data = (uint8_t *)malloc(b->width * b->height)) == NULL) {
- fclose (fp);
- printf ("Error allocating memory for file %s.\n", argv[1]);
- exit (EXIT_FAILURE);
- }
+ if ((b->data = (uint8_t *)malloc(b->width * b->height)) == NULL)
+ error ("Error allocating memory for file", fp);
/* read and print the palette information */
printf ("unsigned short bmp_logo_palette[] = {\n");
b->palette[(int)(i*3+0)] = fgetc(fp);
x=fgetc(fp);
-#if 0
- if ((i%4) == 0)
- putchar ('\t');
- printf ("0x%02X, 0x%02X, 0x%02X,%s",
- b->palette[(int)(i*3+0)],
- b->palette[(int)(i*3+1)],
- b->palette[(int)(i*3+2)],
- ((i%4) == 3) ? "\n" : " "
- );
-#else
- if ((i%8) == 0)
- putchar ('\t');
- printf ("0x0%X%X%X,%s",
+ printf ("%s0x0%X%X%X,%s",
+ ((i%8) == 0) ? "\t" : " ",
(b->palette[(int)(i*3+0)] >> 4) & 0x0F,
(b->palette[(int)(i*3+1)] >> 4) & 0x0F,
(b->palette[(int)(i*3+2)] >> 4) & 0x0F,
- ((i%8) == 7) ? "\n" : " "
+ ((i%8) == 7) ? "\n" : ""
);
-#endif
}
+ /* seek to offset indicated by file header */
+ fseek(fp, (long)data_offset, SEEK_SET);
+
/* read the bitmap; leave room for default color map */
printf ("\n");
printf ("};\n");