diff options
Diffstat (limited to 'src/lib/openjpip/ihdrbox_manager.c')
| -rw-r--r-- | src/lib/openjpip/ihdrbox_manager.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/openjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c index 686e0ece..9eebf8f3 100644 --- a/src/lib/openjpip/ihdrbox_manager.c +++ b/src/lib/openjpip/ihdrbox_manager.c @@ -35,44 +35,44 @@ ihdrbox_param_t * gene_ihdrbox( metadatalist_param_t *metadatalist, Byte_t *jpipstream) { - ihdrbox_param_t *ihdrbox; - metadata_param_t *meta; - box_param_t *jp2h, *ihdr; - int bpc_val; - - jp2h = NULL; - meta = metadatalist->first; - while( meta){ - if( meta->boxlist){ - jp2h = search_box( "jp2h", meta->boxlist); - if( jp2h) - break; + ihdrbox_param_t *ihdrbox; + metadata_param_t *meta; + box_param_t *jp2h, *ihdr; + int bpc_val; + + jp2h = NULL; + meta = metadatalist->first; + while( meta) { + if( meta->boxlist) { + jp2h = search_box( "jp2h", meta->boxlist); + if( jp2h) + break; + } + meta = meta->next; + } + if( !jp2h) { + fprintf( stderr, "jp2h box not found\n"); + return NULL; + } + + ihdr = gene_boxbyTypeinStream( jpipstream, get_DBoxoff( jp2h), get_DBoxlen( jp2h), "ihdr"); + + if( !ihdr) { + fprintf( stderr, "ihdr box not found\n"); + return NULL; } - meta = meta->next; - } - if( !jp2h){ - fprintf( stderr, "jp2h box not found\n"); - return NULL; - } - - ihdr = gene_boxbyTypeinStream( jpipstream, get_DBoxoff( jp2h), get_DBoxlen( jp2h), "ihdr"); - if( !ihdr){ - fprintf( stderr, "ihdr box not found\n"); - return NULL; - } - - ihdrbox = (ihdrbox_param_t *)malloc( sizeof(ihdrbox_param_t)); - - ihdrbox->height = big4( jpipstream+get_DBoxoff(ihdr)); - ihdrbox->width = big4( jpipstream+get_DBoxoff(ihdr)+4); - ihdrbox->nc = big2( jpipstream+get_DBoxoff(ihdr)+8); - bpc_val = *(jpipstream+get_DBoxoff(ihdr)+10)+1; - assert( bpc_val >= 0 && bpc_val <= 255 ); - ihdrbox->bpc = (Byte_t)bpc_val; + ihdrbox = (ihdrbox_param_t *)malloc( sizeof(ihdrbox_param_t)); + + ihdrbox->height = big4( jpipstream+get_DBoxoff(ihdr)); + ihdrbox->width = big4( jpipstream+get_DBoxoff(ihdr)+4); + ihdrbox->nc = big2( jpipstream+get_DBoxoff(ihdr)+8); + bpc_val = *(jpipstream+get_DBoxoff(ihdr)+10)+1; + assert( bpc_val >= 0 && bpc_val <= 255 ); + ihdrbox->bpc = (Byte_t)bpc_val; - free( ihdr); + free( ihdr); - return ihdrbox; + return ihdrbox; } |
