diff options
| author | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-09-07 23:16:31 +0000 |
|---|---|---|
| committer | Giuseppe Baruffa <gbaruffa@users.noreply.github.com> | 2007-09-07 23:16:31 +0000 |
| commit | d70a0415b910cc5a3550fea1d777ded84d4cdfa0 (patch) | |
| tree | 9d73e44534b437db7144bff8b64653bc42a07302 /OPJViewer/source/imagmj2.cpp | |
| parent | 3816e0edf40b766ab78cdbf3ba5634b684630d0f (diff) | |
Adapted the JPWL and OPJViewer code to new interface; fixed a samll bug in JPWL which created large EPBs even when null protection was specified
Diffstat (limited to 'OPJViewer/source/imagmj2.cpp')
| -rw-r--r-- | OPJViewer/source/imagmj2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OPJViewer/source/imagmj2.cpp b/OPJViewer/source/imagmj2.cpp index 1cd7244f..e2862916 100644 --- a/OPJViewer/source/imagmj2.cpp +++ b/OPJViewer/source/imagmj2.cpp @@ -618,6 +618,7 @@ bool wxMJ2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, unsigned char *ptr;
int file_length, jp2c_point, jp2h_point;
unsigned long int jp2hboxlen, jp2cboxlen;
+ opj_codestream_info_t cstr_info; /* Codestream information structure */
// destroy the image
image->Destroy();
@@ -699,7 +700,7 @@ bool wxMJ2Handler::LoadFile(wxImage *image, wxInputStream& stream, bool verbose, cio = opj_cio_open((opj_common_ptr)dinfo, src, my_jPheadSIZE + jp2hboxlen + jp2cboxlen);
/* decode the stream and fill the image structure */
- opjimage = opj_decode(dinfo, cio);
+ opjimage = opj_decode(dinfo, cio, &cstr_info);
if (!opjimage) {
wxMutexGuiEnter();
wxLogError(wxT("MJ2: failed to decode image!"));
|