From ba423fe3d0b501ae9166e36514c01173b0ce04be Mon Sep 17 00:00:00 2001 From: Giuseppe Baruffa Date: Thu, 1 Mar 2007 00:01:37 +0000 Subject: Zoom capability and decoder settings dialog in OPJViewer --- OPJViewer/source/imagjp2.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'OPJViewer/source/imagjp2.cpp') diff --git a/OPJViewer/source/imagjp2.cpp b/OPJViewer/source/imagjp2.cpp index 99ef23c9..ce25bb1e 100644 --- a/OPJViewer/source/imagjp2.cpp +++ b/OPJViewer/source/imagjp2.cpp @@ -149,6 +149,19 @@ bool wxJP2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, strncpy(parameters.outfile, "", sizeof(parameters.outfile)-1); parameters.decod_format = JP2_CFMT; parameters.cod_format = BMP_DFMT; + if (m_reducefactor) + parameters.cp_reduce = m_reducefactor; + if (m_qualitylayers) + parameters.cp_layer = m_qualitylayers; + /*if (n_components) + parameters. = n_components;*/ + + /* JPWL only */ +#ifdef USE_JPWL + parameters.jpwl_exp_comps = m_expcomps; + parameters.jpwl_max_tiles = m_maxtiles; + parameters.jpwl_correct = m_enablejpwl; +#endif /* USE_JPWL */ /* get a decoder handle */ dinfo = opj_create_decompress(CODEC_JP2); @@ -175,7 +188,7 @@ bool wxJP2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, opjimage = opj_decode(dinfo, cio); if (!opjimage) { wxMutexGuiEnter(); - wxLogError("JP2: failed to decode image!"); + wxLogError(wxT("JP2: failed to decode image!")); wxMutexGuiLeave(); opj_destroy_decompress(dinfo); opj_cio_close(cio); @@ -189,7 +202,7 @@ bool wxJP2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, // check image size if ((opjimage->numcomps != 1) && (opjimage->numcomps != 3)) { wxMutexGuiEnter(); - wxLogError("JP2: weird number of components"); + wxLogError(wxT("JP2: weird number of components")); wxMutexGuiLeave(); opj_destroy_decompress(dinfo); free(src); -- cgit v1.2.3