X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2Fjp2.c;h=bfdf2cc817c37d04f28bf50109b844c26a8b3194;hb=1a5c59326ab4836618f88caefa8b66760f624793;hp=a27f8ac61653c23aed2b8e7492084cb76662a9bb;hpb=6ece3f679239c7409cdc6b2c6d19b6d841d3743f;p=openjpeg.git

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index a27f8ac6..bfdf2cc8 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1317,7 +1317,7 @@ static opj_bool jp2_read_colr_v2(	opj_jp2_v2_t * jp2,
 
 	}
 	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;
 
@@ -2389,8 +2389,7 @@ static opj_bool jp2_read_boxhdr_char(
  */
 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
 							)
 {
@@ -2417,8 +2416,7 @@ opj_bool jp2_read_header(	struct opj_stream_private *p_stream,
 
 	return j2k_read_header(	p_stream,
 							jp2->j2k,
-							p_image_header,
-							p_cstr_info,
+							p_file_info,
 							p_manager);
 }
 
@@ -2453,27 +2451,21 @@ void jp2_setup_header_reading (opj_jp2_v2_t *jp2)
  * @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,
@@ -2560,16 +2552,12 @@ void jp2_destroy(opj_jp2_v2_t *jp2)
  *
  * @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);
 }
 
 /* ----------------------------------------------------------------------- */