From 168a4563d416bb0e805dce7daa4a89a8ec18adeb Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 29 Mar 2015 02:24:13 +0000 Subject: cleanup git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2430 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/giftopnm.c | 139 ++++++++++++++++++++++++--------------------- 1 file changed, 74 insertions(+), 65 deletions(-) diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c index 96a6fc4c..23433c1e 100644 --- a/converter/other/giftopnm.c +++ b/converter/other/giftopnm.c @@ -90,7 +90,7 @@ readFile(FILE * const ifP, -struct cmdlineInfo { +struct CmdlineInfo { /* All the information the user supplied in the command line, in a form easy for the program to use. */ @@ -111,7 +111,7 @@ struct cmdlineInfo { static void parseCommandLine(int argc, char ** argv, - struct cmdlineInfo * const cmdlineP) { + struct CmdlineInfo * const cmdlineP) { /*---------------------------------------------------------------------------- Note that the file spec array we return is stored in the storage that was passed to us as the argv array. @@ -240,13 +240,13 @@ typedef struct { -----------------------------------------------------------------------*/ -struct gifScreen { - unsigned int Width; - unsigned int Height; - GifColorMap ColorMap; - unsigned int ColorResolution; - unsigned int Background; - unsigned int AspectRatio; +struct GifScreen { + unsigned int width; + unsigned int height; + GifColorMap colorMap; + unsigned int colorResolution; + unsigned int background; + unsigned int aspectRatio; /* Aspect ratio of each pixel, times 64, minus 15. (i.e. 1 => 1:4). But Zero means 1:1. */ @@ -260,7 +260,7 @@ struct gifScreen { */ }; -struct gif89 { +struct Gif89 { bool haveTransColor; /* The GIF specifies a transparent background color */ unsigned int transparentIndex; @@ -278,7 +278,7 @@ struct gif89 { }; static void -initGif89(struct gif89 * const gif89P) { +initGif89(struct Gif89 * const gif89P) { gif89P->haveTransColor = false; gif89P->haveDelayTime = false; gif89P->haveInputFlag = false; @@ -297,7 +297,16 @@ readColorMap(FILE * const ifP, GifColorMap * const cmapP, bool * const hasGrayP, bool * const hasColorP) { +/*---------------------------------------------------------------------------- + Read a color map from a GIF stream, where the stream is on *ifP, + which is positioned to a color map, which is 'cmapSize' bytes long. + + Return as *cmapP that color map. + Furthermore, analyze that color map and return *hasGrayP == true iff it + contains any gray (black and white don't count) and *hasColorP == true iff + it contains anything that is not gray or black or white. +-----------------------------------------------------------------------------*/ unsigned int i; unsigned char rgb[3]; @@ -494,7 +503,7 @@ LM_to_uint(unsigned char const a, static void doGraphicControlExtension(FILE * const ifP, - struct gif89 * const gif89P) { + struct Gif89 * const gif89P) { bool eof; unsigned int length; @@ -531,7 +540,7 @@ doGraphicControlExtension(FILE * const ifP, static void doExtension(FILE * const ifP, unsigned char const label, - struct gif89 * const gif89P) { + struct Gif89 * const gif89P) { const char * str; @@ -566,7 +575,7 @@ doExtension(FILE * const ifP, -struct getCodeState { +struct GetCodeState { unsigned char buf[280]; /* This is the buffer through which we read the data from the stream. We must buffer it because we have to read whole data @@ -592,7 +601,7 @@ struct getCodeState { static void getAnotherBlock(FILE * const ifP, - struct getCodeState * const gsP, + struct GetCodeState * const gsP, const char ** const errorP) { unsigned int count; @@ -633,10 +642,10 @@ getAnotherBlock(FILE * const ifP, -static struct getCodeState getCodeState; +static struct GetCodeState getCodeState; static void -getCode_init(struct getCodeState * const getCodeStateP) { +getCode_init(struct GetCodeState * const getCodeStateP) { /* Fake a previous data block */ getCodeStateP->buf[0] = 0; @@ -688,7 +697,7 @@ bitsOfLeBuffer(const unsigned char * const buf, static void -getCode_get(struct getCodeState * const gsP, +getCode_get(struct GetCodeState * const gsP, FILE * const ifP, int const codeSize, bool * const eofP, @@ -752,7 +761,7 @@ getCode_get(struct getCodeState * const gsP, -struct stack { +struct Stack { /* Stack grows from low addresses to high addresses */ unsigned char * stack; /* malloc'ed array */ unsigned char * sp; /* stack pointer */ @@ -762,7 +771,7 @@ struct stack { static void -initStack(struct stack * const stackP, unsigned int const size) { +initStack(struct Stack * const stackP, unsigned int const size) { MALLOCARRAY(stackP->stack, size); if (stackP->stack == NULL) @@ -774,7 +783,7 @@ initStack(struct stack * const stackP, unsigned int const size) { static void -pushStack(struct stack * const stackP, unsigned char const value) { +pushStack(struct Stack * const stackP, unsigned char const value) { if (stackP->sp >= stackP->top) pm_error("stack overflow"); @@ -785,14 +794,14 @@ pushStack(struct stack * const stackP, unsigned char const value) { static bool -stackIsEmpty(const struct stack * const stackP) { +stackIsEmpty(const struct Stack * const stackP) { return stackP->sp == stackP->stack; } static unsigned char -popStack(struct stack * const stackP) { +popStack(struct Stack * const stackP) { if (stackP->sp <= stackP->stack) pm_error("stack underflow"); @@ -803,7 +812,7 @@ popStack(struct stack * const stackP) { static void -termStack(struct stack * const stackP) { +termStack(struct Stack * const stackP) { free(stackP->stack); stackP->stack = NULL; } @@ -851,8 +860,8 @@ termStack(struct stack * const stackP) { static int const maxLzwCodeCt = (1<codeSize = decompP->initCodeSize+1; decompP->maxCodeCt = 1 << decompP->codeSize; @@ -927,7 +936,7 @@ validateTransparentIndex(unsigned int const transparentIndex, static void -lzwInit(struct decompressor * const decompP, +lzwInit(struct Decompressor * const decompP, FILE * const ifP, int const initCodeSize, unsigned int const cmapSize, @@ -988,7 +997,7 @@ lzwInit(struct decompressor * const decompP, static void -lzwAdjustForPBM(struct decompressor * const decompP, +lzwAdjustForPBM(struct Decompressor * const decompP, GifColorMap const cmap) { /*---------------------------------------------------------------------------- In the PBM case we use the table index value directly instead of looking up @@ -1006,7 +1015,7 @@ lzwAdjustForPBM(struct decompressor * const decompP, static void -lzwTerm(struct decompressor * const decompP) { +lzwTerm(struct Decompressor * const decompP) { termStack(&decompP->stack); } @@ -1014,7 +1023,7 @@ lzwTerm(struct decompressor * const decompP) { static void -pushWholeStringOnStack(struct decompressor * const decompP, +pushWholeStringOnStack(struct Decompressor * const decompP, unsigned int const code0) { /*---------------------------------------------------------------------------- Get the whole string that compression code 'code0' represents and push @@ -1038,7 +1047,7 @@ pushWholeStringOnStack(struct decompressor * const decompP, static void -expandCodeOntoStack(struct decompressor * const decompP, +expandCodeOntoStack(struct Decompressor * const decompP, unsigned int const incode, const char ** const errorP) { /*---------------------------------------------------------------------------- @@ -1113,8 +1122,8 @@ expandCodeOntoStack(struct decompressor * const decompP, static void -lzwReadByteFresh(struct getCodeState * const getCodeStateP, - struct decompressor * const decompP, +lzwReadByteFresh(struct GetCodeState * const getCodeStateP, + struct Decompressor * const decompP, bool * const endOfImageP, unsigned char * const dataReadP, const char ** const errorP) { @@ -1171,7 +1180,7 @@ lzwReadByteFresh(struct getCodeState * const getCodeStateP, static void -lzwReadByte(struct decompressor * const decompP, +lzwReadByte(struct Decompressor * const decompP, unsigned char * const dataReadP, bool * const endOfImageP, const char ** const errorP) { @@ -1398,7 +1407,7 @@ pnmFormat(bool const hasGray, static void -makePnmRow(struct decompressor * const decompP, +makePnmRow(struct Decompressor * const decompP, unsigned int const cols, unsigned int const rows, bool const fillWithZero, @@ -1447,7 +1456,7 @@ makePnmRow(struct decompressor * const decompP, static void -convertRaster(struct decompressor * const decompP, +convertRaster(struct Decompressor * const decompP, unsigned int const cols, unsigned int const rows, GifColorMap const cmap, @@ -1550,7 +1559,7 @@ convertRaster(struct decompressor * const decompP, static void -skipExtraneousData(struct decompressor * const decompP) { +skipExtraneousData(struct Decompressor * const decompP) { unsigned char byteRead; bool endOfImage; @@ -1638,7 +1647,7 @@ readImageData(FILE * const ifP, bool const tolerateBadInput) { unsigned char lzwMinCodeSize; - struct decompressor decomp; + struct Decompressor decomp; const char * error; readFile(ifP, &lzwMinCodeSize, sizeof(lzwMinCodeSize), &error); @@ -1697,7 +1706,7 @@ warnUserNotSquare(unsigned int const aspectRatio) { static void readGifHeader(FILE * const gifFileP, - struct gifScreen * const gifScreenP) { + struct GifScreen * const gifScreenP) { /*---------------------------------------------------------------------------- Read the GIF stream header off the file *gifFileP, which is present positioned to the beginning of a GIF stream. Return the info from it @@ -1729,25 +1738,25 @@ readGifHeader(FILE * const gifFileP, if (error) pm_error("Failed to read screen descriptor. %s", error); - gifScreenP->Width = LM_to_uint(buf[0],buf[1]); - gifScreenP->Height = LM_to_uint(buf[2],buf[3]); + gifScreenP->width = LM_to_uint(buf[0],buf[1]); + gifScreenP->height = LM_to_uint(buf[2],buf[3]); cmapSize = 1 << ((buf[4] & 0x07) + 1); - gifScreenP->ColorResolution = (buf[4] & 0x70 >> 3) + 1; - gifScreenP->Background = buf[5]; - gifScreenP->AspectRatio = buf[6]; + gifScreenP->colorResolution = (buf[4] & 0x70 >> 3) + 1; + gifScreenP->background = buf[5]; + gifScreenP->aspectRatio = buf[6]; if (verbose) { pm_message("GIF Width = %d GIF Height = %d " "Pixel aspect ratio = %d (%f:1)", - gifScreenP->Width, gifScreenP->Height, - gifScreenP->AspectRatio, - gifScreenP->AspectRatio == 0 ? - 1 : (gifScreenP->AspectRatio + 15) / 64.0); + gifScreenP->width, gifScreenP->height, + gifScreenP->aspectRatio, + gifScreenP->aspectRatio == 0 ? + 1 : (gifScreenP->aspectRatio + 15) / 64.0); pm_message("Colors = %d Color Resolution = %d", - cmapSize, gifScreenP->ColorResolution); + cmapSize, gifScreenP->colorResolution); } if (BitSet(buf[4], LOCALCOLORMAP)) { /* Global Colormap */ - readColorMap(gifFileP, cmapSize, &gifScreenP->ColorMap, + readColorMap(gifFileP, cmapSize, &gifScreenP->colorMap, &gifScreenP->hasGray, &gifScreenP->hasColor); if (verbose) { pm_message("Color map %s grays, %s colors", @@ -1756,15 +1765,15 @@ readGifHeader(FILE * const gifFileP, } } - if (gifScreenP->AspectRatio != 0 && gifScreenP->AspectRatio != 49) - warnUserNotSquare(gifScreenP->AspectRatio); + if (gifScreenP->aspectRatio != 0 && gifScreenP->aspectRatio != 49) + warnUserNotSquare(gifScreenP->aspectRatio); } static void readExtensions(FILE* const ifP, - struct gif89 * const gif89P, + struct Gif89 * const gif89P, bool * const eodP, const char ** const errorP) { /*---------------------------------------------------------------------------- @@ -1892,18 +1901,18 @@ readImageHeader(FILE * const ifP, static void validateWithinGlobalScreen(struct GifImageHeader const imageHeader, - struct gifScreen const gifScreen) { + struct GifScreen const gifScreen) { unsigned long int const rpos = imageHeader.lpos + imageHeader.cols; unsigned long int const bpos = imageHeader.tpos + imageHeader.rows; - if (rpos > gifScreen.Width) + if (rpos > gifScreen.width) pm_error("Image right end (%lu) is outside global screen: %u x %u", - rpos, gifScreen.Width, gifScreen.Height); - if (bpos > gifScreen.Height) + rpos, gifScreen.width, gifScreen.height); + if (bpos > gifScreen.height) pm_error("Image bottom end (%lu) is outside global screen: " "%u x %u", - bpos, gifScreen.Width, gifScreen.Height); + bpos, gifScreen.width, gifScreen.height); } @@ -1928,8 +1937,8 @@ convertImage(FILE * const ifP, bool const skipIt, FILE * const imageoutFileP, FILE * const alphafileP, - struct gifScreen const gifScreen, - struct gif89 const gif89, + struct GifScreen const gifScreen, + struct Gif89 const gif89, bool const tolerateBadInput) { /*---------------------------------------------------------------------------- Read a single GIF image from the current position of file 'ifP'. @@ -1948,7 +1957,7 @@ convertImage(FILE * const ifP, validateWithinGlobalScreen(imageHeader, gifScreen); if (imageHeader.useGlobalColormap) { - currentColorMapP = &gifScreen.ColorMap; + currentColorMapP = &gifScreen.colorMap; hasGray = gifScreen.hasGray; hasColor = gifScreen.hasColor; } else { @@ -2020,8 +2029,8 @@ convertImages(FILE * const ifP, /* Sequence within GIF stream of image we are currently processing. First is 0. */ - struct gifScreen gifScreen; - struct gif89 gif89; + struct GifScreen gifScreen; + struct Gif89 gif89; bool eod; /* We've read through the GIF terminator character */ @@ -2065,7 +2074,7 @@ convertImages(FILE * const ifP, int main(int argc, char **argv) { - struct cmdlineInfo cmdline; + struct CmdlineInfo cmdline; FILE * ifP; FILE * alphaFileP; FILE * imageOutFileP; -- cgit 1.4.1