From 429447c0f9bc630946c2e8bf23cecbeadbfc04f3 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sun, 8 Apr 2018 17:54:30 +0000 Subject: whitespace git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3197 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- lib/libpamn.c | 98 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'lib/libpamn.c') diff --git a/lib/libpamn.c b/lib/libpamn.c index 26dbbfe3..ce844c7f 100644 --- a/lib/libpamn.c +++ b/lib/libpamn.c @@ -52,10 +52,10 @@ allocpamrown(const struct pam * const pamP, /* Now we initialize the pointers to the individual tuples to make this a regulation C two dimensional array. */ - + unsigned char * p; unsigned int i; - + p = (unsigned char*) (tuplerown + pamP->width); /* location of Tuple 0 */ for (i = 0; i < pamP->width; ++i) { @@ -93,7 +93,7 @@ pnm_allocpamrown(const struct pam * const pamP) { static void -readpbmrow(const struct pam * const pamP, +readpbmrow(const struct pam * const pamP, tuplen * const tuplenrow) { bit * bitrow; @@ -101,7 +101,7 @@ readpbmrow(const struct pam * const pamP, jmp_buf * origJmpbufP; bitrow = pbm_allocrow(pamP->width); - + if (setjmp(jmpbuf) != 0) { pbm_freerow(bitrow); pm_setjmpbuf(origJmpbufP); @@ -123,15 +123,15 @@ readpbmrow(const struct pam * const pamP, static void -readpamrow(const struct pam * const pamP, +readpamrow(const struct pam * const pamP, tuplen * const tuplenrow) { jmp_buf jmpbuf; jmp_buf * origJmpbufP; tuple * tuplerow; - + tuplerow = pnm_allocpamrow(pamP); - + if (setjmp(jmpbuf) != 0) { pnm_freepamrow(tuplerow); pm_setjmpbuf(origJmpbufP); @@ -159,13 +159,13 @@ readpamrow(const struct pam * const pamP, -void -pnm_readpamrown(const struct pam * const pamP, +void +pnm_readpamrown(const struct pam * const pamP, tuplen * const tuplenrow) { - /* For speed, we don't check any of the inputs for consistency + /* For speed, we don't check any of the inputs for consistency here (unless it's necessary to avoid crashing). Any consistency - checking should have been done by a prior call to + checking should have been done by a prior call to pnm_writepaminit(). */ assert(pamP->maxval != 0); @@ -186,7 +186,7 @@ pnm_readpamrown(const struct pam * const pamP, static void -writepbmrow(const struct pam * const pamP, +writepbmrow(const struct pam * const pamP, const tuplen * const tuplenrow) { jmp_buf jmpbuf; @@ -206,26 +206,26 @@ writepbmrow(const struct pam * const pamP, for (col = 0; col < pamP->width; ++col) bitrow[col] = tuplenrow[col][0] < 0.5 ? PBM_BLACK : PBM_WHITE; - pbm_writepbmrow(pamP->file, bitrow, pamP->width, + pbm_writepbmrow(pamP->file, bitrow, pamP->width, pamP->format == PBM_FORMAT); pm_setjmpbuf(origJmpbufP); } pbm_freerow(bitrow); -} +} static void -writepamrow(const struct pam * const pamP, +writepamrow(const struct pam * const pamP, const tuplen * const tuplenrow) { jmp_buf jmpbuf; jmp_buf * origJmpbufP; tuple * tuplerow; - + tuplerow = pnm_allocpamrow(pamP); - + if (setjmp(jmpbuf) != 0) { pnm_freepamrow(tuplerow); pm_setjmpbuf(origJmpbufP); @@ -240,7 +240,7 @@ writepamrow(const struct pam * const pamP, for (plane = 0; plane < pamP->depth; ++plane) tuplerow[col][plane] = (sample) (tuplenrow[col][plane] * pamP->maxval + 0.5); - } + } pnm_writepamrow(pamP, tuplerow); pm_setjmpbuf(origJmpbufP); @@ -250,13 +250,13 @@ writepamrow(const struct pam * const pamP, -void -pnm_writepamrown(const struct pam * const pamP, +void +pnm_writepamrown(const struct pam * const pamP, const tuplen * const tuplenrow) { - /* For speed, we don't check any of the inputs for consistency + /* For speed, we don't check any of the inputs for consistency here (unless it's necessary to avoid crashing). Any consistency - checking should have been done by a prior call to + checking should have been done by a prior call to pnm_writepaminit(). */ assert(pamP->maxval != 0); @@ -274,16 +274,16 @@ pnm_writepamrown(const struct pam * const pamP, tuplen ** pnm_allocpamarrayn(const struct pam * const pamP) { - + tuplen ** tuplenarray; const char * error; /* If the speed of this is ever an issue, it might be sped up a little by allocating one large chunk. */ - + MALLOCARRAY(tuplenarray, pamP->height); - if (tuplenarray == NULL) + if (tuplenarray == NULL) pm_asprintf(&error, "Out of memory allocating the row pointer section of " "a %u row array", pamP->height); @@ -317,7 +317,7 @@ pnm_allocpamarrayn(const struct pam * const pamP) { void -pnm_freepamarrayn(tuplen ** const tuplenarray, +pnm_freepamarrayn(tuplen ** const tuplenarray, const struct pam * const pamP) { int row; @@ -329,9 +329,9 @@ pnm_freepamarrayn(tuplen ** const tuplenarray, -tuplen** -pnm_readpamn(FILE * const file, - struct pam * const pamP, +tuplen** +pnm_readpamn(FILE * const file, + struct pam * const pamP, int const size) { tuplen **tuplenarray; @@ -339,9 +339,9 @@ pnm_readpamn(FILE * const file, jmp_buf * origJmpbufP; pnm_readpaminit(file, pamP, size); - + tuplenarray = pnm_allocpamarrayn(pamP); - + if (setjmp(jmpbuf) != 0) { pnm_freepamarrayn(tuplenarray, pamP); pm_setjmpbuf(origJmpbufP); @@ -351,7 +351,7 @@ pnm_readpamn(FILE * const file, pm_setjmpbufsave(&jmpbuf, &origJmpbufP); - for (row = 0; row < pamP->height; ++row) + for (row = 0; row < pamP->height; ++row) pnm_readpamrown(pamP, tuplenarray[row]); pm_setjmpbuf(origJmpbufP); @@ -361,15 +361,15 @@ pnm_readpamn(FILE * const file, -void -pnm_writepamn(struct pam * const pamP, +void +pnm_writepamn(struct pam * const pamP, tuplen ** const tuplenarray) { unsigned int row; pnm_writepaminit(pamP); - - for (row = 0; row < pamP->height; ++row) + + for (row = 0; row < pamP->height; ++row) pnm_writepamrown(pamP, tuplenarray[row]); } @@ -382,7 +382,7 @@ pnm_normalizetuple(struct pam * const pamP, unsigned int plane; - for (plane = 0; plane < pamP->depth; ++plane) + for (plane = 0; plane < pamP->depth; ++plane) tuplen[plane] = (samplen)tuple[plane] / pamP->maxval; } @@ -395,7 +395,7 @@ pnm_unnormalizetuple(struct pam * const pamP, unsigned int plane; - for (plane = 0; plane < pamP->depth; ++plane) + for (plane = 0; plane < pamP->depth; ++plane) tuple[plane] = tuplen[plane] * pamP->maxval + 0.5; } @@ -412,7 +412,7 @@ pnm_normalizeRow(struct pam * const pamP, once here so we can multiply many times later. */ unsigned int plane; - + for (plane = 0; plane < pamP->depth; ++plane) { if (transform && transform[plane]) { unsigned int col; @@ -437,14 +437,14 @@ reversemap(samplen const samplen, /*---------------------------------------------------------------------------- Find the integer sample value that maps to the normalized samplen value 'samplen' through the map 'transformMap'. We interpret the map as - mapping the value N+1 to all the values transformMap[N] through + mapping the value N+1 to all the values transformMap[N] through transformMap[N+1], and we expect transformMap[N+1] to be greater than transformMap[N] for all N. -----------------------------------------------------------------------------*/ /* Do a binary search, since the values are in sorted (increasing) order */ - + sample low, high; low = 0; high = maxval; /* Consider whole range to start */ @@ -471,18 +471,18 @@ pnm_unnormalizeRow(struct pam * const pamP, tuple * const tuplerow) { unsigned int plane; - + for (plane = 0; plane < pamP->depth; ++plane) { if (transform && transform[plane]) { unsigned int col; for (col = 0; col < pamP->width; ++col) - tuplerow[col][plane] = - reversemap(tuplenrow[col][plane], + tuplerow[col][plane] = + reversemap(tuplenrow[col][plane], transform[plane], pamP->maxval); } else { unsigned int col; for (col = 0; col < pamP->width; ++col) - tuplerow[col][plane] = + tuplerow[col][plane] = tuplenrow[col][plane] * pamP->maxval + 0.5; } } @@ -500,13 +500,13 @@ gammaCommon(struct pam * const pamP, unsigned int plane; unsigned int opacityPlane; int haveOpacity; - + pnm_getopacity(pamP, &haveOpacity, &opacityPlane); for (plane = 0; plane < pamP->depth; ++plane) { if (haveOpacity && plane == opacityPlane) { /* It's an opacity (alpha) plane, which means there is - no gamma adjustment in it. + no gamma adjustment in it. */ } else { unsigned int col; @@ -550,7 +550,7 @@ applyopacityCommon(enum applyUnapply const applyUnapply, -----------------------------------------------------------------------------*/ unsigned int opacityPlane; int haveOpacity; - + pnm_getopacity(pamP, &haveOpacity, &opacityPlane); if (haveOpacity) { @@ -657,7 +657,7 @@ createUngammaMapOffset(const struct pam * const pamP, retval[plane] = NULL; else retval[plane] = ungammaTransformMap; - } + } fillInMap(ungammaTransformMap, pamP->maxval, offset); } else { free(retval); -- cgit 1.4.1