diff options
| author | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-24 11:21:19 +0000 |
|---|---|---|
| committer | Francois-Olivier Devaux <fodevaux@users.noreply.github.com> | 2010-03-24 11:21:19 +0000 |
| commit | 73b4d326382e1c7e0f10ea98cc9f1b4672aa3fb2 (patch) | |
| tree | e5f10dc589853a7bd7ec36ebb34f2e2e6e5b32db /libopenjpeg/jp2.c | |
| parent | 67b5ab3c045fae8da28392596ee49ac1bbdbec40 (diff) | |
Code improvements using 'g++-4.4.0' to trace the code (v2.0). Thanks to Winfried for this patch.
Diffstat (limited to 'libopenjpeg/jp2.c')
| -rw-r--r-- | libopenjpeg/jp2.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libopenjpeg/jp2.c b/libopenjpeg/jp2.c index 1bd7b4a9..a9e3975e 100644 --- a/libopenjpeg/jp2.c +++ b/libopenjpeg/jp2.c @@ -505,7 +505,7 @@ bool jp2_read_header_procedure( assert(jp2 != 00); assert(p_manager != 00); - l_current_data = opj_malloc(l_last_data_size); + l_current_data = (unsigned char*)opj_malloc(l_last_data_size); if (l_current_data == 00) @@ -549,7 +549,7 @@ bool jp2_read_header_procedure( if (l_current_data_size > l_last_data_size) { - l_current_data = opj_realloc(l_current_data,l_current_data_size); + l_current_data = (unsigned char*)opj_realloc(l_current_data,l_current_data_size); l_last_data_size = l_current_data_size; } l_nb_bytes_read = opj_stream_read_data(cio,l_current_data,l_current_data_size,p_manager); @@ -1902,7 +1902,7 @@ void jp2_setup_end_header_writting (opj_jp2_t *jp2) // preconditions assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_write_jp2c ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_write_jp2c ); /* DEVELOPER CORNER, add your custom procedures */ } @@ -1915,7 +1915,7 @@ void jp2_setup_header_reading (opj_jp2_t *jp2) // preconditions assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_read_header_procedure ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_read_header_procedure ); /* DEVELOPER CORNER, add your custom procedures */ } @@ -1927,7 +1927,7 @@ void jp2_setup_end_header_reading (opj_jp2_t *jp2) { // preconditions assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_read_header_procedure ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_read_header_procedure ); /* DEVELOPER CORNER, add your custom procedures */ } @@ -2005,7 +2005,7 @@ void jp2_setup_encoding_validation (opj_jp2_t *jp2) { // preconditions assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_validation_list, jp2_default_validation); + opj_procedure_list_add_procedure(jp2->m_validation_list, (void*)jp2_default_validation); /* DEVELOPER CORNER, add your custom validation procedure */ } @@ -2027,10 +2027,10 @@ void jp2_setup_header_writting (opj_jp2_t *jp2) { // preconditions assert(jp2 != 00); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_write_jp ); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_write_ftyp ); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_write_jp2h ); - opj_procedure_list_add_procedure(jp2->m_procedure_list,jp2_skip_jp2c ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_write_jp ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_write_ftyp ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_write_jp2h ); + opj_procedure_list_add_procedure(jp2->m_procedure_list,(void*)jp2_skip_jp2c ); /* DEVELOPER CORNER, insert your custom procedures */ |