From a626f82fdd5aa7107d5399316ac6e80c9b6313c0 Mon Sep 17 00:00:00 2001 From: Cyrille Valladeau <cyrille.valladeau@c-s.fr> Date: Fri, 13 Jun 2008 09:12:11 +0000 Subject: [PATCH] Suppression warnind deprecated --- Utilities/otbopenjpeg/libopenjpeg/openjpeg.h | 26 ++++++++++++-------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h index 6933600119..63c67d05ff 100755 --- a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h +++ b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h @@ -806,11 +806,14 @@ Set decoding parameters to default values OPJ_API void OPJ_CALLCONV opj_set_default_decoder_parameters(opj_dparameters_t *parameters); #ifdef USE_OPJ_DEPRECATED -#ifdef _MSC_VER -#pragma message ( "warning, opj_setup_decoder is deprecated") -#else -#warning "warning, opj_setup_decoder is deprecated" -#endif + +// Modif OTB-Dev, suppress warning deprecated, due to improper use of opj_setup_encoder +//#ifdef _MSC_VER +//#pragma message ( "warning, opj_setup_decoder is deprecated") +//#else +//#warning "warning, opj_setup_decoder is deprecated" +//#endif + /** Setup the decoder decoding parameters using user parameters. Decoding parameters are returned in j2k->cp. @@ -990,11 +993,14 @@ OPJ_API OPJ_BOOL OPJ_CALLCONV opj_set_MCT(opj_cparameters_t *parameters,OPJ_FLOA OPJ_API OPJ_BOOL OPJ_CALLCONV opj_restrict_decoding (opj_dparameters_t *parameters,OPJ_INT32 p_start_x,OPJ_INT32 p_start_y,OPJ_INT32 p_end_x,OPJ_INT32 p_end_y); #ifdef USE_OPJ_DEPRECATED -#ifdef _MSC_VER -#pragma message ("warning, opj_setup_encoder is deprecated") -#else -#warning "warning, opj_setup_encoder is deprecated" -#endif + +// Modif OTB-Dev, suppress warning deprecated, due to improper use of opj_setup_encoder +//#ifdef _MSC_VER +//#pragma message ("warning, opj_setup_encoder is deprecated") +//#else +//#warning "warning, opj_setup_encoder is deprecated" +//#endif + /** Setup the encoder parameters using the current image and using user parameters. @param cinfo Compressor handle -- GitLab