From 58cfcaff9fbd4e02aaded5b5b06a9e573a7bc38e Mon Sep 17 00:00:00 2001 From: Mathieu Malaterre Date: Thu, 1 Mar 2012 15:39:44 +0000 Subject: [PATCH] [1.5] Fix a warning about conversion from const char* to char* --- applications/jpip/libopenjpip/jpipstream_manager.c | 4 ++-- applications/jpip/libopenjpip/jpipstream_manager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/jpip/libopenjpip/jpipstream_manager.c b/applications/jpip/libopenjpip/jpipstream_manager.c index 9a5f91fe..daedd377 100644 --- a/applications/jpip/libopenjpip/jpipstream_manager.c +++ b/applications/jpip/libopenjpip/jpipstream_manager.c @@ -52,7 +52,7 @@ Byte_t * update_JPIPstream( Byte_t *newstream, int newstreamlen, Byte_t *cache_s return stream; } -void save_codestream( Byte_t *codestream, Byte8_t streamlen, char *fmt) +void save_codestream( Byte_t *codestream, Byte8_t streamlen, const char *fmt) { time_t timer; struct tm *t_st; @@ -74,7 +74,7 @@ void save_codestream( Byte_t *codestream, Byte8_t streamlen, char *fmt) Byte_t * jpipstream_to_pnm( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte8_t csn, int fw, int fh, ihdrbox_param_t **ihdrbox) { Byte_t *pnmstream; - Byte_t *j2kstream; // j2k or jp2 codestream + Byte_t *j2kstream; /* j2k or jp2 codestream */ Byte8_t j2klen; j2kstream = recons_j2k( msgqueue, jpipstream, csn, fw, fh, &j2klen); diff --git a/applications/jpip/libopenjpip/jpipstream_manager.h b/applications/jpip/libopenjpip/jpipstream_manager.h index 795ae4a0..89585a24 100644 --- a/applications/jpip/libopenjpip/jpipstream_manager.h +++ b/applications/jpip/libopenjpip/jpipstream_manager.h @@ -34,7 +34,7 @@ Byte_t * update_JPIPstream( Byte_t *newstream, int newstreamlen, Byte_t *cache_stream, int *streamlen); -void save_codestream( Byte_t *codestream, Byte8_t streamlen, char *fmt); +void save_codestream( Byte_t *codestream, Byte8_t streamlen, const char *fmt); Byte_t * jpipstream_to_pnm( Byte_t *jpipstream, msgqueue_param_t *msgqueue, Byte8_t csn, int fw, int fh, ihdrbox_param_t **ihdrbox);