diff options
| author | Antonin Descampe <antonin@gmail.com> | 2011-05-18 11:02:27 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2011-05-18 11:02:27 +0000 |
| commit | 88f43b15fab0c75c10635c9e3d6381e5d716b8e9 (patch) | |
| tree | dd05218cd57a6d2de5bfc10db1e777f84e31d314 /applications/codec/convert.c | |
| parent | 0c9f6a3ac9ede04eb6faf96b7d7a9586c551a9c2 (diff) | |
defined new type "opj_bool", and new constants OPJ_FALSE and OPJ_TRUE, to avoid having to deal with "stdbool.h" (patch from Winfried)
Diffstat (limited to 'applications/codec/convert.c')
| -rw-r--r-- | applications/codec/convert.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/applications/codec/convert.c b/applications/codec/convert.c index d9a45b9a..8c40b0ac 100644 --- a/applications/codec/convert.c +++ b/applications/codec/convert.c @@ -140,7 +140,7 @@ int tga_readheader(FILE *fp, unsigned int *bits_per_pixel, } int tga_writeheader(FILE *fp, int bits_per_pixel, int width, int height, - bool flip_image) + opj_bool flip_image) { tga_header tga; @@ -173,8 +173,8 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { opj_image_cmptparm_t cmptparm[4]; /* maximum 4 components */ int numcomps; OPJ_COLOR_SPACE color_space; - bool mono ; - bool save_alpha; + opj_bool mono ; + opj_bool save_alpha; int subsampling_dx, subsampling_dy; int i; @@ -282,7 +282,7 @@ opj_image_t* tgatoimage(const char *filename, opj_cparameters_t *parameters) { int imagetotga(opj_image_t * image, const char *outfile) { int width, height, bpp, x, y; - bool write_alpha; + opj_bool write_alpha; int i; unsigned int alpha_channel; float r,g,b,a; @@ -313,7 +313,7 @@ int imagetotga(opj_image_t * image, const char *outfile) { // Write TGA header bpp = write_alpha ? 32 : 24; - if (!tga_writeheader(fdest, bpp, width , height, true)) + if (!tga_writeheader(fdest, bpp, width , height, OPJ_TRUE)) return 1; alpha_channel = image->numcomps-1; |