diff options
Diffstat (limited to 'converter/ppm/winicontoppm.c')
| -rw-r--r-- | converter/ppm/winicontoppm.c | 347 |
1 files changed, 197 insertions, 150 deletions
diff --git a/converter/ppm/winicontoppm.c b/converter/ppm/winicontoppm.c index 2c9015f5..ede0a2b9 100644 --- a/converter/ppm/winicontoppm.c +++ b/converter/ppm/winicontoppm.c @@ -10,7 +10,7 @@ ** implied warranty. ** ** Changes: -** +** ** 03/2003 - Added 24+32 bpp capability. */ @@ -57,7 +57,7 @@ parseCommandLine (int argc, const char ** argv, struct cmdlineInfo *cmdlineP ) { /*---------------------------------------------------------------------------- parse program command line described in Unix standard form by argc - and argv. Return the information in the options as *cmdlineP. + and argv. Return the information in the options as *cmdlineP. If command line is internally inconsistent (invalid options, etc.), issue error message to stderr and abort program. @@ -75,15 +75,15 @@ parseCommandLine (int argc, const char ** argv, MALLOCARRAY(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ - OPTENT3(0, "allicons", OPT_FLAG, NULL, + OPTENT3(0, "allicons", OPT_FLAG, NULL, &cmdlineP->allicons, 0 ); - OPTENT3(0, "bestqual", OPT_FLAG, NULL, + OPTENT3(0, "bestqual", OPT_FLAG, NULL, &cmdlineP->bestqual, 0 ); - OPTENT3(0, "writeands", OPT_FLAG, NULL, + OPTENT3(0, "writeands", OPT_FLAG, NULL, &cmdlineP->writeands, 0 ); - OPTENT3(0, "multippm", OPT_FLAG, NULL, + OPTENT3(0, "multippm", OPT_FLAG, NULL, &cmdlineP->multippm, 0 ); - OPTENT3(0, "verbose", OPT_FLAG, NULL, + OPTENT3(0, "verbose", OPT_FLAG, NULL, &cmdlineP->verbose, 0 ); opt.opt_table = option_def; @@ -93,14 +93,14 @@ parseCommandLine (int argc, const char ** argv, pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ - if (argc-1 < 1) + if (argc-1 < 1) cmdlineP->inputFilespec = "-"; else cmdlineP->inputFilespec = argv[1]; if (argc-1 < 2) { cmdlineP->outputFilespec = "-"; - + if (cmdlineP->writeands || cmdlineP->allicons) pm_error("If you specify the -writeands or -allicons option, " "you must also specify an output file name argument."); @@ -116,49 +116,49 @@ parseCommandLine (int argc, const char ** argv, -static int +static int GetByte(FILE * const ifP) { int v; - + v = getc(ifP); if (v == EOF) pm_error(er_read, infname); - + return v; } - -static short + +static short GetShort(FILE * const ifP) { short v; - + pm_readlittleshort(ifP, &v); return v; } - -static long + +static long GetLong(FILE * const ifP) { long v; - + pm_readlittlelong(ifP, &v); - + return v; } - + /* - * These have no purpose but to wrapper the Byte, Short & Long + * These have no purpose but to wrapper the Byte, Short & Long * functions. */ -static u1 +static u1 readU1(FILE * const ifP) { ++fileOffset; @@ -168,17 +168,26 @@ readU1(FILE * const ifP) { -static u1 * +static u1 * readU1String (FILE * const ifP, unsigned int const length) { - + u1 * string; - + size_t rc; + MALLOCARRAY(string, length + 1); if (string == NULL) pm_error("out of memory"); - fread(string, sizeof(u1), length, ifP); + rc = fread(string, sizeof(u1), length, ifP); + if (rc < length) { + if (feof(ifP)) + pm_error("File read failed. Premature end of file"); + else + pm_error("File read failed. Errno=%d (%s)", + errno, strerror(errno)); + } + string[length] = 0; fileOffset += length * sizeof(u1); @@ -187,7 +196,7 @@ readU1String (FILE * const ifP, -static u2 +static u2 readU2 (FILE * const ifP) { fileOffset +=2; @@ -197,7 +206,7 @@ readU2 (FILE * const ifP) { -static u4 +static u4 readU4 (FILE * const ifP) { fileOffset += 4; @@ -207,62 +216,96 @@ readU4 (FILE * const ifP) { -static IC_Entry +static IC_Entry readICEntry(FILE * const ifP) { IC_Entry entryP; + u1 widthFld; /* 0 means 256 */ + u1 heightFld; /* 0 means 256 */ + u1 colorCtFld; /* 0 means 256 */ MALLOCVAR(entryP); if (entryP == NULL) - pm_error("Unable to allcoate memory for IC entry"); + pm_error("Unable to allocate memory for IC entry"); - entryP->width = readU1(ifP); - entryP->height = readU1(ifP); + widthFld = readU1(ifP); + heightFld = readU1(ifP); entryP->color_count = readU1(ifP); - entryP->reserved = readU1(ifP); - entryP->planes = readU2(ifP); - entryP->bitcount = readU2(ifP); - entryP->size_in_bytes = readU4(ifP); - entryP->file_offset = readU4(ifP); + entryP->reserved = readU1(ifP); /* never referenced (should be 0) */ + entryP->planes = readU2(ifP); /* never referenced */ + entryP->bitcount = readU2(ifP); /* must be 0, 1, 4, or 8 */ + entryP->size_in_bytes = readU4(ifP); /* never referenced */ + entryP->file_offset = readU4(ifP); /* never referenced */ entryP->colors = NULL; entryP->ih = NULL; entryP->xorBitmap = NULL; entryP->andBitmap = NULL; - + + entryP->width = widthFld == 0 ? 256 : widthFld; + entryP->height = heightFld == 0 ? 256 : heightFld; + entryP->color_count = colorCtFld == 0 ? 256 : colorCtFld; + + if (entryP->width != entryP->height) + pm_message("warning: icon is not square: %u x %u", + entryP->width, entryP->height); + return entryP; } -static IC_InfoHeader +static IC_InfoHeader readInfoHeader (FILE * const ifP, IC_Entry const entryP) { IC_InfoHeader ihP; MALLOCVAR(ihP); - + if (ihP == NULL) pm_error("Unable to allocate memory for info header"); - ihP->size = readU4(ifP); - ihP->width = readU4(ifP); - ihP->height = readU4(ifP); - ihP->planes = readU2(ifP); + ihP->size = readU4(ifP); /* never referenced */ + ihP->width = readU4(ifP); /* must equal entryP->width */ + ihP->height = readU4(ifP); /* must be 2 * entryP->height */ + ihP->planes = readU2(ifP); /* never referenced */ ihP->bitcount = readU2(ifP); ihP->compression = readU4(ifP); - ihP->imagesize = readU4(ifP); - ihP->x_pixels_per_m = readU4(ifP); - ihP->y_pixels_per_m = readU4(ifP); + ihP->imagesize = readU4(ifP); /* never referenced */ + ihP->x_pixels_per_m = readU4(ifP); /* never referenced */ + ihP->y_pixels_per_m = readU4(ifP); /* never referenced */ ihP->colors_used = readU4(ifP); + /* checked below, otherwise never referenced */ ihP->colors_important = readU4(ifP); - - if (!entryP->bitcount) - entryP->bitcount = ihP->bitcount; - - if (entryP->color_count == 0 && entryP->bitcount <= 8) - entryP->color_count = 256; + /* checked below, otherwise never referenced */ + + if ((entryP->width != ihP->width) + || (entryP->height != ihP->height / 2)) { + pm_error("mismatch in header and image dimensions " + "(%u x %u vs. %u x %u)", + entryP->width, entryP->height, + ihP->width, ihP->height / 2); + } else if (ihP->height % 2 != 0) + pm_error("invalid image height value %u (cannot be an odd number)", + ihP->height); + + if (ihP->bitcount > 8) + pm_error("abnormal bit per pixel value %u", ihP->bitcount); + + if ((entryP->bitcount != 0) && (entryP->bitcount != ihP->bitcount)) { + pm_error("mismatch in header and image bpp value" + "(%u vs. %u)", + entryP->bitcount, ihP->bitcount); + } + + if (ihP->colors_used > entryP->color_count) + pm_error("'colors used' value %u exceeds total colors %u", + ihP->colors_used, entryP->color_count); + + if (ihP->colors_important > entryP->color_count) + pm_error("'important colors' value %u exceeds total colors %u", + ihP->colors_important, entryP->color_count); if (ihP->compression) { pm_error("Can't handle compressed icons"); @@ -272,7 +315,7 @@ readInfoHeader (FILE * const ifP, -static IC_Color +static IC_Color readICColor(FILE * const ifP) { IC_Color colorP; @@ -284,7 +327,7 @@ readICColor(FILE * const ifP) { /* I don't know why this isn't the same as the spec, it just isn't. The colors honestly seem to be stored BGR. Bizarre. - + I've checked this in the BMP code for bmptoppm and the gimp. Guess the spec I have is just plain wrong. */ @@ -296,10 +339,10 @@ readICColor(FILE * const ifP) { return colorP; } - -static u1 * + +static u1 * read1Bitmap (FILE * const ifP, unsigned int const width, unsigned int const height) { @@ -313,9 +356,9 @@ read1Bitmap (FILE * const ifP, if (bitmap == NULL) pm_error("out of memory"); - /* Depending on if the image is stored as 1bpp, 4bpp or 8bpp, the + /* Depending on if the image is stored as 1bpp, 4bpp or 8bpp, the encoding mechanism is different. - + 8bpp => 1 byte/palette index. 4bpp => High Nibble, Low Nibble 1bpp => 1 palette value per bit, high bit 1st. @@ -334,9 +377,9 @@ read1Bitmap (FILE * const ifP, unsigned int col; unsigned int rowByte; unsigned int xOrVal; - + for (col = 0, rowByte = 0, xOrVal = 0x80; col < width; ++col) { - *(bitmap+((height - row - 1) * width) + col) = + *(bitmap+((height - row - 1) * width) + col) = (imgRow[rowByte] & xOrVal) / xOrVal; if (xOrVal == 0x01) { xOrVal = 0x80; @@ -350,8 +393,8 @@ read1Bitmap (FILE * const ifP, } - -static u1 * + +static u1 * read4Bitmap (FILE * const ifP, unsigned int const width, unsigned int const height) { @@ -382,7 +425,7 @@ read4Bitmap (FILE * const ifP, for (col = 0, rowByte = 0, bottom = true; col < width; ++col) { /* 2 nibbles, 2 values */ if (bottom) { - *(bitmap + ((height - row - 1) * width) + col) = + *(bitmap + ((height - row - 1) * width) + col) = (imgRow[rowByte] & 0xF0) >> 4; } else { *(bitmap + ((height - row -1) * width) + col) = @@ -397,8 +440,8 @@ read4Bitmap (FILE * const ifP, } - -static u1 * + +static u1 * read8Bitmap (FILE * const ifP, unsigned int const width, unsigned int const height) { @@ -407,7 +450,7 @@ read8Bitmap (FILE * const ifP, unsigned int xByteCt; unsigned int wt; u1 * bitmap; - + MALLOCARRAY(bitmap, width * height); if (bitmap == NULL) pm_error("out of memory"); @@ -435,12 +478,12 @@ read8Bitmap (FILE * const ifP, static u1 * readXBitmap (FILE * const ifP, - unsigned int const width, - unsigned int const height, + unsigned int const width, + unsigned int const height, unsigned int const bpp) { /*---------------------------------------------------------------------------- Read a true color bitmap. (24/32 bits) - + The output routine deplanarizes it for us, we keep it flat here. -----------------------------------------------------------------------------*/ unsigned int const byteCt = bpp >> 3; @@ -458,7 +501,7 @@ readXBitmap (FILE * const ifP, u1 * bitcurptr; for (i = 0, bitcurptr = &bitmap[byteCt * width * (height-1)]; - i < height; + i < height; ++i, bitcurptr -= xByteCt) { u1 * const row = readU1String(ifP, xByteCt); @@ -471,7 +514,7 @@ readXBitmap (FILE * const ifP, -static MS_Ico +static MS_Ico readIconFile(FILE * const ifP, bool const verbose) { @@ -480,13 +523,23 @@ readIconFile(FILE * const ifP, MS_Ico MSIconData; MALLOCVAR(MSIconData); - + MSIconData->reserved = readU2(ifP); /* should be 0 */ - MSIconData->type = readU2(ifP); /* should be 1 */ + MSIconData->type = readU2(ifP); /* should be 1 (ICO) or 2 (CUR) */ MSIconData->count = readU2(ifP); /* # icons in file */ - if (verbose) - pm_message("Icon file contains %d icons.", MSIconData->count); + if (MSIconData->reserved != 0) + pm_message("Signature 'reserved' field is %u (should be 0)", + MSIconData->reserved); + + if (MSIconData->type != 1 && MSIconData->type != 2) + pm_error("Type %u file. Can handle only type 1 or 2.", + MSIconData->type); + + if (MSIconData->count == 0) + pm_error("Invalid image count: 0"); + else if (verbose) + pm_message("File contains %u images", MSIconData->count); MALLOCARRAY(MSIconData->entries, MSIconData->count); if (MSIconData->entries == NULL) @@ -499,16 +552,17 @@ readIconFile(FILE * const ifP, /* Read in the infoheader, color map (if any) and the actual bit/pix maps for the icons. */ - if (verbose) + if (verbose) pm_message("#\tColors\tBPP\tWidth\tHeight\n"); for (i = 0; i < MSIconData->count; ++i) { + IC_Entry const entryP = MSIconData->entries[i]; + unsigned int bpp; /* bits per pixel */ - MSIconData->entries[i]->ih = - readInfoHeader(ifP, MSIconData->entries[i]); - - bpp = MSIconData->entries[i]->bitcount; + entryP->ih = readInfoHeader(ifP, MSIconData->entries[i]); + + bpp = entryP->bitcount ? entryP->bitcount : entryP->ih->bitcount; /* Read the palette, if appropriate */ switch (bpp) { @@ -519,31 +573,29 @@ readIconFile(FILE * const ifP, default: { unsigned int j; - MALLOCARRAY(MSIconData->entries[i]->colors, - MSIconData->entries[i]->color_count); - if (MSIconData->entries[i]->colors == NULL) - pm_error("out of memory"); + MALLOCARRAY(entryP->colors, entryP->color_count); + if (!entryP->colors) + pm_error("Could get memory for %u colors", + entryP->color_count); - for (j = 0; j < MSIconData->entries[i]->color_count; ++j) - MSIconData->entries[i]->colors[j] = readICColor(ifP); + for (j = 0; j < entryP->color_count; ++j) + entryP->colors[j] = readICColor(ifP); } } if (verbose) { char colsText[10]; - sprintf (colsText, "%d", MSIconData->entries[i]->color_count); + sprintf (colsText, "%d", entryP->color_count); pm_message("%d\t%s\t%d\t%d\t%d\n", i, - MSIconData->entries[i]->color_count ? - colsText : "TRUE", - bpp, MSIconData->entries[i]->width, - MSIconData->entries[i]->height); + entryP->color_count ? colsText : "TRUE", + bpp, entryP->width, entryP->height); } /* Pixels are stored bottom-up, left-to-right. Pixel lines are * padded with zeros to end on a 32bit (4byte) boundary. Every * line will have the same number of bytes. Color indices are * zero based, meaning a pixel color of 0 represents the first * color table entry, a pixel color of 255 (if there are that - * many) represents the 256th entry. - * + * many) represents the 256th entry. + * * 24+32 bit (16 is an abomination, which I'll avoid, and expect * no-one to mind) are stored 1byte/plane with a spare (alpha?) * byte for 32 bit. @@ -554,29 +606,21 @@ readIconFile(FILE * const ifP, */ switch (bpp) { case 1: - MSIconData->entries[i]->xorBitmap = - read1Bitmap(ifP, - MSIconData->entries[i]->width, - MSIconData->entries[i]->height); + entryP->xorBitmap = + read1Bitmap(ifP, entryP->width, entryP->height); break; case 4: - MSIconData->entries[i]->xorBitmap = - read4Bitmap(ifP, - MSIconData->entries[i]->width, - MSIconData->entries[i]->height); + entryP->xorBitmap = + read4Bitmap(ifP, entryP->width, entryP->height); break; case 8: - MSIconData->entries[i]->xorBitmap = - read8Bitmap(ifP, - MSIconData->entries[i]->width, - MSIconData->entries[i]->height); + entryP->xorBitmap = + read8Bitmap(ifP, entryP->width, entryP->height); break; case 24: case 32: - MSIconData->entries[i]->xorBitmap = - readXBitmap(ifP, - MSIconData->entries[i]->width, - MSIconData->entries[i]->height,bpp); + entryP->xorBitmap = + readXBitmap(ifP, entryP->width, entryP->height,bpp); break; default: pm_error("Uncatered bit depth %u", bpp); @@ -584,19 +628,17 @@ readIconFile(FILE * const ifP, /* * Read AND Bitmap */ - MSIconData->entries[i]->andBitmap = - read1Bitmap(ifP, - MSIconData->entries[i]->width, - MSIconData->entries[i]->height); + entryP->andBitmap = + read1Bitmap(ifP, entryP->width, entryP->height); } - + } return MSIconData; } -static char * +static char * trimmedOutputName(const char inputName[]) { /* * Just trim off the final ".ppm", if there is one, else return as is. @@ -612,7 +654,7 @@ trimmedOutputName(const char inputName[]) { -static int +static int getBestQualityIcon(MS_Ico MSIconData) { unsigned int i; @@ -644,7 +686,7 @@ writeXors(FILE * const multiOutF, char * const outputFileBase, IC_Entry const entryP, int const entryNum, - bool const multiple, + bool const multiple, bool const xor) { /*---------------------------------------------------------------------------- Write an "xor" image (i.e. the main image) out. @@ -656,7 +698,7 @@ writeXors(FILE * const multiOutF, 'xor' means to include "xor" in the output file name. if 'multiOutF' is non-null, it is the stream descriptor of an open - stream to which we are to write the image. If it is null, + stream to which we are to write the image. If it is null, we are to open a file using outputFileBase[] and 'entryNum' and 'xor' to derive its name, and close it afterward. -----------------------------------------------------------------------------*/ @@ -673,16 +715,16 @@ writeXors(FILE * const multiOutF, if (multiple) { pm_asprintf(&outputFileName, "%s%s_%d.ppm", outputFileBase,(xor ? "_xor" : ""), entryNum); - } else { + } else { pm_asprintf(&outputFileName, "%s%s.ppm", outputFileBase,(xor ? "_xor" : "")); } } else outputFileName = strdup("-"); - + ofP = pm_openw(outputFileName); } - /* + /* Allocate an array to save the bmp data into. note that entry->height will be 1/2 entry->ih->height, as the latter adds "and" and "xor" height. @@ -705,31 +747,36 @@ writeXors(FILE * const multiOutF, unsigned int col; for (col = 0; col < entryP->width; ++col) { unsigned int const colorIndex = xorRow[col]; - IC_Color const colorP = entryP->colors[colorIndex]; - PPM_ASSIGN(pixArray[row][col], - colorP->red, colorP->green, colorP->blue); + if (colorIndex >= entryP->color_count) { + pm_error("Invalid color index %u (max is %u)", + colorIndex, entryP->color_count - 1); + } else { + IC_Color const colorP = entryP->colors[colorIndex]; + PPM_ASSIGN(pixArray[row][col], + colorP->red, colorP->green, colorP->blue); + } } } break; } - } - - ppm_writeppm(ofP, pixArray, entryP->width, entryP->height, + } + + ppm_writeppm(ofP, pixArray, entryP->width, entryP->height, 255 /* maxval */, false /* text */); ppm_freearray(pixArray, entryP->height); pm_strfree(outputFileName); - - if (!multiOutF) + + if (!multiOutF) pm_close(ofP); } - + static void -writeAnds(FILE * const multiOutF, +writeAnds(FILE * const multiOutF, char const outputFileBase[], IC_Entry const entryP, - unsigned int const entryNum, + unsigned int const entryNum, bool const multiple) { /*---------------------------------------------------------------------------- Write the "and" image (i.e. the alpha mask) of the image *entryP out. @@ -739,7 +786,7 @@ writeAnds(FILE * const multiOutF, we are writing. if 'multiOutF' is non-null, it is the stream descriptor of an open - stream to which we are to write the image. If it is null, + stream to which we are to write the image. If it is null, we are to open a file using outputFileBase[] and 'entryNum' and 'xor' to derive its name, and close it afterward. -----------------------------------------------------------------------------*/ @@ -754,10 +801,10 @@ writeAnds(FILE * const multiOutF, assert(outputFileBase); - if (multiple) + if (multiple) pm_asprintf(&outputFileName, "%s_and_%u.pbm", outputFileBase, entryNum); - else + else pm_asprintf(&outputFileName, "%s_and.pbm", outputFileBase); ofP = pm_openw(outputFileName); pm_strfree(outputFileName); @@ -782,7 +829,7 @@ writeAnds(FILE * const multiOutF, static void -openMultiXor(char const outputFileBase[], +openMultiXor(char const outputFileBase[], bool const writeands, FILE ** const multiOutFP) { @@ -810,7 +857,7 @@ openMultiAnd(char const outputFileBase[], assert(outputFileBase); pm_asprintf(&outputFileName, "%s_and.pbm", outputFileBase); - + *multiAndOutFP = pm_openw(outputFileName); pm_strfree(outputFileName); @@ -847,7 +894,7 @@ freeIcondata(MS_Ico const MSIconDataP) { -int +int main(int argc, const char *argv[]) { struct cmdlineInfo cmdline; @@ -857,7 +904,7 @@ main(int argc, const char *argv[]) { char * outputFileBase; FILE * multiOutF; FILE * multiAndOutF; - + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); @@ -865,7 +912,7 @@ main(int argc, const char *argv[]) { if (cmdline.bestqual && cmdline.allicons) pm_message("-bestqual doesn't make sense with -allicons. " "Ignoring -bestqual."); - + if (streq(cmdline.outputFilespec, "-")) outputFileBase = NULL; else @@ -880,10 +927,10 @@ main(int argc, const char *argv[]) { * Now we've read the icon file in (Hopefully! :) * Go through each of the entries, and write out files of the * form - * + * * fname_0_xor.ppm * fname_0_and.ppm - * + * * (or to stdout, depending on args parsing above). */ /* @@ -899,13 +946,13 @@ main(int argc, const char *argv[]) { else endEntry = 1; } - - if (cmdline.multippm) + + if (cmdline.multippm) openMultiXor(outputFileBase, cmdline.writeands, &multiOutF); else multiOutF = NULL; - if (cmdline.writeands && cmdline.multippm) + if (cmdline.writeands && cmdline.multippm) openMultiAnd(outputFileBase, &multiAndOutF); else multiAndOutF = NULL; @@ -916,18 +963,18 @@ main(int argc, const char *argv[]) { for (entryNum = startEntry; entryNum < endEntry; ++entryNum) { IC_Entry const entryP = MSIconDataP->entries[entryNum]; - writeXors(multiOutF, outputFileBase, entryP, entryNum, + writeXors(multiOutF, outputFileBase, entryP, entryNum, cmdline.allicons, cmdline.writeands); if (cmdline.writeands) - writeAnds(multiAndOutF, outputFileBase, + writeAnds(multiAndOutF, outputFileBase, entryP, entryNum, cmdline.allicons); } } if (multiOutF) - pm_close(multiOutF); + pm_close(multiOutF); if (multiAndOutF) pm_close(multiAndOutF); - + /* free up the image data here. */ freeIcondata(MSIconDataP); |