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

track all declarations after statement for C90 compilers (VS2005)

This commit is contained in:
Mathieu Malaterre 2012-01-30 09:08:45 +00:00
parent aa00142949
commit 9c51a37dbf
5 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
applications/jpip/libopenjpip/boxheader_manager.h
View File

@ -34,12 +34,12 @@
#include "byte_manager.h" #include "byte_manager.h"
#include "box_manager.h" #include "box_manager.h"
//! box header parameters /** box header parameters*/
typedef struct boxheader_param{ typedef struct boxheader_param{
Byte_t headlen; //!< header length 8 or 16 Byte_t headlen; /**< header length 8 or 16*/
Byte8_t length; //!< length of the reference Box Byte8_t length; /**< length of the reference Box*/
char type[4]; //!< type of information in the DBox char type[4]; /**< type of information in the DBox*/
struct boxheader_param *next; //!< pointer to the next header box struct boxheader_param *next; /**< pointer to the next header box*/
} boxheader_param_t; } boxheader_param_t;

8
applications/jpip/libopenjpip/codestream_manager.h
View File

@ -33,11 +33,11 @@
#include "byte_manager.h" #include "byte_manager.h"
//! codestream parameters /** codestream parameters*/
typedef struct codestream_param{ typedef struct codestream_param{
int fd; //!< file descriptor int fd; /**< file descriptor*/
Byte8_t offset; //!< byte position of DBox (Box Contents) in the file Byte8_t offset; /**< byte position of DBox (Box Contents) in the file*/
Byte8_t length; //!< content length Byte8_t length; /**< content length*/
} codestream_param_t; } codestream_param_t;

55
applications/jpip/libopenjpip/index_manager.c
View File

