walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] finalize bio.c/.h related to the v2 style

This commit is contained in:
Mickael Savinaud 2012-10-24 09:09:37 +00:00
parent b4b451863d
commit 12c4e68058
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lib/openjp2/bio.c
View File

@ -78,7 +78,7 @@ opj_bool opj_bio_byteout(opj_bio_t *bio) {
if (bio->bp >= bio->end) { if (bio->bp >= bio->end) {
return OPJ_FALSE; return OPJ_FALSE;
} }
*bio->bp++ = (unsigned char)(bio->buf >> 8); /* TODO MSD: check this conversion */ *bio->bp++ = (OPJ_BYTE)(bio->buf >> 8);
return OPJ_TRUE; return OPJ_TRUE;
} }
@ -94,7 +94,7 @@ opj_bool opj_bio_bytein(opj_bio_t *bio) {
void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) { void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
if (bio->ct == 0) { if (bio->ct == 0) {
opj_bio_byteout(bio); /* TODO_MSD: check this line */ opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */
} }
bio->ct--; bio->ct--;
bio->buf |= b << bio->ct; bio->buf |= b << bio->ct;
@ -102,7 +102,7 @@ void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) { OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
if (bio->ct == 0) { if (bio->ct == 0) {
opj_bio_bytein(bio); /* TODO_MSD: check this line */ opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */
} }
bio->ct--; bio->ct--;
return (bio->buf >> bio->ct) & 1; return (bio->buf >> bio->ct) & 1;

2
src/lib/openjp2/bio.h
View File

@ -57,7 +57,7 @@ typedef struct opj_bio {
/** temporary place where each byte is read or written */ /** temporary place where each byte is read or written */
OPJ_UINT32 buf; OPJ_UINT32 buf;
/** coder : number of bits free to write. decoder : number of bits read */ /** coder : number of bits free to write. decoder : number of bits read */
int ct; OPJ_UINT32 ct;
} opj_bio_t; } opj_bio_t;
/** @name Exported functions */ /** @name Exported functions */