diff options
Diffstat (limited to 'converter/ppm')
31 files changed, 1625 insertions, 1444 deletions
diff --git a/converter/ppm/hpcdtoppm/Makefile b/converter/ppm/hpcdtoppm/Makefile index ddf79ee5..59ba3630 100644 --- a/converter/ppm/hpcdtoppm/Makefile +++ b/converter/ppm/hpcdtoppm/Makefile @@ -14,12 +14,12 @@ MERGE_OBJECTS = include $(SRCDIR)/common.mk -install: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # In June 2002, pcdovtoppm replaced pcdindex cd $(PKGDIR)/bin ; \ - $(SYMLINK) pcdindex$(EXE) pcdovtoppm$(EXE) + $(SYMLINK) pcdovtoppm$(EXE) pcdindex$(EXE) FORCE: diff --git a/converter/ppm/hpcdtoppm/hpcdtoppm b/converter/ppm/hpcdtoppm/hpcdtoppm index cb6d084b..2af4a384 100755 --- a/converter/ppm/hpcdtoppm/hpcdtoppm +++ b/converter/ppm/hpcdtoppm/hpcdtoppm @@ -1,24 +1,24 @@ #!/bin/sh cat <<EOF 1>&2 -You are running a program named 'hpcdtoppm' that stands in for the -real program by that name. +You are running a program named 'hpcdtoppm' that stands in for the real +program by that name. -The real 'hpcdtoppm' is a program that converts an image from Photo CD -format to PPM format. The program you are running now just issues the -message you are reading. +The real 'hpcdtoppm' is a program that converts an image from Photo CD format +to PPM format. The program you are running now just issues the message you +are reading. Please get a copy of Hpcdtoppm from - ftp://ibiblio.org/pub/linux/graphics/convert + http://terasaur.org/item/show/hpcdtoppm-netpbm-convert-photo-cd/4967 and replace this stand-in program with the real one. -The point of this is that this stand-in 'hpcdtoppm' is distributed -with Netpbm on Sourceforge. Hpcdtoppm does not meet the requirements -to be distributed on Sourceforge because a copyright holder does not -permit people to sell copies. In the past the real Hpcdtoppm was -distributed with Netpbm on Sourceforge by mistake. +The point of this is that this stand-in 'hpcdtoppm' is distributed with Netpbm +on Sourceforge. Hpcdtoppm does not meet the requirements to be distributed on +Sourceforge because a copyright holder does not permit people to sell copies. +At one time, the real Hpcdtoppm was distributed with Netpbm on Sourceforge by +mistake. EOF diff --git a/converter/ppm/ilbmtoppm.c b/converter/ppm/ilbmtoppm.c index 280ca939..92d4d6f2 100644 --- a/converter/ppm/ilbmtoppm.c +++ b/converter/ppm/ilbmtoppm.c @@ -99,10 +99,9 @@ static bool debug = FALSE; static char * -ID2string(id) - IFF_ID id; -{ - static char str[] = "abcd"; +ID2string(IFF_ID const id) { + + static char str[4]; str[0] = (char)(id >> 24 & 0xff); str[1] = (char)(id >> 16 & 0xff); @@ -141,16 +140,15 @@ alloc_cmap(void) { static rawtype * -alloc_rawrow(cols) - int cols; -{ - rawtype *r; - int i; +alloc_rawrow(unsigned int const cols) { + + rawtype * r; + unsigned int col; MALLOCARRAY_NOFAIL(r, cols); - for( i = 0; i < cols; i++ ) - r[i] = 0; + for (col = 0; col < cols; ++col) + r[col] = 0; return r; } @@ -161,17 +159,17 @@ alloc_rawrow(cols) ****************************************************************************/ static void -readerr(f, iffid) - FILE *f; - IFF_ID iffid; -{ - if( ferror(f) ) +readerr(FILE * const fP, + IFF_ID const iffId) { + + if (ferror(fP)) pm_error("read error"); else - pm_error("premature EOF in %s chunk", ID2string(iffid)); + pm_error("premature EOF in %s chunk", ID2string(iffId)); } + static void read_bytes(FILE * const ifP, int const bytes, @@ -191,21 +189,20 @@ read_bytes(FILE * const ifP, static unsigned char -get_byte(ifP, iffid, counter) - FILE* ifP; - IFF_ID iffid; - long *counter; -{ +get_byte(FILE * const ifP, + IFF_ID const iffId, + unsigned long * const counterP) { + int i; - if( counter ) { - if( *counter == 0 ) - pm_error("insufficient data in %s chunk", ID2string(iffid)); - --(*counter); + if (counterP) { + if (*counterP == 0 ) + pm_error("insufficient data in %s chunk", ID2string(iffId)); + --(*counterP); } i = getc(ifP); - if( i == EOF ) - readerr(ifP, iffid); + if (i == EOF) + readerr(ifP, iffId); return (unsigned char) i; } @@ -216,7 +213,7 @@ get_big_long(FILE * const ifP, unsigned long * const counterP) { long l; - + if (counterP) { if (*counterP < 4) pm_error("insufficient data in %s chunk", ID2string(iffid)); @@ -273,114 +270,117 @@ chunk_end(FILE * const ifP, static void skip_chunk(FILE * const ifP, - IFF_ID const iffid, - unsigned long const chunksize) { - unsigned long remainingChunksize; + IFF_ID const iffId, + unsigned long const chunkSize) { - remainingChunksize = chunksize; /* initial value */ + unsigned long remainingChunkSize; - while (remainingChunksize > 0) - get_byte(ifP, iffid, &remainingChunksize); + for (remainingChunkSize = chunkSize; remainingChunkSize > 0; ) + get_byte(ifP, iffId, &remainingChunkSize); } static void display_chunk(FILE * const ifP, - IFF_ID const iffid, - unsigned long const chunksize) { + IFF_ID const iffId, + unsigned long const chunkSize) { int byte; - unsigned long remainingChunksize; + unsigned long remainingChunkSize; - pm_message("contents of %s chunk:", ID2string(iffid)); + pm_message("contents of %s chunk:", ID2string(iffId)); - remainingChunksize = chunksize; /* initial value */ - byte = '\0'; + for (remainingChunkSize = chunkSize, byte = '\0'; + remainingChunkSize > 0; ) { - while (remainingChunksize > 0) { - byte = get_byte(ifP, iffid, &remainingChunksize); + byte = get_byte(ifP, iffId, &remainingChunkSize); if (fputc(byte, stderr) == EOF) pm_error("write error"); } - if (byte != '\n') - if (fputc('\n', stderr) == EOF) + if (byte != '\n') { + int rc; + rc = fputc('\n', stderr); + if (rc == EOF) pm_error("write error"); + } } + static void -read_cmap(FILE * const ifP, - IFF_ID const iffid, - long const chunksize, - ColorMap * const cmap) { +read_cmap(FILE * const ifP, + IFF_ID const iffId, + unsigned long const chunkSize, + ColorMap * const cmapP) { - long colors; + unsigned long const colorCt = chunkSize / 3; - colors = chunksize / 3; - if( colors == 0 ) { - pm_error("warning - empty %s colormap", ID2string(iffid)); - skip_chunk(ifP, iffid, chunksize); + if (colorCt == 0) { + pm_error("warning - empty %s colormap", ID2string(iffId)); + skip_chunk(ifP, iffId, chunkSize); } else { unsigned int i; - if( cmap->color ) /* prefer CMAP-chunk over CMYK-chunk */ - ppm_freerow(cmap->color); - cmap->color = ppm_allocrow(colors); - cmap->ncolors = colors; - - for( i = 0; i < colors; ++i ) { - int r, g, b; - r = get_byte(ifP, iffid, &chunksize); - g = get_byte(ifP, iffid, &chunksize); - b = get_byte(ifP, iffid, &chunksize); - PPM_ASSIGN(cmap->color[i], r, g, b); + unsigned long remainingChunkSize; + + if (cmapP->color) /* prefer CMAP-chunk over CMYK-chunk */ + ppm_freerow(cmapP->color); + cmapP->color = ppm_allocrow(colorCt); + cmapP->ncolors = colorCt; + + for (i = 0, remainingChunkSize = chunkSize; i < colorCt; ++i ) { + int const r = get_byte(ifP, iffId, &remainingChunkSize); + int const g = get_byte(ifP, iffId, &remainingChunkSize); + int const b = get_byte(ifP, iffId, &remainingChunkSize); + PPM_ASSIGN(cmapP->color[i], r, g, b); } - chunk_end(ifP, iffid, chunksize); + chunk_end(ifP, iffId, remainingChunkSize); } } static void -read_cmyk(FILE * const ifP, - IFF_ID const iffid, - long const chunksize, - ColorMap * const cmap) { +read_cmyk(FILE * const ifP, + IFF_ID const iffId, + unsigned long const chunkSize, + ColorMap * const cmapP) { - if( HAS_COLORMAP(cmap) ) { /* prefer RGB color map */ - skip_chunk(ifP, iffid, chunksize); + if (HAS_COLORMAP(cmapP)) { /* prefer RGB color map */ + skip_chunk(ifP, iffId, chunkSize); } else { - long const colors = chunksize/4; - if( colors == 0 ) { - pm_error("warning - empty %s colormap", ID2string(iffid)); - skip_chunk(ifP, iffid, chunksize); + unsigned long const colorCt = chunkSize / 4; + if (colorCt == 0 ) { + pm_error("warning - empty %s colormap", ID2string(iffId)); + skip_chunk(ifP, iffId, chunkSize); } else { unsigned int i; - cmap->color = ppm_allocrow(colors); - cmap->ncolors = colors; - - for( i = 0; i < colors; ++i ) { - int c, m, y, k; - c = get_byte(ifP, iffid, &chunksize); - m = get_byte(ifP, iffid, &chunksize); - y = get_byte(ifP, iffid, &chunksize); - k = get_byte(ifP, iffid, &chunksize); + unsigned long remainingChunkSize; + + cmapP->color = ppm_allocrow(colorCt); + cmapP->ncolors = colorCt; + + for (i = 0, remainingChunkSize = chunkSize; i < colorCt; ++i) { + int const c = get_byte(ifP, iffId, &remainingChunkSize); + int const m = get_byte(ifP, iffId, &remainingChunkSize); + int const y = get_byte(ifP, iffId, &remainingChunkSize); + int const k = get_byte(ifP, iffId, &remainingChunkSize); { - pixval const red = + pixval const red = MAXCOLVAL - MIN(MAXCOLVAL, - c*(MAXCOLVAL-k)/MAXCOLVAL+k); - pixval const green = + c * (MAXCOLVAL-k) / MAXCOLVAL+k); + pixval const green = MAXCOLVAL - MIN(MAXCOLVAL, - m*(MAXCOLVAL-k)/MAXCOLVAL+k); - pixval const blue = + m * (MAXCOLVAL-k) / MAXCOLVAL+k); + pixval const blue = MAXCOLVAL - MIN(MAXCOLVAL, - y*(MAXCOLVAL-k)/MAXCOLVAL+k); + y * (MAXCOLVAL-k) / MAXCOLVAL+k); - PPM_ASSIGN(cmap->color[i], red, green, blue); + PPM_ASSIGN(cmapP->color[i], red, green, blue); } } - chunk_end(ifP, iffid, chunksize); + chunk_end(ifP, iffId, remainingChunkSize); } } } @@ -389,45 +389,45 @@ read_cmyk(FILE * const ifP, static void read_clut(FILE * const ifP, - IFF_ID const iffid, - unsigned long const chunksize, - ColorMap * const cmap) { - - if (chunksize != CLUTSize) { - pm_message("invalid size for %s chunk - skipping it", - ID2string(iffid)); - skip_chunk(ifP, iffid, chunksize); + IFF_ID const iffId, + unsigned long const chunkSize, + ColorMap * const cmapP) { + + if (chunkSize != CLUTSize) { + pm_message("invalid size for %s chunk - skipping it", + ID2string(iffId)); + skip_chunk(ifP, iffId, chunkSize); } else { long type; unsigned char * lut; - unsigned long remainingChunksize; + unsigned long remainingChunkSize; unsigned int i; - remainingChunksize = chunksize; /* initial value */ + remainingChunkSize = chunkSize; /* initial value */ - type = get_big_long(ifP, iffid, &remainingChunksize); - get_big_long(ifP, iffid, &remainingChunksize); /* skip reserved fld */ + type = get_big_long(ifP, iffId, &remainingChunkSize); + get_big_long(ifP, iffId, &remainingChunkSize); /* skip reserved fld */ MALLOCARRAY_NOFAIL(lut, 256); for( i = 0; i < 256; ++i ) - lut[i] = get_byte(ifP, iffid, &remainingChunksize); + lut[i] = get_byte(ifP, iffId, &remainingChunkSize); switch( type ) { case CLUT_MONO: - cmap->monolut = lut; + cmapP->monolut = lut; break; case CLUT_RED: - cmap->redlut = lut; + cmapP->redlut = lut; break; case CLUT_GREEN: - cmap->greenlut = lut; + cmapP->greenlut = lut; break; case CLUT_BLUE: - cmap->bluelut = lut; + cmapP->bluelut = lut; break; default: pm_message("warning - %s type %ld not recognized", - ID2string(iffid), type); + ID2string(iffId), type); free(lut); } } @@ -446,8 +446,8 @@ warnNonsquarePixels(uint8_t const xAspect, pm_message("%s; to fix do a 'pamscale -%cscale %g'", baseMsg, xAspect > yAspect ? 'x' : 'y', - xAspect > yAspect ? - (float)xAspect/yAspect : + xAspect > yAspect ? + (float)xAspect/yAspect : (float)yAspect/xAspect); else pm_message("%s", baseMsg); @@ -464,7 +464,7 @@ read_bmhd(FILE * const ifP, BitMapHeader * bmhdP; if (chunksize != BitMapHeaderSize) { - pm_message("invalid size for %s chunk - skipping it", + pm_message("invalid size for %s chunk - skipping it", ID2string(iffid)); skip_chunk(ifP, iffid, chunksize); bmhdP = NULL; @@ -474,7 +474,7 @@ read_bmhd(FILE * const ifP, MALLOCVAR_NOFAIL(bmhdP); remainingChunksize = chunksize; /* initial value */ - + bmhdP->w = get_big_short(ifP, iffid, &remainingChunksize); bmhdP->h = get_big_short(ifP, iffid, &remainingChunksize); bmhdP->x = get_big_short(ifP, iffid, &remainingChunksize); @@ -492,7 +492,7 @@ read_bmhd(FILE * const ifP, if (verbose) { if (typeid == ID_ILBM) - pm_message("dimensions: %dx%d, %d planes", + pm_message("dimensions: %dx%d, %d planes", bmhdP->w, bmhdP->h, bmhdP->nPlanes); else pm_message("dimensions: %dx%d", bmhdP->w, bmhdP->h); @@ -509,11 +509,11 @@ read_bmhd(FILE * const ifP, case mskHasTransparentColor: if (!maskfile) pm_message("use '-maskfile <filename>' " - "to generate a PBM mask file from %s", + "to generate a PBM mask file from %s", mskNAME[bmhdP->masking]); break; case mskLasso: - pm_message("warning - masking type '%s' not recognized", + pm_message("warning - masking type '%s' not recognized", mskNAME[bmhdP->masking]); break; default: @@ -529,7 +529,7 @@ read_bmhd(FILE * const ifP, /* fix aspect ratio */ if (bmhdP->xAspect == 0 || bmhdP->yAspect == 0) { - pm_message("warning - illegal aspect ratio %d:%d, using 1:1", + pm_message("warning - illegal aspect ratio %d:%d, using 1:1", bmhdP->xAspect, bmhdP->yAspect); bmhdP->xAspect = bmhdP->yAspect = 1; } @@ -647,7 +647,7 @@ decode_mask(FILE * const ifP, case mskNone: break; case mskHasMask: /* mask plane */ - read_ilbm_plane(ifP, remainingChunksizeP, RowBytes(cols), + read_ilbm_plane(ifP, remainingChunksizeP, RowBytes(cols), bmhdP->compression); if (maskfile) { ilp = ilbmrow; @@ -669,7 +669,7 @@ decode_mask(FILE * const ifP, case mskHasTransparentColor: if (!chunkyrow) pm_error("decode_mask(): chunkyrow == NULL - can't happen"); - + if (maskfile) { for (col = 0; col < cols; ++col) { if (chunkyrow[col] == bmhdP->transparentColor) @@ -685,7 +685,7 @@ decode_mask(FILE * const ifP, pm_error("This program does not know how to process Lasso masking"); break; default: - pm_error("decode_mask(): unknown masking type %d - can't happen", + pm_error("decode_mask(): unknown masking type %d - can't happen", bmhdP->masking); } } @@ -697,79 +697,82 @@ decode_mask(FILE * const ifP, static void -multi_adjust(cmap, row, palchange) - ColorMap *cmap; - int row; - PaletteChange *palchange; -{ - int i, reg; - - for( i = 0; palchange[i].reg != MP_REG_END; i++ ) { - reg = palchange[i].reg; - if( reg >= cmap->ncolors ) { +multi_adjust(ColorMap * const cmapP, + unsigned int const row, + const PaletteChange * const palchange) { + + unsigned int i; + + for (i = 0; palchange[i].reg != MP_REG_END; ++i) { + int const reg = palchange[i].reg; + if (reg >= cmapP->ncolors) { pm_message("warning - palette change register out of range"); - pm_message(" row %d change structure %d reg=%d (max %d)", - row, i, reg, cmap->ncolors-1); + pm_message(" row %u change structure %d reg=%d (max %d)", + row, i, reg, cmapP->ncolors-1); pm_message(" ignoring it... " "colors might get messed up from here"); - } - else - if( reg != MP_REG_IGNORE ) { - PPM_ASSIGN(cmap->color[reg], - palchange[i].r, palchange[i].g, palchange[i].b); + } else { + if (reg != MP_REG_IGNORE) { + PPM_ASSIGN(cmapP->color[reg], + palchange[i].r, palchange[i].g, palchange[i].b); + } } } } + + static void -multi_init(cmap, viewportmodes) - ColorMap *cmap; - long viewportmodes; -{ - if( cmap->mp_init ) - multi_adjust(cmap, -1, cmap->mp_init); - if( !(viewportmodes & vmLACE) ) - cmap->mp_flags &= ~(MP_FLAGS_SKIPLACED); +multi_init(ColorMap * const cmapP, + long const viewportmodes) { + + if (cmapP->mp_init) + multi_adjust(cmapP, -1, cmapP->mp_init); + if (!(viewportmodes & vmLACE) ) + cmapP->mp_flags &= ~(MP_FLAGS_SKIPLACED); } + + static void -multi_update(cmap, row) - ColorMap *cmap; - int row; -{ - if( cmap->mp_flags & MP_FLAGS_SKIPLACED ) { - if( ODD(row) ) +multi_update(ColorMap * const cmapP, + unsigned int const row) { + + if (cmapP->mp_flags & MP_FLAGS_SKIPLACED) { + if (ODD(row)) return; - if( row/2 < cmap->mp_rows && cmap->mp_change[row/2] ) - multi_adjust(cmap, row, cmap->mp_change[row/2]); - } - else { - if( row < cmap->mp_rows && cmap->mp_change[row] ) - multi_adjust(cmap, row, cmap->mp_change[row]); + if (row/2 < cmapP->mp_rows && cmapP->mp_change[row/2]) + multi_adjust(cmapP, row, cmapP->mp_change[row/2]); + } else { + if (row < cmapP->mp_rows && cmapP->mp_change[row]) + multi_adjust(cmapP, row, cmapP->mp_change[row]); } } + + static void -multi_free(cmap) - ColorMap *cmap; -{ - int i; +multi_free(ColorMap * const cmapP) { - if( cmap->mp_init ) { - free(cmap->mp_init); - cmap->mp_init = NULL; + if (cmapP->mp_init) { + free(cmapP->mp_init); + cmapP->mp_init = NULL; } - if( cmap->mp_change ) { - for( i = 0; i < cmap->mp_rows; i++ ) { - if( cmap->mp_change[i] ) - free(cmap->mp_change[i]); + + if (cmapP->mp_change) { + unsigned int i; + + for (i = 0; i < cmapP->mp_rows; ++i) { + if (cmapP->mp_change[i]) + free(cmapP->mp_change[i]); } - free(cmap->mp_change); - cmap->mp_change = NULL; + free(cmapP->mp_change); + cmapP->mp_change = NULL; } - cmap->mp_rows = 0; - cmap->mp_type = 0; - cmap->mp_flags = 0; + + cmapP->mp_rows = 0; + cmapP->mp_type = 0; + cmapP->mp_flags = 0; } @@ -788,7 +791,7 @@ analyzeCmapSamples(const ColorMap * const cmapP, pixval maxSample; bool shifted; unsigned int i; - + for (i = 0, maxSample = 0, shifted = true; i < cmapP->ncolors; ++i) { pixval const r = PPM_GETR(cmapP->color[i]); pixval const g = PPM_GETG(cmapP->color[i]); @@ -857,7 +860,7 @@ transpColor(const BitMapHeader * const bmhdP, pixel * transpColorP; if (bmhdP) { - if (bmhdP->masking == mskHasTransparentColor || + if (bmhdP->masking == mskHasTransparentColor || bmhdP->masking == mskLasso) { MALLOCVAR_NOFAIL(transpColorP); @@ -909,80 +912,83 @@ prepareCmap(const BitMapHeader * const bmhdP, static pixval -lookup_red(cmap, oldval) - ColorMap *cmap; - int oldval; -{ - if( cmap && cmap->redlut && oldval < 256 ) - return cmap->redlut[oldval]; +lookup_red(ColorMap * const cmapP, + unsigned int const oldval) { + + if (cmapP && cmapP->redlut && oldval < 256) + return cmapP->redlut[oldval]; else return oldval; } + + static pixval -lookup_green(cmap, oldval) - ColorMap *cmap; - int oldval; -{ - if( cmap && cmap->greenlut && oldval < 256 ) - return cmap->greenlut[oldval]; +lookup_green(ColorMap * const cmapP, + unsigned int const oldval) { + + if (cmapP && cmapP->greenlut && oldval < 256) + return cmapP->greenlut[oldval]; else return oldval; } + + static pixval -lookup_blue(cmap, oldval) - ColorMap *cmap; - int oldval; -{ - if( cmap && cmap->bluelut && oldval < 256 ) - return cmap->bluelut[oldval]; +lookup_blue(ColorMap * const cmapP, + unsigned int const oldval) { + + if (cmapP && cmapP->bluelut && oldval < 256) + return cmapP->bluelut[oldval]; else return oldval; } + + static pixval -lookup_mono(cmap, oldval) - ColorMap *cmap; - int oldval; -{ - if( cmap && cmap->monolut && oldval < 256 ) - return cmap->monolut[oldval]; +lookup_mono(ColorMap * const cmapP, + unsigned int const oldval) { + + if (cmapP && cmapP->monolut && oldval < 256) + return cmapP->monolut[oldval]; else return oldval; } + + static ColorMap * -ehbcmap(cmap) - ColorMap *cmap; -{ - pixel *tempcolor = NULL; - int i, col; - - col = cmap->ncolors; - - tempcolor = ppm_allocrow(col * 2); - for( i = 0; i < col; i++ ) { - tempcolor[i] = cmap->color[i]; - PPM_ASSIGN(tempcolor[col + i], PPM_GETR(cmap->color[i]) / 2, - PPM_GETG(cmap->color[i]) / 2, - PPM_GETB(cmap->color[i]) / 2 ); +ehbcmap(ColorMap * const cmapP) { + + pixel * tempcolor; + unsigned int i; + + tempcolor = ppm_allocrow(cmapP->ncolors * 2); + + for (i = 0; i < cmapP->ncolors; ++i) { + tempcolor[i] = cmapP->color[i]; + PPM_ASSIGN(tempcolor[cmapP->ncolors + i], + PPM_GETR(cmapP->color[i]) / 2, + PPM_GETG(cmapP->color[i]) / 2, + PPM_GETB(cmapP->color[i]) / 2); } - ppm_freerow(cmap->color); - cmap->color = tempcolor; - cmap->ncolors *= 2; + ppm_freerow(cmapP->color); + cmapP->color = tempcolor; + cmapP->ncolors *= 2; - return cmap; + return cmapP; } static pixval -lut_maxval(ColorMap * const cmap, +lut_maxval(ColorMap * const cmap, pixval const maxval) { pixval retval; - + if (maxval >= 255) retval = maxval; else { @@ -993,16 +999,16 @@ lut_maxval(ColorMap * const cmap, unsigned char maxlut; maxlut = maxval; for( i = 0; i < maxval; i++ ) { - if( cmap->redlut && cmap->redlut[i] > maxlut ) + if( cmap->redlut && cmap->redlut[i] > maxlut ) maxlut = cmap->redlut[i]; - if( cmap->greenlut && cmap->greenlut[i] > maxlut ) + if( cmap->greenlut && cmap->greenlut[i] > maxlut ) maxlut = cmap->greenlut[i]; - if( cmap->bluelut && cmap->bluelut[i] > maxlut ) + if( cmap->bluelut && cmap->bluelut[i] > maxlut ) maxlut = cmap->bluelut[i]; } pm_message("warning - " "%d-bit index into 8-bit color lookup table, " - "table maxval=%d", + "table maxval=%d", pm_maxvaltobits(maxval), maxlut); if( maxlut != maxval ) retval = 255; @@ -1017,49 +1023,49 @@ lut_maxval(ColorMap * const cmap, static void -get_color(cmap, idx, red, green, blue) - ColorMap *cmap; - int idx; - pixval *red, *green, *blue; -{ - if( HAS_COLORMAP(cmap) ) { - pixval r, g, b; - - if( idx >= cmap->ncolors ) - pm_error("color index out of range: %d (max %d)", - idx, cmap->ncolors); - r = PPM_GETR(cmap->color[idx]); - g = PPM_GETG(cmap->color[idx]); - b = PPM_GETB(cmap->color[idx]); - - *red = lookup_red(cmap, r); - *green = lookup_green(cmap, g); - *blue = lookup_blue(cmap, b); - } - else { - *red = *green = *blue = lookup_mono(cmap, idx); - } +get_color(ColorMap * const cmapP, + unsigned int const idx, + pixval * const redP, + pixval * const greenP, + pixval * const blueP) { + + if (HAS_COLORMAP(cmapP)) { + if (idx >= cmapP->ncolors) + pm_error("color index out of range: %u (max %u)", + idx, cmapP->ncolors); + else { + pixval const r = PPM_GETR(cmapP->color[idx]); + pixval const g = PPM_GETG(cmapP->color[idx]); + pixval const b = PPM_GETB(cmapP->color[idx]); + + *redP = lookup_red (cmapP, r); + *greenP = lookup_green (cmapP, g); + *blueP = lookup_blue (cmapP, b); + } + } else + *redP = *greenP = *blueP = lookup_mono(cmapP, idx); } + /**************************************************************************** Conversion functions ****************************************************************************/ static void -std_to_ppm(FILE * const ifP, - long const chunksize, - BitMapHeader * const bmhdP, - ColorMap * const cmap, +std_to_ppm(FILE * const ifP, + long const chunksize, + BitMapHeader * const bmhdP, + ColorMap * const cmap, long const viewportmodes); static void -ham_to_ppm(FILE * const ifP, - long const chunksize, - BitMapHeader * const bmhdP, - ColorMap * const cmap, +ham_to_ppm(FILE * const ifP, + long const chunksize, + BitMapHeader * const bmhdP, + ColorMap * const cmap, long const viewportmodes) { int cols, rows, hambits, hammask, hamshift, hammask2, col, row; @@ -1077,7 +1083,7 @@ ham_to_ppm(FILE * const ifP, if( hambits > 8 || hambits < 1 ) { int const assumed_viewportmodes = viewportmodes & ~(vmHAM); - pm_message("%d-plane HAM?? - interpreting image as a normal ILBM", + pm_message("%d-plane HAM?? - interpreting image as a normal ILBM", bmhdP->nPlanes); std_to_ppm(ifP, chunksize, bmhdP, cmap, assumed_viewportmodes); return; @@ -1085,8 +1091,8 @@ ham_to_ppm(FILE * const ifP, unsigned long remainingChunksize; pixel * transpColorP; - pm_message("input is a %sHAM%d file", - HAS_MULTIPALETTE(cmap) ? "multipalette " : "", + pm_message("input is a %sHAM%d file", + HAS_MULTIPALETTE(cmap) ? "multipalette " : "", bmhdP->nPlanes); if( HAS_COLORLUT(cmap) || HAS_MONOLUT(cmap) ) { @@ -1095,7 +1101,7 @@ ham_to_ppm(FILE * const ifP, if( cmap->greenlut ) free(cmap->greenlut); if( cmap->bluelut ) free(cmap->bluelut); if( cmap->monolut ) free(cmap->monolut); - cmap->redlut = cmap->greenlut = cmap->bluelut = + cmap->redlut = cmap->greenlut = cmap->bluelut = cmap->monolut = NULL; } if( !HAS_COLORMAP(cmap) ) { @@ -1165,10 +1171,10 @@ ham_to_ppm(FILE * const ifP, static void -std_to_ppm(FILE * const ifP, - long const chunksize, - BitMapHeader * const bmhdP, - ColorMap * const cmap, +std_to_ppm(FILE * const ifP, + long const chunksize, + BitMapHeader * const bmhdP, + ColorMap * const cmap, long const viewportmodes) { if (viewportmodes & vmHAM) { @@ -1213,7 +1219,7 @@ std_to_ppm(FILE * const ifP, ppm_writeppminit( stdout, cols, rows, maxval, 0 ); remainingChunksize = chunksize; /* initial value */ - + for (row = 0; row < rows; ++row) { if( HAS_MULTIPALETTE(cmap) ) @@ -1240,9 +1246,9 @@ std_to_ppm(FILE * const ifP, static void -deep_to_ppm(FILE * const ifP, - long const chunksize, - BitMapHeader * const bmhdP, +deep_to_ppm(FILE * const ifP, + long const chunksize, + BitMapHeader * const bmhdP, ColorMap * const cmap) { unsigned int const cols = bmhdP->w; @@ -1259,9 +1265,9 @@ deep_to_ppm(FILE * const ifP, if( planespercolor > MAXPLANES ) pm_error("too many planes (max %d)", MAXPLANES * 3); - if( bmhdP->masking == mskHasTransparentColor || + if( bmhdP->masking == mskHasTransparentColor || bmhdP->masking == mskLasso ) { - pm_message("masking type '%s' in a deep ILBM?? - ignoring it", + pm_message("masking type '%s' in a deep ILBM?? - ignoring it", mskNAME[bmhdP->masking]); bmhdP->masking = mskNone; } @@ -1271,7 +1277,7 @@ deep_to_ppm(FILE * const ifP, pm_error("nPlanes is too large"); transpColorP = transpColor(bmhdP, cmap, transpName, maxval); - + Rrow = alloc_rawrow(cols); Grow = alloc_rawrow(cols); Brow = alloc_rawrow(cols); @@ -1313,7 +1319,7 @@ dcol_to_ppm(FILE * const ifP, unsigned int const redplanes = dcol->r; unsigned int const greenplanes = dcol->g; unsigned int const blueplanes = dcol->b; - + int col, row; rawtype *Rrow, *Grow, *Brow; pixval maxval, redmaxval, greenmaxval, bluemaxval; @@ -1324,16 +1330,16 @@ dcol_to_ppm(FILE * const ifP, pm_message("input is a %d:%d:%d direct color ILBM", redplanes, greenplanes, blueplanes); - if( redplanes > MAXPLANES || - blueplanes > MAXPLANES || + if( redplanes > MAXPLANES || + blueplanes > MAXPLANES || greenplanes > MAXPLANES ) pm_error("too many planes (max %d per color component)", MAXPLANES); if( bmhdP->nPlanes != (redplanes + greenplanes + blueplanes) ) - pm_error("%s/%s plane number mismatch", + pm_error("%s/%s plane number mismatch", ID2string(ID_BMHD), ID2string(ID_DCOL)); - if( bmhdP->masking == mskHasTransparentColor || + if( bmhdP->masking == mskHasTransparentColor || bmhdP->masking == mskLasso ) { pm_message("masking type '%s' in a direct color ILBM?? - ignoring it", mskNAME[bmhdP->masking]); @@ -1356,7 +1362,7 @@ dcol_to_ppm(FILE * const ifP, if( redmaxval != maxval || greenmaxval != maxval || bluemaxval != maxval ) pm_message("scaling colors to %d bits", pm_maxvaltobits(maxval)); - + MALLOCARRAY_NOFAIL(redtable, redmaxval +1); MALLOCARRAY_NOFAIL(greentable, greenmaxval +1); MALLOCARRAY_NOFAIL(bluetable, bluemaxval +1); @@ -1403,7 +1409,7 @@ dcol_to_ppm(FILE * const ifP, static void cmapToPpm(FILE * const ofP, - ColorMap * const cmapP) { + ColorMap * const cmapP) { ppm_colorrowtomapfile(ofP, cmapP->color, cmapP->ncolors, MAXCOLVAL); } @@ -1425,11 +1431,11 @@ ipbm_to_ppm(FILE * const ifP, unsigned long remainingChunksize; pixel * transpColorP; - pm_message("input is a %sPBM ", + pm_message("input is a %sPBM ", HAS_MULTIPALETTE(cmap) ? "multipalette " : ""); if( bmhdP->nPlanes != 8 ) - pm_error("invalid number of planes for IFF-PBM: %d (must be 8)", + pm_error("invalid number of planes for IFF-PBM: %d (must be 8)", bmhdP->nPlanes); if( bmhdP->masking == mskHasMask ) @@ -1456,7 +1462,7 @@ ipbm_to_ppm(FILE * const ifP, for( row = 0; row < rows; row++ ) { if( HAS_MULTIPALETTE(cmap) ) multi_update(cmap, row); - + read_ilbm_plane(ifP, &remainingChunksize, cols, bmhdP->compression); for( col = 0; col < cols; col++ ) { @@ -1494,24 +1500,24 @@ rgbn_to_ppm(FILE * const ifP, pm_message("input is a %d-bit RGB image", (typeid == ID_RGB8 ? 8 : 4)); if (bmhdP->compression != 4) - pm_error("invalid compression mode for %s: %d (must be 4)", + pm_error("invalid compression mode for %s: %d (must be 4)", ID2string(typeid), bmhdP->compression); - + switch (typeid) { case ID_RGBN: if (bmhdP->nPlanes != 13) - pm_error("invalid number of planes for %s: %d (must be 13)", + pm_error("invalid number of planes for %s: %d (must be 13)", ID2string(typeid), bmhdP->nPlanes); maxval = lut_maxval(cmap, 15); break; case ID_RGB8: if (bmhdP->nPlanes != 25) - pm_error("invalid number of planes for %s: %d (must be 25)", + pm_error("invalid number of planes for %s: %d (must be 25)", ID2string(typeid), bmhdP->nPlanes); maxval = 255; break; default: - pm_error("rgbn_to_ppm(): invalid IFF ID %s - can't happen", + pm_error("rgbn_to_ppm(): invalid IFF ID %s - can't happen", ID2string(typeid)); } @@ -1533,7 +1539,7 @@ rgbn_to_ppm(FILE * const ifP, tries = 0; while (count == 0) { if (typeid == ID_RGB8) { - r = lookup_red(cmap, get_byte(ifP, ID_BODY, + r = lookup_red(cmap, get_byte(ifP, ID_BODY, &remainingChunksize)); g = lookup_green(cmap, get_byte(ifP, ID_BODY, &remainingChunksize)); @@ -1675,40 +1681,46 @@ read_4bit_mp(FILE * const ifP, static void -PCHG_DecompHuff(src, dest, tree, origsize) - unsigned char *src, *dest; - short *tree; - unsigned long origsize; -{ - unsigned long i = 0, bits = 0; +PCHG_DecompHuff(const unsigned char * const src, + unsigned char * const dst, + short * const tree, + unsigned long const origsize) { + + const unsigned char * srcCursor; + unsigned char * dstCursor; + unsigned long i; + unsigned long bits; unsigned char thisbyte; - short *p; + short * p; - p = tree; - while( i < origsize ) { - if( bits == 0 ) { - thisbyte = *src++; + srcCursor = &src[0]; /* initial value */ + dstCursor = &dst[0]; /* initial value */ + i = 0; /* initial value */ + bits = 0; /* initial value */ + p = tree; /* initial value */ + + while (i < origsize) { + if (bits == 0) { + thisbyte = *srcCursor++; bits = 8; } - if( thisbyte & (1 << 7) ) { - if( *p >= 0 ) { - *dest++ = (unsigned char)*p; - i++; + if (thisbyte & (1 << 7)) { + if (*p >= 0) { + *dstCursor++ = (unsigned char)*p; + ++i; p = tree; - } - else + } else p += (*p / 2); - } - else { - p--; - if( *p > 0 && (*p & 0x100) ) { - *dest++ = (unsigned char )*p; - i++; + } else { + --p; + if (*p > 0 && (*p & 0x100)) { + *dstCursor++ = (unsigned char )*p; + ++i; p = tree; } } thisbyte <<= 1; - bits--; + --bits; } } @@ -1743,9 +1755,9 @@ PCHG_Decompress(PCHGHeader * const PCHG, hufftree[i] = pm_uintFromBigend16(bigendComptree[i]); /* decompress the change structure data */ - PCHG_DecompHuff(compdata, data, &hufftree[huffsize-1], + PCHG_DecompHuff(compdata, data, &hufftree[huffsize-1], CompHdr->OriginalDataSize); - + free(hufftree); } break; default: @@ -1755,99 +1767,103 @@ PCHG_Decompress(PCHGHeader * const PCHG, static void -PCHG_ConvertSmall(PCHG, cmap, mask, datasize) - PCHGHeader *PCHG; - ColorMap *cmap; - unsigned char *mask; - unsigned long datasize; -{ +PCHG_ConvertSmall(PCHGHeader * const pchgP, + ColorMap * const cmapP, + unsigned char * const mask, + unsigned long const dataSize) { + unsigned char *data; + unsigned long remDataSize; unsigned char thismask; int bits, row, i, changes, masklen, reg; unsigned char ChangeCount16, ChangeCount32; unsigned short SmallChange; - unsigned long totalchanges = 0; - int changedlines = PCHG->ChangedLines; + unsigned long totalchanges; + int changedlines; + unsigned char * maskCursor; - masklen = 4 * MaskLongWords(PCHG->LineCount); - data = mask + masklen; datasize -= masklen; + totalchanges = 0; /* initial value */ + changedlines = pchgP->ChangedLines; /* initial value */ + masklen = 4 * MaskLongWords(pchgP->LineCount); + maskCursor = mask; + data = maskCursor + masklen; remDataSize = dataSize - masklen; bits = 0; - for( row = PCHG->StartLine; changedlines && row < 0; row++ ) { - if( bits == 0 ) { - if( masklen == 0 ) goto fail2; - thismask = *mask++; + for (row = pchgP->StartLine; changedlines && row < 0; ++row) { + if (bits == 0) { + if (masklen == 0) goto fail2; + thismask = *maskCursor++; --masklen; bits = 8; } - if( thismask & (1<<7) ) { - if( datasize < 2 ) goto fail; + if (thismask & (1<<7)) { + if (remDataSize < 2) goto fail; ChangeCount16 = *data++; ChangeCount32 = *data++; - datasize -= 2; + remDataSize -= 2; changes = ChangeCount16 + ChangeCount32; - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; - if( datasize < 2 ) goto fail; - SmallChange = BIG_WORD(data); data += 2; datasize -= 2; - reg = ((SmallChange & 0xf000) >> 12) + + for (i = 0; i < changes; ++i) { + if (totalchanges >= pchgP->TotalChanges) goto fail; + if (remDataSize < 2) goto fail; + SmallChange = BIG_WORD(data); data += 2; remDataSize -= 2; + reg = ((SmallChange & 0xf000) >> 12) + (i >= ChangeCount16 ? 16 : 0); - cmap->mp_init[reg - PCHG->MinReg].reg = reg; - cmap->mp_init[reg - PCHG->MinReg].r = + cmapP->mp_init[reg - pchgP->MinReg].reg = reg; + cmapP->mp_init[reg - pchgP->MinReg].r = ((SmallChange & 0x0f00) >> 8) * FACTOR_4BIT; - cmap->mp_init[reg - PCHG->MinReg].g = + cmapP->mp_init[reg - pchgP->MinReg].g = ((SmallChange & 0x00f0) >> 4) * FACTOR_4BIT; - cmap->mp_init[reg - PCHG->MinReg].b = + cmapP->mp_init[reg - pchgP->MinReg].b = ((SmallChange & 0x000f) >> 0) * FACTOR_4BIT; ++totalchanges; } --changedlines; } thismask <<= 1; - bits--; + --bits; } - for( row = PCHG->StartLine; changedlines && row < cmap->mp_rows; row++ ) { - if( bits == 0 ) { - if( masklen == 0 ) goto fail2; - thismask = *mask++; + for (row = pchgP->StartLine; changedlines && row < cmapP->mp_rows; row++) { + if (bits == 0) { + if (masklen == 0) goto fail2; + thismask = *maskCursor++; --masklen; bits = 8; } - if( thismask & (1<<7) ) { - if( datasize < 2 ) goto fail; + if(thismask & (1<<7)) { + if (remDataSize < 2) goto fail; ChangeCount16 = *data++; ChangeCount32 = *data++; - datasize -= 2; + remDataSize -= 2; changes = ChangeCount16 + ChangeCount32; - MALLOCARRAY_NOFAIL(cmap->mp_change[row], changes + 1); - for( i = 0; i < changes; i++ ) { - if( totalchanges >= PCHG->TotalChanges ) goto fail; - if( datasize < 2 ) goto fail; - SmallChange = BIG_WORD(data); data += 2; datasize -= 2; - reg = ((SmallChange & 0xf000) >> 12) + + MALLOCARRAY_NOFAIL(cmapP->mp_change[row], changes + 1); + for (i = 0; i < changes; ++i) { + if (totalchanges >= pchgP->TotalChanges) goto fail; + if (remDataSize < 2) goto fail; + SmallChange = BIG_WORD(data); data += 2; remDataSize -= 2; + reg = ((SmallChange & 0xf000) >> 12) + (i >= ChangeCount16 ? 16 : 0); - cmap->mp_change[row][i].reg = reg; - cmap->mp_change[row][i].r = + cmapP->mp_change[row][i].reg = reg; + cmapP->mp_change[row][i].r = ((SmallChange & 0x0f00) >> 8) * FACTOR_4BIT; - cmap->mp_change[row][i].g = + cmapP->mp_change[row][i].g = ((SmallChange & 0x00f0) >> 4) * FACTOR_4BIT; - cmap->mp_change[row][i].b = + cmapP->mp_change[row][i].b = ((SmallChange & 0x000f) >> 0) * FACTOR_4BIT; ++totalchanges; } - cmap->mp_change[row][changes].reg = MP_REG_END; + cmapP->mp_change[row][changes].reg = MP_REG_END; --changedlines; } thismask <<= 1; - bits--; + --bits; } - if( totalchanges != PCHG->TotalChanges ) + if (totalchanges != pchgP->TotalChanges) pm_message("warning - got %ld change structures, " - "chunk header reports %ld", - totalchanges, PCHG->TotalChanges); + "chunk header reports %ld", + totalchanges, pchgP->TotalChanges); return; fail: pm_error("insufficient data in SmallLineChanges structures"); @@ -1872,16 +1888,16 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, int reg; unsigned long totalchanges; int changedlines; - unsigned long dataRemaining; + unsigned long remDataSize; unsigned char * mask; mask = maskStart; /* initial value */ - dataRemaining = datasize; /* initial value */ + remDataSize = datasize; /* initial value */ changedlines = PCHG->ChangedLines; /* initial value */ totalchanges = 0; /* initial value */ masklen = 4 * MaskLongWords(PCHG->LineCount); - data = mask + masklen; dataRemaining -= masklen; + data = mask + masklen; remDataSize -= masklen; for (row = PCHG->StartLine, bits = 0; changedlines && row < 0; ++row) { if (bits == 0) { @@ -1894,16 +1910,16 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, if (thismask & (1<<7)) { unsigned int i; - if (dataRemaining < 2) + if (remDataSize < 2) pm_error("insufficient data in BigLineChanges structures"); - changes = BIG_WORD(data); data += 2; dataRemaining -= 2; + changes = BIG_WORD(data); data += 2; remDataSize -= 2; for (i = 0; i < changes; ++i) { if (totalchanges >= PCHG->TotalChanges) pm_error("insufficient data in BigLineChanges structures"); - if (dataRemaining < 6) + if (remDataSize < 6) pm_error("insufficient data in BigLineChanges structures"); reg = BIG_WORD(data); data += 2; @@ -1912,7 +1928,7 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, cmap->mp_init[reg - PCHG->MinReg].r = *data++; cmap->mp_init[reg - PCHG->MinReg].b = *data++; /* yes, RBG */ cmap->mp_init[reg - PCHG->MinReg].g = *data++; - dataRemaining -= 6; + remDataSize -= 6; ++totalchanges; } --changedlines; @@ -1933,17 +1949,17 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, if (thismask & (1<<7)) { unsigned int i; - if (dataRemaining < 2) + if (remDataSize < 2) pm_error("insufficient data in BigLineChanges structures"); - changes = BIG_WORD(data); data += 2; dataRemaining -= 2; + changes = BIG_WORD(data); data += 2; remDataSize -= 2; MALLOCARRAY_NOFAIL(cmap->mp_change[row], changes + 1); for (i = 0; i < changes; ++i) { if (totalchanges >= PCHG->TotalChanges) pm_error("insufficient data in BigLineChanges structures"); - if (dataRemaining < 6) + if (remDataSize < 6) pm_error("insufficient data in BigLineChanges structures"); reg = BIG_WORD(data); data += 2; @@ -1952,7 +1968,7 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, cmap->mp_change[row][i].r = *data++; cmap->mp_change[row][i].b = *data++; /* yes, RBG */ cmap->mp_change[row][i].g = *data++; - dataRemaining -= 6; + remDataSize -= 6; ++totalchanges; } cmap->mp_change[row][changes].reg = MP_REG_END; @@ -1963,7 +1979,7 @@ PCHG_ConvertBig(PCHGHeader * const PCHG, } if (totalchanges != PCHG->TotalChanges) pm_message("warning - got %ld change structures, " - "chunk header reports %ld", + "chunk header reports %ld", totalchanges, PCHG->TotalChanges); } @@ -2027,7 +2043,7 @@ read_pchg(FILE * const ifP, datasize = CompHdr.OriginalDataSize; MALLOCARRAY_NOFAIL(data, datasize); - PCHG_Decompress(&PCHG, &CompHdr, compdata, + PCHG_Decompress(&PCHG, &CompHdr, compdata, compsize, comptree, data); free(comptree); @@ -2073,7 +2089,7 @@ read_pchg(FILE * const ifP, } else pm_error("unknown palette changes structure " - "format in %s chunk", + "format in %s chunk", ID2string(iffid)); } free(data); @@ -2101,7 +2117,7 @@ ignored_iffid(IFF_ID const iffid, -static void +static void process_body( FILE * const ifP, long const chunksize, BitMapHeader * const bmhdP, @@ -2111,9 +2127,9 @@ process_body( FILE * const ifP, int const isdeepopt, DirectColor * const dcol, int * const viewportmodesP) { - + if (bmhdP == NULL) - pm_error("%s chunk without %s chunk", + pm_error("%s chunk without %s chunk", ID2string(ID_BODY), ID2string(ID_BMHD)); prepareCmap(bmhdP, cmap); @@ -2132,12 +2148,12 @@ process_body( FILE * const ifP, if( isdeepopt > 0 && (bmhdP->nPlanes % 3 != 0) ) { pm_message("cannot interpret %d-plane image as 'deep' " - "(# of planes must be divisible by 3)", + "(# of planes must be divisible by 3)", bmhdP->nPlanes); isdeep = 0; } else isdeep = isdeepopt; - + if (isdeep > 0) deep_to_ppm(ifP, chunksize, bmhdP, cmap); else if (dcol) @@ -2151,7 +2167,7 @@ process_body( FILE * const ifP, /* will be interpreted as grayscale */ std_to_ppm(ifP, chunksize, bmhdP, cmap, *viewportmodesP); else - pm_error("don't know how to interpret %d-plane image", + pm_error("don't know how to interpret %d-plane image", bmhdP->nPlanes); } else std_to_ppm(ifP, chunksize, bmhdP, cmap, *viewportmodesP); @@ -2163,7 +2179,7 @@ process_body( FILE * const ifP, -static void +static void processChunk(FILE * const ifP, long const formsize, IFF_ID const ignorelist[], @@ -2200,7 +2216,7 @@ processChunk(FILE * const ifP, } else if (iffid == ID_END) { /* END chunks are not officially valid in IFF, but suggested as a future expansion for stream-writing, - see Amiga RKM Devices, 3rd Ed, page 376 + see Amiga RKM Devices, 3rd Ed, page 376 */ if (chunksize != 0 ) { pm_message("warning - non-0 %s chunk", ID2string(iffid)); @@ -2212,7 +2228,7 @@ processChunk(FILE * const ifP, ID2string(iffid), formsize, 0xffffffff); *endchunkP = 1; } else if (*bodyChunkProcessedP) { - pm_message("%s chunk found after %s chunk - skipping", + pm_message("%s chunk found after %s chunk - skipping", ID2string(iffid), ID2string(ID_BODY)); skip_chunk(ifP, iffid, chunksize); } else @@ -2251,11 +2267,11 @@ processChunk(FILE * const ifP, (*dcolP)->b = get_byte(ifP, iffid, NULL); get_byte(ifP, iffid, NULL); /* skip pad byte */ break; - case ID_BODY: + case ID_BODY: if (cmaponly || (*bmhdP && (*bmhdP)->nPlanes == 0)) skip_chunk(ifP, ID_BODY, chunksize); else { - process_body(ifP, chunksize, *bmhdP, cmap, + process_body(ifP, chunksize, *bmhdP, cmap, maskfile, fakeviewport, isdeepopt, *dcolP, viewportmodesP); @@ -2280,11 +2296,11 @@ processChunk(FILE * const ifP, x = get_big_short(ifP, ID_DPI, NULL); y = get_big_short(ifP, ID_DPI, NULL); if (verbose) - pm_message("%s chunk: dpi_x = %d dpi_y = %d", + pm_message("%s chunk: dpi_x = %d dpi_y = %d", ID2string(ID_DPI), x, y); } break; default: - pm_message("unknown chunk type %s - skipping", + pm_message("unknown chunk type %s - skipping", ID2string(iffid)); skip_chunk(ifP, iffid, chunksize); break; @@ -2295,7 +2311,7 @@ processChunk(FILE * const ifP, if (ODD(chunksize)) { get_byte(ifP, iffid, NULL); bytesread += 1; - } + } *bytesReadP = bytesread; } @@ -2338,7 +2354,7 @@ maybeWriteColorMap(FILE * const ofP, prepareCmap(bmhdP, cmapP); cmapToPpm(ofP, cmapP); } else - pm_error("ILBM has neither %s or %s chunk", + pm_error("ILBM has neither %s or %s chunk", ID2string(ID_BODY), ID2string(ID_CMAP)); } } @@ -2413,13 +2429,13 @@ main(int argc, char *argv[]) { "as argument"); if( ignorecount >= MAX_IGNORE ) pm_error("max %d chunk IDs to ignore", MAX_IGNORE); - ignorelist[ignorecount++] = - MAKE_ID(argv[argn][0], argv[argn][1], argv[argn][2], + ignorelist[ignorecount++] = + MAKE_ID(argv[argn][0], argv[argn][1], argv[argn][2], argv[argn][3]); } else pm_usage(usage); ++argn; - } + } if( argn < argc ) { ifP = pm_openr( argv[argn] ); @@ -2439,7 +2455,7 @@ main(int argc, char *argv[]) { pm_error("input is not a FORM type IFF file"); formsize = get_big_long(ifP, ID_FORM, NULL); typeid = get_big_long(ifP, ID_FORM, NULL); - if (typeid != ID_ILBM && typeid != ID_RGBN && typeid != ID_RGB8 && + if (typeid != ID_ILBM && typeid != ID_RGBN && typeid != ID_RGB8 && typeid != ID_PBM) pm_error("input is not an ILBM, RGBN, RGB8 or PBM " "type FORM IFF file"); @@ -2474,7 +2490,7 @@ main(int argc, char *argv[]) { { unsigned int skipped; - + for (skipped = 0; fgetc(ifP) != EOF; ++skipped) ++bytesread; @@ -2492,3 +2508,6 @@ main(int argc, char *argv[]) { return 0; } + + + diff --git a/converter/ppm/picttoppm.c b/converter/ppm/picttoppm.c index b14675c7..b8fb8642 100644 --- a/converter/ppm/picttoppm.c +++ b/converter/ppm/picttoppm.c @@ -15,7 +15,7 @@ * University of British Columbia * * - * 2003-02: Handling for DirectBitsRgn opcode (0x9b) added by + * 2003-02: Handling for DirectBitsRgn opcode (0x9b) added by * kabe@sra-tohoku.co.jp. * * 2004-03-27: Several bugs fixed by Steve Summit, scs@eskimo.com. @@ -153,7 +153,7 @@ struct raster { Each pixel is either a palette index or an RGB triple, depending on the format of the associated PICT. - + Each pixel is one byte if the associated PICT has 8 or fewer bits per pixel. If the associated PICT has 16 or 32 bits per pixel, an element herein is 2 or 4 bytes, respectively. @@ -231,7 +231,7 @@ allocateRaster(struct raster * const rasterP, default: pm_error("INTERNAL ERROR: impossible bitsPerPixel value in " "unpackbits(): %u", bitsPerPixel); - } + } if (UINT_MAX / rasterP->rowSize < rasterP->rowCount) pm_error("Arithmetic overflow computing size of %u x %u pixel " "array.", rasterP->rowSize, rasterP->rowCount); @@ -360,7 +360,7 @@ readSignedByte(void) { -static void +static void readShortPoint(struct Point * const p) { p->x = readSignedByte(); p->y = readSignedByte(); @@ -457,15 +457,15 @@ const_name(const struct const_name * const table, for (i = 0; table[i].name; ++i) if (table[i].value == ct) return table[i].name; - + sprintf(numbuf, "? (%u)", ct); return numbuf; } -static void -picComment(Word const type, +static void +picComment(Word const type, int const length) { unsigned int remainingLength; @@ -736,7 +736,7 @@ parseFontLine(const char ** const token, -static int +static int load_fontdir(const char * const dirfile) { /*---------------------------------------------------------------------------- Load the font directory from file named 'dirfile'. Add its contents @@ -744,7 +744,7 @@ load_fontdir(const char * const dirfile) { -----------------------------------------------------------------------------*/ FILE * ifP; unsigned int nFont; - char line[1024]; + char line[1024]; ifP = pm_openr(dirfile); @@ -832,7 +832,7 @@ rectheight(const struct Rect * const r) { static bool -rectsamesize(struct Rect const r1, +rectsamesize(struct Rect const r1, struct Rect const r2) { return r1.right - r1.left == r2.right - r2.left && r1.bottom - r1.top == r2.bottom - r2.top ; @@ -841,8 +841,8 @@ rectsamesize(struct Rect const r1, static void -rectinter(struct Rect const r1, - struct Rect const r2, +rectinter(struct Rect const r1, + struct Rect const r2, struct Rect * const intersectionP) { intersectionP->left = MAX(r1.left, r2.left); @@ -854,8 +854,8 @@ rectinter(struct Rect const r1, static void -rectscale(struct Rect * const r, - double const xscale, +rectscale(struct Rect * const r, + double const xscale, double const yscale) { r->left *= xscale; r->right *= xscale; @@ -886,7 +886,7 @@ addBlitList(blitList * const blitListP, int const mode) { struct blit_info * biP; - + MALLOCVAR(biP); if (biP == NULL) pm_error("out of memory for blit list"); @@ -940,8 +940,8 @@ rgbIsBlack(const struct RGBColor * const colorP) { } -static void -srcCopy(struct RGBColor * const src, +static void +srcCopy(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsBlack(src)) @@ -952,8 +952,8 @@ srcCopy(struct RGBColor * const src, -static void -srcOr(struct RGBColor * const src, +static void +srcOr(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsBlack(src)) *dst = foreground; @@ -961,8 +961,8 @@ srcOr(struct RGBColor * const src, -static void -srcXor(struct RGBColor * const src, +static void +srcXor(struct RGBColor * const src, struct RGBColor * const dst) { dst->red ^= ~src->red; dst->grn ^= ~src->grn; @@ -971,8 +971,8 @@ srcXor(struct RGBColor * const src, -static void -srcBic(struct RGBColor * const src, +static void +srcBic(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsBlack(src)) *dst = background; @@ -980,8 +980,8 @@ srcBic(struct RGBColor * const src, -static void -notSrcCopy(struct RGBColor * const src, +static void +notSrcCopy(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsWhite(src)) *dst = foreground; @@ -991,8 +991,8 @@ notSrcCopy(struct RGBColor * const src, -static void -notSrcOr(struct RGBColor * const src, +static void +notSrcOr(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsWhite(src)) *dst = foreground; @@ -1000,8 +1000,8 @@ notSrcOr(struct RGBColor * const src, -static void -notSrcBic(struct RGBColor * const src, +static void +notSrcBic(struct RGBColor * const src, struct RGBColor * const dst) { if (rgbIsWhite(src)) *dst = background; @@ -1009,8 +1009,8 @@ notSrcBic(struct RGBColor * const src, -static void -notSrcXor(struct RGBColor * const src, +static void +notSrcXor(struct RGBColor * const src, struct RGBColor * const dst) { dst->red ^= src->red; dst->grn ^= src->grn; @@ -1019,8 +1019,8 @@ notSrcXor(struct RGBColor * const src, -static void -addOver(struct RGBColor * const src, +static void +addOver(struct RGBColor * const src, struct RGBColor * const dst) { dst->red += src->red; dst->grn += src->grn; @@ -1029,8 +1029,8 @@ addOver(struct RGBColor * const src, -static void -addPin(struct RGBColor * const src, +static void +addPin(struct RGBColor * const src, struct RGBColor * const dst) { if ((long)dst->red + (long)src->red > (long)op_color.red) dst->red = op_color.red; @@ -1050,8 +1050,8 @@ addPin(struct RGBColor * const src, -static void -subOver(struct RGBColor * const src, +static void +subOver(struct RGBColor * const src, struct RGBColor * const dst) { dst->red -= src->red; dst->grn -= src->grn; @@ -1063,8 +1063,8 @@ subOver(struct RGBColor * const src, /* or maybe its src - dst; my copy of Inside Mac is unclear */ -static void -subPin(struct RGBColor * const src, +static void +subPin(struct RGBColor * const src, struct RGBColor * const dst) { if ((long)dst->red - (long)src->red < (long)op_color.red) dst->red = op_color.red; @@ -1084,8 +1084,8 @@ subPin(struct RGBColor * const src, -static void -adMax(struct RGBColor * const src, +static void +adMax(struct RGBColor * const src, struct RGBColor * const dst) { if (src->red > dst->red) dst->red = src->red; if (src->grn > dst->grn) dst->grn = src->grn; @@ -1094,8 +1094,8 @@ adMax(struct RGBColor * const src, -static void -adMin(struct RGBColor * const src, +static void +adMin(struct RGBColor * const src, struct RGBColor * const dst) { if (src->red < dst->red) dst->red = src->red; if (src->grn < dst->grn) dst->grn = src->grn; @@ -1104,8 +1104,8 @@ adMin(struct RGBColor * const src, -static void -blend(struct RGBColor * const src, +static void +blend(struct RGBColor * const src, struct RGBColor * const dst) { #define blend_component(cmp) \ ((long)src->cmp * (long)op_color.cmp) / 65536 + \ @@ -1118,8 +1118,8 @@ blend(struct RGBColor * const src, -static void -transparent(struct RGBColor * const src, +static void +transparent(struct RGBColor * const src, struct RGBColor * const dst) { if (src->red != background.red || src->grn != background.grn || @@ -1130,7 +1130,7 @@ transparent(struct RGBColor * const src, -static transfer_func +static transfer_func transfer(int const mode) { switch (mode) { case 0: return srcCopy; @@ -1162,7 +1162,7 @@ transfer(int const mode) { static pixval redepth(pixval const c, pixval const oldMaxval) { - + return ROUNDDIV(c * PPM_MAXMAXVAL, oldMaxval); } @@ -1185,7 +1185,7 @@ decode16(unsigned char * const sixteen) { retval.red = (sixteen[0] & 0x7c) >> 2; retval.grn = (sixteen[0] & 0x03) << 3 | (sixteen[1] & 0xe0) >> 5; retval.blu = (sixteen[1] & 0x1f) >> 0; - + return retval; } @@ -1198,9 +1198,9 @@ doDiffSize(struct Rect const clipsrc, int const xsize, int const ysize, transfer_func const trf, - struct RGBColor * const color_map, + struct RGBColor * const color_map, unsigned char * const src, - int const srcwid, + int const srcwid, struct rgbPlanes const dst, unsigned int const dstwid) { @@ -1275,7 +1275,7 @@ doDiffSize(struct Rect const clipsrc, case 32: { unsigned int const planeSize = srcwid / 4; unsigned int rowNumber; - + for (rowNumber = 0; rowNumber < ysize; ++rowNumber) { unsigned char * const row = &src[rowNumber * srcwid]; unsigned char * const redPlane = &row[planeSize * 0]; @@ -1300,16 +1300,16 @@ doDiffSize(struct Rect const clipsrc, ppm_readppminit(scaled = pm_openr(tempFilename), &cols, &rows, &maxval, &format); row = ppm_allocrow(cols); - /* couldn't hurt to assert cols, rows and maxval... */ + /* couldn't hurt to assert cols, rows and maxval... */ if (trf == NULL) { while (rows-- > 0) { unsigned int i; ppm_readppmrow(scaled, row, cols, maxval, format); for (i = 0, rowp = row; i < cols; ++i, ++rowp) { - *reddst++ = PPM_GETR(*rowp) * 65536L / (maxval + 1); - *grndst++ = PPM_GETG(*rowp) * 65536L / (maxval + 1); - *bludst++ = PPM_GETB(*rowp) * 65536L / (maxval + 1); + *reddst++ = PPM_GETR(*rowp) * 65536L / (maxval + 1); + *grndst++ = PPM_GETG(*rowp) * 65536L / (maxval + 1); + *bludst++ = PPM_GETB(*rowp) * 65536L / (maxval + 1); } reddst += dstadd; grndst += dstadd; @@ -1325,9 +1325,9 @@ doDiffSize(struct Rect const clipsrc, dst_c.red = *reddst; dst_c.grn = *grndst; dst_c.blu = *bludst; - src_c.red = PPM_GETR(*rowp) * 65536L / (maxval + 1); - src_c.grn = PPM_GETG(*rowp) * 65536L / (maxval + 1); - src_c.blu = PPM_GETB(*rowp) * 65536L / (maxval + 1); + src_c.red = PPM_GETR(*rowp) * 65536L / (maxval + 1); + src_c.grn = PPM_GETG(*rowp) * 65536L / (maxval + 1); + src_c.blu = PPM_GETB(*rowp) * 65536L / (maxval + 1); (*trf)(&src_c, &dst_c); *reddst++ = dst_c.red; *grndst++ = dst_c.grn; @@ -1480,7 +1480,7 @@ blitIdempotent(unsigned int const pixSize, unsigned int const ysize, unsigned char * const src, unsigned int const srcwid, - struct RGBColor * const colorMap, + struct RGBColor * const colorMap, struct rgbPlanes const dst, unsigned int const dstwid) { /*---------------------------------------------------------------------------- @@ -1494,7 +1494,7 @@ blitIdempotent(unsigned int const pixSize, switch (pixSize) { case 8: { unsigned int rowNumber; - + for (rowNumber = 0; rowNumber < ysize; ++rowNumber) { unsigned char * const srcrow = &src[rowNumber * srcwid]; unsigned int const dstRowCurs = rowNumber * dstwid; @@ -1554,15 +1554,15 @@ blitIdempotent(unsigned int const pixSize, static void -doBlit(struct Rect const srcRect, - struct Rect const dstRect, - struct Rect const srcBounds, +doBlit(struct Rect const srcRect, + struct Rect const dstRect, + struct Rect const srcBounds, struct raster const srcplane, - struct Rect const dstBounds, + struct Rect const dstBounds, struct rgbPlanes const canvasPlanes, - int const pixSize, - int const dstwid, - struct RGBColor * const color_map, + int const pixSize, + int const dstwid, + struct RGBColor * const color_map, int const mode) { /*---------------------------------------------------------------------------- Transfer some pixels from 'srcplane' to 'canvasPlanes', applying the @@ -1583,7 +1583,6 @@ doBlit(struct Rect const srcRect, int dstoff; int xsize; int ysize; - int srcadd; transfer_func trf; if (verbose) { @@ -1604,7 +1603,6 @@ doBlit(struct Rect const srcRect, src = srcplane.bytes + srcRowNumber * srcplane.rowSize + srcRowOffset; xsize = rectwidth(&srcRect); ysize = rectheight(&srcRect); - srcadd = srcplane.rowSize - xsize * pkpixsize; } dstoff = (dstRect.top - dstBounds.top) * dstwid + @@ -1635,16 +1633,16 @@ doBlit(struct Rect const srcRect, static int -blit(struct Rect const srcRect, - struct Rect const srcBounds, +blit(struct Rect const srcRect, + struct Rect const srcBounds, struct raster const srcplane, struct canvas * const canvasP, blitList * const blitListP, - int const pixSize, - struct Rect const dstRect, - struct Rect const dstBounds, - int const dstwid, - struct RGBColor * const color_map, + int const pixSize, + struct Rect const dstRect, + struct Rect const dstBounds, + int const dstwid, + struct RGBColor * const color_map, int const mode) { /*---------------------------------------------------------------------------- 'srcplane' contains the rectangle 'srcBounds' of the image. @@ -1657,7 +1655,7 @@ blit(struct Rect const srcRect, /* I can't tell what the result value of this function is supposed to mean, but I found several return statements that did not set it to anything, - and several calls that examine it. I'm guessing that "1" is the + and several calls that examine it. I'm guessing that "1" is the appropriate thing to return in those cases, so I made it so. -Bryan 00.03.02 */ @@ -1701,7 +1699,7 @@ blit(struct Rect const srcRect, * even only a bit, but that would require even more extra work). */ -static void +static void allocPlanes(unsigned int const width, unsigned int const height, struct rgbPlanes * const planesP) { @@ -1858,7 +1856,7 @@ doBlitList(struct canvas * const canvasP, if (xscale != 1.0 || yscale != 1.0) { struct blit_info * biP; - + for (biP = blitListP->firstP; biP; biP = biP->next) rectscale(&biP->dstRect, xscale, yscale); @@ -2078,7 +2076,7 @@ readColorTable(void) { static void readBytes(FILE * const ifP, - unsigned int const n, + unsigned int const n, unsigned char * const buf) { align += n; @@ -2111,7 +2109,7 @@ expand4Bits(unsigned char * const packed, unsigned char * dst; dst = &expanded[0]; - + for (i = 0; i < packedLen; ++i) { *dst++ = (packed[i] >> 4) & 0x0f; *dst++ = (packed[i] >> 0) & 0x0f; @@ -2124,12 +2122,12 @@ static void expand2Bits(unsigned char * const packed, unsigned char * const expanded, unsigned int const packedLen) { - + unsigned int i; unsigned char * dst; dst = &expanded[0]; - + for (i = 0; i < packedLen; ++i) { *dst++ = (packed[i] >> 6) & 0x03; *dst++ = (packed[i] >> 4) & 0x03; @@ -2149,7 +2147,7 @@ expand1Bit(unsigned char * const packed, unsigned char * dst; dst = &expanded[0]; - + for (i = 0; i < packedLen; ++i) { *dst++ = (packed[i] >> 7) & 0x01; *dst++ = (packed[i] >> 6) & 0x01; @@ -2165,7 +2163,7 @@ expand1Bit(unsigned char * const packed, static void -unpackBuf(unsigned char * const packed, +unpackBuf(unsigned char * const packed, unsigned int const packedLen, int const bitsPerPixel, unsigned char ** const expandedP, @@ -2186,14 +2184,9 @@ unpackBuf(unsigned char * const packed, 'packedLen' must not be greater than 256. -----------------------------------------------------------------------------*/ static unsigned char expanded[256 * 8]; - unsigned char * src; - unsigned char * dst; assert(packedLen <= 256); - src = &packed[0]; - dst = &expanded[0]; - switch (bitsPerPixel) { case 8: case 16: @@ -2247,7 +2240,7 @@ unpackUncompressedBits(FILE * const ifP, if (linebuf == NULL) pm_error("can't allocate memory for line buffer"); - for (rowOfRect = 0; rowOfRect < raster.rowCount; ++rowOfRect) { + for (rowOfRect = 0; rowOfRect < raster.rowCount; ++rowOfRect) { unsigned char * bytePixels; unsigned int expandedByteCount; unsigned char * rasterRow; @@ -2331,12 +2324,12 @@ expandRun(unsigned char * const block, "Invalid PICT file."); else { unsigned int const runLength = (block[0] ^ 0xff) + 2; - + unsigned int i; unsigned char * bytePixels; /* Points to static storage */ unsigned int expandedByteCount; unsigned int outputCursor; - + assert(block[0] & 0x80); /* It's a run */ if (verbose > 1) @@ -2356,13 +2349,13 @@ expandRun(unsigned char * const block, That is what I saw in a test image. */ - + if (expandedByteCount * runLength > expandedSize) pm_error("Invalid PICT image. It contains a row with more pixels " "than the width of the rectangle containing it, " "even padded up to a " "multiple of 16 pixels. Use -verbose to see details."); - + outputCursor = 0; for (i = 0; i < runLength; ++i) { unsigned int j; @@ -2414,14 +2407,14 @@ copyPixelGroup(unsigned char * const block, unsigned char * bytePixels; /* Points to static storage */ unsigned int bytePixelLen; unsigned int rasterBytesGenerated; - + assert(blockLimit >= 1); /* block[0] exists */ assert((block[0] & 0x80) == 0); /* It's not a run */ - + if (verbose > 1) pm_message("Block: %u explicit packed %u-byte units", groupLen, pkpixsize); - + unpackBuf(&block[1], groupLen * pkpixsize, bitsPerPixel, &bytePixels, &bytePixelLen); @@ -2439,7 +2432,7 @@ copyPixelGroup(unsigned char * const block, for (i = 0; i < rasterBytesGenerated; ++i) dest[i] = bytePixels[i]; - + *blockLengthP = blockLength; *rasterBytesGeneratedP = rasterBytesGenerated; } @@ -2506,9 +2499,9 @@ interpretCompressedLine(unsigned char * const linebuf, for (lineCursor = 0, rasterCursor = 0; lineCursor < linelen; ) { unsigned int blockLength, rasterBytesGenerated; - + assert(lineCursor <= linelen); - + if (verbose > 2) pm_message("At Byte %u of line, Column %u of row", lineCursor, rasterCursor); @@ -2518,7 +2511,7 @@ interpretCompressedLine(unsigned char * const linebuf, bitsPerPixel, &rowRaster[rasterCursor], rowSize - rasterCursor, &blockLength, &rasterBytesGenerated); - + lineCursor += blockLength; rasterCursor += rasterBytesGenerated; assert(rasterCursor <= rowSize); @@ -2546,7 +2539,7 @@ interpretCompressedLine(unsigned char * const linebuf, Of course, neither 200 nor 250 make any logical sense. In the worst case, you can represent 254 pixels of 8 bpp or less in a 255 byte line. In the worst case, you can represent 127 16bpp pixels in a 255 byte line. - So with 200 being the cutoff, it's actually impossible to represent some + So with 200 being the cutoff, it's actually impossible to represent some 16 bpp images with 200 pixels per row. We have not been able to find an official spec for PICT. @@ -2616,13 +2609,13 @@ unpackCompressedBits(FILE * const ifP, static void unpackbits(FILE * const ifP, struct Rect * const boundsP, - Word const rowBytesArg, + Word const rowBytesArg, int const bitsPerPixel, struct raster * const rasterP) { unsigned int const rectHeight = boundsP->bottom - boundsP->top; unsigned int const rectWidth = boundsP->right - boundsP->left; - + struct raster raster; unsigned int rowBytes; @@ -2631,7 +2624,7 @@ unpackbits(FILE * const ifP, if (verbose) pm_message("rowBytes = %u, bitsPerPixel = %d", rowBytesArg, bitsPerPixel); - + allocateRaster(&raster, rectWidth, rectHeight, bitsPerPixel); rowBytes = rowBytesArg ? rowBytesArg : raster.rowSize; @@ -2769,7 +2762,7 @@ read8x8Pattern(struct Pattern * const pat) { static drawFn BkPat; -static void +static void BkPat(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -2781,7 +2774,7 @@ BkPat(struct canvas * const canvasP, static drawFn PnPat; -static void +static void PnPat(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -2793,7 +2786,7 @@ PnPat(struct canvas * const canvasP, static drawFn FillPat; -static void +static void FillPat(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -2805,7 +2798,7 @@ FillPat(struct canvas * const canvasP, static drawFn PnSize; -static void +static void PnSize(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -2820,7 +2813,7 @@ PnSize(struct canvas * const canvasP, static drawFn PnSize; -static void +static void PnMode(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -2832,13 +2825,13 @@ PnMode(struct canvas * const canvasP, if (verbose) pm_message("pen transfer mode = %s", const_name(transfer_name, pen_mode)); - + pen_trf = transfer(pen_mode); } -static void +static void readRgb(struct RGBColor * const rgb) { rgb->red = readWord(); rgb->grn = readWord(); @@ -2849,14 +2842,14 @@ readRgb(struct RGBColor * const rgb) { static drawFn RGBFgCol; -static void +static void RGBFgCol(struct canvas * const canvasP, blitList * const blitListP, int const version) { readRgb(&foreground); if (verbose) - pm_message("foreground now [%d,%d,%d]", + pm_message("foreground now [%d,%d,%d]", foreground.red, foreground.grn, foreground.blu); } @@ -2864,14 +2857,14 @@ RGBFgCol(struct canvas * const canvasP, static drawFn RGBBkCol; -static void +static void RGBBkCol(struct canvas * const canvasP, blitList * const blitListP, int const version) { readRgb(&background); if (verbose) - pm_message("background now [%d,%d,%d]", + pm_message("background now [%d,%d,%d]", background.red, background.grn, background.blu); } @@ -2879,11 +2872,11 @@ RGBBkCol(struct canvas * const canvasP, #define PIXEL_INDEX(x,y) ((y) - picFrame.top) * rowlen + (x) - picFrame.left -static void +static void draw_pixel(struct canvas * const canvasP, - int const x, - int const y, - struct RGBColor * const clr, + int const x, + int const y, + struct RGBColor * const clr, transfer_func trf) { if (x < clip_rect.left || x >= clip_rect.right || @@ -2896,7 +2889,7 @@ draw_pixel(struct canvas * const canvasP, dst.red = canvasP->planes.red[i]; dst.grn = canvasP->planes.grn[i]; dst.blu = canvasP->planes.blu[i]; - + (*trf)(clr, &dst); canvasP->planes.red[i] = dst.red; @@ -2907,7 +2900,7 @@ draw_pixel(struct canvas * const canvasP, -static void +static void draw_pen_rect(struct canvas * const canvasP, struct Rect * const r) { @@ -2918,7 +2911,7 @@ draw_pen_rect(struct canvas * const canvasP, struct RGBColor dst; i = PIXEL_INDEX(r->left, r->top); /* initial value */ - + for (y = r->top; y < r->bottom; y++) { for (x = r->left; x < r->right; x++) { dst.red = canvasP->planes.red[i]; @@ -2942,9 +2935,9 @@ draw_pen_rect(struct canvas * const canvasP, -static void +static void draw_pen(struct canvas * const canvasP, - int const x, + int const x, int const y) { struct Rect penrect; @@ -2972,11 +2965,11 @@ draw_pen(struct canvas * const canvasP, * * Paul Heckbert 3 Sep 85 */ -static void +static void scan_line(struct canvas * const canvasP, - short const x1, - short const y1, - short const x2, + short const x1, + short const y1, + short const x2, short const y2) { int d, x, y, ax, ay, sx, sy, dx, dy; @@ -3023,7 +3016,7 @@ scan_line(struct canvas * const canvasP, static drawFn Line; -static void +static void Line(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3041,7 +3034,7 @@ Line(struct canvas * const canvasP, static drawFn LineFrom; -static void +static void LineFrom(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3062,7 +3055,7 @@ LineFrom(struct canvas * const canvasP, static drawFn ShortLine; -static void +static void ShortLine(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3074,7 +3067,7 @@ ShortLine(struct canvas * const canvasP, pm_message("(%d,%d) delta (%d, %d)", p1.x, p1.y, current.x, current.y); current.x += p1.x; current.y += p1.y; - + if (!blitListP) scan_line(canvasP, p1.x, p1.y, current.x, current.y); } @@ -3083,7 +3076,7 @@ ShortLine(struct canvas * const canvasP, static drawFn ShortLineFrom; -static void +static void ShortLineFrom(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3103,12 +3096,12 @@ ShortLineFrom(struct canvas * const canvasP, -static void +static void do_paintRect(struct canvas * const canvasP, struct Rect const prect) { struct Rect rect; - + if (verbose) dumpRect("painting", prect); @@ -3121,7 +3114,7 @@ do_paintRect(struct canvas * const canvasP, static drawFn paintRect; -static void +static void paintRect(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3135,7 +3128,7 @@ paintRect(struct canvas * const canvasP, static drawFn paintSameRect; -static void +static void paintSameRect(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3146,7 +3139,7 @@ paintSameRect(struct canvas * const canvasP, -static void +static void do_frameRect(struct canvas * const canvasP, struct Rect const rect) { @@ -3160,7 +3153,7 @@ do_frameRect(struct canvas * const canvasP, draw_pen(canvasP, x, rect.top); draw_pen(canvasP, x, rect.bottom - pen_height); } - + for (y = rect.top; y <= rect.bottom - pen_height ; y += pen_height) { draw_pen(canvasP, rect.left, y); draw_pen(canvasP, rect.right - pen_width, y); @@ -3172,7 +3165,7 @@ do_frameRect(struct canvas * const canvasP, static drawFn frameRect; -static void +static void frameRect(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3186,7 +3179,7 @@ frameRect(struct canvas * const canvasP, static drawFn frameSameRect; -static void +static void frameSameRect(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3199,7 +3192,7 @@ frameSameRect(struct canvas * const canvasP, /* a stupid shell sort - I'm so embarrassed */ -static void +static void poly_sort(int const sort_index, struct Point points[]) { int d, i, j, temp; @@ -3232,9 +3225,9 @@ poly_sort(int const sort_index, struct Point points[]) { /* Watch out for the lack of error checking in the next two functions ... */ -static void +static void scan_poly(struct canvas * const canvasP, - int const np, + int const np, struct Point pts[]) { int dx,dy,dxabs,dyabs,i,scan_index,j,k,px,py; @@ -3260,7 +3253,7 @@ scan_poly(struct canvas * const canvasP, scan_index++; } -#define sign(x) ((x) > 0 ? 1 : ((x)==0 ? 0:(-1)) ) +#define sign(x) ((x) > 0 ? 1 : ((x)==0 ? 0:(-1)) ) old_sdy = sy0 = sign(pts[1].y - pts[0].y); for (j=0; j<np; j++) { @@ -3319,7 +3312,7 @@ scan_poly(struct canvas * const canvasP, if (sy0 + sdy == 0) scan_index--; poly_sort(scan_index, coord); - + toggle = 0; for (i = 0; i < scan_index; i++) { if ((coord[i].y == coord[i+1].y) && (toggle == 0)) @@ -3332,12 +3325,12 @@ scan_poly(struct canvas * const canvasP, toggle = 0; } } - + static drawFn paintPoly; - -static void + +static void paintPoly(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3359,7 +3352,7 @@ paintPoly(struct canvas * const canvasP, static drawFn PnLocHFrac; -static void +static void PnLocHFrac(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3374,7 +3367,7 @@ PnLocHFrac(struct canvas * const canvasP, static drawFn TxMode; -static void +static void TxMode(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3386,7 +3379,7 @@ TxMode(struct canvas * const canvasP, if (verbose) pm_message("text transfer mode = %s", const_name(transfer_name, text_mode)); - + /* ignore the text mask bit 'cause we don't handle it yet */ text_trf = transfer(text_mode & ~64); } @@ -3395,7 +3388,7 @@ TxMode(struct canvas * const canvasP, static drawFn TxFont; -static void +static void TxFont(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3409,7 +3402,7 @@ TxFont(struct canvas * const canvasP, static drawFn TxFace; -static void +static void TxFace(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3423,7 +3416,7 @@ TxFace(struct canvas * const canvasP, static drawFn TxSize; -static void +static void TxSize(struct canvas * const canvasP, blitList * const blitListP, int const version) { @@ -3445,7 +3438,7 @@ skip_text(blitList * const blitListP) { -static int +static int abs_value(int const x) { if (x < 0) return -x; @@ -3455,9 +3448,9 @@ abs_value(int const x) { -static struct font* -get_font(int const font, - int const size, +static struct font* +get_font(int const font, + int const size, int const style) { int closeness, bestcloseness; @@ -3490,8 +3483,8 @@ get_font(int const font, /* This only does 0, 90, 180 and 270 degree rotations */ -static void -rotate(int * const x, +static void +rotate(int * const x, int * const y) { int tmp; @@ -3522,7 +3515,7 @@ rotate(int * const x, static void do_ps_text(struct canvas * const canvasP, - Word const tx, + Word const tx, Word const ty) { int len, width, i, w, h, x, y, rx, ry, o; @@ -3563,7 +3556,7 @@ do_ps_text(struct canvas * const canvasP, for (i = 0; i < len; i++) { if (!(glyph = tfont->glyph[str[i]])) continue; - + y = ty - glyph->height - glyph->y; for (h = 0; h < glyph->height; h++) { for (w = 0; w < glyph->width; w++) { @@ -3592,7 +3585,7 @@ do_ps_text(struct canvas * const canvasP, static void do_text(struct canvas * const canvasP, blitList * const blitListP, - Word const startx, + Word const startx, Word const starty) { if (blitListP) @@ -3615,11 +3608,11 @@ do_text(struct canvas * const canvasP, int dy; int h; for (h = 0, dy = y - glyph->height - glyph->y; - h < glyph->height; + h < glyph->height; ++h, ++dy) { int w; for (w = 0; w < glyph->width; ++w) { - struct RGBColor * const colorP = + struct RGBColor * const colorP = glyph->bmap[h * glyph->width + w] ? &black : &white; draw_pixel(canvasP, @@ -3710,7 +3703,7 @@ DHDVText(struct canvas * const canvasP, static void directBits(struct canvas * const canvasP, blitList * const blitListP, - unsigned int const pictVersion, + unsigned int const pictVersion, bool const skipRegion) { struct pixMap p; @@ -3718,13 +3711,11 @@ directBits(struct canvas * const canvasP, struct Rect dstRect; struct raster raster; Word mode; - unsigned int rectWidth; /* skip fake len, and fake EOF */ skip(4); /* Ptr baseAddr == 0x000000ff */ readWord(); /* version */ readRect(&p.Bounds); - rectWidth = p.Bounds.right - p.Bounds.left; p.packType = readWord(); p.packSize = readLong(); p.hRes = readLong(); @@ -3750,7 +3741,7 @@ directBits(struct canvas * const canvasP, if (verbose) pm_message("transfer mode = %s", const_name(transfer_name, mode)); - if (skipRegion) + if (skipRegion) skip_poly_or_region(canvasP, blitListP, pictVersion); unpackbits(ifp, &p.Bounds, 0, p.pixelSize, &raster); @@ -3793,8 +3784,8 @@ DirectBitsRgn(struct canvas * const canvasP, static void do_pixmap(struct canvas * const canvasP, blitList * const blitListP, - int const version, - Word const rowBytes, + int const version, + Word const rowBytes, int const is_region) { /*---------------------------------------------------------------------------- Do a paletted image. @@ -3850,8 +3841,8 @@ static void do_bitmap(FILE * const ifP, struct canvas * const canvasP, blitList * const blitListP, - int const version, - int const rowBytes, + int const version, + int const rowBytes, int const is_region) { /*---------------------------------------------------------------------------- Do a bitmap. That's one bit per pixel, 0 is white, 1 is black. @@ -3866,7 +3857,7 @@ do_bitmap(FILE * const ifP, /* This raster contains padding on the right to make a multiple of 16 pixels per row. */ - static struct RGBColor color_table[] = { + static struct RGBColor color_table[] = { {65535L, 65535L, 65535L}, {0, 0, 0} }; readRect(&Bounds); @@ -3921,7 +3912,7 @@ static void BitsRegion(struct canvas * const canvasP, blitList * const blitListP, int const version) { - + Word rowBytesWord; bool pixMap; unsigned int rowBytes; @@ -3978,18 +3969,18 @@ static struct opdef const optable[] = { /* 0x1f */ { "OpColor", NA, OpColor, "RGB OpColor for arithmetic modes" }, /* 0x20 */ { "Line", 8, Line, "pnLoc (point), newPt (point)" }, /* 0x21 */ { "LineFrom", 4, LineFrom, "newPt (point)" }, -/* 0x22 */ { "ShortLine", 6, ShortLine, +/* 0x22 */ { "ShortLine", 6, ShortLine, "pnLoc (point, dh, dv (-128 .. 127))" }, /* 0x23 */ { "ShortLineFrom", 2, ShortLineFrom, "dh, dv (-128 .. 127)" }, /* 0x24 */ RESERVED_OP(WORD_LEN), /* 0x25 */ RESERVED_OP(WORD_LEN), /* 0x26 */ RESERVED_OP(WORD_LEN), /* 0x27 */ RESERVED_OP(WORD_LEN), -/* 0x28 */ { "LongText", NA, LongText, +/* 0x28 */ { "LongText", NA, LongText, "txLoc (point), count (0..255), text" }, /* 0x29 */ { "DHText", NA, DHText, "dh (0..255), count (0..255), text" }, /* 0x2a */ { "DVText", NA, DVText, "dv (0..255), count (0..255), text" }, -/* 0x2b */ { "DHDVText", NA, DHDVText, +/* 0x2b */ { "DHDVText", NA, DHDVText, "dh, dv (0..255), count (0..255), text" }, /* 0x2c */ RESERVED_OP(WORD_LEN), /* 0x2d */ RESERVED_OP(WORD_LEN), @@ -4101,23 +4092,23 @@ static struct opdef const optable[] = { /* 0x97 */ RESERVED_OP(WORD_LEN), /* 0x98 */ { "PackBitsRect", NA, BitsRect, "packed copybits, rect clipped" }, /* 0x99 */ { "PackBitsRgn", NA, BitsRegion, "packed copybits, rgn clipped" }, -/* 0x9a */ { "DirectBitsRect", NA, DirectBitsRect, +/* 0x9a */ { "DirectBitsRect", NA, DirectBitsRect, "PixMap, srcRect, dstRect, int copymode, PixData" }, -/* 0x9b */ { "DirectBitsRgn", NA, DirectBitsRgn, +/* 0x9b */ { "DirectBitsRgn", NA, DirectBitsRgn, "PixMap, srcRect, dstRect, int copymode, maskRgn, PixData" }, /* 0x9c */ RESERVED_OP(WORD_LEN), /* 0x9d */ RESERVED_OP(WORD_LEN), /* 0x9e */ RESERVED_OP(WORD_LEN), /* 0x9f */ RESERVED_OP(WORD_LEN), /* 0xa0 */ { "ShortComment", 2, ShortComment, "kind (word)" }, -/* 0xa1 */ { "LongComment", NA, LongComment, +/* 0xa1 */ { "LongComment", NA, LongComment, "kind (word), size (word), data" } }; static void -processOpcode(Word const opcode, +processOpcode(Word const opcode, struct canvas * const canvasP, blitList * const blitListP, unsigned int const version) { @@ -4257,7 +4248,7 @@ interpretPict(FILE * const ofP) { while((opcode = get_op(version)) != 0xff) processOpcode(opcode, &canvas, fullres ? &blitList : NULL, version); - + if (fullres) { if (blitList.unblittableText) pm_message("Warning: text is omitted from the output because " @@ -4281,7 +4272,7 @@ loadDefaultFontDir(void) { int rc; rc = stat("fontdir", &statbuf); - + if (rc == 0) load_fontdir("fontdir"); } diff --git a/converter/ppm/pjtoppm.c b/converter/ppm/pjtoppm.c index 7b694fb3..b8b94f74 100644 --- a/converter/ppm/pjtoppm.c +++ b/converter/ppm/pjtoppm.c @@ -11,65 +11,87 @@ */ #include "ppm.h" +#include "pm_c_util.h" #include "mallocvar.h" static char usage[] = "[paintjetfile]"; -static int egetc ARGS((FILE *fp)); + + +static unsigned int +uintProduct(unsigned int const multiplicand, + unsigned int const multiplier) { + + if (UINT_MAX / multiplier < multiplicand) + pm_error("Airthmetic overflow"); + + return multiplicand * multiplier; +} + + + static int -egetc(fp) - FILE *fp; -{ +egetc(FILE * const ifP) { int c; - if ((c = fgetc(fp)) == -1) + + c = fgetc(ifP); + + if (c == -1) pm_error("unexpected end of file"); - return(c); + + return c; } + + int -main(argc, argv) - int argc; - char *argv[]; -{ +main(int argc, const char ** argv) { + int cmd, val; char buffer[BUFSIZ]; int planes = 3, rows = -1, cols = -1; - int r = 0, c = 0, p = 0, i; unsigned char **image = NULL; int *imlen; - FILE *fp = stdin; + FILE * ifP; int mode; int argn; unsigned char bf[3]; - pixel *pixrow; + pixel * pixrow; + int c; + int row; + int plane; + pm_proginit(&argc, argv); - ppm_init(&argc, argv); argn = 1; if (argn != argc) - fp = pm_openr(argv[argn++]); + ifP = pm_openr(argv[argn++]); else - fp = stdin; + ifP = stdin; if (argn != argc) pm_usage(usage); - while ((c = fgetc(fp)) != -1) { + row = 0; /* initial value */ + plane = 0; /* initial value */ + + while ((c = fgetc(ifP)) != -1) { if (c != '\033') continue; - switch (c = egetc(fp)) { + switch (c = egetc(ifP)) { case 'E': /* reset */ break; - case '*': - cmd = egetc(fp); + case '*': { + unsigned int i; + cmd = egetc(ifP); for (i = 0; i < BUFSIZ; i++) { - if (!isdigit(c = egetc(fp)) && c != '+' && c != '-') + if (!isdigit(c = egetc(ifP)) && c != '+' && c != '-') break; buffer[i] = c; } if (i != 0) { buffer[i] = '\0'; - if (sscanf(buffer, "%d", &val) != 1) + if (sscanf(buffer, "%d", &val) != 1) pm_error("bad value `%s' at <ESC>*%c%c", buffer, cmd, c); } else @@ -100,7 +122,7 @@ main(argc, argv) break; case 'U': /* planes */ planes = val; - if (planes != 3) + if (planes != 3) pm_error("can handle only 3 plane files"); break; case 'A': /* begin raster */ @@ -126,38 +148,33 @@ main(argc, argv) break; case 'V': /* send plane */ case 'W': /* send last plane */ - if (rows == -1 || r >= rows || image == NULL) { - if (rows == -1 || r >= rows) + if (rows == -1 || row >= rows || image == NULL) { + if (rows == -1 || row >= rows) rows += 100; if (image == NULL) { - MALLOCARRAY(image, rows * planes); - MALLOCARRAY(imlen, rows * planes); - } - else { - image = (unsigned char **) - realloc(image, - rows * planes * - sizeof(unsigned char *)); - imlen = (int *) - realloc(imlen, rows * planes * sizeof(int)); + MALLOCARRAY(image, uintProduct(rows, planes)); + MALLOCARRAY(imlen, uintProduct(rows, planes)); + } else { + REALLOCARRAY(image, uintProduct(rows, planes)); + REALLOCARRAY(imlen, uintProduct(rows, planes)); } } if (image == NULL || imlen == NULL) pm_error("out of memory"); - if (p == planes) + if (plane >= planes) pm_error("too many planes"); - cols = cols > val ? cols : val; - imlen[r * planes + p] = val; - MALLOCARRAY(image[r * planes + p], val); - if (image[r * planes + p] == NULL) + cols = MAX(cols, val); + imlen[row * planes + plane] = val; + MALLOCARRAY(image[row * planes + plane], val); + if (image[row * planes + plane] == NULL) pm_error("out of memory"); - if (fread(image[r * planes + p], 1, val, fp) != val) + if (fread(image[row * planes + plane], 1, val, ifP) != val) pm_error("short data"); if (c == 'V') - p++; + ++plane; else { - p = 0; - r++; + plane = 0; + ++row; } break; default: @@ -166,7 +183,7 @@ main(argc, argv) } break; case 'p': /* Position */ - if (p != 0) + if (plane != 0) pm_error("changed position in the middle of " "transferring planes"); switch (c) { @@ -175,15 +192,15 @@ main(argc, argv) break; case 'Y': if (buffer[0] == '+') - val = r + val; + val = row + val; if (buffer[0] == '-') - val = r - val; - for (; val > r; r++) - for (p = 0; p < 3; p++) { - imlen[r * planes + p] = 0; - image[r * planes + p] = NULL; + val = row - val; + for (; val > row; ++row) + for (plane = 0; plane < 3; ++plane) { + imlen[row * planes + plane] = 0; + image[row * planes + plane] = NULL; } - r = val; + row = val; break; default: pm_message("uninmplemented <ESC>*%c%d%c", cmd, val, c); @@ -192,62 +209,80 @@ main(argc, argv) default: pm_message("uninmplemented <ESC>*%c%d%c", cmd, val, c); break; - } - } + } + } /* case */ + } /* switch */ } - pm_close(fp); - rows = r; + pm_close(ifP); + rows = row; if (mode == 1) { - unsigned char *buf; - int newcols = 0; - newcols = 10240; /* It could not be larger that that! */ - cols = 0; - for (r = 0; r < rows; r++) { - if (image[r * planes] == NULL) + int const newcols = 10240; /* It could not be larger that that! */ + unsigned char * buf; + unsigned int row; + + for (row = 0, cols = 0; row < rows; ++row) { + unsigned int plane; + if (image[row * planes] == NULL) continue; - for (p = 0; p < planes; p++) { + for (plane = 0; plane < planes; ++plane) { + unsigned int i; + unsigned int col; MALLOCARRAY(buf, newcols); - if (buf == NULL) + if (buf == NULL) pm_error("out of memory"); - for (i = 0, c = 0; c < imlen[p + r * planes]; c += 2) - for (cmd = image[p + r * planes][c], - val = image[p + r * planes][c+1]; - cmd >= 0 && i < newcols; cmd--, i++) + for (i = 0, col = 0; + col < imlen[plane + row * planes]; + col += 2) + for (cmd = image[plane + row * planes][col], + val = image[plane + row * planes][col+1]; + cmd >= 0 && i < newcols; cmd--, i++) buf[i] = val; - cols = cols > i ? cols : i; - free(image[p + r * planes]); - /* - * This is less than what we have so it realloc should + cols = MAX(cols, i); + free(image[plane + row * planes]); + /* + * This is less than what we have so it realloc should * not return null. Even if it does, tough! We will * lose a line, and probably die on the next line anyway */ - image[p + r * planes] = (unsigned char *) realloc(buf, i); + image[plane + row * planes] = realloc(buf, i); } } cols *= 8; } - - + ppm_writeppminit(stdout, cols, rows, (pixval) 255, 0); pixrow = ppm_allocrow(cols); - for (r = 0; r < rows; r++) { - if (image[r * planes] == NULL) { - for (c = 0; c < cols; c++) - PPM_ASSIGN(pixrow[c], 0, 0, 0); + + for (row = 0; row < rows; ++row) { + if (image[row * planes] == NULL) { + unsigned int col; + for (col = 0; col < cols; ++col) + PPM_ASSIGN(pixrow[col], 0, 0, 0); continue; } - for (cmd = 0, c = 0; c < cols; c += 8, cmd++) - for (i = 0; i < 8 && c + i < cols; i++) { - for (p = 0; p < planes; p++) - if (mode == 0 && cmd >= imlen[r * planes + p]) - bf[p] = 0; - else - bf[p] = (image[r * planes + p][cmd] & - (1 << (7 - i))) ? 255 : 0; - PPM_ASSIGN(pixrow[c + i], bf[0], bf[1], bf[2]); + { + unsigned int col; + unsigned int cmd; + for (cmd = 0, col = 0; col < cols; col += 8, ++cmd) { + unsigned int i; + for (i = 0; i < 8 && col + i < cols; ++i) { + unsigned int plane; + for (plane = 0; plane < planes; ++plane) + if (mode == 0 && cmd >= imlen[row * planes + plane]) + bf[plane] = 0; + else + bf[plane] = (image[row * planes + plane][cmd] & + (1 << (7 - i))) ? 255 : 0; + PPM_ASSIGN(pixrow[col + i], bf[0], bf[1], bf[2]); + } } - ppm_writeppmrow(stdout, pixrow, cols, (pixval) 255, 0); + } + ppm_writeppmrow(stdout, pixrow, cols, 255, 0); } pm_close(stdout); - exit(0); + + return 0; } + + + diff --git a/converter/ppm/ppmtoarbtxt.c b/converter/ppm/ppmtoarbtxt.c index fc8927ce..6d4ed04e 100644 --- a/converter/ppm/ppmtoarbtxt.c +++ b/converter/ppm/ppmtoarbtxt.c @@ -734,15 +734,20 @@ interpretObjType(const char * const typstr) { static SkeletonObject * -newIcSkelFromReplString(const char * const objstr, +newIcSkelFromReplString(const char * const icolorObjstr, SkeletonObjectType const objType) { - +/*---------------------------------------------------------------------------- + A new skeleton for an integer color substitution specifier (class + OBJTYP_ICOLOR) whose replacement string (the stuff between the parentheses + in #(...)) says substitution type 'objType' and the rest of the + replacement string is 'icolorObjstr'. +-----------------------------------------------------------------------------*/ SkeletonObject * retval; unsigned int icolmin, icolmax; char formstr[MAX_OBJ_BUF]; - unsigned int nOdata; + int nOdata; - nOdata = sscanf(objstr, "%*s%s%u%u", formstr, &icolmin, &icolmax); + nOdata = sscanf(icolorObjstr, "%s%u%u", formstr, &icolmin, &icolmax); if (nOdata == 3) retval = newIcolDataObj(objType, formstr, icolmin, icolmax); @@ -758,16 +763,20 @@ newIcSkelFromReplString(const char * const objstr, static SkeletonObject * -newFcSkelFromReplString(const char * const objstr, +newFcSkelFromReplString(const char * const fcolorObjstr, SkeletonObjectType const objType) { - +/*---------------------------------------------------------------------------- + A new skeleton for a floating point color substitution specifier (class + OBJTYP_FCOLOR) whose replacement string (the stuff between the parentheses + in #(...)) says substitution type 'objType' and the rest of the + replacement string is 'fcolorObjstr'. +-----------------------------------------------------------------------------*/ SkeletonObject * retval; double fcolmin, fcolmax; char formstr[MAX_OBJ_BUF]; - unsigned int nOdata; + int nOdata; - nOdata = sscanf(objstr, "%*s%s%lf%lf", formstr, - &fcolmin, &fcolmax); + nOdata = sscanf(fcolorObjstr, "%s%lf%lf", formstr, &fcolmin, &fcolmax); if (nOdata == 3) retval = newFcolDataObj(objType, formstr, fcolmin, fcolmax); @@ -783,12 +792,19 @@ newFcSkelFromReplString(const char * const objstr, static SkeletonObject * -newISkelFromReplString(const char * const objstr, +newISkelFromReplString(const char * const intObjstr, SkeletonObjectType const objType) { - +/*---------------------------------------------------------------------------- + A new skeleton for an integer substitution specifier (class OBJTYP_INT) + whose replacement string (the stuff between the parentheses in #(...)) + says substitution type 'objType' and the rest of the replacement string is + 'intObjstr'. +-----------------------------------------------------------------------------*/ SkeletonObject * retval; char formstr[MAX_OBJ_BUF]; - unsigned int const nOdata = sscanf(objstr, "%*s%s", formstr); + int nOdata; + + nOdata = sscanf(intObjstr, "%s", formstr); if (nOdata == 1) retval = newIdataObj(objType, formstr); @@ -806,7 +822,7 @@ newISkelFromReplString(const char * const objstr, static SkeletonObject * newSkeletonFromReplString(const char * const objstr) { /*---------------------------------------------------------------------------- - Create a skeleton from the replacement string 'objstr' (the stuff + A new skeleton created from the replacement string 'objstr' (the stuff between the parentheses in #(...) ). Return NULL if it isn't a valid replacement string. @@ -821,6 +837,7 @@ newSkeletonFromReplString(const char * const objstr) { SkeletonObject * retval; char typstr[MAX_OBJ_BUF]; + int typlen; SkeletonObjectType objType; int conversionCt; char s1[MAX_OBJ_BUF]; /* Dry read. */ @@ -829,7 +846,8 @@ newSkeletonFromReplString(const char * const objstr) { typstr[0] = '\0'; /* initial value */ - conversionCt = sscanf(objstr, "%s%s%f%f%s", typstr, s1, &f1, &f2, s2); + conversionCt = sscanf(objstr, "%s%n%s%f%f%s", + typstr, &typlen, s1, &f1, &f2, s2); switch (conversionCt) { case 1: case 2: case 4: objType = interpretObjType(typstr); @@ -840,13 +858,13 @@ newSkeletonFromReplString(const char * const objstr) { switch (objClass(objType)) { case OBJTYP_ICOLOR: - retval = newIcSkelFromReplString(objstr, objType); + retval = newIcSkelFromReplString(&objstr[typlen], objType); break; case OBJTYP_FCOLOR: - retval = newFcSkelFromReplString(objstr, objType); + retval = newFcSkelFromReplString(&objstr[typlen], objType); break; case OBJTYP_INT: - retval = newISkelFromReplString(objstr, objType); + retval = newISkelFromReplString(&objstr[typlen], objType); break; case OBJTYP_BDATA: retval = NULL; diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c index 6d65d744..f89cec8d 100644 --- a/converter/ppm/ppmtobmp.c +++ b/converter/ppm/ppmtobmp.c @@ -13,6 +13,7 @@ * */ +#define _DEFAULT_SOURCE 1 /* New name for SVID & BSD source defines */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ @@ -29,9 +30,9 @@ #define MAXCOLORS 256 -enum colortype {TRUECOLOR, PALETTE}; +typedef enum {TRUECOLOR, PALETTE} Colortype; -struct rgb { +struct Rgb { unsigned char red; unsigned char grn; unsigned char blu; @@ -50,13 +51,13 @@ typedef struct { colorhash_table cht; /* Indices in the following array are the same as in 'cht', above. */ - struct rgb bmpMap[MAXCOLORS]; -} colorMap; + struct Rgb bmpMap[MAXCOLORS]; +} ColorMap; static void -freeColorMap(const colorMap * const colorMapP) { +freeColorMap(const ColorMap * const colorMapP) { if (colorMapP->cht) ppm_freecolorhash(colorMapP->cht); @@ -68,11 +69,11 @@ struct CmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. */ - const char * inputFilename; - int class; /* C_WIN or C_OS2 */ - unsigned int bppSpec; - unsigned int bpp; - const char * mapfile; + const char * inputFilename; + enum bmpClass class; + unsigned int bppSpec; + unsigned int bpp; + const char * mapfile; }; @@ -93,15 +94,15 @@ parseCommandLine(int argc, const char ** argv, unsigned int windowsSpec, os2Spec, mapfileSpec; unsigned int option_def_index; - + MALLOCARRAY(option_def, 100); option_def_index = 0; /* incremented by OPTENTRY */ OPTENT3('w', "windows", OPT_FLAG, NULL, &windowsSpec, 0); OPTENT3('o', "os2", OPT_FLAG, NULL, &os2Spec, 0); - OPTENT3(0, "bpp", OPT_UINT, &cmdlineP->bpp, + OPTENT3(0, "bpp", OPT_UINT, &cmdlineP->bpp, &cmdlineP->bppSpec, 0); - OPTENT3(0, "mapfile", OPT_STRING, &cmdlineP->mapfile, + OPTENT3(0, "mapfile", OPT_STRING, &cmdlineP->mapfile, &mapfileSpec, 0); opt.opt_table = option_def; @@ -110,18 +111,18 @@ parseCommandLine(int argc, const char ** argv, pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); - if (windowsSpec && os2Spec) + if (windowsSpec && os2Spec) pm_error("Can't specify both -windows and -os2 options."); - else if (windowsSpec) - cmdlineP->class = C_WIN; + else if (windowsSpec) + cmdlineP->class = BMP_C_WIN_V1; else if (os2Spec) - cmdlineP->class = C_OS2; - else - cmdlineP->class = C_WIN; + cmdlineP->class = BMP_C_OS2_1x; + else + cmdlineP->class = BMP_C_WIN_V1; if (cmdlineP->bppSpec) { - if (cmdlineP->bpp != 1 && cmdlineP->bpp != 4 && + if (cmdlineP->bpp != 1 && cmdlineP->bpp != 4 && cmdlineP->bpp != 8 && cmdlineP->bpp != 24) pm_error("Invalid -bpp value specified: %u. The only values valid " "in the BMP format are 1, 4, 8, and 24 bits per pixel", @@ -135,7 +136,7 @@ parseCommandLine(int argc, const char ** argv, cmdlineP->inputFilename = pm_strdup("-"); /* he wants stdin */ else if (argc - 1 == 1) cmdlineP->inputFilename = pm_strdup(argv[1]); - else + else pm_error("Too many arguments. The only argument accepted " "is the input file specificaton"); @@ -153,8 +154,8 @@ freeCommandLine(struct CmdlineInfo const cmdline) { static void -PutByte(FILE * const fp, unsigned char const v) { - if (putc(v, fp) == EOF) +putByte(FILE * const fp, unsigned char const v) { + if (putc(v, fp) == EOF) pm_error("Write of a byte to a file failed."); /* Note: a Solaris/SPARC user reported on 2003.09.29 that the above @@ -168,139 +169,166 @@ PutByte(FILE * const fp, unsigned char const v) { static void -PutShort(FILE * const fp, short const v) { - if (pm_writelittleshort(fp, v) == -1) +putShort(FILE * const fp, short const v) { + if (pm_writelittleshort(fp, v) == -1) pm_error("Write of a halfword to a file failed."); } static void -PutLong(FILE * const fp, long const v) { +putLong(FILE * const fp, long const v) { if (pm_writelittlelong(fp, v) == -1) pm_error("Write of a word to a file failed."); } - -/* - * BMP writing - */ +/*---------------------------------------------------------------------------- + BMP writing +-----------------------------------------------------------------------------*/ static unsigned int -BMPwritefileheader(FILE * const fp, +bmpWriteFileHeader(FILE * const fp, unsigned int const cbSize, unsigned int const offBits) { /*---------------------------------------------------------------------------- Return the number of bytes written. -----------------------------------------------------------------------------*/ - PutByte(fp, 'B'); - PutByte(fp, 'M'); + putByte(fp, 'B'); + putByte(fp, 'M'); /* cbSize */ - PutLong(fp, cbSize); - + putLong(fp, cbSize); + /* xHotSpot */ - PutShort(fp, 0); - + putShort(fp, 0); + /* yHotSpot */ - PutShort(fp, 0); - + putShort(fp, 0); + /* offBits */ - PutLong(fp, offBits); - + putLong(fp, offBits); + + assert(BMPlenfileheader() == 14); + return 14; } -static int -BMPwriteinfoheader(FILE * const fp, - int const class, - unsigned long const bitcount, - unsigned long const x, +static unsigned int +bmpWriteInfoHeader(FILE * const fp, + enum bmpClass const class, + unsigned long const bitcount, + unsigned long const x, unsigned long const y) { /*---------------------------------------------------------------------------- + Write the INFO header. + Return the number of bytes written. ----------------------------------------------------------------------------*/ unsigned int cbFix; switch (class) { - case C_WIN: { - cbFix = 40; - PutLong(fp, cbFix); - - PutLong(fp, x); /* cx */ - PutLong(fp, y); /* cy */ - PutShort(fp, 1); /* cPlanes */ - PutShort(fp, bitcount); /* cBitCount */ + case BMP_C_WIN_V1: + case BMP_C_WIN_V2: + case BMP_C_WIN_V3: + case BMP_C_WIN_V4: + case BMP_C_WIN_V5: + { + cbFix = BMP_HDRLEN_WIN_V1; + putLong(fp, cbFix); + + putLong(fp, x); /* cx */ + putLong(fp, y); /* cy */ + putShort(fp, 1); /* cPlanes */ + putShort(fp, bitcount); /* cBitCount */ /* * We've written 16 bytes so far, need to write 24 more * for the required total of 40. */ - PutLong(fp, 0); /* Compression */ - PutLong(fp, 0); /* ImageSize */ - PutLong(fp, 0); /* XpixelsPerMeter */ - PutLong(fp, 0); /* YpixelsPerMeter */ - PutLong(fp, 0); /* ColorsUsed */ - PutLong(fp, 0); /* ColorsImportant */ + putLong(fp, 0); /* Compression */ + putLong(fp, 0); /* ImageSize */ + putLong(fp, 0); /* XpixelsPerMeter */ + putLong(fp, 0); /* YpixelsPerMeter */ + putLong(fp, 0); /* ColorsUsed */ + putLong(fp, 0); /* ColorsImportant */ + + assert(BMP_HDRLEN_WIN_V1 == 40); /* We wrote 40 bytes */ + + if (class != BMP_C_WIN_V1) { + /* Invalid call to this function - we don't know how to write + these header extensions. + */ + assert(false); + } } break; - case C_OS2: { - cbFix = 12; - PutLong(fp, cbFix); - - PutShort(fp, x); /* cx */ - PutShort(fp, y); /* cy */ - PutShort(fp, 1); /* cPlanes */ - PutShort(fp, bitcount); /* cBitCount */ + case BMP_C_OS2_1x: { + cbFix = BMP_HDRLEN_OS2_1x; + putLong(fp, cbFix); + + putShort(fp, x); /* cx */ + putShort(fp, y); /* cy */ + putShort(fp, 1); /* cPlanes */ + putShort(fp, bitcount); /* cBitCount */ + + assert(BMP_HDRLEN_OS2_1x == 12); /* We wrote 12 bytes */ } break; - default: - pm_error(er_internal, "BMPwriteinfoheader"); + case BMP_C_OS2_2x: + /* Invalid call to this function */ + assert(false); + break; } - return cbFix; } -static int -BMPwriteRgb(FILE * const fp, - int const class, - pixval const R, - pixval const G, - pixval const B) { +static unsigned int +bmpWriteRgb(FILE * const fp, + enum bmpClass const class, + pixval const R, + pixval const G, + pixval const B) { /*---------------------------------------------------------------------------- Return the number of bytes written. -----------------------------------------------------------------------------*/ + unsigned int retval; + switch (class) { - case C_WIN: - PutByte(fp, B); - PutByte(fp, G); - PutByte(fp, R); - PutByte(fp, 0); - return 4; - case C_OS2: - PutByte(fp, B); - PutByte(fp, G); - PutByte(fp, R); - return 3; - default: - pm_error(er_internal, "BMPwriteRgb"); - return -1; /* avoid compiler warning. */ + case BMP_C_WIN_V1: + case BMP_C_WIN_V2: + case BMP_C_WIN_V3: + case BMP_C_WIN_V4: + case BMP_C_WIN_V5: + putByte(fp, B); + putByte(fp, G); + putByte(fp, R); + putByte(fp, 0); + retval = 4; + break; + case BMP_C_OS2_1x: + case BMP_C_OS2_2x: + putByte(fp, B); + putByte(fp, G); + putByte(fp, R); + retval = 3; + break; } + return retval; } -static int -BMPwriteColormap(FILE * const ifP, - int const class, +static unsigned int +bmpWriteColormap(FILE * const ifP, + enum bmpClass const class, int const bpp, - const colorMap * const colorMapP) { + const ColorMap * const colorMapP) { /*---------------------------------------------------------------------------- Return the number of bytes written. -----------------------------------------------------------------------------*/ @@ -314,12 +342,12 @@ BMPwriteColormap(FILE * const ifP, nbyte = 0; for (i = 0; i < colorMapP->count; ++i) { - const struct rgb * const mapEntryP = &colorMapP->bmpMap[i]; - nbyte += BMPwriteRgb(ifP, class, + const struct Rgb * const mapEntryP = &colorMapP->bmpMap[i]; + nbyte += bmpWriteRgb(ifP, class, mapEntryP->red, mapEntryP->grn, mapEntryP->blu); } for (; i < ncolors; ++i) - nbyte += BMPwriteRgb(ifP, class, 0, 0, 0); + nbyte += bmpWriteRgb(ifP, class, 0, 0, 0); return nbyte; } @@ -345,10 +373,10 @@ lookupColor(colorhash_table const cht, static void -bmpWriteRow_palette(FILE * const fp, - const pixel * const row, +bmpWriteRow_palette(FILE * const fp, + const pixel * const row, unsigned int const cols, - unsigned short const bpp, + unsigned short const bpp, colorhash_table const cht, unsigned int * const nBytesP) { /*---------------------------------------------------------------------------- @@ -357,7 +385,7 @@ bmpWriteRow_palette(FILE * const fp, Return the number of bytes written as *nBytesP. -----------------------------------------------------------------------------*/ BITSTREAM b; - + b = pm_bitinit(fp, "w"); if (b == NULL) pm_error("Failed to initialize output file for output"); @@ -365,9 +393,9 @@ bmpWriteRow_palette(FILE * const fp, int rc; unsigned int nbyte; unsigned int col; - + nbyte = 0; /* initial value */ - + for (col = 0; col < cols; ++col) { unsigned int colorIndex; int rc; @@ -385,10 +413,10 @@ bmpWriteRow_palette(FILE * const fp, rc = pm_bitfini(b); nbyte += rc; - + /* Make sure we write a multiple of 4 bytes. */ while (nbyte % 4 != 0) { - PutByte(fp, 0); + putByte(fp, 0); ++nbyte; } *nBytesP = nbyte; @@ -398,13 +426,13 @@ bmpWriteRow_palette(FILE * const fp, static void -bmpWriteRow_truecolor(FILE * const fp, - const pixel * const row, +bmpWriteRow_truecolor(FILE * const fp, + const pixel * const row, unsigned long const cols, pixval const maxval, unsigned int * const nBytesP) { /*---------------------------------------------------------------------------- - Write a row of a truecolor BMP image to the file 'fp'. The row is + Write a row of a truecolor BMP image to the file 'fp'. The row is 'row', which is 'cols' columns long. @@ -413,20 +441,20 @@ bmpWriteRow_truecolor(FILE * const fp, /* This works only for 24 bits per pixel. To implement this for the general case (which is only hypothetical -- this program doesn't write any truecolor images except 24 bit and apparently no one - else does either), you would move this function into + else does either), you would move this function into BMPwriterow_palette, which writes arbitrary bit strings. But that would be a lot slower and less robust. */ int nbyte; /* Number of bytes we have written to file so far */ - int col; - + int col; + nbyte = 0; /* initial value */ for (col = 0; col < cols; ++col) { /* We scale to the BMP maxval, which is always 255. */ - PutByte(fp, PPM_GETB(row[col]) * 255 / maxval); - PutByte(fp, PPM_GETG(row[col]) * 255 / maxval); - PutByte(fp, PPM_GETR(row[col]) * 255 / maxval); + putByte(fp, PPM_GETB(row[col]) * 255 / maxval); + putByte(fp, PPM_GETG(row[col]) * 255 / maxval); + putByte(fp, PPM_GETR(row[col]) * 255 / maxval); nbyte += 3; } @@ -434,25 +462,27 @@ bmpWriteRow_truecolor(FILE * const fp, * Make sure we write a multiple of 4 bytes. */ while (nbyte % 4) { - PutByte(fp, 0); + putByte(fp, 0); ++nbyte; } - + *nBytesP = nbyte; } -static int -BMPwritebits(FILE * const fp, - unsigned long const cols, - unsigned long const rows, - enum colortype const colortype, - unsigned short const cBitCount, - const pixel ** const pixels, - pixval const maxval, - colorhash_table const cht) { +static unsigned int +bmpWriteRaster(FILE * const fp, + unsigned long const cols, + unsigned long const rows, + Colortype const colortype, + unsigned short const cBitCount, + const pixel ** const pixels, + pixval const maxval, + colorhash_table const cht) { /*---------------------------------------------------------------------------- + Write the raster. + Return the number of bytes written. -----------------------------------------------------------------------------*/ unsigned int nbyte; @@ -469,9 +499,9 @@ BMPwritebits(FILE * const fp, unsigned int nBytesThisRow; if (colortype == PALETTE) - bmpWriteRow_palette(fp, pixels[row], cols, + bmpWriteRow_palette(fp, pixels[row], cols, cBitCount, cht, &nBytesThisRow); - else + else bmpWriteRow_truecolor(fp, pixels[row], cols, maxval, &nBytesThisRow); @@ -486,15 +516,15 @@ BMPwritebits(FILE * const fp, static void -bmpEncode(FILE * const ifP, - int const class, - enum colortype const colortype, +bmpEncode(FILE * const ifP, + enum bmpClass const class, + Colortype const colortype, unsigned int const bpp, - int const x, - int const y, - const pixel ** const pixels, + int const x, + int const y, + const pixel ** const pixels, pixval const maxval, - const colorMap * const colorMapP) { + const ColorMap * const colorMapP) { /*---------------------------------------------------------------------------- Write a BMP file of the given class. -----------------------------------------------------------------------------*/ @@ -509,16 +539,16 @@ bmpEncode(FILE * const ifP, pm_message("Writing %u bits per pixel truecolor (no palette)", bpp); nbyte = 0; /* initial value */ - nbyte += BMPwritefileheader(ifP, cbSize, offbits); - nbyte += BMPwriteinfoheader(ifP, class, bpp, x, y); + nbyte += bmpWriteFileHeader(ifP, cbSize, offbits); + nbyte += bmpWriteInfoHeader(ifP, class, bpp, x, y); if (colortype == PALETTE) - nbyte += BMPwriteColormap(ifP, class, bpp, colorMapP); + nbyte += bmpWriteColormap(ifP, class, bpp, colorMapP); if (nbyte != offbits) pm_error(er_internal, "BmpEncode 1"); - nbyte += BMPwritebits(ifP, x, y, colortype, bpp, pixels, maxval, - colorMapP->cht); + nbyte += bmpWriteRaster(ifP, x, y, colortype, bpp, pixels, maxval, + colorMapP->cht); if (nbyte != cbSize) pm_error(er_internal, "BmpEncode 2"); } @@ -526,7 +556,7 @@ bmpEncode(FILE * const ifP, static void -makeBilevelColorMap(colorMap * const colorMapP) { +makeBilevelColorMap(ColorMap * const colorMapP) { colorMapP->count = 2; colorMapP->cht = NULL; @@ -541,10 +571,10 @@ makeBilevelColorMap(colorMap * const colorMapP) { static void -bmpEncodePbm(FILE * const ifP, - int const class, - int const cols, - int const rows, +bmpEncodePbm(FILE * const ifP, + enum bmpClass const class, + int const cols, + int const rows, unsigned char ** const bitrow) { /*---------------------------------------------------------------------------- Write a bi-level BMP file of the given class. @@ -559,19 +589,19 @@ bmpEncodePbm(FILE * const ifP, unsigned int const packedBytes = adjustedCols / 8; unsigned long nbyte; - colorMap bilevelColorMap; + ColorMap bilevelColorMap; unsigned int row; - + /* colortype == PALETTE */ pm_message("Writing 1 bit per pixel with a black-white palette"); nbyte = 0; /* initial value */ - nbyte += BMPwritefileheader(ifP, cbSize, offbits); - nbyte += BMPwriteinfoheader(ifP, class, 1, cols, rows); + nbyte += bmpWriteFileHeader(ifP, cbSize, offbits); + nbyte += bmpWriteInfoHeader(ifP, class, 1, cols, rows); makeBilevelColorMap(&bilevelColorMap); - nbyte += BMPwriteColormap(ifP, class, 1, &bilevelColorMap); + nbyte += bmpWriteColormap(ifP, class, 1, &bilevelColorMap); if (nbyte != offbits) pm_error(er_internal, "bmpEncodePbm 1"); @@ -583,7 +613,7 @@ bmpEncodePbm(FILE * const ifP, if (bytesWritten != packedBytes){ if (feof(ifP)) pm_error("End of file writing row %u of BMP raster.", row); - else + else pm_error("Error writing BMP raster. Errno=%d (%s)", errno, strerror(errno)); } else @@ -597,7 +627,7 @@ bmpEncodePbm(FILE * const ifP, static void -makeHashFromBmpMap(const struct rgb * const bmpMap, +makeHashFromBmpMap(const struct Rgb * const bmpMap, unsigned int const nColors, colorhash_table * const chtP) { @@ -607,7 +637,7 @@ makeHashFromBmpMap(const struct rgb * const bmpMap, MALLOCARRAY_NOFAIL(chv, nColors); for (i = 0; i < nColors; ++i) { - const struct rgb * const mapEntryP = &bmpMap[i]; + const struct Rgb * const mapEntryP = &bmpMap[i]; PPM_ASSIGN(chv[i].color, mapEntryP->red, mapEntryP->grn, mapEntryP->blu); @@ -629,7 +659,7 @@ minBmpBitsForColorCount(unsigned int const colorCount) { implement and other bpp's have in fact been seen to confuse viewers. There is an extended BMP format that has 16 bpp too, but this program doesn't know how to generate that - (see Bmptopnm.c, though). + (see Bmptopnm.c, though). */ if (minbits == 1) return 1; @@ -646,7 +676,7 @@ minBmpBitsForColorCount(unsigned int const colorCount) { static void getMapFile(const char * const mapFileName, unsigned int * const minimumBppP, - colorMap * const colorMapP) { + ColorMap * const colorMapP) { /*---------------------------------------------------------------------------- Get the color map (palette) for the BMP from file 'mapFileName'. @@ -655,7 +685,6 @@ getMapFile(const char * const mapFileName, Return as *minimumBppP the minimum number of bits per pixel it will take to represent all the colors in the map in the BMP format. -----------------------------------------------------------------------------*/ - FILE * mapFileP; int cols, rows; pixval maxval; @@ -675,12 +704,12 @@ getMapFile(const char * const mapFileName, MAXCOLORS, cols * rows); count = 0; /* initial value */ - + for (row = 0; row < rows; ++row) { unsigned int col; for (col = 0; col < cols; ++col) { pixel const color = pixels[row][col]; - struct rgb * const mapEntryP = &colorMapP->bmpMap[count++]; + struct Rgb * const mapEntryP = &colorMapP->bmpMap[count++]; assert(count <= ARRAY_SIZE(colorMapP->bmpMap)); @@ -703,15 +732,15 @@ getMapFile(const char * const mapFileName, static void -analyzeColors(const pixel ** const pixels, - int const cols, - int const rows, - pixval const maxval, +analyzeColors(const pixel ** const pixels, + int const cols, + int const rows, + pixval const maxval, unsigned int * const minimumBppP, - colorMap * const colorMapP) { + ColorMap * const colorMapP) { /*---------------------------------------------------------------------------- Look at the colors in the image 'pixels' and compute values to use in - representing those colors in a BMP image. + representing those colors in a BMP image. First of all, count the distinct colors. Return as *minimumBppP the minimum number of bits per pixel it will take to represent all @@ -733,7 +762,7 @@ analyzeColors(const pixel ** const pixels, int colorCount; pm_message("analyzing colors..."); - chv = ppm_computecolorhist((pixel**)pixels, cols, rows, MAXCOLORS, + chv = ppm_computecolorhist((pixel**)pixels, cols, rows, MAXCOLORS, &colorCount); colorMapP->count = colorCount; if (chv == NULL) { @@ -751,12 +780,12 @@ analyzeColors(const pixel ** const pixels, * Now scale the maxval to 255 as required by BMP format. */ for (i = 0; i < colorMapP->count; ++i) { - struct rgb * const mapEntryP = &colorMapP->bmpMap[i]; + struct Rgb * const mapEntryP = &colorMapP->bmpMap[i]; mapEntryP->red = (pixval) PPM_GETR(chv[i].color) * 255 / maxval; mapEntryP->grn = (pixval) PPM_GETG(chv[i].color) * 255 / maxval; mapEntryP->blu = (pixval) PPM_GETB(chv[i].color) * 255 / maxval; } - + /* And make a hash table for fast lookup. */ colorMapP->cht = ppm_colorhisttocolorhash(chv, colorMapP->count); ppm_freecolorhist(chv); @@ -769,7 +798,7 @@ static void chooseColortypeBpp(bool const userRequestsBpp, unsigned int const requestedBpp, unsigned int const minimumBpp, - enum colortype * const colortypeP, + Colortype * const colortypeP, unsigned int * const bitsPerPixelP) { /*---------------------------------------------------------------------------- Determine whether the BMP raster should contain RGB values or palette @@ -803,12 +832,12 @@ chooseColortypeBpp(bool const userRequestsBpp, *bitsPerPixelP = requestedBpp; } - assert(*bitsPerPixelP == 1 || - *bitsPerPixelP == 4 || - *bitsPerPixelP == 8 || + assert(*bitsPerPixelP == 1 || + *bitsPerPixelP == 4 || + *bitsPerPixelP == 8 || *bitsPerPixelP == 24); - if (*bitsPerPixelP > 8) + if (*bitsPerPixelP > 8) *colortypeP = TRUECOLOR; else { *colortypeP = PALETTE; @@ -818,13 +847,13 @@ chooseColortypeBpp(bool const userRequestsBpp, static void -doPbm(FILE * const ifP, - unsigned int const cols, - unsigned int const rows, - int const format, - int const class, - FILE * const ofP) { - +doPbm(FILE * const ifP, + unsigned int const cols, + unsigned int const rows, + int const format, + enum bmpClass const class, + FILE * const ofP) { + /* We read the raster directly from the input with pbm_readpbmrow_packed(). The raster format is almost identical, except that BMP specifies rows to be zero-filled to @@ -835,7 +864,7 @@ doPbm(FILE * const ifP, int const adjustedCols = (cols+31) /32 * 32; int const packedBytes = adjustedCols /8; - unsigned char ** bitrow; + unsigned char ** bitrow; unsigned int row; bitrow = pbm_allocarray_packed(adjustedCols, rows); @@ -848,15 +877,15 @@ doPbm(FILE * const ifP, thisRow[packedBytes-2] = 0x00; thisRow[packedBytes-3] = 0x00; thisRow[packedBytes-4] = 0x00; - + pbm_readpbmrow_packed(ifP, thisRow, cols, format); { unsigned int i; - for (i = 0; i < colChars; ++i) + for (i = 0; i < colChars; ++i) thisRow[i] = ~thisRow[i]; /* flip all pixels */ } - /* This may seem unnecessary, because the color palette + /* This may seem unnecessary, because the color palette (RGB[] in bmpEncodePbm) can be inverted for the same effect. However we take this precaution, for there is indication that some BMP viewers may get confused with that. @@ -867,21 +896,21 @@ doPbm(FILE * const ifP, } bmpEncodePbm(ofP, class, cols, rows, bitrow); -} +} static void -doPgmPpm(FILE * const ifP, - unsigned int const cols, - unsigned int const rows, - pixval const maxval, - int const ppmFormat, - int const class, - bool const userRequestsBpp, - unsigned int const requestedBpp, - const char * const mapFileName, - FILE * const ofP) { +doPgmPpm(FILE * const ifP, + unsigned int const cols, + unsigned int const rows, + pixval const maxval, + int const ppmFormat, + enum bmpClass const class, + bool const userRequestsBpp, + unsigned int const requestedBpp, + const char * const mapFileName, + FILE * const ofP) { /* PGM and PPM. We read the input image into a PPM array, scan it to analyze the colors, and convert it to a BMP raster. Logic @@ -889,29 +918,29 @@ doPgmPpm(FILE * const ifP, */ unsigned int minimumBpp; unsigned int bitsPerPixel; - enum colortype colortype; + Colortype colortype; unsigned int row; - + pixel ** pixels; - colorMap colorMap; - + ColorMap colorMap; + pixels = ppm_allocarray(cols, rows); - + for (row = 0; row < rows; ++row) ppm_readppmrow(ifP, pixels[row], cols, maxval, ppmFormat); - + if (mapFileName) getMapFile(mapFileName, &minimumBpp, &colorMap); else - analyzeColors((const pixel**)pixels, cols, rows, maxval, + analyzeColors((const pixel**)pixels, cols, rows, maxval, &minimumBpp, &colorMap); - + chooseColortypeBpp(userRequestsBpp, requestedBpp, minimumBpp, &colortype, &bitsPerPixel); - + bmpEncode(ofP, class, colortype, bitsPerPixel, cols, rows, (const pixel**)pixels, maxval, &colorMap); - + freeColorMap(&colorMap); ppm_freearray(pixels, rows); @@ -935,10 +964,11 @@ main(int argc, parseCommandLine(argc, argv, &cmdline); ifP = pm_openr(cmdline.inputFilename); - + ppm_readppminit(ifP, &cols, &rows, &maxval, &ppmFormat); - - if (PPM_FORMAT_TYPE(ppmFormat) == PBM_TYPE) + + if ((PPM_FORMAT_TYPE(ppmFormat) == PBM_TYPE) && + (!cmdline.bppSpec || cmdline.bpp == 1)) doPbm(ifP, cols, rows, ppmFormat, cmdline.class, stdout); else doPgmPpm(ifP, cols, rows, maxval, ppmFormat, @@ -952,3 +982,6 @@ main(int argc, return 0; } + + + diff --git a/converter/ppm/ppmtogif.c b/converter/ppm/ppmtogif.c index fa7d1dbe..8dd133b5 100644 --- a/converter/ppm/ppmtogif.c +++ b/converter/ppm/ppmtogif.c @@ -10,6 +10,7 @@ - Pamtogif requires a user-specififed map file (-mapfile) to match the input in depth. */ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/ppmtoicr.c b/converter/ppm/ppmtoicr.c index 3c8be421..1720f790 100644 --- a/converter/ppm/ppmtoicr.c +++ b/converter/ppm/ppmtoicr.c @@ -53,35 +53,6 @@ makeIcrColormap(colorhist_vector const chv, static int -bppFromColorCt(unsigned int const colorCt) { - - unsigned int bpp; - - if (colorCt <= 2) - bpp = 1; - else if (colorCt <= 4) - bpp = 2; - else if (colorCt <= 8) - bpp = 3; - else if (colorCt <= 16) - bpp = 4; - else if (colorCt <= 32) - bpp = 5; - else if (colorCt <= 64) - bpp = 6; - else if (colorCt <= 128) - bpp = 7; - else if (colorCt <= 256) - bpp = 8; - else - assert(false); - - return bpp; -} - - - -static int colorIndexAtPosition(unsigned int const x, unsigned int const y, pixel ** const pixels, @@ -166,7 +137,6 @@ main(int argc, const char ** const argv) { int rows, cols; int colorCt; int argn; - unsigned int bitsPerPixel; pixval maxval; colorhist_vector chv; char rgb[CLUTCOLORCT]; @@ -235,8 +205,6 @@ main(int argc, const char ** const argv) { makeIcrColormap(chv, colorCt, maxval, rgb); - bitsPerPixel = bppFromColorCt(colorCt); - /* And make a hash table for fast lookup. */ cht = ppm_colorhisttocolorhash(chv, colorCt); diff --git a/converter/ppm/ppmtomitsu.c b/converter/ppm/ppmtomitsu.c index e59f09b3..5b0b3245 100644 --- a/converter/ppm/ppmtomitsu.c +++ b/converter/ppm/ppmtomitsu.c @@ -274,7 +274,7 @@ static void doLookupTableColors(colorhist_vector const table, unsigned int const nColor, hashinfo * const colorhashtable) { - + unsigned int colval; for (colval = 0; colval < nColor; ++colval) { struct hashinfo * const hashchain = @@ -287,7 +287,7 @@ doLookupTableColors(colorhist_vector const table, datum(PPM_GETR((table[colval]).color)); datum(PPM_GETG((table[colval]).color)); datum(PPM_GETB((table[colval]).color)); - + hashrun = hashchain; /* start at beginning of chain */ if (hashrun->flag == -1) { @@ -323,7 +323,7 @@ doLookupTableGrays(colorhist_vector const table, datum(PPM_GETB((table[colval]).color)); datum(PPM_GETB((table[colval]).color)); datum(PPM_GETB((table[colval]).color)); - + hashrun = hashchain; /* start at beginning of chain */ if (hashrun->flag == -1) { @@ -410,7 +410,7 @@ writeColormapRaster(pixel ** const pixels, struct hashinfo * const hashchain = &colorhashtable[myhash(pixrow[col])]; struct hashinfo * p; - + p = hashchain; while (!PPM_EQUAL((p->color), pixrow[col])) { assert(p->next); @@ -554,7 +554,7 @@ doTiny(FILE * const ifP, int const enlarge, int const copy, struct mediasize const medias) { - + pixel * pixelrow; unsigned char * redrow; unsigned char * grnrow; @@ -653,7 +653,7 @@ main(int argc, char * argv[]) { tiny = TRUE; else pm_usage(usage); - ++argn; + ++argn; } if (argn < argc) { @@ -690,7 +690,7 @@ main(int argc, char * argv[]) { } ppm_readppminit(ifP, &cols, &rows, &maxval, &format); - + if (tiny) { doTiny(ifP, cols, rows, maxval, format, sharpness, enlarge, copy, medias); @@ -707,7 +707,7 @@ main(int argc, char * argv[]) { /* first check wether we can use the lut transfer */ - table = ppm_computecolorhist(pixels, cols, rows, MAXLUTCOL+1, + table = ppm_computecolorhist(pixels, cols, rows, MAXLUTCOL+1, &nColor); if (table) useLookupTable(pixels, table, sharpness, enlarge, copy, medias, diff --git a/converter/ppm/ppmtompeg/HISTORY b/converter/ppm/ppmtompeg/HISTORY index c9f4932a..e6fb86d3 100644 --- a/converter/ppm/ppmtompeg/HISTORY +++ b/converter/ppm/ppmtompeg/HISTORY @@ -1,4 +1,4 @@ -The entire ppmtojpeg directory was adapted by Bryan from the package +The entire ppmtompeg directory was adapted by Bryan from the package mpeg_encode-1.5b-src (subdirectory mpeg_encode) on March 30, 1999. The program was called mpeg_encode in that package. It was dated August 16, 1995 and came from ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/ diff --git a/converter/ppm/ppmtompeg/frame.c b/converter/ppm/ppmtompeg/frame.c index 75b209f8..f91f2cc6 100644 --- a/converter/ppm/ppmtompeg/frame.c +++ b/converter/ppm/ppmtompeg/frame.c @@ -82,8 +82,10 @@ Resize_Array_Width(uint8 ** const inarray, int out_total; uint8 *inptr; uint8 *outptr; +#ifdef DOING_INTERPOLATION uint8 pointA,pointB; - /* double slope,diff; */ + double slope,diff; +#endif for (i = 0; i < in_y; ++i) { /* For each row */ unsigned int j; @@ -105,11 +107,15 @@ Resize_Array_Width(uint8 ** const inarray, --inptr; } } else { +#ifdef DOING_INTERPOLATION pointA = *inptr; +#endif ++inptr; +#ifdef DOING_INTERPOLATION pointB = *inptr; +#endif --inptr; -#if 0 +#ifdef DOING_INTERPOLATION /*Interpolative solution */ slope = ((double)(pointB -pointA))/((double)(out_x)); diff = (((double)(out_total - in_total))); @@ -159,8 +165,10 @@ Resize_Array_Height(uint8 ** const inarray, for(i=0; i < in_x; ++i){ /* for each column */ int in_total; int out_total; +#ifdef DOING_INTERPOLATION uint8 pointA, pointB; double slope, diff; +#endif unsigned int j; int k; @@ -180,15 +188,17 @@ Resize_Array_Height(uint8 ** const inarray, --k; } } else { +#ifdef DOING_INTERPOLATION pointA = inarray[k][i]; - if (k != (in_y -1)) { + if (k != (in_y - 1)) { pointB = inarray[k+1][i]; } else pointB = pointA; /* Interpolative case */ slope = ((double)(pointB -pointA))/(double)(out_y); diff = (double)(out_total - in_total); - /* outarray[j][i] = (inarray[k][i] + (uint8)(slope*diff)); */ + outarray[j][i] = (inarray[k][i] + (uint8)(slope*diff)); +#endif /* Non-Interpolative case */ outarray[j][i] = inarray[k][i]; out_total = out_total + in_y; diff --git a/converter/ppm/ppmtompeg/frametype.c b/converter/ppm/ppmtompeg/frametype.c index b7daacc9..09afa403 100644 --- a/converter/ppm/ppmtompeg/frametype.c +++ b/converter/ppm/ppmtompeg/frametype.c @@ -264,7 +264,7 @@ ComputeFrameTable(unsigned int const numFramesArg) { 'numFrames' == 0 means number of frames is not known at this time. -----------------------------------------------------------------------------*/ int index; - FrameTable *lastI, *lastIP, *firstB, *secondIP; + FrameTable *lastIP, *firstB, *secondIP; FrameTable *ptr; char typ; int table_size; @@ -278,7 +278,6 @@ ComputeFrameTable(unsigned int const numFramesArg) { MALLOCARRAY_NOFAIL(frameTable, 1 + table_size); - lastI = NULL; lastIP = NULL; firstB = NULL; secondIP = NULL; diff --git a/converter/ppm/ppmtompeg/gethostname.c b/converter/ppm/ppmtompeg/gethostname.c index d20af17c..649fff91 100644 --- a/converter/ppm/ppmtompeg/gethostname.c +++ b/converter/ppm/ppmtompeg/gethostname.c @@ -1,3 +1,4 @@ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/ppmtompeg/jrevdct.c b/converter/ppm/ppmtompeg/jrevdct.c index bf9196c4..dd1f9fff 100644 --- a/converter/ppm/ppmtompeg/jrevdct.c +++ b/converter/ppm/ppmtompeg/jrevdct.c @@ -26,7 +26,11 @@ * matrix, perhaps with the difference cases encoded. */ +#define _XOPEN_SOURCE 500 /* get M_PI in math.h */ + #include <memory.h> +#include <math.h> + #include "all.h" #include "dct.h" @@ -1211,35 +1215,29 @@ mpeg_jrevdct_quick(data) */ -/* Here we use math.h to generate constants. Compiler results may - vary a little */ - -#ifndef PI -#ifdef M_PI -#define PI M_PI -#else -#define PI 3.14159265358979323846 -#endif -#endif - /* cosine transform matrix for 8x1 IDCT */ static double itrans_coef[8][8]; -/* initialize DCT coefficient matrix */ -void init_idctref() -{ - int freq, time; - double scale; - - for (freq=0; freq < 8; freq++) - { - scale = (freq == 0) ? sqrt(0.125) : 0.5; - for (time=0; time<8; time++) - itrans_coef[freq][time] = scale*cos((PI/8.0)*freq*(time + 0.5)); - } + +void init_idctref() { +/*---------------------------------------------------------------------------- + initialize DCT coefficient matrix +-----------------------------------------------------------------------------*/ + unsigned int freq; + + for (freq=0; freq < 8; ++freq) { + double const scale = (freq == 0) ? sqrt(0.125) : 0.5; + + unsigned int time; + + for (time = 0; time < 8; ++time) + itrans_coef[freq][time] = scale*cos((M_PI/8.0)*freq*(time + 0.5)); + } } + + /* perform IDCT matrix multiply for 8x8 coefficient block */ void reference_rev_dct(block) diff --git a/converter/ppm/ppmtompeg/mfwddct.c b/converter/ppm/ppmtompeg/mfwddct.c index 75c3a718..9381e51c 100644 --- a/converter/ppm/ppmtompeg/mfwddct.c +++ b/converter/ppm/ppmtompeg/mfwddct.c @@ -15,6 +15,10 @@ * instead of floating point. */ +#define _XOPEN_SOURCE 500 /* get M_PI in math.h */ + +#include <math.h> + #include "all.h" #include "dct.h" @@ -375,26 +379,19 @@ mp_fwd_dct_block2(data, dest) * */ -#ifndef PI -#ifdef M_PI -#define PI M_PI -#else -#define PI 3.14159265358979323846 -#endif -#endif -void init_fdct() -{ - int i, j; - double s; +void init_fdct() { - for (i=0; i<8; i++) - { - s = (i==0) ? sqrt(0.125) : 0.5; + unsigned int i; - for (j=0; j<8; j++) - trans_coef[i][j] = s * cos((PI/8.0)*i*(j+0.5)); - } + for (i = 0; i < 8; ++i) { + double const s = i == 0 ? sqrt(0.125) : 0.5; + + unsigned int j; + + for (j = 0; j < 8; ++j) + trans_coef[i][j] = s * cos((M_PI/8.0) * i * (j+0.5)); + } } diff --git a/converter/ppm/ppmtompeg/mpeg.c b/converter/ppm/ppmtompeg/mpeg.c index 24d337ed..33e1a9f9 100644 --- a/converter/ppm/ppmtompeg/mpeg.c +++ b/converter/ppm/ppmtompeg/mpeg.c @@ -30,6 +30,7 @@ * HEADER FILES * *==============*/ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/ppmtompeg/parallel.c b/converter/ppm/ppmtompeg/parallel.c index 2835c67c..e3bcec1a 100644 --- a/converter/ppm/ppmtompeg/parallel.c +++ b/converter/ppm/ppmtompeg/parallel.c @@ -2149,7 +2149,6 @@ DecodeServer(int const numInputFiles, int otherSock; int decodePortNum; int frameReady; - boolean *ready; int *waitMachine; int *waitPort; int *waitList; @@ -2162,7 +2161,6 @@ DecodeServer(int const numInputFiles, /* should keep list of port numbers to notify when frames become ready */ - ready = (boolean *) calloc(numInputFiles, sizeof(boolean)); waitMachine = (int *) calloc(numInputFiles, sizeof(int)); waitPort = (int *) malloc(numMachines*sizeof(int)); waitList = (int *) calloc(numMachines, sizeof(int)); diff --git a/converter/ppm/ppmtompeg/param.c b/converter/ppm/ppmtompeg/param.c index 45605981..87fdfa6b 100644 --- a/converter/ppm/ppmtompeg/param.c +++ b/converter/ppm/ppmtompeg/param.c @@ -7,6 +7,8 @@ /* COPYRIGHT INFORMATION IS AT THE END OF THIS FILE */ +#define _DEFAULT_SOURCE 1 + /* New name for SVID & BSD source defines */ #define _XOPEN_SOURCE 500 /* This makes sure popen() is in stdio.h. In GNU libc 2.1.3, _POSIX_C_SOURCE = 2 is sufficient, but on AIX 4.3, the higher level diff --git a/converter/ppm/ppmtompeg/ppmtompeg.c b/converter/ppm/ppmtompeg/ppmtompeg.c index cd94db39..837b1b9d 100644 --- a/converter/ppm/ppmtompeg/ppmtompeg.c +++ b/converter/ppm/ppmtompeg/ppmtompeg.c @@ -30,6 +30,7 @@ * HEADER FILES * *==============*/ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ @@ -190,16 +191,17 @@ parseArgs(int const argc, ++idx; } else if (streq(argv[idx], "-child")) { if (idx+7 < argc-1) { - int combinePortNumber; - /* This used to be important information, when the child - notified the combine server. Now the master notifies - the combine server after the child notifies the master - it is done. So this value is unused. - */ cmdlineP->masterHostname = argv[idx+1]; cmdlineP->masterPortNumber = atoi(argv[idx+2]); ioPortNumber = atoi(argv[idx+3]); - combinePortNumber = atoi(argv[idx+4]); + /* + combinePortNumber = atoi(argv[idx+4]); + + This used to be important information, when the child + notified the combine server. Now the master notifies + the combine server after the child notifies the master + it is done. So this value is unused. + */ decodePortNumber = atoi(argv[idx+5]); machineNumber = atoi(argv[idx+6]); remoteIO = atoi(argv[idx+7]); diff --git a/converter/ppm/ppmtompeg/rate.c b/converter/ppm/ppmtompeg/rate.c index c775e055..6ec330cf 100644 --- a/converter/ppm/ppmtompeg/rate.c +++ b/converter/ppm/ppmtompeg/rate.c @@ -389,7 +389,6 @@ targetRateControl(MpegFrame * const frame) { float tempX, tempY, tempZ; int result; int frameType; - const char *strPtr; minimumBits = (bit_rate / (8 * frameRateRounded)); @@ -445,14 +444,18 @@ targetRateControl(MpegFrame * const frame) { Qscale = (mquant > 31 ? 31 : mquant); Qscale = (Qscale < 1 ? 1 : Qscale); - /* Print headers for Frame info */ - strPtr = Frame_header1; - DBG_PRINT(("%s\n",strPtr)); - strPtr = Frame_header2; - DBG_PRINT(("%s\n",strPtr)); - strPtr = Frame_header3; - DBG_PRINT(("%s\n",strPtr)); - +#ifdef HEINOUS_DEBUG_MODE + { + const char * strPtr; + /* Print headers for Frame info */ + strPtr = Frame_header1; + DBG_PRINT(("%s\n",strPtr)); + strPtr = Frame_header2; + DBG_PRINT(("%s\n",strPtr)); + strPtr = Frame_header3; + DBG_PRINT(("%s\n",strPtr)); + } +#endif /* Print Frame info */ sprintf(rc_buffer, "%4d %1c %4d %6d %7d " "%2d %2d %2d %2.2f %6d %4d %3d", @@ -467,10 +470,13 @@ targetRateControl(MpegFrame * const frame) { /* Print headers for Macroblock info */ if (RC_MB_SAMPLE_RATE) { +#ifdef HEINOUS_DEBUG_MODE + const char * strPtr; strPtr = MB_header1; DBG_PRINT(("%s\n",strPtr)); strPtr = MB_header2; DBG_PRINT(("%s\n",strPtr)); +#endif } } @@ -519,7 +525,6 @@ void updateRateControl(int const type) { int totalBits, frameComplexity, pctAllocUsed, pctGOPUsed; float avgQuant; - const char *strPtr; totalBits = rc_totalFrameBits; avgQuant = ((float) rc_totalQuant / (float) rc_numBlocks); @@ -559,15 +564,18 @@ updateRateControl(int const type) { break; } - - /* Print Frame info */ - strPtr = Frame_trailer1; - DBG_PRINT(("%s\n",strPtr)); - strPtr = Frame_trailer2; - DBG_PRINT(("%s\n",strPtr)); - strPtr = Frame_trailer3; - DBG_PRINT(("%s\n",strPtr)); - +#ifdef HEINOUS_DEBUG_MODE + { + /* Print Frame info */ + const char * strPtr; + strPtr = Frame_trailer1; + DBG_PRINT(("%s\n",strPtr)); + strPtr = Frame_trailer2; + DBG_PRINT(("%s\n",strPtr)); + strPtr = Frame_trailer3; + DBG_PRINT(("%s\n",strPtr)); + } +#endif sprintf(rc_buffer, "%6d %2.2f %6d %3d %2.2f %7d " "%3d %7d %3d %6d %6d", totalBits, avgQuant, frameComplexity, avg_act, N_act, diff --git a/converter/ppm/ppmtompeg/readframe.c b/converter/ppm/ppmtompeg/readframe.c index 23752706..2a359b2f 100644 --- a/converter/ppm/ppmtompeg/readframe.c +++ b/converter/ppm/ppmtompeg/readframe.c @@ -17,6 +17,7 @@ * HEADER FILES * *==============*/ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _BSD_SOURCE /* Make sure popen() is in stdio.h */ #include "all.h" #include <time.h> diff --git a/converter/ppm/ppmtompeg/specifics.c b/converter/ppm/ppmtompeg/specifics.c index fb5e3649..1a1fda44 100644 --- a/converter/ppm/ppmtompeg/specifics.c +++ b/converter/ppm/ppmtompeg/specifics.c @@ -36,6 +36,7 @@ * HEADER FILES * *==============*/ +#include "netpbm/mallocvar.h" #include "all.h" #include "mtypes.h" #include "frames.h" @@ -239,7 +240,6 @@ FILE *fp; FrameSpecList *current, *new; char typ; int fnum,snum, bnum, qs, newqs; - int num_scanned; fsl = MakeFslEntry(); current = fsl; @@ -274,7 +274,7 @@ FILE *fp; break; case 'B': lp += 6; - num_scanned = sscanf(lp, "%d %d", &bnum, &newqs); + sscanf(lp, "%d %d", &bnum, &newqs); if (qs == newqs) break; qs = newqs; AddBs(current, bnum, FALSE, qs); @@ -289,116 +289,140 @@ FILE *fp; } -/* Version 2 */ -void Parse_Specifics_File_v2(fp) -FILE *fp; -{ - char line[1024], *lp; - FrameSpecList *current, *new; - char typ; - int fnum, snum, bnum, qs, newqs; - int num_scanned, fx=0, fy=0, sx=0, sy=0; - char kind[100]; - Block_Specifics *new_blk; - boolean relative; - fsl = MakeFslEntry(); - current = fsl; - while ((fgets(line,1023,fp))!=NULL) { - lp = &line[0]; - while ((*lp == ' ') || (*lp == '\t')) lp++; - if (( *lp == '#' ) || (*lp=='\n')) { - continue; +void +Parse_Specifics_File_v2(FILE * const fP) { +/*---------------------------------------------------------------------------- + Parse Version 2 specific file. +-----------------------------------------------------------------------------*/ + char line[1024]; + FrameSpecList * current; + int qs; + int numScanned; + int fx, fy, sx, sy; + char kind[100]; + Block_Specifics *new_blk; + boolean relative; + + fx = fy = sx = sy = 0; /* initial value */ + + fsl = MakeFslEntry(); + current = fsl; + + while ((fgets(line,1023, fP))!=NULL) { + const char * lp; + + lp = &line[0]; /* initial value */ + + while ((*lp == ' ') || (*lp == '\t')) + ++lp; + if (*lp == '#' || *lp == '\n') { + /* comment or blank line */ + } else { + switch (my_upper(*lp)) { + case 'F': { + char typ; + FrameSpecList * new; + int fnum; + + lp += 6; + sscanf(lp,"%d %c %d", &fnum, &typ, &qs); + new = MakeFslEntry(); + if (current->framenum != -1) { + current->next = new; + current = new; + } + current->framenum = fnum; + current->frametype = CvtType(typ); + if (qs <= 0) + qs = -1; + current->qscale = qs; + } break; + case 'S': { + int snum; + int newqs; + lp += 6; + sscanf(lp,"%d %d", &snum, &newqs); + if (qs == newqs) + break; + qs = newqs; + AddSlc(current, snum, qs); + } break; + case 'B': { + int bnum; + int newqs; + lp += 6; + numScanned = 0; + bnum = atoi(lp); + SkipToSpace(lp); + while ((*lp != '-') && (*lp != '+') && + ((*lp < '0') || (*lp > '9'))) + ++lp; + relative = (*lp == '-' || *lp == '+'); + newqs = atoi(lp); + SkipToSpace(lp); + if (EndString(lp)) { + numScanned = 2; + } else { + numScanned = + 2 + sscanf(lp, "%s %d %d %d %d", + kind, &fx, &fy, &sx, &sy); + } + + qs = newqs; + new_blk = AddBs(current, bnum, relative, qs); + if (numScanned > 2) { + BlockMV * tmp; + + MALLOCVAR(tmp); + + switch (numScanned) { + case 7: + tmp->typ = TYP_BOTH; + tmp->fx = fx; + tmp->fy = fy; + tmp->bx = sx; + tmp->by = sy; + new_blk->mv = tmp; + break; + case 3: + tmp->typ = TYP_SKIP; + new_blk->mv = tmp; + break; + case 5: + if (my_upper(kind[0]) == 'B') { + tmp->typ = TYP_BACK; + tmp->bx = fx; + tmp->by = fy; + } else { + tmp->typ = TYP_FORW; + tmp->fx = fx; + tmp->fy = fy; + } + new_blk->mv = tmp; + break; + default: + fprintf(stderr, + "Bug in specifics file! " + "Skipping short/long entry: %s\n",line); + break; + } + } else + new_blk->mv = NULL; + + } break; + case 'V': + fprintf(stderr, + "Cannot specify version twice! Taking first (%d).\n", + version); + break; + default: + printf("What? *%s*\n",line); + break; + } + } } - - switch (my_upper(*lp)) { - case 'F': - lp += 6; - sscanf(lp,"%d %c %d", &fnum, &typ, &qs); - new = MakeFslEntry(); - if (current->framenum != -1) { - current->next = new; - current = new; - } - current->framenum = fnum; - current->frametype = CvtType(typ); - if (qs <= 0) qs = -1; - current->qscale = qs; - break; - case 'S': - lp += 6; - sscanf(lp,"%d %d", &snum, &newqs); - if (qs == newqs) break; - qs = newqs; - AddSlc(current, snum, qs); - break; - case 'B': - lp += 6; - num_scanned = 0; - bnum = atoi(lp); - SkipToSpace(lp); - while ((*lp != '-') && (*lp != '+') && - ((*lp < '0') || (*lp > '9'))) lp++; - relative = ((*lp == '-') || (*lp == '+')); - newqs = atoi(lp); - SkipToSpace(lp); - if (EndString(lp)) { - num_scanned = 2; - } else { - num_scanned = 2+sscanf(lp, "%s %d %d %d %d", kind, &fx, &fy, &sx, &sy); - } - - qs = newqs; - new_blk = AddBs(current, bnum, relative, qs); - if (num_scanned > 2) { - BlockMV *tmp; - tmp = (BlockMV *) malloc(sizeof(BlockMV)); - switch (num_scanned) { - case 7: - tmp->typ = TYP_BOTH; - tmp->fx = fx; - tmp->fy = fy; - tmp->bx = sx; - tmp->by = sy; - new_blk->mv = tmp; - break; - case 3: - tmp->typ = TYP_SKIP; - new_blk->mv = tmp; - break; - case 5: - if (my_upper(kind[0]) == 'B') { - tmp->typ = TYP_BACK; - tmp->bx = fx; - tmp->by = fy; - } else { - tmp->typ = TYP_FORW; - tmp->fx = fx; - tmp->fy = fy; - } - new_blk->mv = tmp; - break; - default: - fprintf(stderr, - "Bug in specifics file! Skipping short/long entry: %s\n",line); - break; - } - } else { - new_blk->mv = (BlockMV *) NULL; - } - - break; - case 'V': - fprintf(stderr, - "Cannot specify version twice! Taking first (%d).\n", - version); - break; - default: - printf("What? *%s*\n",line); - break; - }} - } diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c index 38d99972..0e316928 100644 --- a/converter/ppm/ppmtoxpm.c +++ b/converter/ppm/ppmtoxpm.c @@ -33,6 +33,7 @@ ** (base 93 not base 28 -> saves a lot of space for colorful xpms) */ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/sldtoppm.c b/converter/ppm/sldtoppm.c index 550eed5b..2dc049f8 100644 --- a/converter/ppm/sldtoppm.c +++ b/converter/ppm/sldtoppm.c @@ -50,7 +50,7 @@ struct spoint { /* Screen polygon */ -struct spolygon { +struct spolygon { int npoints, /* Number of points in polygon */ fill; /* Fill type */ struct spoint pt[11]; /* Actual points */ @@ -130,7 +130,7 @@ sli(void) { /* SLIB -- Input byte from slide file */ -static int +static int slib(void) { unsigned char ch; @@ -154,85 +154,127 @@ vscale(int * const px, +static void +upcase(const char * const sname, + char * const uname) { + + unsigned int i; + const char * ip; + + for (i = 0, ip = sname; i < 31; ++i) { + char const ch = *ip++; + + if (ch != EOS) + uname[i] = islower(ch) ? toupper(ch) : ch; + } + uname[i] = EOS; +} + + + +static void +skipBytes(FILE * const fileP, + unsigned int const count) { + + unsigned int i; + + for (i = 0; i < count; ++i) + getc(fileP); +} + + + +static void +scanDirectory(FILE * const slFileP, + long const dirPos, + bool const dirOnly, + const char * const uname, + bool * const foundP) { +/*---------------------------------------------------------------------------- + Scan the directory at the current position in *slFileP, either listing + the directory ('dirOnly' true) or searching for a slide named + 'uname' ('dirOnly' false). + + 'dirPos' is the offset in the file of the directory, i.e. the current + position of *slFileP. + + In the latter case, return as *foundP whether the slide name is there. +-----------------------------------------------------------------------------*/ + bool found; + bool eof; + long pos; + unsigned char libent[36]; + + for (found = false, eof = false, pos = dirPos; !found && !eof; ) { + size_t readCt; + readCt = fread(libent, 36, 1, slFileP); + if (readCt != 1) + eof = true; + else { + /* The directory entry is 32 bytes of NUL-terminated slide name + followed by 4 bytes of offset of the next directory entry. + */ + const char * const slideName = (const char *)(&libent[0]); + if (pm_strnlen(slideName, 32) == 32) + pm_error("Invalid input: slide name field is not " + "nul-terminated"); + else { + if (strlen(slideName) == 0) + eof = true; + else { + pos += 36; + if (dirOnly) { + pm_message(" %s", slideName); + } else if (streq(slideName, uname)) { + long const dpos = + (((((libent[35] << 8) | libent[34]) << 8) | + libent[33]) << 8) | libent[32]; + + if ((slFileP == stdin) || + (fseek(slFileP, dpos, 0) == -1)) { + + skipBytes(slFileP, dpos - pos); + } + found = true; + } + } + } + } + } + *foundP = found; +} + /* SLIDEFIND -- Find a slide in a library or, if DIRONLY is nonzero, print a directory listing of the library. If UCASEN is nonzero, the requested slide name is converted to upper case. */ static void -slidefind(const char * const sname, - bool const dironly, +slidefind(const char * const slideName, + bool const dirOnly, bool const ucasen) { - char uname[32]; - unsigned char libent[36]; - long pos; + char uname[32]; /* upper case translation of 'slideName' */ + char header[32]; /* (supposed) header read from file */ bool found; - bool eof; - if (dironly) + if (dirOnly) pm_message("Slides in library:"); else { - unsigned int i; - const char * ip; - - ip = sname; /* initial value */ - - for (i = 0; i < 31; ++i) { - char const ch = *ip++; - if (ch == EOS) - break; - - { - char const upperCh = - ucasen && islower(ch) ? toupper(ch) : ch; - - uname[i] = upperCh; - } - } - uname[i] = EOS; + upcase(slideName, uname); } - + /* Read slide library header and verify. */ - - if ((fread(libent, 32, 1, slfile) != 1) || - (!strneq((char *)libent, "AutoCAD Slide Library 1.0\015\012\32", 32))) { + + if ((fread(header, 32, 1, slfile) != 1) || + (!STRSEQ(header, "AutoCAD Slide Library 1.0\r\n\32"))) { pm_error("not an AutoCAD slide library file."); } - pos = 32; - - /* Search for a slide with the requested name or list the directory */ - - for (found = false, eof = false; !found && !eof; ) { - size_t readCt; - readCt = fread(libent, 36, 1, slfile); - if (readCt != 1) - eof = true; - else if (strnlen((char *)libent, 32) == 0) - eof = true; - if (!eof) { - pos += 36; - if (dironly) { - pm_message(" %s", libent); - } else if (strneq((char *)libent, uname, 32)) { - long dpos; - - dpos = (((((libent[35] << 8) | libent[34]) << 8) | - libent[33]) << 8) | libent[32]; - - if ((slfile == stdin) || (fseek(slfile, dpos, 0) == -1)) { - dpos -= pos; - - while (dpos-- > 0) - getc(slfile); - } - found = true; - } - } - } - if (!found && !dironly) - pm_error("slide '%s' not in library.", sname); + scanDirectory(slfile, 32, dirOnly, ucasen ? uname : slideName, &found); + + if (!found && !dirOnly) + pm_error("slide '%s' not in library.", slideName); } @@ -295,14 +337,14 @@ flood(struct spolygon * const poly, assert(poly->pt[i].x >= 0 && poly->pt[i].x < pixcols); assert(poly->pt[i].y >= 0 && poly->pt[i].y < pixrows); ppmd_line(pixels, pixcols, pixrows, pixmaxval, - poly->pt[i].x, iydots - poly->pt[i].y, + poly->pt[i].x, iydots - poly->pt[i].y, poly->pt[(i + 1) % poly->npoints].x, iydots - poly->pt[(i + 1) % poly->npoints].y, ppmd_fill_drawproc, handle); } ppmd_fill(pixels, pixcols, pixrows, pixmaxval, handle, PPMD_NULLDRAWPROC, (char *) &rgbcolor); - + ppmd_fill_destroy(handle); } @@ -333,11 +375,11 @@ slider(slvecfn slvec, {"AutoCAD Slide\r\n\32", 86,2, 0,0, 0.0, 0}; int curcolor = 7; /* Current vector color */ pixel rgbcolor; /* Pixel used to clear pixmap */ - + lx = ly = 32000; - + /* Process the header of the slide file. */ - + sdrawkcab = false; /* Initially guess byte order is OK */ fread(slfrof.slh, 17, 1, slfile); fread(&slfrof.sntype, sizeof(char), 1, slfile); @@ -361,12 +403,12 @@ slider(slvecfn slvec, pm_error("incompatible slide file format"); /* Build SDSAR value from long scaled version. */ - + ldsar = 0L; for (i = 3; i >= 0; --i) ldsar = (ldsar << 8) | ubfr[i]; slfrof.sdsar = ((double) ldsar) / 1E7; - + /* Examine the byte order test value. If it's backwards, set the byte-reversal flag and correct all of the values we've read in so far. @@ -380,7 +422,7 @@ slider(slvecfn slvec, rshort(slfrof.shwfill); #undef rshort } - + /* Dump the header if we're blithering. */ if (blither || info) { @@ -455,29 +497,29 @@ slider(slvecfn slvec, } iydots = sysize - 1; } - + if (adjust) { pm_message( "Resized from %dx%d to %dx%d to correct pixel aspect ratio.", slfrof.sxdots + 1, slfrof.sydots + 1, ixdots + 1, iydots + 1); } - + /* Allocate image buffer and clear it to black. */ - + pixels = ppm_allocarray(pixcols = ixdots + 1, pixrows = iydots + 1); PPM_ASSIGN(rgbcolor, 0, 0, 0); ppmd_filledrectangle(pixels, pixcols, pixrows, pixmaxval, 0, 0, pixcols, pixrows, PPMD_NULLDRAWPROC, (char *) &rgbcolor); - + if ((rescale = slfrof.sxdots != ixdots || slfrof.sydots != iydots || slfrof.sdsar != dsar) != 0) { - + /* Rescale all coords. so they'll look (more or less) right on this display. */ - + xfac = (ixdots + 1) * 0x10000L; xfac /= (long) (slfrof.sxdots + 1); yfac = (iydots + 1) * 0x10000L; @@ -490,7 +532,7 @@ slider(slvecfn slvec, } poly.npoints = 0; /* No flood in progress. */ - + while ((cw = sli()) != 0xFC00) { switch (cw & 0xFF00) { case 0xFB00: /* Short vector compressed */ @@ -508,10 +550,10 @@ slider(slvecfn slvec, slx = vec.f.x; /* Save scaled point */ sly = vec.f.y; break; - + case 0xFC00: /* End of file */ break; - + case 0xFD00: /* Flood command */ vec.f.x = sli(); vec.f.y = sli(); @@ -538,7 +580,7 @@ slider(slvecfn slvec, poly.npoints++; } break; - + case 0xFE00: /* Common endpoint compressed */ vec.f.x = lx + extend(cw & 0xFF); vec.f.y = ly + slib(); @@ -553,7 +595,7 @@ slider(slvecfn slvec, slx = vec.f.x; /* Save scaled point */ sly = vec.f.y; break; - + case 0xFF00: /* Change color */ curcolor = cw & 0xFF; break; @@ -661,7 +703,7 @@ main(int argc, } /* If a file name is specified, open it. Otherwise read from - standard input. + standard input. */ if (argn < argc) { @@ -670,24 +712,24 @@ main(int argc, } else { slfile = stdin; } - + if (argn != argc) { /* Extra bogus arguments ? */ pm_usage(usage); } - + /* If we're extracting an item from a slide library, position the input stream to the start of the chosen slide. */ - + if (dironly || slobber) slidefind(slobber, dironly, ucasen); - + if (!dironly) { slider(draw, flood); ppm_writeppm(stdout, pixels, pixcols, pixrows, pixmaxval, 0); } pm_close(slfile); pm_close(stdout); - + return 0; } diff --git a/converter/ppm/tgatoppm.c b/converter/ppm/tgatoppm.c index 95893089..662f741b 100644 --- a/converter/ppm/tgatoppm.c +++ b/converter/ppm/tgatoppm.c @@ -12,6 +12,7 @@ ** implied warranty. */ +#define _DEFAULT_SOURCE 1 /* New name for SVID & BSD source defines */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ @@ -29,7 +30,6 @@ static int mapped, rlencoded; static pixel ColorMap[MAXCOLORS]; static gray AlphaMap[MAXCOLORS]; -static int RLE_count = 0, RLE_flag = 0; struct cmdlineInfo { /* All the information the user supplied in the command line, @@ -78,14 +78,14 @@ parseCommandLine(int argc, char ** argv, cmdlineP->input_filename = "-"; /* he wants stdin */ else if (argc - 1 == 1) cmdlineP->input_filename = strdup(argv[1]); - else + else pm_error("Too many arguments. The only argument accepted " "is the input file specification"); if (alpha_spec && streq(cmdlineP->alpha_filename, "-")) cmdlineP->alpha_stdout = 1; - else + else cmdlineP->alpha_stdout = 0; if (!alpha_spec) @@ -102,89 +102,111 @@ getbyte(FILE * const ifP) { if ( fread( (char*) &c, 1, 1, ifP ) != 1 ) pm_error( "EOF / read error" ); - + return c; } +static int RLE_count = 0, RLE_flag = 0; + + + static void -get_pixel(FILE * const ifP, pixel * dest, int Size, gray *alpha_p) { +handleRun(FILE * const ifP, + bool * const repeatP) { + + if (rlencoded) { + if (RLE_count == 0) { + /* Have to restart run. */ + unsigned char i; + i = getbyte(ifP); + RLE_flag = (i & 0x80); + if (RLE_flag == 0) { + /* Stream of unencoded pixels. */ + RLE_count = i + 1; + } else { + /* Single pixel replicated. */ + RLE_count = i - 127; + } + /* Decrement count & get pixel. */ + --RLE_count; + *repeatP = false; + } else { + /* Have already read count & (at least) first pixel. */ + --RLE_count; + if (RLE_flag != 0) { + /* Replicated pixels. */ + *repeatP = true; + } else + *repeatP = false; + } + } else + *repeatP = false; +} - static pixval Red, Grn, Blu; - static pixval Alpha; - unsigned char j, k; + + +static void +getPixel(FILE * const ifP, + pixel * const dest, + int const size, + gray * const alphaP) { + + static pixval red, grn, blu; + static pixval alpha; static unsigned int l; + unsigned char j, k; + bool repeat; + /* Next pixel is just a repeat (from an encoded run) */ - /* Check if run length encoded. */ - if ( rlencoded ) - { - if ( RLE_count == 0 ) - { /* Have to restart run. */ - unsigned char i; - i = getbyte( ifP ); - RLE_flag = ( i & 0x80 ); - if ( RLE_flag == 0 ) - /* Stream of unencoded pixels. */ - RLE_count = i + 1; - else - /* Single pixel replicated. */ - RLE_count = i - 127; - /* Decrement count & get pixel. */ - --RLE_count; - } - else - { /* Have already read count & (at least) first pixel. */ - --RLE_count; - if ( RLE_flag != 0 ) - /* Replicated pixels. */ - goto PixEncode; - } - } - /* Read appropriate number of bytes, break into RGB. */ - switch ( Size ) - { - case 8: /* Grayscale, read and triplicate. */ - Red = Grn = Blu = l = getbyte( ifP ); - Alpha = 0; - break; - - case 16: /* 5 bits each of red green and blue. */ - case 15: /* Watch byte order. */ - j = getbyte( ifP ); - k = getbyte( ifP ); - l = ( (unsigned int) k << 8 ) + j; - Red = ( k & 0x7C ) >> 2; - Grn = ( ( k & 0x03 ) << 3 ) + ( ( j & 0xE0 ) >> 5 ); - Blu = j & 0x1F; - Alpha = 0; - break; - - case 32: /* 8 bits each of blue, green, red, and alpha */ - case 24: /* 8 bits each of blue, green, and red. */ - Blu = getbyte( ifP ); - Grn = getbyte( ifP ); - Red = getbyte( ifP ); - if ( Size == 32 ) - Alpha = getbyte( ifP ); - else - Alpha = 0; - l = 0; - break; + handleRun(ifP, &repeat); - default: - pm_error( "unknown pixel size (#2) - %d", Size ); - } + if (repeat) { + /* Use red, grn, blu, alpha, and l from prior call to getPixel */ + } else { + /* Read appropriate number of bytes, break into RGB. */ + switch (size) { + case 8: /* Grayscale, read and triplicate. */ + red = grn = blu = l = getbyte(ifP); + alpha = 0; + break; -PixEncode: - if ( mapped ) { + case 16: /* 5 bits each of red green and blue. */ + case 15: /* Watch byte order. */ + j = getbyte(ifP); + k = getbyte(ifP); + l = ((unsigned int)k << 8) + j; + red = (k & 0x7C) >> 2; + grn = ((k & 0x03) << 3) + ((j & 0xE0) >> 5); + blu = j & 0x1F; + alpha = 0; + break; + + case 32: /* 8 bits each of blue, green, red, and alpha */ + case 24: /* 8 bits each of blue, green, and red. */ + blu = getbyte(ifP); + grn = getbyte(ifP); + red = getbyte(ifP); + if (size == 32) + alpha = getbyte(ifP); + else + alpha = 0; + l = 0; + break; + + default: + pm_error("unknown pixel size (#2) - %d", size); + } + } + if (mapped) { *dest = ColorMap[l]; - *alpha_p = AlphaMap[l]; + *alphaP = AlphaMap[l]; } else { - PPM_ASSIGN( *dest, Red, Grn, Blu ); - *alpha_p = Alpha; - } + PPM_ASSIGN(*dest, red, grn, blu); + *alphaP = alpha; } +} @@ -216,7 +238,7 @@ readtga(FILE * const ifP, struct ImageHeader * tgaP) { tgaP->Rsrvd = ( flags & 0x10 ) >> 4; tgaP->OrgBit = ( flags & 0x20 ) >> 5; tgaP->IntrLve = ( flags & 0xc0 ) >> 6; - + if ( tgaP->IdLength != 0 ) fread( junk, 1, (int) tgaP->IdLength, ifP ); } @@ -230,14 +252,14 @@ get_map_entry(FILE * const ifP, pixel * Value, int Size, gray * Alpha) { /* Read appropriate number of bytes, break into rgb & put in map. */ switch ( Size ) - { - case 8: /* Grayscale, read and triplicate. */ + { + case 8: /* Grayscale, read and triplicate. */ r = g = b = getbyte( ifP ); a = 0; break; - - case 16: /* 5 bits each of red green and blue. */ - case 15: /* Watch for byte order. */ + + case 16: /* 5 bits each of red green and blue. */ + case 15: /* Watch for byte order. */ j = getbyte( ifP ); k = getbyte( ifP ); r = ( k & 0x7C ) >> 2; @@ -245,21 +267,21 @@ get_map_entry(FILE * const ifP, pixel * Value, int Size, gray * Alpha) { b = j & 0x1F; a = 0; break; - - case 32: /* 8 bits each of blue, green, red, and alpha */ - case 24: /* 8 bits each of blue green and red. */ + + case 32: /* 8 bits each of blue, green, red, and alpha */ + case 24: /* 8 bits each of blue green and red. */ b = getbyte( ifP ); g = getbyte( ifP ); r = getbyte( ifP ); if ( Size == 32 ) a = getbyte( ifP ); - else + else a = 0; break; - - default: + + default: pm_error( "unknown colormap pixel size (#2) - %d", Size ); - } + } PPM_ASSIGN( *Value, r, g, b ); *Alpha = a; } @@ -325,84 +347,89 @@ main(int argc, char * argv[]) { if (cmdline.alpha_stdout) alpha_file = stdout; - else if (cmdline.alpha_filename == NULL) + else if (cmdline.alpha_filename == NULL) alpha_file = NULL; else alpha_file = pm_openw(cmdline.alpha_filename); - - if (cmdline.alpha_stdout) + + if (cmdline.alpha_stdout) imageout_file = NULL; else imageout_file = stdout; - + /* Read the Targa file header. */ readtga(ifP, &tga_head); - if (cmdline.headerdump) + if (cmdline.headerdump) dumpHeader(tga_head); rows = ((int) tga_head.Height_lo) + ((int) tga_head.Height_hi) * 256; cols = ((int) tga_head.Width_lo) + ((int) tga_head.Width_hi) * 256; switch (tga_head.ImgType) { - case TGA_Map: - case TGA_RGB: - case TGA_Mono: - case TGA_RLEMap: - case TGA_RLERGB: - case TGA_RLEMono: + case TGA_Map: + case TGA_RGB: + case TGA_Mono: + case TGA_RLEMap: + case TGA_RLERGB: + case TGA_RLEMono: + break; + case TGA_CompMap: + case TGA_CompMap4: + pm_error("Targa image type %d (compressed color-mapped data). " + "Cannot handle this format.", tga_head.ImgType); break; - default: + default: pm_error("unknown Targa image type %d", tga_head.ImgType); - } - + } + if (tga_head.ImgType == TGA_Map || tga_head.ImgType == TGA_RLEMap || tga_head.ImgType == TGA_CompMap || tga_head.ImgType == TGA_CompMap4) - { /* Color-mapped image */ + { /* Color-mapped image */ if (tga_head.CoMapType != 1) - pm_error( + pm_error( "mapped image (type %d) with color map type != 1", tga_head.ImgType ); mapped = true; /* Figure maxval from CoSize. */ switch (tga_head.CoSize) { - case 8: - case 24: - case 32: + case 8: + case 24: + case 32: maxval = 255; break; - case 15: - case 16: + case 15: + case 16: maxval = 31; break; - default: - pm_error( - "unknown colormap pixel size - %d", tga_head.CoSize ); - } - } else { + default: + pm_error( + "unknown colormap pixel size - %d", tga_head.CoSize ); + } + } else { /* Not colormap, so figure maxval from PixelSize. */ mapped = false; switch ( tga_head.PixelSize ) { - case 8: - case 24: - case 32: + case 8: + case 24: + case 32: maxval = 255; break; - - case 15: - case 16: + + case 15: + case 16: maxval = 31; break; - - default: + + default: pm_error("unknown pixel size - %d", tga_head.PixelSize); - } - } - + } + } + /* If required, read the color map information. */ if ( tga_head.CoMapType != 0 ) { unsigned int i; @@ -415,7 +442,7 @@ main(int argc, char * argv[]) { for (i = temp1; i < (temp1 + temp2); ++i) get_map_entry(ifP, &ColorMap[i], (int) tga_head.CoSize, &AlphaMap[i]); - } + } /* Check run-length encoding. */ if (tga_head.ImgType == TGA_RLEMap || @@ -424,7 +451,7 @@ main(int argc, char * argv[]) { rlencoded = 1; else rlencoded = 0; - + /* Read the Targa file body and convert to portable format. */ pixels = ppm_allocarray( cols, rows ); alpha = pgm_allocarray( cols, rows ); @@ -436,10 +463,10 @@ main(int argc, char * argv[]) { realrow = truerow; if (tga_head.OrgBit == 0) realrow = rows - realrow - 1; - + for (col = 0; col < cols; ++col) - get_pixel(ifP, &(pixels[realrow][col]), (int) tga_head.PixelSize, - &(alpha[realrow][col])); + getPixel(ifP, &(pixels[realrow][col]), (int) tga_head.PixelSize, + &(alpha[realrow][col])); if (tga_head.IntrLve == TGA_IL_Four) truerow += 4; else if (tga_head.IntrLve == TGA_IL_Two) @@ -448,17 +475,20 @@ main(int argc, char * argv[]) { ++truerow; if (truerow >= rows) truerow = ++baserow; - } + } pm_close(ifP); - - if (imageout_file) + + if (imageout_file) ppm_writeppm(imageout_file, pixels, cols, rows, (pixval) maxval, 0); if (alpha_file) pgm_writepgm(alpha_file, alpha, cols, rows, (pixval) maxval, 0); - if (imageout_file) + if (imageout_file) pm_close(imageout_file); if (alpha_file) pm_close(alpha_file); return 0; } + + + diff --git a/converter/ppm/winicontoppm.c b/converter/ppm/winicontoppm.c index 6b1376b2..2c9015f5 100644 --- a/converter/ppm/winicontoppm.c +++ b/converter/ppm/winicontoppm.c @@ -14,6 +14,7 @@ ** 03/2003 - Added 24+32 bpp capability. */ +#define _DEFAULT_SOURCE 1 /* New name for SVID & BSD source defines */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/ximtoppm.c b/converter/ppm/ximtoppm.c index ce5e6396..75faac69 100644 --- a/converter/ppm/ximtoppm.c +++ b/converter/ppm/ximtoppm.c @@ -10,6 +10,7 @@ ** implied warranty. */ +#define _DEFAULT_SOURCE 1 /* New name for SVID & BSD source defines */ #define _BSD_SOURCE 1 /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ diff --git a/converter/ppm/xpmtoppm.c b/converter/ppm/xpmtoppm.c index 27f17931..46101a09 100644 --- a/converter/ppm/xpmtoppm.c +++ b/converter/ppm/xpmtoppm.c @@ -3,6 +3,7 @@ Copyright and history information is at end of file */ +#define _DEFAULT_SOURCE /* New name for SVID & BSD source defines */ #define _BSD_SOURCE /* Make sure strdup() is in string.h */ #define _XOPEN_SOURCE 500 /* Make sure strdup() is in string.h */ @@ -81,14 +82,14 @@ parseCommandLine(int argc, char ** argv, cmdlineP->input_filespec = NULL; /* he wants stdin */ else if (argc - 1 == 1) cmdlineP->input_filespec = strdup(argv[1]); - else + else pm_error("Too many arguments. The only argument accepted\n" "is the input file specification"); - if (cmdlineP->alpha_filename && + if (cmdlineP->alpha_filename && streq(cmdlineP->alpha_filename, "-")) cmdlineP->alpha_stdout = TRUE; - else + else cmdlineP->alpha_stdout = FALSE; } @@ -223,7 +224,7 @@ entryMatch(struct ColorNameHashTableEntry const entry, { unsigned int i; - + for (i = 0; i < size; ++i) { if (name[i] != entry.colorName[i]) return false; @@ -271,7 +272,7 @@ hash_find(const ColorNameHash * const hashP, for (i = initialIndex; !entryMatch(hashP->table[i], name, hashP->nameSize); bumpIndex(&i, hashP->size, initialIndex)); - + *entryPP = &hashP->table[i]; } @@ -357,7 +358,7 @@ getLine(char * const line, If 'backup' is true, the "next line" is the previously read line, i.e. the one in that one-line buffer. Otherwise, the "next line" is the next - line from the real file. After reading the backed up line, we reset + line from the real file. After reading the backed up line, we reset 'backup' to false. Return the line as a null terminated string in *line, which is an @@ -370,7 +371,7 @@ getLine(char * const line, "which is out of bounds"); if (backup) { - strncpy(line, lastInputLine, size); + strncpy(line, lastInputLine, size); backup = FALSE; } else { if (fgets(line, size, stream) == NULL) @@ -397,7 +398,7 @@ getword(char * const output, char ** const cursorP) { strncpy(output, t1, t2 - t1); output[t2 - t1] = '\0'; *cursorP = t2; -} +} @@ -437,7 +438,7 @@ validateColorName(const char * const name, static void interpretXpm3ColorTableLine(char const line[], - unsigned int const seqNum, + unsigned int const seqNum, unsigned int const charsPerPixel, ColorNameHash * const hashP) { /*---------------------------------------------------------------------------- @@ -457,22 +458,22 @@ interpretXpm3ColorTableLine(char const line[], -----------------------------------------------------------------------------*/ /* Note: this code seems to allow for multi-word color specifications, but I'm not aware that such are legal. Ultimately, ppm_parsecolor() - interprets the name, and I believe it takes only single word + interprets the name, and I believe it takes only single word color specifications. -Bryan 2001.05.06. */ - char str2[MAX_LINE+1]; + char str2[MAX_LINE+1]; char * t1; char * t2; int endOfEntry; /* boolean */ - + unsigned int curkey, key, highkey; /* current color key */ - bool lastwaskey; + bool lastwaskey; /* The last token we processes was a key, and we have processed at least one token. */ char curbuf[BUFSIZ]; /* current buffer */ bool isTransparent; - + const char * colorName; /* The 0-3 character name this color map line gives the color (i.e. the name that the raster uses). This is NOT NUL-terminated. @@ -484,20 +485,20 @@ interpretXpm3ColorTableLine(char const line[], if (t1 == NULL) pm_error("A line that is supposed to be an entry in the color " "table does not start with a quote. The line is '%s'. " - "It is the %uth entry in the color table.", + "It is the %uth entry in the color table.", line, seqNum); else ++t1; /* Points now to first color number character */ - + validateColorName(t1, charsPerPixel); colorName = t1; t1 += charsPerPixel; /* - * read color keys and values + * read color keys and values */ - curkey = 0; + curkey = 0; highkey = 1; lastwaskey = FALSE; t2 = t1; @@ -511,8 +512,8 @@ interpretXpm3ColorTableLine(char const line[], /* See if the word we got is a valid key (and get its key number if so) */ - for (key = 1; - key <= NKEYS && !streq(xpmColorKeys[key - 1], str2); + for (key = 1; + key <= NKEYS && !streq(xpmColorKeys[key - 1], str2); key++); isKey = (key <= NKEYS); @@ -520,21 +521,21 @@ interpretXpm3ColorTableLine(char const line[], /* This word is a color specification (or "none" for transparent). */ - if (!curkey) + if (!curkey) pm_error("Missing color key token in color table line " "'%s' before '%s'.", line, str2); - if (!lastwaskey) + if (!lastwaskey) strcat(curbuf, " "); /* append space */ - if ( (strneq(str2, "None", 4)) + if ( (strneq(str2, "None", 4)) || (strneq(str2, "none", 4)) ) { /* This entry identifies the transparent color number */ strcat(curbuf, "#000000"); /* Make it black */ isTransparent = TRUE; - } else + } else strcat(curbuf, str2); /* append buf */ lastwaskey = FALSE; - } else { - /* This word is a key. So we've seen the last of the + } else { + /* This word is a key. So we've seen the last of the info for the previous key, and we must either put it in the color map or ignore it if we already have a higher color form in the colormap for this colormap entry. @@ -560,7 +561,7 @@ interpretXpm3ColorTableLine(char const line[], addToColorMap(hashP, colorName, curbuf, isTransparent); highkey = curkey; } - if (highkey == 1) + if (highkey == 1) pm_error("C error scanning color table"); } @@ -587,10 +588,10 @@ readV3ColorTable(FILE * const ifP, /* skip the comment line if any */ if (strneq(line, "/*", 2)) getLine(line, sizeof(line), ifP); - + interpretXpm3ColorTableLine(line, seqNum, charsPerPixel, colorNameHashP); - + } *colorNameHashPP = colorNameHashP; } @@ -600,7 +601,7 @@ readV3ColorTable(FILE * const ifP, static void readXpm3Header(FILE * const ifP, unsigned int * const widthP, - unsigned int * const heightP, + unsigned int * const heightP, unsigned int * const charsPerPixelP, ColorNameHash ** const colorNameHashPP) { /*---------------------------------------------------------------------------- @@ -619,14 +620,14 @@ readXpm3Header(FILE * const ifP, -----------------------------------------------------------------------------*/ char line[MAX_LINE+1]; const char * xpm3_signature = "/* XPM */"; - + unsigned int width, height; unsigned int nColors; unsigned int charsPerPixel; /* Read the XPM signature comment */ getLine(line, sizeof(line), ifP); - if (!strneq(line, xpm3_signature, strlen(xpm3_signature))) + if (!strneq(line, xpm3_signature, strlen(xpm3_signature))) pm_error("Apparent XPM 3 file does not start with '/* XPM */'. " "First line is '%s'", xpm3_signature); @@ -715,7 +716,7 @@ readV1ColorTable(FILE * const ifP, static void readXpm1Header(FILE * const ifP, unsigned int * const widthP, - unsigned int * const heightP, + unsigned int * const heightP, unsigned int * const charsPerPixelP, ColorNameHash ** const colorNameHashPP) { /*---------------------------------------------------------------------------- @@ -723,11 +724,11 @@ readXpm1Header(FILE * const ifP, getLine() stream is presently positioned to the beginning of the file and it is a Version 1 XPM file. Leave the stream positioned after the header. - + Return the information from the header the same as for readXpm3Header. -----------------------------------------------------------------------------*/ int format, v; - bool processedStaticChar; + bool processedStaticChar; /* We have read up to and interpreted the "static char..." line */ char * t1; unsigned int nColors; @@ -875,7 +876,7 @@ convertRow(char const line[], "'%s'. Ignoring this line.", line); } else { unsigned int col; - + ++lineCursor; /* Skip to first character after quote */ /* Handle pixels until a close quote, eol, or we've returned all @@ -889,7 +890,7 @@ convertRow(char const line[], alpharow[col] = hash_isTransparent(colorNameHashP, lineCursor) ? PBM_BLACK : PBM_WHITE; - + lineCursor += charsPerPixel; } if (*lineCursor != '"') @@ -902,7 +903,7 @@ convertRow(char const line[], static void convertRaster(FILE * const ifP, unsigned int const cols, - unsigned int const rows, + unsigned int const rows, unsigned int const charsPerPixel, const ColorNameHash * const colorNameHashP, FILE * const imageOutFileP, @@ -927,7 +928,7 @@ convertRaster(FILE * const ifP, bool haveLine; for (haveLine = false; !haveLine; ) { - getLine(line, sizeof(line), ifP); + getLine(line, sizeof(line), ifP); if (strneq(line, "/*", 2)) { /* It's a comment. Ignore it. */ @@ -938,22 +939,22 @@ convertRaster(FILE * const ifP, pixrow, alpharow); if (imageOutFileP) - ppm_writeppmrow(imageOutFileP, + ppm_writeppmrow(imageOutFileP, pixrow, cols, PPM_MAXMAXVAL, 0); - if (alphaOutFileP) - pbm_writepbmrow(alphaOutFileP, alpharow, cols, 0); + if (alphaOutFileP) + pbm_writepbmrow(alphaOutFileP, alpharow, cols, 0); } pbm_freerow(alpharow); ppm_freerow(pixrow); } - + static void readXpmHeader(FILE * const ifP, unsigned int * const widthP, - unsigned int * const heightP, + unsigned int * const heightP, unsigned int * const charsPerPixelP, ColorNameHash ** const colorNameHashPP) { /*---------------------------------------------------------------------------- @@ -973,7 +974,7 @@ readXpmHeader(FILE * const ifP, /* Read the header line */ getLine(line, sizeof(line), ifP); backup = TRUE; /* back up so next read reads this line again */ - + rc = sscanf(line, "/* %s */", str1); if (rc == 1 && strneq(str1, "XPM", 3)) { /* It's an XPM version 3 file */ @@ -986,7 +987,7 @@ readXpmHeader(FILE * const ifP, *heightP = height; *charsPerPixelP = charsPerPixel; } - + int @@ -1007,20 +1008,20 @@ main(int argc, char *argv[]) { verbose = cmdline.verbose; - if ( cmdline.input_filespec != NULL ) + if ( cmdline.input_filespec != NULL ) ifP = pm_openr( cmdline.input_filespec); else ifP = stdin; if (cmdline.alpha_stdout) alphaOutFileP = stdout; - else if (cmdline.alpha_filename == NULL) + else if (cmdline.alpha_filename == NULL) alphaOutFileP = NULL; else { alphaOutFileP = pm_openw(cmdline.alpha_filename); } - if (cmdline.alpha_stdout) + if (cmdline.alpha_stdout) imageOutFileP = NULL; else imageOutFileP = stdout; @@ -1035,7 +1036,7 @@ main(int argc, char *argv[]) { convertRaster(ifP, cols, rows, charsPerPixel, colorNameHashP, imageOutFileP, alphaOutFileP); - + pm_close(ifP); if (imageOutFileP) pm_close(imageOutFileP); @@ -1043,7 +1044,7 @@ main(int argc, char *argv[]) { pm_close(alphaOutFileP); hash_destroy(colorNameHashP); - + return 0; } @@ -1065,17 +1066,17 @@ main(int argc, char *argv[]) { ** Tue Apr 9 1991 ** ** Rainer Sinkwitz sinkwitz@ifi.unizh.ch - 21 Nov 91: -** - Bug fix, no advance of read ptr, would not read -** colors like "ac c black" because it would find +** - Bug fix, no advance of read ptr, would not read +** colors like "ac c black" because it would find ** the "c" of "ac" and then had problems with "c" ** as color. -** +** ** - Now understands multiword X11 color names -** +** ** - Now reads multiple color keys. Takes the color ** of the hightest available key. Lines no longer need ** to begin with key 'c'. -** +** ** - expanded line buffer to from 500 to 2048 for bigger files */ diff --git a/converter/ppm/xvminitoppm.c b/converter/ppm/xvminitoppm.c index d76bea87..ad207ae9 100644 --- a/converter/ppm/xvminitoppm.c +++ b/converter/ppm/xvminitoppm.c @@ -13,12 +13,13 @@ #include <assert.h> #include <string.h> #include <errno.h> +#include <stdbool.h> #include "pm_c_util.h" #include "nstring.h" +#include "pm.h" #include "ppm.h" -#define BUFSIZE 256 typedef struct xvPalette { @@ -53,25 +54,6 @@ parseCommandLine(int const argc, static void -getLine(FILE * const ifP, - char * const buf, - size_t const size) { - - char * rc; - - rc = fgets(buf, size, ifP); - if (rc == NULL) { - if (ferror(ifP)) - pm_error("read error. fgets() failed, errno=%d (%s)", - errno, strerror(errno)); - else - pm_error("unexpected EOF"); - } -} - - - -static void makeXvPalette(xvPalette * const xvPaletteP) { unsigned int paletteIndex; @@ -101,37 +83,53 @@ readXvHeader(FILE * const ifP, unsigned int * const colsP, unsigned int * const rowsP, unsigned int * const maxvalP) { - - char buf[256]; + + char * buf; + size_t bufferSz; + int eof; + size_t lineLen; unsigned int cols, rows, maxval; int rc; bool endOfComments; - - getLine(ifP, buf, sizeof(buf)); - if (!strneq(buf, "P7 332", 6)) + buf = NULL; /* initial value */ + bufferSz = 0; /* initial value */ + + pm_getline(ifP, &buf, &bufferSz, &eof, &lineLen); + + if (eof || !strneq(buf, "P7 332", 6)) pm_error("Input is not a XV thumbnail picture. It does not " "begin with the characters 'P7 332'."); - endOfComments = FALSE; - while (!endOfComments) { - getLine(ifP, buf, sizeof(buf)); + for (endOfComments = false; !endOfComments; ) { + int eof; + size_t lineLen; + pm_getline(ifP, &buf, &bufferSz, &eof, &lineLen); + if (eof) + pm_error("EOF before #END_OF_COMMENTS line"); if (strneq(buf, "#END_OF_COMMENTS", 16)) - endOfComments = TRUE; + endOfComments = true; else if (strneq(buf, "#BUILTIN", 8)) pm_error("This program does not know how to " "convert builtin XV thumbnail pictures"); } - getLine(ifP, buf, sizeof(buf)); + pm_getline(ifP, &buf, &bufferSz, &eof, &lineLen); + if (eof) + pm_error("EOF where cols/rows/maxval line expected"); + rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval); if (rc != 3) pm_error("error parsing dimension info '%s'. " "It does not consist of 3 decimal numbers.", buf); if (maxval != 255) pm_error("bogus XV thumbnail maxval %u. Should be 255", maxval); + *colsP = cols; *rowsP = rows; *maxvalP = maxval; + + if (buf) + free(buf); } @@ -166,7 +164,7 @@ writePpm(FILE * const ifP, else { unsigned int const paletteIndex = byte; assert(byte >= 0); - + PPM_ASSIGN(pixrow[col], xvPaletteP->red[paletteIndex], xvPaletteP->grn[paletteIndex], @@ -181,7 +179,7 @@ writePpm(FILE * const ifP, -int +int main(int argc, char * argv[]) { @@ -190,7 +188,7 @@ main(int argc, unsigned int cols, rows; pixval maxval; xvPalette xvPalette; - + ppm_init(&argc, argv); parseCommandLine(argc, argv, &cmdline); diff --git a/converter/ppm/yuvtoppm.c b/converter/ppm/yuvtoppm.c index 151ff9f9..9c5d79c4 100644 --- a/converter/ppm/yuvtoppm.c +++ b/converter/ppm/yuvtoppm.c @@ -45,6 +45,7 @@ parseCommandLine(int argc, const char ** argv, optEntry * option_def; /* Instructions to OptParseOptions3 on how to parse our options */ optStruct3 opt; + unsigned int option_def_index; MALLOCARRAY_NOFAIL(option_def, 100); |