@ -50,7 +50,7 @@
#define FCGI_stdout stdout #define FCGI_stdout stdout
#define FCGI_stderr stderr #define FCGI_stderr stderr
#define logstream stderr #define logstream stderr
#endif //SERVER #endif /*SERVER*/
/** /**
* chekc JP2 box indexing * chekc JP2 box indexing
@ -134,7 +134,7 @@ void print_index( index_param_t index)
print_faixbox( index.tilepart); print_faixbox( index.tilepart);
fprintf( logstream, "Tile header information: \n"); fprintf( logstream, "Tile header information: \n");
for( i=0; i<index.SIZ.XTnum*index.SIZ.YTnum ;i++) for( i=0; i<(int)(index.SIZ.XTnum*index.SIZ.YTnum);i++)
print_mhixbox( index.tileheader[i]); print_mhixbox( index.tileheader[i]);
fprintf( logstream, "Precinct packet information: \n"); fprintf( logstream, "Precinct packet information: \n");
@ -187,7 +187,7 @@ void delete_index( index_param_t **index)
delete_faixbox( &((*index)->tilepart)); delete_faixbox( &((*index)->tilepart));
for( i=0; i< (*index)->SIZ.XTnum*(*index)->SIZ.YTnum ;i++) for( i=0; i< (int)((*index)->SIZ.XTnum*(*index)->SIZ.YTnum);i++)
delete_mhixbox( &((*index)->tileheader[i])); delete_mhixbox( &((*index)->tileheader[i]));
free( (*index)->tileheader); free( (*index)->tileheader);
@ -208,6 +208,14 @@ bool check_JP2boxidx( boxlist_param_t *toplev_boxlist)
{ {
box_param_t *iptr, *fidx, *prxy; box_param_t *iptr, *fidx, *prxy;
box_param_t *cidx, *jp2c; box_param_t *cidx, *jp2c;
Byte8_t off;
Byte8_t len;
int pos;
Byte8_t ooff;
boxheader_param_t *obh;
Byte_t ni;
Byte8_t ioff;
boxheader_param_t *ibh;
iptr = search_box( "iptr", toplev_boxlist); iptr = search_box( "iptr", toplev_boxlist);
fidx = search_box( "fidx", toplev_boxlist); fidx = search_box( "fidx", toplev_boxlist);
@ -215,40 +223,39 @@ bool check_JP2boxidx( boxlist_param_t *toplev_boxlist)
jp2c = search_box( "jp2c", toplev_boxlist); jp2c = search_box( "jp2c", toplev_boxlist);
prxy = gene_childboxbyType( fidx, 0, "prxy"); prxy = gene_childboxbyType( fidx, 0, "prxy");
Byte8_t off = fetch_DBox8bytebigendian( iptr, 0); off = fetch_DBox8bytebigendian( iptr, 0);
if( off != fidx->offset) if( off != fidx->offset)
fprintf( FCGI_stderr, "Reference File Index box offset in Index Finder box not correct\n"); fprintf( FCGI_stderr, "Reference File Index box offset in Index Finder box not correct\n");
Byte8_t len = fetch_DBox8bytebigendian( iptr, 8); len = fetch_DBox8bytebigendian( iptr, 8);
if( len != fidx->length) if( len != fidx->length)
fprintf( FCGI_stderr, "Reference File Index box length in Index Finder box not correct\n"); fprintf( FCGI_stderr, "Reference File Index box length in Index Finder box not correct\n");
pos = 0;
int pos = 0; ooff = fetch_DBox8bytebigendian( prxy, pos);
Byte8_t ooff = fetch_DBox8bytebigendian( prxy, pos);
if( ooff != jp2c->offset) if( ooff != jp2c->offset)
fprintf( FCGI_stderr, "Reference jp2c offset in prxy box not correct\n"); fprintf( FCGI_stderr, "Reference jp2c offset in prxy box not correct\n");
pos += 8; pos += 8;
boxheader_param_t *obh = gene_childboxheader( prxy, pos); obh = gene_childboxheader( prxy, pos);
if( obh->length != jp2c->length || strncmp( obh->type, "jp2c",4)!=0) if( obh->length != jp2c->length || strncmp( obh->type, "jp2c",4)!=0)
fprintf( FCGI_stderr, "Reference jp2c header in prxy box not correct\n"); fprintf( FCGI_stderr, "Reference jp2c header in prxy box not correct\n");
pos += obh->headlen; pos += obh->headlen;
free(obh); free(obh);
Byte_t ni = fetch_DBox1byte( prxy, pos); ni = fetch_DBox1byte( prxy, pos);
if( ni != 1){ if( ni != 1){
fprintf( FCGI_stderr, "Multiple indexes not supported\n"); fprintf( FCGI_stderr, "Multiple indexes not supported\n");
return false; return false;
} }
pos += 1; pos += 1;
Byte8_t ioff = fetch_DBox8bytebigendian( prxy, pos); ioff = fetch_DBox8bytebigendian( prxy, pos);
if( ioff != cidx->offset) if( ioff != cidx->offset)
fprintf( FCGI_stderr, "Reference cidx offset in prxy box not correct\n"); fprintf( FCGI_stderr, "Reference cidx offset in prxy box not correct\n");
pos += 8; pos += 8;
boxheader_param_t *ibh = gene_childboxheader( prxy, pos); ibh = gene_childboxheader( prxy, pos);
if( ibh->length != cidx->length || strncmp( ibh->type, "cidx",4)!=0) if( ibh->length != cidx->length || strncmp( ibh->type, "cidx",4)!=0)
fprintf( FCGI_stderr, "Reference cidx header in prxy box not correct\n"); fprintf( FCGI_stderr, "Reference cidx header in prxy box not correct\n");
pos += ibh->headlen; pos += ibh->headlen;
@ -359,23 +366,23 @@ bool set_cidxdata( box_param_t *cidx_box, index_param_t *jp2idx)
bool set_cptrdata( box_param_t *cidx_box, index_param_t *jp2idx) bool set_cptrdata( box_param_t *cidx_box, index_param_t *jp2idx)
{ {
box_param_t *box; //!< cptr box box_param_t *box; /**< cptr box*/
Byte2_t dr, cont; Byte2_t dr, cont;
if( !(box = gene_boxbyType( cidx_box->fd, get_DBoxoff( cidx_box), get_DBoxlen( cidx_box), "cptr"))) if( !(box = gene_boxbyType( cidx_box->fd, get_DBoxoff( cidx_box), get_DBoxlen( cidx_box), "cptr")))
return false; return false;
// DR: Data Reference. /* DR: Data Reference. */
// If 0, the codestream or its Fragment Table box exists in the current file /* If 0, the codestream or its Fragment Table box exists in the current file*/
if(( dr = fetch_DBox2bytebigendian( box, 0))){ if(( dr = fetch_DBox2bytebigendian( box, 0))){
fprintf( FCGI_stderr, "Error: Codestream not present in current file\n"); fprintf( FCGI_stderr, "Error: Codestream not present in current file\n");
free( box); free( box);
return false; return false;
} }
// CONT: Container Type /* CONT: Container Type*/
// If 0, the entire codestream appears as a contiguous range of /* If 0, the entire codestream appears as a contiguous range of*/
// bytes within its file or resource. /* bytes within its file or resource.*/
if(( cont = fetch_DBox2bytebigendian( box, 2))){ if(( cont = fetch_DBox2bytebigendian( box, 2))){
fprintf( FCGI_stderr, "Error: Can't cope with fragmented codestreams yet\n"); fprintf( FCGI_stderr, "Error: Can't cope with fragmented codestreams yet\n");
free( box); free( box);
@ -443,8 +450,8 @@ bool set_mainmhixdata( box_param_t *cidx_box, codestream_param_t codestream, ind
bool set_tpixdata( box_param_t *cidx_box, index_param_t *jp2idx) bool set_tpixdata( box_param_t *cidx_box, index_param_t *jp2idx)
{ {
box_param_t *tpix_box; //!< tpix box box_param_t *tpix_box; /**< tpix box*/
box_param_t *faix_box; //!< faix box box_param_t *faix_box; /**< faix box*/
if( !(tpix_box = gene_boxbyType( cidx_box->fd, get_DBoxoff( cidx_box), get_DBoxlen( cidx_box), "tpix"))){ if( !(tpix_box = gene_boxbyType( cidx_box->fd, get_DBoxoff( cidx_box), get_DBoxlen( cidx_box), "tpix"))){
fprintf( FCGI_stderr, "Error: tpix box not present in cidx box\n"); fprintf( FCGI_stderr, "Error: tpix box not present in cidx box\n");
@ -518,9 +525,9 @@ bool set_thixdata( box_param_t *cidx_box, index_param_t *jp2idx)
bool set_ppixdata( box_param_t *cidx_box, index_param_t *jp2idx) bool set_ppixdata( box_param_t *cidx_box, index_param_t *jp2idx)
{ {
box_param_t *ppix_box, *faix_box, *manf_box; box_param_t *ppix_box, *faix_box, *manf_box;
manfbox_param_t *manf; //!< manf manfbox_param_t *manf; /**< manf*/
boxheader_param_t *bh; //!< box headers boxheader_param_t *bh; /**< box headers*/
faixbox_param_t *faix; //!< faix faixbox_param_t *faix; /**< faix*/
Byte8_t inbox_offset; Byte8_t inbox_offset;
int comp_idx; int comp_idx;
@ -630,7 +637,7 @@ bool set_CODmkrdata( markeridx_param_t *codmkidx, codestream_param_t codestream,
COD->YPsiz = (Byte4_t *)malloc( (COD->numOfdecomp+1)*sizeof(Byte4_t)); COD->YPsiz = (Byte4_t *)malloc( (COD->numOfdecomp+1)*sizeof(Byte4_t));
for( i=0; i<=COD->numOfdecomp; i++){ for( i=0; i<=COD->numOfdecomp; i++){
//precinct size /*precinct size*/
COD->XPsiz[i] = pow( 2, fetch_marker1byte( codmkr, 12+i) & 0x0F); COD->XPsiz[i] = pow( 2, fetch_marker1byte( codmkr, 12+i) & 0x0F);
COD->YPsiz[i] = pow( 2,(fetch_marker1byte( codmkr, 12+i) & 0xF0) >> 4); COD->YPsiz[i] = pow( 2,(fetch_marker1byte( codmkr, 12+i) & 0xF0) >> 4);
} }

6
applications/jpip/libopenjpip/manfbox_manager.h
View File

@ -36,10 +36,10 @@
#include "boxheader_manager.h" #include "boxheader_manager.h"
//! manifest box parameters /** manifest box parameters*/
//! I.3.2.3 Manifest box /** I.3.2.3 Manifest box*/
typedef struct manfbox_param{ typedef struct manfbox_param{
boxheader_param_t *first; //!< top of the box header list boxheader_param_t *first; /**< top of the box header list*/
} manfbox_param_t; } manfbox_param_t;

10
applications/jpip/libopenjpip/marker_manager.h
View File

@ -34,12 +34,12 @@
#include "codestream_manager.h" #include "codestream_manager.h"
//! Marker parameters /** Marker parameters*/
typedef struct marker_param{ typedef struct marker_param{
codestream_param_t cs; //!< corresponding codestream codestream_param_t cs; /**< corresponding codestream*/
Byte2_t code; //!< marker code Byte2_t code; /**< marker code*/
Byte8_t offset; //!< offset relative to the start of the codestream ( including the length parameter but not the marker itself) Byte8_t offset; /**< offset relative to the start of the codestream ( including the length parameter but not the marker itself)*/
Byte2_t length; //!< marker segment length Byte2_t length; /**< marker segment length*/
} marker_param_t; } marker_param_t;