diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2011-04-26 15:46:10 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2011-04-26 15:46:10 +0000 |
commit | 27523d1e4f5d136bc2685ad055e4b17264f73a16 (patch) | |
tree | 8c40cfe5c9d2a3c15d9d0debcdf5c45da72b148f /converter/other | |
parent | 56b5a6eaae4442ebeb73ad925d4ceaa863f4f56d (diff) | |
download | netpbm-mirror-27523d1e4f5d136bc2685ad055e4b17264f73a16.tar.gz netpbm-mirror-27523d1e4f5d136bc2685ad055e4b17264f73a16.tar.xz netpbm-mirror-27523d1e4f5d136bc2685ad055e4b17264f73a16.zip |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1476 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
-rw-r--r-- | converter/other/pdbimgtopam.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/converter/other/pdbimgtopam.c b/converter/other/pdbimgtopam.c index 6b7c6008..3cb4129a 100644 --- a/converter/other/pdbimgtopam.c +++ b/converter/other/pdbimgtopam.c @@ -637,19 +637,19 @@ munpack(const uint8_t * const p, static void -ipdb_g16row(IPDB * const pdbP, - unsigned int const row, - uint8_t * const buffer) { - +g16row(IPDB * const pdbP, + unsigned int const row, + uint8_t * const buffer) { + g16unpack(ipdb_img_row(pdbP->i, row), buffer, ipdb_width(pdbP)); } static void -ipdb_grow(IPDB * const pdbP, - unsigned int const row, - uint8_t * const buffer) { +grow(IPDB * const pdbP, + unsigned int const row, + uint8_t * const buffer) { gunpack(ipdb_img_row(pdbP->i, row), buffer, ipdb_width(pdbP)); } @@ -657,9 +657,9 @@ ipdb_grow(IPDB * const pdbP, static void -ipdb_mrow(IPDB * const pdbP, - unsigned int const row, - uint8_t * const buffer) { +mrow(IPDB * const pdbP, + unsigned int const row, + uint8_t * const buffer) { munpack(ipdb_img_row(pdbP->i, row), buffer, ipdb_width(pdbP)); } @@ -667,7 +667,7 @@ ipdb_mrow(IPDB * const pdbP, static void -writePdbImg(IPDB * const pdbP, +writeImgPam(IPDB * const pdbP, FILE * const ofP) { struct pam pam; @@ -700,11 +700,11 @@ writePdbImg(IPDB * const pdbP, if (ipdb_type(pdbP) == IMG_MONO) - ipdb_mrow(pdbP, row, imgRow); + mrow(pdbP, row, imgRow); else if (ipdb_type(pdbP) == IMG_GRAY) - ipdb_grow(pdbP, row, imgRow); + grow(pdbP, row, imgRow); else - ipdb_g16row(pdbP, row, imgRow); + g16row(pdbP, row, imgRow); for (col = 0; col < pam.width; ++col) tupleRow[col][0] = imgRow[col]; @@ -719,8 +719,8 @@ writePdbImg(IPDB * const pdbP, static void -writetxt(IPDB * const pdbP, - const char * const name) { +writeText(IPDB * const pdbP, + const char * const name) { const char * const note = ipdb_text(pdbP); @@ -762,9 +762,9 @@ main(int argc, const char ** argv) { if (status != 0) pm_error("Image header read error: %s.", ipdb_err(status)); - writePdbImg(pdbP, stdout); + writeImgPam(pdbP, stdout); - writetxt(pdbP, cmdline.notefile); + writeText(pdbP, cmdline.notefile); ipdb_free(pdbP); |