diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-09-27 16:08:57 +0100 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-09-27 16:52:27 +0100 |
| commit | 9a78bfb8698061e22e3d460b8c15825992e44def (patch) | |
| tree | d1350b9c7a02da811ec438eae175ca9689bf9d4c /openjpeg/src/lib/openjp2/mqc.h | |
| parent | b4cc6d28e9a456a34a7348d98ff78ada9da727bb (diff) | |
| download | ghostpdl-9a78bfb8698061e22e3d460b8c15825992e44def.tar.gz | |
Import new OpenJPEG version.
Squashed version of openjpeg-update-20160927
This squashes the following commits:
* Import new OpenJPEG version.
From https://github.com/uclouvain/openjpeg
Final commit is:
commit 34dae137a9a8c04feaa9763ae7e09a86ecb10400
Author: Mathieu Malaterre <mathieu.malaterre@gmail.com>
Date: Mon Sep 26 12:01:31 2016 +0200
OPENJPEG_NAMESPACE is configurable by user
* Zap the OpenJPEG stuff we don't need
* Add predefined openjpeg headers.
* Import patches from Sumatra's tree.
* Update Makefiles for new openjpeg
* Update MSVC for new files
* OpenJPEG allocation fixes.
The old version of openjpeg allocates using malloc/free.
The new version of openjpeg allocates via opj_malloc (and co).
We can capture these and pass them down to our own allocators,
but we cannot get openjpeg to pass us a gs_memory_t * to use.
We therefore resort to using a static to hold 'the current
gs_memory_t *' before we call openjpeg. To keep this threadsafe
we add some private data to the gslibctx, which the openjpeg
implementation can use to hold a lock.
We add calls to both jpx decode implementations to init this
private data (where the luratech implementation is null).
Diffstat (limited to 'openjpeg/src/lib/openjp2/mqc.h')
| -rw-r--r-- | openjpeg/src/lib/openjp2/mqc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/openjpeg/src/lib/openjp2/mqc.h b/openjpeg/src/lib/openjp2/mqc.h index 69a2d4602..491ee50ee 100644 --- a/openjpeg/src/lib/openjp2/mqc.h +++ b/openjpeg/src/lib/openjp2/mqc.h @@ -77,11 +77,14 @@ typedef struct opj_mqc { OPJ_BYTE *end; opj_mqc_state_t *ctxs[MQC_NUMCTXS]; opj_mqc_state_t **curctx; + const OPJ_BYTE *lut_ctxno_zc_orient; /* lut_ctxno_zc shifted by 256 * bandno */ #ifdef MQC_PERF_OPT unsigned char *buffer; #endif } opj_mqc_t; +#include "mqc_inl.h" + /** @name Exported functions */ /*@{*/ /* ----------------------------------------------------------------------- */ @@ -198,7 +201,7 @@ Decode a symbol @param mqc MQC handle @return Returns the decoded symbol (0 or 1) */ -OPJ_INT32 opj_mqc_decode(opj_mqc_t * const mqc); +static INLINE OPJ_INT32 opj_mqc_decode(opj_mqc_t * const mqc); /* ----------------------------------------------------------------------- */ /*@}*/ |