diff options
| author | Chris Liddell <chris.liddell@artifex.com> | 2014-02-18 09:36:09 +0000 |
|---|---|---|
| committer | Chris Liddell <chris.liddell@artifex.com> | 2014-02-20 10:21:14 +0000 |
| commit | 7bd3739a888f70edf0270891782a88a547f5e829 (patch) | |
| tree | e91b195114217be09d85e82a879aeda5c372ba85 | |
| parent | 174cfd14e4d34a37cdcf2e0372bd0b4334310e8b (diff) | |
| download | ghostpdl-7bd3739a888f70edf0270891782a88a547f5e829.tar.gz | |
Make the OpenJPEG callbacks static.....
and give them names more likely to be unique (just for debugging convenience).
No cluster differences.
| -rw-r--r-- | gs/base/sjpx_openjpeg.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gs/base/sjpx_openjpeg.c b/gs/base/sjpx_openjpeg.c index 9b78d2a2c..aa2506bf1 100644 --- a/gs/base/sjpx_openjpeg.c +++ b/gs/base/sjpx_openjpeg.c @@ -29,7 +29,7 @@ gs_private_st_simple(st_jpxd_state, stream_jpxd_state, static int s_opjd_accumulate_input(stream_jpxd_state *state, stream_cursor_read * pr); -OPJ_SIZE_T stream_read(void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data) +static OPJ_SIZE_T sjpx_stream_read(void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_data) { stream_block *sb = (stream_block *)p_user_data; OPJ_SIZE_T len; @@ -46,7 +46,7 @@ OPJ_SIZE_T stream_read(void * p_buffer, OPJ_SIZE_T p_nb_bytes, void * p_user_dat return len; } -OPJ_OFF_T stream_skip(OPJ_OFF_T skip, void * p_user_data) +static OPJ_OFF_T sjpx_stream_skip(OPJ_OFF_T skip, void * p_user_data) { stream_block *sb = (stream_block *)p_user_data; @@ -56,7 +56,7 @@ OPJ_OFF_T stream_skip(OPJ_OFF_T skip, void * p_user_data) return sb->pos; } -OPJ_BOOL stream_seek(OPJ_OFF_T seek_pos, void * p_user_data) +static OPJ_BOOL sjpx_stream_seek(OPJ_OFF_T seek_pos, void * p_user_data) { stream_block *sb = (stream_block *)p_user_data; @@ -147,9 +147,9 @@ s_opjd_set_codec_format(stream_state * ss, OPJ_CODEC_FORMAT format) return ERRC; } - opj_stream_set_read_function(state->stream, stream_read); - opj_stream_set_skip_function(state->stream, stream_skip); - opj_stream_set_seek_function(state->stream, stream_seek); + opj_stream_set_read_function(state->stream, sjpx_stream_read); + opj_stream_set_skip_function(state->stream, sjpx_stream_skip); + opj_stream_set_seek_function(state->stream, sjpx_stream_seek); return 0; } |