X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libopenjpeg%2Fjp2.c;h=959366fd07eabeaba18afe13620d4e85b073249f;hb=a600d8f4e2c21ea0532d4af3dc6374b60b93c583;hp=efbf8d101da8d28cb8bfe6bdac1b1aafed68ab41;hpb=d44375aece5dea2af83ffb8c9de4ade2ad35c593;p=openjpeg.git

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index efbf8d10..959366fd 100644
--- a/libopenjpeg/jp2.c
+++ b/libopenjpeg/jp2.c
@@ -1750,11 +1750,12 @@ void jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters) {
 	/* further JP2 initializations go here */
 }
 
-void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters) {
+void jp2_setup_decoder_v2(opj_jp2_v2_t *jp2, opj_dparameters_t *parameters)
+{
 	/* setup the J2K codec */
 	j2k_setup_decoder_v2(jp2->j2k, parameters);
-	/* further JP2 initializations go here */
 
+	/* further JP2 initializations go here */
 	jp2->color.jp2_has_colr = 0;
 }
 
@@ -2389,7 +2390,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_file_info_t * p_file_info,
+							opj_image_header_t* p_img_header,
 							struct opj_event_mgr * p_manager
 							)
 {
@@ -2416,7 +2417,7 @@ opj_bool jp2_read_header(	struct opj_stream_private *p_stream,
 
 	return j2k_read_header(	p_stream,
 							jp2->j2k,
-							p_file_info,
+							p_img_header,
 							p_manager);
 }
 
@@ -2451,27 +2452,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,
@@ -2558,16 +2553,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);
 }
 
 /* ----------------------------------------------------------------------- */