From ff9ca35a0fea3e32ab61b5659dd6004184ffdd22 Mon Sep 17 00:00:00 2001
From: Thomas Feuvrier <thomas.feuvrier@c-s.fr>
Date: Fri, 4 Jul 2008 10:00:15 +0000
Subject: [PATCH] =?UTF-8?q?Correction=20=20:=20renomme=20des=20m=C3=A9thod?=
=?UTF-8?q?es=20"callback"=20dans=20JpegDecod=20et=20JpegEncod=20pour=20?=
=?UTF-8?q?=C3=A9viter=20m=C3=AAme=20nom,=20donc=20PB=20compilation?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Testing/Utilities/openJpegDecoder.cxx | 12 ++++++------
Testing/Utilities/openJpegEncoder.cxx | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Testing/Utilities/openJpegDecoder.cxx b/Testing/Utilities/openJpegDecoder.cxx
index 4311095d5c..9a8e918c2d 100644
--- a/Testing/Utilities/openJpegDecoder.cxx
+++ b/Testing/Utilities/openJpegDecoder.cxx
@@ -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))
diff --git a/Testing/Utilities/openJpegEncoder.cxx b/Testing/Utilities/openJpegEncoder.cxx
index c36057c0f6..deb93224a7 100644
--- a/Testing/Utilities/openJpegEncoder.cxx
+++ b/Testing/Utilities/openJpegEncoder.cxx
@@ -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
--
GitLab