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

Merge pull request #537 from mayeut/master 

Various Minor fixes
This commit is contained in:
Matthieu Darbois 2015-07-18 21:46:59 +02:00
parent b59085db0c ae4799ad07
commit 06f6911d7b
10 changed files with 125 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/jp2/CMakeLists.txt
View File

@ -3,10 +3,14 @@
# First thing define the common source: # First thing define the common source:
set(common_SRCS set(common_SRCS
convert.c convert.c
convert.h
convertbmp.c convertbmp.c
index.c index.c
index.h
${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c ${OPENJPEG_SOURCE_DIR}/src/bin/common/color.c
${OPENJPEG_SOURCE_DIR}/src/bin/common/color.h
${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c ${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.c
${OPENJPEG_SOURCE_DIR}/src/bin/common/opj_getopt.h
) )
if(OPJ_HAVE_LIBTIFF) if(OPJ_HAVE_LIBTIFF)

26
src/lib/openjp2/CMakeLists.txt
View File

@ -10,34 +10,60 @@ include_directories(
# Defines the source code for the library # Defines the source code for the library
set(OPENJPEG_SRCS set(OPENJPEG_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/bio.c ${CMAKE_CURRENT_SOURCE_DIR}/bio.c
${CMAKE_CURRENT_SOURCE_DIR}/bio.h
${CMAKE_CURRENT_SOURCE_DIR}/cio.c ${CMAKE_CURRENT_SOURCE_DIR}/cio.c
${CMAKE_CURRENT_SOURCE_DIR}/cio.h
${CMAKE_CURRENT_SOURCE_DIR}/dwt.c ${CMAKE_CURRENT_SOURCE_DIR}/dwt.c
${CMAKE_CURRENT_SOURCE_DIR}/dwt.h
${CMAKE_CURRENT_SOURCE_DIR}/event.c ${CMAKE_CURRENT_SOURCE_DIR}/event.c
${CMAKE_CURRENT_SOURCE_DIR}/event.h
${CMAKE_CURRENT_SOURCE_DIR}/image.c ${CMAKE_CURRENT_SOURCE_DIR}/image.c
${CMAKE_CURRENT_SOURCE_DIR}/image.h
${CMAKE_CURRENT_SOURCE_DIR}/invert.c ${CMAKE_CURRENT_SOURCE_DIR}/invert.c
${CMAKE_CURRENT_SOURCE_DIR}/invert.h
${CMAKE_CURRENT_SOURCE_DIR}/j2k.c ${CMAKE_CURRENT_SOURCE_DIR}/j2k.c
${CMAKE_CURRENT_SOURCE_DIR}/j2k.h
${CMAKE_CURRENT_SOURCE_DIR}/jp2.c ${CMAKE_CURRENT_SOURCE_DIR}/jp2.c
${CMAKE_CURRENT_SOURCE_DIR}/jp2.h
${CMAKE_CURRENT_SOURCE_DIR}/mct.c ${CMAKE_CURRENT_SOURCE_DIR}/mct.c
${CMAKE_CURRENT_SOURCE_DIR}/mct.h
${CMAKE_CURRENT_SOURCE_DIR}/mqc.c ${CMAKE_CURRENT_SOURCE_DIR}/mqc.c
${CMAKE_CURRENT_SOURCE_DIR}/mqc.h
${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.c ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.c
${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_clock.c ${CMAKE_CURRENT_SOURCE_DIR}/opj_clock.c
${CMAKE_CURRENT_SOURCE_DIR}/opj_clock.h
${CMAKE_CURRENT_SOURCE_DIR}/pi.c ${CMAKE_CURRENT_SOURCE_DIR}/pi.c
${CMAKE_CURRENT_SOURCE_DIR}/pi.h
${CMAKE_CURRENT_SOURCE_DIR}/raw.c ${CMAKE_CURRENT_SOURCE_DIR}/raw.c
${CMAKE_CURRENT_SOURCE_DIR}/raw.h
${CMAKE_CURRENT_SOURCE_DIR}/t1.c ${CMAKE_CURRENT_SOURCE_DIR}/t1.c
${CMAKE_CURRENT_SOURCE_DIR}/t1.h
${CMAKE_CURRENT_SOURCE_DIR}/t2.c ${CMAKE_CURRENT_SOURCE_DIR}/t2.c
${CMAKE_CURRENT_SOURCE_DIR}/t2.h
${CMAKE_CURRENT_SOURCE_DIR}/tcd.c ${CMAKE_CURRENT_SOURCE_DIR}/tcd.c
${CMAKE_CURRENT_SOURCE_DIR}/tcd.h
${CMAKE_CURRENT_SOURCE_DIR}/tgt.c ${CMAKE_CURRENT_SOURCE_DIR}/tgt.c
${CMAKE_CURRENT_SOURCE_DIR}/tgt.h
${CMAKE_CURRENT_SOURCE_DIR}/function_list.c ${CMAKE_CURRENT_SOURCE_DIR}/function_list.c
${CMAKE_CURRENT_SOURCE_DIR}/function_list.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_codec.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_includes.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_intmath.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_malloc.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_stdint.h
) )
if(BUILD_JPIP) if(BUILD_JPIP)
add_definitions(-DUSE_JPIP) add_definitions(-DUSE_JPIP)
set(OPENJPEG_SRCS set(OPENJPEG_SRCS
${OPENJPEG_SRCS} ${OPENJPEG_SRCS}
${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/cidx_manager.h
${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/phix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/ppix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/thix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c ${CMAKE_CURRENT_SOURCE_DIR}/tpix_manager.c
${CMAKE_CURRENT_SOURCE_DIR}/indexbox_manager.h
) )
endif() endif()

8
src/lib/openjp2/bio.c
View File

@ -78,7 +78,7 @@ static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio);
========================================================== ==========================================================
*/ */
OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) { static OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) {
bio->buf = (bio->buf << 8) & 0xffff; bio->buf = (bio->buf << 8) & 0xffff;
bio->ct = bio->buf == 0xff00 ? 7 : 8; bio->ct = bio->buf == 0xff00 ? 7 : 8;
if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) { if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) {
@ -88,7 +88,7 @@ OPJ_BOOL opj_bio_byteout(opj_bio_t *bio) {
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) { static OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) {
bio->buf = (bio->buf << 8) & 0xffff; bio->buf = (bio->buf << 8) & 0xffff;
bio->ct = bio->buf == 0xff00 ? 7 : 8; bio->ct = bio->buf == 0xff00 ? 7 : 8;
if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) { if ((OPJ_SIZE_T)bio->bp >= (OPJ_SIZE_T)bio->end) {
@ -98,7 +98,7 @@ OPJ_BOOL opj_bio_bytein(opj_bio_t *bio) {
return OPJ_TRUE; return OPJ_TRUE;
} }
void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) { static void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
if (bio->ct == 0) { if (bio->ct == 0) {
opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */ opj_bio_byteout(bio); /* MSD: why not check the return value of this function ? */
} }
@ -106,7 +106,7 @@ void opj_bio_putbit(opj_bio_t *bio, OPJ_UINT32 b) {
bio->buf |= b << bio->ct; bio->buf |= b << bio->ct;
} }
OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) { static OPJ_UINT32 opj_bio_getbit(opj_bio_t *bio) {
if (bio->ct == 0) { if (bio->ct == 0) {
opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */ opj_bio_bytein(bio); /* MSD: why not check the return value of this function ? */
} }

34
src/lib/openjp2/dwt.c
View File

@ -193,7 +193,7 @@ static const OPJ_FLOAT64 opj_dwt_norms_real[4][10] = {
/* <summary> */ /* <summary> */
/* Forward lazy transform (horizontal). */ /* Forward lazy transform (horizontal). */
/* </summary> */ /* </summary> */
void opj_dwt_deinterleave_h(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) { static void opj_dwt_deinterleave_h(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
OPJ_INT32 i; OPJ_INT32 i;
OPJ_INT32 * l_dest = b; OPJ_INT32 * l_dest = b;
OPJ_INT32 * l_src = a+cas; OPJ_INT32 * l_src = a+cas;
@ -215,7 +215,7 @@ void opj_dwt_deinterleave_h(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32
/* <summary> */ /* <summary> */
/* Forward lazy transform (vertical). */ /* Forward lazy transform (vertical). */
/* </summary> */ /* </summary> */
void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas) { static void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas) {
OPJ_INT32 i = sn; OPJ_INT32 i = sn;
OPJ_INT32 * l_dest = b; OPJ_INT32 * l_dest = b;
OPJ_INT32 * l_src = a+cas; OPJ_INT32 * l_src = a+cas;
@ -240,7 +240,7 @@ void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, OPJ_INT32
/* <summary> */ /* <summary> */
/* Inverse lazy transform (horizontal). */ /* Inverse lazy transform (horizontal). */
/* </summary> */ /* </summary> */
void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a) { static void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a) {
OPJ_INT32 *ai = a; OPJ_INT32 *ai = a;
OPJ_INT32 *bi = h->mem + h->cas; OPJ_INT32 *bi = h->mem + h->cas;
OPJ_INT32 i = h->sn; OPJ_INT32 i = h->sn;
@ -260,7 +260,7 @@ void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a) {
/* <summary> */ /* <summary> */
/* Inverse lazy transform (vertical). */ /* Inverse lazy transform (vertical). */
/* </summary> */ /* </summary> */
void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x) { static void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x) {
OPJ_INT32 *ai = a; OPJ_INT32 *ai = a;
OPJ_INT32 *bi = v->mem + v->cas; OPJ_INT32 *bi = v->mem + v->cas;
OPJ_INT32 i = v->sn; OPJ_INT32 i = v->sn;
@ -283,7 +283,7 @@ void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x) {
/* <summary> */ /* <summary> */
/* Forward 5-3 wavelet transform in 1-D. */ /* Forward 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) { static void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
OPJ_INT32 i; OPJ_INT32 i;
if (!cas) { if (!cas) {
@ -304,7 +304,7 @@ void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
/* <summary> */ /* <summary> */
/* Inverse 5-3 wavelet transform in 1-D. */ /* Inverse 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
void opj_dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) { static void opj_dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
OPJ_INT32 i; OPJ_INT32 i;
if (!cas) { if (!cas) {
@ -325,14 +325,14 @@ void opj_dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas)
/* <summary> */ /* <summary> */
/* Inverse 5-3 wavelet transform in 1-D. */ /* Inverse 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
void opj_dwt_decode_1(opj_dwt_t *v) { static void opj_dwt_decode_1(opj_dwt_t *v) {
opj_dwt_decode_1_(v->mem, v->dn, v->sn, v->cas); opj_dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
} }
/* <summary> */ /* <summary> */
/* Forward 9-7 wavelet transform in 1-D. */ /* Forward 9-7 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
void opj_dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) { static void opj_dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 cas) {
OPJ_INT32 i; OPJ_INT32 i;
if (!cas) { if (!cas) {
if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */ if ((dn > 0) || (sn > 1)) { /* NEW : CASE ONE ELEMENT */
@ -367,7 +367,7 @@ void opj_dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, OPJ_INT32 c
} }
} }
void opj_dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps, opj_stepsize_t *bandno_stepsize) { static void opj_dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps, opj_stepsize_t *bandno_stepsize) {
OPJ_INT32 p, n; OPJ_INT32 p, n;
p = opj_int_floorlog2(stepsize) - 13; p = opj_int_floorlog2(stepsize) - 13;
n = 11 - opj_int_floorlog2(stepsize); n = 11 - opj_int_floorlog2(stepsize);
@ -385,7 +385,7 @@ void opj_dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps, opj_stepsize_
/* <summary> */ /* <summary> */
/* Forward 5-3 wavelet transform in 2-D. */ /* Forward 5-3 wavelet transform in 2-D. */
/* </summary> */ /* </summary> */
INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void (*p_function)(OPJ_INT32 *, OPJ_INT32,OPJ_INT32,OPJ_INT32) ) static INLINE OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void (*p_function)(OPJ_INT32 *, OPJ_INT32,OPJ_INT32,OPJ_INT32) )
{ {
OPJ_INT32 i, j, k; OPJ_INT32 i, j, k;
OPJ_INT32 *a = 00; OPJ_INT32 *a = 00;
@ -541,7 +541,7 @@ void opj_dwt_calc_explicit_stepsizes(opj_tccp_t * tccp, OPJ_UINT32 prec) {
/* <summary> */ /* <summary> */
/* Determine maximum computed resolution level for inverse wavelet transform */ /* Determine maximum computed resolution level for inverse wavelet transform */
/* </summary> */ /* </summary> */
OPJ_UINT32 opj_dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i) { static OPJ_UINT32 opj_dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i) {
OPJ_UINT32 mr = 0; OPJ_UINT32 mr = 0;
OPJ_UINT32 w; OPJ_UINT32 w;
while( --i ) { while( --i ) {
@ -557,7 +557,7 @@ OPJ_UINT32 opj_dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i
/* <summary> */ /* <summary> */
/* Inverse wavelet transform in 2-D. */ /* Inverse wavelet transform in 2-D. */
/* </summary> */ /* </summary> */
OPJ_BOOL opj_dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres, DWT1DFN dwt_1D) { static OPJ_BOOL opj_dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres, DWT1DFN dwt_1D) {
opj_dwt_t h; opj_dwt_t h;
opj_dwt_t v; opj_dwt_t v;
@ -613,7 +613,7 @@ OPJ_BOOL opj_dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres, DWT1D
return OPJ_TRUE; return OPJ_TRUE;
} }
void opj_v4dwt_interleave_h(opj_v4dwt_t* restrict w, OPJ_FLOAT32* restrict a, OPJ_INT32 x, OPJ_INT32 size){ static void opj_v4dwt_interleave_h(opj_v4dwt_t* restrict w, OPJ_FLOAT32* restrict a, OPJ_INT32 x, OPJ_INT32 size){
OPJ_FLOAT32* restrict bi = (OPJ_FLOAT32*) (w->wavelet + w->cas); OPJ_FLOAT32* restrict bi = (OPJ_FLOAT32*) (w->wavelet + w->cas);
OPJ_INT32 count = w->sn; OPJ_INT32 count = w->sn;
OPJ_INT32 i, k; OPJ_INT32 i, k;
@ -656,7 +656,7 @@ void opj_v4dwt_interleave_h(opj_v4dwt_t* restrict w, OPJ_FLOAT32* restrict a, OP
} }
} }
void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a , OPJ_INT32 x, OPJ_INT32 nb_elts_read){ static void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a , OPJ_INT32 x, OPJ_INT32 nb_elts_read){
opj_v4_t* restrict bi = v->wavelet + v->cas; opj_v4_t* restrict bi = v->wavelet + v->cas;
OPJ_INT32 i; OPJ_INT32 i;
@ -674,7 +674,7 @@ void opj_v4dwt_interleave_v(opj_v4dwt_t* restrict v , OPJ_FLOAT32* restrict a ,
#ifdef __SSE__ #ifdef __SSE__
void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c){ static void opj_v4dwt_decode_step1_sse(opj_v4_t* w, OPJ_INT32 count, const __m128 c){
__m128* restrict vw = (__m128*) w; __m128* restrict vw = (__m128*) w;
OPJ_INT32 i; OPJ_INT32 i;
/* 4x unrolled loop */ /* 4x unrolled loop */
@ -723,7 +723,7 @@ void opj_v4dwt_decode_step2_sse(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32
#else #else
void opj_v4dwt_decode_step1(opj_v4_t* w, OPJ_INT32 count, const OPJ_FLOAT32 c) static void opj_v4dwt_decode_step1(opj_v4_t* w, OPJ_INT32 count, const OPJ_FLOAT32 c)
{ {
OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w; OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w;
OPJ_INT32 i; OPJ_INT32 i;
@ -739,7 +739,7 @@ void opj_v4dwt_decode_step1(opj_v4_t* w, OPJ_INT32 count, const OPJ_FLOAT32 c)
} }
} }
void opj_v4dwt_decode_step2(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, OPJ_FLOAT32 c) static void opj_v4dwt_decode_step2(opj_v4_t* l, opj_v4_t* w, OPJ_INT32 k, OPJ_INT32 m, OPJ_FLOAT32 c)
{ {
OPJ_FLOAT32* restrict fl = (OPJ_FLOAT32*) l; OPJ_FLOAT32* restrict fl = (OPJ_FLOAT32*) l;
OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w; OPJ_FLOAT32* restrict fw = (OPJ_FLOAT32*) w;

6
src/lib/openjp2/invert.c
View File

@ -103,7 +103,7 @@ OPJ_BOOL opj_matrix_inversion_f(OPJ_FLOAT32 * pSrcMatrix,
Local functions Local functions
========================================================== ==========================================================
*/ */
OPJ_BOOL opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations, static OPJ_BOOL opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
OPJ_FLOAT32 * p_swap_area, OPJ_FLOAT32 * p_swap_area,
OPJ_UINT32 nb_compo) OPJ_UINT32 nb_compo)
{ {
@ -204,7 +204,7 @@ OPJ_BOOL opj_lupDecompose(OPJ_FLOAT32 * matrix,OPJ_UINT32 * permutations,
return OPJ_TRUE; return OPJ_TRUE;
} }
void opj_lupSolve (OPJ_FLOAT32 * pResult, static void opj_lupSolve (OPJ_FLOAT32 * pResult,
OPJ_FLOAT32 * pMatrix, OPJ_FLOAT32 * pMatrix,
OPJ_FLOAT32 * pVector, OPJ_FLOAT32 * pVector,
OPJ_UINT32* pPermutations, OPJ_UINT32* pPermutations,
@ -266,7 +266,7 @@ void opj_lupSolve (OPJ_FLOAT32 * pResult,
} }
void opj_lupInvert (OPJ_FLOAT32 * pSrcMatrix, static void opj_lupInvert (OPJ_FLOAT32 * pSrcMatrix,
OPJ_FLOAT32 * pDestMatrix, OPJ_FLOAT32 * pDestMatrix,
OPJ_UINT32 nb_compo, OPJ_UINT32 nb_compo,
OPJ_UINT32 * pPermutations, OPJ_UINT32 * pPermutations,

10
src/lib/openjp2/mqc.c
View File

@ -202,7 +202,7 @@ static opj_mqc_state_t mqc_states[47 * 2] = {
========================================================== ==========================================================
*/ */
void opj_mqc_byteout(opj_mqc_t *mqc) { static void opj_mqc_byteout(opj_mqc_t *mqc) {
if (*mqc->bp == 0xff) { if (*mqc->bp == 0xff) {
mqc->bp++; mqc->bp++;
*mqc->bp = (OPJ_BYTE)(mqc->c >> 20); *mqc->bp = (OPJ_BYTE)(mqc->c >> 20);
@ -232,7 +232,7 @@ void opj_mqc_byteout(opj_mqc_t *mqc) {
} }
} }
void opj_mqc_renorme(opj_mqc_t *mqc) { static void opj_mqc_renorme(opj_mqc_t *mqc) {
do { do {
mqc->a <<= 1; mqc->a <<= 1;
mqc->c <<= 1; mqc->c <<= 1;
@ -243,7 +243,7 @@ void opj_mqc_renorme(opj_mqc_t *mqc) {
} while ((mqc->a & 0x8000) == 0); } while ((mqc->a & 0x8000) == 0);
} }
void opj_mqc_codemps(opj_mqc_t *mqc) { static void opj_mqc_codemps(opj_mqc_t *mqc) {
mqc->a -= (*mqc->curctx)->qeval; mqc->a -= (*mqc->curctx)->qeval;
if ((mqc->a & 0x8000) == 0) { if ((mqc->a & 0x8000) == 0) {
if (mqc->a < (*mqc->curctx)->qeval) { if (mqc->a < (*mqc->curctx)->qeval) {
@ -258,7 +258,7 @@ void opj_mqc_codemps(opj_mqc_t *mqc) {
} }
} }
void opj_mqc_codelps(opj_mqc_t *mqc) { static void opj_mqc_codelps(opj_mqc_t *mqc) {
mqc->a -= (*mqc->curctx)->qeval; mqc->a -= (*mqc->curctx)->qeval;
if (mqc->a < (*mqc->curctx)->qeval) { if (mqc->a < (*mqc->curctx)->qeval) {
mqc->c += (*mqc->curctx)->qeval; mqc->c += (*mqc->curctx)->qeval;
@ -269,7 +269,7 @@ void opj_mqc_codelps(opj_mqc_t *mqc) {
opj_mqc_renorme(mqc); opj_mqc_renorme(mqc);
} }
void opj_mqc_setbits(opj_mqc_t *mqc) { static void opj_mqc_setbits(opj_mqc_t *mqc) {
OPJ_UINT32 tempc = mqc->c + mqc->a; OPJ_UINT32 tempc = mqc->c + mqc->a;
mqc->c |= 0xffff; mqc->c |= 0xffff;
if (mqc->c >= tempc) { if (mqc->c >= tempc) {

28
src/lib/openjp2/pi.c
View File

@ -214,7 +214,7 @@ static void opj_pi_update_decode_poc ( opj_pi_iterator_t * p_pi,
/** /**
* FIXME DOC * FIXME DOC
*/ */
OPJ_BOOL opj_pi_check_next_level( OPJ_INT32 pos, static OPJ_BOOL opj_pi_check_next_level( OPJ_INT32 pos,
opj_cp_t *cp, opj_cp_t *cp,
OPJ_UINT32 tileno, OPJ_UINT32 tileno,
OPJ_UINT32 pino, OPJ_UINT32 pino,
@ -230,7 +230,7 @@ OPJ_BOOL opj_pi_check_next_level( OPJ_INT32 pos,
========================================================== ==========================================================
*/ */
OPJ_BOOL opj_pi_next_lrcp(opj_pi_iterator_t * pi) { static OPJ_BOOL opj_pi_next_lrcp(opj_pi_iterator_t * pi) {
opj_pi_comp_t *comp = NULL; opj_pi_comp_t *comp = NULL;
opj_pi_resolution_t *res = NULL; opj_pi_resolution_t *res = NULL;
OPJ_UINT32 index = 0; OPJ_UINT32 index = 0;
@ -270,7 +270,7 @@ LABEL_SKIP:;
return OPJ_FALSE; return OPJ_FALSE;
} }
OPJ_BOOL opj_pi_next_rlcp(opj_pi_iterator_t * pi) { static OPJ_BOOL opj_pi_next_rlcp(opj_pi_iterator_t * pi) {
opj_pi_comp_t *comp = NULL; opj_pi_comp_t *comp = NULL;
opj_pi_resolution_t *res = NULL; opj_pi_resolution_t *res = NULL;
OPJ_UINT32 index = 0; OPJ_UINT32 index = 0;
@ -309,7 +309,7 @@ LABEL_SKIP:;
return OPJ_FALSE; return OPJ_FALSE;
} }
OPJ_BOOL opj_pi_next_rpcl(opj_pi_iterator_t * pi) { static OPJ_BOOL opj_pi_next_rpcl(opj_pi_iterator_t * pi) {
opj_pi_comp_t *comp = NULL; opj_pi_comp_t *comp = NULL;
opj_pi_resolution_t *res = NULL; opj_pi_resolution_t *res = NULL;
OPJ_UINT32 index = 0; OPJ_UINT32 index = 0;
@ -392,7 +392,7 @@ LABEL_SKIP:;
return OPJ_FALSE; return OPJ_FALSE;
} }
OPJ_BOOL opj_pi_next_pcrl(opj_pi_iterator_t * pi) { static OPJ_BOOL opj_pi_next_pcrl(opj_pi_iterator_t * pi) {
opj_pi_comp_t *comp = NULL; opj_pi_comp_t *comp = NULL;
opj_pi_resolution_t *res = NULL; opj_pi_resolution_t *res = NULL;
OPJ_UINT32 index = 0; OPJ_UINT32 index = 0;
@ -473,7 +473,7 @@ LABEL_SKIP:;
return OPJ_FALSE; return OPJ_FALSE;
} }
OPJ_BOOL opj_pi_next_cprl(opj_pi_iterator_t * pi) { static OPJ_BOOL opj_pi_next_cprl(opj_pi_iterator_t * pi) {
opj_pi_comp_t *comp = NULL; opj_pi_comp_t *comp = NULL;
opj_pi_resolution_t *res = NULL; opj_pi_resolution_t *res = NULL;
OPJ_UINT32 index = 0; OPJ_UINT32 index = 0;
@ -552,7 +552,7 @@ LABEL_SKIP:;
return OPJ_FALSE; return OPJ_FALSE;
} }
void opj_get_encoding_parameters( const opj_image_t *p_image, static void opj_get_encoding_parameters( const opj_image_t *p_image,
const opj_cp_t *p_cp, const opj_cp_t *p_cp,
OPJ_UINT32 p_tileno, OPJ_UINT32 p_tileno,
OPJ_INT32 * p_tx0, OPJ_INT32 * p_tx0,
@ -666,7 +666,7 @@ void opj_get_encoding_parameters( const opj_image_t *p_image,
} }
void opj_get_all_encoding_parameters( const opj_image_t *p_image, static void opj_get_all_encoding_parameters( const opj_image_t *p_image,
const opj_cp_t *p_cp, const opj_cp_t *p_cp,
OPJ_UINT32 tileno, OPJ_UINT32 tileno,
OPJ_INT32 * p_tx0, OPJ_INT32 * p_tx0,
@ -789,7 +789,7 @@ void opj_get_all_encoding_parameters( const opj_image_t *p_image,
} }
} }
opj_pi_iterator_t * opj_pi_create( const opj_image_t *image, static opj_pi_iterator_t * opj_pi_create( const opj_image_t *image,
const opj_cp_t *cp, const opj_cp_t *cp,
OPJ_UINT32 tileno ) OPJ_UINT32 tileno )
{ {
@ -850,7 +850,7 @@ opj_pi_iterator_t * opj_pi_create( const opj_image_t *image,
return l_pi; return l_pi;
} }
void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp, static void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp,
OPJ_UINT32 p_tileno, OPJ_UINT32 p_tileno,
OPJ_INT32 p_tx0, OPJ_INT32 p_tx0,
OPJ_INT32 p_tx1, OPJ_INT32 p_tx1,
@ -928,7 +928,7 @@ void opj_pi_update_encode_poc_and_final ( opj_cp_t *p_cp,
} }
} }
void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp, static void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp,
OPJ_UINT32 p_num_comps, OPJ_UINT32 p_num_comps,
OPJ_UINT32 p_tileno, OPJ_UINT32 p_tileno,
OPJ_INT32 p_tx0, OPJ_INT32 p_tx0,
@ -983,7 +983,7 @@ void opj_pi_update_encode_not_poc ( opj_cp_t *p_cp,
} }
} }
void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi, static void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi,
opj_tcp_t * p_tcp, opj_tcp_t * p_tcp,
OPJ_UINT32 p_max_precision, OPJ_UINT32 p_max_precision,
OPJ_UINT32 p_max_res) OPJ_UINT32 p_max_res)
@ -1025,7 +1025,7 @@ void opj_pi_update_decode_poc (opj_pi_iterator_t * p_pi,
} }
} }
void opj_pi_update_decode_not_poc (opj_pi_iterator_t * p_pi, static void opj_pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,
opj_tcp_t * p_tcp, opj_tcp_t * p_tcp,
OPJ_UINT32 p_max_precision, OPJ_UINT32 p_max_precision,
OPJ_UINT32 p_max_res) OPJ_UINT32 p_max_res)
@ -1062,7 +1062,7 @@ void opj_pi_update_decode_not_poc (opj_pi_iterator_t * p_pi,
OPJ_BOOL opj_pi_check_next_level( OPJ_INT32 pos, static OPJ_BOOL opj_pi_check_next_level( OPJ_INT32 pos,
opj_cp_t *cp, opj_cp_t *cp,
OPJ_UINT32 tileno, OPJ_UINT32 tileno,
OPJ_UINT32 pino, OPJ_UINT32 pino,

60
src/lib/openjp2/t1.c
View File

@ -295,7 +295,7 @@ static OPJ_BOOL opj_t1_decode_cblk( opj_t1_t *t1,
OPJ_UINT32 roishift, OPJ_UINT32 roishift,
OPJ_UINT32 cblksty); OPJ_UINT32 cblksty);
OPJ_BOOL opj_t1_allocate_buffers( opj_t1_t *t1, static OPJ_BOOL opj_t1_allocate_buffers( opj_t1_t *t1,
OPJ_UINT32 w, OPJ_UINT32 w,
OPJ_UINT32 h); OPJ_UINT32 h);
@ -305,25 +305,25 @@ OPJ_BOOL opj_t1_allocate_buffers( opj_t1_t *t1,
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
OPJ_BYTE opj_t1_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient) { static OPJ_BYTE opj_t1_getctxno_zc(OPJ_UINT32 f, OPJ_UINT32 orient) {
return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)]; return lut_ctxno_zc[(orient << 8) | (f & T1_SIG_OTH)];
} }
OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f) { static OPJ_BYTE opj_t1_getctxno_sc(OPJ_UINT32 f) {
return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4]; return lut_ctxno_sc[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
} }
OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f) { static OPJ_UINT32 opj_t1_getctxno_mag(OPJ_UINT32 f) {
OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG; OPJ_UINT32 tmp1 = (f & T1_SIG_OTH) ? T1_CTXNO_MAG + 1 : T1_CTXNO_MAG;
OPJ_UINT32 tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1; OPJ_UINT32 tmp2 = (f & T1_REFINE) ? T1_CTXNO_MAG + 2 : tmp1;
return (tmp2); return (tmp2);
} }
OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f) { static OPJ_BYTE opj_t1_getspb(OPJ_UINT32 f) {
return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4]; return lut_spb[(f & (T1_SIG_PRIM | T1_SGN)) >> 4];
} }
OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos) { static OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
if (bitpos > 0) { if (bitpos > 0) {
return lut_nmsedec_sig[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)]; return lut_nmsedec_sig[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)];
} }
@ -331,7 +331,7 @@ OPJ_INT16 opj_t1_getnmsedec_sig(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)]; return lut_nmsedec_sig0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
} }
OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos) { static OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
if (bitpos > 0) { if (bitpos > 0) {
return lut_nmsedec_ref[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)]; return lut_nmsedec_ref[(x >> (bitpos)) & ((1 << T1_NMSEDEC_BITS) - 1)];
} }
@ -339,7 +339,7 @@ OPJ_INT16 opj_t1_getnmsedec_ref(OPJ_UINT32 x, OPJ_UINT32 bitpos) {
return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)]; return lut_nmsedec_ref0[x & ((1 << T1_NMSEDEC_BITS) - 1)];
} }
void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s, OPJ_UINT32 stride) { static void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s, OPJ_UINT32 stride) {
opj_flag_t *np = flagsp - stride; opj_flag_t *np = flagsp - stride;
opj_flag_t *sp = flagsp + stride; opj_flag_t *sp = flagsp + stride;
@ -363,7 +363,7 @@ void opj_t1_updateflags(opj_flag_t *flagsp, OPJ_UINT32 s, OPJ_UINT32 stride) {
sp[1] |= T1_SIG_NW; sp[1] |= T1_SIG_NW;
} }
void opj_t1_enc_sigpass_step( opj_t1_t *t1, static void opj_t1_enc_sigpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
OPJ_UINT32 orient, OPJ_UINT32 orient,
@ -427,7 +427,7 @@ static INLINE void opj_t1_dec_sigpass_step_raw(
} }
} }
INLINE void opj_t1_dec_sigpass_step_mqc( static INLINE void opj_t1_dec_sigpass_step_mqc(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -451,7 +451,7 @@ INLINE void opj_t1_dec_sigpass_step_mqc(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
INLINE void opj_t1_dec_sigpass_step_mqc_vsc( static INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -478,7 +478,7 @@ INLINE void opj_t1_dec_sigpass_step_mqc_vsc(
void opj_t1_enc_sigpass(opj_t1_t *t1, static void opj_t1_enc_sigpass(opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_UINT32 orient, OPJ_UINT32 orient,
OPJ_INT32 *nmsedec, OPJ_INT32 *nmsedec,
@ -510,7 +510,7 @@ void opj_t1_enc_sigpass(opj_t1_t *t1,
} }
} }
void opj_t1_dec_sigpass_raw( static void opj_t1_dec_sigpass_raw(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_INT32 orient, OPJ_INT32 orient,
@ -537,7 +537,7 @@ void opj_t1_dec_sigpass_raw(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_dec_sigpass_mqc( static void opj_t1_dec_sigpass_mqc(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_INT32 orient) OPJ_INT32 orient)
@ -580,7 +580,7 @@ void opj_t1_dec_sigpass_mqc(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_dec_sigpass_mqc_vsc( static void opj_t1_dec_sigpass_mqc_vsc(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_INT32 orient) OPJ_INT32 orient)
@ -608,7 +608,7 @@ void opj_t1_dec_sigpass_mqc_vsc(
void opj_t1_enc_refpass_step( opj_t1_t *t1, static void opj_t1_enc_refpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
OPJ_INT32 bpno, OPJ_INT32 bpno,
@ -636,7 +636,7 @@ void opj_t1_enc_refpass_step( opj_t1_t *t1,
} }
} }
INLINE void opj_t1_dec_refpass_step_raw( static INLINE void opj_t1_dec_refpass_step_raw(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -657,7 +657,7 @@ INLINE void opj_t1_dec_refpass_step_raw(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
INLINE void opj_t1_dec_refpass_step_mqc( static INLINE void opj_t1_dec_refpass_step_mqc(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -678,7 +678,7 @@ INLINE void opj_t1_dec_refpass_step_mqc(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
INLINE void opj_t1_dec_refpass_step_mqc_vsc( static INLINE void opj_t1_dec_refpass_step_mqc_vsc(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -701,7 +701,7 @@ INLINE void opj_t1_dec_refpass_step_mqc_vsc(
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_enc_refpass( static void opj_t1_enc_refpass(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_INT32 *nmsedec, OPJ_INT32 *nmsedec,
@ -731,7 +731,7 @@ void opj_t1_enc_refpass(
} }
} }
void opj_t1_dec_refpass_raw( static void opj_t1_dec_refpass_raw(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_INT32 cblksty) OPJ_INT32 cblksty)
@ -758,7 +758,7 @@ void opj_t1_dec_refpass_raw(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_dec_refpass_mqc( static void opj_t1_dec_refpass_mqc(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno) OPJ_INT32 bpno)
{ {
@ -800,7 +800,7 @@ void opj_t1_dec_refpass_mqc(
} }
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_dec_refpass_mqc_vsc( static void opj_t1_dec_refpass_mqc_vsc(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno) OPJ_INT32 bpno)
{ {
@ -827,7 +827,7 @@ void opj_t1_dec_refpass_mqc_vsc(
} /* VSC and BYPASS by Antonin */ } /* VSC and BYPASS by Antonin */
void opj_t1_enc_clnpass_step( static void opj_t1_enc_clnpass_step(
opj_t1_t *t1, opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
@ -937,7 +937,7 @@ LABEL_PARTIAL:
*flagsp &= ~T1_VISIT; *flagsp &= ~T1_VISIT;
} }
void opj_t1_enc_clnpass( static void opj_t1_enc_clnpass(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_INT32 bpno, OPJ_INT32 bpno,
OPJ_UINT32 orient, OPJ_UINT32 orient,
@ -1161,7 +1161,7 @@ static OPJ_FLOAT64 opj_t1_getwmsedec(
return wmsedec; return wmsedec;
} }
OPJ_BOOL opj_t1_allocate_buffers( static OPJ_BOOL opj_t1_allocate_buffers(
opj_t1_t *t1, opj_t1_t *t1,
OPJ_UINT32 w, OPJ_UINT32 w,
OPJ_UINT32 h) OPJ_UINT32 h)
@ -1358,7 +1358,7 @@ OPJ_BOOL opj_t1_decode_cblks( opj_t1_t* t1,
} }
OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1, static OPJ_BOOL opj_t1_decode_cblk(opj_t1_t *t1,
opj_tcd_cblk_dec_t* cblk, opj_tcd_cblk_dec_t* cblk,
OPJ_UINT32 orient, OPJ_UINT32 orient,
OPJ_UINT32 roishift, OPJ_UINT32 roishift,
@ -1556,7 +1556,7 @@ OPJ_BOOL opj_t1_encode_cblks( opj_t1_t *t1,
} }
/** mod fixed_quality */ /** mod fixed_quality */
void opj_t1_encode_cblk(opj_t1_t *t1, static void opj_t1_encode_cblk(opj_t1_t *t1,
opj_tcd_cblk_enc_t* cblk, opj_tcd_cblk_enc_t* cblk,
OPJ_UINT32 orient, OPJ_UINT32 orient,
OPJ_UINT32 compno, OPJ_UINT32 compno,
@ -1696,7 +1696,7 @@ void opj_t1_encode_cblk(opj_t1_t *t1,
} }
#if 0 #if 0
void opj_t1_dec_refpass_step( opj_t1_t *t1, static void opj_t1_dec_refpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
OPJ_INT32 poshalf, OPJ_INT32 poshalf,
@ -1728,7 +1728,7 @@ void opj_t1_dec_refpass_step( opj_t1_t *t1,
#if 0 #if 0
void opj_t1_dec_sigpass_step( opj_t1_t *t1, static void opj_t1_dec_sigpass_step( opj_t1_t *t1,
opj_flag_t *flagsp, opj_flag_t *flagsp,
OPJ_INT32 *datap, OPJ_INT32 *datap,
OPJ_UINT32 orient, OPJ_UINT32 orient,

16
src/lib/openjp2/t2.c
View File

@ -158,7 +158,7 @@ static void opj_t2_putcommacode(opj_bio_t *bio, OPJ_INT32 n) {
opj_bio_write(bio, 0, 1); opj_bio_write(bio, 0, 1);
} }
OPJ_UINT32 opj_t2_getcommacode(opj_bio_t *bio) static OPJ_UINT32 opj_t2_getcommacode(opj_bio_t *bio)
{ {
OPJ_UINT32 n = 0; OPJ_UINT32 n = 0;
while (opj_bio_read(bio, 1)) { while (opj_bio_read(bio, 1)) {
@ -167,7 +167,7 @@ OPJ_UINT32 opj_t2_getcommacode(opj_bio_t *bio)
return n; return n;
} }
void opj_t2_putnumpasses(opj_bio_t *bio, OPJ_UINT32 n) { static void opj_t2_putnumpasses(opj_bio_t *bio, OPJ_UINT32 n) {
if (n == 1) { if (n == 1) {
opj_bio_write(bio, 0, 1); opj_bio_write(bio, 0, 1);
} else if (n == 2) { } else if (n == 2) {
@ -181,7 +181,7 @@ void opj_t2_putnumpasses(opj_bio_t *bio, OPJ_UINT32 n) {
} }
} }
OPJ_UINT32 opj_t2_getnumpasses(opj_bio_t *bio) { static OPJ_UINT32 opj_t2_getnumpasses(opj_bio_t *bio) {
OPJ_UINT32 n; OPJ_UINT32 n;
if (!opj_bio_read(bio, 1)) if (!opj_bio_read(bio, 1))
return 1; return 1;
@ -511,7 +511,7 @@ void opj_t2_destroy(opj_t2_t *t2) {
} }
} }
OPJ_BOOL opj_t2_decode_packet( opj_t2_t* p_t2, static OPJ_BOOL opj_t2_decode_packet( opj_t2_t* p_t2,
opj_tcd_tile_t *p_tile, opj_tcd_tile_t *p_tile,
opj_tcp_t *p_tcp, opj_tcp_t *p_tcp,
opj_pi_iterator_t *p_pi, opj_pi_iterator_t *p_pi,
@ -550,7 +550,7 @@ OPJ_BOOL opj_t2_decode_packet( opj_t2_t* p_t2,
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_t2_encode_packet( OPJ_UINT32 tileno, static OPJ_BOOL opj_t2_encode_packet( OPJ_UINT32 tileno,
opj_tcd_tile_t * tile, opj_tcd_tile_t * tile,
opj_tcp_t * tcp, opj_tcp_t * tcp,
opj_pi_iterator_t *pi, opj_pi_iterator_t *pi,
@ -825,7 +825,7 @@ static OPJ_BOOL opj_t2_skip_packet( opj_t2_t* p_t2,
} }
OPJ_BOOL opj_t2_read_packet_header( opj_t2_t* p_t2, static OPJ_BOOL opj_t2_read_packet_header( opj_t2_t* p_t2,
opj_tcd_tile_t *p_tile, opj_tcd_tile_t *p_tile,
opj_tcp_t *p_tcp, opj_tcp_t *p_tcp,
opj_pi_iterator_t *p_pi, opj_pi_iterator_t *p_pi,
@ -1094,7 +1094,7 @@ OPJ_BOOL opj_t2_read_packet_header( opj_t2_t* p_t2,
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_t2_read_packet_data( opj_t2_t* p_t2, static OPJ_BOOL opj_t2_read_packet_data( opj_t2_t* p_t2,
opj_tcd_tile_t *p_tile, opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi, opj_pi_iterator_t *p_pi,
OPJ_BYTE *p_src_data, OPJ_BYTE *p_src_data,
@ -1228,7 +1228,7 @@ OPJ_BOOL opj_t2_read_packet_data( opj_t2_t* p_t2,
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_t2_skip_packet_data( opj_t2_t* p_t2, static OPJ_BOOL opj_t2_skip_packet_data( opj_t2_t* p_t2,
opj_tcd_tile_t *p_tile, opj_tcd_tile_t *p_tile,
opj_pi_iterator_t *p_pi, opj_pi_iterator_t *p_pi,
OPJ_UINT32 * p_data_read, OPJ_UINT32 * p_data_read,

28
src/lib/openjp2/tcd.c
View File

@ -1462,7 +1462,7 @@ OPJ_BOOL opj_tcd_update_tile_data ( opj_tcd_t *p_tcd,
void opj_tcd_free_tile(opj_tcd_t *p_tcd) static void opj_tcd_free_tile(opj_tcd_t *p_tcd)
{ {
OPJ_UINT32 compno, resno, bandno, precno; OPJ_UINT32 compno, resno, bandno, precno;
opj_tcd_tile_t *l_tile = 00; opj_tcd_tile_t *l_tile = 00;
@ -1545,7 +1545,7 @@ void opj_tcd_free_tile(opj_tcd_t *p_tcd)
} }
OPJ_BOOL opj_tcd_t2_decode (opj_tcd_t *p_tcd, static OPJ_BOOL opj_tcd_t2_decode (opj_tcd_t *p_tcd,
OPJ_BYTE * p_src_data, OPJ_BYTE * p_src_data,
OPJ_UINT32 * p_data_read, OPJ_UINT32 * p_data_read,
OPJ_UINT32 p_max_src_size, OPJ_UINT32 p_max_src_size,
@ -1577,7 +1577,7 @@ OPJ_BOOL opj_tcd_t2_decode (opj_tcd_t *p_tcd,
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_t1_decode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_t1_decode ( opj_tcd_t *p_tcd )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno;
opj_t1_t * l_t1; opj_t1_t * l_t1;
@ -1607,7 +1607,7 @@ OPJ_BOOL opj_tcd_t1_decode ( opj_tcd_t *p_tcd )
} }
OPJ_BOOL opj_tcd_dwt_decode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_dwt_decode ( opj_tcd_t *p_tcd )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno;
opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
@ -1647,7 +1647,7 @@ OPJ_BOOL opj_tcd_dwt_decode ( opj_tcd_t *p_tcd )
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
{ {
opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
opj_tcp_t * l_tcp = p_tcd->tcp; opj_tcp_t * l_tcp = p_tcd->tcp;
@ -1725,7 +1725,7 @@ OPJ_BOOL opj_tcd_mct_decode ( opj_tcd_t *p_tcd )
} }
OPJ_BOOL opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno;
opj_tcd_tilecomp_t * l_tile_comp = 00; opj_tcd_tilecomp_t * l_tile_comp = 00;
@ -1795,7 +1795,7 @@ OPJ_BOOL opj_tcd_dc_level_shift_decode ( opj_tcd_t *p_tcd )
/** /**
* Deallocates the encoding data of the given precinct. * Deallocates the encoding data of the given precinct.
*/ */
void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct) static void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct)
{ {
OPJ_UINT32 cblkno , l_nb_code_blocks; OPJ_UINT32 cblkno , l_nb_code_blocks;
@ -1833,7 +1833,7 @@ void opj_tcd_code_block_dec_deallocate (opj_tcd_precinct_t * p_precinct)
/** /**
* Deallocates the encoding data of the given precinct. * Deallocates the encoding data of the given precinct.
*/ */
void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_t * p_precinct) static void opj_tcd_code_block_enc_deallocate (opj_tcd_precinct_t * p_precinct)
{ {
OPJ_UINT32 cblkno , l_nb_code_blocks; OPJ_UINT32 cblkno , l_nb_code_blocks;
@ -1894,7 +1894,7 @@ OPJ_UINT32 opj_tcd_get_encoded_tile_size ( opj_tcd_t *p_tcd )
return l_data_size; return l_data_size;
} }
OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd )
{ {
OPJ_UINT32 compno; OPJ_UINT32 compno;
opj_tcd_tilecomp_t * l_tile_comp = 00; opj_tcd_tilecomp_t * l_tile_comp = 00;
@ -1934,7 +1934,7 @@ OPJ_BOOL opj_tcd_dc_level_shift_encode ( opj_tcd_t *p_tcd )
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd )
{ {
opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps;
@ -1989,7 +1989,7 @@ OPJ_BOOL opj_tcd_mct_encode ( opj_tcd_t *p_tcd )
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd )
{ {
opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles; opj_tcd_tile_t * l_tile = p_tcd->tcd_image->tiles;
opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps; opj_tcd_tilecomp_t * l_tile_comp = p_tcd->tcd_image->tiles->comps;
@ -2015,7 +2015,7 @@ OPJ_BOOL opj_tcd_dwt_encode ( opj_tcd_t *p_tcd )
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd ) static OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd )
{ {
opj_t1_t * l_t1; opj_t1_t * l_t1;
const OPJ_FLOAT64 * l_mct_norms; const OPJ_FLOAT64 * l_mct_norms;
@ -2052,7 +2052,7 @@ OPJ_BOOL opj_tcd_t1_encode ( opj_tcd_t *p_tcd )
return OPJ_TRUE; return OPJ_TRUE;
} }
OPJ_BOOL opj_tcd_t2_encode (opj_tcd_t *p_tcd, static OPJ_BOOL opj_tcd_t2_encode (opj_tcd_t *p_tcd,
OPJ_BYTE * p_dest_data, OPJ_BYTE * p_dest_data,
OPJ_UINT32 * p_data_written, OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_max_dest_size, OPJ_UINT32 p_max_dest_size,
@ -2090,7 +2090,7 @@ OPJ_BOOL opj_tcd_t2_encode (opj_tcd_t *p_tcd,
} }
OPJ_BOOL opj_tcd_rate_allocate_encode( opj_tcd_t *p_tcd, static OPJ_BOOL opj_tcd_rate_allocate_encode( opj_tcd_t *p_tcd,
OPJ_BYTE * p_dest_data, OPJ_BYTE * p_dest_data,
OPJ_UINT32 p_max_dest_size, OPJ_UINT32 p_max_dest_size,
opj_codestream_info_t *p_cstr_info ) opj_codestream_info_t *p_cstr_info )