summaryrefslogtreecommitdiff
path: root/src/lib/openjpip/jp2k_decoder.c
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-03 11:36:31 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-03 11:36:31 +0000
commit25255c4ed1cb1974857189a2a5c67f878c923cc3 (patch)
treec174ee9190f9a9885ecf917c5c86639871d9c902 /src/lib/openjpip/jp2k_decoder.c
parent16febebd28aafe8a47472d669b399dded8f84c5e (diff)
[trunk] remove all api with invalid FILE* parameters which could leads to issues when applications are compiled with different flags from openjpeg.
Fixes issue 198
Diffstat (limited to 'src/lib/openjpip/jp2k_decoder.c')
-rw-r--r--src/lib/openjpip/jp2k_decoder.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/openjpip/jp2k_decoder.c b/src/lib/openjpip/jp2k_decoder.c
index 9bbfe00d..a1878adc 100644
--- a/src/lib/openjpip/jp2k_decoder.c
+++ b/src/lib/openjpip/jp2k_decoder.c
@@ -43,7 +43,7 @@ static void info_callback(const char *msg, void *client_data);
static Byte_t * imagetopnm(opj_image_t *image, ihdrbox_param_t **ihdrbox);
-Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox)
+Byte_t * j2k_to_pnm( const char *fn, ihdrbox_param_t **ihdrbox)
{
Byte_t *pnmstream = NULL;
opj_dparameters_t parameters; /* decompression parameters */
@@ -51,13 +51,11 @@ Byte_t * j2k_to_pnm( FILE *fp, ihdrbox_param_t **ihdrbox)
opj_codec_t *l_codec = NULL; /* handle to a decompressor */
opj_stream_t *l_stream = NULL;
-
-
/* set decoding parameters to default values */
opj_set_default_decoder_parameters(&parameters);
/* set a byte stream */
- l_stream = opj_stream_create_default_file_stream( fp, 1);
+ l_stream = opj_stream_create_default_file_stream_v3( fn, OPJ_TRUE);
if (!l_stream){
fprintf(stderr, "ERROR -> failed to create the stream from the file\n");
return NULL;