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

Merge pull request #984 from stweil/const 

Use more const qualifiers
This commit is contained in:
Even Rouault 2017-08-14 17:28:26 +02:00 committed by GitHub
parent baf0c1ad45 bc59410f25
commit 52d5690a6f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1305,7 +1305,7 @@ typedef struct j2k_prog_order {
char str_prog[5]; char str_prog[5];
} j2k_prog_order_t; } j2k_prog_order_t;
static j2k_prog_order_t j2k_prog_order_list[] = { static const j2k_prog_order_t j2k_prog_order_list[] = {
{OPJ_CPRL, "CPRL"}, {OPJ_CPRL, "CPRL"},
{OPJ_LRCP, "LRCP"}, {OPJ_LRCP, "LRCP"},
{OPJ_PCRL, "PCRL"}, {OPJ_PCRL, "PCRL"},
@ -1602,9 +1602,9 @@ static void opj_j2k_write_float_to_float64(const void * p_src_data,
} }
} }
char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order) const char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order)
{ {
j2k_prog_order_t *po; const j2k_prog_order_t *po;
for (po = j2k_prog_order_list; po->enum_prog != -1; po++) { for (po = j2k_prog_order_list; po->enum_prog != -1; po++) {
if (po->enum_prog == prg_order) { if (po->enum_prog == prg_order) {
return po->str_prog; return po->str_prog;

2
src/lib/openjp2/j2k.h
View File

@ -617,7 +617,7 @@ OPJ_BOOL opj_j2k_setup_encoder(opj_j2k_t *p_j2k,
/** /**
Converts an enum type progression order to string type Converts an enum type progression order to string type
*/ */
char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order); const char *opj_j2k_convert_progression_order(OPJ_PROG_ORDER prg_order);
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/*@}*/ /*@}*/

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

@ -79,7 +79,7 @@ static void opj_mqc_setbits(opj_mqc_t *mqc);
/* <summary> */ /* <summary> */
/* This array defines all the possible states for a context. */ /* This array defines all the possible states for a context. */
/* </summary> */ /* </summary> */
static opj_mqc_state_t mqc_states[47 * 2] = { static const opj_mqc_state_t mqc_states[47 * 2] = {
{0x5601, 0, &mqc_states[2], &mqc_states[3]}, {0x5601, 0, &mqc_states[2], &mqc_states[3]},
{0x5601, 1, &mqc_states[3], &mqc_states[2]}, {0x5601, 1, &mqc_states[3], &mqc_states[2]},
{0x3401, 0, &mqc_states[4], &mqc_states[12]}, {0x3401, 0, &mqc_states[4], &mqc_states[12]},

8
src/lib/openjp2/mqc.h
View File

@ -61,9 +61,9 @@ typedef struct opj_mqc_state {
/** the Most Probable Symbol (0 or 1) */ /** the Most Probable Symbol (0 or 1) */
OPJ_UINT32 mps; OPJ_UINT32 mps;
/** next state if the next encoded symbol is the MPS */ /** next state if the next encoded symbol is the MPS */
struct opj_mqc_state *nmps; const struct opj_mqc_state *nmps;
/** next state if the next encoded symbol is the LPS */ /** next state if the next encoded symbol is the LPS */
struct opj_mqc_state *nlps; const struct opj_mqc_state *nlps;
} opj_mqc_state_t; } opj_mqc_state_t;
#define MQC_NUMCTXS 19 #define MQC_NUMCTXS 19
@ -87,9 +87,9 @@ typedef struct opj_mqc {
/** pointer to the end of the buffer */ /** pointer to the end of the buffer */
OPJ_BYTE *end; OPJ_BYTE *end;
/** Array of contexts */ /** Array of contexts */
opj_mqc_state_t *ctxs[MQC_NUMCTXS]; const opj_mqc_state_t *ctxs[MQC_NUMCTXS];
/** Active context */ /** Active context */
opj_mqc_state_t **curctx; const opj_mqc_state_t **curctx;
/* lut_ctxno_zc shifted by (1 << 9) * bandno */ /* lut_ctxno_zc shifted by (1 << 9) * bandno */
const OPJ_BYTE* lut_ctxno_zc_orient; const OPJ_BYTE* lut_ctxno_zc_orient;
/** Original value of the 2 bytes at end[0] and end[1] */ /** Original value of the 2 bytes at end[0] and end[1] */

2
src/lib/openjp2/mqc_inl.h
View File

@ -157,7 +157,7 @@ static INLINE OPJ_UINT32 opj_mqc_raw_decode(opj_mqc_t *mqc)
} }
#define DOWNLOAD_MQC_VARIABLES(mqc, curctx, c, a, ct) \ #define DOWNLOAD_MQC_VARIABLES(mqc, curctx, c, a, ct) \
register opj_mqc_state_t **curctx = mqc->curctx; \ register const opj_mqc_state_t **curctx = mqc->curctx; \
register OPJ_UINT32 c = mqc->c; \ register OPJ_UINT32 c = mqc->c; \
register OPJ_UINT32 a = mqc->a; \ register OPJ_UINT32 a = mqc->a; \
register OPJ_UINT32 ct = mqc->ct register OPJ_UINT32 ct = mqc->ct