diff options
Diffstat (limited to 'converter/other/pnmtopng.c')
| -rw-r--r-- | converter/other/pnmtopng.c | 131 |
1 files changed, 64 insertions, 67 deletions
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index b7bd6d07..10b586b0 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -56,13 +56,10 @@ #endif /* 2 for warnings (1 == error) */ #include <assert.h> +#include <stdbool.h> #include <string.h> /* strcat() */ #include <limits.h> #include <png.h> -/* Because of a design error in png.h, you must not #include <setjmp.h> before - <png.h>. If you do, png.h won't compile. -*/ -#include <setjmp.h> #include <zlib.h> #include "pm_c_util.h" @@ -136,16 +133,6 @@ struct cmdlineInfo { -typedef struct _jmpbuf_wrapper { - jmp_buf jmpbuf; -} jmpbuf_wrapper; - -#ifndef TRUE -# define TRUE 1 -#endif -#ifndef FALSE -# define FALSE 0 -#endif #ifndef NONE # define NONE 0 #endif @@ -160,7 +147,6 @@ typedef struct _jmpbuf_wrapper { static bool verbose; -static jmpbuf_wrapper pnmtopng_jmpbuf_struct; static int errorlevel; @@ -192,9 +178,9 @@ parseRgbOpt(const char * const rgbOpt, &rgbP->gx, &rgbP->gy, &rgbP->bx, &rgbP->by); - if (count != 6) + if (count != 8) pm_error("Invalid syntax for the -rgb option value '%s'. " - "Should be 6 floating point number: " + "Should be 8 floating point numbers: " "x and y for each of white, red, green, and blue", rgbOpt); } @@ -298,9 +284,7 @@ parseCommandLine(int argc, const char ** argv, Note that the strings we return are stored in the storage that was passed to us as the argv array. We also trash *argv. -----------------------------------------------------------------------------*/ - optEntry *option_def; - /* Instructions to pm_optParseOptions3 on how to parse our options. - */ + optEntry * option_def; /* Used by OPTENT3 */ optStruct3 opt; unsigned int option_def_index; @@ -394,10 +378,10 @@ parseCommandLine(int argc, const char ** argv, opt.opt_table = option_def; - opt.short_allowed = FALSE; /* We have no short (old-fashioned) options */ - opt.allowNegNum = FALSE; /* We have no parms that are negative numbers */ + opt.short_allowed = false; /* We have no short (old-fashioned) options */ + opt.allowNegNum = false; /* We have no parms that are negative numbers */ - pm_optParseOptions3(&argc, (char **)argv, opt, sizeof(opt), 0); + pm_optParseOptions4(&argc, argv, opt, sizeof(opt), 0); /* Uses and sets argc, argv, and some of *cmdlineP and others. */ @@ -511,6 +495,8 @@ parseCommandLine(int argc, const char ** argv, cmdlineP->inputFileName = argv[1]; else pm_error("Program takes at most one argument: input file name"); + + free(option_def); } @@ -613,6 +599,7 @@ alloccoloralphahash(void) { } + static void freecoloralphahash(coloralphahash_table const caht) { int i; @@ -671,7 +658,7 @@ lookupColorAlpha(coloralphahash_table const caht, /* The following variables belong to getChv() and freeChv() */ -static bool getChv_computed = FALSE; +static bool getChv_computed = false; static colorhist_vector getChv_chv; @@ -722,7 +709,7 @@ getChv(FILE * const ifP, else pm_message("Too many colors (more than %u) found", maxColors); } - getChv_computed = TRUE; + getChv_computed = true; } *chvP = getChv_chv; *colorsP = getChv_colors; @@ -736,7 +723,7 @@ static void freeChv(void) { if (getChv_chv) ppm_freecolorhist(getChv_chv); - getChv_computed = FALSE; + getChv_computed = false; } @@ -750,7 +737,7 @@ pgmBitsAreRepeated(unsigned int const repeatedSize, xelval const maxval, int const format) { /*---------------------------------------------------------------------------- - Return TRUE iff all the samples in the image in file 'ifP', + Return true iff all the samples in the image in file 'ifP', described by 'cols', 'rows', 'maxval', and 'format', consist in the rightmost 'repeatedSize' * 2 bits of two identical sets of 'repeatedSize' bits. @@ -774,7 +761,7 @@ pgmBitsAreRepeated(unsigned int const repeatedSize, pm_seek2(ifP, &rasterPos, sizeof(rasterPos)); - mayscale = TRUE; /* initial assumption */ + mayscale = true; /* initial assumption */ for (row = 0; row < rows && mayscale; ++row) { unsigned int col; @@ -785,7 +772,7 @@ pgmBitsAreRepeated(unsigned int const repeatedSize, xelval const testbits1 = testbits2 & mask1; /* The lower half of the bits of interest in the sample */ if (((testbits1 << repeatedSize) | testbits1) != testbits2) - mayscale = FALSE; + mayscale = false; } } pnm_freerow(xelrow); @@ -878,7 +865,7 @@ meaningful_bits_ppm(FILE * const ifp, maxMeaningfulBits = pm_maxvaltobits(maxval); if (maxval == 65535) { - mayscale = TRUE; /* initial assumption */ + mayscale = true; /* initial assumption */ pm_seek2(ifp, &rasterPos, sizeof(rasterPos)); for (row = 0; row < rows && mayscale; ++row) { unsigned int col; @@ -888,7 +875,7 @@ meaningful_bits_ppm(FILE * const ifp, if ((PPM_GETR(p) & 0xff) * 0x101 != PPM_GETR(p) || (PPM_GETG(p) & 0xff) * 0x101 != PPM_GETG(p) || (PPM_GETB(p) & 0xff) * 0x101 != PPM_GETB(p)) - mayscale = FALSE; + mayscale = false; } } if (mayscale) @@ -902,7 +889,7 @@ meaningful_bits_ppm(FILE * const ifp, static void -tryTransparentColor(FILE * const ifp, +tryTransparentColor(FILE * const ifP, pm_filepos const rasterPos, int const cols, int const rows, @@ -912,7 +899,14 @@ tryTransparentColor(FILE * const ifp, gray const alphaMaxval, pixel const transcolor, bool * const singleColorIsTransP) { +/*---------------------------------------------------------------------------- + Find out if the transparent pixels identified by alpha mask 'alphaMask' + (whose maxval is 'alphaMaxval') are exactly the pixels of color + 'transcolor'. Return answer as *singleColorIsTransP. + The image we analyze is that on input stream *ifP, starting at position + 'rasterPos', and we leave that stream positioned arbitrarily. +-----------------------------------------------------------------------------*/ int const pnmType = PNM_FORMAT_TYPE(format); xel * xelrow; @@ -922,13 +916,13 @@ tryTransparentColor(FILE * const ifp, xelrow = pnm_allocrow(cols); - pm_seek2(ifp, &rasterPos, sizeof(rasterPos)); + pm_seek2(ifP, &rasterPos, sizeof(rasterPos)); - singleColorIsTrans = TRUE; /* initial assumption */ + singleColorIsTrans = true; /* initial assumption */ for (row = 0; row < rows && singleColorIsTrans; ++row) { int col; - pnm_readpnmrow(ifp, xelrow, cols, maxval, format); + pnm_readpnmrow(ifP, xelrow, cols, maxval, format); for (col = 0 ; col < cols && singleColorIsTrans; ++col) { if (alphaMask[row][col] == 0) { /* transparent */ /* If we have a second transparent color, we're @@ -936,16 +930,16 @@ tryTransparentColor(FILE * const ifp, */ if (pnmType == PPM_TYPE) { if (!PPM_EQUAL(xelrow[col], transcolor)) - singleColorIsTrans = FALSE; + singleColorIsTrans = false; } else { if (PNM_GET1(xelrow[col]) != PNM_GET1(transcolor)) - singleColorIsTrans = FALSE; + singleColorIsTrans = false; } } else if (alphaMask[row][col] != alphaMaxval) { /* Here's an area of the mask that is translucent. That disqualified us. */ - singleColorIsTrans = FALSE; + singleColorIsTrans = false; } else { /* Here's an area of the mask that is opaque. If it's the same color as our candidate transparent color, @@ -953,14 +947,16 @@ tryTransparentColor(FILE * const ifp, */ if (pnmType == PPM_TYPE) { if (PPM_EQUAL(xelrow[col], transcolor)) - singleColorIsTrans = FALSE; + singleColorIsTrans = false; } else { if (PNM_GET1(xelrow[col]) == PNM_GET1(transcolor)) - singleColorIsTrans = FALSE; + singleColorIsTrans = false; } } } } + *singleColorIsTransP = singleColorIsTrans; + pnm_freerow(xelrow); } @@ -988,8 +984,8 @@ analyzeAlpha(FILE * const ifP, of a certain color fully transparent and every other pixel opaque, we can simply identify that color in the PNG. - We have to do this before any scaling occurs, since alpha is only - possible with 8 and 16-bit. + We have to do this before any scaling occurs, since alpha is possible + only with 8 and 16-bit. -----------------------------------------------------------------------------*/ xel * xelrow; bool foundTransparentPixel; @@ -1032,7 +1028,7 @@ analyzeAlpha(FILE * const ifP, pnm_readpnmrow(ifP, xelrow, cols, maxval, format); for (col = 0; col < cols && !foundTransparentPixel; ++col) { if (alphaMask[row][col] == 0) { - foundTransparentPixel = TRUE; + foundTransparentPixel = true; transcolor = pnm_xeltopixel(xelrow[col], format); } } @@ -1113,16 +1109,16 @@ determineTransparency(struct cmdlineInfo const cmdline, if (alphaCanBeTransparencyIndex && !cmdline.force) { if (verbose) pm_message("converting alpha mask to transparency index"); - *alphaP = FALSE; + *alphaP = false; *transparentP = 2; *transColorP = alphaTranscolor; } else if (allOpaque) { if (verbose) pm_message("Skipping alpha because mask is all opaque"); - *alphaP = FALSE; + *alphaP = false; *transparentP = -1; } else { - *alphaP = TRUE; + *alphaP = true; *transparentP = -1; } *alphaMaxvalP = alphaMaxval; @@ -1132,17 +1128,17 @@ determineTransparency(struct cmdlineInfo const cmdline, use with trans[], which can have stuff in it if the user specified a transparent color. */ - *alphaP = FALSE; + *alphaP = false; *alphaMaxvalP = 255; if (cmdline.transparent) { const char * transstring2; /* The -transparent value, but with possible leading '=' removed */ if (cmdline.transparent[0] == '=') { - *transExactP = TRUE; + *transExactP = true; transstring2 = &cmdline.transparent[1]; } else { - *transExactP = FALSE; + *transExactP = false; transstring2 = cmdline.transparent; } /* We do this funny PPM_DEPTH thing instead of just passing 'maxval' @@ -1204,7 +1200,7 @@ hasColor(FILE * const ifP, for (col = 0; col < cols && isGray; ++col) { xel const p = xelrow[col]; if (PPM_GETR(p) != PPM_GETG(p) || PPM_GETG(p) != PPM_GETB(p)) - isGray = FALSE; + isGray = false; } } @@ -1333,10 +1329,10 @@ compute_nonalpha_palette(colorhist_vector const chv, int j; bool found; - found = FALSE; + found = false; for (j = 0; j < ordered_palette_size && !found; ++j) { if (PNM_EQUAL(ordered_palette[j], chv[colorIndex].color)) - found = TRUE; + found = true; } if (!found) pm_error("failed to find color (%d, %d, %d), which is in the " @@ -1468,9 +1464,14 @@ computeUnsortedAlphaPalette(FILE * const ifP, int row; xel * xelrow; unsigned int alphaColorPairCnt; + /* Number of different alpha/color pairs we've seen so far as we + iterate through the image. + */ cht = ppm_colorhisttocolorhash(chv, colors); + /* We have not seen any alphas of any color yet. */ + alphaColorPairCnt = 0; for (colorIndex = 0; colorIndex < colors; ++colorIndex) { alphasOfColor[colorIndex] = NULL; alphasOfColorCnt[colorIndex] = 0; @@ -1629,7 +1630,7 @@ compute_alpha_palette(FILE * const ifP, MAXPALETTEENTRIES elements. If there are more than MAXPALETTEENTRIES color/alpha pairs in the image, - don't return any palette information -- just return *tooBigP == TRUE. + don't return any palette information -- just return *tooBigP == true. -----------------------------------------------------------------------------*/ colorhist_vector chv; unsigned int colors; @@ -1707,9 +1708,9 @@ makeOneColorTransparentInPalette(xel const transColor, can do a better job when the opaque entries are all last in the color/alpha palette). - If the specified color is not there and exact == TRUE, return + If the specified color is not there and exact == true, return without changing anything, but issue a warning message. If it's - not there and exact == FALSE, just find the closest color. + not there and exact == false, just find the closest color. We assume every entry in the palette is opaque upon entry. @@ -2208,6 +2209,7 @@ computeRasterWidth(bool const colorMapped, } + static void createPngPalette(pixel palette_pnm[], unsigned int const paletteSize, @@ -2362,7 +2364,8 @@ writeRaster(struct pngx * const pngxP, /* max: 3 color channels, one alpha channel, 16-bit */ MALLOCARRAY(line, cols * 8); if (line == NULL) - pm_error("out of memory allocating PNG row buffer"); + pm_error("out of memory allocating PNG row buffer for %u columns", + cols); for (pass = 0; pass < pngxP->numPassesRequired; ++pass) { unsigned int row; @@ -2379,6 +2382,7 @@ writeRaster(struct pngx * const pngxP, pngx_writeRow(pngxP, line); } } + free(line); pnm_freerow(xelrow); } @@ -2552,6 +2556,7 @@ reportTrans(struct pngx * const pngxP) { } + static void doTrnsChunk(struct pngx * const pngxP, png_byte const transPalette[], @@ -2719,7 +2724,6 @@ convertpnm(struct cmdlineInfo const cmdline, /* The background color, with maxval equal to that of the input image. */ - jmp_buf jmpbuf; struct pngx * pngxP; bool colorMapped; @@ -2774,10 +2778,7 @@ convertpnm(struct cmdlineInfo const cmdline, errorlevel = 0; - if (setjmp(jmpbuf)) - pm_error ("setjmp returns error condition"); - - pngx_create(&pngxP, PNGX_WRITE, &jmpbuf); + pngx_create(&pngxP, PNGX_WRITE, NULL); pnm_readpnminit(ifP, &cols, &rows, &maxval, &format); pm_tell2(ifP, &rasterPos, sizeof(rasterPos)); @@ -2830,9 +2831,9 @@ convertpnm(struct cmdlineInfo const cmdline, if (verbose) pm_message("Not using color map. %s", noColormapReason); pm_strfree(noColormapReason); - colorMapped = FALSE; + colorMapped = false; } else - colorMapped = TRUE; + colorMapped = true; computeColorMapLookupTable(colorMapped, palettePnm, paletteSize, transPnm, transSize, alpha, alphaMaxval, @@ -2853,10 +2854,6 @@ convertpnm(struct cmdlineInfo const cmdline, pngMaxval = pm_bitstomaxval(depth); - if (setjmp (pnmtopng_jmpbuf_struct.jmpbuf)) { - pm_error ("setjmp returns error condition (2)"); - } - doIhdrChunk(pngxP, cols, rows, depth, colorMapped, colorPng, alpha, cmdline.interlace); |