diff options
Diffstat (limited to 'extern/libopenjpeg/ppix_manager.c')
-rw-r--r-- | extern/libopenjpeg/ppix_manager.c | 113 |
1 files changed, 67 insertions, 46 deletions
diff --git a/extern/libopenjpeg/ppix_manager.c b/extern/libopenjpeg/ppix_manager.c index 58d324ceb41..fce514899a4 100644 --- a/extern/libopenjpeg/ppix_manager.c +++ b/extern/libopenjpeg/ppix_manager.c @@ -1,8 +1,8 @@ /* * $Id: ppix_manager.c 897 2011-08-28 21:43:57Z Kaori.Hagihara@gmail.com $ * - * Copyright (c) 2002-2011, Communications and Remote Sensing Laboratory, Universite catholique de Louvain (UCL), Belgium - * Copyright (c) 2002-2011, Professor Benoit Macq + * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium + * Copyright (c) 2002-2014, Professor Benoit Macq * Copyright (c) 2003-2004, Yannick Verschueren * Copyright (c) 2010-2011, Kaori Hagihara * All rights reserved. @@ -33,9 +33,6 @@ * \brief Modification of jpip.c from 2KAN indexer */ -#include <stdio.h> -#include <stdlib.h> -#include <math.h> #include "opj_includes.h" /* @@ -49,49 +46,65 @@ * @param[in] cio file output handle * @return length of faix box */ -int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio); -int write_ppix( int coff, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio) + +int opj_write_ppix( int coff, opj_codestream_info_t cstr_info, OPJ_BOOL EPHused, int j2klen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) { - int len, lenp, compno, i; + OPJ_BYTE l_data_header [4]; + int compno, i; opj_jp2_box_t *box; + OPJ_OFF_T lenp; + OPJ_UINT32 len; /* printf("cstr_info.packno %d\n", cstr_info.packno); //NMAX? */ lenp = -1; - box = (opj_jp2_box_t *)opj_calloc( cstr_info.numcomps, sizeof(opj_jp2_box_t)); + box = (opj_jp2_box_t *)opj_calloc( (size_t)cstr_info.numcomps, sizeof(opj_jp2_box_t)); for (i=0;i<2;i++){ - if (i) cio_seek( cio, lenp); + if (i) + + opj_stream_seek( cio, lenp, p_manager); - lenp = cio_tell( cio); - cio_skip( cio, 4); /* L [at the end] */ - cio_write( cio, JPIP_PPIX, 4); /* PPIX */ + lenp = (OPJ_UINT32)(opj_stream_tell(cio)); + opj_stream_skip( cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_PPIX,4);/* PPIX */ + opj_stream_write_data(cio,l_data_header,4,p_manager); - write_manf( i, cstr_info.numcomps, box, cio); + opj_write_manf( i, cstr_info.numcomps, box, cio, p_manager); for (compno=0; compno<cstr_info.numcomps; compno++){ - box[compno].length = write_ppixfaix( coff, compno, cstr_info, EPHused, j2klen, cio); + box[compno].length = (OPJ_UINT32)opj_write_ppixfaix( coff, compno, cstr_info, EPHused, j2klen, cio,p_manager); box[compno].type = JPIP_FAIX; } - len = cio_tell( cio)-lenp; - cio_seek( cio, lenp); - cio_write( cio, len, 4); /* L */ - cio_seek( cio, lenp+len); + + len = (OPJ_UINT32)(opj_stream_tell(cio)-lenp); + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); } opj_free(box); - return len; + return (int)len; } -int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_bool EPHused, int j2klen, opj_cio_t *cio) + + +int opj_write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, OPJ_BOOL EPHused, int j2klen, opj_stream_private_t *cio, + opj_event_mgr_t * p_manager ) { - int len, lenp, tileno, version, i, nmax, size_of_coding; /* 4 or 8*/ + OPJ_BYTE l_data_header [8]; + OPJ_UINT32 tileno, version, i, nmax, size_of_coding; /* 4 or 8*/ + OPJ_UINT32 len; + OPJ_OFF_T lenp; opj_tile_info_t *tile_Idx; opj_packet_info_t packet; - int resno, precno, layno, num_packet; + int resno, precno, layno; + OPJ_UINT32 num_packet; int numOfres, numOfprec, numOflayers; packet.end_pos = packet.end_ph_pos = packet.start_pos = -1; (void)EPHused; /* unused ? */ @@ -105,19 +118,22 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b version = 0; } - lenp = cio_tell( cio); - cio_skip( cio, 4); /* L [at the end] */ - cio_write( cio, JPIP_FAIX, 4); /* FAIX */ - cio_write( cio, version, 1); /* Version 0 = 4 bytes */ + lenp = opj_stream_tell(cio); + opj_stream_skip(cio, 4, p_manager); /* L [at the end] */ + opj_write_bytes(l_data_header,JPIP_FAIX,4); /* FAIX */ + opj_write_bytes(l_data_header,version,1); + opj_stream_write_data(cio,l_data_header,1,p_manager);/* Version 0 = 4 bytes */ nmax = 0; - for( i=0; i<=cstr_info.numdecompos[compno]; i++) - nmax += cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers; + for( i=0; i<=(OPJ_UINT32)cstr_info.numdecompos[compno]; i++) + nmax += (OPJ_UINT32)(cstr_info.tile[0].ph[i] * cstr_info.tile[0].pw[i] * cstr_info.numlayers); - cio_write( cio, nmax, size_of_coding); /* NMAX */ - cio_write( cio, cstr_info.tw*cstr_info.th, size_of_coding); /* M */ + opj_write_bytes(l_data_header,nmax,size_of_coding); /* NMAX */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,(OPJ_UINT32)(cstr_info.tw*cstr_info.th),size_of_coding); /* M */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); - for( tileno=0; tileno<cstr_info.tw*cstr_info.th; tileno++){ + for( tileno=0; tileno<(OPJ_UINT32)(cstr_info.tw*cstr_info.th); tileno++){ tile_Idx = &cstr_info.tile[ tileno]; num_packet=0; @@ -130,27 +146,29 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b for( layno=0; layno<numOflayers; layno++){ switch ( cstr_info.prog){ - case LRCP: + case OPJ_LRCP: packet = tile_Idx->packet[ ((layno*numOfres+resno)*cstr_info.numcomps+compno)*numOfprec+precno]; break; - case RLCP: + case OPJ_RLCP: packet = tile_Idx->packet[ ((resno*numOflayers+layno)*cstr_info.numcomps+compno)*numOfprec+precno]; break; - case RPCL: + case OPJ_RPCL: packet = tile_Idx->packet[ ((resno*numOfprec+precno)*cstr_info.numcomps+compno)*numOflayers+layno]; break; - case PCRL: + case OPJ_PCRL: packet = tile_Idx->packet[ ((precno*cstr_info.numcomps+compno)*numOfres+resno)*numOflayers + layno]; break; - case CPRL: + case OPJ_CPRL: packet = tile_Idx->packet[ ((compno*numOfprec+precno)*numOfres+resno)*numOflayers + layno]; break; default: fprintf( stderr, "failed to ppix indexing\n"); } - cio_write( cio, packet.start_pos-coff, size_of_coding); /* start position */ - cio_write( cio, packet.end_pos-packet.start_pos+1, size_of_coding); /* length */ + opj_write_bytes(l_data_header,(OPJ_UINT32)(packet.start_pos-coff),size_of_coding); /* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,(OPJ_UINT32)(packet.end_pos-packet.start_pos+1),size_of_coding); /* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); num_packet++; } @@ -158,16 +176,19 @@ int write_ppixfaix( int coff, int compno, opj_codestream_info_t cstr_info, opj_b } while( num_packet < nmax){ /* PADDING */ - cio_write( cio, 0, size_of_coding); /* start position */ - cio_write( cio, 0, size_of_coding); /* length */ + opj_write_bytes(l_data_header,0,size_of_coding);/* start position */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); + opj_write_bytes(l_data_header,0,size_of_coding);/* length */ + opj_stream_write_data(cio,l_data_header,size_of_coding,p_manager); num_packet++; } } - len = cio_tell( cio)-lenp; - cio_seek( cio, lenp); - cio_write( cio, len, 4); /* L */ - cio_seek( cio, lenp+len); + len = (OPJ_UINT32)(opj_stream_tell(cio)-lenp); + opj_stream_seek(cio, lenp,p_manager); + opj_write_bytes(l_data_header,len,4);/* L */ + opj_stream_write_data(cio,l_data_header,4,p_manager); + opj_stream_seek(cio, lenp+len,p_manager); - return len; + return (int)len; } |