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

[trunk] HACK: This commit remove some JPWL related code just to allow compilation. See r1564 for more info

This commit is contained in:
Mathieu Malaterre 2012-03-17 15:05:38 +00:00
parent 7539577b46
commit 652d34b0a8
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libopenjpeg/j2k.c
View File

@ -1933,7 +1933,10 @@ opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k,
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
/* update markers struct */ /* update markers struct */
/*
j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOC, p_stream_tell(p_stream) - 2, 2); j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOC, p_stream_tell(p_stream) - 2, 2);
*/
assert( 0 && "TODO" );
#endif /* USE_JPWL */ #endif /* USE_JPWL */
/* <<UniPG */ /* <<UniPG */
@ -4832,7 +4835,10 @@ opj_bool j2k_write_sot_v2( opj_j2k_v2_t *p_j2k,
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
/* update markers struct */ /* update markers struct */
/*
j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOT, p_j2k->sot_start, len + 2); j2k_add_marker(p_j2k->cstr_info, J2K_MS_SOT, p_j2k->sot_start, len + 2);
*/
assert( 0 && "TODO" );
#endif /* USE_JPWL */ #endif /* USE_JPWL */
* p_data_written = 12; * p_data_written = 12;
@ -5342,7 +5348,9 @@ opj_bool j2k_write_sod_v2( opj_j2k_v2_t *p_j2k,
/* UniPG>> */ /* UniPG>> */
#ifdef USE_JPWL #ifdef USE_JPWL
/* update markers struct */ /* 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 */ #endif /* USE_JPWL */
/* <<UniPG */ /* <<UniPG */
/*}*/ /*}*/
@ -6144,12 +6152,15 @@ opj_bool j2k_write_epc( opj_j2k_v2_t *p_j2k,
#ifdef USE_JPWL #ifdef USE_JPWL
/* preparation of JPWL marker segments */ /* preparation of JPWL marker segments */
#if 0
if(cp->epc_on) { if(cp->epc_on) {
/* encode according to JPWL */ /* encode according to JPWL */
jpwl_encode(p_j2k, p_stream, image); jpwl_encode(p_j2k, p_stream, image);
} }
#endif
assert( 0 && "TODO" );
#endif /* USE_JPWL */ #endif /* USE_JPWL */
return OPJ_TRUE; return OPJ_TRUE;

2
libopenjpeg/jpwl/jpwl.c
View File

@ -955,6 +955,7 @@ void j2k_read_epc(opj_j2k_t *j2k) {
cio_seek(cio, Lepcp + Lepc); cio_seek(cio, Lepcp + Lepc);
} }
#if 0
void j2k_write_epc(opj_j2k_t *j2k) { void j2k_write_epc(opj_j2k_t *j2k) {
unsigned long int DL, Lepcp, Pcrcp, l; 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); j2k_add_marker(j2k->cstr_info, J2K_MS_EPC, Lepcp - 2, Lepc + 2);
} }
#endif
void j2k_read_epb(opj_j2k_t *j2k) { void j2k_read_epb(opj_j2k_t *j2k) {
unsigned long int LDPepb, Pepb; unsigned long int LDPepb, Pepb;

2
libopenjpeg/jpwl/jpwl.h
View File

@ -243,7 +243,9 @@ as a possible value, mening that the information is not available) and the infor
are not yet implemented are not yet implemented
@param j2k J2K handle @param j2k J2K handle
*/ */
#if 0
void j2k_write_epc(opj_j2k_t *j2k); void j2k_write_epc(opj_j2k_t *j2k);
#endif
/** /**
Read the EPB marker (Error Protection Block) Read the EPB marker (Error Protection Block)