diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-19 15:53:04 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-06-19 15:53:04 +0000 |
| commit | a4b7c7bd2ab30a51d6b231c80ecd575e8c551654 (patch) | |
| tree | 8e09ac2ac4453db5af16b73a05216766bff73973 /lib | |
| parent | 8f3545ad1087e4466feff3bb4c308dcece9077be (diff) | |
| download | netpbm-mirror-a4b7c7bd2ab30a51d6b231c80ecd575e8c551654.tar.gz netpbm-mirror-a4b7c7bd2ab30a51d6b231c80ecd575e8c551654.tar.xz netpbm-mirror-a4b7c7bd2ab30a51d6b231c80ecd575e8c551654.zip | |
cleanup
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1939 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libpammap.c | 2 | ||||
| -rw-r--r-- | lib/libpamn.c | 6 | ||||
| -rw-r--r-- | lib/util/pm_c_util.h | 4 |
3 files changed, 8 insertions, 4 deletions
diff --git a/lib/libpammap.c b/lib/libpammap.c index 66aa6fc0..ef373e81 100644 --- a/lib/libpammap.c +++ b/lib/libpammap.c @@ -574,7 +574,7 @@ pnm_computetupletablehash(struct pam * const pamP, -----------------------------------------------------------------------------*/ tuplehash tupletablehash; unsigned int i; - bool fits; + int fits; tupletablehash = pnm_createtuplehash(); diff --git a/lib/libpamn.c b/lib/libpamn.c index bd3fab21..b30bde53 100644 --- a/lib/libpamn.c +++ b/lib/libpamn.c @@ -498,7 +498,7 @@ gammaCommon(struct pam * const pamP, unsigned int plane; unsigned int opacityPlane; - bool haveOpacity; + int haveOpacity; pnm_getopacity(pamP, &haveOpacity, &opacityPlane); @@ -548,7 +548,7 @@ applyopacityCommon(enum applyUnapply const applyUnapply, if the foreground values had already been so multiplied. -----------------------------------------------------------------------------*/ unsigned int opacityPlane; - bool haveOpacity; + int haveOpacity; pnm_getopacity(pamP, &haveOpacity, &opacityPlane); @@ -645,7 +645,7 @@ createUngammaMapOffset(const struct pam * const pamP, MALLOCARRAY(ungammaTransformMap, pamP->maxval+1); if (ungammaTransformMap != NULL) { - bool haveOpacity; + int haveOpacity; unsigned int opacityPlane; unsigned int plane; diff --git a/lib/util/pm_c_util.h b/lib/util/pm_c_util.h index f17d1e03..6fec12ff 100644 --- a/lib/util/pm_c_util.h +++ b/lib/util/pm_c_util.h @@ -63,6 +63,9 @@ #endif /* C++ has a bool type and false and true constants built in. */ #ifndef __cplusplus +#ifndef NOT_EXPERIMENTING +#include <stdbool.h> /* DEBUG */ +#else #ifndef HAVE_BOOL #define HAVE_BOOL 1 typedef int bool; @@ -71,6 +74,7 @@ enum boolvalue {false=0, true=1}; #endif #endif +#endif #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) |