Skip to content

Commit

Permalink
j2k.c: use correct naming convention for total_data_size variable
Browse files Browse the repository at this point in the history
  • Loading branch information
@rouault
rouault committed Apr 23, 2019
1 parent d0dd894 commit 5dd75f6
Showing 1 changed file with 27 additions and 27 deletions.
54 changes: 27 additions & 27 deletions src/lib/openjp2/j2k.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,14 +400,14 @@ static OPJ_BOOL opj_j2k_setup_header_writing(opj_j2k_t *p_j2k,
static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
opj_stream_private_t *p_stream,
struct opj_event_mgr * p_manager);

static OPJ_BOOL opj_j2k_write_all_tile_parts(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
opj_stream_private_t *p_stream,
struct opj_event_mgr * p_manager);

Expand Down Expand Up @@ -832,14 +832,14 @@ static OPJ_BOOL opj_j2k_write_tlm(opj_j2k_t *p_j2k,
*
* @param p_j2k J2K codec.
* @param p_data Output buffer
* @param p_total_data_size Output buffer size
* @param total_data_size Output buffer size
* @param p_data_written Number of bytes written into stream
* @param p_stream the stream to write data to.
* @param p_manager the user event manager.
*/
static OPJ_BOOL opj_j2k_write_sot(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
OPJ_UINT32 * p_data_written,
const opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager);
Expand Down Expand Up @@ -883,15 +883,15 @@ static OPJ_BOOL opj_j2k_read_sot(opj_j2k_t *p_j2k,
* @param p_tile_coder FIXME DOC
* @param p_data FIXME DOC
* @param p_data_written FIXME DOC
* @param p_total_data_size FIXME DOC
* @param total_data_size FIXME DOC
* @param p_stream the stream to write data to.
* @param p_manager the user event manager.
*/
static OPJ_BOOL opj_j2k_write_sod(opj_j2k_t *p_j2k,
opj_tcd_t * p_tile_coder,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
const opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager);

Expand Down Expand Up @@ -4205,7 +4205,7 @@ static OPJ_BOOL opj_j2k_write_tlm(opj_j2k_t *p_j2k,

static OPJ_BOOL opj_j2k_write_sot(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
OPJ_UINT32 * p_data_written,
const opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager
Expand All @@ -4218,7 +4218,7 @@ static OPJ_BOOL opj_j2k_write_sot(opj_j2k_t *p_j2k,

OPJ_UNUSED(p_stream);

if (p_total_data_size < 12) {
if (total_data_size < 12) {
opj_event_msg(p_manager, EVT_ERROR,
"Not enough bytes in output buffer to write SOT marker\n");
return OPJ_FALSE;
Expand Down Expand Up @@ -4615,7 +4615,7 @@ static OPJ_BOOL opj_j2k_write_sod(opj_j2k_t *p_j2k,
opj_tcd_t * p_tile_coder,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
const opj_stream_private_t *p_stream,
opj_event_mgr_t * p_manager
)
Expand All @@ -4630,7 +4630,7 @@ static OPJ_BOOL opj_j2k_write_sod(opj_j2k_t *p_j2k,

OPJ_UNUSED(p_stream);

if (p_total_data_size < 4) {
if (total_data_size < 4) {
opj_event_msg(p_manager, EVT_ERROR,
"Not enough bytes in output buffer to write SOD marker\n");
return OPJ_FALSE;
Expand All @@ -4641,7 +4641,7 @@ static OPJ_BOOL opj_j2k_write_sod(opj_j2k_t *p_j2k,
p_data += 2;

/* make room for the EOF marker */
l_remaining_data = p_total_data_size - 4;
l_remaining_data = total_data_size - 4;

/* update tile coder */
p_tile_coder->tp_num =
Expand Down Expand Up @@ -11707,7 +11707,7 @@ static OPJ_BOOL opj_j2k_setup_header_writing(opj_j2k_t *p_j2k,
static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
opj_stream_private_t *p_stream,
struct opj_event_mgr * p_manager)
{
Expand All @@ -11731,15 +11731,15 @@ static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,

l_current_nb_bytes_written = 0;
l_begin_data = p_data;
if (! opj_j2k_write_sot(p_j2k, p_data, p_total_data_size,
if (! opj_j2k_write_sot(p_j2k, p_data, total_data_size,
&l_current_nb_bytes_written, p_stream,
p_manager)) {
return OPJ_FALSE;
}

l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;

if (!OPJ_IS_CINEMA(l_cp->rsiz)) {
#if 0
Expand All @@ -11749,14 +11749,14 @@ static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,
p_manager);
l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;

l_current_nb_bytes_written = 0;
opj_j2k_write_qcc_in_memory(p_j2k, compno, p_data, &l_current_nb_bytes_written,
p_manager);
l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
}
#endif
if (l_cp->tcps[p_j2k->m_current_tile_number].numpocs) {
Expand All @@ -11765,13 +11765,13 @@ static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,
p_manager);
l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
}
}

l_current_nb_bytes_written = 0;
if (! opj_j2k_write_sod(p_j2k, l_tcd, p_data, &l_current_nb_bytes_written,
p_total_data_size, p_stream, p_manager)) {
total_data_size, p_stream, p_manager)) {
return OPJ_FALSE;
}

Expand All @@ -11792,7 +11792,7 @@ static OPJ_BOOL opj_j2k_write_first_tile_part(opj_j2k_t *p_j2k,
static OPJ_BOOL opj_j2k_write_all_tile_parts(opj_j2k_t *p_j2k,
OPJ_BYTE * p_data,
OPJ_UINT32 * p_data_written,
OPJ_UINT32 p_total_data_size,
OPJ_UINT32 total_data_size,
opj_stream_private_t *p_stream,
struct opj_event_mgr * p_manager
)
Expand Down Expand Up @@ -11825,7 +11825,7 @@ static OPJ_BOOL opj_j2k_write_all_tile_parts(opj_j2k_t *p_j2k,
l_begin_data = p_data;

if (! opj_j2k_write_sot(p_j2k, p_data,
p_total_data_size,
total_data_size,
&l_current_nb_bytes_written,
p_stream,
p_manager)) {
Expand All @@ -11834,18 +11834,18 @@ static OPJ_BOOL opj_j2k_write_all_tile_parts(opj_j2k_t *p_j2k,

l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
l_part_tile_size += l_current_nb_bytes_written;

l_current_nb_bytes_written = 0;
if (! opj_j2k_write_sod(p_j2k, l_tcd, p_data, &l_current_nb_bytes_written,
p_total_data_size, p_stream, p_manager)) {
total_data_size, p_stream, p_manager)) {
return OPJ_FALSE;
}

p_data += l_current_nb_bytes_written;
l_nb_bytes_written += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
l_part_tile_size += l_current_nb_bytes_written;

/* Writing Psot in SOT marker */
Expand All @@ -11871,27 +11871,27 @@ static OPJ_BOOL opj_j2k_write_all_tile_parts(opj_j2k_t *p_j2k,
l_begin_data = p_data;

if (! opj_j2k_write_sot(p_j2k, p_data,
p_total_data_size,
total_data_size,
&l_current_nb_bytes_written, p_stream,
p_manager)) {
return OPJ_FALSE;
}

l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
l_part_tile_size += l_current_nb_bytes_written;

l_current_nb_bytes_written = 0;

if (! opj_j2k_write_sod(p_j2k, l_tcd, p_data, &l_current_nb_bytes_written,
p_total_data_size, p_stream, p_manager)) {
total_data_size, p_stream, p_manager)) {
return OPJ_FALSE;
}

l_nb_bytes_written += l_current_nb_bytes_written;
p_data += l_current_nb_bytes_written;
p_total_data_size -= l_current_nb_bytes_written;
total_data_size -= l_current_nb_bytes_written;
l_part_tile_size += l_current_nb_bytes_written;

/* Writing Psot in SOT marker */
Expand Down

0 comments on commit 5dd75f6

Please sign in to comment.