Fixed a copy-and-paste type assignment error (bool instead of int) in the JPWL sectio...

[openjpeg.git] / OPJViewer / source / imagj2k.cpp

diff --git a/OPJViewer/source/imagj2k.cpp b/OPJViewer/source/imagj2k.cpp
index b58c7a51b634eeba8fba63bd81ee82553f837514..16bcdd1631a0dbb0eaa1874f89234ad7f6fc7eac 100644 (file)
--- a/OPJViewer/source/imagj2k.cpp
+++ b/OPJViewer/source/imagj2k.cpp
@@ -124,7 +124,6 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
        opj_dparameters_t parameters;   /* decompression parameters */\r
        opj_event_mgr_t event_mgr;              /* event manager */\r
        opj_image_t *opjimage = NULL;\r
-       FILE *fsrc = NULL;\r
        unsigned char *src = NULL;\r
     unsigned char *ptr;\r
        int file_length;\r
@@ -147,13 +146,15 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
        opj_set_default_decoder_parameters(&parameters);\r
 \r
        /* prepare parameters */\r
+       strncpy(parameters.infile, "", sizeof(parameters.infile)-1);\r
+       strncpy(parameters.outfile, "", sizeof(parameters.outfile)-1);\r
        parameters.decod_format = J2K_CFMT;\r
        parameters.cod_format = BMP_DFMT;\r
 \r
        /* JPWL only */\r
 #ifdef USE_JPWL\r
-       parameters.jpwl_exp_comps = 3;\r
-       parameters.jpwl_max_tiles = 100;\r
+       parameters.jpwl_exp_comps = JPWL_EXPECTED_COMPONENTS;\r
+       parameters.jpwl_max_tiles = JPWL_MAXIMUM_TILES;\r
        parameters.jpwl_correct = true;\r
 #endif /* USE_JPWL */\r
 \r
@@ -191,13 +192,15 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
                return false;\r
        }\r
 \r
+       /* close the byte stream */\r
+       opj_cio_close(cio);\r
+\r
        // check image components\r
        if ((opjimage->numcomps != 1) && (opjimage->numcomps != 3)) {\r
                wxMutexGuiEnter();\r
                wxLogError("J2K: weird number of components");\r
                wxMutexGuiLeave();\r
                opj_destroy_decompress(dinfo);\r
-               opj_cio_close(cio);\r
                free(src);\r
                return false;\r
        }\r
@@ -274,7 +277,6 @@ bool wxJ2KHandler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose,
 \r
        /* close openjpeg structs */\r
        opj_destroy_decompress(dinfo);\r
-       opj_cio_close(cio);\r
        opj_image_destroy(opjimage);\r
        free(src);\r
 \r