diff options
Diffstat (limited to 'converter')
| -rw-r--r-- | converter/other/pamtogif.c | 42 | ||||
| -rw-r--r-- | converter/other/pamtopdbimg.c | 17 | ||||
| -rw-r--r-- | converter/other/pgmtoppm.c | 147 | ||||
| -rw-r--r-- | converter/other/sunicontopnm.c | 12 | ||||
| -rw-r--r-- | converter/other/xwdtopnm.c | 11 | ||||
| -rw-r--r-- | converter/other/yuy2topam.c | 8 | ||||
| -rw-r--r-- | converter/pbm/atktopbm.c | 34 | ||||
| -rw-r--r-- | converter/pbm/escp2topbm.c | 18 | ||||
| -rw-r--r-- | converter/pbm/g3topbm.c | 11 | ||||
| -rw-r--r-- | converter/pbm/mgrtopbm.c | 30 | ||||
| -rw-r--r-- | converter/pbm/pbmtoatk.c | 31 | ||||
| -rw-r--r-- | converter/pbm/pbmtoescp2.c | 23 | ||||
| -rw-r--r-- | converter/pbm/pbmtomgr.c | 14 | ||||
| -rw-r--r-- | converter/pbm/ybmtopbm.c | 6 | ||||
| -rw-r--r-- | converter/pgm/st4topgm.c | 6 |
15 files changed, 243 insertions, 167 deletions
diff --git a/converter/other/pamtogif.c b/converter/other/pamtogif.c index f5bdbf4b..341c9c03 100644 --- a/converter/other/pamtogif.c +++ b/converter/other/pamtogif.c @@ -1892,14 +1892,14 @@ computeColormapFromInput(struct pam * const pamP, static void -computeLibnetpbmColormap(struct pam * const pamP, - bool const haveAlpha, - const char * const mapfile, - tuple * const color, - tuplehash * const tuplehashP, - struct pam * const mapPamP, - unsigned int * const colorCountP, - bool const sort) { +computeLibnetpbmColormap(struct pam * const pamP, + enum TransparencyType const transType, + const char * const mapfile, + tuple * const color, + tuplehash * const tuplehashP, + struct pam * const mapPamP, + unsigned int * const colorCountP, + bool const sort) { /*---------------------------------------------------------------------------- Compute a colormap, libnetpbm style, for the image described by 'pamP', which is positioned to the raster. @@ -1913,21 +1913,23 @@ computeLibnetpbmColormap(struct pam * const pamP, The tuples of the color map have a meaningful depth of 1 (grayscale) or 3 (color) and *mapPamP reflects that. - While we're at it, count the colors and validate that there aren't - too many. Return the count as *colorCountP. In determining if there are - too many, allow one slot for a fake transparency color if 'haveAlpha' - is true. If there are too many, issue an error message and abort the + While we're at it, count the colors and validate that there aren't too + many. Return the count as *colorCountP. In determining if there are too + many, allow one slot for a fake transparency color if 'transType' is + 'TRANS_ALPHA'. If there are too many, issue an error message and abort the program. 'sort' means to sort the colormap by red intensity, then by green intensity, then by blue intensity, as opposed to arbitrary order. -----------------------------------------------------------------------------*/ - unsigned int const maxcolors = haveAlpha ? MAXCMAPSIZE - 1 : MAXCMAPSIZE; + unsigned int const maxcolors = + transType == TRANS_ALPHA ? MAXCMAPSIZE - 1 : MAXCMAPSIZE; /* The most colors we can tolerate in the image. If we have our own made-up entry in the colormap for transparency, it isn't included in this count. */ - unsigned int const nInputComp = haveAlpha ? pamP->depth - 1 : pamP->depth; + unsigned int const nInputComp = + pamAlphaPlane(pamP) ? pamP->depth - 1 : pamP->depth; /* Number of color components (not alpha) in the input image */ unsigned int i; @@ -2010,16 +2012,16 @@ main(int argc, char *argv[]) { pm_tell2(ifP, &rasterPos, sizeof(rasterPos)); - computeLibnetpbmColormap(&pam, !!pamAlphaPlane(&pam), cmdline.mapfile, + transType = cmdline.transparent ? TRANS_COLOR : + pamAlphaPlane(&pam) ? TRANS_ALPHA : + TRANS_NONE; + + computeLibnetpbmColormap(&pam, transType, cmdline.mapfile, cmap.color, &cmap.tuplehash, &cmap.pam, &cmap.cmapSize, cmdline.sort); assert(cmap.pam.maxval == pam.maxval); - transType = cmdline.transparent ? TRANS_COLOR : - pamAlphaPlane(&pam) ? TRANS_ALPHA : - TRANS_NONE; - if (transType == TRANS_ALPHA) { /* Add a fake entry to the end of the colormap for transparency. Make its color black. @@ -2035,7 +2037,7 @@ main(int argc, char *argv[]) { gifEncode(&pam, stdout, rasterPos, cmdline.interlace, 0, bitsPerPixel, &cmap, cmdline.comment, cmdline.aspect, !cmdline.nolzw, cmdline.noclear, - !cmdline.transparent); + transType==TRANS_ALPHA); destroyCmap(&cmap); diff --git a/converter/other/pamtopdbimg.c b/converter/other/pamtopdbimg.c index ce2f7659..4823686f 100644 --- a/converter/other/pamtopdbimg.c +++ b/converter/other/pamtopdbimg.c @@ -63,7 +63,7 @@ parseCommandLine(int argc, const char ** argv, struct cmdlineInfo * const 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. @@ -110,7 +110,7 @@ parseCommandLine(int argc, const char ** argv, if (!notefileSpec) cmdlineP->notefile = NULL; - + if (compressed + uncompressed + maybeCompressed > 1) pm_error("You may specify only one of -compressed, -uncompressed, " "-maybecompressed"); @@ -232,7 +232,7 @@ imageWrite(IMAGE * const imgP, static int textWrite(TEXT * const textP, FILE * const fileP) { - + if (textP) fwrite(textP->data, 1, strlen(textP->data), fileP); @@ -303,7 +303,7 @@ ipdbWrite(IPDB * const pdbP, rc = pdbheadWrite(pdbP->p, fileP); if (rc != 0) pm_error("Failed to write PDB header. %s", ipdb_err(rc)); - + rc = rechdrWrite(irP, fileP); if (rc != 0) pm_error("Failed to write image record header. %s", ipdb_err(rc)); @@ -513,7 +513,7 @@ insertG16image(IPDB * const pdbP, /* Pad with white on the bottom */ for (; row < ipdb_height(pdbP); ++row) memset(outP, 0, rowSize); - } + } } @@ -544,7 +544,7 @@ insertGimage(IPDB * const pdbP, /* Pad with white on the bottom */ for (; row < ipdb_height(pdbP); ++row) memset(outP, 0, rowSize); - } + } } @@ -575,7 +575,7 @@ insertMimage(IPDB * const pdbP, /* Pad with white on the bottom */ for (; row < ipdb_height(pdbP); ++row) memset(outP, 0, rowSize); - } + } } @@ -730,3 +730,6 @@ main(int argc, const char **argv) { return EXIT_SUCCESS; } + + + diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c index 62a388c2..dea6c4ca 100644 --- a/converter/other/pgmtoppm.c +++ b/converter/other/pgmtoppm.c @@ -17,24 +17,27 @@ #include "pm_c_util.h" #include "mallocvar.h" +#include "nstring.h" #include "shhopt.h" #include "ppm.h" -struct cmdlineInfo { +struct CmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. */ const char * inputFilename; /* '-' if stdin */ const char * map; - const char * colorBlack; - const char * colorWhite; + const char * colorBlack; /* malloc'ed */ + /* The color to which the user says to map black */ + const char * colorWhite; /* malloc'ed */ + /* The color to which the user says to map white */ }; static void -parseCommandLine(int argc, char ** argv, - struct cmdlineInfo * const cmdlineP) { +parseCommandLine(int argc, const char ** argv, + struct CmdlineInfo * const cmdlineP) { /*---------------------------------------------------------------------------- parse program command line described in Unix standard form by argc and argv. Return the information in the options as *cmdlineP. @@ -52,11 +55,18 @@ parseCommandLine(int argc, char ** argv, unsigned int option_def_index; - unsigned int mapSpec; + unsigned int blackSpec, whiteSpec, mapSpec; + + const char * blackOpt; + const char * whiteOpt; MALLOCARRAY_NOFAIL(option_def, 100); option_def_index = 0; /* incremented by OPTENT3 */ + OPTENT3(0, "black", OPT_STRING, &blackOpt, + &blackSpec, 0); + OPTENT3(0, "white", OPT_STRING, &whiteOpt, + &whiteSpec, 0); OPTENT3(0, "map", OPT_STRING, &cmdlineP->map, &mapSpec, 0); @@ -64,13 +74,20 @@ parseCommandLine(int argc, char ** argv, opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ - pm_optParseOptions3(&argc, argv, opt, sizeof(opt), 0); + pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ if (!mapSpec) cmdlineP->map = NULL; if (mapSpec) { + if (blackSpec || whiteSpec) + pm_error("You may not specify -black or -white " + "together with -map"); + + cmdlineP->colorBlack = NULL; + cmdlineP->colorWhite = NULL; + /* No color argument; only argument is file name */ if (argc-1 < 1) cmdlineP->inputFilename = "-"; @@ -81,41 +98,77 @@ parseCommandLine(int argc, char ** argv, "the file name. You specified %u", argc-1); } } else { - /* Arguments are color or color range and file name */ - /* For defaults, we use "rgbi:..." instead of the simpler "black" - and "white" so that we don't have unnecessary dependency on a - color dictionary being available. + /* For default colors, we use "rgbi:..." instead of the simpler + "black" and "white" so that we don't have an unnecessary dependency + on a color dictionary being available. */ - if (argc-1 < 1) { - cmdlineP->colorBlack = "rgbi:0/0/0"; - cmdlineP->colorWhite = "rgbi:1/1/1"; + if (blackSpec || whiteSpec) { + cmdlineP->colorBlack = + pm_strdup(blackSpec ? blackOpt : "rgbi:0/0/0"); + cmdlineP->colorWhite = + pm_strdup(whiteSpec ? whiteOpt : "rgbi:1/1/1"); + + /* The only possibly argument is input file name */ + if (argc-1 < 1) + cmdlineP->inputFilename = "-"; + else { + cmdlineP->inputFilename = argv[1]; + if (argc-1 > 1) + pm_error("Whten you specify -black or -white, " + "there can be at most one non-option arguments: " + "the file name. " + "You specified %u", argc-1); + } } else { - char * buffer = strdup(argv[1]); - char * hyphenPos = strchr(buffer, '-'); - if (hyphenPos) { - *hyphenPos = '\0'; - cmdlineP->colorBlack = buffer; - cmdlineP->colorWhite = hyphenPos+1; + /* Arguments are color or color range and optional file name */ + + if (argc-1 < 1) { + cmdlineP->colorBlack = pm_strdup("rgbi:0/0/0"); + cmdlineP->colorWhite = pm_strdup("rgbi:1/1/1"); } else { - cmdlineP->colorBlack = "rgbi:0/0/0"; - cmdlineP->colorWhite = buffer; + char * buffer = strdup(argv[1]); + if (!buffer) + pm_error("Out of memory allocating tiny buffer"); + char * hyphenPos = strchr(buffer, '-'); + if (hyphenPos) { + *hyphenPos = '\0'; + cmdlineP->colorBlack = pm_strdup(buffer); + cmdlineP->colorWhite = pm_strdup(hyphenPos+1); + } else { + cmdlineP->colorBlack = pm_strdup("rgbi:0/0/0"); + cmdlineP->colorWhite = pm_strdup(buffer); + } + free(buffer); } - } - if (argc-1 < 2) - cmdlineP->inputFilename = "-"; - else - cmdlineP->inputFilename = argv[2]; - if (argc-1 > 2) - pm_error("Program takes at most 2 arguments: " - "color name/range and input file name. " - "You specified %u", argc-1); + if (argc-1 < 2) + cmdlineP->inputFilename = "-"; + else { + cmdlineP->inputFilename = argv[2]; + + if (argc-1 > 2) + pm_error("Program takes at most 2 arguments: " + "color name/range and input file name. " + "You specified %u", argc-1); + } + } } } static void +freeCommandLine(struct CmdlineInfo const cmdline) { + + if (cmdline.colorBlack) + pm_strfree(cmdline.colorBlack); + if (cmdline.colorWhite) + pm_strfree(cmdline.colorWhite); +} + + + +static void convertWithMap(FILE * const ifP, unsigned int const cols, unsigned int const rows, @@ -172,21 +225,19 @@ convertLinear(FILE * const ifP, gray * const grayrow, pixel * const pixelrow) { - pixel colorBlack, colorWhite; - pixval red0, grn0, blu0, red1, grn1, blu1; - unsigned int row; + pixel const colorBlack = ppm_parsecolor(colorNameBlack, maxval); + pixel const colorWhite = ppm_parsecolor(colorNameWhite, maxval); - ppm_writeppminit(ofP, cols, rows, maxval, 0); + pixval const red0 = PPM_GETR(colorBlack); + pixval const grn0 = PPM_GETG(colorBlack); + pixval const blu0 = PPM_GETB(colorBlack); + pixval const red1 = PPM_GETR(colorWhite); + pixval const grn1 = PPM_GETG(colorWhite); + pixval const blu1 = PPM_GETB(colorWhite); - colorBlack = ppm_parsecolor(colorNameBlack, maxval); - colorWhite = ppm_parsecolor(colorNameWhite, maxval); + unsigned int row; - red0 = PPM_GETR(colorBlack); - grn0 = PPM_GETG(colorBlack); - blu0 = PPM_GETB(colorBlack); - red1 = PPM_GETR(colorWhite); - grn1 = PPM_GETG(colorWhite); - blu1 = PPM_GETB(colorWhite); + ppm_writeppminit(ofP, cols, rows, maxval, 0); for (row = 0; row < rows; ++row) { unsigned int col; @@ -208,17 +259,17 @@ convertLinear(FILE * const ifP, int -main(int argc, - char * argv[]) { +main(int argc, + const char * argv[]) { FILE * ifP; - struct cmdlineInfo cmdline; + struct CmdlineInfo cmdline; gray * grayrow; pixel * pixelrow; int rows, cols, format; gray maxval; - ppm_init(&argc, argv); + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); @@ -240,6 +291,8 @@ main(int argc, pgm_freerow(grayrow); pm_close(ifP); + freeCommandLine(cmdline); + /* If the program failed, it previously aborted with nonzero completion code, via various function calls. */ diff --git a/converter/other/sunicontopnm.c b/converter/other/sunicontopnm.c index db26663e..93ddc0ab 100644 --- a/converter/other/sunicontopnm.c +++ b/converter/other/sunicontopnm.c @@ -30,9 +30,9 @@ static void -ReadIconFileHeader(FILE * const file, - int * const widthP, - int * const heightP, +ReadIconFileHeader(FILE * const file, + int * const widthP, + int * const heightP, int * const depthP, int * const bitsPerItemP) { @@ -51,7 +51,7 @@ ReadIconFileHeader(FILE * const file, ch == ' ') ; for (i = 0; - ch != '=' && ch != ',' && ch != '\n' && ch != '\t' && + ch != '=' && ch != ',' && ch != '\n' && ch != '\t' && ch != ' ' && (i < (sizeof(variable) - 1)); ++i) { variable[i] = ch; @@ -84,7 +84,7 @@ ReadIconFileHeader(FILE * const file, } else if (streq(variable, "Valid_bits_per_item")) { if (value != 16 && value !=32) pm_error("invalid Valid_bits_per_item"); - *bitsPerItemP = value; + *bitsPerItemP = value; ++fieldCt; } } @@ -165,7 +165,7 @@ main(int argc, const char ** argv) { else grayrow[colChar] = data; } else - pm_error("error scanning bits item %u" , colChar); + pm_error("error scanning bits item %u", colChar); } /* output row */ diff --git a/converter/other/xwdtopnm.c b/converter/other/xwdtopnm.c index a99768b8..4eb16def 100644 --- a/converter/other/xwdtopnm.c +++ b/converter/other/xwdtopnm.c @@ -549,10 +549,10 @@ processX11Header(X11WDFileHeader * const h11P, pm_error("couldn't read rest of X11 XWD file header"); /* Check whether we can handle this dump. */ - if (h11FixedP->pixmap_depth > 24) - pm_error( "can't handle X11 pixmap_depth > 24"); - if (h11FixedP->bits_per_rgb > 24) - pm_error("can't handle X11 bits_per_rgb > 24"); + if (h11FixedP->pixmap_depth > 32) + pm_error( "can't handle X11 pixmap_depth > 32"); + if (h11FixedP->bits_per_rgb > 32) + pm_error("can't handle X11 bits_per_rgb > 32"); if (h11FixedP->pixmap_format != ZPixmap && h11FixedP->pixmap_depth != 1) pm_error("can't handle X11 pixmap_format %d with depth != 1", h11FixedP->pixmap_format); @@ -593,6 +593,9 @@ processX11Header(X11WDFileHeader * const h11P, *formatP = PPM_TYPE; /* See discussion above about this maxval */ + if (h11FixedP->bits_per_rgb > 16) + pm_error("Invalid bits_per_rgb for TrueColor image: %u. " + "Maximum possible is 16", h11FixedP->bits_per_rgb); *maxvalP = pm_bitstomaxval(h11FixedP->bits_per_rgb); } else if (*visualclassP == StaticGray && h11FixedP->bits_per_pixel == 1) { *formatP = PBM_TYPE; diff --git a/converter/other/yuy2topam.c b/converter/other/yuy2topam.c index 40ab98b3..49f284ac 100644 --- a/converter/other/yuy2topam.c +++ b/converter/other/yuy2topam.c @@ -31,12 +31,12 @@ struct CmdlineInfo { -static void -parseCommandLine(int argc, const char ** argv, +static void +parseCommandLine(int argc, const char ** argv, struct CmdlineInfo * const 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. @@ -84,7 +84,7 @@ parseCommandLine(int argc, const char ** argv, cmdlineP->inputFileName = "-"; else { cmdlineP->inputFileName = argv[1]; - + if (argc-1 > 1) pm_error("Too many arguments (%u). The only non-option argument " "is the input file name.", argc-1); diff --git a/converter/pbm/atktopbm.c b/converter/pbm/atktopbm.c index 807e4f4a..57782d91 100644 --- a/converter/pbm/atktopbm.c +++ b/converter/pbm/atktopbm.c @@ -44,7 +44,7 @@ #define dataobject_OBJECTCREATIONFAILED 4 #define dataobject_BADFORMAT 5 -/* ReadRow(file, row, length) +/* ReadRow(file, row, length) ** Reads from 'file' the encoding of bytes to fill in 'row'. Row will be ** truncated or padded (with WHITE) to exactly 'length' bytes. ** @@ -52,7 +52,7 @@ ** '|' correct end of line ** '\0' if the length was satisfied (before a terminator) ** EOF if the file ended -** '\' '{' other recognized ends. +** '\' '{' other recognized ends. ** The '|' is the expected end and pads the row with WHITE. ** The '\' and '{' are error conditions and may indicate the ** beginning of some other portion of the data stream. @@ -76,11 +76,11 @@ ReadRow(FILE * const file, 'file' is where to get them from. 'row' is where to put bytes. 'length' is how many bytes in row must be filled. - + Return the delimiter that marks the end of the row, or EOF if EOF marks the end of the row, or NUL in some cases. -----------------------------------------------------------------------------*/ - /* Each input character is processed by the central loop. There are + /* Each input character is processed by the central loop. There are ** some input codes which require two or three characters for ** completion; these are handled by advancing the state machine. ** Errors are not processed; instead the state machine is reset @@ -98,7 +98,7 @@ ReadRow(FILE * const file, RepeatAndDigit /* have seen repeat code and its first following digit */ }; - + enum StateCode InputState; /* current state */ int c; /* the current input character */ long repeatcount; /* current repeat value */ @@ -106,8 +106,8 @@ ReadRow(FILE * const file, long pendinghex; /* the first of a pair of hex characters */ int lengthRemaining; unsigned char * cursor; - - /* We cannot exit when length becomes zero because we need to check + + /* We cannot exit when length becomes zero because we need to check ** to see if a row ending character follows. Thus length is checked ** only when we get a data generating byte. If length then is ** zero, we ungetc the byte. @@ -148,7 +148,7 @@ ReadRow(FILE * const file, while (lengthRemaining-- > 0) *cursor++ = WHITEBYTE; return c; - + CASE1(0x21): CASE6(0x22): CASE8(0x28): @@ -227,9 +227,9 @@ ReadRow(FILE * const file, break; store: - /* generate byte(s) into the output row + /* generate byte(s) into the output row Use repeatcount, depending on state. */ - if (lengthRemaining < repeatcount) + if (lengthRemaining < repeatcount) /* reduce repeat count if it would exceed available space */ repeatcount = lengthRemaining; @@ -269,7 +269,7 @@ ReadATKRaster(FILE * const ifP) { pm_error ("input file not Andrew raster object"); fscanf(ifP, " %d ", &version); - if (version < 2) + if (version < 2) pm_error ("version too old to parse"); { @@ -277,8 +277,8 @@ ReadATKRaster(FILE * const ifP) { long xscale, yscale; long xoffset, yoffset, subwidth, subheight; /* ignore all these features: */ - fscanf(ifP, " %u %ld %ld %ld %ld %ld %ld", - &options, &xscale, &yscale, &xoffset, + fscanf(ifP, " %u %ld %ld %ld %ld %ld %ld", + &options, &xscale, &yscale, &xoffset, &yoffset, &subwidth, &subheight); } /* scan to end of line in case this is actually something beyond V2 */ @@ -291,8 +291,12 @@ ReadATKRaster(FILE * const ifP) { fscanf(ifP, " %d %d %d ", &objectid, &width, &height); - if (width < 1 || height < 1 || width > 1000000 || height > 1000000) + if (width < 1 || height < 1 || width > 1000000 || height > 1000000) pm_error("bad width or height"); + /* Note: Whether these values are upper limits set by the author of + the original version of this program, or come from the official + file format specification is unknown. + */ pbm_writepbminit(stdout, width, height, 0); bitrow = pbm_allocrow_packed(width); @@ -302,7 +306,7 @@ ReadATKRaster(FILE * const ifP) { long const nextChar = ReadRow(ifP, bitrow, rowlen); switch (nextChar) { - case '|': + case '|': pbm_writepbmrow_packed(stdout, bitrow, width, 0); break; case EOF: diff --git a/converter/pbm/escp2topbm.c b/converter/pbm/escp2topbm.c index 8acd13d6..de3ea931 100644 --- a/converter/pbm/escp2topbm.c +++ b/converter/pbm/escp2topbm.c @@ -104,7 +104,7 @@ readChar(FILE * const ifP) { -static void +static void readStripeHeader(unsigned int * const widthThisStripeP, unsigned int * const rowsThisStripeP, unsigned int * const compressionP, @@ -120,7 +120,7 @@ readStripeHeader(unsigned int * const widthThisStripeP, compression = stripeHeader[0]; /* verticalResolution = stripeHeader[1]; */ /* horizontalResolution = stripeHeader[2]; */ - rowsThisStripe = stripeHeader[3]; + rowsThisStripe = stripeHeader[3]; widthThisStripe = stripeHeader[5] * 256 + stripeHeader[4]; if (widthThisStripe == 0 || rowsThisStripe == 0) @@ -143,7 +143,7 @@ readStripeHeader(unsigned int * const widthThisStripeP, /* RLE decoder */ static void -decEpsonRLE(unsigned int const blockSize, +decEpsonRLE(unsigned int const blockSize, unsigned char * const outBuffer, FILE * const ifP) { @@ -174,7 +174,7 @@ decEpsonRLE(unsigned int const blockSize, unsigned int i; for (i = 0; i < runLength; ++i) - outBuffer[dpos + i] = repeatChar; + outBuffer[dpos + i] = repeatChar; dpos += runLength; } } @@ -191,7 +191,7 @@ processStripeRaster(unsigned char ** const bitarray, unsigned int const compression, FILE * const ifP, unsigned int * const rowIdxP) { - + unsigned int const initialRowIdx = *rowIdxP; unsigned int const widthInBytes = pbm_packed_bytes(width); unsigned int const blockSize = rowsThisStripe * widthInBytes; @@ -237,7 +237,7 @@ expandBitarray(unsigned char *** const bitarrayP, if (*bitarraySizeP > heightMax) pm_error("Error: Image too tall"); else - REALLOCARRAY_NOFAIL(*bitarrayP, *bitarraySizeP); + REALLOCARRAY_NOFAIL(*bitarrayP, *bitarraySizeP); } @@ -253,7 +253,7 @@ writePbmImage(unsigned char ** const bitarray, pm_error("No image"); pbm_writepbminit(stdout, width, height, 0); - + for (row = 0; row < height; ++row) { pbm_cleanrowend_packed(bitarray[row], width); pbm_writepbmrow_packed(stdout, bitarray[row], width, 0); @@ -309,7 +309,7 @@ main(int argc, unsigned int compression; unsigned int rowsThisStripe; unsigned int widthThisStripe; - + readStripeHeader(&widthThisStripe, &rowsThisStripe, &compression, ifP); @@ -320,7 +320,7 @@ main(int argc, /* The official Epson manual says valid values are 1, 8, 24 but we just print a warning message and continue if other values are detected. - */ + */ pm_message("Abnormal data block height value: %u " "(ignoring)", rowsThisStripe); diff --git a/converter/pbm/g3topbm.c b/converter/pbm/g3topbm.c index 5d98fcb2..5db507a3 100644 --- a/converter/pbm/g3topbm.c +++ b/converter/pbm/g3topbm.c @@ -552,12 +552,11 @@ readFaxRow(struct BitStream * const bitStreamP, curcode = (curcode << 1) | bit; ++curlen; - if (curlen > 11 && curcode == 0x00) { - if (++fillbits > MAXFILLBITS) - pm_error("Encountered %u consecutive fill bits. " - "Aborting", fillbits); - } - else if (curlen - fillbits > 13) { + if (curlen > 11 && curcode == 0x00) { + if (++fillbits > MAXFILLBITS) + pm_error("Encountered %u consecutive fill bits. " + "Aborting", fillbits); + } else if (curlen - fillbits > 13) { formatBadCodeException(exceptionP, col, curlen, curcode); done = TRUE; } else if (curcode != 0) { diff --git a/converter/pbm/mgrtopbm.c b/converter/pbm/mgrtopbm.c index 712e3be9..e0a88883 100644 --- a/converter/pbm/mgrtopbm.c +++ b/converter/pbm/mgrtopbm.c @@ -58,12 +58,12 @@ interpHdrHeight(struct b_header const head, static void -readMgrHeader(FILE * const ifP, - unsigned int * const colsP, - unsigned int * const rowsP, - unsigned int * const depthP, +readMgrHeader(FILE * const ifP, + unsigned int * const colsP, + unsigned int * const rowsP, + unsigned int * const depthP, unsigned int * const padrightP ) { - + struct b_header head; unsigned int pad; size_t bytesRead; @@ -73,10 +73,10 @@ readMgrHeader(FILE * const ifP, pm_error("Unable to read 1st byte of file. " "fread() returns errno %d (%s)", errno, strerror(errno)); - if (head.magic[0] == 'y' && head.magic[1] == 'z') { + if (head.magic[0] == 'y' && head.magic[1] == 'z') { /* new style bitmap */ size_t bytesRead; - bytesRead = fread(&head.depth, + bytesRead = fread(&head.depth, sizeof(head) - sizeof(struct old_b_header), 1, ifP); if (bytesRead != 1 ) pm_error("Unable to read header after 1st byte. " @@ -84,11 +84,11 @@ readMgrHeader(FILE * const ifP, errno, strerror(errno)); *depthP = (int) head.depth - ' '; pad = 8; - } else if (head.magic[0] == 'x' && head.magic[1] == 'z') { + } else if (head.magic[0] == 'x' && head.magic[1] == 'z') { /* old style bitmap with 32-bit padding */ *depthP = 1; pad = 32; - } else if (head.magic[0] == 'z' && head.magic[1] == 'z') { + } else if (head.magic[0] == 'z' && head.magic[1] == 'z') { /* old style bitmap with 16-bit padding */ *depthP = 1; pad = 16; @@ -104,8 +104,8 @@ readMgrHeader(FILE * const ifP, interpHdrWidth (head, colsP); interpHdrHeight(head, rowsP); - - *padrightP = ( ( *colsP + pad - 1 ) / pad ) * pad - *colsP; + + *padrightP = ((*colsP + pad - 1) / pad) * pad - *colsP; } @@ -131,7 +131,7 @@ main(int argc, inputFileName = argv[1]; else inputFileName = "-"; - + ifP = pm_openr(inputFileName); readMgrHeader(ifP, &cols, &rows, &depth, &padright); @@ -141,7 +141,7 @@ main(int argc, pbm_writepbminit(stdout, cols, rows, 0); bitrow = pbm_allocrow_packed(cols + padright); - + itemCount = (cols + padright ) / 8; for (row = 0; row < rows; ++row) { @@ -166,9 +166,9 @@ main(int argc, Changed bitrow from plain to raw, read function from getc() to fread(), write function from pbm_writepbmrow() to pbm_writepbmrow_packed(). Retired bitwise transformation functions. - + NOT tested for old-style format files. Only one zz file in mgrsrc-0.69 . - + */ diff --git a/converter/pbm/pbmtoatk.c b/converter/pbm/pbmtoatk.c index ea5b7abe..5f2b625c 100644 --- a/converter/pbm/pbmtoatk.c +++ b/converter/pbm/pbmtoatk.c @@ -22,8 +22,8 @@ static void -write_atk_bytes(FILE * const file, - unsigned char const curbyte, +write_atk_bytes(FILE * const file, + unsigned char const curbyte, unsigned int const startcount) { /* codes for data stream */ @@ -37,7 +37,7 @@ write_atk_bytes(FILE * const file, #define BLACKBYTE 0xFF /* WriteRow table for conversion of a byte value to two character - hex representation + hex representation */ static unsigned char hex[16] = { @@ -82,10 +82,10 @@ write_atk_bytes(FILE * const file, static void -process_atk_byte(int * const pcurcount, - unsigned char * const pcurbyte, - FILE * const file, - unsigned char const newbyte, +process_atk_byte(int * const pcurcount, + unsigned char * const pcurbyte, + FILE * const file, + unsigned char const newbyte, int const eolflag) { int curcount; @@ -93,7 +93,7 @@ process_atk_byte(int * const pcurcount, curcount = *pcurcount; /* initial value */ curbyte = *pcurbyte; /* initial value */ - + if (curcount < 1) { *pcurbyte = curbyte = newbyte; *pcurcount = curcount = 1; @@ -139,6 +139,17 @@ main(int argc, const char ** argv) { } pbm_readpbminit(ifP, &cols, &rows, &format); + /* Note: atktopbm imposes limits: cols <= 1000000 rows <= 1000000 + Whether these values are defined in the official file format + specification is unknown. We issue warning messages when large + values are encountered. + */ + + if (cols > 1000000) + pm_message("Proceeding with extremely large width value: %u", cols); + if (rows > 1000000) + pm_message("Proceeding with extremely large height value: %u", rows); + bitrow = pbm_allocrow_packed(cols); printf("\\begindata{raster,%d}\n", 1); @@ -152,7 +163,7 @@ main(int argc, const char ** argv) { pbm_readpbmrow_packed(ifP, bitrow, cols, format); pbm_cleanrowend_packed(bitrow, cols); - + for (i = 0, curbyte = 0, curcount = 0; i < byteCt; ++i) { process_atk_byte(&curcount, &curbyte, stdout, bitrow[i], @@ -162,7 +173,7 @@ main(int argc, const char ** argv) { pbm_freerow_packed(bitrow); pm_close(ifP); - + printf("\\enddata{raster, %d}\n", 1); return 0; diff --git a/converter/pbm/pbmtoescp2.c b/converter/pbm/pbmtoescp2.c index 6f284f3c..942ecec9 100644 --- a/converter/pbm/pbmtoescp2.c +++ b/converter/pbm/pbmtoescp2.c @@ -18,6 +18,7 @@ * * ESC/P Reference Manual (1997) * ftp://download.epson-europe.com/pub/download/182/epson18162eu.zip +* See Part 1 "ESC ." Print Raster Graphics */ #include <string.h> @@ -28,7 +29,7 @@ #include "runlength.h" #include "pbm.h" - +#define MAXCOLS (127 * 256 + 255) /* Limit in official Epson manual */ static char const esc = 033; @@ -57,19 +58,19 @@ parseCommandLine(int argc, const char ** argv, opt.opt_table = option_def; opt.short_allowed = FALSE; opt.allowNegNum = FALSE; - OPTENT3(0, "compress", OPT_UINT, &cmdlineP->compress, + OPTENT3(0, "compress", OPT_UINT, &cmdlineP->compress, &compressSpec, 0); - OPTENT3(0, "resolution", OPT_UINT, &cmdlineP->resolution, + OPTENT3(0, "resolution", OPT_UINT, &cmdlineP->resolution, &resolutionSpec, 0); - OPTENT3(0, "stripeheight", OPT_UINT, &cmdlineP->stripeHeight, + OPTENT3(0, "stripeheight", OPT_UINT, &cmdlineP->stripeHeight, &stripeHeightSpec, 0); - OPTENT3(0, "raw", OPT_FLAG, NULL, + OPTENT3(0, "raw", OPT_FLAG, NULL, &rawSpec, 0); - OPTENT3(0, "formfeed", OPT_FLAG, NULL, + OPTENT3(0, "formfeed", OPT_FLAG, NULL, &formfeedSpec, 0); - + pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); - + if (argc-1 > 1) pm_error("Too many arguments: %d. " "Only argument is the filename", argc-1); @@ -155,7 +156,7 @@ main(int argc, const char * argv[]) { unsigned char * bitrow[256]; unsigned char * compressedData; struct CmdlineInfo cmdline; - + pm_proginit(&argc, argv); parseCommandLine(argc, argv, &cmdline); @@ -164,7 +165,7 @@ main(int argc, const char * argv[]) { pbm_readpbminit(ifP, &cols, &rows, &format); - if (cols / 256 > 127) /* Limit in official Epson manual */ + if (cols > MAXCOLS) pm_error("Image width is too large"); outColByteCt = pbm_packed_bytes(cols); @@ -229,7 +230,7 @@ main(int argc, const char * argv[]) { } } - free(inBuff); + free(inBuff); free(compressedData); pm_close(ifP); diff --git a/converter/pbm/pbmtomgr.c b/converter/pbm/pbmtomgr.c index 0e529740..faa56d8f 100644 --- a/converter/pbm/pbmtomgr.c +++ b/converter/pbm/pbmtomgr.c @@ -33,7 +33,7 @@ putinit(unsigned int const rows, head._reserved = ' '; writtenCount = fwrite(&head, sizeof(head), 1, stdout); if (writtenCount != 1) - pm_error("fwrite() failed to write the MGR header."); + pm_error("fwrite() failed to write the MGR header."); } @@ -63,7 +63,7 @@ main(int argc, inputFileName = argv[1]; else inputFileName = "-"; - + ifP = pm_openr(inputFileName); pbm_readpbminit(ifP, &cols, &rows, &format); @@ -71,14 +71,14 @@ main(int argc, pm_error("Image width too large: %u (max: %u)", cols, maxDimension); if (rows > maxDimension) pm_error("Image height too large: %u (max: %u)", rows, maxDimension); - + bitrow = pbm_allocrow_packed(cols); bytesPerRow = pbm_packed_bytes(cols); putinit(rows, cols); - + for (row = 0; row < rows; ++row) { - /* The raster formats are identical. + /* The raster formats are identical. The row end pad bits are set to 0 in mgr. */ size_t bytesWritten; @@ -89,7 +89,7 @@ main(int argc, bytesWritten = fwrite(bitrow, 1, bytesPerRow, stdout); if (bytesWritten != bytesPerRow ) pm_error("fwrite() failed to write MGR bitmap " - "to Standard Output."); + "to Standard Output."); } pm_close(ifP); return 0; @@ -102,7 +102,7 @@ main(int argc, pbm_readpbmrow_packed(), write function from putc() to fwrite(). Retired bitwise transformation functions. - + Produces only new style bitmap (8 bit padding.) See mgrtopbm.c . */ diff --git a/converter/pbm/ybmtopbm.c b/converter/pbm/ybmtopbm.c index ea7e66a7..36f2dee7 100644 --- a/converter/pbm/ybmtopbm.c +++ b/converter/pbm/ybmtopbm.c @@ -19,7 +19,7 @@ static short const ybmMagic = ( ( '!' << 8 ) | '!' ); static void -getinit(FILE * const ifP, +getinit(FILE * const ifP, unsigned int * const colsP, unsigned int * const rowsP, int * const depthP) { @@ -80,7 +80,7 @@ main(int argc, const char * argv[]) { getinit(ifP, &cols, &rows, &depth); if (depth != 1) pm_error("YBM file has depth of %u, must be 1", (unsigned int) depth); - + pbm_writepbminit(stdout, cols, rows, 0); bitrow = pbm_allocrow_packed(cols + 8); @@ -95,7 +95,7 @@ main(int argc, const char * argv[]) { for (i = 0; i < itemCt; ++i) { short int item; pm_readbigshort(ifP, &item); - itemrow[i] = (uint16_t) item; + itemrow[i] = (uint16_t) item; } for (i = 0; i < pbm_packed_bytes(cols); ++i) diff --git a/converter/pgm/st4topgm.c b/converter/pgm/st4topgm.c index 90be6b72..791184b7 100644 --- a/converter/pgm/st4topgm.c +++ b/converter/pgm/st4topgm.c @@ -69,11 +69,11 @@ writeRaster(FILE * const ifP, unsigned int col; for (col = 0; col < st4Width; ++col) { - char c; + unsigned char c; - pm_readchar(ifP, &c); + pm_readcharu(ifP, &c); - tuplerow[col][0] = (unsigned char)c; + tuplerow[col][0] = c; } pnm_writepamrow(pamP, tuplerow); } |