diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2017-05-09 15:44:46 +0200 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2017-05-09 20:46:20 +0200 |
| commit | 563bd8499e63db976ca8358216138647593354bc (patch) | |
| tree | 003599ed2b0cffd932d2122c3f72c142070efafd /src/lib/openjpip/ihdrbox_manager.c | |
| parent | d4e54e9f35d532062533f1d369c159810b01d224 (diff) | |
Reformat whole codebase with astyle.options (#128)
Diffstat (limited to 'src/lib/openjpip/ihdrbox_manager.c')
| -rw-r--r-- | src/lib/openjpip/ihdrbox_manager.c | 75 |
1 files changed, 39 insertions, 36 deletions
diff --git a/src/lib/openjpip/ihdrbox_manager.c b/src/lib/openjpip/ihdrbox_manager.c index 686e0ece..efb4d092 100644 --- a/src/lib/openjpip/ihdrbox_manager.c +++ b/src/lib/openjpip/ihdrbox_manager.c @@ -33,46 +33,49 @@ #include <assert.h> #include "ihdrbox_manager.h" -ihdrbox_param_t * gene_ihdrbox( metadatalist_param_t *metadatalist, Byte_t *jpipstream) +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; } |
