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 /lib/pam.h | |
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 'lib/pam.h')
-rw-r--r-- | lib/pam.h | 37 |
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/pam.h b/lib/pam.h index 3bad05e8..c28c5c2c 100644 --- a/lib/pam.h +++ b/lib/pam.h @@ -6,8 +6,8 @@ #ifndef PAM_H #define PAM_H -#include "pm.h" -#include "pnm.h" +#include <netpbm/pm.h> +#include <netpbm/pnm.h> #ifdef __cplusplus extern "C" { @@ -23,16 +23,16 @@ typedef unsigned long sample; */ struct pam { -/* This structure describes an open PAM image file. It consists - entirely of information that belongs in the header of a PAM image - and filesystem information. It does not contain any state - information about the processing of that image. - - This is not considered to be an opaque object. The user of Netbpm - libraries is free to access and set any of these fields whenever - appropriate. The structure exists to make coding of function calls - easy. -*/ + /* This structure describes an open PAM image file. It consists + entirely of information that belongs in the header of a PAM image + and filesystem information. It does not contain any state + information about the processing of that image. + + This is not considered to be an opaque object. The user of Netbpm + libraries is free to access and set any of these fields whenever + appropriate. The structure exists to make coding of function calls + easy. + */ /* 'size' and 'len' are necessary in order to provide forward and backward compatibility between library functions and calling programs @@ -44,7 +44,9 @@ struct pam { /* The length, in bytes, of the information in this structure. The information starts in the first byte and is contiguous. This cannot be greater than 'size' - */ + + Use PAM_STRUCT_SIZE() to compute or interpret a value for this. + */ FILE * file; int format; /* The format code of the raw image. This is PAM_FORMAT @@ -52,7 +54,7 @@ struct pam { image. Then it's PBM_FORMAT, RPBM_FORMAT, etc. */ unsigned int plainformat; - /* Logical: On output, use the plain version of the format type + /* Logical: On output, use plain version of the format type indicated by 'format'. Otherwise, use the raw version. (i.e., on output, the plainness information in 'format' is irrelevant). Input functions set this to FALSE, for the @@ -102,7 +104,7 @@ struct pam { On output, NULL means no comments. - On input, libnetpbm mallocs storage for the comments and placed + On input, libnetpbm mallocs storage for the comments and places the pointer at *comment_p. Caller must free it. NULL means libnetpbm does not return comments and does not allocate any storage. @@ -457,6 +459,11 @@ tuple pnm_parsecolor(const char * const colorname, sample const maxval); +const char * +pnm_colorname(struct pam * const pamP, + tuple const color, + int const hexok); + extern double pnm_lumin_factor[3]; |