diff options
| author | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-17 15:05:38 +0000 |
|---|---|---|
| committer | Mathieu Malaterre <mathieu.malaterre@gmail.com> | 2012-03-17 15:05:38 +0000 |
| commit | 652d34b0a8bda11ffea8ef678ce8c91db31fabab (patch) | |
| tree | 11aa34b23c85f2a748566fa2753bde7e97f08371 /libopenjpeg | |
| parent | 7539577b46fff617ab99c4f4fcbbc788387d94f1 (diff) | |
[trunk] HACK: This commit remove some JPWL related code just to allow compilation. See r1564 for more info
Diffstat (limited to 'libopenjpeg')
| -rw-r--r-- | libopenjpeg/j2k.c | 13 | ||||
| -rw-r--r-- | libopenjpeg/jpwl/jpwl.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/jpwl/jpwl.h | 2 |
3 files changed, 16 insertions, 1 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 0d7f62bc..4d03b52c 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -1933,7 +1933,10 @@ opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k, /* UniPG>> */ #ifdef USE_JPWL /* update markers struct */ +/* j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOC, p_stream_tell(p_stream) - 2, 2); +*/ + assert( 0 && "TODO" ); #endif /* USE_JPWL */ /* <<UniPG */ @@ -4832,7 +4835,10 @@ opj_bool j2k_write_sot_v2( opj_j2k_v2_t *p_j2k, /* UniPG>> */ #ifdef USE_JPWL /* update markers struct */ +/* j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOT, p_j2k->sot_start, len + 2); +*/ + assert( 0 && "TODO" ); #endif /* USE_JPWL */ * p_data_written = 12; @@ -5342,7 +5348,9 @@ opj_bool j2k_write_sod_v2( opj_j2k_v2_t *p_j2k, /* UniPG>> */ #ifdef USE_JPWL /* update markers struct */ - j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOD, p_j2k->sod_start, 2); + /*j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOD, p_j2k->sod_start, 2); +*/ + assert( 0 && "TODO" ); #endif /* USE_JPWL */ /* <<UniPG */ /*}*/ @@ -6144,12 +6152,15 @@ opj_bool j2k_write_epc( opj_j2k_v2_t *p_j2k, #ifdef USE_JPWL /* preparation of JPWL marker segments */ +#if 0 if(cp->epc_on) { /* encode according to JPWL */ jpwl_encode(p_j2k, p_stream, image); } +#endif + assert( 0 && "TODO" ); #endif /* USE_JPWL */ return OPJ_TRUE; diff --git a/libopenjpeg/jpwl/jpwl.c b/libopenjpeg/jpwl/jpwl.c index e379278f..db8cfa3f 100644 --- a/libopenjpeg/jpwl/jpwl.c +++ b/libopenjpeg/jpwl/jpwl.c @@ -955,6 +955,7 @@ void j2k_read_epc(opj_j2k_t *j2k) { cio_seek(cio, Lepcp + Lepc); } +#if 0 void j2k_write_epc(opj_j2k_t *j2k) { unsigned long int DL, Lepcp, Pcrcp, l; @@ -1015,6 +1016,7 @@ void j2k_write_epc(opj_j2k_t *j2k) { j2k_add_marker(j2k->cstr_info, J2K_MS_EPC, Lepcp - 2, Lepc + 2); } +#endif void j2k_read_epb(opj_j2k_t *j2k) { unsigned long int LDPepb, Pepb; diff --git a/libopenjpeg/jpwl/jpwl.h b/libopenjpeg/jpwl/jpwl.h index b77afdd6..12076283 100644 --- a/libopenjpeg/jpwl/jpwl.h +++ b/libopenjpeg/jpwl/jpwl.h @@ -243,7 +243,9 @@ as a possible value, mening that the information is not available) and the infor are not yet implemented @param j2k J2K handle */ +#if 0 void j2k_write_epc(opj_j2k_t *j2k); +#endif /** Read the EPB marker (Error Protection Block) |