diff options
| author | Antonin Descampe <antonin@gmail.com> | 2005-11-01 10:15:34 +0000 |
|---|---|---|
| committer | Antonin Descampe <antonin@gmail.com> | 2005-11-01 10:15:34 +0000 |
| commit | 8f3bd54c3dd0403aae45abccdcc850eab5faeb6a (patch) | |
| tree | 7a8c3aa95f4990d26a65eff5f515fd22deb24577 /libopenjpeg/t2.c | |
| parent | 18a9bcb882b9af492714ff122a6b403961a2dfb3 (diff) | |
Changes proposed by Mathieu Malaterre from the GDCM project... Thanks a lot Mathieu
- '//' replaced by '/* */'
- inclusion of int.h in int.c
- inclusion of j2k.h in int.h in order to export symbols
- adding (void) var when a variable is declared but not used
- some explicit cast
- CLOCKS_PER_SEC is declared as float in bcc55, so there is a need to cast it to int for the modulo operation
- some variables changed from float -> double
Diffstat (limited to 'libopenjpeg/t2.c')
| -rw-r--r-- | libopenjpeg/t2.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/libopenjpeg/t2.c b/libopenjpeg/t2.c index d3f1e4fc..82eae95c 100644 --- a/libopenjpeg/t2.c +++ b/libopenjpeg/t2.c @@ -314,11 +314,11 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, - //Add Antonin : sizebug1 + /*Add Antonin : sizebug1*/ if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue; - //ddA + /*ddA*/ tgt_reset(prc->incltree); @@ -332,7 +332,7 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, - // SOP markers + /* SOP markers*/ if (tcp->csty & J2K_CP_CSTY_SOP) { @@ -346,7 +346,7 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, } - //TODO : check the Nsop value + /*TODO : check the Nsop value*/ } @@ -358,10 +358,10 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, if (cp->ppm == 1) { /* PPM */ hd = cp->ppm_data; - bio_init_dec(hd, cp->ppm_len); //Mod Antonin : ppmbug1 + bio_init_dec(hd, cp->ppm_len); /*Mod Antonin : ppmbug1*/ } else if (tcp->ppt == 1) { /* PPT */ hd = tcp->ppt_data; - bio_init_dec(hd, tcp->ppt_len); //Mod Antonin : ppmbug1 + bio_init_dec(hd, tcp->ppt_len); /*Mod Antonin : ppmbug1*/ } else { /* Normal Case */ hd = c; @@ -379,7 +379,7 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, - // EPH markers + /* EPH markers*/ if (tcp->csty & J2K_CP_CSTY_EPH) { @@ -419,11 +419,11 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, - //Add Antonin : sizebug1 + /*Add Antonin : sizebug1*/ if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue; - //ddA + /*ddA*/ for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) { @@ -484,7 +484,7 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, hd += bio_numbytes(); - // EPH markers + /* EPH markers*/ if (tcp->csty & J2K_CP_CSTY_EPH) { if ((*hd) != 0xff || (*(hd + 1) != 0x92)) { fprintf(stderr,"Error : expected EPH marker\n"); @@ -520,11 +520,11 @@ int t2_decode_packet(unsigned char *src, int len, tcd_tile_t * tile, - //Add Antonin : sizebug1 + /*Add Antonin : sizebug1*/ if ((band->x1-band->x0 == 0)||(band->y1-band->y0 == 0)) continue; - //ddA + /*ddA*/ for (cblkno = 0; cblkno < prc->cw * prc->ch; cblkno++) { |