diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-03-27 01:38:28 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-03-27 01:38:28 +0000 |
| commit | 367c9cb514c9da766488b9bdb218a18e31cb7624 (patch) | |
| tree | f9e343be94161a4837f0f1c1d072a35538ae0f63 /generator/pamgradient.c | |
| parent | 6e88e3326cb0c7f7975b56189278cab3f84ba1bd (diff) | |
| download | netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.tar.gz netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.tar.xz netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.zip | |
Promote Stable (10.47) to Super Stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@2691 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'generator/pamgradient.c')
| -rw-r--r-- | generator/pamgradient.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/generator/pamgradient.c b/generator/pamgradient.c index 08db86e3..aa559d27 100644 --- a/generator/pamgradient.c +++ b/generator/pamgradient.c @@ -1,5 +1,6 @@ #include <string.h> +#include "pm_c_util.h" #include "pam.h" #include "shhopt.h" #include "mallocvar.h" @@ -11,7 +12,6 @@ struct cmdlineInfo { tuple colorTopRight; tuple colorBottomLeft; tuple colorBottomRight; - unsigned depth; unsigned int cols; unsigned int rows; unsigned int maxval; @@ -121,8 +121,7 @@ interpolate(struct pam * const pamP, static int -isgray(struct pam * const pamP, - tuple const color) { +isgray(tuple const color) { return (color[PAM_RED_PLANE] == color[PAM_GRN_PLANE]) && (color[PAM_RED_PLANE] == color[PAM_BLU_PLANE]); @@ -176,10 +175,10 @@ main(int argc, char *argv[]) { pam.maxval = cmdline.maxval; pam.bytes_per_sample = pnm_bytespersample(pam.maxval); pam.format = PAM_FORMAT; - if (isgray(&pam, cmdline.colorTopLeft) - && isgray(&pam, cmdline.colorTopRight) - && isgray(&pam, cmdline.colorBottomLeft) - && isgray(&pam, cmdline.colorBottomRight)) { + if (isgray(cmdline.colorTopLeft) + && isgray(cmdline.colorTopRight) + && isgray(cmdline.colorBottomLeft) + && isgray(cmdline.colorBottomRight)) { pam.depth = 1; strcpy(pam.tuple_type, PAM_PGM_TUPLETYPE); } else { |