diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-16 12:32:34 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-16 12:32:34 +0000 |
| commit | ff8e97310d0ee0c4bf38cd1348f3a34979d14ff1 (patch) | |
| tree | 3333a80807c39949f573d73c9a4f2f9481ea303c | |
| parent | 2546661aeb27ebdc2db2804e3d7d1ade2373781c (diff) | |
remove deprecated v1 style function j2k_write_soc
| -rw-r--r-- | libopenjpeg/j2k.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c index 14654c6b..030cda58 100644 --- a/libopenjpeg/j2k.c +++ b/libopenjpeg/j2k.c @@ -378,12 +378,6 @@ static opj_bool opj_j2k_allocate_tile_element_cstr_index(opj_j2k_v2_t *p_j2k); */ /** -Write the SOC marker (Start Of Codestream) -@param j2k J2K handle -*/ -static void j2k_write_soc(opj_j2k_t *j2k); - -/** * Writes the SOC marker (Start Of Codestream) * * @param p_stream the stream to write data to. @@ -1925,22 +1919,6 @@ opj_bool j2k_calculate_tp_v2( opj_j2k_v2_t *p_j2k, return OPJ_TRUE; } -static void j2k_write_soc(opj_j2k_t *j2k) { - opj_cio_t *cio = j2k->cio; - cio_write(cio, J2K_MS_SOC, 2); - - if(j2k->cstr_info) - j2k_add_mhmarker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio), 0); - -/* UniPG>> */ -#ifdef USE_JPWL - - /* update markers struct */ - j2k_add_marker(j2k->cstr_info, J2K_MS_SOC, cio_tell(cio) - 2, 2); -#endif /* USE_JPWL */ -/* <<UniPG */ -} - /** * Writes the SOC marker (Start Of Codestream) * @@ -1948,9 +1926,9 @@ static void j2k_write_soc(opj_j2k_t *j2k) { * @param p_j2k J2K codec. * @param p_manager the user event manager. */ -opj_bool j2k_write_soc_v2( opj_j2k_v2_t *p_j2k, - struct opj_stream_private *p_stream, - struct opj_event_mgr * p_manager ) +opj_bool opj_j2k_write_soc( opj_j2k_v2_t *p_j2k, + opj_stream_private_t *p_stream, + opj_event_mgr_t * p_manager ) { /* 2 bytes will be written */ OPJ_BYTE * l_start_stream = 00; |
