}
else // TODO MSD
- opj_event_msg_v2(p_manager, EVT_INFO, "COLR BOX meth value is not is not a regular value (%d), so we will skip the fields following approx field.\n", jp2->meth);
+ opj_event_msg_v2(p_manager, EVT_INFO, "COLR BOX meth value is not a regular value (%d), so we will skip the fields following the approx field.\n", jp2->meth);
jp2->color.jp2_has_colr = 1;
*/
opj_bool jp2_read_header( struct opj_stream_private *p_stream,
opj_jp2_v2_t *jp2,
- opj_image_header_t ** p_image_header,
- struct opj_codestream_info** p_cstr_info,
+ opj_file_info_t * p_file_info,
struct opj_event_mgr * p_manager
)
{
return j2k_read_header( p_stream,
jp2->j2k,
- p_image_header,
- p_cstr_info,
+ p_file_info,
p_manager);
}
* @param p_stream the stream to write data to.
* @param p_manager the user event manager.
*/
-opj_bool jp2_read_tile_header (
- opj_jp2_v2_t * p_jp2,
- OPJ_UINT32 * p_tile_index,
- OPJ_UINT32 * p_data_size,
- OPJ_INT32 * p_tile_x0,
- OPJ_INT32 * p_tile_y0,
- OPJ_INT32 * p_tile_x1,
- OPJ_INT32 * p_tile_y1,
- OPJ_UINT32 * p_nb_comps,
- opj_bool * p_go_on,
- opj_stream_private_t *p_stream,
- opj_event_mgr_t * p_manager
- )
+opj_bool jp2_read_tile_header( opj_jp2_v2_t * p_jp2,
+ OPJ_UINT32 * p_tile_index,
+ OPJ_UINT32 * p_data_size,
+ OPJ_INT32 * p_tile_x0, OPJ_INT32 * p_tile_y0,
+ OPJ_INT32 * p_tile_x1, OPJ_INT32 * p_tile_y1,
+ OPJ_UINT32 * p_nb_comps,
+ opj_bool * p_go_on,
+ opj_stream_private_t *p_stream,
+ opj_event_mgr_t * p_manager )
{
- return j2k_read_tile_header (p_jp2->j2k,
+ return j2k_read_tile_header(p_jp2->j2k,
p_tile_index,
p_data_size,
- p_tile_x0,
- p_tile_y0,
- p_tile_x1,
- p_tile_y1,
+ p_tile_x0, p_tile_y0,
+ p_tile_x1, p_tile_y1,
p_nb_comps,
p_go_on,
p_stream,
*
* @return true if the area could be set.
*/
-opj_bool jp2_set_decode_area(
- opj_jp2_v2_t *p_jp2,
- OPJ_INT32 p_start_x,
- OPJ_INT32 p_start_y,
- OPJ_INT32 p_end_x,
- OPJ_INT32 p_end_y,
- struct opj_event_mgr * p_manager
- )
+opj_bool jp2_set_decode_area( opj_jp2_v2_t *p_jp2,
+ OPJ_INT32 p_start_x, OPJ_INT32 p_start_y,
+ OPJ_INT32 p_end_x, OPJ_INT32 p_end_y,
+ struct opj_event_mgr * p_manager )
{
- return j2k_set_decode_area(p_jp2->j2k,p_start_x,p_start_y,p_end_x,p_end_y,p_manager);
+ return j2k_set_decode_area(p_jp2->j2k, p_start_x, p_start_y, p_end_x, p_end_y, p_manager);
}
/* ----------------------------------------------------------------------- */