Skip to content
Snippets Groups Projects
Commit ff9ca35a authored by Thomas Feuvrier's avatar Thomas Feuvrier
Browse files

Correction : renomme des méthodes "callback" dans JpegDecod et JpegEncod pour...

Correction  : renomme des méthodes "callback" dans JpegDecod et JpegEncod pour éviter même nom, donc PB compilation
parent fbe020db
No related branches found
No related tags found
No related merge requests found
......@@ -46,21 +46,21 @@
/**
sample error debug callback expecting no client object
*/
void error_callback(const char *msg, void *client_data) {
void _openJpegDecoder_error_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[ERROR] %s", msg);
}
/**
sample warning debug callback expecting no client object
*/
void warning_callback(const char *msg, void *client_data) {
void _openJpegDecoder_warning_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[WARNING] %s", msg);
}
/**
sample debug callback expecting no client object
*/
void info_callback(const char *msg, void *client_data) {
void _openJpegDecoder_info_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[INFO] %s", msg);
}
......@@ -113,9 +113,9 @@ int openJpegDecoder(int argc, char * argv[])
}
/* catch events using our callbacks and give a local context */
opj_set_info_handler(l_codec, info_callback,00);
opj_set_warning_handler(l_codec, warning_callback,00);
opj_set_error_handler(l_codec, error_callback,00);
opj_set_info_handler(l_codec, _openJpegDecoder_info_callback,00);
opj_set_warning_handler(l_codec, _openJpegDecoder_warning_callback,00);
opj_set_error_handler(l_codec, _openJpegDecoder_error_callback,00);
if
(! opj_setup_decoder(l_codec,&l_param))
......
......@@ -49,35 +49,35 @@
/**
sample error callback expecting a FILE* client object
*/
void error_callback_file(const char *msg, void *client_data) {
void _openJpegEncoder_error_callback_file(const char *msg, void *client_data) {
FILE *stream = (FILE*)client_data;
fprintf(stream, "[ERROR] %s", msg);
}
/**
sample warning callback expecting a FILE* client object
*/
void warning_callback_file(const char *msg, void *client_data) {
void _openJpegEncoder_warning_callback_file(const char *msg, void *client_data) {
FILE *stream = (FILE*)client_data;
fprintf(stream, "[WARNING] %s", msg);
}
/**
sample error debug callback expecting no client object
*/
void error__callback(const char *msg, void *client_data) {
void _openJpegEncoder_error_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[ERROR] %s", msg);
}
/**
sample warning debug callback expecting no client object
*/
void warning__callback(const char *msg, void *client_data) {
void _openJpegEncoder_warning_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[WARNING] %s", msg);
}
/**
sample debug callback expecting no client object
*/
void info__callback(const char *msg, void *client_data) {
void _openJpegEncoder_info_callback(const char *msg, void *client_data) {
(void)client_data;
fprintf(stdout, "[INFO] %s", msg);
}
......@@ -215,9 +215,9 @@ int openJpegEncoder(int argc, char * argv[])
}
/* catch events using our callbacks and give a local context */
opj_set_info_handler(l_codec, info__callback,00);
opj_set_warning_handler(l_codec, warning__callback,00);
opj_set_error_handler(l_codec, error__callback,00);
opj_set_info_handler(l_codec, _openJpegEncoder_info_callback,00);
opj_set_warning_handler(l_codec, _openJpegEncoder_warning_callback,00);
opj_set_error_handler(l_codec, _openJpegEncoder_error_callback,00);
l_image = opj_image_tile_create(NUM_COMPS,l_params,CLRSPC_SRGB);
if
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment