diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-11-27 16:46:50 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2006-11-27 16:46:50 +0000 |
commit | 49a61bec1215b4ef9e12f305aec84cb0ee2e2198 (patch) | |
tree | 344ea69a515961d80361b5f488aab0d3d455e16d | |
parent | ac9154458a06c8ff990fa064981c15668d8d8124 (diff) | |
download | netpbm-mirror-49a61bec1215b4ef9e12f305aec84cb0ee2e2198.tar.gz netpbm-mirror-49a61bec1215b4ef9e12f305aec84cb0ee2e2198.tar.xz netpbm-mirror-49a61bec1215b4ef9e12f305aec84cb0ee2e2198.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@150 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r-- | lib/libpnm3.c | 60 | ||||
-rw-r--r-- | lib/pnm.h | 6 |
2 files changed, 33 insertions, 33 deletions
diff --git a/lib/libpnm3.c b/lib/libpnm3.c index bc55ae3e..80ccadfa 100644 --- a/lib/libpnm3.c +++ b/lib/libpnm3.c @@ -142,57 +142,57 @@ pnm_backgroundxelrow( xel* xelrow, int cols, xelval maxval, int format ) return bgxel; } + + xel -pnm_whitexel( xelval maxval, int format ) - { - xel x; +pnm_whitexel(xelval const maxval, + int const format) { - switch ( PNM_FORMAT_TYPE(format) ) - { + xel retval; + + switch (PNM_FORMAT_TYPE(format)) { case PPM_TYPE: - PPM_ASSIGN( x, maxval, maxval, maxval ); - break; + PPM_ASSIGN(retval, maxval, maxval, maxval); + break; case PGM_TYPE: - PNM_ASSIGN1( x, maxval ); - break; - case PBM_TYPE: - PNM_ASSIGN1( x, maxval ); - break; + PNM_ASSIGN1(retval, maxval); + break; default: - pm_error( "Invalid format passed to pnm_whitexel()"); + pm_error("Invalid format %d passed to pnm_whitexel()", format); } - return x; - } + return retval; +} + + xel -pnm_blackxel( xelval maxval, int format ) - { - xel x; +pnm_blackxel(xelval const maxval, + int const format) { - switch ( PNM_FORMAT_TYPE(format) ) - { + xel retval; + + switch (PNM_FORMAT_TYPE(format)) { case PPM_TYPE: - PPM_ASSIGN( x, 0, 0, 0 ); - break; + PPM_ASSIGN(retval, 0, 0, 0); + break; case PGM_TYPE: - PNM_ASSIGN1( x, (xelval) 0 ); - break; - case PBM_TYPE: - PNM_ASSIGN1( x, (xelval) 0 ); - break; + PNM_ASSIGN1(retval, 0); + break; default: - pm_error( "Invalid format passed to pnm_blackxel(): %d", format); + pm_error("Invalid format %d passed to pnm_blackxel()", format); } + + return retval; +} + - return x; - } void pnm_invertxel(xel* const xP, diff --git a/lib/pnm.h b/lib/pnm.h index d3b6f84f..f4469bf5 100644 --- a/lib/pnm.h +++ b/lib/pnm.h @@ -100,13 +100,13 @@ pnm_writepnm(FILE * const fileP, int const forceplain); xel -pnm_backgroundxel (xel** xels, int cols, int rows, xelval maxval, int format); +pnm_backgroundxel(xel** xels, int cols, int rows, xelval maxval, int format); xel -pnm_backgroundxelrow (xel* xelrow, int cols, xelval maxval, int format); +pnm_backgroundxelrow(xel* xelrow, int cols, xelval maxval, int format); xel -pnm_whitexel (xelval maxval, int format); +pnm_whitexel(xelval maxval, int format); xel pnm_blackxel(xelval maxval, int format); |