diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 16:24:39 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-10-29 16:24:39 +0000 |
| commit | 82d29d4c2a56dabfcb66b64d9d9c498e1d78e77c (patch) | |
| tree | 45ae08c9bde188f3f79be3260cd72ba431c29685 /src/bin | |
| parent | 1a5791750be5f96591d22efc137083cdee0eaeec (diff) | |
[trunk] Remove bool.h, use opj_bool instead
Fix remaining opj_calloc/malloc/free issues
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jpip/opj_jpip_transcode.c | 8 | ||||
| -rw-r--r-- | src/bin/jpip/opj_server.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/bin/jpip/opj_jpip_transcode.c b/src/bin/jpip/opj_jpip_transcode.c index 55ec2182..825c087a 100644 --- a/src/bin/jpip/opj_jpip_transcode.c +++ b/src/bin/jpip/opj_jpip_transcode.c @@ -53,7 +53,7 @@ static int jpip_to_jp2(int argc,char *argv[]) return -1; } - dec = init_jpipdecoder( true); + dec = init_jpipdecoder( OPJ_TRUE); if(!( fread_jpip( argv[1], dec))) return -1; @@ -63,7 +63,7 @@ static int jpip_to_jp2(int argc,char *argv[]) if(!(fwrite_jp2k( argv[2], dec))) return -1; - output_log( true, false, true, dec); + output_log( OPJ_TRUE, OPJ_FALSE, OPJ_TRUE, dec); destroy_jpipdecoder( &dec); @@ -92,7 +92,7 @@ static int jpip_to_j2k(int argc,char *argv[]) return -1; } - dec = init_jpipdecoder( false); + dec = init_jpipdecoder( OPJ_FALSE); if(!( fread_jpip( argv[1], dec))) return -1; @@ -102,7 +102,7 @@ static int jpip_to_j2k(int argc,char *argv[]) if(!( fwrite_jp2k( argv[2], dec))) return -1; - /* output_log( true, false, false, dec); */ + /* output_log( OPJ_TRUE, OPJ_FALSE, OPJ_FALSE, dec); */ destroy_jpipdecoder( &dec); diff --git a/src/bin/jpip/opj_server.c b/src/bin/jpip/opj_server.c index 1666a94f..b5cc87d7 100644 --- a/src/bin/jpip/opj_server.c +++ b/src/bin/jpip/opj_server.c @@ -84,7 +84,7 @@ int main(void) #endif { QR_t *qr; - bool parse_status; + opj_bool parse_status; #ifdef SERVER query_string = getenv("QUERY_STRING"); @@ -98,7 +98,7 @@ int main(void) parse_status = process_JPIPrequest( server_record, qr); #ifndef SERVER - local_log( true, true, parse_status, false, qr, server_record); + local_log( OPJ_TRUE, OPJ_TRUE, parse_status, OPJ_FALSE, qr, server_record); #endif if( parse_status) |