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

diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c
index bfdf2cc8..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);
 }