diff options
| author | Tor Andersson <tor@ghostscript.com> | 2009-12-02 18:06:30 +0100 |
|---|---|---|
| committer | Tor Andersson <tor@ghostscript.com> | 2009-12-02 18:06:30 +0100 |
| commit | 4c5184df2fe18d684787111160b1ffec85e83b26 (patch) | |
| tree | a8423ccd5b2a940a688319310ee657826e104034 /fitz/filt_jpxd.c | |
| parent | ca0c2ce9056227051fe23625e45c00de94ecbb9b (diff) | |
| download | mupdf-4c5184df2fe18d684787111160b1ffec85e83b26.tar.xz | |
Update win32, jbig2 and jpx code for malloc changes.
Diffstat (limited to 'fitz/filt_jpxd.c')
| -rw-r--r-- | fitz/filt_jpxd.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fitz/filt_jpxd.c b/fitz/filt_jpxd.c index fff6a306..a0b68bbe 100644 --- a/fitz/filt_jpxd.c +++ b/fitz/filt_jpxd.c @@ -1,6 +1,7 @@ #include "fitz_base.h" #include "fitz_stream.h" +#define OPJ_STATIC #include <openjpeg.h> typedef struct fz_jpxd_s fz_jpxd; @@ -32,8 +33,8 @@ static void fz_opj_info_callback(const char *msg, void *client_data) } -fz_error -fz_newjpxd(fz_filter **fp, fz_obj *params) +fz_filter * +fz_newjpxd(fz_obj *params) { FZ_NEWFILTER(fz_jpxd, d, jpxd); @@ -54,12 +55,12 @@ fz_newjpxd(fz_filter **fp, fz_obj *params) d->info = opj_create_decompress(CODEC_JP2); if (!d->info) - return fz_throw("opj_create_decompress failed"); + fz_warn("assert: opj_create_decompress failed"); opj_set_event_mgr((opj_common_ptr)d->info, &d->evtmgr, stderr); opj_setup_decoder(d->info, &d->params); - return fz_okay; + return (fz_filter*)d; } void |