Remove bundled, unmaintained libjasper source codev5.12.0-beta3

[ChangeLog][Third-Party Code] The unmaintained bundled libjasper has been
removed. Building the jp2 handler will require libjasper to be present as
a system or external library.

Change-Id: Ic48cc6021fc5fb64fb369eb9621fd7a811e8e9f7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

121 files changed, 7 insertions, 42492 deletions

diff --git a/src/3rdparty/jasper.pri b/src/3rdparty/jasper.pri
deleted file mode 100644
index ddb5c40..0000000
--- a/src/3rdparty/jasper.pri
+++ /dev/null
@@ -1,67 +0,0 @@
-warning("Using bundled unmaintained copy of libjasper.")
-
-msvc: DEFINES += JAS_WIN_MSVC_BUILD
-INCLUDEPATH += $$PWD/jasper/src/libjasper/include $$PWD/libjasper/include
-SOURCES += \
-    $$PWD/jasper/src/libjasper/base/jas_cm.c \
-    $$PWD/jasper/src/libjasper/base/jas_debug.c \
-    $$PWD/jasper/src/libjasper/base/jas_getopt.c \
-    $$PWD/jasper/src/libjasper/base/jas_icc.c \
-    $$PWD/jasper/src/libjasper/base/jas_iccdata.c \
-    $$PWD/jasper/src/libjasper/base/jas_image.c \
-    $$PWD/jasper/src/libjasper/base/jas_init.c \
-    $$PWD/jasper/src/libjasper/base/jas_malloc.c \
-    $$PWD/jasper/src/libjasper/base/jas_seq.c \
-    $$PWD/jasper/src/libjasper/base/jas_stream.c \
-    $$PWD/jasper/src/libjasper/base/jas_string.c \
-    $$PWD/jasper/src/libjasper/base/jas_tmr.c \
-    $$PWD/jasper/src/libjasper/base/jas_tvp.c \
-    $$PWD/jasper/src/libjasper/base/jas_version.c \
-    $$PWD/jasper/src/libjasper/bmp/bmp_cod.c \
-    $$PWD/jasper/src/libjasper/bmp/bmp_dec.c \
-    $$PWD/jasper/src/libjasper/bmp/bmp_enc.c \
-    $$PWD/jasper/src/libjasper/dummy.c \
-    $$PWD/jasper/src/libjasper/jp2/jp2_cod.c \
-    $$PWD/jasper/src/libjasper/jp2/jp2_dec.c \
-    $$PWD/jasper/src/libjasper/jp2/jp2_enc.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_bs.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_cs.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_dec.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_enc.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_math.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_mct.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_mqcod.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_mqdec.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_mqenc.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_qmfb.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t1cod.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t1dec.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t1enc.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t2cod.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t2dec.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_t2enc.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_tagtree.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_tsfb.c \
-    $$PWD/jasper/src/libjasper/jpc/jpc_util.c \
-    $$PWD/jasper/src/libjasper/jpg/jpg_val.c \
-    $$PWD/jasper/src/libjasper/mif/mif_cod.c \
-    $$PWD/jasper/src/libjasper/pgx/pgx_cod.c \
-    $$PWD/jasper/src/libjasper/pgx/pgx_dec.c \
-    $$PWD/jasper/src/libjasper/pgx/pgx_enc.c \
-    $$PWD/jasper/src/libjasper/pnm/pnm_cod.c \
-    $$PWD/jasper/src/libjasper/pnm/pnm_dec.c \
-    $$PWD/jasper/src/libjasper/pnm/pnm_enc.c \
-    $$PWD/jasper/src/libjasper/ras/ras_cod.c \
-    $$PWD/jasper/src/libjasper/ras/ras_dec.c \
-    $$PWD/jasper/src/libjasper/ras/ras_enc.c
-
-LIBJPEG_DEP = $$PWD/../../../qtbase/src/3rdparty/libjpeg.pri
-exists($${LIBJPEG_DEP}) {
-    include($${LIBJPEG_DEP})
-    SOURCES += \
-        $$PWD/jasper/src/libjasper/jpg/jpg_dec.c \
-        $$PWD/jasper/src/libjasper/jpg/jpg_enc.c
-} else {
-    SOURCES += \
-        $$PWD/jasper/src/libjasper/jpg/jpg_dummy.c
-}
diff --git a/src/3rdparty/jasper/COPYRIGHT b/src/3rdparty/jasper/COPYRIGHT
deleted file mode 100644
index db023aa..0000000
--- a/src/3rdparty/jasper/COPYRIGHT
+++ /dev/null
@@ -1,2 +0,0 @@
-The copyright information for the JasPer software accompanies the software
-license, and can be found in the file named "LICENSE".
diff --git a/src/3rdparty/jasper/ChangeLog b/src/3rdparty/jasper/ChangeLog
deleted file mode 100644
index e69de29..0000000
--- a/src/3rdparty/jasper/ChangeLog
+++ /dev/null
diff --git a/src/3rdparty/jasper/INSTALL b/src/3rdparty/jasper/INSTALL
deleted file mode 100644
index 857e21a..0000000
--- a/src/3rdparty/jasper/INSTALL
+++ /dev/null
@@ -1,3 +0,0 @@
-Detailed instructions on how to build and install the JasPer software
-can be found in the JasPer Software Reference Manual which is located
-in the doc directory.  (See the section titled "Building the Software".)
diff --git a/src/3rdparty/jasper/LICENSE b/src/3rdparty/jasper/LICENSE
deleted file mode 100644
index 8975f6f..0000000
--- a/src/3rdparty/jasper/LICENSE
+++ /dev/null
@@ -1,50 +0,0 @@
-JasPer License Version 2.0
-
-Copyright (c) 2001-2006 Michael David Adams
-Copyright (c) 1999-2000 Image Power, Inc.
-Copyright (c) 1999-2000 The University of British Columbia
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person (the
-"User") obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge,
-publish, distribute, and/or sell copies of the Software, and to permit
-persons to whom the Software is furnished to do so, subject to the
-following conditions:
-
-1.  The above copyright notices and this permission notice (which
-includes the disclaimer below) shall be included in all copies or
-substantial portions of the Software.
-
-2.  The name of a copyright holder shall not be used to endorse or
-promote products derived from the Software without specific prior
-written permission.
-
-THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
-LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
-THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
-"AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
-EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
-INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
-FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
-NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
-WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
-PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
-THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
-EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
-BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
-PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
-GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
-ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
-IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
-SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
-AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
-SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
-THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
-PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
-RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
-EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
diff --git a/src/3rdparty/jasper/NEWS b/src/3rdparty/jasper/NEWS
deleted file mode 100644
index 25e1fa9..0000000
--- a/src/3rdparty/jasper/NEWS
+++ /dev/null
@@ -1,19 +0,0 @@
-Dear JasPer Users:
-
-I am pleased to announce the availability of JasPer version 1.900.1.
-
-This release fixes some build problems as well as
-a multiply-defined symbol problem in jpc_qmfb.h.
-
-The new JasPer release is available from the JasPer Project Home Page
-(i.e., http://www.ece.uvic.ca/~mdadams/jasper) and the JPEG web site
-(i.e., http://www.jpeg.org/software).
-
-Regards,
-Michael
-
----
-Michael Adams, Assistant Professor
-Dept. of Elec. and Comp. Engineering, University of Victoria
-P.O. Box 3055 STN CSC, Victoria, BC, V8W 3P6, CANADA
-E-mail: mdadams@ece.uvic.ca, Web: www.ece.uvic.ca/~mdadams
diff --git a/src/3rdparty/jasper/README b/src/3rdparty/jasper/README
deleted file mode 100644
index df33b1b..0000000
--- a/src/3rdparty/jasper/README
+++ /dev/null
@@ -1,21 +0,0 @@
-JasPer Readme
-*************
-
-This is the source code distribution for JasPer.  JasPer is a collection
-of software (i.e., a library and application programs) for the coding
-and manipulation of images.  This software can handle image data in a
-variety of formats.  One such format supported by JasPer is the JPEG-2000
-format defined in ISO/IEC 15444-1.
-
-The complete licensing terms for the JasPer software can be found in
-the file named "LICENSE" in the top level directory of this software
-distribution.  Any use of this software contrary to the terms of the
-license is strictly prohibited.  The changes made to the software
-since the last release are described in the file "NEWS".  Detailed
-documentation on the JasPer software can be found in the JasPer Software
-Reference Manual.  This manual is located in the "doc" directory, and
-includes useful information such as: 1) how to build, install, and use
-the software, 2) how to submit report bugs, and 3) where to find
-additional information about the software.
-
-Enjoy! :)
diff --git a/src/3rdparty/jasper/qt_attribution.json b/src/3rdparty/jasper/qt_attribution.json
deleted file mode 100644
index 2cc9d15..0000000
--- a/src/3rdparty/jasper/qt_attribution.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "Id": "jasper",
-    "Name": "JasPer",
-    "QDocModule": "qtimageformats",
-    "QtUsage": "Used in the QJp2 image plugin if no system jasper library is found.",
-
-    "Description": "JasPer is a collection of software (i.e., a library and application programs) for the coding and manipulation of images.",
-    "Homepage": "http://www.ece.uvic.ca/~mdadams/jasper",
-    "Version": "1.900.1",
-    "License": "JasPer License",
-    "LicenseId": "JasPer-2.0",
-    "LicenseFile": "LICENSE",
-    "Copyright": "Copyright (c) 1999-2000 Image Power, Inc. and the University of British Columbia.
-Copyright (c) 2001-2006 Michael David Adams.
-"
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_cm.c b/src/3rdparty/jasper/src/libjasper/base/jas_cm.c
deleted file mode 100644
index 6a043e1..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_cm.c
+++ /dev/null
@@ -1,1282 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Color Management
- *
- * $Id$
- */
-
-#include <jasper/jas_config.h>
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <jasper/jas_cm.h>
-#include <jasper/jas_icc.h>
-#include <jasper/jas_init.h>
-#include <jasper/jas_stream.h>
-#include <jasper/jas_malloc.h>
-#include <jasper/jas_math.h>
-
-static jas_cmprof_t *jas_cmprof_create(void);
-static void jas_cmshapmatlut_cleanup(jas_cmshapmatlut_t *);
-static jas_cmreal_t jas_cmshapmatlut_lookup(jas_cmshapmatlut_t *lut, jas_cmreal_t x);
-
-static void jas_cmpxform_destroy(jas_cmpxform_t *pxform);
-static jas_cmpxform_t *jas_cmpxform_copy(jas_cmpxform_t *pxform);
-
-static void jas_cmshapmat_destroy(jas_cmpxform_t *pxform);
-static int jas_cmshapmat_apply(jas_cmpxform_t *pxform, jas_cmreal_t *in,
-  jas_cmreal_t *out, int cnt);
-
-static int jas_cmputint(long **bufptr, int sgnd, int prec, long val);
-static int jas_cmgetint(long **bufptr, int sgnd, int prec, long *val);
-static int jas_cmpxformseq_append(jas_cmpxformseq_t *pxformseq,
-  jas_cmpxformseq_t *othpxformseq);
-static int jas_cmpxformseq_appendcnvt(jas_cmpxformseq_t *pxformseq,
-  int, int);
-static int jas_cmpxformseq_resize(jas_cmpxformseq_t *pxformseq, int n);
-
-static int mono(jas_iccprof_t *prof, int op, jas_cmpxformseq_t **pxformseq);
-static int triclr(jas_iccprof_t *prof, int op, jas_cmpxformseq_t **retpxformseq);
-
-static void jas_cmpxformseq_destroy(jas_cmpxformseq_t *pxformseq);
-static int jas_cmpxformseq_delete(jas_cmpxformseq_t *pxformseq, int i);
-static jas_cmpxformseq_t *jas_cmpxformseq_create(void);
-static jas_cmpxformseq_t *jas_cmpxformseq_copy(jas_cmpxformseq_t *pxformseq);
-static int jas_cmshapmat_invmat(jas_cmreal_t out[3][4], jas_cmreal_t in[3][4]);
-static int jas_cmpxformseq_insertpxform(jas_cmpxformseq_t *pxformseq,
-  int i, jas_cmpxform_t *pxform);
-
-#define	SEQFWD(intent)	(intent)
-#define	SEQREV(intent)	(4 + (intent))
-#define	SEQSIM(intent)	(8 + (intent))
-#define	SEQGAM		12
-
-#define fwdpxformseq(prof, intent) \
-  (((prof)->pxformseqs[SEQFWD(intent)]) ? \
-  ((prof)->pxformseqs[SEQFWD(intent)]) : \
-  ((prof)->pxformseqs[SEQFWD(0)]))
-
-#define revpxformseq(prof, intent) \
-  (((prof)->pxformseqs[SEQREV(intent)]) ? \
-  ((prof)->pxformseqs[SEQREV(intent)]) : \
-  ((prof)->pxformseqs[SEQREV(0)]))
-
-#define simpxformseq(prof, intent) \
-  (((prof)->pxformseqs[SEQSIM(intent)]) ? \
-  ((prof)->pxformseqs[SEQSIM(intent)]) : \
-  ((prof)->pxformseqs[SEQSIM(0)]))
-
-#define gampxformseq(prof)	((prof)->pxformseqs[SEQGAM])
-
-static int icctoclrspc(int iccclrspc, int refflag);
-static jas_cmpxform_t *jas_cmpxform_create0(void);
-static jas_cmpxform_t *jas_cmpxform_createshapmat(void);
-static void jas_cmshapmatlut_init(jas_cmshapmatlut_t *lut);
-static int jas_cmshapmatlut_set(jas_cmshapmatlut_t *lut, jas_icccurv_t *curv);
-
-static jas_cmpxformops_t shapmat_ops = {jas_cmshapmat_destroy, jas_cmshapmat_apply, 0};
-static jas_cmprof_t *jas_cmprof_createsycc(void);
-
-/******************************************************************************\
-* Color profile class.
-\******************************************************************************/
-
-jas_cmprof_t *jas_cmprof_createfromclrspc(int clrspc)
-{
-    jas_iccprof_t *iccprof;
-    jas_cmprof_t *prof;
-
-    iccprof = 0;
-    prof = 0;
-    switch (clrspc) {
-    case JAS_CLRSPC_SYCBCR:
-        if (!(prof = jas_cmprof_createsycc()))
-            goto error;
-        break;
-    default:
-        if (!(iccprof = jas_iccprof_createfromclrspc(clrspc)))
-            goto error;
-        if (!(prof = jas_cmprof_createfromiccprof(iccprof)))
-            goto error;
-        jas_iccprof_destroy(iccprof);
-        iccprof = 0;
-        if (!jas_clrspc_isgeneric(clrspc))
-            prof->clrspc = clrspc;
-        break;
-    }
-    return prof;
-error:
-    if (iccprof)
-        jas_iccprof_destroy(iccprof);
-    return 0;
-}
-
-static jas_cmprof_t *jas_cmprof_createsycc()
-{
-    jas_cmprof_t *prof;
-    jas_cmpxform_t *fwdpxform;
-    jas_cmpxform_t *revpxform;
-    jas_cmshapmat_t *fwdshapmat;
-    jas_cmshapmat_t *revshapmat;
-    int i;
-    int j;
-
-    if (!(prof = jas_cmprof_createfromclrspc(JAS_CLRSPC_SRGB)))
-        goto error;
-    prof->clrspc = JAS_CLRSPC_SYCBCR;
-    assert(prof->numchans == 3 && prof->numrefchans == 3);
-    assert(prof->refclrspc == JAS_CLRSPC_CIEXYZ);
-    if (!(fwdpxform = jas_cmpxform_createshapmat()))
-        goto error;
-    fwdpxform->numinchans = 3;
-    fwdpxform->numoutchans = 3;
-    fwdshapmat = &fwdpxform->data.shapmat;
-    fwdshapmat->mono = 0;
-    fwdshapmat->order = 0;
-    fwdshapmat->useluts = 0;
-    fwdshapmat->usemat = 1;
-    fwdshapmat->mat[0][0] = 1.0;
-    fwdshapmat->mat[0][1] = 0.0;
-    fwdshapmat->mat[0][2] = 1.402;
-    fwdshapmat->mat[1][0] = 1.0;
-    fwdshapmat->mat[1][1] = -0.34413;
-    fwdshapmat->mat[1][2] = -0.71414;
-    fwdshapmat->mat[2][0] = 1.0;
-    fwdshapmat->mat[2][1] = 1.772;
-    fwdshapmat->mat[2][2] = 0.0;
-    fwdshapmat->mat[0][3] = -0.5 * (1.402);
-    fwdshapmat->mat[1][3] = -0.5 * (-0.34413 - 0.71414);
-    fwdshapmat->mat[2][3] = -0.5 * (1.772);
-    if (!(revpxform = jas_cmpxform_createshapmat()))
-        goto error;
-    revpxform->numinchans = 3;
-    revpxform->numoutchans = 3;
-    revshapmat = &revpxform->data.shapmat;
-    revshapmat->mono = 0;
-    revshapmat->order = 1;
-    revshapmat->useluts = 0;
-    revshapmat->usemat = 1;
-    jas_cmshapmat_invmat(revshapmat->mat, fwdshapmat->mat);
-
-    for (i = 0; i < JAS_CMXFORM_NUMINTENTS; ++i) {
-        j = SEQFWD(i);
-        if (prof->pxformseqs[j]) {
-            if (jas_cmpxformseq_insertpxform(prof->pxformseqs[j], 0,
-              fwdpxform))
-                goto error;
-        }
-        j = SEQREV(i);
-        if (prof->pxformseqs[j]) {
-            if (jas_cmpxformseq_insertpxform(prof->pxformseqs[j],
-              -1, revpxform))
-                goto error;
-        }
-    }
-
-    jas_cmpxform_destroy(fwdpxform);
-    jas_cmpxform_destroy(revpxform);
-    return prof;
-error:
-    return 0;
-}
-
-jas_cmprof_t *jas_cmprof_createfromiccprof(jas_iccprof_t *iccprof)
-{
-    jas_cmprof_t *prof;
-    jas_icchdr_t icchdr;
-    jas_cmpxformseq_t *fwdpxformseq;
-    jas_cmpxformseq_t *revpxformseq;
-
-    prof = 0;
-    fwdpxformseq = 0;
-    revpxformseq = 0;
-
-    if (!(prof = jas_cmprof_create()))
-        goto error;
-    jas_iccprof_gethdr(iccprof, &icchdr);
-    if (!(prof->iccprof = jas_iccprof_copy(iccprof)))
-        goto error;
-    prof->clrspc = icctoclrspc(icchdr.colorspc, 0);
-    prof->refclrspc = icctoclrspc(icchdr.refcolorspc, 1);
-    prof->numchans = jas_clrspc_numchans(prof->clrspc);
-    prof->numrefchans = jas_clrspc_numchans(prof->refclrspc);
-
-    if (prof->numchans == 1) {
-        if (mono(prof->iccprof, 0, &fwdpxformseq))
-            goto error;
-        if (mono(prof->iccprof, 1, &revpxformseq))
-            goto error;
-    } else if (prof->numchans == 3) {
-        if (triclr(prof->iccprof, 0, &fwdpxformseq))
-            goto error;
-        if (triclr(prof->iccprof, 1, &revpxformseq))
-            goto error;
-    }
-    prof->pxformseqs[SEQFWD(0)] = fwdpxformseq;
-    prof->pxformseqs[SEQREV(0)] = revpxformseq;
-
-#if 0
-    if (prof->numchans > 1) {
-        lut(prof->iccprof, 0, PER, &pxformseq);
-        pxformseqs_set(prof, SEQFWD(PER), pxformseq);
-        lut(prof->iccprof, 1, PER, &pxformseq);
-        pxformseqs_set(prof, SEQREV(PER), pxformseq);
-        lut(prof->iccprof, 0, CLR, &pxformseq);
-        pxformseqs_set(prof, SEQREV(CLR), pxformseq);
-        lut(prof->iccprof, 1, CLR, &pxformseq);
-        pxformseqs_set(prof, SEQREV(CLR), pxformseq);
-        lut(prof->iccprof, 0, SAT, &pxformseq);
-        pxformseqs_set(prof, SEQREV(SAT), pxformseq);
-        lut(prof->iccprof, 1, SAT, &pxformseq);
-        pxformseqs_set(prof, SEQREV(SAT), pxformseq);
-    }
-#endif
-
-    return prof;
-
-error:
-    if (fwdpxformseq) {
-        jas_cmpxformseq_destroy(fwdpxformseq);
-    }
-    if (revpxformseq) {
-        jas_cmpxformseq_destroy(revpxformseq);
-    }
-    if (prof) {
-        jas_cmprof_destroy(prof);
-    }
-
-    return 0;
-}
-
-static jas_cmprof_t *jas_cmprof_create()
-{
-    int i;
-    jas_cmprof_t *prof;
-    if (!(prof = jas_malloc(sizeof(jas_cmprof_t))))
-        return 0;
-    memset(prof, 0, sizeof(jas_cmprof_t));
-    prof->iccprof = 0;
-    for (i = 0; i < JAS_CMPROF_NUMPXFORMSEQS; ++i)
-        prof->pxformseqs[i] = 0;
-    return prof;
-}
-
-void jas_cmprof_destroy(jas_cmprof_t *prof)
-{
-    int i;
-    for (i = 0; i < JAS_CMPROF_NUMPXFORMSEQS; ++i) {
-        if (prof->pxformseqs[i]) {
-            jas_cmpxformseq_destroy(prof->pxformseqs[i]);
-            prof->pxformseqs[i] = 0;
-        }
-    }
-    if (prof->iccprof)
-        jas_iccprof_destroy(prof->iccprof);
-    jas_free(prof);
-}
-
-jas_cmprof_t *jas_cmprof_copy(jas_cmprof_t *prof)
-{
-    jas_cmprof_t *newprof;
-    int i;
-
-    if (!(newprof = jas_cmprof_create()))
-        goto error;
-    newprof->clrspc = prof->clrspc;
-    newprof->numchans = prof->numchans;
-    newprof->refclrspc = prof->refclrspc;
-    newprof->numrefchans = prof->numrefchans;
-    newprof->iccprof = jas_iccprof_copy(prof->iccprof);
-    for (i = 0; i < JAS_CMPROF_NUMPXFORMSEQS; ++i) {
-        if (prof->pxformseqs[i]) {
-            if (!(newprof->pxformseqs[i] = jas_cmpxformseq_copy(prof->pxformseqs[i])))
-                goto error;
-        }
-    }
-    return newprof;
-error:
-    return 0;
-}
-
-/******************************************************************************\
-* Transform class.
-\******************************************************************************/
-
-jas_cmxform_t *jas_cmxform_create(jas_cmprof_t *inprof, jas_cmprof_t *outprof,
-  jas_cmprof_t *prfprof, int op, int intent, int optimize)
-{
-    jas_cmxform_t *xform;
-    jas_cmpxformseq_t *inpxformseq;
-    jas_cmpxformseq_t *outpxformseq;
-    jas_cmpxformseq_t *altoutpxformseq;
-    jas_cmpxformseq_t *prfpxformseq;
-    int prfintent;
-
-    /* Avoid compiler warnings about unused parameters. */
-    optimize = 0;
-
-    prfintent = intent;
-
-    if (!(xform = jas_malloc(sizeof(jas_cmxform_t))))
-        goto error;
-    if (!(xform->pxformseq = jas_cmpxformseq_create()))
-        goto error;
-
-    switch (op) {
-    case JAS_CMXFORM_OP_FWD:
-        inpxformseq = fwdpxformseq(inprof, intent);
-        outpxformseq = revpxformseq(outprof, intent);
-        if (!inpxformseq || !outpxformseq)
-            goto error;
-        if (jas_cmpxformseq_append(xform->pxformseq, inpxformseq) ||
-          jas_cmpxformseq_appendcnvt(xform->pxformseq,
-          inprof->refclrspc, outprof->refclrspc) ||
-          jas_cmpxformseq_append(xform->pxformseq, outpxformseq))
-            goto error;
-        xform->numinchans = jas_clrspc_numchans(inprof->clrspc);
-        xform->numoutchans = jas_clrspc_numchans(outprof->clrspc);
-        break;
-    case JAS_CMXFORM_OP_REV:
-        outpxformseq = fwdpxformseq(outprof, intent);
-        inpxformseq = revpxformseq(inprof, intent);
-        if (!outpxformseq || !inpxformseq)
-            goto error;
-        if (jas_cmpxformseq_append(xform->pxformseq, outpxformseq) ||
-          jas_cmpxformseq_appendcnvt(xform->pxformseq,
-          outprof->refclrspc, inprof->refclrspc) ||
-          jas_cmpxformseq_append(xform->pxformseq, inpxformseq))
-            goto error;
-        xform->numinchans = jas_clrspc_numchans(outprof->clrspc);
-        xform->numoutchans = jas_clrspc_numchans(inprof->clrspc);
-        break;
-    case JAS_CMXFORM_OP_PROOF:
-        assert(prfprof);
-        inpxformseq = fwdpxformseq(inprof, intent);
-        prfpxformseq = fwdpxformseq(prfprof, prfintent);
-        if (!inpxformseq || !prfpxformseq)
-            goto error;
-        outpxformseq = simpxformseq(outprof, intent);
-        altoutpxformseq = 0;
-        if (!outpxformseq) {
-            outpxformseq = revpxformseq(outprof, intent);
-            altoutpxformseq = fwdpxformseq(outprof, intent);
-            if (!outpxformseq || !altoutpxformseq)
-                goto error;
-        }
-        if (jas_cmpxformseq_append(xform->pxformseq, inpxformseq) ||
-          jas_cmpxformseq_appendcnvt(xform->pxformseq,
-          inprof->refclrspc, outprof->refclrspc))
-            goto error;
-        if (altoutpxformseq) {
-            if (jas_cmpxformseq_append(xform->pxformseq, outpxformseq) ||
-              jas_cmpxformseq_append(xform->pxformseq, altoutpxformseq))
-                goto error;
-        } else {
-            if (jas_cmpxformseq_append(xform->pxformseq, outpxformseq))
-                goto error;
-        }
-        if (jas_cmpxformseq_appendcnvt(xform->pxformseq,
-          outprof->refclrspc, inprof->refclrspc) ||
-          jas_cmpxformseq_append(xform->pxformseq, prfpxformseq))
-            goto error;
-        xform->numinchans = jas_clrspc_numchans(inprof->clrspc);
-        xform->numoutchans = jas_clrspc_numchans(prfprof->clrspc);
-        break;
-    case JAS_CMXFORM_OP_GAMUT:
-        inpxformseq = fwdpxformseq(inprof, intent);
-        outpxformseq = gampxformseq(outprof);
-        if (!inpxformseq || !outpxformseq)
-            goto error;
-        if (jas_cmpxformseq_append(xform->pxformseq, inpxformseq) ||
-          jas_cmpxformseq_appendcnvt(xform->pxformseq,
-          inprof->refclrspc, outprof->refclrspc) ||
-          jas_cmpxformseq_append(xform->pxformseq, outpxformseq))
-            goto error;
-        xform->numinchans = jas_clrspc_numchans(inprof->clrspc);
-        xform->numoutchans = 1;
-        break;
-    }
-    return xform;
-error:
-    return 0;
-}
-
-#define	APPLYBUFSIZ	2048
-int jas_cmxform_apply(jas_cmxform_t *xform, jas_cmpixmap_t *in, jas_cmpixmap_t *out)
-{
-    jas_cmcmptfmt_t *fmt;
-    jas_cmreal_t buf[2][APPLYBUFSIZ];
-    jas_cmpxformseq_t *pxformseq;
-    int i;
-    int j;
-    int width;
-    int height;
-    int total;
-    int n;
-    jas_cmreal_t *inbuf;
-    jas_cmreal_t *outbuf;
-    jas_cmpxform_t *pxform;
-    long *dataptr;
-    int maxchans;
-    int bufmax;
-    int m;
-    int bias;
-    jas_cmreal_t scale;
-    long v;
-    jas_cmreal_t *bufptr;
-
-    if (xform->numinchans > in->numcmpts || xform->numoutchans > out->numcmpts)
-        goto error;
-
-    fmt = &in->cmptfmts[0];
-    width = fmt->width;
-    height = fmt->height;
-    for (i = 1; i < xform->numinchans; ++i) {
-        fmt = &in->cmptfmts[i];
-        if (fmt->width != width || fmt->height != height) {
-            goto error;
-        }
-    }
-    for (i = 0; i < xform->numoutchans; ++i) {
-        fmt = &out->cmptfmts[i];
-        if (fmt->width != width || fmt->height != height) {
-            goto error;
-        }
-    }
-
-    maxchans = 0;
-    pxformseq = xform->pxformseq;
-    for (i = 0; i < pxformseq->numpxforms; ++i) {
-        pxform = pxformseq->pxforms[i];
-        if (pxform->numinchans > maxchans) {
-            maxchans = pxform->numinchans;
-        }
-        if (pxform->numoutchans > maxchans) {
-            maxchans = pxform->numoutchans;
-        }
-    }
-    bufmax = APPLYBUFSIZ / maxchans;
-    assert(bufmax > 0);
-
-    total = width * height;
-    n = 0;
-    while (n < total) {
-
-        inbuf = &buf[0][0];
-        m = JAS_MIN(total - n, bufmax);
-
-        for (i = 0; i < xform->numinchans; ++i) {
-            fmt = &in->cmptfmts[i];
-            scale = (double)((1 << fmt->prec) - 1);
-            bias = fmt->sgnd ? (1 << (fmt->prec - 1)) : 0;
-            dataptr = &fmt->buf[n];
-            bufptr = &inbuf[i];
-            for (j = 0; j < m; ++j) {
-                if (jas_cmgetint(&dataptr, fmt->sgnd, fmt->prec, &v))
-                    goto error;
-                *bufptr = (v - bias) / scale;
-                bufptr += xform->numinchans;
-            }
-        }
-
-        inbuf = &buf[0][0];
-        outbuf = inbuf;
-        for (i = 0; i < pxformseq->numpxforms; ++i) {
-            pxform = pxformseq->pxforms[i];
-            if (pxform->numoutchans > pxform->numinchans) {
-                outbuf = (inbuf == &buf[0][0]) ? &buf[1][0] : &buf[0][0];
-            } else {
-                outbuf = inbuf;
-            }
-            if ((*pxform->ops->apply)(pxform, inbuf, outbuf, m))
-                goto error;
-            inbuf = outbuf;
-        }
-
-        for (i = 0; i < xform->numoutchans; ++i) {
-            fmt = &out->cmptfmts[i];
-            scale = (double)((1 << fmt->prec) - 1);
-            bias = fmt->sgnd ? (1 << (fmt->prec - 1)) : 0;
-            bufptr = &outbuf[i];
-            dataptr = &fmt->buf[n];
-            for (j = 0; j < m; ++j) {
-                v = (*bufptr) * scale + bias;
-                bufptr += xform->numoutchans;
-                if (jas_cmputint(&dataptr, fmt->sgnd, fmt->prec, v))
-                    goto error;
-            }
-        }
-
-        n += m;
-    }
-
-    return 0;
-error:
-    return -1;
-}
-
-void jas_cmxform_destroy(jas_cmxform_t *xform)
-{
-    if (xform->pxformseq)
-        jas_cmpxformseq_destroy(xform->pxformseq);
-    jas_free(xform);
-}
-
-/******************************************************************************\
-* Primitive transform sequence class.
-\******************************************************************************/
-
-static jas_cmpxformseq_t *jas_cmpxformseq_create()
-{
-    jas_cmpxformseq_t *pxformseq;
-    pxformseq = 0;
-    if (!(pxformseq = jas_malloc(sizeof(jas_cmpxformseq_t))))
-        goto error;
-    pxformseq->pxforms = 0;
-    pxformseq->numpxforms = 0;
-    pxformseq->maxpxforms = 0;
-    if (jas_cmpxformseq_resize(pxformseq, 16))
-        goto error;
-    return pxformseq;
-error:
-    if (pxformseq)
-        jas_cmpxformseq_destroy(pxformseq);
-    return 0;
-}
-
-static jas_cmpxformseq_t *jas_cmpxformseq_copy(jas_cmpxformseq_t *pxformseq)
-{
-    jas_cmpxformseq_t *newpxformseq;
-
-    if (!(newpxformseq = jas_cmpxformseq_create()))
-        goto error;
-    if (jas_cmpxformseq_append(newpxformseq, pxformseq))
-        goto error;
-    return newpxformseq;
-error:
-    return 0;
-}
-
-static void jas_cmpxformseq_destroy(jas_cmpxformseq_t *pxformseq)
-{
-    while (pxformseq->numpxforms > 0)
-        jas_cmpxformseq_delete(pxformseq, pxformseq->numpxforms - 1);
-    if (pxformseq->pxforms)
-        jas_free(pxformseq->pxforms);
-    jas_free(pxformseq);
-}
-
-static int jas_cmpxformseq_delete(jas_cmpxformseq_t *pxformseq, int i)
-{
-    assert(i >= 0 && i < pxformseq->numpxforms);
-    if (i != pxformseq->numpxforms - 1)
-        abort();
-    jas_cmpxform_destroy(pxformseq->pxforms[i]);
-    pxformseq->pxforms[i] = 0;
-    --pxformseq->numpxforms;
-    return 0;
-}
-
-static int jas_cmpxformseq_appendcnvt(jas_cmpxformseq_t *pxformseq,
-  int dstclrspc, int srcclrspc)
-{
-    if (dstclrspc == srcclrspc)
-        return 0;
-    abort();
-    /* Avoid compiler warnings about unused parameters. */
-    pxformseq = 0;
-    return -1;
-}
-
-static int jas_cmpxformseq_insertpxform(jas_cmpxformseq_t *pxformseq,
-  int i, jas_cmpxform_t *pxform)
-{
-    jas_cmpxform_t *tmppxform;
-    int n;
-    if (i < 0)
-        i = pxformseq->numpxforms;
-    assert(i >= 0 && i <= pxformseq->numpxforms);
-    if (pxformseq->numpxforms >= pxformseq->maxpxforms) {
-        if (jas_cmpxformseq_resize(pxformseq, pxformseq->numpxforms +
-          16))
-            goto error;
-    }
-    assert(pxformseq->numpxforms < pxformseq->maxpxforms);
-    if (!(tmppxform = jas_cmpxform_copy(pxform)))
-        goto error;
-    n = pxformseq->numpxforms - i;
-    if (n > 0) {
-        memmove(&pxformseq->pxforms[i + 1], &pxformseq->pxforms[i],
-          n * sizeof(jas_cmpxform_t *));
-    }
-    pxformseq->pxforms[i] = tmppxform;
-    ++pxformseq->numpxforms;
-    return 0;
-error:
-    return -1;
-}
-
-static int jas_cmpxformseq_append(jas_cmpxformseq_t *pxformseq,
-  jas_cmpxformseq_t *othpxformseq)
-{
-    int n;
-    int i;
-    jas_cmpxform_t *pxform;
-    jas_cmpxform_t *othpxform;
-    n = pxformseq->numpxforms + othpxformseq->numpxforms;
-    if (n > pxformseq->maxpxforms) {
-        if (jas_cmpxformseq_resize(pxformseq, n))
-            goto error;
-    }
-    for (i = 0; i < othpxformseq->numpxforms; ++i) {
-        othpxform = othpxformseq->pxforms[i];
-        if (!(pxform = jas_cmpxform_copy(othpxform)))
-            goto error;
-        pxformseq->pxforms[pxformseq->numpxforms] = pxform;
-        ++pxformseq->numpxforms;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static int jas_cmpxformseq_resize(jas_cmpxformseq_t *pxformseq, int n)
-{
-    jas_cmpxform_t **p;
-    assert(n >= pxformseq->numpxforms);
-    p = (!pxformseq->pxforms) ? jas_malloc(n * sizeof(jas_cmpxform_t *)) :
-      jas_realloc(pxformseq->pxforms, n * sizeof(jas_cmpxform_t *));
-    if (!p) {
-        return -1;
-    }
-    pxformseq->pxforms = p;
-    pxformseq->maxpxforms = n;
-    return 0;
-}
-
-/******************************************************************************\
-* Primitive transform class.
-\******************************************************************************/
-
-static jas_cmpxform_t *jas_cmpxform_create0()
-{
-    jas_cmpxform_t *pxform;
-    if (!(pxform = jas_malloc(sizeof(jas_cmpxform_t))))
-        return 0;
-    memset(pxform, 0, sizeof(jas_cmpxform_t));
-    pxform->refcnt = 0;
-    pxform->ops = 0;
-    return pxform;
-}
-
-static void jas_cmpxform_destroy(jas_cmpxform_t *pxform)
-{
-    if (--pxform->refcnt <= 0) {
-        (*pxform->ops->destroy)(pxform);
-        jas_free(pxform);
-    }
-}
-
-static jas_cmpxform_t *jas_cmpxform_copy(jas_cmpxform_t *pxform)
-{
-    ++pxform->refcnt;
-    return pxform;
-}
-
-/******************************************************************************\
-* Shaper matrix class.
-\******************************************************************************/
-
-static jas_cmpxform_t *jas_cmpxform_createshapmat()
-{
-    int i;
-    int j;
-    jas_cmpxform_t *pxform;
-    jas_cmshapmat_t *shapmat;
-    if (!(pxform = jas_cmpxform_create0()))
-        return 0;
-    pxform->ops = &shapmat_ops;
-    shapmat = &pxform->data.shapmat;
-    shapmat->mono = 0;
-    shapmat->order = 0;
-    shapmat->useluts = 0;
-    shapmat->usemat = 0;
-    for (i = 0; i < 3; ++i)
-        jas_cmshapmatlut_init(&shapmat->luts[i]);
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 4; ++j)
-            shapmat->mat[i][j] = 0.0;
-    }
-    ++pxform->refcnt;
-    return pxform;
-}
-
-static void jas_cmshapmat_destroy(jas_cmpxform_t *pxform)
-{
-    jas_cmshapmat_t *shapmat = &pxform->data.shapmat;
-    int i;
-    for (i = 0; i < 3; ++i)
-        jas_cmshapmatlut_cleanup(&shapmat->luts[i]);
-}
-
-static int jas_cmshapmat_apply(jas_cmpxform_t *pxform, jas_cmreal_t *in,
-  jas_cmreal_t *out, int cnt)
-{
-    jas_cmshapmat_t *shapmat = &pxform->data.shapmat;
-    jas_cmreal_t *src;
-    jas_cmreal_t *dst;
-    jas_cmreal_t a0;
-    jas_cmreal_t a1;
-    jas_cmreal_t a2;
-    jas_cmreal_t b0;
-    jas_cmreal_t b1;
-    jas_cmreal_t b2;
-    src = in;
-    dst = out;
-    if (!shapmat->mono) {
-        while (--cnt >= 0) {
-            a0 = *src++;
-            a1 = *src++;
-            a2 = *src++;
-            if (!shapmat->order && shapmat->useluts) {
-                a0 = jas_cmshapmatlut_lookup(&shapmat->luts[0], a0);
-                a1 = jas_cmshapmatlut_lookup(&shapmat->luts[1], a1);
-                a2 = jas_cmshapmatlut_lookup(&shapmat->luts[2], a2);
-            }
-            if (shapmat->usemat) {
-                b0 = shapmat->mat[0][0] * a0
-                  + shapmat->mat[0][1] * a1
-                  + shapmat->mat[0][2] * a2
-                  + shapmat->mat[0][3];
-                b1 = shapmat->mat[1][0] * a0
-                  + shapmat->mat[1][1] * a1
-                  + shapmat->mat[1][2] * a2
-                  + shapmat->mat[1][3];
-                b2 = shapmat->mat[2][0] * a0
-                  + shapmat->mat[2][1] * a1
-                  + shapmat->mat[2][2] * a2
-                  + shapmat->mat[2][3];
-                a0 = b0;
-                a1 = b1;
-                a2 = b2;
-            }
-            if (shapmat->order && shapmat->useluts) {
-                a0 = jas_cmshapmatlut_lookup(&shapmat->luts[0], a0);
-                a1 = jas_cmshapmatlut_lookup(&shapmat->luts[1], a1);
-                a2 = jas_cmshapmatlut_lookup(&shapmat->luts[2], a2);
-            }
-            *dst++ = a0;
-            *dst++ = a1;
-            *dst++ = a2;
-        }
-    } else {
-        if (!shapmat->order) {
-            while (--cnt >= 0) {
-                a0 = *src++;
-                if (shapmat->useluts)
-                    a0 = jas_cmshapmatlut_lookup(&shapmat->luts[0], a0);
-                a2 = a0 * shapmat->mat[2][0];
-                a1 = a0 * shapmat->mat[1][0];
-                a0 = a0 * shapmat->mat[0][0];
-                *dst++ = a0;
-                *dst++ = a1;
-                *dst++ = a2;
-            }
-        } else {
-assert(0);
-            while (--cnt >= 0) {
-                a0 = *src++;
-                src++;
-                src++;
-                a0 = a0 * shapmat->mat[0][0];
-                if (shapmat->useluts)
-                    a0 = jas_cmshapmatlut_lookup(&shapmat->luts[0], a0);
-                *dst++ = a0;
-            }
-        }
-    }
-
-    return 0;
-}
-
-static void jas_cmshapmatlut_init(jas_cmshapmatlut_t *lut)
-{
-    lut->data = 0;
-    lut->size = 0;
-}
-
-static void jas_cmshapmatlut_cleanup(jas_cmshapmatlut_t *lut)
-{
-    if (lut->data) {
-        jas_free(lut->data);
-        lut->data = 0;
-    }
-    lut->size = 0;
-}
-
-static double gammafn(double x, double gamma)
-{
-    if (x == 0.0)
-        return 0.0;
-    return pow(x, gamma);
-}
-
-static int jas_cmshapmatlut_set(jas_cmshapmatlut_t *lut, jas_icccurv_t *curv)
-{
-    jas_cmreal_t gamma;
-    int i;
-    gamma = 0;
-    jas_cmshapmatlut_cleanup(lut);
-    if (curv->numents == 0) {
-        lut->size = 2;
-        if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-            goto error;
-        lut->data[0] = 0.0;
-        lut->data[1] = 1.0;
-    } else if (curv->numents == 1) {
-        lut->size = 256;
-        if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-            goto error;
-        gamma = curv->ents[0] / 256.0;
-        for (i = 0; i < lut->size; ++i) {
-            lut->data[i] = gammafn(i / (double) (lut->size - 1), gamma);
-        }
-    } else {
-        lut->size = curv->numents;
-        if (!(lut->data = jas_malloc(lut->size * sizeof(jas_cmreal_t))))
-            goto error;
-        for (i = 0; i < lut->size; ++i) {
-            lut->data[i] = curv->ents[i] / 65535.0;
-        }
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static jas_cmreal_t jas_cmshapmatlut_lookup(jas_cmshapmatlut_t *lut, jas_cmreal_t x)
-{
-    jas_cmreal_t t;
-    int lo;
-    int hi;
-    t = x * (lut->size - 1);
-    lo = floor(t);
-    if (lo < 0)
-        return lut->data[0];
-    hi = ceil(t);
-    if (hi >= lut->size)
-        return lut->data[lut->size - 1];
-    return lut->data[lo] + (t - lo) * (lut->data[hi] - lut->data[lo]);
-}
-
-static int jas_cmshapmatlut_invert(jas_cmshapmatlut_t *invlut,
-  jas_cmshapmatlut_t *lut, int n)
-{
-    int i;
-    int j;
-    int k;
-    jas_cmreal_t ax;
-    jas_cmreal_t ay;
-    jas_cmreal_t bx;
-    jas_cmreal_t by;
-    jas_cmreal_t sx;
-    jas_cmreal_t sy;
-    assert(n >= 2);
-    if (invlut->data) {
-        jas_free(invlut->data);
-        invlut->data = 0;
-    }
-    /* The sample values should be nondecreasing. */
-    for (i = 1; i < lut->size; ++i) {
-        if (lut->data[i - 1] > lut->data[i]) {
-            assert(0);
-            return -1;
-        }
-    }
-    if (!(invlut->data = jas_malloc(n * sizeof(jas_cmreal_t))))
-        return -1;
-    invlut->size = n;
-    for (i = 0; i < invlut->size; ++i) {
-        sy = ((double) i) / (invlut->size - 1);
-        sx = 1.0;
-        for (j = 0; j < lut->size; ++j) {
-            ay = lut->data[j];
-            if (sy == ay) {
-                for (k = j + 1; k < lut->size; ++k) {
-                    by = lut->data[k];
-                    if (by != sy)
-                        break;
-#if 0
-assert(0);
-#endif
-                }
-                if (k < lut->size) {
-                    --k;
-                    ax = ((double) j) / (lut->size - 1);
-                    bx = ((double) k) / (lut->size - 1);
-                    sx = (ax + bx) / 2.0;
-                }
-                break;
-            }
-            if (j < lut->size - 1) {
-                by = lut->data[j + 1];
-                if (sy > ay && sy < by) {
-                    ax = ((double) j) / (lut->size - 1);
-                    bx = ((double) j + 1) / (lut->size - 1);
-                    sx = ax +
-                      (sy - ay) / (by - ay) * (bx - ax);
-                    break;
-                }
-            }
-        }
-        invlut->data[i] = sx;
-    }
-#if 0
-for (i=0;i<lut->size;++i)
-    jas_eprintf("lut[%d]=%f ", i, lut->data[i]);
-for (i=0;i<invlut->size;++i)
-    jas_eprintf("invlut[%d]=%f ", i, invlut->data[i]);
-#endif
-    return 0;
-}
-
-static int jas_cmshapmat_invmat(jas_cmreal_t out[3][4], jas_cmreal_t in[3][4])
-{
-    jas_cmreal_t d;
-    d = in[0][0] * (in[1][1] * in[2][2] - in[1][2] * in[2][1])
-      - in[0][1] * (in[1][0] * in[2][2] - in[1][2] * in[2][0])
-      + in[0][2] * (in[1][0] * in[2][1] - in[1][1] * in[2][0]);
-#if 0
-jas_eprintf("delta=%f\n", d);
-#endif
-    if (JAS_ABS(d) < 1e-6)
-        return -1;
-    out[0][0] = (in[1][1] * in[2][2] - in[1][2] * in[2][1]) / d;
-    out[1][0] = -(in[1][0] * in[2][2] - in[1][2] * in[2][0]) / d;
-    out[2][0] = (in[1][0] * in[2][1] - in[1][1] * in[2][0]) / d;
-    out[0][1] = -(in[0][1] * in[2][2] - in[0][2] * in[2][1]) / d;
-    out[1][1] = (in[0][0] * in[2][2] - in[0][2] * in[2][0]) / d;
-    out[2][1] = -(in[0][0] * in[2][1] - in[0][1] * in[2][0]) / d;
-    out[0][2] = (in[0][1] * in[1][2] - in[0][2] * in[1][1]) / d;
-    out[1][2] = -(in[0][0] * in[1][2] - in[1][0] * in[0][2]) / d;
-    out[2][2] = (in[0][0] * in[1][1] - in[0][1] * in[1][0]) / d;
-    out[0][3] = -in[0][3];
-    out[1][3] = -in[1][3];
-    out[2][3] = -in[2][3];
-#if 0
-jas_eprintf("[ %f %f %f %f ]\n[ %f %f %f %f ]\n[ %f %f %f %f ]\n",
-in[0][0], in[0][1], in[0][2], in[0][3],
-in[1][0], in[1][1], in[1][2], in[1][3],
-in[2][0], in[2][1], in[2][2], in[2][3]);
-jas_eprintf("[ %f %f %f %f ]\n[ %f %f %f %f ]\n[ %f %f %f %f ]\n",
-out[0][0], out[0][1], out[0][2], out[0][3],
-out[1][0], out[1][1], out[1][2], out[1][3],
-out[2][0], out[2][1], out[2][2], out[2][3]);
-#endif
-    return 0;
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int icctoclrspc(int iccclrspc, int refflag)
-{
-    if (refflag) {
-        switch (iccclrspc) {
-        case JAS_ICC_COLORSPC_XYZ:
-            return JAS_CLRSPC_CIEXYZ;
-        case JAS_ICC_COLORSPC_LAB:
-            return JAS_CLRSPC_CIELAB;
-        default:
-            abort();
-            break;
-        }
-    } else {
-        switch (iccclrspc) {
-        case JAS_ICC_COLORSPC_YCBCR:
-            return JAS_CLRSPC_GENYCBCR;
-        case JAS_ICC_COLORSPC_RGB:
-            return JAS_CLRSPC_GENRGB;
-        case JAS_ICC_COLORSPC_GRAY:
-            return JAS_CLRSPC_GENGRAY;
-        default:
-            abort();
-            break;
-        }
-    }
-}
-
-static int mono(jas_iccprof_t *iccprof, int op, jas_cmpxformseq_t **retpxformseq)
-{
-    jas_iccattrval_t *graytrc;
-    jas_cmshapmat_t *shapmat;
-    jas_cmpxform_t *pxform;
-    jas_cmpxformseq_t *pxformseq;
-    jas_cmshapmatlut_t lut;
-
-    jas_cmshapmatlut_init(&lut);
-    if (!(graytrc = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_GRYTRC)) ||
-      graytrc->type != JAS_ICC_TYPE_CURV)
-        goto error;
-    if (!(pxform = jas_cmpxform_createshapmat()))
-        goto error;
-    shapmat = &pxform->data.shapmat;
-    if (!(pxformseq = jas_cmpxformseq_create()))
-        goto error;
-    if (jas_cmpxformseq_insertpxform(pxformseq, -1, pxform))
-        goto error;
-
-    pxform->numinchans = 1;
-    pxform->numoutchans = 3;
-
-    shapmat->mono = 1;
-    shapmat->useluts = 1;
-    shapmat->usemat = 1;
-    if (!op) {
-        shapmat->order = 0;
-        shapmat->mat[0][0] = 0.9642;
-        shapmat->mat[1][0] = 1.0;
-        shapmat->mat[2][0] = 0.8249;
-        if (jas_cmshapmatlut_set(&shapmat->luts[0], &graytrc->data.curv))
-            goto error;
-    } else {
-        shapmat->order = 1;
-        shapmat->mat[0][0] = 1.0 / 0.9642;
-        shapmat->mat[1][0] = 1.0;
-        shapmat->mat[2][0] = 1.0 / 0.8249;
-        jas_cmshapmatlut_init(&lut);
-        if (jas_cmshapmatlut_set(&lut, &graytrc->data.curv))
-            goto error;
-        if (jas_cmshapmatlut_invert(&shapmat->luts[0], &lut, lut.size))
-            goto error;
-        jas_cmshapmatlut_cleanup(&lut);
-    }
-    jas_iccattrval_destroy(graytrc);
-    jas_cmpxform_destroy(pxform);
-    *retpxformseq = pxformseq;
-    return 0;
-error:
-    return -1;
-}
-
-static int triclr(jas_iccprof_t *iccprof, int op, jas_cmpxformseq_t **retpxformseq)
-{
-    int i;
-    jas_iccattrval_t *trcs[3];
-    jas_iccattrval_t *cols[3];
-    jas_cmshapmat_t *shapmat;
-    jas_cmpxform_t *pxform;
-    jas_cmpxformseq_t *pxformseq;
-    jas_cmreal_t mat[3][4];
-    jas_cmshapmatlut_t lut;
-
-    pxform = 0;
-    pxformseq = 0;
-    for (i = 0; i < 3; ++i) {
-        trcs[i] = 0;
-        cols[i] = 0;
-    }
-    jas_cmshapmatlut_init(&lut);
-
-    if (!(trcs[0] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_REDTRC)) ||
-      !(trcs[1] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_GRNTRC)) ||
-      !(trcs[2] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_BLUTRC)) ||
-      !(cols[0] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_REDMATCOL)) ||
-      !(cols[1] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_GRNMATCOL)) ||
-      !(cols[2] = jas_iccprof_getattr(iccprof, JAS_ICC_TAG_BLUMATCOL)))
-        goto error;
-    for (i = 0; i < 3; ++i) {
-        if (trcs[i]->type != JAS_ICC_TYPE_CURV ||
-          cols[i]->type != JAS_ICC_TYPE_XYZ)
-            goto error;
-    }
-    if (!(pxform = jas_cmpxform_createshapmat()))
-        goto error;
-    pxform->numinchans = 3;
-    pxform->numoutchans = 3;
-    shapmat = &pxform->data.shapmat;
-    if (!(pxformseq = jas_cmpxformseq_create()))
-        goto error;
-    if (jas_cmpxformseq_insertpxform(pxformseq, -1, pxform))
-        goto error;
-    shapmat->mono = 0;
-    shapmat->useluts = 1;
-    shapmat->usemat = 1;
-    if (!op) {
-        shapmat->order = 0;
-        for (i = 0; i < 3; ++i) {
-            shapmat->mat[0][i] = cols[i]->data.xyz.x / 65536.0;
-            shapmat->mat[1][i] = cols[i]->data.xyz.y / 65536.0;
-            shapmat->mat[2][i] = cols[i]->data.xyz.z / 65536.0;
-        }
-        for (i = 0; i < 3; ++i)
-            shapmat->mat[i][3] = 0.0;
-        for (i = 0; i < 3; ++i) {
-            if (jas_cmshapmatlut_set(&shapmat->luts[i], &trcs[i]->data.curv))
-                goto error;
-        }
-    } else {
-        shapmat->order = 1;
-        for (i = 0; i < 3; ++i) {
-            mat[0][i] = cols[i]->data.xyz.x / 65536.0;
-            mat[1][i] = cols[i]->data.xyz.y / 65536.0;
-            mat[2][i] = cols[i]->data.xyz.z / 65536.0;
-        }
-        for (i = 0; i < 3; ++i)
-            mat[i][3] = 0.0;
-        if (jas_cmshapmat_invmat(shapmat->mat, mat))
-            goto error;
-        for (i = 0; i < 3; ++i) {
-            jas_cmshapmatlut_init(&lut);
-            if (jas_cmshapmatlut_set(&lut, &trcs[i]->data.curv))
-                goto error;
-            if (jas_cmshapmatlut_invert(&shapmat->luts[i], &lut, lut.size))
-                goto error;
-            jas_cmshapmatlut_cleanup(&lut);
-        }
-    }
-    for (i = 0; i < 3; ++i) {
-        jas_iccattrval_destroy(trcs[i]);
-        jas_iccattrval_destroy(cols[i]);
-    }
-    jas_cmpxform_destroy(pxform);
-    *retpxformseq = pxformseq;
-    return 0;
-
-error:
-
-    for (i = 0; i < 3; ++i) {
-        if (trcs[i]) {
-            jas_iccattrval_destroy(trcs[i]);
-        }
-        if (cols[i]) {
-            jas_iccattrval_destroy(cols[i]);
-        }
-    }
-    if (pxformseq) {
-        jas_cmpxformseq_destroy(pxformseq);
-    }
-    if (pxform) {
-        jas_cmpxform_destroy(pxform);
-    }
-
-    return -1;
-}
-
-static int jas_cmgetint(long **bufptr, int sgnd, int prec, long *val)
-{
-    long v;
-    int m;
-    v = **bufptr;
-    if (sgnd) {
-        m = (1 << (prec - 1));
-        if (v < -m || v >= m)
-            return -1;
-    } else {
-        if (v < 0 || v >= (1 << prec))
-            return -1;
-    }
-    ++(*bufptr);
-    *val = v;
-    return 0;
-}
-
-static int jas_cmputint(long **bufptr, int sgnd, int prec, long val)
-{
-    int m;
-    if (sgnd) {
-        m = (1 << (prec - 1));
-        if (val < -m || val >= m)
-            return -1;
-    } else {
-        if (val < 0 || val >= (1 << prec))
-            return -1;
-    }
-    **bufptr = val;
-    ++(*bufptr);
-    return 0;
-}
-
-int jas_clrspc_numchans(int clrspc)
-{
-    switch (jas_clrspc_fam(clrspc)) {
-    case JAS_CLRSPC_FAM_XYZ:
-    case JAS_CLRSPC_FAM_LAB:
-    case JAS_CLRSPC_FAM_RGB:
-    case JAS_CLRSPC_FAM_YCBCR:
-        return 3;
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        return 1;
-        break;
-    default:
-        abort();
-        break;
-    }
-}
-
-jas_iccprof_t *jas_iccprof_createfromcmprof(jas_cmprof_t *prof)
-{
-    return jas_iccprof_copy(prof->iccprof);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_debug.c b/src/3rdparty/jasper/src/libjasper/base/jas_debug.c
deleted file mode 100644
index 3d8b3d6..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_debug.c
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_debug.h"
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-static int jas_dbglevel = 0;
-/* The debug level. */
-
-/******************************************************************************\
-* Code for getting/setting the debug level.
-\******************************************************************************/
-
-/* Set the library debug level. */
-int jas_setdbglevel(int dbglevel)
-{
-    int olddbglevel;
-
-    /* Save the old debug level. */
-    olddbglevel = jas_dbglevel;
-
-    /* Change the debug level. */
-    jas_dbglevel = dbglevel;
-
-    /* Return the old debug level. */
-    return olddbglevel;
-}
-
-/* Get the library debug level. */
-int jas_getdbglevel()
-{
-    return jas_dbglevel;
-}
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-/* Perform formatted output to standard error. */
-int jas_eprintf(const char *fmt, ...)
-{
-    int ret;
-    va_list ap;
-
-    va_start(ap, fmt);
-    ret = vfprintf(stderr, fmt, ap);
-    va_end(ap);
-    return ret;
-}
-
-/* Dump memory to a stream. */
-int jas_memdump(FILE *out, void *data, size_t len)
-{
-    size_t i;
-    size_t j;
-    uchar *dp;
-    dp = data;
-    for (i = 0; i < len; i += 16) {
-        fprintf(out, "%04x:", i);
-        for (j = 0; j < 16; ++j) {
-            if (i + j < len) {
-                fprintf(out, " %02x", dp[i + j]);
-            }
-        }
-        fprintf(out, "\n");
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c b/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c
deleted file mode 100644
index 6b65a30..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_getopt.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 1999-2000, Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Command Line Option Parsing Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-
-#include "jasper/jas_debug.h"
-#include "jasper/jas_getopt.h"
-#include "jasper/jas_math.h"
-
-/******************************************************************************\
-* Global data.
-\******************************************************************************/
-
-int jas_optind = 0;
-int jas_opterr = 1;
-char *jas_optarg = 0;
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-static jas_opt_t *jas_optlookup(jas_opt_t *opts, char *name)
-{
-    jas_opt_t *opt;
-
-    for (opt = opts; opt->id >= 0 && opt->name; ++opt) {
-        if (!strcmp(opt->name, name)) {
-            return opt;
-        }
-    }
-    return 0;
-}
-
-int jas_getopt(int argc, char **argv, jas_opt_t *opts)
-{
-    char *cp;
-    int id;
-    int hasarg;
-    jas_opt_t *opt;
-    char *s;
-
-    if (!jas_optind) {
-        jas_optind = JAS_MIN(1, argc);
-    }
-    while (jas_optind < argc) {
-        s = cp = argv[jas_optind];
-        if (*cp == '-') {
-            /* We are processing an option. */
-            ++jas_optind;
-            if (*++cp == '-') {
-                /* We are processing a long option. */
-                ++cp;
-                if (*cp == '\0') {
-                    /* This is the end of the options. */
-                    return JAS_GETOPT_EOF;
-                }
-                if (!(opt = jas_optlookup(opts, cp))) {
-                    if (jas_opterr) {
-                        jas_eprintf("unknown long option %s\n", s);
-                    }
-                    return JAS_GETOPT_ERR;
-                }
-                hasarg = (opt->flags & JAS_OPT_HASARG) != 0;
-                id = opt->id;
-            } else {
-                /* We are processing a short option. */
-                if (strlen(cp) != 1 ||
-                  !(opt = jas_optlookup(opts, cp))) {
-                    if (jas_opterr) {
-                        jas_eprintf("unknown short option %s\n", s);
-                    }
-                    return JAS_GETOPT_ERR;
-                }
-                hasarg = (opt->flags & JAS_OPT_HASARG) != 0;
-                id = opt->id;
-            }
-            if (hasarg) {
-                /* The option has an argument. */
-                if (jas_optind >= argc) {
-                    if (jas_opterr) {
-                        jas_eprintf("missing argument for option %s\n", s);
-                    }
-                    return JAS_GETOPT_ERR;
-                }
-                jas_optarg = argv[jas_optind];
-                ++jas_optind;
-            } else {
-                /* The option does not have an argument. */
-                jas_optarg = 0;
-            }
-            return id;
-        } else {
-            /* We are not processing an option. */
-            return JAS_GETOPT_EOF;
-        }
-    }
-    return JAS_GETOPT_EOF;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_icc.c b/src/3rdparty/jasper/src/libjasper/base/jas_icc.c
deleted file mode 100644
index 37eb787..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_icc.c
+++ /dev/null
@@ -1,1722 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#include <assert.h>
-#include <jasper/jas_config.h>
-#include <jasper/jas_types.h>
-#include <jasper/jas_malloc.h>
-#include <jasper/jas_debug.h>
-#include <jasper/jas_icc.h>
-#include <jasper/jas_cm.h>
-#include <jasper/jas_stream.h>
-#include <jasper/jas_string.h>
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#define	jas_iccputuint8(out, val)	jas_iccputuint(out, 1, val)
-#define	jas_iccputuint16(out, val)	jas_iccputuint(out, 2, val)
-#define	jas_iccputsint32(out, val)	jas_iccputsint(out, 4, val)
-#define	jas_iccputuint32(out, val)	jas_iccputuint(out, 4, val)
-#define	jas_iccputuint64(out, val)	jas_iccputuint(out, 8, val)
-
-static jas_iccattrval_t *jas_iccattrval_create0(void);
-
-static int jas_iccgetuint(jas_stream_t *in, int n, ulonglong *val);
-static int jas_iccgetuint8(jas_stream_t *in, jas_iccuint8_t *val);
-static int jas_iccgetuint16(jas_stream_t *in, jas_iccuint16_t *val);
-static int jas_iccgetsint32(jas_stream_t *in, jas_iccsint32_t *val);
-static int jas_iccgetuint32(jas_stream_t *in, jas_iccuint32_t *val);
-static int jas_iccgetuint64(jas_stream_t *in, jas_iccuint64_t *val);
-static int jas_iccputuint(jas_stream_t *out, int n, ulonglong val);
-static int jas_iccputsint(jas_stream_t *out, int n, longlong val);
-static jas_iccprof_t *jas_iccprof_create(void);
-static int jas_iccprof_readhdr(jas_stream_t *in, jas_icchdr_t *hdr);
-static int jas_iccprof_writehdr(jas_stream_t *out, jas_icchdr_t *hdr);
-static int jas_iccprof_gettagtab(jas_stream_t *in, jas_icctagtab_t *tagtab);
-static void jas_iccprof_sorttagtab(jas_icctagtab_t *tagtab);
-static int jas_iccattrtab_lookup(jas_iccattrtab_t *attrtab, jas_iccuint32_t name);
-static jas_iccattrtab_t *jas_iccattrtab_copy(jas_iccattrtab_t *attrtab);
-static jas_iccattrvalinfo_t *jas_iccattrvalinfo_lookup(jas_iccsig_t name);
-static int jas_iccgettime(jas_stream_t *in, jas_icctime_t *time);
-static int jas_iccgetxyz(jas_stream_t *in, jas_iccxyz_t *xyz);
-static int jas_icctagtabent_cmp(const void *src, const void *dst);
-
-static void jas_icccurv_destroy(jas_iccattrval_t *attrval);
-static int jas_icccurv_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval);
-static int jas_icccurv_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_icccurv_getsize(jas_iccattrval_t *attrval);
-static int jas_icccurv_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_icccurv_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static void jas_icctxtdesc_destroy(jas_iccattrval_t *attrval);
-static int jas_icctxtdesc_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval);
-static int jas_icctxtdesc_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_icctxtdesc_getsize(jas_iccattrval_t *attrval);
-static int jas_icctxtdesc_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_icctxtdesc_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static void jas_icctxt_destroy(jas_iccattrval_t *attrval);
-static int jas_icctxt_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval);
-static int jas_icctxt_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_icctxt_getsize(jas_iccattrval_t *attrval);
-static int jas_icctxt_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_icctxt_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static int jas_iccxyz_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_iccxyz_getsize(jas_iccattrval_t *attrval);
-static int jas_iccxyz_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_iccxyz_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static jas_iccattrtab_t *jas_iccattrtab_create(void);
-static void jas_iccattrtab_destroy(jas_iccattrtab_t *tab);
-static int jas_iccattrtab_resize(jas_iccattrtab_t *tab, int maxents);
-static int jas_iccattrtab_add(jas_iccattrtab_t *attrtab, int i,
-  jas_iccuint32_t name, jas_iccattrval_t *val);
-static int jas_iccattrtab_replace(jas_iccattrtab_t *attrtab, int i,
-  jas_iccuint32_t name, jas_iccattrval_t *val);
-static void jas_iccattrtab_delete(jas_iccattrtab_t *attrtab, int i);
-static long jas_iccpadtomult(long x, long y);
-static int jas_iccattrtab_get(jas_iccattrtab_t *attrtab, int i,
-  jas_iccattrname_t *name, jas_iccattrval_t **val);
-static int jas_iccprof_puttagtab(jas_stream_t *out, jas_icctagtab_t *tagtab);
-
-static void jas_icclut16_destroy(jas_iccattrval_t *attrval);
-static int jas_icclut16_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval);
-static int jas_icclut16_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_icclut16_getsize(jas_iccattrval_t *attrval);
-static int jas_icclut16_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_icclut16_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static void jas_icclut8_destroy(jas_iccattrval_t *attrval);
-static int jas_icclut8_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval);
-static int jas_icclut8_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt);
-static int jas_icclut8_getsize(jas_iccattrval_t *attrval);
-static int jas_icclut8_output(jas_iccattrval_t *attrval, jas_stream_t *out);
-static void jas_icclut8_dump(jas_iccattrval_t *attrval, FILE *out);
-
-static int jas_iccputtime(jas_stream_t *out, jas_icctime_t *ctime);
-static int jas_iccputxyz(jas_stream_t *out, jas_iccxyz_t *xyz);
-
-static long jas_iccpowi(int x, int n);
-
-static char *jas_iccsigtostr(int sig, char *buf);
-
-
-jas_iccattrvalinfo_t jas_iccattrvalinfos[] = {
-    {JAS_ICC_TYPE_CURV, {jas_icccurv_destroy, jas_icccurv_copy,
-      jas_icccurv_input, jas_icccurv_output, jas_icccurv_getsize,
-      jas_icccurv_dump}},
-    {JAS_ICC_TYPE_XYZ, {0, 0, jas_iccxyz_input, jas_iccxyz_output,
-      jas_iccxyz_getsize, jas_iccxyz_dump}},
-    {JAS_ICC_TYPE_TXTDESC, {jas_icctxtdesc_destroy,
-      jas_icctxtdesc_copy, jas_icctxtdesc_input, jas_icctxtdesc_output,
-      jas_icctxtdesc_getsize, jas_icctxtdesc_dump}},
-    {JAS_ICC_TYPE_TXT, {jas_icctxt_destroy, jas_icctxt_copy,
-      jas_icctxt_input, jas_icctxt_output, jas_icctxt_getsize,
-      jas_icctxt_dump}},
-    {JAS_ICC_TYPE_LUT8, {jas_icclut8_destroy, jas_icclut8_copy,
-      jas_icclut8_input, jas_icclut8_output, jas_icclut8_getsize,
-      jas_icclut8_dump}},
-    {JAS_ICC_TYPE_LUT16, {jas_icclut16_destroy, jas_icclut16_copy,
-      jas_icclut16_input, jas_icclut16_output, jas_icclut16_getsize,
-      jas_icclut16_dump}},
-    {0, {0, 0, 0, 0, 0, 0}}
-};
-
-typedef struct {
-    jas_iccuint32_t tag;
-    char *name;
-} jas_icctaginfo_t;
-
-/******************************************************************************\
-* profile class
-\******************************************************************************/
-
-static jas_iccprof_t *jas_iccprof_create()
-{
-    jas_iccprof_t *prof;
-    prof = 0;
-    if (!(prof = jas_malloc(sizeof(jas_iccprof_t)))) {
-        goto error;
-    }
-    if (!(prof->attrtab = jas_iccattrtab_create()))
-        goto error;
-    memset(&prof->hdr, 0, sizeof(jas_icchdr_t));
-    prof->tagtab.numents = 0;
-    prof->tagtab.ents = 0;
-    return prof;
-error:
-    if (prof)
-        jas_iccprof_destroy(prof);
-    return 0;
-}
-
-jas_iccprof_t *jas_iccprof_copy(jas_iccprof_t *prof)
-{
-    jas_iccprof_t *newprof;
-    newprof = 0;
-    if (!(newprof = jas_iccprof_create()))
-        goto error;
-    newprof->hdr = prof->hdr;
-    newprof->tagtab.numents = 0;
-    newprof->tagtab.ents = 0;
-    assert(newprof->attrtab);
-    jas_iccattrtab_destroy(newprof->attrtab);
-    if (!(newprof->attrtab = jas_iccattrtab_copy(prof->attrtab)))
-        goto error;
-    return newprof;
-error:
-    if (newprof)
-        jas_iccprof_destroy(newprof);
-    return 0;
-}
-
-void jas_iccprof_destroy(jas_iccprof_t *prof)
-{
-    if (prof->attrtab)
-        jas_iccattrtab_destroy(prof->attrtab);
-    if (prof->tagtab.ents)
-        jas_free(prof->tagtab.ents);
-    jas_free(prof);
-}
-
-void jas_iccprof_dump(jas_iccprof_t *prof, FILE *out)
-{
-    jas_iccattrtab_dump(prof->attrtab, out);
-}
-
-jas_iccprof_t *jas_iccprof_load(jas_stream_t *in)
-{
-    jas_iccprof_t *prof;
-    int numtags;
-    long curoff;
-    long reloff;
-    long prevoff;
-    jas_iccsig_t type;
-    jas_iccattrval_t *attrval;
-    jas_iccattrval_t *prevattrval;
-    jas_icctagtabent_t *tagtabent;
-    jas_iccattrvalinfo_t *attrvalinfo;
-    int i;
-    int len;
-
-    prof = 0;
-    attrval = 0;
-
-    if (!(prof = jas_iccprof_create())) {
-        goto error;
-    }
-
-    if (jas_iccprof_readhdr(in, &prof->hdr)) {
-        jas_eprintf("cannot get header\n");
-        goto error;
-    }
-    if (jas_iccprof_gettagtab(in, &prof->tagtab)) {
-        jas_eprintf("cannot get tab table\n");
-        goto error;
-    }
-    jas_iccprof_sorttagtab(&prof->tagtab);
-
-    numtags = prof->tagtab.numents;
-    curoff = JAS_ICC_HDRLEN + 4 + 12 * numtags;
-    prevoff = 0;
-    prevattrval = 0;
-    for (i = 0; i < numtags; ++i) {
-        tagtabent = &prof->tagtab.ents[i];
-        if (tagtabent->off == JAS_CAST(jas_iccuint32_t, prevoff)) {
-            if (prevattrval) {
-                if (!(attrval = jas_iccattrval_clone(prevattrval)))
-                    goto error;
-                if (jas_iccprof_setattr(prof, tagtabent->tag, attrval))
-                    goto error;
-                jas_iccattrval_destroy(attrval);
-            } else {
-#if 0
-                jas_eprintf("warning: skipping unknown tag type\n");
-#endif
-            }
-            continue;
-        }
-        reloff = tagtabent->off - curoff;
-        if (reloff > 0) {
-            if (jas_stream_gobble(in, reloff) != reloff)
-                goto error;
-            curoff += reloff;
-        } else if (reloff < 0) {
-            /* This should never happen since we read the tagged
-            element data in a single pass. */
-            abort();
-        }
-        prevoff = curoff;
-        if (jas_iccgetuint32(in, &type)) {
-            goto error;
-        }
-        if (jas_stream_gobble(in, 4) != 4) {
-            goto error;
-        }
-        curoff += 8;
-        if (!(attrvalinfo = jas_iccattrvalinfo_lookup(type))) {
-#if 0
-            jas_eprintf("warning: skipping unknown tag type\n");
-#endif
-            prevattrval = 0;
-            continue;
-        }
-        if (!(attrval = jas_iccattrval_create(type))) {
-            goto error;
-        }
-        len = tagtabent->len - 8;
-        if ((*attrval->ops->input)(attrval, in, len)) {
-            goto error;
-        }
-        curoff += len;
-        if (jas_iccprof_setattr(prof, tagtabent->tag, attrval)) {
-            goto error;
-        }
-        prevattrval = attrval; /* This is correct, but slimey. */
-        jas_iccattrval_destroy(attrval);
-        attrval = 0;
-    }
-
-    return prof;
-
-error:
-    if (prof)
-        jas_iccprof_destroy(prof);
-    if (attrval)
-        jas_iccattrval_destroy(attrval);
-    return 0;
-}
-
-int jas_iccprof_save(jas_iccprof_t *prof, jas_stream_t *out)
-{
-    long curoff;
-    long reloff;
-    long newoff;
-    int i;
-    int j;
-    jas_icctagtabent_t *tagtabent;
-    jas_icctagtabent_t *sharedtagtabent;
-    jas_icctagtabent_t *tmptagtabent;
-    jas_iccuint32_t attrname;
-    jas_iccattrval_t *attrval;
-    jas_icctagtab_t *tagtab;
-
-    tagtab = &prof->tagtab;
-    if (!(tagtab->ents = jas_malloc(prof->attrtab->numattrs *
-      sizeof(jas_icctagtabent_t))))
-        goto error;
-    tagtab->numents = prof->attrtab->numattrs;
-    curoff = JAS_ICC_HDRLEN + 4 + 12 * tagtab->numents;
-    for (i = 0; i < JAS_CAST(int, tagtab->numents); ++i) {
-        tagtabent = &tagtab->ents[i];
-        if (jas_iccattrtab_get(prof->attrtab, i, &attrname, &attrval))
-            goto error;
-        assert(attrval->ops->output);
-        tagtabent->tag = attrname;
-        tagtabent->data = &attrval->data;
-        sharedtagtabent = 0;
-        for (j = 0; j < i; ++j) {
-            tmptagtabent = &tagtab->ents[j];
-            if (tagtabent->data == tmptagtabent->data) {
-                sharedtagtabent = tmptagtabent;
-                break;
-            }
-        }
-        if (sharedtagtabent) {
-            tagtabent->off = sharedtagtabent->off;
-            tagtabent->len = sharedtagtabent->len;
-            tagtabent->first = sharedtagtabent;
-        } else {
-            tagtabent->off = curoff;
-            tagtabent->len = (*attrval->ops->getsize)(attrval) + 8;
-            tagtabent->first = 0;
-            if (i < JAS_CAST(int, tagtab->numents - 1)) {
-                curoff = jas_iccpadtomult(curoff + tagtabent->len, 4);
-            } else {
-                curoff += tagtabent->len;
-            }
-        }
-        jas_iccattrval_destroy(attrval);
-    }
-    prof->hdr.size = curoff;
-    if (jas_iccprof_writehdr(out, &prof->hdr))
-        goto error;
-    if (jas_iccprof_puttagtab(out, &prof->tagtab))
-        goto error;
-    curoff = JAS_ICC_HDRLEN + 4 + 12 * tagtab->numents;
-    for (i = 0; i < JAS_CAST(int, tagtab->numents);) {
-        tagtabent = &tagtab->ents[i];
-        assert(curoff == JAS_CAST(long, tagtabent->off));
-        if (jas_iccattrtab_get(prof->attrtab, i, &attrname, &attrval))
-            goto error;
-        if (jas_iccputuint32(out, attrval->type) || jas_stream_pad(out,
-          4, 0) != 4)
-            goto error;
-        if ((*attrval->ops->output)(attrval, out))
-            goto error;
-        jas_iccattrval_destroy(attrval);
-        curoff += tagtabent->len;
-        ++i;
-        while (i < JAS_CAST(int, tagtab->numents) &&
-          tagtab->ents[i].first)
-            ++i;
-        newoff = (i < JAS_CAST(int, tagtab->numents)) ?
-          tagtab->ents[i].off : prof->hdr.size;
-        reloff = newoff - curoff;
-        assert(reloff >= 0);
-        if (reloff > 0) {
-            if (jas_stream_pad(out, reloff, 0) != reloff)
-                goto error;
-            curoff += reloff;
-        }
-    }
-    return 0;
-error:
-    /* XXX - need to free some resources here */
-    return -1;
-}
-
-static int jas_iccprof_writehdr(jas_stream_t *out, jas_icchdr_t *hdr)
-{
-    if (jas_iccputuint32(out, hdr->size) ||
-      jas_iccputuint32(out, hdr->cmmtype) ||
-      jas_iccputuint32(out, hdr->version) ||
-      jas_iccputuint32(out, hdr->clas) ||
-      jas_iccputuint32(out, hdr->colorspc) ||
-      jas_iccputuint32(out, hdr->refcolorspc) ||
-      jas_iccputtime(out, &hdr->ctime) ||
-      jas_iccputuint32(out, hdr->magic) ||
-      jas_iccputuint32(out, hdr->platform) ||
-      jas_iccputuint32(out, hdr->flags) ||
-      jas_iccputuint32(out, hdr->maker) ||
-      jas_iccputuint32(out, hdr->model) ||
-      jas_iccputuint64(out, hdr->attr) ||
-      jas_iccputuint32(out, hdr->intent) ||
-      jas_iccputxyz(out, &hdr->illum) ||
-      jas_iccputuint32(out, hdr->creator) ||
-      jas_stream_pad(out, 44, 0) != 44)
-        return -1;
-    return 0;
-}
-
-static int jas_iccprof_puttagtab(jas_stream_t *out, jas_icctagtab_t *tagtab)
-{
-    int i;
-    jas_icctagtabent_t *tagtabent;
-    if (jas_iccputuint32(out, tagtab->numents))
-        goto error;
-    for (i = 0; i < JAS_CAST(int, tagtab->numents); ++i) {
-        tagtabent = &tagtab->ents[i];
-        if (jas_iccputuint32(out, tagtabent->tag) ||
-          jas_iccputuint32(out, tagtabent->off) ||
-          jas_iccputuint32(out, tagtabent->len))
-            goto error;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static int jas_iccprof_readhdr(jas_stream_t *in, jas_icchdr_t *hdr)
-{
-    if (jas_iccgetuint32(in, &hdr->size) ||
-      jas_iccgetuint32(in, &hdr->cmmtype) ||
-      jas_iccgetuint32(in, &hdr->version) ||
-      jas_iccgetuint32(in, &hdr->clas) ||
-      jas_iccgetuint32(in, &hdr->colorspc) ||
-      jas_iccgetuint32(in, &hdr->refcolorspc) ||
-      jas_iccgettime(in, &hdr->ctime) ||
-      jas_iccgetuint32(in, &hdr->magic) ||
-      jas_iccgetuint32(in, &hdr->platform) ||
-      jas_iccgetuint32(in, &hdr->flags) ||
-      jas_iccgetuint32(in, &hdr->maker) ||
-      jas_iccgetuint32(in, &hdr->model) ||
-      jas_iccgetuint64(in, &hdr->attr) ||
-      jas_iccgetuint32(in, &hdr->intent) ||
-      jas_iccgetxyz(in, &hdr->illum) ||
-      jas_iccgetuint32(in, &hdr->creator) ||
-      jas_stream_gobble(in, 44) != 44)
-        return -1;
-    return 0;
-}
-
-static int jas_iccprof_gettagtab(jas_stream_t *in, jas_icctagtab_t *tagtab)
-{
-    int i;
-    jas_icctagtabent_t *tagtabent;
-
-    if (tagtab->ents) {
-        jas_free(tagtab->ents);
-        tagtab->ents = 0;
-    }
-    if (jas_iccgetuint32(in, &tagtab->numents))
-        goto error;
-    if (!(tagtab->ents = jas_malloc(tagtab->numents *
-      sizeof(jas_icctagtabent_t))))
-        goto error;
-    tagtabent = tagtab->ents;
-    for (i = 0; i < JAS_CAST(long, tagtab->numents); ++i) {
-        if (jas_iccgetuint32(in, &tagtabent->tag) ||
-        jas_iccgetuint32(in, &tagtabent->off) ||
-        jas_iccgetuint32(in, &tagtabent->len))
-            goto error;
-        ++tagtabent;
-    }
-    return 0;
-error:
-    if (tagtab->ents) {
-        jas_free(tagtab->ents);
-        tagtab->ents = 0;
-    }
-    return -1;
-}
-
-jas_iccattrval_t *jas_iccprof_getattr(jas_iccprof_t *prof,
-  jas_iccattrname_t name)
-{
-    int i;
-    jas_iccattrval_t *attrval;
-    if ((i = jas_iccattrtab_lookup(prof->attrtab, name)) < 0)
-        goto error;
-    if (!(attrval = jas_iccattrval_clone(prof->attrtab->attrs[i].val)))
-        goto error;
-    return attrval;
-error:
-    return 0;
-}
-
-int jas_iccprof_setattr(jas_iccprof_t *prof, jas_iccattrname_t name,
-  jas_iccattrval_t *val)
-{
-    int i;
-    if ((i = jas_iccattrtab_lookup(prof->attrtab, name)) >= 0) {
-        if (val) {
-            if (jas_iccattrtab_replace(prof->attrtab, i, name, val))
-                goto error;
-        } else {
-            jas_iccattrtab_delete(prof->attrtab, i);
-        }
-    } else {
-        if (val) {
-            if (jas_iccattrtab_add(prof->attrtab, -1, name, val))
-                goto error;
-        } else {
-            /* NOP */
-        }
-    }
-    return 0;
-error:
-    return -1;
-}
-
-int jas_iccprof_gethdr(jas_iccprof_t *prof, jas_icchdr_t *hdr)
-{
-    *hdr = prof->hdr;
-    return 0;
-}
-
-int jas_iccprof_sethdr(jas_iccprof_t *prof, jas_icchdr_t *hdr)
-{
-    prof->hdr = *hdr;
-    return 0;
-}
-
-static void jas_iccprof_sorttagtab(jas_icctagtab_t *tagtab)
-{
-    qsort(tagtab->ents, tagtab->numents, sizeof(jas_icctagtabent_t),
-      jas_icctagtabent_cmp);
-}
-
-static int jas_icctagtabent_cmp(const void *src, const void *dst)
-{
-    jas_icctagtabent_t *srctagtabent = JAS_CAST(jas_icctagtabent_t *, src);
-    jas_icctagtabent_t *dsttagtabent = JAS_CAST(jas_icctagtabent_t *, dst);
-    if (srctagtabent->off > dsttagtabent->off) {
-        return 1;
-    } else if (srctagtabent->off < dsttagtabent->off) {
-        return -1;
-    }
-    return 0;
-}
-
-static jas_iccattrvalinfo_t *jas_iccattrvalinfo_lookup(jas_iccsig_t type)
-{
-    jas_iccattrvalinfo_t *info;
-    info = jas_iccattrvalinfos;
-    for (info = jas_iccattrvalinfos; info->type; ++info) {
-        if (info->type == type) {
-            return info;
-        }
-    }
-    return 0;
-}
-
-static int jas_iccgettime(jas_stream_t *in, jas_icctime_t *time)
-{
-    if (jas_iccgetuint16(in, &time->year) ||
-      jas_iccgetuint16(in, &time->month) ||
-      jas_iccgetuint16(in, &time->day) ||
-      jas_iccgetuint16(in, &time->hour) ||
-      jas_iccgetuint16(in, &time->min) ||
-      jas_iccgetuint16(in, &time->sec)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jas_iccgetxyz(jas_stream_t *in, jas_iccxyz_t *xyz)
-{
-    if (jas_iccgetsint32(in, &xyz->x) ||
-      jas_iccgetsint32(in, &xyz->y) ||
-      jas_iccgetsint32(in, &xyz->z)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jas_iccputtime(jas_stream_t *out, jas_icctime_t *time)
-{
-    jas_iccputuint16(out, time->year);
-    jas_iccputuint16(out, time->month);
-    jas_iccputuint16(out, time->day);
-    jas_iccputuint16(out, time->hour);
-    jas_iccputuint16(out, time->min);
-    jas_iccputuint16(out, time->sec);
-    return 0;
-}
-
-static int jas_iccputxyz(jas_stream_t *out, jas_iccxyz_t *xyz)
-{
-    jas_iccputuint32(out, xyz->x);
-    jas_iccputuint32(out, xyz->y);
-    jas_iccputuint32(out, xyz->z);
-    return 0;
-}
-
-/******************************************************************************\
-* attribute table class
-\******************************************************************************/
-
-static jas_iccattrtab_t *jas_iccattrtab_create()
-{
-    jas_iccattrtab_t *tab;
-    tab = 0;
-    if (!(tab = jas_malloc(sizeof(jas_iccattrtab_t))))
-        goto error;
-    tab->maxattrs = 0;
-    tab->numattrs = 0;
-    tab->attrs = 0;
-    if (jas_iccattrtab_resize(tab, 32))
-        goto error;
-    return tab;
-error:
-    if (tab)
-        jas_iccattrtab_destroy(tab);
-    return 0;
-}
-
-static jas_iccattrtab_t *jas_iccattrtab_copy(jas_iccattrtab_t *attrtab)
-{
-    jas_iccattrtab_t *newattrtab;
-    int i;
-    if (!(newattrtab = jas_iccattrtab_create()))
-        goto error;
-    for (i = 0; i < attrtab->numattrs; ++i) {
-        if (jas_iccattrtab_add(newattrtab, i, attrtab->attrs[i].name,
-          attrtab->attrs[i].val))
-            goto error;
-    }
-    return newattrtab;
-error:
-    return 0;
-}
-
-static void jas_iccattrtab_destroy(jas_iccattrtab_t *tab)
-{
-    if (tab->attrs) {
-        while (tab->numattrs > 0) {
-            jas_iccattrtab_delete(tab, 0);
-        }
-        jas_free(tab->attrs);
-    }
-    jas_free(tab);
-}
-
-void jas_iccattrtab_dump(jas_iccattrtab_t *attrtab, FILE *out)
-{
-    int i;
-    jas_iccattr_t *attr;
-    jas_iccattrval_t *attrval;
-    jas_iccattrvalinfo_t *info;
-    char buf[16];
-    fprintf(out, "numattrs=%d\n", attrtab->numattrs);
-    fprintf(out, "---\n");
-    for (i = 0; i < attrtab->numattrs; ++i) {
-        attr = &attrtab->attrs[i];
-        attrval = attr->val;
-        info = jas_iccattrvalinfo_lookup(attrval->type);
-        if (!info) abort();
-        fprintf(out, "attrno=%d; attrname=\"%s\"(0x%08x); attrtype=\"%s\"(0x%08x)\n",
-          i,
-          jas_iccsigtostr(attr->name, &buf[0]),
-          attr->name,
-          jas_iccsigtostr(attrval->type, &buf[8]),
-          attrval->type
-          );
-        jas_iccattrval_dump(attrval, out);
-        fprintf(out, "---\n");
-    }
-}
-
-static int jas_iccattrtab_resize(jas_iccattrtab_t *tab, int maxents)
-{
-    jas_iccattr_t *newattrs;
-    assert(maxents >= tab->numattrs);
-    newattrs = tab->attrs ? jas_realloc(tab->attrs, maxents *
-      sizeof(jas_iccattr_t)) : jas_malloc(maxents * sizeof(jas_iccattr_t));
-    if (!newattrs)
-        return -1;
-    tab->attrs = newattrs;
-    tab->maxattrs = maxents;
-    return 0;
-}
-
-static int jas_iccattrtab_add(jas_iccattrtab_t *attrtab, int i,
-  jas_iccuint32_t name, jas_iccattrval_t *val)
-{
-    int n;
-    jas_iccattr_t *attr;
-    jas_iccattrval_t *tmpattrval;
-    tmpattrval = 0;
-    if (i < 0) {
-        i = attrtab->numattrs;
-    }
-    assert(i >= 0 && i <= attrtab->numattrs);
-    if (attrtab->numattrs >= attrtab->maxattrs) {
-        if (jas_iccattrtab_resize(attrtab, attrtab->numattrs + 32)) {
-            goto error;
-        }
-    }
-    if (!(tmpattrval = jas_iccattrval_clone(val)))
-        goto error;
-    n = attrtab->numattrs - i;
-    if (n > 0)
-        memmove(&attrtab->attrs[i + 1], &attrtab->attrs[i],
-          n * sizeof(jas_iccattr_t));
-    attr = &attrtab->attrs[i];
-    attr->name = name;
-    attr->val = tmpattrval;
-    ++attrtab->numattrs;
-    return 0;
-error:
-    if (tmpattrval)
-        jas_iccattrval_destroy(tmpattrval);
-    return -1;
-}
-
-static int jas_iccattrtab_replace(jas_iccattrtab_t *attrtab, int i,
-  jas_iccuint32_t name, jas_iccattrval_t *val)
-{
-    jas_iccattrval_t *newval;
-    jas_iccattr_t *attr;
-    if (!(newval = jas_iccattrval_clone(val)))
-        goto error;
-    attr = &attrtab->attrs[i];
-    jas_iccattrval_destroy(attr->val);
-    attr->name = name;
-    attr->val = newval;
-    return 0;
-error:
-    return -1;
-}
-
-static void jas_iccattrtab_delete(jas_iccattrtab_t *attrtab, int i)
-{
-    int n;
-    jas_iccattrval_destroy(attrtab->attrs[i].val);
-    if ((n = attrtab->numattrs - i - 1) > 0)
-        memmove(&attrtab->attrs[i], &attrtab->attrs[i + 1],
-          n * sizeof(jas_iccattr_t));
-    --attrtab->numattrs;
-}
-
-static int jas_iccattrtab_get(jas_iccattrtab_t *attrtab, int i,
-  jas_iccattrname_t *name, jas_iccattrval_t **val)
-{
-    jas_iccattr_t *attr;
-    if (i < 0 || i >= attrtab->numattrs)
-        goto error;
-    attr = &attrtab->attrs[i];
-    *name = attr->name;
-    if (!(*val = jas_iccattrval_clone(attr->val)))
-        goto error;
-    return 0;
-error:
-    return -1;
-}
-
-static int jas_iccattrtab_lookup(jas_iccattrtab_t *attrtab,
-  jas_iccuint32_t name)
-{
-    int i;
-    jas_iccattr_t *attr;
-    for (i = 0; i < attrtab->numattrs; ++i) {
-        attr = &attrtab->attrs[i];
-        if (attr->name == name)
-            return i;
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* attribute value class
-\******************************************************************************/
-
-jas_iccattrval_t *jas_iccattrval_create(jas_iccuint32_t type)
-{
-    jas_iccattrval_t *attrval;
-    jas_iccattrvalinfo_t *info;
-
-    if (!(info = jas_iccattrvalinfo_lookup(type)))
-        goto error;
-    if (!(attrval = jas_iccattrval_create0()))
-        goto error;
-    attrval->ops = &info->ops;
-    attrval->type = type;
-    ++attrval->refcnt;
-    memset(&attrval->data, 0, sizeof(attrval->data));
-    return attrval;
-error:
-    return 0;
-}
-
-jas_iccattrval_t *jas_iccattrval_clone(jas_iccattrval_t *attrval)
-{
-    ++attrval->refcnt;
-    return attrval;
-}
-
-void jas_iccattrval_destroy(jas_iccattrval_t *attrval)
-{
-#if 0
-jas_eprintf("refcnt=%d\n", attrval->refcnt);
-#endif
-    if (--attrval->refcnt <= 0) {
-        if (attrval->ops->destroy)
-            (*attrval->ops->destroy)(attrval);
-        jas_free(attrval);
-    }
-}
-
-void jas_iccattrval_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    char buf[8];
-    jas_iccsigtostr(attrval->type, buf);
-    fprintf(out, "refcnt = %d; type = 0x%08x %s\n", attrval->refcnt,
-      attrval->type, jas_iccsigtostr(attrval->type, &buf[0]));
-    if (attrval->ops->dump) {
-        (*attrval->ops->dump)(attrval, out);
-    }
-}
-
-int jas_iccattrval_allowmodify(jas_iccattrval_t **attrvalx)
-{
-    jas_iccattrval_t *newattrval;
-    jas_iccattrval_t *attrval = *attrvalx;
-    newattrval = 0;
-    if (attrval->refcnt > 1) {
-        if (!(newattrval = jas_iccattrval_create0()))
-            goto error;
-        newattrval->ops = attrval->ops;
-        newattrval->type = attrval->type;
-        ++newattrval->refcnt;
-        if (newattrval->ops->copy) {
-            if ((*newattrval->ops->copy)(newattrval, attrval))
-                goto error;
-        } else {
-            memcpy(&newattrval->data, &attrval->data,
-              sizeof(newattrval->data));
-        }
-        *attrvalx = newattrval;
-    }
-    return 0;
-error:
-    if (newattrval) {
-        jas_free(newattrval);
-    }
-    return -1;
-}
-
-static jas_iccattrval_t *jas_iccattrval_create0()
-{
-    jas_iccattrval_t *attrval;
-    if (!(attrval = jas_malloc(sizeof(jas_iccattrval_t))))
-        return 0;
-    memset(attrval, 0, sizeof(jas_iccattrval_t));
-    attrval->refcnt = 0;
-    attrval->ops = 0;
-    attrval->type = 0;
-    return attrval;
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int jas_iccxyz_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int len)
-{
-    if (len != 4 * 3) abort();
-    return jas_iccgetxyz(in, &attrval->data.xyz);
-}
-
-static int jas_iccxyz_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_iccxyz_t *xyz = &attrval->data.xyz;
-    if (jas_iccputuint32(out, xyz->x) ||
-      jas_iccputuint32(out, xyz->y) ||
-      jas_iccputuint32(out, xyz->z))
-        return -1;
-    return 0;
-}
-
-static int jas_iccxyz_getsize(jas_iccattrval_t *attrval)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    attrval = 0;
-
-    return 12;
-}
-
-static void jas_iccxyz_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    jas_iccxyz_t *xyz = &attrval->data.xyz;
-    fprintf(out, "(%f, %f, %f)\n", xyz->x / 65536.0, xyz->y / 65536.0, xyz->z / 65536.0);
-}
-
-/******************************************************************************\
-* attribute table class
-\******************************************************************************/
-
-static void jas_icccurv_destroy(jas_iccattrval_t *attrval)
-{
-    jas_icccurv_t *curv = &attrval->data.curv;
-    if (curv->ents)
-        jas_free(curv->ents);
-}
-
-static int jas_icccurv_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    attrval = 0;
-    othattrval = 0;
-
-    /* Not yet implemented. */
-    abort();
-    return -1;
-}
-
-static int jas_icccurv_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt)
-{
-    jas_icccurv_t *curv = &attrval->data.curv;
-    unsigned int i;
-
-    curv->numents = 0;
-    curv->ents = 0;
-
-    if (jas_iccgetuint32(in, &curv->numents))
-        goto error;
-    if (!(curv->ents = jas_malloc(curv->numents * sizeof(jas_iccuint16_t))))
-        goto error;
-    for (i = 0; i < curv->numents; ++i) {
-        if (jas_iccgetuint16(in, &curv->ents[i]))
-            goto error;
-    }
-
-    if (JAS_CAST(int, 4 + 2 * curv->numents) != cnt)
-        goto error;
-    return 0;
-
-error:
-    jas_icccurv_destroy(attrval);
-    return -1;
-}
-
-static int jas_icccurv_getsize(jas_iccattrval_t *attrval)
-{
-    jas_icccurv_t *curv = &attrval->data.curv;
-    return 4 + 2 * curv->numents;
-}
-
-static int jas_icccurv_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_icccurv_t *curv = &attrval->data.curv;
-    unsigned int i;
-
-    if (jas_iccputuint32(out, curv->numents))
-        goto error;
-    for (i = 0; i < curv->numents; ++i) {
-        if (jas_iccputuint16(out, curv->ents[i]))
-            goto error;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static void jas_icccurv_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    int i;
-    jas_icccurv_t *curv = &attrval->data.curv;
-    fprintf(out, "number of entires = %d\n", curv->numents);
-    if (curv->numents == 1) {
-        fprintf(out, "gamma = %f\n", curv->ents[0] / 256.0);
-    } else {
-        for (i = 0; i < JAS_CAST(int, curv->numents); ++i) {
-            if (i < 3 || i >= JAS_CAST(int, curv->numents) - 3) {
-                fprintf(out, "entry[%d] = %f\n", i, curv->ents[i] / 65535.0);
-            }
-        }
-    }
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static void jas_icctxtdesc_destroy(jas_iccattrval_t *attrval)
-{
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-    if (txtdesc->ascdata)
-        jas_free(txtdesc->ascdata);
-    if (txtdesc->ucdata)
-        jas_free(txtdesc->ucdata);
-}
-
-static int jas_icctxtdesc_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval)
-{
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-
-    /* Avoid compiler warnings about unused parameters. */
-    attrval = 0;
-    othattrval = 0;
-    txtdesc = 0;
-
-    /* Not yet implemented. */
-    abort();
-    return -1;
-}
-
-static int jas_icctxtdesc_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt)
-{
-    int n;
-    int c;
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-    txtdesc->ascdata = 0;
-    txtdesc->ucdata = 0;
-    if (jas_iccgetuint32(in, &txtdesc->asclen))
-        goto error;
-    if (!(txtdesc->ascdata = jas_malloc(txtdesc->asclen)))
-        goto error;
-    if (jas_stream_read(in, txtdesc->ascdata, txtdesc->asclen) !=
-      JAS_CAST(int, txtdesc->asclen))
-        goto error;
-    txtdesc->ascdata[txtdesc->asclen - 1] = '\0';
-    if (jas_iccgetuint32(in, &txtdesc->uclangcode) ||
-      jas_iccgetuint32(in, &txtdesc->uclen))
-        goto error;
-    if (!(txtdesc->ucdata = jas_malloc(txtdesc->uclen * 2)))
-        goto error;
-    if (jas_stream_read(in, txtdesc->ucdata, txtdesc->uclen * 2) !=
-      JAS_CAST(int, txtdesc->uclen * 2))
-        goto error;
-    if (jas_iccgetuint16(in, &txtdesc->sccode))
-        goto error;
-    if ((c = jas_stream_getc(in)) == EOF)
-        goto error;
-    txtdesc->maclen = c;
-    if (jas_stream_read(in, txtdesc->macdata, 67) != 67)
-        goto error;
-    txtdesc->asclen = strlen(txtdesc->ascdata) + 1;
-#define WORKAROUND_BAD_PROFILES
-#ifdef WORKAROUND_BAD_PROFILES
-    n = txtdesc->asclen + txtdesc->uclen * 2 + 15 + 67;
-    if (n > cnt) {
-        return -1;
-    }
-    if (n < cnt) {
-        if (jas_stream_gobble(in, cnt - n) != cnt - n)
-            goto error;
-    }
-#else
-    if (txtdesc->asclen + txtdesc->uclen * 2 + 15 + 67 != cnt)
-        return -1;
-#endif
-    return 0;
-error:
-    jas_icctxtdesc_destroy(attrval);
-    return -1;
-}
-
-static int jas_icctxtdesc_getsize(jas_iccattrval_t *attrval)
-{
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-    return strlen(txtdesc->ascdata) + 1 + txtdesc->uclen * 2 + 15 + 67;
-}
-
-static int jas_icctxtdesc_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-    if (jas_iccputuint32(out, txtdesc->asclen) ||
-      jas_stream_puts(out, txtdesc->ascdata) ||
-      jas_stream_putc(out, 0) == EOF ||
-      jas_iccputuint32(out, txtdesc->uclangcode) ||
-      jas_iccputuint32(out, txtdesc->uclen) ||
-      jas_stream_write(out, txtdesc->ucdata, txtdesc->uclen * 2) != JAS_CAST(int, txtdesc->uclen * 2) ||
-      jas_iccputuint16(out, txtdesc->sccode) ||
-      jas_stream_putc(out, txtdesc->maclen) == EOF)
-        goto error;
-    if (txtdesc->maclen > 0) {
-        if (jas_stream_write(out, txtdesc->macdata, 67) != 67)
-            goto error;
-    } else {
-        if (jas_stream_pad(out, 67, 0) != 67)
-            goto error;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static void jas_icctxtdesc_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    jas_icctxtdesc_t *txtdesc = &attrval->data.txtdesc;
-    fprintf(out, "ascii = \"%s\"\n", txtdesc->ascdata);
-    fprintf(out, "uclangcode = %d; uclen = %d\n", txtdesc->uclangcode,
-      txtdesc->uclen);
-    fprintf(out, "sccode = %d\n", txtdesc->sccode);
-    fprintf(out, "maclen = %d\n", txtdesc->maclen);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static void jas_icctxt_destroy(jas_iccattrval_t *attrval)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    if (txt->string)
-        jas_free(txt->string);
-}
-
-static int jas_icctxt_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    jas_icctxt_t *othtxt = &othattrval->data.txt;
-    if (!(txt->string = jas_strdup(othtxt->string)))
-        return -1;
-    return 0;
-}
-
-static int jas_icctxt_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    txt->string = 0;
-    if (!(txt->string = jas_malloc(cnt)))
-        goto error;
-    if (jas_stream_read(in, txt->string, cnt) != cnt)
-        goto error;
-    txt->string[cnt - 1] = '\0';
-    if (JAS_CAST(int, strlen(txt->string)) + 1 != cnt)
-        goto error;
-    return 0;
-error:
-    if (txt->string)
-        jas_free(txt->string);
-    return -1;
-}
-
-static int jas_icctxt_getsize(jas_iccattrval_t *attrval)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    return strlen(txt->string) + 1;
-}
-
-static int jas_icctxt_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    if (jas_stream_puts(out, txt->string) ||
-      jas_stream_putc(out, 0) == EOF)
-        return -1;
-    return 0;
-}
-
-static void jas_icctxt_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    jas_icctxt_t *txt = &attrval->data.txt;
-    fprintf(out, "string = \"%s\"\n", txt->string);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static void jas_icclut8_destroy(jas_iccattrval_t *attrval)
-{
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    if (lut8->clut)
-        jas_free(lut8->clut);
-    if (lut8->intabs)
-        jas_free(lut8->intabs);
-    if (lut8->intabsbuf)
-        jas_free(lut8->intabsbuf);
-    if (lut8->outtabs)
-        jas_free(lut8->outtabs);
-    if (lut8->outtabsbuf)
-        jas_free(lut8->outtabsbuf);
-}
-
-static int jas_icclut8_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval)
-{
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    /* Avoid compiler warnings about unused parameters. */
-    attrval = 0;
-    othattrval = 0;
-    lut8 = 0;
-    abort();
-    return -1;
-}
-
-static int jas_icclut8_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt)
-{
-    int i;
-    int j;
-    int clutsize;
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    lut8->clut = 0;
-    lut8->intabs = 0;
-    lut8->intabsbuf = 0;
-    lut8->outtabs = 0;
-    lut8->outtabsbuf = 0;
-    if (jas_iccgetuint8(in, &lut8->numinchans) ||
-      jas_iccgetuint8(in, &lut8->numoutchans) ||
-      jas_iccgetuint8(in, &lut8->clutlen) ||
-      jas_stream_getc(in) == EOF)
-        goto error;
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            if (jas_iccgetsint32(in, &lut8->e[i][j]))
-                goto error;
-        }
-    }
-    if (jas_iccgetuint16(in, &lut8->numintabents) ||
-      jas_iccgetuint16(in, &lut8->numouttabents))
-        goto error;
-    clutsize = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-    if (!(lut8->clut = jas_malloc(clutsize * sizeof(jas_iccuint8_t))) ||
-      !(lut8->intabsbuf = jas_malloc(lut8->numinchans *
-      lut8->numintabents * sizeof(jas_iccuint8_t))) ||
-      !(lut8->intabs = jas_malloc(lut8->numinchans *
-      sizeof(jas_iccuint8_t *))))
-        goto error;
-    for (i = 0; i < lut8->numinchans; ++i)
-        lut8->intabs[i] = &lut8->intabsbuf[i * lut8->numintabents];
-    if (!(lut8->outtabsbuf = jas_malloc(lut8->numoutchans *
-      lut8->numouttabents * sizeof(jas_iccuint8_t))) ||
-      !(lut8->outtabs = jas_malloc(lut8->numoutchans *
-      sizeof(jas_iccuint8_t *))))
-        goto error;
-    for (i = 0; i < lut8->numoutchans; ++i)
-        lut8->outtabs[i] = &lut8->outtabsbuf[i * lut8->numouttabents];
-    for (i = 0; i < lut8->numinchans; ++i) {
-        for (j = 0; j < JAS_CAST(int, lut8->numintabents); ++j) {
-            if (jas_iccgetuint8(in, &lut8->intabs[i][j]))
-                goto error;
-        }
-    }
-    for (i = 0; i < lut8->numoutchans; ++i) {
-        for (j = 0; j < JAS_CAST(int, lut8->numouttabents); ++j) {
-            if (jas_iccgetuint8(in, &lut8->outtabs[i][j]))
-                goto error;
-        }
-    }
-    for (i = 0; i < clutsize; ++i) {
-        if (jas_iccgetuint8(in, &lut8->clut[i]))
-            goto error;
-    }
-    if (JAS_CAST(int, 44 + lut8->numinchans * lut8->numintabents +
-      lut8->numoutchans * lut8->numouttabents +
-      jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans) !=
-      cnt)
-        goto error;
-    return 0;
-error:
-    jas_icclut8_destroy(attrval);
-    return -1;
-}
-
-static int jas_icclut8_getsize(jas_iccattrval_t *attrval)
-{
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    return 44 + lut8->numinchans * lut8->numintabents +
-      lut8->numoutchans * lut8->numouttabents +
-      jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-}
-
-static int jas_icclut8_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    int i;
-    int j;
-    int n;
-    lut8->clut = 0;
-    lut8->intabs = 0;
-    lut8->intabsbuf = 0;
-    lut8->outtabs = 0;
-    lut8->outtabsbuf = 0;
-    if (jas_stream_putc(out, lut8->numinchans) == EOF ||
-      jas_stream_putc(out, lut8->numoutchans) == EOF ||
-      jas_stream_putc(out, lut8->clutlen) == EOF ||
-      jas_stream_putc(out, 0) == EOF)
-        goto error;
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            if (jas_iccputsint32(out, lut8->e[i][j]))
-                goto error;
-        }
-    }
-    if (jas_iccputuint16(out, lut8->numintabents) ||
-      jas_iccputuint16(out, lut8->numouttabents))
-        goto error;
-    n = lut8->numinchans * lut8->numintabents;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint8(out, lut8->intabsbuf[i]))
-            goto error;
-    }
-    n = lut8->numoutchans * lut8->numouttabents;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint8(out, lut8->outtabsbuf[i]))
-            goto error;
-    }
-    n = jas_iccpowi(lut8->clutlen, lut8->numinchans) * lut8->numoutchans;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint8(out, lut8->clut[i]))
-            goto error;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static void jas_icclut8_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    jas_icclut8_t *lut8 = &attrval->data.lut8;
-    int i;
-    int j;
-    fprintf(out, "numinchans=%d, numoutchans=%d, clutlen=%d\n",
-      lut8->numinchans, lut8->numoutchans, lut8->clutlen);
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            fprintf(out, "e[%d][%d]=%f ", i, j, lut8->e[i][j] / 65536.0);
-        }
-        fprintf(out, "\n");
-    }
-    fprintf(out, "numintabents=%d, numouttabents=%d\n",
-      lut8->numintabents, lut8->numouttabents);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static void jas_icclut16_destroy(jas_iccattrval_t *attrval)
-{
-    jas_icclut16_t *lut16 = &attrval->data.lut16;
-    if (lut16->clut)
-        jas_free(lut16->clut);
-    if (lut16->intabs)
-        jas_free(lut16->intabs);
-    if (lut16->intabsbuf)
-        jas_free(lut16->intabsbuf);
-    if (lut16->outtabs)
-        jas_free(lut16->outtabs);
-    if (lut16->outtabsbuf)
-        jas_free(lut16->outtabsbuf);
-}
-
-static int jas_icclut16_copy(jas_iccattrval_t *attrval,
-  jas_iccattrval_t *othattrval)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    attrval = 0;
-    othattrval = 0;
-    /* Not yet implemented. */
-    abort();
-    return -1;
-}
-
-static int jas_icclut16_input(jas_iccattrval_t *attrval, jas_stream_t *in,
-  int cnt)
-{
-    int i;
-    int j;
-    int clutsize;
-    jas_icclut16_t *lut16 = &attrval->data.lut16;
-    lut16->clut = 0;
-    lut16->intabs = 0;
-    lut16->intabsbuf = 0;
-    lut16->outtabs = 0;
-    lut16->outtabsbuf = 0;
-    if (jas_iccgetuint8(in, &lut16->numinchans) ||
-      jas_iccgetuint8(in, &lut16->numoutchans) ||
-      jas_iccgetuint8(in, &lut16->clutlen) ||
-      jas_stream_getc(in) == EOF)
-        goto error;
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            if (jas_iccgetsint32(in, &lut16->e[i][j]))
-                goto error;
-        }
-    }
-    if (jas_iccgetuint16(in, &lut16->numintabents) ||
-      jas_iccgetuint16(in, &lut16->numouttabents))
-        goto error;
-    clutsize = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-    if (!(lut16->clut = jas_malloc(clutsize * sizeof(jas_iccuint16_t))) ||
-      !(lut16->intabsbuf = jas_malloc(lut16->numinchans *
-      lut16->numintabents * sizeof(jas_iccuint16_t))) ||
-      !(lut16->intabs = jas_malloc(lut16->numinchans *
-      sizeof(jas_iccuint16_t *))))
-        goto error;
-    for (i = 0; i < lut16->numinchans; ++i)
-        lut16->intabs[i] = &lut16->intabsbuf[i * lut16->numintabents];
-    if (!(lut16->outtabsbuf = jas_malloc(lut16->numoutchans *
-      lut16->numouttabents * sizeof(jas_iccuint16_t))) ||
-      !(lut16->outtabs = jas_malloc(lut16->numoutchans *
-      sizeof(jas_iccuint16_t *))))
-        goto error;
-    for (i = 0; i < lut16->numoutchans; ++i)
-        lut16->outtabs[i] = &lut16->outtabsbuf[i * lut16->numouttabents];
-    for (i = 0; i < lut16->numinchans; ++i) {
-        for (j = 0; j < JAS_CAST(int, lut16->numintabents); ++j) {
-            if (jas_iccgetuint16(in, &lut16->intabs[i][j]))
-                goto error;
-        }
-    }
-    for (i = 0; i < lut16->numoutchans; ++i) {
-        for (j = 0; j < JAS_CAST(int, lut16->numouttabents); ++j) {
-            if (jas_iccgetuint16(in, &lut16->outtabs[i][j]))
-                goto error;
-        }
-    }
-    for (i = 0; i < clutsize; ++i) {
-        if (jas_iccgetuint16(in, &lut16->clut[i]))
-            goto error;
-    }
-    if (JAS_CAST(int, 44 + 2 * (lut16->numinchans * lut16->numintabents +
-          lut16->numoutchans * lut16->numouttabents +
-          jas_iccpowi(lut16->clutlen, lut16->numinchans) *
-      lut16->numoutchans)) != cnt)
-        goto error;
-    return 0;
-error:
-    jas_icclut16_destroy(attrval);
-    return -1;
-}
-
-static int jas_icclut16_getsize(jas_iccattrval_t *attrval)
-{
-    jas_icclut16_t *lut16 = &attrval->data.lut16;
-    return 44 + 2 * (lut16->numinchans * lut16->numintabents +
-      lut16->numoutchans * lut16->numouttabents +
-      jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans);
-}
-
-static int jas_icclut16_output(jas_iccattrval_t *attrval, jas_stream_t *out)
-{
-    jas_icclut16_t *lut16 = &attrval->data.lut16;
-    int i;
-    int j;
-    int n;
-    if (jas_stream_putc(out, lut16->numinchans) == EOF ||
-      jas_stream_putc(out, lut16->numoutchans) == EOF ||
-      jas_stream_putc(out, lut16->clutlen) == EOF ||
-      jas_stream_putc(out, 0) == EOF)
-        goto error;
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            if (jas_iccputsint32(out, lut16->e[i][j]))
-                goto error;
-        }
-    }
-    if (jas_iccputuint16(out, lut16->numintabents) ||
-      jas_iccputuint16(out, lut16->numouttabents))
-        goto error;
-    n = lut16->numinchans * lut16->numintabents;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint16(out, lut16->intabsbuf[i]))
-            goto error;
-    }
-    n = lut16->numoutchans * lut16->numouttabents;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint16(out, lut16->outtabsbuf[i]))
-            goto error;
-    }
-    n = jas_iccpowi(lut16->clutlen, lut16->numinchans) * lut16->numoutchans;
-    for (i = 0; i < n; ++i) {
-        if (jas_iccputuint16(out, lut16->clut[i]))
-            goto error;
-    }
-    return 0;
-error:
-    return -1;
-}
-
-static void jas_icclut16_dump(jas_iccattrval_t *attrval, FILE *out)
-{
-    jas_icclut16_t *lut16 = &attrval->data.lut16;
-    int i;
-    int j;
-    fprintf(out, "numinchans=%d, numoutchans=%d, clutlen=%d\n",
-      lut16->numinchans, lut16->numoutchans, lut16->clutlen);
-    for (i = 0; i < 3; ++i) {
-        for (j = 0; j < 3; ++j) {
-            fprintf(out, "e[%d][%d]=%f ", i, j, lut16->e[i][j] / 65536.0);
-        }
-        fprintf(out, "\n");
-    }
-    fprintf(out, "numintabents=%d, numouttabents=%d\n",
-      lut16->numintabents, lut16->numouttabents);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int jas_iccgetuint(jas_stream_t *in, int n, ulonglong *val)
-{
-    int i;
-    int c;
-    ulonglong v;
-    v = 0;
-    for (i = n; i > 0; --i) {
-        if ((c = jas_stream_getc(in)) == EOF)
-            return -1;
-        v = (v << 8) | c;
-    }
-    *val = v;
-    return 0;
-}
-
-static int jas_iccgetuint8(jas_stream_t *in, jas_iccuint8_t *val)
-{
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF)
-        return -1;
-    *val = c;
-    return 0;
-}
-
-static int jas_iccgetuint16(jas_stream_t *in, jas_iccuint16_t *val)
-{
-    ulonglong tmp;
-    if (jas_iccgetuint(in, 2, &tmp))
-        return -1;
-    *val = tmp;
-    return 0;
-}
-
-static int jas_iccgetsint32(jas_stream_t *in, jas_iccsint32_t *val)
-{
-    ulonglong tmp;
-    if (jas_iccgetuint(in, 4, &tmp))
-        return -1;
-    *val = (tmp & 0x80000000) ? (-JAS_CAST(longlong, (((~tmp) &
-      0x7fffffff) + 1))) : JAS_CAST(longlong, tmp);
-    return 0;
-}
-
-static int jas_iccgetuint32(jas_stream_t *in, jas_iccuint32_t *val)
-{
-    ulonglong tmp;
-    if (jas_iccgetuint(in, 4, &tmp))
-        return -1;
-    *val = tmp;
-    return 0;
-}
-
-static int jas_iccgetuint64(jas_stream_t *in, jas_iccuint64_t *val)
-{
-    ulonglong tmp;
-    if (jas_iccgetuint(in, 8, &tmp))
-        return -1;
-    *val = tmp;
-    return 0;
-}
-
-static int jas_iccputuint(jas_stream_t *out, int n, ulonglong val)
-{
-    int i;
-    int c;
-    for (i = n; i > 0; --i) {
-        c = (val >> (8 * (i - 1))) & 0xff;
-        if (jas_stream_putc(out, c) == EOF)
-            return -1;
-    }
-    return 0;
-}
-
-static int jas_iccputsint(jas_stream_t *out, int n, longlong val)
-{
-    ulonglong tmp;
-    tmp = (val < 0) ? (abort(), 0) : val;
-    return jas_iccputuint(out, n, tmp);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static char *jas_iccsigtostr(int sig, char *buf)
-{
-    int n;
-    int c;
-    char *bufptr;
-    bufptr = buf;
-    for (n = 4; n > 0; --n) {
-        c = (sig >> 24) & 0xff;
-        if (isalpha(c) || isdigit(c)) {
-            *bufptr++ = c;
-        }
-        sig <<= 8;
-    }
-    *bufptr = '\0';
-    return buf;
-}
-
-static long jas_iccpadtomult(long x, long y)
-{
-    return ((x + y - 1) / y) * y;
-}
-
-static long jas_iccpowi(int x, int n)
-{
-    long y;
-    y = 1;
-    while (--n >= 0)
-        y *= x;
-    return y;
-}
-
-
-jas_iccprof_t *jas_iccprof_createfrombuf(uchar *buf, int len)
-{
-    jas_stream_t *in;
-    jas_iccprof_t *prof;
-    if (!(in = jas_stream_memopen(JAS_CAST(char *, buf), len)))
-        goto error;
-    if (!(prof = jas_iccprof_load(in)))
-        goto error;
-    jas_stream_close(in);
-    return prof;
-error:
-    return 0;
-}
-
-jas_iccprof_t *jas_iccprof_createfromclrspc(int clrspc)
-{
-    jas_iccprof_t *prof;
-    switch (clrspc) {
-    case JAS_CLRSPC_SRGB:
-        prof = jas_iccprof_createfrombuf(jas_iccprofdata_srgb,
-          jas_iccprofdata_srgblen);
-        break;
-    case JAS_CLRSPC_SGRAY:
-        prof = jas_iccprof_createfrombuf(jas_iccprofdata_sgray,
-          jas_iccprofdata_sgraylen);
-        break;
-    default:
-        prof = 0;
-        break;
-    }
-    return prof;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_iccdata.c b/src/3rdparty/jasper/src/libjasper/base/jas_iccdata.c
deleted file mode 100644
index 5647156..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_iccdata.c
+++ /dev/null
@@ -1,517 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_types.h>
-
-uchar jas_iccprofdata_srgb[] =
-{
-    0x00, 0x00, 0x0c, 0x48, 0x4c, 0x69, 0x6e, 0x6f,
-    0x02, 0x10, 0x00, 0x00, 0x6d, 0x6e, 0x74, 0x72,
-    0x52, 0x47, 0x42, 0x20, 0x58, 0x59, 0x5a, 0x20,
-    0x07, 0xce, 0x00, 0x02, 0x00, 0x09, 0x00, 0x06,
-    0x00, 0x31, 0x00, 0x00, 0x61, 0x63, 0x73, 0x70,
-    0x4d, 0x53, 0x46, 0x54, 0x00, 0x00, 0x00, 0x00,
-    0x49, 0x45, 0x43, 0x20, 0x73, 0x52, 0x47, 0x42,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d,
-    0x48, 0x50, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x11, 0x63, 0x70, 0x72, 0x74,
-    0x00, 0x00, 0x01, 0x50, 0x00, 0x00, 0x00, 0x33,
-    0x64, 0x65, 0x73, 0x63, 0x00, 0x00, 0x01, 0x84,
-    0x00, 0x00, 0x00, 0x6c, 0x77, 0x74, 0x70, 0x74,
-    0x00, 0x00, 0x01, 0xf0, 0x00, 0x00, 0x00, 0x14,
-    0x62, 0x6b, 0x70, 0x74, 0x00, 0x00, 0x02, 0x04,
-    0x00, 0x00, 0x00, 0x14, 0x72, 0x58, 0x59, 0x5a,
-    0x00, 0x00, 0x02, 0x18, 0x00, 0x00, 0x00, 0x14,
-    0x67, 0x58, 0x59, 0x5a, 0x00, 0x00, 0x02, 0x2c,
-    0x00, 0x00, 0x00, 0x14, 0x62, 0x58, 0x59, 0x5a,
-    0x00, 0x00, 0x02, 0x40, 0x00, 0x00, 0x00, 0x14,
-    0x64, 0x6d, 0x6e, 0x64, 0x00, 0x00, 0x02, 0x54,
-    0x00, 0x00, 0x00, 0x70, 0x64, 0x6d, 0x64, 0x64,
-    0x00, 0x00, 0x02, 0xc4, 0x00, 0x00, 0x00, 0x88,
-    0x76, 0x75, 0x65, 0x64, 0x00, 0x00, 0x03, 0x4c,
-    0x00, 0x00, 0x00, 0x86, 0x76, 0x69, 0x65, 0x77,
-    0x00, 0x00, 0x03, 0xd4, 0x00, 0x00, 0x00, 0x24,
-    0x6c, 0x75, 0x6d, 0x69, 0x00, 0x00, 0x03, 0xf8,
-    0x00, 0x00, 0x00, 0x14, 0x6d, 0x65, 0x61, 0x73,
-    0x00, 0x00, 0x04, 0x0c, 0x00, 0x00, 0x00, 0x24,
-    0x74, 0x65, 0x63, 0x68, 0x00, 0x00, 0x04, 0x30,
-    0x00, 0x00, 0x00, 0x0c, 0x72, 0x54, 0x52, 0x43,
-    0x00, 0x00, 0x04, 0x3c, 0x00, 0x00, 0x08, 0x0c,
-    0x67, 0x54, 0x52, 0x43, 0x00, 0x00, 0x04, 0x3c,
-    0x00, 0x00, 0x08, 0x0c, 0x62, 0x54, 0x52, 0x43,
-    0x00, 0x00, 0x04, 0x3c, 0x00, 0x00, 0x08, 0x0c,
-    0x74, 0x65, 0x78, 0x74, 0x00, 0x00, 0x00, 0x00,
-    0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68,
-    0x74, 0x20, 0x28, 0x63, 0x29, 0x20, 0x31, 0x39,
-    0x39, 0x38, 0x20, 0x48, 0x65, 0x77, 0x6c, 0x65,
-    0x74, 0x74, 0x2d, 0x50, 0x61, 0x63, 0x6b, 0x61,
-    0x72, 0x64, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x61,
-    0x6e, 0x79, 0x00, 0x00, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,
-    0x73, 0x52, 0x47, 0x42, 0x20, 0x49, 0x45, 0x43,
-    0x36, 0x31, 0x39, 0x36, 0x36, 0x2d, 0x32, 0x2e,
-    0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x12, 0x73, 0x52, 0x47,
-    0x42, 0x20, 0x49, 0x45, 0x43, 0x36, 0x31, 0x39,
-    0x36, 0x36, 0x2d, 0x32, 0x2e, 0x31, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xf3, 0x51, 0x00, 0x01, 0x00, 0x00,
-    0x00, 0x01, 0x16, 0xcc, 0x58, 0x59, 0x5a, 0x20,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x6f, 0xa2, 0x00, 0x00, 0x38, 0xf5,
-    0x00, 0x00, 0x03, 0x90, 0x58, 0x59, 0x5a, 0x20,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x62, 0x99,
-    0x00, 0x00, 0xb7, 0x85, 0x00, 0x00, 0x18, 0xda,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x24, 0xa0, 0x00, 0x00, 0x0f, 0x84,
-    0x00, 0x00, 0xb6, 0xcf, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16,
-    0x49, 0x45, 0x43, 0x20, 0x68, 0x74, 0x74, 0x70,
-    0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e, 0x69,
-    0x65, 0x63, 0x2e, 0x63, 0x68, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x16, 0x49, 0x45, 0x43, 0x20, 0x68, 0x74, 0x74,
-    0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, 0x2e,
-    0x69, 0x65, 0x63, 0x2e, 0x63, 0x68, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2e,
-    0x49, 0x45, 0x43, 0x20, 0x36, 0x31, 0x39, 0x36,
-    0x36, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x44, 0x65,
-    0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x52, 0x47,
-    0x42, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x75, 0x72,
-    0x20, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x2d,
-    0x20, 0x73, 0x52, 0x47, 0x42, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x2e, 0x49, 0x45, 0x43, 0x20, 0x36, 0x31, 0x39,
-    0x36, 0x36, 0x2d, 0x32, 0x2e, 0x31, 0x20, 0x44,
-    0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x20, 0x52,
-    0x47, 0x42, 0x20, 0x63, 0x6f, 0x6c, 0x6f, 0x75,
-    0x72, 0x20, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20,
-    0x2d, 0x20, 0x73, 0x52, 0x47, 0x42, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c,
-    0x52, 0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63,
-    0x65, 0x20, 0x56, 0x69, 0x65, 0x77, 0x69, 0x6e,
-    0x67, 0x20, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74,
-    0x69, 0x6f, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x49,
-    0x45, 0x43, 0x36, 0x31, 0x39, 0x36, 0x36, 0x2d,
-    0x32, 0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c, 0x52,
-    0x65, 0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65,
-    0x20, 0x56, 0x69, 0x65, 0x77, 0x69, 0x6e, 0x67,
-    0x20, 0x43, 0x6f, 0x6e, 0x64, 0x69, 0x74, 0x69,
-    0x6f, 0x6e, 0x20, 0x69, 0x6e, 0x20, 0x49, 0x45,
-    0x43, 0x36, 0x31, 0x39, 0x36, 0x36, 0x2d, 0x32,
-    0x2e, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x76, 0x69, 0x65, 0x77,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x13, 0xa4, 0xfe,
-    0x00, 0x14, 0x5f, 0x2e, 0x00, 0x10, 0xcf, 0x14,
-    0x00, 0x03, 0xed, 0xcc, 0x00, 0x04, 0x13, 0x0b,
-    0x00, 0x03, 0x5c, 0x9e, 0x00, 0x00, 0x00, 0x01,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x4c, 0x09, 0x56, 0x00, 0x50, 0x00, 0x00,
-    0x00, 0x57, 0x1f, 0xe7, 0x6d, 0x65, 0x61, 0x73,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x02, 0x8f, 0x00, 0x00, 0x00, 0x02,
-    0x73, 0x69, 0x67, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x43, 0x52, 0x54, 0x20, 0x63, 0x75, 0x72, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00,
-    0x00, 0x00, 0x00, 0x05, 0x00, 0x0a, 0x00, 0x0f,
-    0x00, 0x14, 0x00, 0x19, 0x00, 0x1e, 0x00, 0x23,
-    0x00, 0x28, 0x00, 0x2d, 0x00, 0x32, 0x00, 0x37,
-    0x00, 0x3b, 0x00, 0x40, 0x00, 0x45, 0x00, 0x4a,
-    0x00, 0x4f, 0x00, 0x54, 0x00, 0x59, 0x00, 0x5e,
-    0x00, 0x63, 0x00, 0x68, 0x00, 0x6d, 0x00, 0x72,
-    0x00, 0x77, 0x00, 0x7c, 0x00, 0x81, 0x00, 0x86,
-    0x00, 0x8b, 0x00, 0x90, 0x00, 0x95, 0x00, 0x9a,
-    0x00, 0x9f, 0x00, 0xa4, 0x00, 0xa9, 0x00, 0xae,
-    0x00, 0xb2, 0x00, 0xb7, 0x00, 0xbc, 0x00, 0xc1,
-    0x00, 0xc6, 0x00, 0xcb, 0x00, 0xd0, 0x00, 0xd5,
-    0x00, 0xdb, 0x00, 0xe0, 0x00, 0xe5, 0x00, 0xeb,
-    0x00, 0xf0, 0x00, 0xf6, 0x00, 0xfb, 0x01, 0x01,
-    0x01, 0x07, 0x01, 0x0d, 0x01, 0x13, 0x01, 0x19,
-    0x01, 0x1f, 0x01, 0x25, 0x01, 0x2b, 0x01, 0x32,
-    0x01, 0x38, 0x01, 0x3e, 0x01, 0x45, 0x01, 0x4c,
-    0x01, 0x52, 0x01, 0x59, 0x01, 0x60, 0x01, 0x67,
-    0x01, 0x6e, 0x01, 0x75, 0x01, 0x7c, 0x01, 0x83,
-    0x01, 0x8b, 0x01, 0x92, 0x01, 0x9a, 0x01, 0xa1,
-    0x01, 0xa9, 0x01, 0xb1, 0x01, 0xb9, 0x01, 0xc1,
-    0x01, 0xc9, 0x01, 0xd1, 0x01, 0xd9, 0x01, 0xe1,
-    0x01, 0xe9, 0x01, 0xf2, 0x01, 0xfa, 0x02, 0x03,
-    0x02, 0x0c, 0x02, 0x14, 0x02, 0x1d, 0x02, 0x26,
-    0x02, 0x2f, 0x02, 0x38, 0x02, 0x41, 0x02, 0x4b,
-    0x02, 0x54, 0x02, 0x5d, 0x02, 0x67, 0x02, 0x71,
-    0x02, 0x7a, 0x02, 0x84, 0x02, 0x8e, 0x02, 0x98,
-    0x02, 0xa2, 0x02, 0xac, 0x02, 0xb6, 0x02, 0xc1,
-    0x02, 0xcb, 0x02, 0xd5, 0x02, 0xe0, 0x02, 0xeb,
-    0x02, 0xf5, 0x03, 0x00, 0x03, 0x0b, 0x03, 0x16,
-    0x03, 0x21, 0x03, 0x2d, 0x03, 0x38, 0x03, 0x43,
-    0x03, 0x4f, 0x03, 0x5a, 0x03, 0x66, 0x03, 0x72,
-    0x03, 0x7e, 0x03, 0x8a, 0x03, 0x96, 0x03, 0xa2,
-    0x03, 0xae, 0x03, 0xba, 0x03, 0xc7, 0x03, 0xd3,
-    0x03, 0xe0, 0x03, 0xec, 0x03, 0xf9, 0x04, 0x06,
-    0x04, 0x13, 0x04, 0x20, 0x04, 0x2d, 0x04, 0x3b,
-    0x04, 0x48, 0x04, 0x55, 0x04, 0x63, 0x04, 0x71,
-    0x04, 0x7e, 0x04, 0x8c, 0x04, 0x9a, 0x04, 0xa8,
-    0x04, 0xb6, 0x04, 0xc4, 0x04, 0xd3, 0x04, 0xe1,
-    0x04, 0xf0, 0x04, 0xfe, 0x05, 0x0d, 0x05, 0x1c,
-    0x05, 0x2b, 0x05, 0x3a, 0x05, 0x49, 0x05, 0x58,
-    0x05, 0x67, 0x05, 0x77, 0x05, 0x86, 0x05, 0x96,
-    0x05, 0xa6, 0x05, 0xb5, 0x05, 0xc5, 0x05, 0xd5,
-    0x05, 0xe5, 0x05, 0xf6, 0x06, 0x06, 0x06, 0x16,
-    0x06, 0x27, 0x06, 0x37, 0x06, 0x48, 0x06, 0x59,
-    0x06, 0x6a, 0x06, 0x7b, 0x06, 0x8c, 0x06, 0x9d,
-    0x06, 0xaf, 0x06, 0xc0, 0x06, 0xd1, 0x06, 0xe3,
-    0x06, 0xf5, 0x07, 0x07, 0x07, 0x19, 0x07, 0x2b,
-    0x07, 0x3d, 0x07, 0x4f, 0x07, 0x61, 0x07, 0x74,
-    0x07, 0x86, 0x07, 0x99, 0x07, 0xac, 0x07, 0xbf,
-    0x07, 0xd2, 0x07, 0xe5, 0x07, 0xf8, 0x08, 0x0b,
-    0x08, 0x1f, 0x08, 0x32, 0x08, 0x46, 0x08, 0x5a,
-    0x08, 0x6e, 0x08, 0x82, 0x08, 0x96, 0x08, 0xaa,
-    0x08, 0xbe, 0x08, 0xd2, 0x08, 0xe7, 0x08, 0xfb,
-    0x09, 0x10, 0x09, 0x25, 0x09, 0x3a, 0x09, 0x4f,
-    0x09, 0x64, 0x09, 0x79, 0x09, 0x8f, 0x09, 0xa4,
-    0x09, 0xba, 0x09, 0xcf, 0x09, 0xe5, 0x09, 0xfb,
-    0x0a, 0x11, 0x0a, 0x27, 0x0a, 0x3d, 0x0a, 0x54,
-    0x0a, 0x6a, 0x0a, 0x81, 0x0a, 0x98, 0x0a, 0xae,
-    0x0a, 0xc5, 0x0a, 0xdc, 0x0a, 0xf3, 0x0b, 0x0b,
-    0x0b, 0x22, 0x0b, 0x39, 0x0b, 0x51, 0x0b, 0x69,
-    0x0b, 0x80, 0x0b, 0x98, 0x0b, 0xb0, 0x0b, 0xc8,
-    0x0b, 0xe1, 0x0b, 0xf9, 0x0c, 0x12, 0x0c, 0x2a,
-    0x0c, 0x43, 0x0c, 0x5c, 0x0c, 0x75, 0x0c, 0x8e,
-    0x0c, 0xa7, 0x0c, 0xc0, 0x0c, 0xd9, 0x0c, 0xf3,
-    0x0d, 0x0d, 0x0d, 0x26, 0x0d, 0x40, 0x0d, 0x5a,
-    0x0d, 0x74, 0x0d, 0x8e, 0x0d, 0xa9, 0x0d, 0xc3,
-    0x0d, 0xde, 0x0d, 0xf8, 0x0e, 0x13, 0x0e, 0x2e,
-    0x0e, 0x49, 0x0e, 0x64, 0x0e, 0x7f, 0x0e, 0x9b,
-    0x0e, 0xb6, 0x0e, 0xd2, 0x0e, 0xee, 0x0f, 0x09,
-    0x0f, 0x25, 0x0f, 0x41, 0x0f, 0x5e, 0x0f, 0x7a,
-    0x0f, 0x96, 0x0f, 0xb3, 0x0f, 0xcf, 0x0f, 0xec,
-    0x10, 0x09, 0x10, 0x26, 0x10, 0x43, 0x10, 0x61,
-    0x10, 0x7e, 0x10, 0x9b, 0x10, 0xb9, 0x10, 0xd7,
-    0x10, 0xf5, 0x11, 0x13, 0x11, 0x31, 0x11, 0x4f,
-    0x11, 0x6d, 0x11, 0x8c, 0x11, 0xaa, 0x11, 0xc9,
-    0x11, 0xe8, 0x12, 0x07, 0x12, 0x26, 0x12, 0x45,
-    0x12, 0x64, 0x12, 0x84, 0x12, 0xa3, 0x12, 0xc3,
-    0x12, 0xe3, 0x13, 0x03, 0x13, 0x23, 0x13, 0x43,
-    0x13, 0x63, 0x13, 0x83, 0x13, 0xa4, 0x13, 0xc5,
-    0x13, 0xe5, 0x14, 0x06, 0x14, 0x27, 0x14, 0x49,
-    0x14, 0x6a, 0x14, 0x8b, 0x14, 0xad, 0x14, 0xce,
-    0x14, 0xf0, 0x15, 0x12, 0x15, 0x34, 0x15, 0x56,
-    0x15, 0x78, 0x15, 0x9b, 0x15, 0xbd, 0x15, 0xe0,
-    0x16, 0x03, 0x16, 0x26, 0x16, 0x49, 0x16, 0x6c,
-    0x16, 0x8f, 0x16, 0xb2, 0x16, 0xd6, 0x16, 0xfa,
-    0x17, 0x1d, 0x17, 0x41, 0x17, 0x65, 0x17, 0x89,
-    0x17, 0xae, 0x17, 0xd2, 0x17, 0xf7, 0x18, 0x1b,
-    0x18, 0x40, 0x18, 0x65, 0x18, 0x8a, 0x18, 0xaf,
-    0x18, 0xd5, 0x18, 0xfa, 0x19, 0x20, 0x19, 0x45,
-    0x19, 0x6b, 0x19, 0x91, 0x19, 0xb7, 0x19, 0xdd,
-    0x1a, 0x04, 0x1a, 0x2a, 0x1a, 0x51, 0x1a, 0x77,
-    0x1a, 0x9e, 0x1a, 0xc5, 0x1a, 0xec, 0x1b, 0x14,
-    0x1b, 0x3b, 0x1b, 0x63, 0x1b, 0x8a, 0x1b, 0xb2,
-    0x1b, 0xda, 0x1c, 0x02, 0x1c, 0x2a, 0x1c, 0x52,
-    0x1c, 0x7b, 0x1c, 0xa3, 0x1c, 0xcc, 0x1c, 0xf5,
-    0x1d, 0x1e, 0x1d, 0x47, 0x1d, 0x70, 0x1d, 0x99,
-    0x1d, 0xc3, 0x1d, 0xec, 0x1e, 0x16, 0x1e, 0x40,
-    0x1e, 0x6a, 0x1e, 0x94, 0x1e, 0xbe, 0x1e, 0xe9,
-    0x1f, 0x13, 0x1f, 0x3e, 0x1f, 0x69, 0x1f, 0x94,
-    0x1f, 0xbf, 0x1f, 0xea, 0x20, 0x15, 0x20, 0x41,
-    0x20, 0x6c, 0x20, 0x98, 0x20, 0xc4, 0x20, 0xf0,
-    0x21, 0x1c, 0x21, 0x48, 0x21, 0x75, 0x21, 0xa1,
-    0x21, 0xce, 0x21, 0xfb, 0x22, 0x27, 0x22, 0x55,
-    0x22, 0x82, 0x22, 0xaf, 0x22, 0xdd, 0x23, 0x0a,
-    0x23, 0x38, 0x23, 0x66, 0x23, 0x94, 0x23, 0xc2,
-    0x23, 0xf0, 0x24, 0x1f, 0x24, 0x4d, 0x24, 0x7c,
-    0x24, 0xab, 0x24, 0xda, 0x25, 0x09, 0x25, 0x38,
-    0x25, 0x68, 0x25, 0x97, 0x25, 0xc7, 0x25, 0xf7,
-    0x26, 0x27, 0x26, 0x57, 0x26, 0x87, 0x26, 0xb7,
-    0x26, 0xe8, 0x27, 0x18, 0x27, 0x49, 0x27, 0x7a,
-    0x27, 0xab, 0x27, 0xdc, 0x28, 0x0d, 0x28, 0x3f,
-    0x28, 0x71, 0x28, 0xa2, 0x28, 0xd4, 0x29, 0x06,
-    0x29, 0x38, 0x29, 0x6b, 0x29, 0x9d, 0x29, 0xd0,
-    0x2a, 0x02, 0x2a, 0x35, 0x2a, 0x68, 0x2a, 0x9b,
-    0x2a, 0xcf, 0x2b, 0x02, 0x2b, 0x36, 0x2b, 0x69,
-    0x2b, 0x9d, 0x2b, 0xd1, 0x2c, 0x05, 0x2c, 0x39,
-    0x2c, 0x6e, 0x2c, 0xa2, 0x2c, 0xd7, 0x2d, 0x0c,
-    0x2d, 0x41, 0x2d, 0x76, 0x2d, 0xab, 0x2d, 0xe1,
-    0x2e, 0x16, 0x2e, 0x4c, 0x2e, 0x82, 0x2e, 0xb7,
-    0x2e, 0xee, 0x2f, 0x24, 0x2f, 0x5a, 0x2f, 0x91,
-    0x2f, 0xc7, 0x2f, 0xfe, 0x30, 0x35, 0x30, 0x6c,
-    0x30, 0xa4, 0x30, 0xdb, 0x31, 0x12, 0x31, 0x4a,
-    0x31, 0x82, 0x31, 0xba, 0x31, 0xf2, 0x32, 0x2a,
-    0x32, 0x63, 0x32, 0x9b, 0x32, 0xd4, 0x33, 0x0d,
-    0x33, 0x46, 0x33, 0x7f, 0x33, 0xb8, 0x33, 0xf1,
-    0x34, 0x2b, 0x34, 0x65, 0x34, 0x9e, 0x34, 0xd8,
-    0x35, 0x13, 0x35, 0x4d, 0x35, 0x87, 0x35, 0xc2,
-    0x35, 0xfd, 0x36, 0x37, 0x36, 0x72, 0x36, 0xae,
-    0x36, 0xe9, 0x37, 0x24, 0x37, 0x60, 0x37, 0x9c,
-    0x37, 0xd7, 0x38, 0x14, 0x38, 0x50, 0x38, 0x8c,
-    0x38, 0xc8, 0x39, 0x05, 0x39, 0x42, 0x39, 0x7f,
-    0x39, 0xbc, 0x39, 0xf9, 0x3a, 0x36, 0x3a, 0x74,
-    0x3a, 0xb2, 0x3a, 0xef, 0x3b, 0x2d, 0x3b, 0x6b,
-    0x3b, 0xaa, 0x3b, 0xe8, 0x3c, 0x27, 0x3c, 0x65,
-    0x3c, 0xa4, 0x3c, 0xe3, 0x3d, 0x22, 0x3d, 0x61,
-    0x3d, 0xa1, 0x3d, 0xe0, 0x3e, 0x20, 0x3e, 0x60,
-    0x3e, 0xa0, 0x3e, 0xe0, 0x3f, 0x21, 0x3f, 0x61,
-    0x3f, 0xa2, 0x3f, 0xe2, 0x40, 0x23, 0x40, 0x64,
-    0x40, 0xa6, 0x40, 0xe7, 0x41, 0x29, 0x41, 0x6a,
-    0x41, 0xac, 0x41, 0xee, 0x42, 0x30, 0x42, 0x72,
-    0x42, 0xb5, 0x42, 0xf7, 0x43, 0x3a, 0x43, 0x7d,
-    0x43, 0xc0, 0x44, 0x03, 0x44, 0x47, 0x44, 0x8a,
-    0x44, 0xce, 0x45, 0x12, 0x45, 0x55, 0x45, 0x9a,
-    0x45, 0xde, 0x46, 0x22, 0x46, 0x67, 0x46, 0xab,
-    0x46, 0xf0, 0x47, 0x35, 0x47, 0x7b, 0x47, 0xc0,
-    0x48, 0x05, 0x48, 0x4b, 0x48, 0x91, 0x48, 0xd7,
-    0x49, 0x1d, 0x49, 0x63, 0x49, 0xa9, 0x49, 0xf0,
-    0x4a, 0x37, 0x4a, 0x7d, 0x4a, 0xc4, 0x4b, 0x0c,
-    0x4b, 0x53, 0x4b, 0x9a, 0x4b, 0xe2, 0x4c, 0x2a,
-    0x4c, 0x72, 0x4c, 0xba, 0x4d, 0x02, 0x4d, 0x4a,
-    0x4d, 0x93, 0x4d, 0xdc, 0x4e, 0x25, 0x4e, 0x6e,
-    0x4e, 0xb7, 0x4f, 0x00, 0x4f, 0x49, 0x4f, 0x93,
-    0x4f, 0xdd, 0x50, 0x27, 0x50, 0x71, 0x50, 0xbb,
-    0x51, 0x06, 0x51, 0x50, 0x51, 0x9b, 0x51, 0xe6,
-    0x52, 0x31, 0x52, 0x7c, 0x52, 0xc7, 0x53, 0x13,
-    0x53, 0x5f, 0x53, 0xaa, 0x53, 0xf6, 0x54, 0x42,
-    0x54, 0x8f, 0x54, 0xdb, 0x55, 0x28, 0x55, 0x75,
-    0x55, 0xc2, 0x56, 0x0f, 0x56, 0x5c, 0x56, 0xa9,
-    0x56, 0xf7, 0x57, 0x44, 0x57, 0x92, 0x57, 0xe0,
-    0x58, 0x2f, 0x58, 0x7d, 0x58, 0xcb, 0x59, 0x1a,
-    0x59, 0x69, 0x59, 0xb8, 0x5a, 0x07, 0x5a, 0x56,
-    0x5a, 0xa6, 0x5a, 0xf5, 0x5b, 0x45, 0x5b, 0x95,
-    0x5b, 0xe5, 0x5c, 0x35, 0x5c, 0x86, 0x5c, 0xd6,
-    0x5d, 0x27, 0x5d, 0x78, 0x5d, 0xc9, 0x5e, 0x1a,
-    0x5e, 0x6c, 0x5e, 0xbd, 0x5f, 0x0f, 0x5f, 0x61,
-    0x5f, 0xb3, 0x60, 0x05, 0x60, 0x57, 0x60, 0xaa,
-    0x60, 0xfc, 0x61, 0x4f, 0x61, 0xa2, 0x61, 0xf5,
-    0x62, 0x49, 0x62, 0x9c, 0x62, 0xf0, 0x63, 0x43,
-    0x63, 0x97, 0x63, 0xeb, 0x64, 0x40, 0x64, 0x94,
-    0x64, 0xe9, 0x65, 0x3d, 0x65, 0x92, 0x65, 0xe7,
-    0x66, 0x3d, 0x66, 0x92, 0x66, 0xe8, 0x67, 0x3d,
-    0x67, 0x93, 0x67, 0xe9, 0x68, 0x3f, 0x68, 0x96,
-    0x68, 0xec, 0x69, 0x43, 0x69, 0x9a, 0x69, 0xf1,
-    0x6a, 0x48, 0x6a, 0x9f, 0x6a, 0xf7, 0x6b, 0x4f,
-    0x6b, 0xa7, 0x6b, 0xff, 0x6c, 0x57, 0x6c, 0xaf,
-    0x6d, 0x08, 0x6d, 0x60, 0x6d, 0xb9, 0x6e, 0x12,
-    0x6e, 0x6b, 0x6e, 0xc4, 0x6f, 0x1e, 0x6f, 0x78,
-    0x6f, 0xd1, 0x70, 0x2b, 0x70, 0x86, 0x70, 0xe0,
-    0x71, 0x3a, 0x71, 0x95, 0x71, 0xf0, 0x72, 0x4b,
-    0x72, 0xa6, 0x73, 0x01, 0x73, 0x5d, 0x73, 0xb8,
-    0x74, 0x14, 0x74, 0x70, 0x74, 0xcc, 0x75, 0x28,
-    0x75, 0x85, 0x75, 0xe1, 0x76, 0x3e, 0x76, 0x9b,
-    0x76, 0xf8, 0x77, 0x56, 0x77, 0xb3, 0x78, 0x11,
-    0x78, 0x6e, 0x78, 0xcc, 0x79, 0x2a, 0x79, 0x89,
-    0x79, 0xe7, 0x7a, 0x46, 0x7a, 0xa5, 0x7b, 0x04,
-    0x7b, 0x63, 0x7b, 0xc2, 0x7c, 0x21, 0x7c, 0x81,
-    0x7c, 0xe1, 0x7d, 0x41, 0x7d, 0xa1, 0x7e, 0x01,
-    0x7e, 0x62, 0x7e, 0xc2, 0x7f, 0x23, 0x7f, 0x84,
-    0x7f, 0xe5, 0x80, 0x47, 0x80, 0xa8, 0x81, 0x0a,
-    0x81, 0x6b, 0x81, 0xcd, 0x82, 0x30, 0x82, 0x92,
-    0x82, 0xf4, 0x83, 0x57, 0x83, 0xba, 0x84, 0x1d,
-    0x84, 0x80, 0x84, 0xe3, 0x85, 0x47, 0x85, 0xab,
-    0x86, 0x0e, 0x86, 0x72, 0x86, 0xd7, 0x87, 0x3b,
-    0x87, 0x9f, 0x88, 0x04, 0x88, 0x69, 0x88, 0xce,
-    0x89, 0x33, 0x89, 0x99, 0x89, 0xfe, 0x8a, 0x64,
-    0x8a, 0xca, 0x8b, 0x30, 0x8b, 0x96, 0x8b, 0xfc,
-    0x8c, 0x63, 0x8c, 0xca, 0x8d, 0x31, 0x8d, 0x98,
-    0x8d, 0xff, 0x8e, 0x66, 0x8e, 0xce, 0x8f, 0x36,
-    0x8f, 0x9e, 0x90, 0x06, 0x90, 0x6e, 0x90, 0xd6,
-    0x91, 0x3f, 0x91, 0xa8, 0x92, 0x11, 0x92, 0x7a,
-    0x92, 0xe3, 0x93, 0x4d, 0x93, 0xb6, 0x94, 0x20,
-    0x94, 0x8a, 0x94, 0xf4, 0x95, 0x5f, 0x95, 0xc9,
-    0x96, 0x34, 0x96, 0x9f, 0x97, 0x0a, 0x97, 0x75,
-    0x97, 0xe0, 0x98, 0x4c, 0x98, 0xb8, 0x99, 0x24,
-    0x99, 0x90, 0x99, 0xfc, 0x9a, 0x68, 0x9a, 0xd5,
-    0x9b, 0x42, 0x9b, 0xaf, 0x9c, 0x1c, 0x9c, 0x89,
-    0x9c, 0xf7, 0x9d, 0x64, 0x9d, 0xd2, 0x9e, 0x40,
-    0x9e, 0xae, 0x9f, 0x1d, 0x9f, 0x8b, 0x9f, 0xfa,
-    0xa0, 0x69, 0xa0, 0xd8, 0xa1, 0x47, 0xa1, 0xb6,
-    0xa2, 0x26, 0xa2, 0x96, 0xa3, 0x06, 0xa3, 0x76,
-    0xa3, 0xe6, 0xa4, 0x56, 0xa4, 0xc7, 0xa5, 0x38,
-    0xa5, 0xa9, 0xa6, 0x1a, 0xa6, 0x8b, 0xa6, 0xfd,
-    0xa7, 0x6e, 0xa7, 0xe0, 0xa8, 0x52, 0xa8, 0xc4,
-    0xa9, 0x37, 0xa9, 0xa9, 0xaa, 0x1c, 0xaa, 0x8f,
-    0xab, 0x02, 0xab, 0x75, 0xab, 0xe9, 0xac, 0x5c,
-    0xac, 0xd0, 0xad, 0x44, 0xad, 0xb8, 0xae, 0x2d,
-    0xae, 0xa1, 0xaf, 0x16, 0xaf, 0x8b, 0xb0, 0x00,
-    0xb0, 0x75, 0xb0, 0xea, 0xb1, 0x60, 0xb1, 0xd6,
-    0xb2, 0x4b, 0xb2, 0xc2, 0xb3, 0x38, 0xb3, 0xae,
-    0xb4, 0x25, 0xb4, 0x9c, 0xb5, 0x13, 0xb5, 0x8a,
-    0xb6, 0x01, 0xb6, 0x79, 0xb6, 0xf0, 0xb7, 0x68,
-    0xb7, 0xe0, 0xb8, 0x59, 0xb8, 0xd1, 0xb9, 0x4a,
-    0xb9, 0xc2, 0xba, 0x3b, 0xba, 0xb5, 0xbb, 0x2e,
-    0xbb, 0xa7, 0xbc, 0x21, 0xbc, 0x9b, 0xbd, 0x15,
-    0xbd, 0x8f, 0xbe, 0x0a, 0xbe, 0x84, 0xbe, 0xff,
-    0xbf, 0x7a, 0xbf, 0xf5, 0xc0, 0x70, 0xc0, 0xec,
-    0xc1, 0x67, 0xc1, 0xe3, 0xc2, 0x5f, 0xc2, 0xdb,
-    0xc3, 0x58, 0xc3, 0xd4, 0xc4, 0x51, 0xc4, 0xce,
-    0xc5, 0x4b, 0xc5, 0xc8, 0xc6, 0x46, 0xc6, 0xc3,
-    0xc7, 0x41, 0xc7, 0xbf, 0xc8, 0x3d, 0xc8, 0xbc,
-    0xc9, 0x3a, 0xc9, 0xb9, 0xca, 0x38, 0xca, 0xb7,
-    0xcb, 0x36, 0xcb, 0xb6, 0xcc, 0x35, 0xcc, 0xb5,
-    0xcd, 0x35, 0xcd, 0xb5, 0xce, 0x36, 0xce, 0xb6,
-    0xcf, 0x37, 0xcf, 0xb8, 0xd0, 0x39, 0xd0, 0xba,
-    0xd1, 0x3c, 0xd1, 0xbe, 0xd2, 0x3f, 0xd2, 0xc1,
-    0xd3, 0x44, 0xd3, 0xc6, 0xd4, 0x49, 0xd4, 0xcb,
-    0xd5, 0x4e, 0xd5, 0xd1, 0xd6, 0x55, 0xd6, 0xd8,
-    0xd7, 0x5c, 0xd7, 0xe0, 0xd8, 0x64, 0xd8, 0xe8,
-    0xd9, 0x6c, 0xd9, 0xf1, 0xda, 0x76, 0xda, 0xfb,
-    0xdb, 0x80, 0xdc, 0x05, 0xdc, 0x8a, 0xdd, 0x10,
-    0xdd, 0x96, 0xde, 0x1c, 0xde, 0xa2, 0xdf, 0x29,
-    0xdf, 0xaf, 0xe0, 0x36, 0xe0, 0xbd, 0xe1, 0x44,
-    0xe1, 0xcc, 0xe2, 0x53, 0xe2, 0xdb, 0xe3, 0x63,
-    0xe3, 0xeb, 0xe4, 0x73, 0xe4, 0xfc, 0xe5, 0x84,
-    0xe6, 0x0d, 0xe6, 0x96, 0xe7, 0x1f, 0xe7, 0xa9,
-    0xe8, 0x32, 0xe8, 0xbc, 0xe9, 0x46, 0xe9, 0xd0,
-    0xea, 0x5b, 0xea, 0xe5, 0xeb, 0x70, 0xeb, 0xfb,
-    0xec, 0x86, 0xed, 0x11, 0xed, 0x9c, 0xee, 0x28,
-    0xee, 0xb4, 0xef, 0x40, 0xef, 0xcc, 0xf0, 0x58,
-    0xf0, 0xe5, 0xf1, 0x72, 0xf1, 0xff, 0xf2, 0x8c,
-    0xf3, 0x19, 0xf3, 0xa7, 0xf4, 0x34, 0xf4, 0xc2,
-    0xf5, 0x50, 0xf5, 0xde, 0xf6, 0x6d, 0xf6, 0xfb,
-    0xf7, 0x8a, 0xf8, 0x19, 0xf8, 0xa8, 0xf9, 0x38,
-    0xf9, 0xc7, 0xfa, 0x57, 0xfa, 0xe7, 0xfb, 0x77,
-    0xfc, 0x07, 0xfc, 0x98, 0xfd, 0x29, 0xfd, 0xba,
-    0xfe, 0x4b, 0xfe, 0xdc, 0xff, 0x6d, 0xff, 0xff
-};
-
-int jas_iccprofdata_srgblen = sizeof(jas_iccprofdata_srgb);
-
-uchar jas_iccprofdata_sgray[] = {
-    0x00, 0x00, 0x01, 0x8a, 0x00, 0x00, 0x00, 0x00,
-    0x02, 0x20, 0x00, 0x00, 0x73, 0x63, 0x6e, 0x72,
-    0x47, 0x52, 0x41, 0x59, 0x58, 0x59, 0x5a, 0x20,
-    0x07, 0xd3, 0x00, 0x01, 0x00, 0x1f, 0x00, 0x0d,
-    0x00, 0x35, 0x00, 0x21, 0x61, 0x63, 0x73, 0x70,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x4b, 0x4f, 0x44, 0x41, 0x73, 0x47, 0x72, 0x79,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf6, 0xd6,
-    0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0xd3, 0x2d,
-    0x4a, 0x50, 0x45, 0x47, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x04, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0xb4, 0x00, 0x00, 0x00, 0x86,
-    0x63, 0x70, 0x72, 0x74, 0x00, 0x00, 0x01, 0x3c,
-    0x00, 0x00, 0x00, 0x2b, 0x77, 0x74, 0x70, 0x74,
-    0x00, 0x00, 0x01, 0x68, 0x00, 0x00, 0x00, 0x14,
-    0x6b, 0x54, 0x52, 0x43, 0x00, 0x00, 0x01, 0x7c,
-    0x00, 0x00, 0x00, 0x0e, 0x64, 0x65, 0x73, 0x63,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x2c,
-    0x52, 0x65, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74,
-    0x65, 0x64, 0x20, 0x49, 0x43, 0x43, 0x20, 0x70,
-    0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x20, 0x64,
-    0x65, 0x73, 0x63, 0x72, 0x69, 0x62, 0x69, 0x6e,
-    0x67, 0x20, 0x73, 0x52, 0x47, 0x42, 0x2d, 0x67,
-    0x72, 0x65, 0x79, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x74, 0x65, 0x78, 0x74,
-    0x00, 0x00, 0x00, 0x00, 0x43, 0x6f, 0x70, 0x79,
-    0x72, 0x69, 0x67, 0x68, 0x74, 0x20, 0x32, 0x30,
-    0x30, 0x33, 0x20, 0x73, 0x52, 0x47, 0x42, 0x2d,
-    0x67, 0x72, 0x65, 0x79, 0x20, 0x52, 0x65, 0x66,
-    0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x00, 0x00,
-    0x58, 0x59, 0x5a, 0x20, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0xf3, 0x54, 0x00, 0x01, 0x00, 0x00,
-    0x00, 0x01, 0x16, 0xcf, 0x63, 0x75, 0x72, 0x76,
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-    0x01, 0xcd
-};
-
-int jas_iccprofdata_sgraylen = sizeof(jas_iccprofdata_sgray);
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_image.c b/src/3rdparty/jasper/src/libjasper/base/jas_image.c
deleted file mode 100644
index fff2c24..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_image.c
+++ /dev/null
@@ -1,1445 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Image Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-#include <ctype.h>
-
-#include "jasper/jas_math.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_string.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-#define	FLOORDIV(x, y) ((x) / (y))
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static jas_image_cmpt_t *jas_image_cmpt_create0(void);
-static void jas_image_cmpt_destroy(jas_image_cmpt_t *cmpt);
-static jas_image_cmpt_t *jas_image_cmpt_create(uint_fast32_t tlx, uint_fast32_t tly,
-  uint_fast32_t hstep, uint_fast32_t vstep, uint_fast32_t width, uint_fast32_t
-  height, uint_fast16_t depth, bool sgnd, uint_fast32_t inmem);
-static void jas_image_setbbox(jas_image_t *image);
-static jas_image_cmpt_t *jas_image_cmpt_copy(jas_image_cmpt_t *cmpt);
-static int jas_image_growcmpts(jas_image_t *image, int maxcmpts);
-static uint_fast32_t inttobits(jas_seqent_t v, int prec, bool sgnd);
-static jas_seqent_t bitstoint(uint_fast32_t v, int prec, bool sgnd);
-static int putint(jas_stream_t *out, int sgnd, int prec, long val);
-static int getint(jas_stream_t *in, int sgnd, int prec, long *val);
-static void jas_image_calcbbox2(jas_image_t *image, jas_image_coord_t *tlx,
-  jas_image_coord_t *tly, jas_image_coord_t *brx, jas_image_coord_t *bry);
-static long uptomult(long x, long y);
-static long downtomult(long x, long y);
-static long convert(long val, int oldsgnd, int oldprec, int newsgnd,
-  int newprec);
-static void jas_image_calcbbox2(jas_image_t *image, jas_image_coord_t *tlx,
-  jas_image_coord_t *tly, jas_image_coord_t *brx, jas_image_coord_t *bry);
-
-/******************************************************************************\
-* Global data.
-\******************************************************************************/
-
-static int jas_image_numfmts = 0;
-static jas_image_fmtinfo_t jas_image_fmtinfos[JAS_IMAGE_MAXFMTS];
-
-/******************************************************************************\
-* Create and destroy operations.
-\******************************************************************************/
-
-jas_image_t *jas_image_create(int numcmpts, jas_image_cmptparm_t *cmptparms,
-  int clrspc)
-{
-    jas_image_t *image;
-    uint_fast32_t rawsize;
-    uint_fast32_t inmem;
-    int cmptno;
-    jas_image_cmptparm_t *cmptparm;
-
-    if (!(image = jas_image_create0())) {
-        return 0;
-    }
-
-    image->clrspc_ = clrspc;
-    image->maxcmpts_ = numcmpts;
-    image->inmem_ = true;
-
-    /* Allocate memory for the per-component information. */
-    if (!(image->cmpts_ = jas_malloc(image->maxcmpts_ *
-      sizeof(jas_image_cmpt_t *)))) {
-        jas_image_destroy(image);
-        return 0;
-    }
-    /* Initialize in case of failure. */
-    for (cmptno = 0; cmptno < image->maxcmpts_; ++cmptno) {
-        image->cmpts_[cmptno] = 0;
-    }
-
-    /* Compute the approximate raw size of the image. */
-    rawsize = 0;
-    for (cmptno = 0, cmptparm = cmptparms; cmptno < numcmpts; ++cmptno,
-      ++cmptparm) {
-        rawsize += cmptparm->width * cmptparm->height *
-          (cmptparm->prec + 7) / 8;
-    }
-    /* Decide whether to buffer the image data in memory, based on the
-      raw size of the image. */
-    inmem = (rawsize < JAS_IMAGE_INMEMTHRESH);
-
-    /* Create the individual image components. */
-    for (cmptno = 0, cmptparm = cmptparms; cmptno < numcmpts; ++cmptno,
-      ++cmptparm) {
-        if (!(image->cmpts_[cmptno] = jas_image_cmpt_create(cmptparm->tlx,
-          cmptparm->tly, cmptparm->hstep, cmptparm->vstep,
-          cmptparm->width, cmptparm->height, cmptparm->prec,
-          cmptparm->sgnd, inmem))) {
-            jas_image_destroy(image);
-            return 0;
-        }
-        ++image->numcmpts_;
-    }
-
-    /* Determine the bounding box for all of the components on the
-      reference grid (i.e., the image area) */
-    jas_image_setbbox(image);
-
-    return image;
-}
-
-jas_image_t *jas_image_create0()
-{
-    jas_image_t *image;
-
-    if (!(image = jas_malloc(sizeof(jas_image_t)))) {
-        return 0;
-    }
-
-    image->tlx_ = 0;
-    image->tly_ = 0;
-    image->brx_ = 0;
-    image->bry_ = 0;
-    image->clrspc_ = JAS_CLRSPC_UNKNOWN;
-    image->numcmpts_ = 0;
-    image->maxcmpts_ = 0;
-    image->cmpts_ = 0;
-    image->inmem_ = true;
-    image->cmprof_ = 0;
-
-    return image;
-}
-
-jas_image_t *jas_image_copy(jas_image_t *image)
-{
-    jas_image_t *newimage;
-    int cmptno;
-
-    newimage = jas_image_create0();
-    if (jas_image_growcmpts(newimage, image->numcmpts_)) {
-        goto error;
-    }
-    for (cmptno = 0; cmptno < image->numcmpts_; ++cmptno) {
-        if (!(newimage->cmpts_[cmptno] = jas_image_cmpt_copy(image->cmpts_[cmptno]))) {
-            goto error;
-        }
-        ++newimage->numcmpts_;
-    }
-
-    jas_image_setbbox(newimage);
-
-    if (image->cmprof_) {
-        if (!(newimage->cmprof_ = jas_cmprof_copy(image->cmprof_)))
-            goto error;
-    }
-
-    return newimage;
-error:
-    if (newimage) {
-        jas_image_destroy(newimage);
-    }
-    return 0;
-}
-
-static jas_image_cmpt_t *jas_image_cmpt_create0()
-{
-    jas_image_cmpt_t *cmpt;
-    if (!(cmpt = jas_malloc(sizeof(jas_image_cmpt_t)))) {
-        return 0;
-    }
-    memset(cmpt, 0, sizeof(jas_image_cmpt_t));
-    cmpt->type_ = JAS_IMAGE_CT_UNKNOWN;
-    return cmpt;
-}
-
-static jas_image_cmpt_t *jas_image_cmpt_copy(jas_image_cmpt_t *cmpt)
-{
-    jas_image_cmpt_t *newcmpt;
-
-    if (!(newcmpt = jas_image_cmpt_create0())) {
-        return 0;
-    }
-    newcmpt->tlx_ = cmpt->tlx_;
-    newcmpt->tly_ = cmpt->tly_;
-    newcmpt->hstep_ = cmpt->hstep_;
-    newcmpt->vstep_ = cmpt->vstep_;
-    newcmpt->width_ = cmpt->width_;
-    newcmpt->height_ = cmpt->height_;
-    newcmpt->prec_ = cmpt->prec_;
-    newcmpt->sgnd_ = cmpt->sgnd_;
-    newcmpt->cps_ = cmpt->cps_;
-    newcmpt->type_ = cmpt->type_;
-    if (!(newcmpt->stream_ = jas_stream_memopen(0, 0))) {
-        return 0;
-    }
-    if (jas_stream_seek(cmpt->stream_, 0, SEEK_SET)) {
-        return 0;
-    }
-    if (jas_stream_copy(newcmpt->stream_, cmpt->stream_, -1)) {
-        return 0;
-    }
-    if (jas_stream_seek(newcmpt->stream_, 0, SEEK_SET)) {
-        return 0;
-    }
-    return newcmpt;
-}
-
-void jas_image_destroy(jas_image_t *image)
-{
-    int i;
-
-    if (image->cmpts_) {
-        for (i = 0; i < image->numcmpts_; ++i) {
-            jas_image_cmpt_destroy(image->cmpts_[i]);
-            image->cmpts_[i] = 0;
-        }
-        jas_free(image->cmpts_);
-    }
-    if (image->cmprof_)
-        jas_cmprof_destroy(image->cmprof_);
-    jas_free(image);
-}
-
-static jas_image_cmpt_t *jas_image_cmpt_create(uint_fast32_t tlx, uint_fast32_t tly,
-  uint_fast32_t hstep, uint_fast32_t vstep, uint_fast32_t width, uint_fast32_t
-  height, uint_fast16_t depth, bool sgnd, uint_fast32_t inmem)
-{
-    jas_image_cmpt_t *cmpt;
-    long size;
-
-    if (!(cmpt = jas_malloc(sizeof(jas_image_cmpt_t)))) {
-        return 0;
-    }
-
-    cmpt->type_ = JAS_IMAGE_CT_UNKNOWN;
-    cmpt->tlx_ = tlx;
-    cmpt->tly_ = tly;
-    cmpt->hstep_ = hstep;
-    cmpt->vstep_ = vstep;
-    cmpt->width_ = width;
-    cmpt->height_ = height;
-    cmpt->prec_ = depth;
-    cmpt->sgnd_ = sgnd;
-    cmpt->stream_ = 0;
-    cmpt->cps_ = (depth + 7) / 8;
-
-    size = cmpt->width_ * cmpt->height_ * cmpt->cps_;
-    cmpt->stream_ = (inmem) ? jas_stream_memopen(0, size) : jas_stream_tmpfile();
-    if (!cmpt->stream_) {
-        jas_image_cmpt_destroy(cmpt);
-        return 0;
-    }
-
-    /* Zero the component data.  This isn't necessary, but it is
-    convenient for debugging purposes. */
-    if (jas_stream_seek(cmpt->stream_, size - 1, SEEK_SET) < 0 ||
-      jas_stream_putc(cmpt->stream_, 0) == EOF ||
-      jas_stream_seek(cmpt->stream_, 0, SEEK_SET) < 0) {
-        jas_image_cmpt_destroy(cmpt);
-        return 0;
-    }
-
-    return cmpt;
-}
-
-static void jas_image_cmpt_destroy(jas_image_cmpt_t *cmpt)
-{
-    if (cmpt->stream_) {
-        jas_stream_close(cmpt->stream_);
-    }
-    jas_free(cmpt);
-}
-
-/******************************************************************************\
-* Load and save operations.
-\******************************************************************************/
-
-jas_image_t *jas_image_decode(jas_stream_t *in, int fmt, char *optstr)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    jas_image_t *image;
-
-    image = 0;
-
-    /* If possible, try to determine the format of the input data. */
-    if (fmt < 0) {
-        if ((fmt = jas_image_getfmt(in)) < 0)
-            goto error;
-    }
-
-    /* Is it possible to decode an image represented in this format? */
-    if (!(fmtinfo = jas_image_lookupfmtbyid(fmt)))
-        goto error;
-    if (!fmtinfo->ops.decode)
-        goto error;
-
-    /* Decode the image. */
-    if (!(image = (*fmtinfo->ops.decode)(in, optstr)))
-        goto error;
-
-    /* Create a color profile if needed. */
-    if (!jas_clrspc_isunknown(image->clrspc_) &&
-      !jas_clrspc_isgeneric(image->clrspc_) && !image->cmprof_) {
-        if (!(image->cmprof_ =
-          jas_cmprof_createfromclrspc(jas_image_clrspc(image))))
-            goto error;
-    }
-
-    return image;
-error:
-    if (image)
-        jas_image_destroy(image);
-    return 0;
-}
-
-int jas_image_encode(jas_image_t *image, jas_stream_t *out, int fmt, char *optstr)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    if (!(fmtinfo = jas_image_lookupfmtbyid(fmt))) {
-        return -1;
-    }
-    return (fmtinfo->ops.encode) ? (*fmtinfo->ops.encode)(image, out,
-      optstr) : (-1);
-}
-
-/******************************************************************************\
-* Component read and write operations.
-\******************************************************************************/
-
-int jas_image_readcmpt(jas_image_t *image, int cmptno, jas_image_coord_t x,
-  jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  jas_matrix_t *data)
-{
-    jas_image_cmpt_t *cmpt;
-    jas_image_coord_t i;
-    jas_image_coord_t j;
-    int k;
-    jas_seqent_t v;
-    int c;
-    jas_seqent_t *dr;
-    jas_seqent_t *d;
-    int drs;
-
-    if (cmptno < 0 || cmptno >= image->numcmpts_) {
-        return -1;
-    }
-
-    cmpt = image->cmpts_[cmptno];
-    if (x >= cmpt->width_ || y >= cmpt->height_ ||
-      x + width > cmpt->width_ ||
-      y + height > cmpt->height_) {
-        return -1;
-    }
-
-    if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
-        if (jas_matrix_resize(data, height, width)) {
-            return -1;
-        }
-    }
-
-    dr = jas_matrix_getref(data, 0, 0);
-    drs = jas_matrix_rowstep(data);
-    for (i = 0; i < height; ++i, dr += drs) {
-        d = dr;
-        if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * (y + i) + x)
-          * cmpt->cps_, SEEK_SET) < 0) {
-            return -1;
-        }
-        for (j = width; j > 0; --j, ++d) {
-            v = 0;
-            for (k = cmpt->cps_; k > 0; --k) {
-                if ((c = jas_stream_getc(cmpt->stream_)) == EOF) {
-                    return -1;
-                }
-                v = (v << 8) | (c & 0xff);
-            }
-            *d = bitstoint(v, cmpt->prec_, cmpt->sgnd_);
-        }
-    }
-
-    return 0;
-}
-
-int jas_image_writecmpt(jas_image_t *image, int cmptno, jas_image_coord_t x, jas_image_coord_t y, jas_image_coord_t width,
-  jas_image_coord_t height, jas_matrix_t *data)
-{
-    jas_image_cmpt_t *cmpt;
-    jas_image_coord_t i;
-    jas_image_coord_t j;
-    jas_seqent_t *d;
-    jas_seqent_t *dr;
-    int drs;
-    jas_seqent_t v;
-    int k;
-    int c;
-
-    if (cmptno < 0 || cmptno >= image->numcmpts_) {
-        return -1;
-    }
-
-    cmpt = image->cmpts_[cmptno];
-    if (x >= cmpt->width_ || y >= cmpt->height_ ||
-      x + width > cmpt->width_ ||
-      y + height > cmpt->height_) {
-        return -1;
-    }
-
-    if (jas_matrix_numrows(data) != height || jas_matrix_numcols(data) != width) {
-        return -1;
-    }
-
-    dr = jas_matrix_getref(data, 0, 0);
-    drs = jas_matrix_rowstep(data);
-    for (i = 0; i < height; ++i, dr += drs) {
-        d = dr;
-        if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * (y + i) + x)
-          * cmpt->cps_, SEEK_SET) < 0) {
-            return -1;
-        }
-        for (j = width; j > 0; --j, ++d) {
-            v = inttobits(*d, cmpt->prec_, cmpt->sgnd_);
-            for (k = cmpt->cps_; k > 0; --k) {
-                c = (v >> (8 * (cmpt->cps_ - 1))) & 0xff;
-                if (jas_stream_putc(cmpt->stream_,
-                  (unsigned char) c) == EOF) {
-                    return -1;
-                }
-                v <<= 8;
-            }
-        }
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* File format operations.
-\******************************************************************************/
-
-void jas_image_clearfmts()
-{
-    int i;
-    jas_image_fmtinfo_t *fmtinfo;
-    for (i = 0; i < jas_image_numfmts; ++i) {
-        fmtinfo = &jas_image_fmtinfos[i];
-        if (fmtinfo->name) {
-            jas_free(fmtinfo->name);
-            fmtinfo->name = 0;
-        }
-        if (fmtinfo->ext) {
-            jas_free(fmtinfo->ext);
-            fmtinfo->ext = 0;
-        }
-        if (fmtinfo->desc) {
-            jas_free(fmtinfo->desc);
-            fmtinfo->desc = 0;
-        }
-    }
-    jas_image_numfmts = 0;
-}
-
-int jas_image_addfmt(int id, char *name, char *ext, char *desc,
-  jas_image_fmtops_t *ops)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    assert(id >= 0 && name && ext && ops);
-    if (jas_image_numfmts >= JAS_IMAGE_MAXFMTS) {
-        return -1;
-    }
-    fmtinfo = &jas_image_fmtinfos[jas_image_numfmts];
-    fmtinfo->id = id;
-    if (!(fmtinfo->name = jas_strdup(name))) {
-        return -1;
-    }
-    if (!(fmtinfo->ext = jas_strdup(ext))) {
-        jas_free(fmtinfo->name);
-        return -1;
-    }
-    if (!(fmtinfo->desc = jas_strdup(desc))) {
-        jas_free(fmtinfo->name);
-        jas_free(fmtinfo->ext);
-        return -1;
-    }
-    fmtinfo->ops = *ops;
-    ++jas_image_numfmts;
-    return 0;
-}
-
-int jas_image_strtofmt(char *name)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    if (!(fmtinfo = jas_image_lookupfmtbyname(name))) {
-        return -1;
-    }
-    return fmtinfo->id;
-}
-
-char *jas_image_fmttostr(int fmt)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    if (!(fmtinfo = jas_image_lookupfmtbyid(fmt))) {
-        return 0;
-    }
-    return fmtinfo->name;
-}
-
-int jas_image_getfmt(jas_stream_t *in)
-{
-    jas_image_fmtinfo_t *fmtinfo;
-    int found;
-    int i;
-
-    /* Check for data in each of the supported formats. */
-    found = 0;
-    for (i = 0, fmtinfo = jas_image_fmtinfos; i < jas_image_numfmts; ++i,
-      ++fmtinfo) {
-        if (fmtinfo->ops.validate) {
-            /* Is the input data valid for this format? */
-            if (!(*fmtinfo->ops.validate)(in)) {
-                found = 1;
-                break;
-            }
-        }
-    }
-    return found ? fmtinfo->id : (-1);
-}
-
-int jas_image_fmtfromname(char *name)
-{
-    int i;
-    char *ext;
-    jas_image_fmtinfo_t *fmtinfo;
-    /* Get the file name extension. */
-    if (!(ext = strrchr(name, '.'))) {
-        return -1;
-    }
-    ++ext;
-    /* Try to find a format that uses this extension. */
-    for (i = 0, fmtinfo = jas_image_fmtinfos; i < jas_image_numfmts; ++i,
-      ++fmtinfo) {
-        /* Do we have a match? */
-        if (!strcmp(ext, fmtinfo->ext)) {
-            return fmtinfo->id;
-        }
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Miscellaneous operations.
-\******************************************************************************/
-
-uint_fast32_t jas_image_rawsize(jas_image_t *image)
-{
-    uint_fast32_t rawsize;
-    int cmptno;
-    jas_image_cmpt_t *cmpt;
-
-    rawsize = 0;
-    for (cmptno = 0; cmptno < image->numcmpts_; ++cmptno) {
-        cmpt = image->cmpts_[cmptno];
-        rawsize += (cmpt->width_ * cmpt->height_ * cmpt->prec_ +
-          7) / 8;
-    }
-    return rawsize;
-}
-
-void jas_image_delcmpt(jas_image_t *image, int cmptno)
-{
-    if (cmptno >= image->numcmpts_) {
-        return;
-    }
-    jas_image_cmpt_destroy(image->cmpts_[cmptno]);
-    if (cmptno < image->numcmpts_) {
-        memmove(&image->cmpts_[cmptno], &image->cmpts_[cmptno + 1],
-          (image->numcmpts_ - 1 - cmptno) * sizeof(jas_image_cmpt_t *));
-    }
-    --image->numcmpts_;
-
-    jas_image_setbbox(image);
-}
-
-int jas_image_addcmpt(jas_image_t *image, int cmptno,
-  jas_image_cmptparm_t *cmptparm)
-{
-    jas_image_cmpt_t *newcmpt;
-    if (cmptno < 0)
-        cmptno = image->numcmpts_;
-    assert(cmptno >= 0 && cmptno <= image->numcmpts_);
-    if (image->numcmpts_ >= image->maxcmpts_) {
-        if (jas_image_growcmpts(image, image->maxcmpts_ + 128)) {
-            return -1;
-        }
-    }
-    if (!(newcmpt = jas_image_cmpt_create(cmptparm->tlx,
-      cmptparm->tly, cmptparm->hstep, cmptparm->vstep,
-      cmptparm->width, cmptparm->height, cmptparm->prec,
-      cmptparm->sgnd, 1))) {
-        return -1;
-    }
-    if (cmptno < image->numcmpts_) {
-        memmove(&image->cmpts_[cmptno + 1], &image->cmpts_[cmptno],
-          (image->numcmpts_ - cmptno) * sizeof(jas_image_cmpt_t *));
-    }
-    image->cmpts_[cmptno] = newcmpt;
-    ++image->numcmpts_;
-
-    jas_image_setbbox(image);
-
-    return 0;
-}
-
-jas_image_fmtinfo_t *jas_image_lookupfmtbyid(int id)
-{
-    int i;
-    jas_image_fmtinfo_t *fmtinfo;
-
-    for (i = 0, fmtinfo = jas_image_fmtinfos; i < jas_image_numfmts; ++i, ++fmtinfo) {
-        if (fmtinfo->id == id) {
-            return fmtinfo;
-        }
-    }
-    return 0;
-}
-
-jas_image_fmtinfo_t *jas_image_lookupfmtbyname(const char *name)
-{
-    int i;
-    jas_image_fmtinfo_t *fmtinfo;
-
-    for (i = 0, fmtinfo = jas_image_fmtinfos; i < jas_image_numfmts; ++i, ++fmtinfo) {
-        if (!strcmp(fmtinfo->name, name)) {
-            return fmtinfo;
-        }
-    }
-    return 0;
-}
-
-
-
-
-
-static uint_fast32_t inttobits(jas_seqent_t v, int prec, bool sgnd)
-{
-    uint_fast32_t ret;
-    ret = ((sgnd && v < 0) ? ((1 << prec) + v) : v) & JAS_ONES(prec);
-    return ret;
-}
-
-static jas_seqent_t bitstoint(uint_fast32_t v, int prec, bool sgnd)
-{
-    jas_seqent_t ret;
-    v &= JAS_ONES(prec);
-    ret = (sgnd && (v & (1 << (prec - 1)))) ? (v - (1 << prec)) : v;
-    return ret;
-}
-
-static void jas_image_setbbox(jas_image_t *image)
-{
-    jas_image_cmpt_t *cmpt;
-    int cmptno;
-    int_fast32_t x;
-    int_fast32_t y;
-
-    if (image->numcmpts_ > 0) {
-        /* Determine the bounding box for all of the components on the
-          reference grid (i.e., the image area) */
-        cmpt = image->cmpts_[0];
-        image->tlx_ = cmpt->tlx_;
-        image->tly_ = cmpt->tly_;
-        image->brx_ = cmpt->tlx_ + cmpt->hstep_ * (cmpt->width_ - 1) + 1;
-        image->bry_ = cmpt->tly_ + cmpt->vstep_ * (cmpt->height_ - 1) + 1;
-        for (cmptno = 1; cmptno < image->numcmpts_; ++cmptno) {
-            cmpt = image->cmpts_[cmptno];
-            if (image->tlx_ > cmpt->tlx_) {
-                image->tlx_ = cmpt->tlx_;
-            }
-            if (image->tly_ > cmpt->tly_) {
-                image->tly_ = cmpt->tly_;
-            }
-            x = cmpt->tlx_ + cmpt->hstep_ * (cmpt->width_ - 1) + 1;
-            if (image->brx_ < x) {
-                image->brx_ = x;
-            }
-            y = cmpt->tly_ + cmpt->vstep_ * (cmpt->height_ - 1) + 1;
-            if (image->bry_ < y) {
-                image->bry_ = y;
-            }
-        }
-    } else {
-        image->tlx_ = 0;
-        image->tly_ = 0;
-        image->brx_ = 0;
-        image->bry_ = 0;
-    }
-}
-
-static int jas_image_growcmpts(jas_image_t *image, int maxcmpts)
-{
-    jas_image_cmpt_t **newcmpts;
-    int cmptno;
-
-    newcmpts = (!image->cmpts_) ? jas_malloc(maxcmpts * sizeof(jas_image_cmpt_t *)) :
-      jas_realloc(image->cmpts_, maxcmpts * sizeof(jas_image_cmpt_t *));
-    if (!newcmpts) {
-        return -1;
-    }
-    image->cmpts_ = newcmpts;
-    image->maxcmpts_ = maxcmpts;
-    for (cmptno = image->numcmpts_; cmptno < image->maxcmpts_; ++cmptno) {
-        image->cmpts_[cmptno] = 0;
-    }
-    return 0;
-}
-
-int jas_image_copycmpt(jas_image_t *dstimage, int dstcmptno, jas_image_t *srcimage,
-  int srccmptno)
-{
-    jas_image_cmpt_t *newcmpt;
-    if (dstimage->numcmpts_ >= dstimage->maxcmpts_) {
-        if (jas_image_growcmpts(dstimage, dstimage->maxcmpts_ + 128)) {
-            return -1;
-        }
-    }
-    if (!(newcmpt = jas_image_cmpt_copy(srcimage->cmpts_[srccmptno]))) {
-        return -1;
-    }
-    if (dstcmptno < dstimage->numcmpts_) {
-        memmove(&dstimage->cmpts_[dstcmptno + 1], &dstimage->cmpts_[dstcmptno],
-          (dstimage->numcmpts_ - dstcmptno) * sizeof(jas_image_cmpt_t *));
-    }
-    dstimage->cmpts_[dstcmptno] = newcmpt;
-    ++dstimage->numcmpts_;
-
-    jas_image_setbbox(dstimage);
-    return 0;
-}
-
-void jas_image_dump(jas_image_t *image, FILE *out)
-{
-    long buf[1024];
-    int cmptno;
-    int n;
-    int i;
-    int width;
-    int height;
-    jas_image_cmpt_t *cmpt;
-    for (cmptno = 0; cmptno < image->numcmpts_; ++cmptno) {
-        cmpt = image->cmpts_[cmptno];
-        fprintf(out, "prec=%d, sgnd=%d, cmpttype=%d\n", cmpt->prec_,
-          cmpt->sgnd_, cmpt->type_);
-        width = jas_image_cmptwidth(image, cmptno);
-        height = jas_image_cmptheight(image, cmptno);
-        n = JAS_MIN(16, width);
-        if (jas_image_readcmpt2(image, cmptno, 0, 0, n, 1, buf)) {
-            abort();
-        }
-        for (i = 0; i < n; ++i) {
-            fprintf(out, " f(%d,%d)=%ld", i, 0, buf[i]);
-        }
-        fprintf(out, "\n");
-        if (jas_image_readcmpt2(image, cmptno, width - n, height - 1, n, 1, buf)) {
-            abort();
-        }
-        for (i = 0; i < n; ++i) {
-            fprintf(out, " f(%d,%d)=%ld", width - n + i, height - 1, buf[i]);
-        }
-        fprintf(out, "\n");
-    }
-}
-
-int jas_image_depalettize(jas_image_t *image, int cmptno, int numlutents,
-  int_fast32_t *lutents, int dtype, int newcmptno)
-{
-    jas_image_cmptparm_t cmptparms;
-    int_fast32_t v;
-    int i;
-    int j;
-    jas_image_cmpt_t *cmpt;
-
-    cmpt = image->cmpts_[cmptno];
-    cmptparms.tlx = cmpt->tlx_;
-    cmptparms.tly = cmpt->tly_;
-    cmptparms.hstep = cmpt->hstep_;
-    cmptparms.vstep = cmpt->vstep_;
-    cmptparms.width = cmpt->width_;
-    cmptparms.height = cmpt->height_;
-    cmptparms.prec = JAS_IMAGE_CDT_GETPREC(dtype);
-    cmptparms.sgnd = JAS_IMAGE_CDT_GETSGND(dtype);
-
-    if (jas_image_addcmpt(image, newcmptno, &cmptparms)) {
-        return -1;
-    }
-    if (newcmptno <= cmptno) {
-        ++cmptno;
-        cmpt = image->cmpts_[cmptno];
-    }
-
-    for (j = 0; j < cmpt->height_; ++j) {
-        for (i = 0; i < cmpt->width_; ++i) {
-            v = jas_image_readcmptsample(image, cmptno, i, j);
-            if (v < 0) {
-                v = 0;
-            } else if (v >= numlutents) {
-                v = numlutents - 1;
-            }
-            jas_image_writecmptsample(image, newcmptno, i, j,
-              lutents[v]);
-        }
-    }
-    return 0;
-}
-
-int jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y)
-{
-    jas_image_cmpt_t *cmpt;
-    uint_fast32_t v;
-    int k;
-    int c;
-
-    cmpt = image->cmpts_[cmptno];
-
-    if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * y + x) * cmpt->cps_,
-      SEEK_SET) < 0) {
-        return -1;
-    }
-    v = 0;
-    for (k = cmpt->cps_; k > 0; --k) {
-        if ((c = jas_stream_getc(cmpt->stream_)) == EOF) {
-            return -1;
-        }
-        v = (v << 8) | (c & 0xff);
-    }
-    return bitstoint(v, cmpt->prec_, cmpt->sgnd_);
-}
-
-void jas_image_writecmptsample(jas_image_t *image, int cmptno, int x, int y,
-  int_fast32_t v)
-{
-    jas_image_cmpt_t *cmpt;
-    uint_fast32_t t;
-    int k;
-    int c;
-
-    cmpt = image->cmpts_[cmptno];
-
-    if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * y + x) * cmpt->cps_,
-      SEEK_SET) < 0) {
-        return;
-    }
-    t = inttobits(v, cmpt->prec_, cmpt->sgnd_);
-    for (k = cmpt->cps_; k > 0; --k) {
-        c = (t >> (8 * (cmpt->cps_ - 1))) & 0xff;
-        if (jas_stream_putc(cmpt->stream_, (unsigned char) c) == EOF) {
-            return;
-        }
-        t <<= 8;
-    }
-}
-
-int jas_image_getcmptbytype(jas_image_t *image, int ctype)
-{
-    int cmptno;
-
-    for (cmptno = 0; cmptno < image->numcmpts_; ++cmptno) {
-        if (image->cmpts_[cmptno]->type_ == ctype) {
-            return cmptno;
-        }
-    }
-    return -1;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-/***********************************************/
-/***********************************************/
-/***********************************************/
-/***********************************************/
-
-int jas_image_readcmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x,
-  jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  long *buf)
-{
-    jas_image_cmpt_t *cmpt;
-    jas_image_coord_t i;
-    jas_image_coord_t j;
-    long v;
-    long *bufptr;
-
-    if (cmptno < 0 || cmptno >= image->numcmpts_)
-        goto error;
-    cmpt = image->cmpts_[cmptno];
-    if (x < 0 || x >= cmpt->width_ || y < 0 || y >= cmpt->height_ ||
-      width < 0 || height < 0 || x + width > cmpt->width_ ||
-      y + height > cmpt->height_)
-        goto error;
-
-    bufptr = buf;
-    for (i = 0; i < height; ++i) {
-        if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * (y + i) + x)
-          * cmpt->cps_, SEEK_SET) < 0)
-            goto error;
-        for (j = 0; j < width; ++j) {
-            if (getint(cmpt->stream_, cmpt->sgnd_, cmpt->prec_, &v))
-                goto error;
-            *bufptr++ = v;
-        }
-    }
-
-    return 0;
-error:
-    return -1;
-}
-
-int jas_image_writecmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x,
-  jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  long *buf)
-{
-    jas_image_cmpt_t *cmpt;
-    jas_image_coord_t i;
-    jas_image_coord_t j;
-    long v;
-    long *bufptr;
-
-    if (cmptno < 0 || cmptno >= image->numcmpts_)
-        goto error;
-    cmpt = image->cmpts_[cmptno];
-    if (x < 0 || x >= cmpt->width_ || y < 0 || y >= cmpt->height_ ||
-      width < 0 || height < 0 || x + width > cmpt->width_ ||
-      y + height > cmpt->height_)
-        goto error;
-
-    bufptr = buf;
-    for (i = 0; i < height; ++i) {
-        if (jas_stream_seek(cmpt->stream_, (cmpt->width_ * (y + i) + x)
-          * cmpt->cps_, SEEK_SET) < 0)
-            goto error;
-        for (j = 0; j < width; ++j) {
-            v = *bufptr++;
-            if (putint(cmpt->stream_, cmpt->sgnd_, cmpt->prec_, v))
-                goto error;
-        }
-    }
-
-    return 0;
-error:
-    return -1;
-}
-
-int jas_image_sampcmpt(jas_image_t *image, int cmptno, int newcmptno,
-  jas_image_coord_t ho, jas_image_coord_t vo, jas_image_coord_t hs,
-  jas_image_coord_t vs, int sgnd, int prec)
-{
-    jas_image_cmpt_t *oldcmpt;
-    jas_image_cmpt_t *newcmpt;
-    int width;
-    int height;
-    jas_image_coord_t tlx;
-    jas_image_coord_t tly;
-    jas_image_coord_t brx;
-    jas_image_coord_t bry;
-    int i;
-    int j;
-    jas_image_cmptparm_t cmptparm;
-    jas_image_coord_t ax;
-    jas_image_coord_t ay;
-    jas_image_coord_t bx;
-    jas_image_coord_t by;
-    jas_image_coord_t d0;
-    jas_image_coord_t d1;
-    jas_image_coord_t d2;
-    jas_image_coord_t d3;
-    jas_image_coord_t oldx;
-    jas_image_coord_t oldy;
-    jas_image_coord_t x;
-    jas_image_coord_t y;
-    long v;
-    jas_image_coord_t cmptbrx;
-    jas_image_coord_t cmptbry;
-
-    assert(cmptno >= 0 && cmptno < image->numcmpts_);
-    oldcmpt = image->cmpts_[cmptno];
-    assert(oldcmpt->tlx_ == 0 && oldcmpt->tly_ == 0);
-    jas_image_calcbbox2(image, &tlx, &tly, &brx, &bry);
-    width = FLOORDIV(brx - ho + hs, hs);
-    height = FLOORDIV(bry - vo + vs, vs);
-    cmptparm.tlx = ho;
-    cmptparm.tly = vo;
-    cmptparm.hstep = hs;
-    cmptparm.vstep = vs;
-    cmptparm.width = width;
-    cmptparm.height = height;
-    cmptparm.prec = prec;
-    cmptparm.sgnd = sgnd;
-    if (jas_image_addcmpt(image, newcmptno, &cmptparm))
-        goto error;
-cmptbrx = oldcmpt->tlx_ + (oldcmpt->width_ - 1) * oldcmpt->hstep_;
-cmptbry = oldcmpt->tly_ + (oldcmpt->height_ - 1) * oldcmpt->vstep_;
-    newcmpt = image->cmpts_[newcmptno];
-    jas_stream_rewind(newcmpt->stream_);
-    for (i = 0; i < height; ++i) {
-        y = newcmpt->tly_ + newcmpt->vstep_ * i;
-        for (j = 0; j < width; ++j) {
-            x = newcmpt->tlx_ + newcmpt->hstep_ * j;
-            ax = downtomult(x - oldcmpt->tlx_, oldcmpt->hstep_) + oldcmpt->tlx_;
-            ay = downtomult(y - oldcmpt->tly_, oldcmpt->vstep_) + oldcmpt->tly_;
-            bx = uptomult(x - oldcmpt->tlx_, oldcmpt->hstep_) + oldcmpt->tlx_;
-            if (bx > cmptbrx)
-                bx = cmptbrx;
-            by = uptomult(y - oldcmpt->tly_, oldcmpt->vstep_) + oldcmpt->tly_;
-            if (by > cmptbry)
-                by = cmptbry;
-            d0 = (ax - x) * (ax - x) + (ay - y) * (ay - y);
-            d1 = (bx - x) * (bx - x) + (ay - y) * (ay - y);
-            d2 = (bx - x) * (bx - x) + (by - y) * (by - y);
-            d3 = (ax - x) * (ax - x) + (by - y) * (by - y);
-            if (d0 <= d1 && d0 <= d2 && d0 <= d3) {
-                oldx = (ax - oldcmpt->tlx_) / oldcmpt->hstep_;
-                oldy = (ay - oldcmpt->tly_) / oldcmpt->vstep_;
-            } else if (d1 <= d0 && d1 <= d2 && d1 <= d3) {
-                oldx = (bx - oldcmpt->tlx_) / oldcmpt->hstep_;
-                oldy = (ay - oldcmpt->tly_) / oldcmpt->vstep_;
-            } else if (d2 <= d0 && d2 <= d1 && d1 <= d3) {
-                oldx = (bx - oldcmpt->tlx_) / oldcmpt->hstep_;
-                oldy = (by - oldcmpt->tly_) / oldcmpt->vstep_;
-            } else {
-                oldx = (ax - oldcmpt->tlx_) / oldcmpt->hstep_;
-                oldy = (by - oldcmpt->tly_) / oldcmpt->vstep_;
-            }
-            assert(oldx >= 0 && oldx < oldcmpt->width_ &&
-              oldy >= 0 && oldy < oldcmpt->height_);
-            if (jas_stream_seek(oldcmpt->stream_, oldcmpt->cps_ *
-              (oldy * oldcmpt->width_ + oldx), SEEK_SET) < 0)
-                goto error;
-            if (getint(oldcmpt->stream_, oldcmpt->sgnd_,
-              oldcmpt->prec_, &v))
-                goto error;
-            if (newcmpt->prec_ != oldcmpt->prec_ ||
-              newcmpt->sgnd_ != oldcmpt->sgnd_) {
-                v = convert(v, oldcmpt->sgnd_, oldcmpt->prec_,
-                  newcmpt->sgnd_, newcmpt->prec_);
-            }
-            if (putint(newcmpt->stream_, newcmpt->sgnd_,
-              newcmpt->prec_, v))
-                goto error;
-        }
-    }
-    return 0;
-error:
-    return -1;
-}
-
-int jas_image_ishomosamp(jas_image_t *image)
-{
-    jas_image_coord_t hstep;
-    jas_image_coord_t vstep;
-    int result;
-    int i;
-    hstep = jas_image_cmpthstep(image, 0);
-    vstep = jas_image_cmptvstep(image, 0);
-    result = 1;
-    for (i = 0; i < image->numcmpts_; ++i) {
-        if (jas_image_cmpthstep(image, i) != hstep ||
-          jas_image_cmptvstep(image, i) != vstep) {
-            result = 0;
-            break;
-        }
-    }
-    return result;
-}
-
-/* Note: This function defines a bounding box differently. */
-static void jas_image_calcbbox2(jas_image_t *image, jas_image_coord_t *tlx,
-  jas_image_coord_t *tly, jas_image_coord_t *brx, jas_image_coord_t *bry)
-{
-    jas_image_cmpt_t *cmpt;
-    jas_image_coord_t tmptlx;
-    jas_image_coord_t tmptly;
-    jas_image_coord_t tmpbrx;
-    jas_image_coord_t tmpbry;
-    jas_image_coord_t t;
-    int i;
-    if (image->numcmpts_ > 0) {
-        cmpt = image->cmpts_[0];
-        tmptlx = cmpt->tlx_;
-        tmptly = cmpt->tly_;
-        tmpbrx = cmpt->tlx_ + cmpt->hstep_ * (cmpt->width_ - 1);
-        tmpbry = cmpt->tly_ + cmpt->vstep_ * (cmpt->height_ - 1);
-        for (i = 0; i < image->numcmpts_; ++i) {
-            cmpt = image->cmpts_[i];
-            if (cmpt->tlx_ < tmptlx)
-                tmptlx = cmpt->tlx_;
-            if (cmpt->tly_ < tmptly)
-                tmptly = cmpt->tly_;
-            t = cmpt->tlx_ + cmpt->hstep_ * (cmpt->width_ - 1);
-            if (t > tmpbrx)
-                tmpbrx = t;
-            t = cmpt->tly_ + cmpt->vstep_ * (cmpt->height_ - 1);
-            if (t > tmpbry)
-                tmpbry = t;
-        }
-    } else {
-        tmptlx = 0;
-        tmptly = 0;
-        tmpbrx = -1;
-        tmpbry = -1;
-    }
-    *tlx = tmptlx;
-    *tly = tmptly;
-    *brx = tmpbrx;
-    *bry = tmpbry;
-}
-
-
-
-static int getint(jas_stream_t *in, int sgnd, int prec, long *val)
-{
-    long v;
-    int n;
-    int c;
-    n = (prec + 7) / 8;
-    v = 0;
-    while (--n >= 0) {
-        if ((c = jas_stream_getc(in)) == EOF)
-            return -1;
-        v = (v << 8) | c;
-    }
-    v &= ((1 << prec) - 1);
-    if (sgnd) {
-        /* XXX - Do something here. */
-        abort();
-    } else {
-        *val = v;
-    }
-    return 0;
-}
-
-static int putint(jas_stream_t *out, int sgnd, int prec, long val)
-{
-    int n;
-    int c;
-    if (sgnd) {
-        /* XXX - Do something here. */
-        abort();
-    }
-    val &= (1 << prec) - 1;
-    n = (prec + 7) / 8;
-    while (--n >= 0) {
-        c = (val >> (n * 8)) & 0xff;
-        if (jas_stream_putc(out, c) != c)
-            return -1;
-    }
-    return 0;
-}
-
-static long convert(long val, int oldsgnd, int oldprec, int newsgnd,
-  int newprec)
-{
-    if (newsgnd != oldsgnd) {
-    }
-    if (newprec != oldprec) {
-        if (newprec > oldprec) {
-            val <<= newprec - oldprec;
-        } else if (oldprec > newprec) {
-            val >>= oldprec - newprec;
-        }
-    }
-    return val;
-}
-
-static long downtomult(long x, long y)
-{
-    assert(x >= 0);
-    return (x / y) * y;
-}
-
-static long uptomult(long x, long y)
-{
-    assert(x >= 0);
-    return ((x + y - 1) / y) * y;
-}
-
-jas_image_t *jas_image_chclrspc(jas_image_t *image, jas_cmprof_t *outprof,
-  int intent)
-{
-    jas_image_t *inimage;
-    int minhstep;
-    int minvstep;
-    int i;
-    int j;
-    int k;
-    int n;
-    int hstep;
-    int vstep;
-    int numinauxchans;
-    int numoutauxchans;
-    int numinclrchans;
-    int numoutclrchans;
-    int prec;
-    jas_image_t *outimage;
-    int cmpttype;
-    int numoutchans;
-    jas_cmprof_t *inprof;
-    jas_cmprof_t *tmpprof;
-    jas_image_cmptparm_t cmptparm;
-    int width;
-    int height;
-    jas_cmxform_t *xform;
-    jas_cmpixmap_t inpixmap;
-    jas_cmpixmap_t outpixmap;
-    jas_cmcmptfmt_t *incmptfmts;
-    jas_cmcmptfmt_t *outcmptfmts;
-
-#if 0
-jas_eprintf("IMAGE\n");
-jas_image_dump(image, stderr);
-#endif
-
-    if (!(inimage = jas_image_copy(image)))
-        goto error;
-    image = 0;
-
-    if (!jas_image_ishomosamp(inimage)) {
-        minhstep = jas_image_cmpthstep(inimage, 0);
-        minvstep = jas_image_cmptvstep(inimage, 0);
-        for (i = 1; i < jas_image_numcmpts(inimage); ++i) {
-            hstep = jas_image_cmpthstep(inimage, i);
-            vstep = jas_image_cmptvstep(inimage, i);
-            if (hstep < minhstep)
-                minhstep = hstep;
-            if (vstep < minvstep)
-                minvstep = vstep;
-        }
-        n = jas_image_numcmpts(inimage);
-        for (i = 0; i < n; ++i) {
-            cmpttype = jas_image_cmpttype(inimage, i);
-            if (jas_image_sampcmpt(inimage, i, i + 1, 0, 0, minhstep, minvstep, jas_image_cmptsgnd(inimage, i), jas_image_cmptprec(inimage, i)))
-                goto error;
-            jas_image_setcmpttype(inimage, i + 1, cmpttype);
-            jas_image_delcmpt(inimage, i);
-        }
-    }
-
-    width = jas_image_cmptwidth(inimage, 0);
-    height = jas_image_cmptheight(inimage, 0);
-    hstep = jas_image_cmpthstep(inimage, 0);
-    vstep = jas_image_cmptvstep(inimage, 0);
-
-    inprof = jas_image_cmprof(inimage);
-    assert(inprof);
-    numinclrchans = jas_clrspc_numchans(jas_cmprof_clrspc(inprof));
-    numinauxchans = jas_image_numcmpts(inimage) - numinclrchans;
-    numoutclrchans = jas_clrspc_numchans(jas_cmprof_clrspc(outprof));
-    numoutauxchans = 0;
-    numoutchans = numoutclrchans + numoutauxchans;
-    prec = 8;
-
-    if (!(outimage = jas_image_create0()))
-        goto error;
-
-    /* Create a component for each of the colorants. */
-    for (i = 0; i < numoutclrchans; ++i) {
-        cmptparm.tlx = 0;
-        cmptparm.tly = 0;
-        cmptparm.hstep = hstep;
-        cmptparm.vstep = vstep;
-        cmptparm.width = width;
-        cmptparm.height = height;
-        cmptparm.prec = prec;
-        cmptparm.sgnd = 0;
-        if (jas_image_addcmpt(outimage, -1, &cmptparm))
-            goto error;
-        jas_image_setcmpttype(outimage, i, JAS_IMAGE_CT_COLOR(i));
-    }
-#if 0
-    /* Copy the auxiliary components without modification. */
-    for (i = 0; i < jas_image_numcmpts(inimage); ++i) {
-        if (!ISCOLOR(jas_image_cmpttype(inimage, i))) {
-            jas_image_copycmpt(outimage, -1, inimage, i);
-/* XXX - need to specify laydown of component on ref. grid */
-        }
-    }
-#endif
-
-    if (!(tmpprof = jas_cmprof_copy(outprof)))
-        goto error;
-    assert(!jas_image_cmprof(outimage));
-    jas_image_setcmprof(outimage, tmpprof);
-    tmpprof = 0;
-    jas_image_setclrspc(outimage, jas_cmprof_clrspc(outprof));
-
-    if (!(xform = jas_cmxform_create(inprof, outprof, 0, JAS_CMXFORM_OP_FWD, intent, 0)))
-        goto error;
-
-    inpixmap.numcmpts = numinclrchans;
-    incmptfmts = malloc(numinclrchans * sizeof(jas_cmcmptfmt_t));
-    assert(incmptfmts);
-    inpixmap.cmptfmts = incmptfmts;
-    for (i = 0; i < numinclrchans; ++i) {
-        j = jas_image_getcmptbytype(inimage, JAS_IMAGE_CT_COLOR(i));
-        assert(j >= 0);
-        if (!(incmptfmts[i].buf = malloc(width * sizeof(long))))
-            goto error;
-        incmptfmts[i].prec = jas_image_cmptprec(inimage, j);
-        incmptfmts[i].sgnd = jas_image_cmptsgnd(inimage, j);
-        incmptfmts[i].width = width;
-        incmptfmts[i].height = 1;
-    }
-
-    outpixmap.numcmpts = numoutclrchans;
-    outcmptfmts = malloc(numoutclrchans * sizeof(jas_cmcmptfmt_t));
-    assert(outcmptfmts);
-    outpixmap.cmptfmts = outcmptfmts;
-
-    for (i = 0; i < numoutclrchans; ++i) {
-        j = jas_image_getcmptbytype(outimage, JAS_IMAGE_CT_COLOR(i));
-        assert(j >= 0);
-        if (!(outcmptfmts[i].buf = malloc(width * sizeof(long))))
-            goto error;
-        outcmptfmts[i].prec = jas_image_cmptprec(outimage, j);
-        outcmptfmts[i].sgnd = jas_image_cmptsgnd(outimage, j);
-        outcmptfmts[i].width = width;
-        outcmptfmts[i].height = 1;
-    }
-
-    for (i = 0; i < height; ++i) {
-        for (j = 0; j < numinclrchans; ++j) {
-            k = jas_image_getcmptbytype(inimage, JAS_IMAGE_CT_COLOR(j));
-            if (jas_image_readcmpt2(inimage, k, 0, i, width, 1, incmptfmts[j].buf))
-                goto error;
-        }
-        jas_cmxform_apply(xform, &inpixmap, &outpixmap);
-        for (j = 0; j < numoutclrchans; ++j) {
-            k = jas_image_getcmptbytype(outimage, JAS_IMAGE_CT_COLOR(j));
-            if (jas_image_writecmpt2(outimage, k, 0, i, width, 1, outcmptfmts[j].buf))
-                goto error;
-        }
-    }
-
-    for (i = 0; i < numoutclrchans; ++i)
-        jas_free(outcmptfmts[i].buf);
-    jas_free(outcmptfmts);
-    for (i = 0; i < numinclrchans; ++i)
-        jas_free(incmptfmts[i].buf);
-    jas_free(incmptfmts);
-    jas_cmxform_destroy(xform);
-    jas_image_destroy(inimage);
-
-#if 0
-jas_eprintf("INIMAGE\n");
-jas_image_dump(inimage, stderr);
-jas_eprintf("OUTIMAGE\n");
-jas_image_dump(outimage, stderr);
-#endif
-    return outimage;
-error:
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_init.c b/src/3rdparty/jasper/src/libjasper/base/jas_init.c
deleted file mode 100644
index c100190..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_init.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_init.h"
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-/* Initialize the image format table. */
-int jas_init()
-{
-    jas_image_fmtops_t fmtops;
-    int fmtid;
-
-    fmtid = 0;
-
-#if !defined(EXCLUDE_MIF_SUPPORT)
-    fmtops.decode = mif_decode;
-    fmtops.encode = mif_encode;
-    fmtops.validate = mif_validate;
-    jas_image_addfmt(fmtid, "mif", "mif", "My Image Format (MIF)", &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_PNM_SUPPORT)
-    fmtops.decode = pnm_decode;
-    fmtops.encode = pnm_encode;
-    fmtops.validate = pnm_validate;
-    jas_image_addfmt(fmtid, "pnm", "pnm", "Portable Graymap/Pixmap (PNM)",
-      &fmtops);
-    jas_image_addfmt(fmtid, "pnm", "pgm", "Portable Graymap/Pixmap (PNM)",
-      &fmtops);
-    jas_image_addfmt(fmtid, "pnm", "ppm", "Portable Graymap/Pixmap (PNM)",
-      &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_BMP_SUPPORT)
-    fmtops.decode = bmp_decode;
-    fmtops.encode = bmp_encode;
-    fmtops.validate = bmp_validate;
-    jas_image_addfmt(fmtid, "bmp", "bmp", "Microsoft Bitmap (BMP)", &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_RAS_SUPPORT)
-    fmtops.decode = ras_decode;
-    fmtops.encode = ras_encode;
-    fmtops.validate = ras_validate;
-    jas_image_addfmt(fmtid, "ras", "ras", "Sun Rasterfile (RAS)", &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_JP2_SUPPORT)
-    fmtops.decode = jp2_decode;
-    fmtops.encode = jp2_encode;
-    fmtops.validate = jp2_validate;
-    jas_image_addfmt(fmtid, "jp2", "jp2",
-      "JPEG-2000 JP2 File Format Syntax (ISO/IEC 15444-1)", &fmtops);
-    ++fmtid;
-    fmtops.decode = jpc_decode;
-    fmtops.encode = jpc_encode;
-    fmtops.validate = jpc_validate;
-    jas_image_addfmt(fmtid, "jpc", "jpc",
-      "JPEG-2000 Code Stream Syntax (ISO/IEC 15444-1)", &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_JPG_SUPPORT)
-    fmtops.decode = jpg_decode;
-    fmtops.encode = jpg_encode;
-    fmtops.validate = jpg_validate;
-    jas_image_addfmt(fmtid, "jpg", "jpg", "JPEG (ISO/IEC 10918-1)", &fmtops);
-    ++fmtid;
-#endif
-
-#if !defined(EXCLUDE_PGX_SUPPORT)
-    fmtops.decode = pgx_decode;
-    fmtops.encode = pgx_encode;
-    fmtops.validate = pgx_validate;
-    jas_image_addfmt(fmtid, "pgx", "pgx", "JPEG-2000 VM Format (PGX)", &fmtops);
-    ++fmtid;
-#endif
-
-    /* We must not register the JasPer library exit handler until after
-    at least one memory allocation is performed.  This is desirable
-    as it ensures that the JasPer exit handler is called before the
-    debug memory allocator exit handler. */
-    atexit(jas_cleanup);
-
-    return 0;
-}
-
-void jas_cleanup()
-{
-    jas_image_clearfmts();
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_malloc.c b/src/3rdparty/jasper/src/libjasper/base/jas_malloc.c
deleted file mode 100644
index df60818..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_malloc.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Memory Allocator
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/* We need the prototype for memset. */
-#include <string.h>
-
-#include "jasper/jas_malloc.h"
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-#if defined(DEBUG_MEMALLOC)
-#include "../../../local/src/memalloc.c"
-#endif
-
-#if !defined(DEBUG_MEMALLOC)
-
-#define MEMALLOC_ALIGNMENT	32
-#define MEMALLOC_ALIGN2
-#undef MEMALLOC_ALIGN2
-
-void *jas_malloc(size_t size)
-{
-#if defined(MEMALLOC_ALIGN2)
-    void *ptr;
-abort();
-    if (posix_memalign(&ptr, MEMALLOC_ALIGNMENT, size)) {
-        return 0;
-    }
-    return ptr;
-#endif
-    return malloc(size);
-}
-
-void jas_free(void *ptr)
-{
-    free(ptr);
-}
-
-void *jas_realloc(void *ptr, size_t size)
-{
-    return realloc(ptr, size);
-}
-
-void *jas_calloc(size_t nmemb, size_t size)
-{
-    void *ptr;
-    size_t n;
-    n = nmemb * size;
-    if (!(ptr = jas_malloc(n * sizeof(char)))) {
-        return 0;
-    }
-    memset(ptr, 0, n);
-    return ptr;
-}
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_seq.c b/src/3rdparty/jasper/src/libjasper/base/jas_seq.c
deleted file mode 100644
index 0dc4196..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_seq.c
+++ /dev/null
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sequence/Matrix Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-
-#include "jasper/jas_seq.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-
-/******************************************************************************\
-* Constructors and destructors.
-\******************************************************************************/
-
-jas_matrix_t *jas_seq2d_create(int xstart, int ystart, int xend, int yend)
-{
-    jas_matrix_t *matrix;
-    assert(xstart <= xend && ystart <= yend);
-    if (!(matrix = jas_matrix_create(yend - ystart, xend - xstart))) {
-        return 0;
-    }
-    matrix->xstart_ = xstart;
-    matrix->ystart_ = ystart;
-    matrix->xend_ = xend;
-    matrix->yend_ = yend;
-    return matrix;
-}
-
-jas_matrix_t *jas_matrix_create(int numrows, int numcols)
-{
-    jas_matrix_t *matrix;
-    int i;
-
-    if (!(matrix = jas_malloc(sizeof(jas_matrix_t)))) {
-        return 0;
-    }
-    matrix->flags_ = 0;
-    matrix->numrows_ = numrows;
-    matrix->numcols_ = numcols;
-    matrix->rows_ = 0;
-    matrix->maxrows_ = numrows;
-    matrix->data_ = 0;
-    matrix->datasize_ = numrows * numcols;
-
-    if (matrix->maxrows_ > 0) {
-        if (!(matrix->rows_ = jas_malloc(matrix->maxrows_ *
-          sizeof(jas_seqent_t *)))) {
-            jas_matrix_destroy(matrix);
-            return 0;
-        }
-    }
-
-    if (matrix->datasize_ > 0) {
-        if (!(matrix->data_ = jas_malloc(matrix->datasize_ *
-          sizeof(jas_seqent_t)))) {
-            jas_matrix_destroy(matrix);
-            return 0;
-        }
-    }
-
-    for (i = 0; i < numrows; ++i) {
-        matrix->rows_[i] = &matrix->data_[i * matrix->numcols_];
-    }
-
-    for (i = 0; i < matrix->datasize_; ++i) {
-        matrix->data_[i] = 0;
-    }
-
-    matrix->xstart_ = 0;
-    matrix->ystart_ = 0;
-    matrix->xend_ = matrix->numcols_;
-    matrix->yend_ = matrix->numrows_;
-
-    return matrix;
-}
-
-void jas_matrix_destroy(jas_matrix_t *matrix)
-{
-    if (matrix->data_) {
-        assert(!(matrix->flags_ & JAS_MATRIX_REF));
-        jas_free(matrix->data_);
-        matrix->data_ = 0;
-    }
-    if (matrix->rows_) {
-        jas_free(matrix->rows_);
-        matrix->rows_ = 0;
-    }
-    jas_free(matrix);
-}
-
-jas_seq2d_t *jas_seq2d_copy(jas_seq2d_t *x)
-{
-    jas_matrix_t *y;
-    int i;
-    int j;
-    y = jas_seq2d_create(jas_seq2d_xstart(x), jas_seq2d_ystart(x), jas_seq2d_xend(x),
-      jas_seq2d_yend(x));
-    assert(y);
-    for (i = 0; i < x->numrows_; ++i) {
-        for (j = 0; j < x->numcols_; ++j) {
-            *jas_matrix_getref(y, i, j) = jas_matrix_get(x, i, j);
-        }
-    }
-    return y;
-}
-
-jas_matrix_t *jas_matrix_copy(jas_matrix_t *x)
-{
-    jas_matrix_t *y;
-    int i;
-    int j;
-    y = jas_matrix_create(x->numrows_, x->numcols_);
-    for (i = 0; i < x->numrows_; ++i) {
-        for (j = 0; j < x->numcols_; ++j) {
-            *jas_matrix_getref(y, i, j) = jas_matrix_get(x, i, j);
-        }
-    }
-    return y;
-}
-
-/******************************************************************************\
-* Bind operations.
-\******************************************************************************/
-
-void jas_seq2d_bindsub(jas_matrix_t *s, jas_matrix_t *s1, int xstart, int ystart,
-  int xend, int yend)
-{
-    jas_matrix_bindsub(s, s1, ystart - s1->ystart_, xstart - s1->xstart_,
-      yend - s1->ystart_ - 1, xend - s1->xstart_ - 1);
-}
-
-void jas_matrix_bindsub(jas_matrix_t *mat0, jas_matrix_t *mat1, int r0, int c0,
-  int r1, int c1)
-{
-    int i;
-
-    if (mat0->data_) {
-        if (!(mat0->flags_ & JAS_MATRIX_REF)) {
-            jas_free(mat0->data_);
-        }
-        mat0->data_ = 0;
-        mat0->datasize_ = 0;
-    }
-    if (mat0->rows_) {
-        jas_free(mat0->rows_);
-        mat0->rows_ = 0;
-    }
-    mat0->flags_ |= JAS_MATRIX_REF;
-    mat0->numrows_ = r1 - r0 + 1;
-    mat0->numcols_ = c1 - c0 + 1;
-    mat0->maxrows_ = mat0->numrows_;
-    mat0->rows_ = jas_malloc(mat0->maxrows_ * sizeof(jas_seqent_t *));
-    for (i = 0; i < mat0->numrows_; ++i) {
-        mat0->rows_[i] = mat1->rows_[r0 + i] + c0;
-    }
-
-    mat0->xstart_ = mat1->xstart_ + c0;
-    mat0->ystart_ = mat1->ystart_ + r0;
-    mat0->xend_ = mat0->xstart_ + mat0->numcols_;
-    mat0->yend_ = mat0->ystart_ + mat0->numrows_;
-}
-
-/******************************************************************************\
-* Arithmetic operations.
-\******************************************************************************/
-
-int jas_matrix_cmp(jas_matrix_t *mat0, jas_matrix_t *mat1)
-{
-    int i;
-    int j;
-
-    if (mat0->numrows_ != mat1->numrows_ || mat0->numcols_ !=
-      mat1->numcols_) {
-        return 1;
-    }
-    for (i = 0; i < mat0->numrows_; i++) {
-        for (j = 0; j < mat0->numcols_; j++) {
-            if (jas_matrix_get(mat0, i, j) != jas_matrix_get(mat1, i, j)) {
-                return 1;
-            }
-        }
-    }
-    return 0;
-}
-
-void jas_matrix_divpow2(jas_matrix_t *matrix, int n)
-{
-    int i;
-    int j;
-    jas_seqent_t *rowstart;
-    int rowstep;
-    jas_seqent_t *data;
-
-    rowstep = jas_matrix_rowstep(matrix);
-    for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-      rowstart += rowstep) {
-        for (j = matrix->numcols_, data = rowstart; j > 0; --j,
-          ++data) {
-            *data = (*data >= 0) ? ((*data) >> n) :
-              (-((-(*data)) >> n));
-        }
-    }
-}
-
-void jas_matrix_clip(jas_matrix_t *matrix, jas_seqent_t minval, jas_seqent_t maxval)
-{
-    int i;
-    int j;
-    jas_seqent_t v;
-    jas_seqent_t *rowstart;
-    jas_seqent_t *data;
-    int rowstep;
-
-    rowstep = jas_matrix_rowstep(matrix);
-    for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-      rowstart += rowstep) {
-        data = rowstart;
-        for (j = matrix->numcols_, data = rowstart; j > 0; --j,
-          ++data) {
-            v = *data;
-            if (v < minval) {
-                *data = minval;
-            } else if (v > maxval) {
-                *data = maxval;
-            }
-        }
-    }
-}
-
-void jas_matrix_asr(jas_matrix_t *matrix, int n)
-{
-    int i;
-    int j;
-    jas_seqent_t *rowstart;
-    int rowstep;
-    jas_seqent_t *data;
-
-    assert(n >= 0);
-    rowstep = jas_matrix_rowstep(matrix);
-    for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-      rowstart += rowstep) {
-        for (j = matrix->numcols_, data = rowstart; j > 0; --j,
-          ++data) {
-            *data >>= n;
-        }
-    }
-}
-
-void jas_matrix_asl(jas_matrix_t *matrix, int n)
-{
-    int i;
-    int j;
-    jas_seqent_t *rowstart;
-    int rowstep;
-    jas_seqent_t *data;
-
-    rowstep = jas_matrix_rowstep(matrix);
-    for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-      rowstart += rowstep) {
-        for (j = matrix->numcols_, data = rowstart; j > 0; --j,
-          ++data) {
-            *data <<= n;
-        }
-    }
-}
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-int jas_matrix_resize(jas_matrix_t *matrix, int numrows, int numcols)
-{
-    int size;
-    int i;
-
-    size = numrows * numcols;
-    if (size > matrix->datasize_ || numrows > matrix->maxrows_) {
-        return -1;
-    }
-
-    matrix->numrows_ = numrows;
-    matrix->numcols_ = numcols;
-
-    for (i = 0; i < numrows; ++i) {
-        matrix->rows_[i] = &matrix->data_[numcols * i];
-    }
-
-    return 0;
-}
-
-void jas_matrix_setall(jas_matrix_t *matrix, jas_seqent_t val)
-{
-    int i;
-    int j;
-    jas_seqent_t *rowstart;
-    int rowstep;
-    jas_seqent_t *data;
-
-    rowstep = jas_matrix_rowstep(matrix);
-    for (i = matrix->numrows_, rowstart = matrix->rows_[0]; i > 0; --i,
-      rowstart += rowstep) {
-        for (j = matrix->numcols_, data = rowstart; j > 0; --j,
-          ++data) {
-            *data = val;
-        }
-    }
-}
-
-jas_matrix_t *jas_seq2d_input(FILE *in)
-{
-    jas_matrix_t *matrix;
-    int i;
-    int j;
-    long x;
-    int numrows;
-    int numcols;
-    int xoff;
-    int yoff;
-
-    if (fscanf(in, "%d %d", &xoff, &yoff) != 2)
-        return 0;
-    if (fscanf(in, "%d %d", &numcols, &numrows) != 2)
-        return 0;
-    if (!(matrix = jas_seq2d_create(xoff, yoff, xoff + numcols, yoff + numrows)))
-        return 0;
-
-    if (jas_matrix_numrows(matrix) != numrows || jas_matrix_numcols(matrix) != numcols) {
-        abort();
-    }
-
-    /* Get matrix data. */
-    for (i = 0; i < jas_matrix_numrows(matrix); i++) {
-        for (j = 0; j < jas_matrix_numcols(matrix); j++) {
-            if (fscanf(in, "%ld", &x) != 1) {
-                jas_matrix_destroy(matrix);
-                return 0;
-            }
-            jas_matrix_set(matrix, i, j, JAS_CAST(jas_seqent_t, x));
-        }
-    }
-
-    return matrix;
-}
-
-int jas_seq2d_output(jas_matrix_t *matrix, FILE *out)
-{
-#define MAXLINELEN	80
-    int i;
-    int j;
-    jas_seqent_t x;
-    char buf[MAXLINELEN + 1];
-    char sbuf[MAXLINELEN + 1];
-    int n;
-
-    fprintf(out, "%d %d\n", jas_seq2d_xstart(matrix),
-      jas_seq2d_ystart(matrix));
-    fprintf(out, "%d %d\n", jas_matrix_numcols(matrix),
-      jas_matrix_numrows(matrix));
-
-    buf[0] = '\0';
-    for (i = 0; i < jas_matrix_numrows(matrix); ++i) {
-        for (j = 0; j < jas_matrix_numcols(matrix); ++j) {
-            x = jas_matrix_get(matrix, i, j);
-            sprintf(sbuf, "%s%4ld", (strlen(buf) > 0) ? " " : "",
-              JAS_CAST(long, x));
-            n = strlen(buf);
-            if (n + strlen(sbuf) > MAXLINELEN) {
-                fputs(buf, out);
-                fputs("\n", out);
-                buf[0] = '\0';
-            }
-            strcat(buf, sbuf);
-            if (j == jas_matrix_numcols(matrix) - 1) {
-                fputs(buf, out);
-                fputs("\n", out);
-                buf[0] = '\0';
-            }
-        }
-    }
-    fputs(buf, out);
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_stream.c b/src/3rdparty/jasper/src/libjasper/base/jas_stream.c
deleted file mode 100644
index 87eecc7..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_stream.c
+++ /dev/null
@@ -1,1150 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * I/O Stream Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
-#endif
-#include <stdlib.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <ctype.h>
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#if defined(WIN32) || defined(HAVE_IO_H)
-#include <io.h>
-#endif
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static int jas_strtoopenmode(const char *s);
-static void jas_stream_destroy(jas_stream_t *stream);
-static jas_stream_t *jas_stream_create(void);
-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
-  int bufsize);
-
-static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt);
-static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt);
-static long mem_seek(jas_stream_obj_t *obj, long offset, int origin);
-static int mem_close(jas_stream_obj_t *obj);
-
-static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt);
-static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt);
-static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin);
-static int sfile_close(jas_stream_obj_t *obj);
-
-static int file_read(jas_stream_obj_t *obj, char *buf, int cnt);
-static int file_write(jas_stream_obj_t *obj, char *buf, int cnt);
-static long file_seek(jas_stream_obj_t *obj, long offset, int origin);
-static int file_close(jas_stream_obj_t *obj);
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-static jas_stream_ops_t jas_stream_fileops = {
-    file_read,
-    file_write,
-    file_seek,
-    file_close
-};
-
-static jas_stream_ops_t jas_stream_sfileops = {
-    sfile_read,
-    sfile_write,
-    sfile_seek,
-    sfile_close
-};
-
-static jas_stream_ops_t jas_stream_memops = {
-    mem_read,
-    mem_write,
-    mem_seek,
-    mem_close
-};
-
-/******************************************************************************\
-* Code for opening and closing streams.
-\******************************************************************************/
-
-static jas_stream_t *jas_stream_create()
-{
-    jas_stream_t *stream;
-
-    if (!(stream = jas_malloc(sizeof(jas_stream_t)))) {
-        return 0;
-    }
-    stream->openmode_ = 0;
-    stream->bufmode_ = 0;
-    stream->flags_ = 0;
-    stream->bufbase_ = 0;
-    stream->bufstart_ = 0;
-    stream->bufsize_ = 0;
-    stream->ptr_ = 0;
-    stream->cnt_ = 0;
-    stream->ops_ = 0;
-    stream->obj_ = 0;
-    stream->rwcnt_ = 0;
-    stream->rwlimit_ = -1;
-
-    return stream;
-}
-
-jas_stream_t *jas_stream_memopen(char *buf, int bufsize)
-{
-    jas_stream_t *stream;
-    jas_stream_memobj_t *obj;
-
-    if (!(stream = jas_stream_create())) {
-        return 0;
-    }
-
-    /* A stream associated with a memory buffer is always opened
-    for both reading and writing in binary mode. */
-    stream->openmode_ = JAS_STREAM_READ | JAS_STREAM_WRITE | JAS_STREAM_BINARY;
-
-    /* Since the stream data is already resident in memory, buffering
-    is not necessary. */
-    /* But... It still may be faster to use buffering anyways. */
-    jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-
-    /* Select the operations for a memory stream. */
-    stream->ops_ = &jas_stream_memops;
-
-    /* Allocate memory for the underlying memory stream object. */
-    if (!(obj = jas_malloc(sizeof(jas_stream_memobj_t)))) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-    stream->obj_ = (void *) obj;
-
-    /* Initialize a few important members of the memory stream object. */
-    obj->myalloc_ = 0;
-    obj->buf_ = 0;
-
-    /* If the buffer size specified is nonpositive, then the buffer
-    is allocated internally and automatically grown as needed. */
-    if (bufsize <= 0) {
-        obj->bufsize_ = 1024;
-        obj->growable_ = 1;
-    } else {
-        obj->bufsize_ = bufsize;
-        obj->growable_ = 0;
-    }
-    if (buf) {
-        obj->buf_ = (unsigned char *) buf;
-    } else {
-        obj->buf_ = jas_malloc(obj->bufsize_ * sizeof(char));
-        obj->myalloc_ = 1;
-    }
-    if (!obj->buf_) {
-        jas_stream_close(stream);
-        return 0;
-    }
-
-    if (bufsize > 0 && buf) {
-        /* If a buffer was supplied by the caller and its length is positive,
-          make the associated buffer data appear in the stream initially. */
-        obj->len_ = bufsize;
-    } else {
-        /* The stream is initially empty. */
-        obj->len_ = 0;
-    }
-    obj->pos_ = 0;
-
-    return stream;
-}
-
-jas_stream_t *jas_stream_fopen(const char *filename, const char *mode)
-{
-    jas_stream_t *stream;
-    jas_stream_fileobj_t *obj;
-    int openflags;
-
-    /* Allocate a stream object. */
-    if (!(stream = jas_stream_create())) {
-        return 0;
-    }
-
-    /* Parse the mode string. */
-    stream->openmode_ = jas_strtoopenmode(mode);
-
-    /* Determine the correct flags to use for opening the file. */
-    if ((stream->openmode_ & JAS_STREAM_READ) &&
-      (stream->openmode_ & JAS_STREAM_WRITE)) {
-        openflags = O_RDWR;
-    } else if (stream->openmode_ & JAS_STREAM_READ) {
-        openflags = O_RDONLY;
-    } else if (stream->openmode_ & JAS_STREAM_WRITE) {
-        openflags = O_WRONLY;
-    } else {
-        openflags = 0;
-    }
-    if (stream->openmode_ & JAS_STREAM_APPEND) {
-        openflags |= O_APPEND;
-    }
-    if (stream->openmode_ & JAS_STREAM_BINARY) {
-        openflags |= O_BINARY;
-    }
-    if (stream->openmode_ & JAS_STREAM_CREATE) {
-        openflags |= O_CREAT | O_TRUNC;
-    }
-
-    /* Allocate space for the underlying file stream object. */
-    if (!(obj = jas_malloc(sizeof(jas_stream_fileobj_t)))) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-    obj->fd = -1;
-    obj->flags = 0;
-    obj->pathname[0] = '\0';
-    stream->obj_ = (void *) obj;
-
-    /* Select the operations for a file stream object. */
-    stream->ops_ = &jas_stream_fileops;
-
-    /* Open the underlying file. */
-    if ((obj->fd = open(filename, openflags, JAS_STREAM_PERMS)) < 0) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-
-    /* By default, use full buffering for this type of stream. */
-    jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-
-    return stream;
-}
-
-jas_stream_t *jas_stream_freopen(const char *path, const char *mode, FILE *fp)
-{
-    jas_stream_t *stream;
-    int openflags;
-
-    /* Eliminate compiler warning about unused variable. */
-    path = 0;
-
-    /* Allocate a stream object. */
-    if (!(stream = jas_stream_create())) {
-        return 0;
-    }
-
-    /* Parse the mode string. */
-    stream->openmode_ = jas_strtoopenmode(mode);
-
-    /* Determine the correct flags to use for opening the file. */
-    if ((stream->openmode_ & JAS_STREAM_READ) &&
-      (stream->openmode_ & JAS_STREAM_WRITE)) {
-        openflags = O_RDWR;
-    } else if (stream->openmode_ & JAS_STREAM_READ) {
-        openflags = O_RDONLY;
-    } else if (stream->openmode_ & JAS_STREAM_WRITE) {
-        openflags = O_WRONLY;
-    } else {
-        openflags = 0;
-    }
-    if (stream->openmode_ & JAS_STREAM_APPEND) {
-        openflags |= O_APPEND;
-    }
-    if (stream->openmode_ & JAS_STREAM_BINARY) {
-        openflags |= O_BINARY;
-    }
-    if (stream->openmode_ & JAS_STREAM_CREATE) {
-        openflags |= O_CREAT | O_TRUNC;
-    }
-
-    stream->obj_ = JAS_CAST(void *, fp);
-
-    /* Select the operations for a file stream object. */
-    stream->ops_ = &jas_stream_sfileops;
-
-    /* By default, use full buffering for this type of stream. */
-    jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-
-    return stream;
-}
-
-jas_stream_t *jas_stream_tmpfile()
-{
-    jas_stream_t *stream;
-    jas_stream_fileobj_t *obj;
-
-    if (!(stream = jas_stream_create())) {
-        return 0;
-    }
-
-    /* A temporary file stream is always opened for both reading and
-    writing in binary mode. */
-    stream->openmode_ = JAS_STREAM_READ | JAS_STREAM_WRITE | JAS_STREAM_BINARY;
-
-    /* Allocate memory for the underlying temporary file object. */
-    if (!(obj = jas_malloc(sizeof(jas_stream_fileobj_t)))) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-    obj->fd = -1;
-    obj->flags = 0;
-    obj->pathname[0] = '\0';
-    stream->obj_ = obj;
-
-    /* Choose a file name. */
-    tmpnam(obj->pathname);
-
-    /* Open the underlying file. */
-    if ((obj->fd = open(obj->pathname, O_CREAT | O_EXCL | O_RDWR | O_TRUNC | O_BINARY,
-      JAS_STREAM_PERMS)) < 0) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-
-    /* Unlink the file so that it will disappear if the program
-    terminates abnormally. */
-    /* Under UNIX, one can unlink an open file and continue to do I/O
-    on it.  Not all operating systems support this functionality, however.
-    For example, under Microsoft Windows the unlink operation will fail,
-    since the file is open. */
-    if (unlink(obj->pathname)) {
-        /* We will try unlinking the file again after it is closed. */
-        obj->flags |= JAS_STREAM_FILEOBJ_DELONCLOSE;
-    }
-
-    /* Use full buffering. */
-    jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-
-    stream->ops_ = &jas_stream_fileops;
-
-    return stream;
-}
-
-jas_stream_t *jas_stream_fdopen(int fd, const char *mode)
-{
-    jas_stream_t *stream;
-    jas_stream_fileobj_t *obj;
-
-    /* Allocate a stream object. */
-    if (!(stream = jas_stream_create())) {
-        return 0;
-    }
-
-    /* Parse the mode string. */
-    stream->openmode_ = jas_strtoopenmode(mode);
-
-#if defined(WIN32)
-    /* Argh!!!  Someone ought to banish text mode (i.e., O_TEXT) to the
-      greatest depths of purgatory! */
-    /* Ensure that the file descriptor is in binary mode, if the caller
-      has specified the binary mode flag.  Arguably, the caller ought to
-      take care of this, but text mode is a ugly wart anyways, so we save
-      the caller some grief by handling this within the stream library. */
-    /* This ugliness is mainly for the benefit of those who run the
-      JasPer software under Windows from shells that insist on opening
-      files in text mode.  For example, in the Cygwin environment,
-      shells often open files in text mode when I/O redirection is
-      used.  Grr... */
-    if (stream->openmode_ & JAS_STREAM_BINARY) {
-        setmode(fd, O_BINARY);
-    }
-#endif
-
-    /* Allocate space for the underlying file stream object. */
-    if (!(obj = jas_malloc(sizeof(jas_stream_fileobj_t)))) {
-        jas_stream_destroy(stream);
-        return 0;
-    }
-    obj->fd = fd;
-    obj->flags = 0;
-    obj->pathname[0] = '\0';
-    stream->obj_ = (void *) obj;
-
-    /* Do not close the underlying file descriptor when the stream is
-    closed. */
-    obj->flags |= JAS_STREAM_FILEOBJ_NOCLOSE;
-
-    /* By default, use full buffering for this type of stream. */
-    jas_stream_initbuf(stream, JAS_STREAM_FULLBUF, 0, 0);
-
-    /* Select the operations for a file stream object. */
-    stream->ops_ = &jas_stream_fileops;
-
-    return stream;
-}
-
-static void jas_stream_destroy(jas_stream_t *stream)
-{
-    /* If the memory for the buffer was allocated with malloc, free
-    this memory. */
-    if ((stream->bufmode_ & JAS_STREAM_FREEBUF) && stream->bufbase_) {
-        jas_free(stream->bufbase_);
-        stream->bufbase_ = 0;
-    }
-    jas_free(stream);
-}
-
-int jas_stream_close(jas_stream_t *stream)
-{
-    /* Flush buffer if necessary. */
-    jas_stream_flush(stream);
-
-    /* Close the underlying stream object. */
-    (*stream->ops_->close_)(stream->obj_);
-
-    jas_stream_destroy(stream);
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for reading and writing streams.
-\******************************************************************************/
-
-int jas_stream_getc_func(jas_stream_t *stream)
-{
-    assert(stream->ptr_ - stream->bufbase_ <= stream->bufsize_ +
-      JAS_STREAM_MAXPUTBACK);
-    return jas_stream_getc_macro(stream);
-}
-
-int jas_stream_putc_func(jas_stream_t *stream, int c)
-{
-    assert(stream->ptr_ - stream->bufstart_ <= stream->bufsize_);
-    return jas_stream_putc_macro(stream, c);
-}
-
-int jas_stream_ungetc(jas_stream_t *stream, int c)
-{
-    if (!stream->ptr_ || stream->ptr_ == stream->bufbase_) {
-        return -1;
-    }
-
-    /* Reset the EOF indicator (since we now have at least one character
-      to read). */
-    stream->flags_ &= ~JAS_STREAM_EOF;
-
-    --stream->rwcnt_;
-    --stream->ptr_;
-    ++stream->cnt_;
-    *stream->ptr_ = c;
-    return 0;
-}
-
-int jas_stream_read(jas_stream_t *stream, void *buf, int cnt)
-{
-    int n;
-    int c;
-    char *bufptr;
-
-    bufptr = buf;
-
-    n = 0;
-    while (n < cnt) {
-        if ((c = jas_stream_getc(stream)) == EOF) {
-            return n;
-        }
-        *bufptr++ = c;
-        ++n;
-    }
-
-    return n;
-}
-
-int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt)
-{
-    int n;
-    const char *bufptr;
-
-    bufptr = buf;
-
-    n = 0;
-    while (n < cnt) {
-        if (jas_stream_putc(stream, *bufptr) == EOF) {
-            return n;
-        }
-        ++bufptr;
-        ++n;
-    }
-
-    return n;
-}
-
-/* Note: This function uses a fixed size buffer.  Therefore, it cannot
-  handle invocations that will produce more output than can be held
-  by the buffer. */
-int jas_stream_printf(jas_stream_t *stream, const char *fmt, ...)
-{
-    va_list ap;
-    char buf[4096];
-    int ret;
-
-    va_start(ap, fmt);
-    ret = vsprintf(buf, fmt, ap);
-    jas_stream_puts(stream, buf);
-    va_end(ap);
-    return ret;
-}
-
-int jas_stream_puts(jas_stream_t *stream, const char *s)
-{
-    while (*s != '\0') {
-        if (jas_stream_putc_macro(stream, *s) == EOF) {
-            return -1;
-        }
-        ++s;
-    }
-    return 0;
-}
-
-char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize)
-{
-    int c;
-    char *bufptr;
-    assert(bufsize > 0);
-
-    bufptr = buf;
-    while (bufsize > 1) {
-        if ((c = jas_stream_getc(stream)) == EOF) {
-            break;
-        }
-        *bufptr++ = c;
-        --bufsize;
-        if (c == '\n') {
-            break;
-        }
-    }
-    *bufptr = '\0';
-    return buf;
-}
-
-int jas_stream_gobble(jas_stream_t *stream, int n)
-{
-    int m;
-    m = n;
-    for (m = n; m > 0; --m) {
-        if (jas_stream_getc(stream) == EOF) {
-            return n - m;
-        }
-    }
-    return n;
-}
-
-int jas_stream_pad(jas_stream_t *stream, int n, int c)
-{
-    int m;
-    m = n;
-    for (m = n; m > 0; --m) {
-        if (jas_stream_putc(stream, c) == EOF)
-            return n - m;
-    }
-    return n;
-}
-
-/******************************************************************************\
-* Code for getting and setting the stream position.
-\******************************************************************************/
-
-int jas_stream_isseekable(jas_stream_t *stream)
-{
-    if (stream->ops_ == &jas_stream_memops) {
-        return 1;
-    } else if (stream->ops_ == &jas_stream_fileops) {
-        if ((*stream->ops_->seek_)(stream->obj_, 0, SEEK_CUR) < 0) {
-            return 0;
-        }
-        return 1;
-    } else {
-        return 0;
-    }
-}
-
-int jas_stream_rewind(jas_stream_t *stream)
-{
-    return jas_stream_seek(stream, 0, SEEK_SET);
-}
-
-long jas_stream_seek(jas_stream_t *stream, long offset, int origin)
-{
-    long newpos;
-
-    /* The buffer cannot be in use for both reading and writing. */
-    assert(!((stream->bufmode_ & JAS_STREAM_RDBUF) && (stream->bufmode_ &
-      JAS_STREAM_WRBUF)));
-
-    /* Reset the EOF indicator (since we may not be at the EOF anymore). */
-    stream->flags_ &= ~JAS_STREAM_EOF;
-
-    if (stream->bufmode_ & JAS_STREAM_RDBUF) {
-        if (origin == SEEK_CUR) {
-            offset -= stream->cnt_;
-        }
-    } else if (stream->bufmode_ & JAS_STREAM_WRBUF) {
-        if (jas_stream_flush(stream)) {
-            return -1;
-        }
-    }
-    stream->cnt_ = 0;
-    stream->ptr_ = stream->bufstart_;
-    stream->bufmode_ &= ~(JAS_STREAM_RDBUF | JAS_STREAM_WRBUF);
-
-    if ((newpos = (*stream->ops_->seek_)(stream->obj_, offset, origin))
-      < 0) {
-        return -1;
-    }
-
-    return newpos;
-}
-
-long jas_stream_tell(jas_stream_t *stream)
-{
-    int adjust;
-    int offset;
-
-    if (stream->bufmode_ & JAS_STREAM_RDBUF) {
-        adjust = -stream->cnt_;
-    } else if (stream->bufmode_ & JAS_STREAM_WRBUF) {
-        adjust = stream->ptr_ - stream->bufstart_;
-    } else {
-        adjust = 0;
-    }
-
-    if ((offset = (*stream->ops_->seek_)(stream->obj_, 0, SEEK_CUR)) < 0) {
-        return -1;
-    }
-
-    return offset + adjust;
-}
-
-/******************************************************************************\
-* Buffer initialization code.
-\******************************************************************************/
-
-static void jas_stream_initbuf(jas_stream_t *stream, int bufmode, char *buf,
-  int bufsize)
-{
-    /* If this function is being called, the buffer should not have been
-      initialized yet. */
-    assert(!stream->bufbase_);
-
-    if (bufmode != JAS_STREAM_UNBUF) {
-        /* The full- or line-buffered mode is being employed. */
-        if (!buf) {
-            /* The caller has not specified a buffer to employ, so allocate
-              one. */
-            if ((stream->bufbase_ = jas_malloc(JAS_STREAM_BUFSIZE +
-              JAS_STREAM_MAXPUTBACK))) {
-                stream->bufmode_ |= JAS_STREAM_FREEBUF;
-                stream->bufsize_ = JAS_STREAM_BUFSIZE;
-            } else {
-                /* The buffer allocation has failed.  Resort to unbuffered
-                  operation. */
-                stream->bufbase_ = stream->tinybuf_;
-                stream->bufsize_ = 1;
-            }
-        } else {
-            /* The caller has specified a buffer to employ. */
-            /* The buffer must be large enough to accommodate maximum
-              putback. */
-            assert(bufsize > JAS_STREAM_MAXPUTBACK);
-            stream->bufbase_ = JAS_CAST(uchar *, buf);
-            stream->bufsize_ = bufsize - JAS_STREAM_MAXPUTBACK;
-        }
-    } else {
-        /* The unbuffered mode is being employed. */
-        /* A buffer should not have been supplied by the caller. */
-        assert(!buf);
-        /* Use a trivial one-character buffer. */
-        stream->bufbase_ = stream->tinybuf_;
-        stream->bufsize_ = 1;
-    }
-    stream->bufstart_ = &stream->bufbase_[JAS_STREAM_MAXPUTBACK];
-    stream->ptr_ = stream->bufstart_;
-    stream->cnt_ = 0;
-    stream->bufmode_ |= bufmode & JAS_STREAM_BUFMODEMASK;
-}
-
-/******************************************************************************\
-* Buffer filling and flushing code.
-\******************************************************************************/
-
-int jas_stream_flush(jas_stream_t *stream)
-{
-    if (stream->bufmode_ & JAS_STREAM_RDBUF) {
-        return 0;
-    }
-    return jas_stream_flushbuf(stream, EOF);
-}
-
-int jas_stream_fillbuf(jas_stream_t *stream, int getflag)
-{
-    int c;
-
-    /* The stream must not be in an error or EOF state. */
-    if ((stream->flags_ & (JAS_STREAM_ERRMASK)) != 0) {
-        return EOF;
-    }
-
-    /* The stream must be open for reading. */
-    if ((stream->openmode_ & JAS_STREAM_READ) == 0) {
-        return EOF;
-    }
-
-    /* Make a half-hearted attempt to confirm that the buffer is not
-    currently being used for writing.  This check is not intended
-    to be foolproof! */
-    assert((stream->bufmode_ & JAS_STREAM_WRBUF) == 0);
-
-    assert(stream->ptr_ - stream->bufstart_ <= stream->bufsize_);
-
-    /* Mark the buffer as being used for reading. */
-    stream->bufmode_ |= JAS_STREAM_RDBUF;
-
-    /* Read new data into the buffer. */
-    stream->ptr_ = stream->bufstart_;
-    if ((stream->cnt_ = (*stream->ops_->read_)(stream->obj_,
-      (char *) stream->bufstart_, stream->bufsize_)) <= 0) {
-        if (stream->cnt_ < 0) {
-            stream->flags_ |= JAS_STREAM_ERR;
-        } else {
-            stream->flags_ |= JAS_STREAM_EOF;
-        }
-        stream->cnt_ = 0;
-        return EOF;
-    }
-
-    assert(stream->cnt_ > 0);
-    /* Get or peek at the first character in the buffer. */
-    c = (getflag) ? jas_stream_getc2(stream) : (*stream->ptr_);
-
-    return c;
-}
-
-int jas_stream_flushbuf(jas_stream_t *stream, int c)
-{
-    int len;
-    int n;
-
-    /* The stream should not be in an error or EOF state. */
-    if ((stream->flags_ & (JAS_STREAM_ERRMASK)) != 0) {
-        return EOF;
-    }
-
-    /* The stream must be open for writing. */
-    if ((stream->openmode_ & (JAS_STREAM_WRITE | JAS_STREAM_APPEND)) == 0) {
-        return EOF;
-    }
-
-    /* The buffer should not currently be in use for reading. */
-    assert(!(stream->bufmode_ & JAS_STREAM_RDBUF));
-
-    /* Note: Do not use the quantity stream->cnt to determine the number
-    of characters in the buffer!  Depending on how this function was
-    called, the stream->cnt value may be "off-by-one". */
-    len = stream->ptr_ - stream->bufstart_;
-    if (len > 0) {
-        n = (*stream->ops_->write_)(stream->obj_, (char *)
-          stream->bufstart_, len);
-        if (n != len) {
-            stream->flags_ |= JAS_STREAM_ERR;
-            return EOF;
-        }
-    }
-    stream->cnt_ = stream->bufsize_;
-    stream->ptr_ = stream->bufstart_;
-
-    stream->bufmode_ |= JAS_STREAM_WRBUF;
-
-    if (c != EOF) {
-        assert(stream->cnt_ > 0);
-        return jas_stream_putc2(stream, c);
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Miscellaneous code.
-\******************************************************************************/
-
-static int jas_strtoopenmode(const char *s)
-{
-    int openmode = 0;
-    while (*s != '\0') {
-        switch (*s) {
-        case 'r':
-            openmode |= JAS_STREAM_READ;
-            break;
-        case 'w':
-            openmode |= JAS_STREAM_WRITE | JAS_STREAM_CREATE;
-            break;
-        case 'b':
-            openmode |= JAS_STREAM_BINARY;
-            break;
-        case 'a':
-            openmode |= JAS_STREAM_APPEND;
-            break;
-        case '+':
-            openmode |= JAS_STREAM_READ | JAS_STREAM_WRITE;
-            break;
-        default:
-            break;
-        }
-        ++s;
-    }
-    return openmode;
-}
-
-int jas_stream_copy(jas_stream_t *out, jas_stream_t *in, int n)
-{
-    int all;
-    int c;
-    int m;
-
-    all = (n < 0) ? 1 : 0;
-
-    m = n;
-    while (all || m > 0) {
-        if ((c = jas_stream_getc_macro(in)) == EOF) {
-            /* The next character of input could not be read. */
-            /* Return with an error if an I/O error occured
-              (not including EOF) or if an explicit copy count
-              was specified. */
-            return (!all || jas_stream_error(in)) ? (-1) : 0;
-        }
-        if (jas_stream_putc_macro(out, c) == EOF) {
-            return -1;
-        }
-        --m;
-    }
-    return 0;
-}
-
-long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt)
-{
-    int old;
-
-    old = stream->rwcnt_;
-    stream->rwcnt_ = rwcnt;
-    return old;
-}
-
-int jas_stream_display(jas_stream_t *stream, FILE *fp, int n)
-{
-    unsigned char buf[16];
-    int i;
-    int j;
-    int m;
-    int c;
-    int display;
-    int cnt;
-
-    cnt = n - (n % 16);
-    display = 1;
-
-    for (i = 0; i < n; i += 16) {
-        if (n > 16 && i > 0) {
-            display = (i >= cnt) ? 1 : 0;
-        }
-        if (display) {
-            fprintf(fp, "%08x:", i);
-        }
-        m = JAS_MIN(n - i, 16);
-        for (j = 0; j < m; ++j) {
-            if ((c = jas_stream_getc(stream)) == EOF) {
-                abort();
-                return -1;
-            }
-            buf[j] = c;
-        }
-        if (display) {
-            for (j = 0; j < m; ++j) {
-                fprintf(fp, " %02x", buf[j]);
-            }
-            fputc(' ', fp);
-            for (; j < 16; ++j) {
-                fprintf(fp, "   ");
-            }
-            for (j = 0; j < m; ++j) {
-                if (isprint(buf[j])) {
-                    fputc(buf[j], fp);
-                } else {
-                    fputc(' ', fp);
-                }
-            }
-            fprintf(fp, "\n");
-        }
-
-
-    }
-    return 0;
-}
-
-long jas_stream_length(jas_stream_t *stream)
-{
-    long oldpos;
-    long pos;
-    if ((oldpos = jas_stream_tell(stream)) < 0) {
-        return -1;
-    }
-    if (jas_stream_seek(stream, 0, SEEK_END) < 0) {
-        return -1;
-    }
-    if ((pos = jas_stream_tell(stream)) < 0) {
-        return -1;
-    }
-    if (jas_stream_seek(stream, oldpos, SEEK_SET) < 0) {
-        return -1;
-    }
-    return pos;
-}
-
-/******************************************************************************\
-* Memory stream object.
-\******************************************************************************/
-
-static int mem_read(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    int n;
-    jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj;
-    n = m->len_ - m->pos_;
-    cnt = JAS_MIN(n, cnt);
-    memcpy(buf, &m->buf_[m->pos_], cnt);
-    m->pos_ += cnt;
-    return cnt;
-}
-
-static int mem_resize(jas_stream_memobj_t *m, int bufsize)
-{
-    unsigned char *buf;
-
-    assert(m->buf_);
-    if (!(buf = jas_realloc(m->buf_, bufsize * sizeof(unsigned char)))) {
-        return -1;
-    }
-    m->buf_ = buf;
-    m->bufsize_ = bufsize;
-    return 0;
-}
-
-static int mem_write(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    int n;
-    int ret;
-    jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj;
-    long newbufsize;
-    long newpos;
-
-    newpos = m->pos_ + cnt;
-    if (newpos > m->bufsize_ && m->growable_) {
-        newbufsize = m->bufsize_;
-        while (newbufsize < newpos) {
-            newbufsize <<= 1;
-            assert(newbufsize >= 0);
-        }
-        if (mem_resize(m, newbufsize)) {
-            return -1;
-        }
-    }
-    if (m->pos_ > m->len_) {
-        /* The current position is beyond the end of the file, so
-          pad the file to the current position with zeros. */
-        n = JAS_MIN(m->pos_, m->bufsize_) - m->len_;
-        if (n > 0) {
-            memset(&m->buf_[m->len_], 0, n);
-            m->len_ += n;
-        }
-        if (m->pos_ != m->len_) {
-            /* The buffer is not big enough. */
-            return 0;
-        }
-    }
-    n = m->bufsize_ - m->pos_;
-    ret = JAS_MIN(n, cnt);
-    if (ret > 0) {
-        memcpy(&m->buf_[m->pos_], buf, ret);
-        m->pos_ += ret;
-    }
-    if (m->pos_ > m->len_) {
-        m->len_ = m->pos_;
-    }
-assert(ret == cnt);
-    return ret;
-}
-
-static long mem_seek(jas_stream_obj_t *obj, long offset, int origin)
-{
-    jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj;
-    long newpos;
-
-    switch (origin) {
-    case SEEK_SET:
-        newpos = offset;
-        break;
-    case SEEK_END:
-        newpos = m->len_ - offset;
-        break;
-    case SEEK_CUR:
-        newpos = m->pos_ + offset;
-        break;
-    default:
-        abort();
-        break;
-    }
-    if (newpos < 0) {
-        return -1;
-    }
-    m->pos_ = newpos;
-
-    return m->pos_;
-}
-
-static int mem_close(jas_stream_obj_t *obj)
-{
-    jas_stream_memobj_t *m = (jas_stream_memobj_t *)obj;
-    if (m->myalloc_ && m->buf_) {
-        jas_free(m->buf_);
-        m->buf_ = 0;
-    }
-    jas_free(obj);
-    return 0;
-}
-
-/******************************************************************************\
-* File stream object.
-\******************************************************************************/
-
-static int file_read(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    jas_stream_fileobj_t *fileobj = JAS_CAST(jas_stream_fileobj_t *, obj);
-    return read(fileobj->fd, buf, cnt);
-}
-
-static int file_write(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    jas_stream_fileobj_t *fileobj = JAS_CAST(jas_stream_fileobj_t *, obj);
-    return write(fileobj->fd, buf, cnt);
-}
-
-static long file_seek(jas_stream_obj_t *obj, long offset, int origin)
-{
-    jas_stream_fileobj_t *fileobj = JAS_CAST(jas_stream_fileobj_t *, obj);
-    return lseek(fileobj->fd, offset, origin);
-}
-
-static int file_close(jas_stream_obj_t *obj)
-{
-    jas_stream_fileobj_t *fileobj = JAS_CAST(jas_stream_fileobj_t *, obj);
-    int ret;
-    ret = close(fileobj->fd);
-    if (fileobj->flags & JAS_STREAM_FILEOBJ_DELONCLOSE) {
-        unlink(fileobj->pathname);
-    }
-    jas_free(fileobj);
-    return ret;
-}
-
-/******************************************************************************\
-* Stdio file stream object.
-\******************************************************************************/
-
-static int sfile_read(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    FILE *fp;
-    fp = JAS_CAST(FILE *, obj);
-    return fread(buf, 1, cnt, fp);
-}
-
-static int sfile_write(jas_stream_obj_t *obj, char *buf, int cnt)
-{
-    FILE *fp;
-    fp = JAS_CAST(FILE *, obj);
-    return fwrite(buf, 1, cnt, fp);
-}
-
-static long sfile_seek(jas_stream_obj_t *obj, long offset, int origin)
-{
-    FILE *fp;
-    fp = JAS_CAST(FILE *, obj);
-    return fseek(fp, offset, origin);
-}
-
-static int sfile_close(jas_stream_obj_t *obj)
-{
-    FILE *fp;
-    fp = JAS_CAST(FILE *, obj);
-    return fclose(fp);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_string.c b/src/3rdparty/jasper/src/libjasper/base/jas_string.c
deleted file mode 100644
index 3534a5e..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_string.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * String Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include <string.h>
-
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_string.h"
-
-/******************************************************************************\
-* Miscellaneous Functions
-\******************************************************************************/
-
-/* This function is equivalent to the popular but non-standard (and
-  not-always-available) strdup function. */
-
-char *jas_strdup(const char *s)
-{
-    int n;
-    char *p;
-    n = strlen(s) + 1;
-    if (!(p = jas_malloc(n * sizeof(char)))) {
-        return 0;
-    }
-    strcpy(p, s);
-    return p;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_tmr.c b/src/3rdparty/jasper/src/libjasper/base/jas_tmr.c
deleted file mode 100644
index 029dace..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_tmr.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 2004 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Timing Routines
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-
-#include "jasper/jas_tmr.h"
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-#if defined(HAVE_GETTIMEOFDAY)
-
-void jas_tmr_start(jas_tmr_t *tmr)
-{
-    if (gettimeofday(&tmr->start, 0)) {
-        abort();
-    }
-}
-
-void jas_tmr_stop(jas_tmr_t *tmr)
-{
-    if (gettimeofday(&tmr->stop, 0)) {
-        abort();
-    }
-}
-
-double jas_tmr_get(jas_tmr_t *tmr)
-{
-    double t0;
-    double t1;
-    t0 = ((double) tmr->start.tv_sec) + ((double) tmr->start.tv_usec) / 1e6;
-    t1 = ((double) tmr->stop.tv_sec) + ((double) tmr->stop.tv_usec) / 1e6;
-    return t1 - t0;
-}
-
-#elif defined(HAVE_GETRUSAGE)
-
-void jas_tmr_start(jas_tmr_t *tmr)
-{
-    if (getrusage(RUSAGE_SELF, &tmr->start) < 0) {
-        abort();
-    }
-}
-
-void jas_tmr_stop(jas_tmr_t *tmr)
-{
-    if (getrusage(RUSAGE_SELF, &tmr->stop) < 0) {
-        abort();
-    }
-}
-
-double jas_tmr_get(jas_tmr_t *tmr)
-{
-    double t;
-    t = ((tmr->stop.ru_utime.tv_sec * 1e6 + tmr->stop.ru_utime.tv_usec) -
-      (tmr->start.ru_utime.tv_sec * 1e6 + tmr->start.ru_utime.tv_usec)) / 1e6;
-    t += ((tmr->stop.ru_stime.tv_sec * 1e6 + tmr->stop.ru_stime.tv_usec) -
-      (tmr->start.ru_stime.tv_sec * 1e6 + tmr->start.ru_stime.tv_usec)) / 1e6;
-    return t;
-}
-
-#else
-
-void jas_tmr_start(jas_tmr_t *tmr)
-{
-}
-
-void jas_tmr_stop(jas_tmr_t *tmr)
-{
-}
-
-double jas_tmr_get(jas_tmr_t *tmr)
-{
-    return 0.0;
-}
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_tvp.c b/src/3rdparty/jasper/src/libjasper/base/jas_tvp.c
deleted file mode 100644
index 1ca2438..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_tvp.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tag-Value Parser Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <stdlib.h>
-
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_tvp.h"
-
-/******************************************************************************\
-* Macros.
-\******************************************************************************/
-
-/* Is the specified character valid for a tag name? */
-#define	JAS_TVP_ISTAG(x) \
-    (isalpha(x) || (x) == '_' || isdigit(x))
-
-/******************************************************************************\
-* Code for creating and destroying a tag-value parser.
-\******************************************************************************/
-
-jas_tvparser_t *jas_tvparser_create(const char *s)
-{
-    jas_tvparser_t *tvp;
-    if (!(tvp = jas_malloc(sizeof(jas_tvparser_t)))) {
-        return 0;
-    }
-    if (!(tvp->buf = jas_strdup(s))) {
-        jas_tvparser_destroy(tvp);
-        return 0;
-    }
-    tvp->pos = tvp->buf;
-    tvp->tag = 0;
-    tvp->val = 0;
-    return tvp;
-}
-
-void jas_tvparser_destroy(jas_tvparser_t *tvp)
-{
-    if (tvp->buf) {
-        jas_free(tvp->buf);
-    }
-    jas_free(tvp);
-}
-
-/******************************************************************************\
-* Main parsing code.
-\******************************************************************************/
-
-/* Get the next tag-value pair. */
-int jas_tvparser_next(jas_tvparser_t *tvp)
-{
-    char *p;
-    char *tag;
-    char *val;
-
-    /* Skip any leading whitespace. */
-    p = tvp->pos;
-    while (*p != '\0' && isspace(*p)) {
-        ++p;
-    }
-
-    /* Has the end of the input data been reached? */
-    if (*p == '\0') {
-        /* No more tags are present. */
-        tvp->pos = p;
-        return 1;
-    }
-
-    /* Does the tag name begin with a valid character? */
-    if (!JAS_TVP_ISTAG(*p)) {
-        return -1;
-    }
-
-    /* Remember where the tag name begins. */
-    tag = p;
-
-    /* Find the end of the tag name. */
-    while (*p != '\0' && JAS_TVP_ISTAG(*p)) {
-        ++p;
-    }
-
-    /* Has the end of the input data been reached? */
-    if (*p == '\0') {
-        /* The value field is empty. */
-        tvp->tag = tag;
-        tvp->val = "";
-        tvp->pos = p;
-        return 0;
-    }
-
-    /* Is a value field not present? */
-    if (*p != '=') {
-        if (*p != '\0' && !isspace(*p)) {
-            return -1;
-        }
-        *p++ = '\0';
-        tvp->tag = tag;
-        tvp->val = "";
-        tvp->pos = p;
-        return 0;
-    }
-
-    *p++ = '\0';
-
-    val = p;
-    while (*p != '\0' && !isspace(*p)) {
-        ++p;
-    }
-
-    if (*p != '\0') {
-        *p++ = '\0';
-    }
-
-    tvp->pos = p;
-    tvp->tag = tag;
-    tvp->val = val;
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for querying the current tag/value.
-\******************************************************************************/
-
-/* Get the current tag. */
-char *jas_tvparser_gettag(jas_tvparser_t *tvp)
-{
-    return tvp->tag;
-}
-
-/* Get the current value. */
-char *jas_tvparser_getval(jas_tvparser_t *tvp)
-{
-    return tvp->val;
-}
-
-/******************************************************************************\
-* Miscellaneous code.
-\******************************************************************************/
-
-/* Lookup a tag by name. */
-jas_taginfo_t *jas_taginfos_lookup(jas_taginfo_t *taginfos, const char *name)
-{
-    jas_taginfo_t *taginfo;
-    taginfo = taginfos;
-    while (taginfo->id >= 0) {
-        if (!strcmp(taginfo->name, name)) {
-            return taginfo;
-        }
-        ++taginfo;
-    }
-    return 0;
-}
-
-/* This function is simply for convenience. */
-/* One can avoid testing for the special case of a null pointer, by
-  using this function.   This function never returns a null pointer.  */
-jas_taginfo_t *jas_taginfo_nonull(jas_taginfo_t *taginfo)
-{
-    static jas_taginfo_t invalidtaginfo = {
-        -1, 0
-    };
-
-    return taginfo ? taginfo : &invalidtaginfo;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/base/jas_version.c b/src/3rdparty/jasper/src/libjasper/base/jas_version.c
deleted file mode 100644
index a87f966..0000000
--- a/src/3rdparty/jasper/src/libjasper/base/jas_version.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#include "jasper/jas_version.h"
-
-const char *jas_getversion()
-{
-    return JAS_VERSION;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.c b/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.c
deleted file mode 100644
index b281e2a..0000000
--- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Windows Bitmap File Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_malloc.h"
-
-#include "bmp_cod.h"
-
-/******************************************************************************\
-* Constructors and destructors.
-\******************************************************************************/
-
-bmp_info_t *bmp_info_create()
-{
-    bmp_info_t *info;
-    if (!(info = jas_malloc(sizeof(bmp_info_t)))) {
-        return 0;
-    }
-    info->palents = 0;
-    return info;
-}
-
-void bmp_info_destroy(bmp_info_t *info)
-{
-    if (info->palents) {
-        jas_free(info->palents);
-    }
-    jas_free(info);
-}
-
-/******************************************************************************\
-* Miscellaneous functions.
-\******************************************************************************/
-
-int bmp_isgrayscalepal(bmp_palent_t *palents, int numpalents)
-{
-    bmp_palent_t *palent;
-    int i;
-
-    for (i = numpalents, palent = palents; i > 0; --i, ++palent) {
-        if (palent->red != palent->grn || palent->red != palent->blu) {
-            return 0;
-        }
-    }
-    return 1;
-}
-
-int bmp_numcmpts(bmp_info_t *info)
-{
-    int numcmpts;
-
-    if (info->depth == 24) {
-        numcmpts = 3;
-    } else if (info->depth == 8) {
-        numcmpts = bmp_isgrayscalepal(info->palents, info->numcolors) ?
-          1 : 3;
-    } else {
-        numcmpts = 0;
-        abort();
-    }
-    return numcmpts;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.h b/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.h
deleted file mode 100644
index 674aa6e..0000000
--- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_cod.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Windows Bitmap File Library
- *
- * $Id$
- */
-
-#ifndef BMP_COD_H
-#define BMP_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Constants and macros.
-\******************************************************************************/
-
-#define	BMP_MAGIC	0x4d42
-/* The signature for a BMP file. */
-
-#define	BMP_HDRLEN	14
-/* The nominal header length. */
-
-#define BMP_INFOLEN	40
-/* The nominal info length. */
-
-#define BMP_PALLEN(info)	((info)->numcolors * 4)
-/* The length of the palette. */
-
-#define	BMP_HASPAL(info)	((info)->numcolors > 0)
-/* Is this a palettized image? */
-
-/* Encoding types. */
-#define	BMP_ENC_RGB		0 /* No special encoding. */
-#define	BMP_ENC_RLE8	1 /* Run length encoding. */
-#define	BMP_ENC_RLE4	2 /* Run length encoding. */
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* BMP header. */
-typedef struct {
-
-    int_fast16_t magic;
-    /* The signature (a.k.a. the magic number). */
-
-    int_fast32_t siz;
-    /* The size of the file in 32-bit words. */
-
-    int_fast16_t reserved1;
-    /* Ask Bill Gates what this is all about. */
-
-    int_fast16_t reserved2;
-    /* Ditto. */
-
-    int_fast32_t off;
-    /* The offset of the bitmap data from the bitmap file header in bytes. */
-
-} bmp_hdr_t;
-
-/* Palette entry. */
-typedef struct {
-
-    int_fast16_t red;
-    /* The red component. */
-
-    int_fast16_t grn;
-    /* The green component. */
-
-    int_fast16_t blu;
-    /* The blue component. */
-
-    int_fast16_t res;
-    /* Reserved. */
-
-} bmp_palent_t;
-
-/* BMP info. */
-typedef struct {
-
-    int_fast32_t len;
-    /* The length of the bitmap information header in bytes. */
-
-    int_fast32_t width;
-    /* The width of the bitmap in pixels. */
-
-    int_fast32_t height;
-    /* The height of the bitmap in pixels. */
-
-    int_fast8_t topdown;
-    /* The bitmap data is specified in top-down order. */
-
-    int_fast16_t numplanes;
-    /* The number of planes.  This must be set to a value of one. */
-
-    int_fast16_t depth;
-    /* The number of bits per pixel. */
-
-    int_fast32_t enctype;
-    /* The type of compression used. */
-
-    int_fast32_t siz;
-    /* The size of the image in bytes. */
-
-    int_fast32_t hres;
-    /* The horizontal resolution in pixels/metre. */
-
-    int_fast32_t vres;
-    /* The vertical resolution in pixels/metre. */
-
-    int_fast32_t numcolors;
-    /* The number of color indices used by the bitmap. */
-
-    int_fast32_t mincolors;
-    /* The number of color indices important for displaying the bitmap. */
-
-    bmp_palent_t *palents;
-    /* The colors should be listed in order of importance. */
-
-} bmp_info_t;
-
-/******************************************************************************\
-* Functions and macros.
-\******************************************************************************/
-
-#define	bmp_issupported(hdr, info) \
-    ((hdr)->magic == BMP_MAGIC && !(hdr)->reserved1 && \
-      !(hdr)->reserved2 && (info)->numplanes == 1 && \
-      ((info)->depth == 8 || (info)->depth == 24) && \
-      (info)->enctype == BMP_ENC_RGB)
-/* Is this type of BMP file supported? */
-
-#define	bmp_haspal(info) \
-    ((info)->depth == 8)
-/* Is there a palette? */
-
-int bmp_numcmpts(bmp_info_t *info);
-/* Get the number of components. */
-
-bmp_info_t *bmp_info_create(void);
-/* Create BMP information. */
-
-void bmp_info_destroy(bmp_info_t *info);
-/* Destroy BMP information. */
-
-int bmp_isgrayscalepal(bmp_palent_t *palents, int numpalents);
-/* Does the specified palette correspond to a grayscale image? */
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c b/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c
deleted file mode 100644
index b1ff065..0000000
--- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_dec.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Windows Bitmap File Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_debug.h"
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_malloc.h"
-
-#include "bmp_cod.h"
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static int bmp_gethdr(jas_stream_t *in, bmp_hdr_t *hdr);
-static bmp_info_t *bmp_getinfo(jas_stream_t *in);
-static int bmp_getdata(jas_stream_t *in, bmp_info_t *info, jas_image_t *image);
-static int bmp_getint16(jas_stream_t *in, int_fast16_t *val);
-static int bmp_getint32(jas_stream_t *in, int_fast32_t *val);
-static int bmp_gobble(jas_stream_t *in, long n);
-
-/******************************************************************************\
-* Interface functions.
-\******************************************************************************/
-
-jas_image_t *bmp_decode(jas_stream_t *in, char *optstr)
-{
-    jas_image_t *image;
-    bmp_hdr_t hdr;
-    bmp_info_t *info;
-    uint_fast16_t cmptno;
-    jas_image_cmptparm_t cmptparms[3];
-    jas_image_cmptparm_t *cmptparm;
-    uint_fast16_t numcmpts;
-    long n;
-
-    if (optstr) {
-        jas_eprintf("warning: ignoring BMP decoder options\n");
-    }
-
-    jas_eprintf(
-      "THE BMP FORMAT IS NOT FULLY SUPPORTED!\n"
-      "THAT IS, THE JASPER SOFTWARE CANNOT DECODE ALL TYPES OF BMP DATA.\n"
-      "IF YOU HAVE ANY PROBLEMS, PLEASE TRY CONVERTING YOUR IMAGE DATA\n"
-      "TO THE PNM FORMAT, AND USING THIS FORMAT INSTEAD.\n"
-      );
-
-    /* Read the bitmap header. */
-    if (bmp_gethdr(in, &hdr)) {
-        jas_eprintf("cannot get header\n");
-        return 0;
-    }
-
-    /* Read the bitmap information. */
-    if (!(info = bmp_getinfo(in))) {
-        jas_eprintf("cannot get info\n");
-        return 0;
-    }
-
-    /* Ensure that we support this type of BMP file. */
-    if (!bmp_issupported(&hdr, info)) {
-        jas_eprintf("error: unsupported BMP encoding\n");
-        bmp_info_destroy(info);
-        return 0;
-    }
-
-    /* Skip over any useless data between the end of the palette
-      and start of the bitmap data. */
-    if ((n = hdr.off - (BMP_HDRLEN + BMP_INFOLEN + BMP_PALLEN(info))) < 0) {
-        jas_eprintf("error: possibly bad bitmap offset?\n");
-        return 0;
-    }
-    if (n > 0) {
-        jas_eprintf("skipping unknown data in BMP file\n");
-        if (bmp_gobble(in, n)) {
-            bmp_info_destroy(info);
-            return 0;
-        }
-    }
-
-    /* Get the number of components. */
-    numcmpts = bmp_numcmpts(info);
-
-    for (cmptno = 0, cmptparm = cmptparms; cmptno < numcmpts; ++cmptno,
-      ++cmptparm) {
-        cmptparm->tlx = 0;
-        cmptparm->tly = 0;
-        cmptparm->hstep = 1;
-        cmptparm->vstep = 1;
-        cmptparm->width = info->width;
-        cmptparm->height = info->height;
-        cmptparm->prec = 8;
-        cmptparm->sgnd = false;
-    }
-
-    /* Create image object. */
-    if (!(image = jas_image_create(numcmpts, cmptparms,
-      JAS_CLRSPC_UNKNOWN))) {
-        bmp_info_destroy(info);
-        return 0;
-    }
-
-    if (numcmpts == 3) {
-        jas_image_setclrspc(image, JAS_CLRSPC_SRGB);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R));
-        jas_image_setcmpttype(image, 1,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G));
-        jas_image_setcmpttype(image, 2,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B));
-    } else {
-        jas_image_setclrspc(image, JAS_CLRSPC_SGRAY);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-    }
-
-    /* Read the bitmap data. */
-    if (bmp_getdata(in, info, image)) {
-        bmp_info_destroy(info);
-        jas_image_destroy(image);
-        return 0;
-    }
-
-    bmp_info_destroy(info);
-
-    return image;
-}
-
-int bmp_validate(jas_stream_t *in)
-{
-    int n;
-    int i;
-    uchar buf[2];
-
-    assert(JAS_STREAM_MAXPUTBACK >= 2);
-
-    /* Read the first two characters that constitute the signature. */
-    if ((n = jas_stream_read(in, (char *) buf, 2)) < 0) {
-        return -1;
-    }
-    /* Put the characters read back onto the stream. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-    /* Did we read enough characters? */
-    if (n < 2) {
-        return -1;
-    }
-    /* Is the signature correct for the BMP format? */
-    if (buf[0] == (BMP_MAGIC & 0xff) && buf[1] == (BMP_MAGIC >> 8)) {
-        return 0;
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Code for aggregate types.
-\******************************************************************************/
-
-static int bmp_gethdr(jas_stream_t *in, bmp_hdr_t *hdr)
-{
-    if (bmp_getint16(in, &hdr->magic) || hdr->magic != BMP_MAGIC ||
-      bmp_getint32(in, &hdr->siz) || bmp_getint16(in, &hdr->reserved1) ||
-      bmp_getint16(in, &hdr->reserved2) || bmp_getint32(in, &hdr->off)) {
-        return -1;
-    }
-    return 0;
-}
-
-static bmp_info_t *bmp_getinfo(jas_stream_t *in)
-{
-    bmp_info_t *info;
-    int i;
-    bmp_palent_t *palent;
-
-    if (!(info = bmp_info_create())) {
-        return 0;
-    }
-
-    if (bmp_getint32(in, &info->len) || info->len != 40 ||
-      bmp_getint32(in, &info->width) || bmp_getint32(in, &info->height) ||
-      bmp_getint16(in, &info->numplanes) ||
-      bmp_getint16(in, &info->depth) || bmp_getint32(in, &info->enctype) ||
-      bmp_getint32(in, &info->siz) ||
-      bmp_getint32(in, &info->hres) || bmp_getint32(in, &info->vres) ||
-      bmp_getint32(in, &info->numcolors) ||
-      bmp_getint32(in, &info->mincolors)) {
-        bmp_info_destroy(info);
-        return 0;
-    }
-
-    if (info->height < 0) {
-        info->topdown = 1;
-        info->height = -info->height;
-    } else {
-        info->topdown = 0;
-    }
-
-    if (info->width <= 0 || info->height <= 0 || info->numplanes <= 0 ||
-      info->depth <= 0  || info->numcolors < 0 || info->mincolors < 0) {
-        bmp_info_destroy(info);
-        return 0;
-    }
-
-    if (info->enctype != BMP_ENC_RGB) {
-        jas_eprintf("unsupported BMP encoding\n");
-        bmp_info_destroy(info);
-        return 0;
-    }
-
-    if (info->numcolors > 0) {
-        if (!(info->palents = jas_malloc(info->numcolors *
-          sizeof(bmp_palent_t)))) {
-            bmp_info_destroy(info);
-            return 0;
-        }
-    } else {
-        info->palents = 0;
-    }
-
-    for (i = 0; i < info->numcolors; ++i) {
-        palent = &info->palents[i];
-        if ((palent->blu = jas_stream_getc(in)) == EOF ||
-          (palent->grn = jas_stream_getc(in)) == EOF ||
-          (palent->red = jas_stream_getc(in)) == EOF ||
-          (palent->res = jas_stream_getc(in)) == EOF) {
-            bmp_info_destroy(info);
-            return 0;
-        }
-    }
-
-    return info;
-}
-
-static int bmp_getdata(jas_stream_t *in, bmp_info_t *info, jas_image_t *image)
-{
-    int i;
-    int j;
-    int y;
-    jas_matrix_t *cmpts[3];
-    int numpad;
-    int red;
-    int grn;
-    int blu;
-    int ret;
-    int numcmpts;
-    int cmptno;
-    int ind;
-    bmp_palent_t *palent;
-    int mxind;
-    int haspal;
-
-    assert(info->depth == 8 || info->depth == 24);
-    assert(info->enctype == BMP_ENC_RGB);
-
-    numcmpts = bmp_numcmpts(info);
-    haspal = bmp_haspal(info);
-
-    ret = 0;
-    for (i = 0; i < numcmpts; ++i) {
-        cmpts[i] = 0;
-    }
-
-    /* Create temporary matrices to hold component data. */
-    for (i = 0; i < numcmpts; ++i) {
-        if (!(cmpts[i] = jas_matrix_create(1, info->width))) {
-            ret = -1;
-            goto bmp_getdata_done;
-        }
-    }
-
-    /* Calculate number of padding bytes per row of image data. */
-    numpad = (numcmpts * info->width) % 4;
-    if (numpad) {
-        numpad = 4 - numpad;
-    }
-
-    mxind = (1 << info->depth) - 1;
-    for (i = 0; i < info->height; ++i) {
-        for (j = 0; j < info->width; ++j) {
-            if (haspal) {
-                if ((ind = jas_stream_getc(in)) == EOF) {
-                    ret = -1;
-                    goto bmp_getdata_done;
-                }
-                if (ind > mxind) {
-                    ret = -1;
-                    goto bmp_getdata_done;
-                }
-                if (ind < info->numcolors) {
-                    palent = &info->palents[ind];
-                    red = palent->red;
-                    grn = palent->grn;
-                    blu = palent->blu;
-                } else {
-                    red = ind;
-                    grn = ind;
-                    blu = ind;
-                }
-            } else {
-                if ((blu = jas_stream_getc(in)) == EOF ||
-                  (grn = jas_stream_getc(in)) == EOF ||
-                  (red = jas_stream_getc(in)) == EOF) {
-                    ret = -1;
-                    goto bmp_getdata_done;
-                }
-            }
-            if (numcmpts == 3) {
-                jas_matrix_setv(cmpts[0], j, red);
-                jas_matrix_setv(cmpts[1], j, grn);
-                jas_matrix_setv(cmpts[2], j, blu);
-            } else {
-                jas_matrix_setv(cmpts[0], j, red);
-            }
-        }
-        for (j = numpad; j > 0; --j) {
-                if (jas_stream_getc(in) == EOF) {
-                    ret = -1;
-                    goto bmp_getdata_done;
-                }
-        }
-        for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-            y = info->topdown ? i : (info->height - 1 - i);
-            if (jas_image_writecmpt(image, cmptno, 0, y, info->width,
-              1, cmpts[cmptno])) {
-                ret = -1;
-                goto bmp_getdata_done;
-            }
-        }
-    }
-
-bmp_getdata_done:
-    /* Destroy the temporary matrices. */
-    for (i = 0; i < numcmpts; ++i) {
-        if (cmpts[i]) {
-            jas_matrix_destroy(cmpts[i]);
-        }
-    }
-
-    return ret;
-}
-
-/******************************************************************************\
-* Code for primitive types.
-\******************************************************************************/
-
-static int bmp_getint16(jas_stream_t *in, int_fast16_t *val)
-{
-    int lo;
-    int hi;
-    if ((lo = jas_stream_getc(in)) == EOF || (hi = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    if (val) {
-        *val = (hi << 8) | lo;
-    }
-    return 0;
-}
-
-static int bmp_getint32(jas_stream_t *in, int_fast32_t *val)
-{
-    int n;
-    uint_fast32_t v;
-    int c;
-    for (n = 4, v = 0;;) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        v |= (c << 24);
-        if (--n <= 0) {
-            break;
-        }
-        v >>= 8;
-    }
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-static int bmp_gobble(jas_stream_t *in, long n)
-{
-    while (--n >= 0) {
-        if (jas_stream_getc(in) == EOF) {
-            return -1;
-        }
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.c b/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.c
deleted file mode 100644
index e156b01..0000000
--- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Windows Bitmap File Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_debug.h"
-
-#include "bmp_enc.h"
-#include "bmp_cod.h"
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static int bmp_puthdr(jas_stream_t *out, bmp_hdr_t *hdr);
-static int bmp_putinfo(jas_stream_t *out, bmp_info_t *info);
-static int bmp_putdata(jas_stream_t *out, bmp_info_t *info, jas_image_t *image, int *cmpts);
-static int bmp_putint16(jas_stream_t *in, int_fast16_t val);
-static int bmp_putint32(jas_stream_t *out, int_fast32_t val);
-
-/******************************************************************************\
-* Interface functions.
-\******************************************************************************/
-
-int bmp_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    jas_image_coord_t width;
-    jas_image_coord_t height;
-    int depth;
-    int cmptno;
-    bmp_hdr_t hdr;
-    bmp_info_t *info;
-    int_fast32_t datalen;
-    int numpad;
-    bmp_enc_t encbuf;
-    bmp_enc_t *enc = &encbuf;
-    jas_clrspc_t clrspc;
-
-    if (optstr) {
-        jas_eprintf("warning: ignoring BMP encoder options\n");
-    }
-
-    clrspc = jas_image_clrspc(image);
-    switch (jas_clrspc_fam(clrspc)) {
-    case JAS_CLRSPC_FAM_RGB:
-        if (clrspc != JAS_CLRSPC_SRGB)
-            jas_eprintf("warning: inaccurate color\n");
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        if (clrspc != JAS_CLRSPC_SGRAY)
-            jas_eprintf("warning: inaccurate color\n");
-        break;
-    default:
-        jas_eprintf("error: BMP format does not support color space\n");
-        return -1;
-        break;
-    }
-
-    switch (jas_clrspc_fam(clrspc)) {
-    case JAS_CLRSPC_FAM_RGB:
-        enc->numcmpts = 3;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R))) < 0 ||
-          (enc->cmpts[1] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G))) < 0 ||
-          (enc->cmpts[2] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        enc->numcmpts = 1;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    default:
-        abort();
-        break;
-    }
-
-    width = jas_image_cmptwidth(image, enc->cmpts[0]);
-    height = jas_image_cmptheight(image, enc->cmpts[0]);
-    depth = jas_image_cmptprec(image, enc->cmpts[0]);
-
-    /* Check to ensure that the image to be saved can actually be represented
-      using the BMP format. */
-    for (cmptno = 0; cmptno < enc->numcmpts; ++cmptno) {
-        if (jas_image_cmptwidth(image, enc->cmpts[cmptno]) != width ||
-          jas_image_cmptheight(image, enc->cmpts[cmptno]) != height ||
-          jas_image_cmptprec(image, enc->cmpts[cmptno]) != depth ||
-          jas_image_cmptsgnd(image, enc->cmpts[cmptno]) != false ||
-          jas_image_cmpttlx(image, enc->cmpts[cmptno]) != 0 ||
-          jas_image_cmpttly(image, enc->cmpts[cmptno]) != 0) {
-            jas_eprintf("The BMP format cannot be used to represent an image with this geometry.\n");
-            return -1;
-        }
-    }
-
-    /* The component depths must be 1, 4, or 8. */
-    if (depth != 1 && depth != 4 && depth != 8) {
-        return -1;
-    }
-
-    numpad = (width * enc->numcmpts) % 4;
-    if (numpad) {
-        numpad = 4 - numpad;
-    }
-    datalen = (enc->numcmpts * width + numpad) * height;
-
-    if (!(info = bmp_info_create())) {
-        return -1;
-    }
-    info->len = BMP_INFOLEN;
-    info->width = width;
-    info->height = height;
-    info->numplanes = 1;
-    info->depth = enc->numcmpts * depth;
-    info->enctype = BMP_ENC_RGB;
-    info->siz = datalen;
-    info->hres = 0;
-    info->vres = 0;
-    info->numcolors = (enc->numcmpts == 1) ? 256 : 0;
-    info->mincolors = 0;
-
-    hdr.magic = BMP_MAGIC;
-    hdr.siz = BMP_HDRLEN + BMP_INFOLEN + 0 + datalen;
-    hdr.off = BMP_HDRLEN + BMP_INFOLEN + BMP_PALLEN(info);
-
-    /* Write the bitmap header. */
-    if (bmp_puthdr(out, &hdr)) {
-        return -1;
-    }
-
-    /* Write the bitmap information. */
-    if (bmp_putinfo(out, info)) {
-        return -1;
-    }
-
-    /* Write the bitmap data. */
-    if (bmp_putdata(out, info, image, enc->cmpts)) {
-        return -1;
-    }
-
-    bmp_info_destroy(info);
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for aggregate types.
-\******************************************************************************/
-
-static int bmp_puthdr(jas_stream_t *out, bmp_hdr_t *hdr)
-{
-    assert(hdr->magic == BMP_MAGIC);
-    if (bmp_putint16(out, hdr->magic) || bmp_putint32(out, hdr->siz) ||
-      bmp_putint32(out, 0) || bmp_putint32(out, hdr->off)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int bmp_putinfo(jas_stream_t *out, bmp_info_t *info)
-{
-    int i;
-
-    info->len = 40;
-    if (bmp_putint32(out, info->len) ||
-      bmp_putint32(out, info->width) ||
-      bmp_putint32(out, info->height) ||
-      bmp_putint16(out, info->numplanes) ||
-      bmp_putint16(out, info->depth) ||
-      bmp_putint32(out, info->enctype) ||
-      bmp_putint32(out, info->siz) ||
-      bmp_putint32(out, info->hres) ||
-      bmp_putint32(out, info->vres) ||
-      bmp_putint32(out, info->numcolors) ||
-      bmp_putint32(out, info->mincolors)) {
-        return -1;
-    }
-
-    for (i = 0; i < info->numcolors; ++i)
-    {
-        if (jas_stream_putc(out, i) == EOF ||
-          jas_stream_putc(out, i) == EOF ||
-          jas_stream_putc(out, i) == EOF ||
-          jas_stream_putc(out, 0) == EOF)
-        {
-            return -1;
-        }
-    }
-
-    return 0;
-}
-
-static int bmp_putdata(jas_stream_t *out, bmp_info_t *info, jas_image_t *image,
-  int *cmpts)
-{
-    int i;
-    int j;
-    jas_matrix_t *bufs[3];
-    int numpad;
-    unsigned char red;
-    unsigned char grn;
-    unsigned char blu;
-    int ret;
-    int numcmpts;
-    int v;
-    int cmptno;
-
-    numcmpts = (info->depth == 24) ? 3:1;
-
-    /* We do not support palettized images. */
-    if (BMP_HASPAL(info) && numcmpts == 3) {
-        jas_eprintf("no palettized image support for BMP format\n");
-        return -1;
-    }
-
-    ret = 0;
-    for (i = 0; i < numcmpts; ++i) {
-        bufs[i] = 0;
-    }
-
-    /* Create temporary matrices to hold component data. */
-    for (i = 0; i < numcmpts; ++i) {
-        if (!(bufs[i] = jas_matrix_create(1, info->width))) {
-            ret = -1;
-            goto bmp_putdata_done;
-        }
-    }
-
-    /* Calculate number of padding bytes per row of image data. */
-    numpad = (numcmpts * info->width) % 4;
-    if (numpad) {
-        numpad = 4 - numpad;
-    }
-
-    /* Put the image data. */
-    for (i = info->height - 1; i >= 0; --i) {
-        for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-            if (jas_image_readcmpt(image, cmptno, 0, i, info->width,
-              1, bufs[cmpts[cmptno]])) {
-                ret = -1;
-                goto bmp_putdata_done;
-            }
-        }
-        for (j = 0; j < info->width; ++j) {
-            if (numcmpts == 3) {
-                red = (jas_matrix_getv(bufs[0], j));
-                grn = (jas_matrix_getv(bufs[1], j));
-                blu = (jas_matrix_getv(bufs[2], j));
-                if (jas_stream_putc(out, blu) == EOF ||
-                  jas_stream_putc(out, grn) == EOF ||
-                  jas_stream_putc(out, red) == EOF) {
-                    ret = -1;
-                    goto bmp_putdata_done;
-                }
-            } else if (numcmpts == 1) {
-                v = (jas_matrix_getv(bufs[cmpts[0]], j));
-                if (jas_stream_putc(out, v) == EOF) {
-                    ret = -1;
-                    goto bmp_putdata_done;
-                }
-            } else {
-                abort();
-            }
-        }
-        for (j = numpad; j > 0; --j) {
-            if (jas_stream_putc(out, 0) == EOF) {
-                ret = -1;
-                goto bmp_putdata_done;
-            }
-        }
-    }
-
-bmp_putdata_done:
-    /* Destroy the temporary matrices. */
-    for (i = 0; i < numcmpts; ++i) {
-        if (bufs[i]) {
-            jas_matrix_destroy(bufs[i]);
-        }
-    }
-
-    return ret;
-}
-
-/******************************************************************************\
-* Code for primitive types.
-\******************************************************************************/
-
-static int bmp_putint16(jas_stream_t *in, int_fast16_t val)
-{
-    if (jas_stream_putc(in, val & 0xff) == EOF || jas_stream_putc(in, (val >> 8) &
-      0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-static int bmp_putint32(jas_stream_t *out, int_fast32_t val)
-{
-    int n;
-    int_fast32_t v;
-
-    /* This code needs to be changed if we want to handle negative values. */
-    assert(val >= 0);
-    v = val;
-    for (n = 4;;) {
-        if (jas_stream_putc(out, v & 0xff) == EOF) {
-            return -1;
-        }
-        if (--n <= 0) {
-            break;
-        }
-        v >>= 8;
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.h b/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.h
deleted file mode 100644
index 1fb50e8..0000000
--- a/src/3rdparty/jasper/src/libjasper/bmp/bmp_enc.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef BMP_ENC_H
-#define BMP_ENC_H
-
-typedef struct {
-
-    int numcmpts;
-    int cmpts[4];
-
-} bmp_enc_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/dummy.c b/src/3rdparty/jasper/src/libjasper/dummy.c
deleted file mode 100644
index 9344920..0000000
--- a/src/3rdparty/jasper/src/libjasper/dummy.c
+++ /dev/null
@@ -1,3 +0,0 @@
-/* This source file only exists to keep libtool happy. */
-
-char jas_dummy;
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_cm.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_cm.h
deleted file mode 100644
index 35cf9f0..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_cm.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Color Management
- *
- * $Id$
- */
-
-#ifndef JAS_CM_H
-#define JAS_CM_H
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_icc.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef int jas_clrspc_t;
-
-/* transform operations */
-#define	JAS_CMXFORM_OP_FWD	0
-#define	JAS_CMXFORM_OP_REV	1
-#define	JAS_CMXFORM_OP_PROOF	2
-#define	JAS_CMXFORM_OP_GAMUT	3
-
-/* rendering intents */
-#define	JAS_CMXFORM_INTENT_PER		0
-#define	JAS_CMXFORM_INTENT_RELCLR	1
-#define	JAS_CMXFORM_INTENT_ABSCLR	2
-#define	JAS_CMXFORM_INTENT_SAT		3
-#define	JAS_CMXFORM_NUMINTENTS		4
-
-#define	JAS_CMXFORM_OPTM_SPEED	0
-#define JAS_CMXFORM_OPTM_SIZE	1
-#define	JAS_CMXFORM_OPTM_ACC	2
-
-
-#define	jas_clrspc_create(fam, mbr)	(((fam) << 8) | (mbr))
-#define	jas_clrspc_fam(clrspc)	((clrspc) >> 8)
-#define	jas_clrspc_mbr(clrspc)	((clrspc) & 0xff)
-#define	jas_clrspc_isgeneric(clrspc)	(!jas_clrspc_mbr(clrspc))
-#define	jas_clrspc_isunknown(clrspc)	((clrspc) & JAS_CLRSPC_UNKNOWNMASK)
-
-#define	JAS_CLRSPC_UNKNOWNMASK	0x4000
-
-/* color space families */
-#define	JAS_CLRSPC_FAM_UNKNOWN	0
-#define	JAS_CLRSPC_FAM_XYZ	1
-#define	JAS_CLRSPC_FAM_LAB	2
-#define	JAS_CLRSPC_FAM_GRAY	3
-#define	JAS_CLRSPC_FAM_RGB	4
-#define	JAS_CLRSPC_FAM_YCBCR	5
-
-/* specific color spaces */
-#define	JAS_CLRSPC_UNKNOWN	JAS_CLRSPC_UNKNOWNMASK
-#define	JAS_CLRSPC_CIEXYZ	jas_clrspc_create(JAS_CLRSPC_FAM_XYZ, 1)
-#define	JAS_CLRSPC_CIELAB	jas_clrspc_create(JAS_CLRSPC_FAM_LAB, 1)
-#define	JAS_CLRSPC_SGRAY	jas_clrspc_create(JAS_CLRSPC_FAM_GRAY, 1)
-#define	JAS_CLRSPC_SRGB		jas_clrspc_create(JAS_CLRSPC_FAM_RGB, 1)
-#define	JAS_CLRSPC_SYCBCR	jas_clrspc_create(JAS_CLRSPC_FAM_YCBCR, 1)
-
-/* generic color spaces */
-#define	JAS_CLRSPC_GENRGB	jas_clrspc_create(JAS_CLRSPC_FAM_RGB, 0)
-#define	JAS_CLRSPC_GENGRAY	jas_clrspc_create(JAS_CLRSPC_FAM_GRAY, 0)
-#define	JAS_CLRSPC_GENYCBCR	jas_clrspc_create(JAS_CLRSPC_FAM_YCBCR, 0)
-
-#define	JAS_CLRSPC_CHANIND_YCBCR_Y	0
-#define	JAS_CLRSPC_CHANIND_YCBCR_CB	1
-#define	JAS_CLRSPC_CHANIND_YCBCR_CR	2
-
-#define	JAS_CLRSPC_CHANIND_RGB_R	0
-#define	JAS_CLRSPC_CHANIND_RGB_G	1
-#define	JAS_CLRSPC_CHANIND_RGB_B	2
-
-#define	JAS_CLRSPC_CHANIND_GRAY_Y	0
-
-typedef double jas_cmreal_t;
-
-struct jas_cmpxform_s;
-
-typedef struct {
-    long *buf;
-    int prec;
-    int sgnd;
-    int width;
-    int height;
-} jas_cmcmptfmt_t;
-
-typedef struct {
-    int numcmpts;
-    jas_cmcmptfmt_t *cmptfmts;
-} jas_cmpixmap_t;
-
-typedef struct {
-    void (*destroy)(struct jas_cmpxform_s *pxform);
-    int (*apply)(struct jas_cmpxform_s *pxform, jas_cmreal_t *in, jas_cmreal_t *out, int cnt);
-    void (*dump)(struct jas_cmpxform_s *pxform);
-} jas_cmpxformops_t;
-
-typedef struct {
-    jas_cmreal_t *data;
-    int size;
-} jas_cmshapmatlut_t;
-
-typedef struct {
-    int mono;
-    int order;
-    int useluts;
-    int usemat;
-    jas_cmshapmatlut_t luts[3];
-    jas_cmreal_t mat[3][4];
-} jas_cmshapmat_t;
-
-typedef struct {
-    int order;
-} jas_cmshaplut_t;
-
-typedef struct {
-    int inclrspc;
-    int outclrspc;
-} jas_cmclrspcconv_t;
-
-#define	jas_align_t	double
-
-typedef struct jas_cmpxform_s {
-    int refcnt;
-    jas_cmpxformops_t *ops;
-    int numinchans;
-    int numoutchans;
-    union {
-        jas_align_t dummy;
-        jas_cmshapmat_t shapmat;
-        jas_cmshaplut_t shaplut;
-        jas_cmclrspcconv_t clrspcconv;
-    } data;
-} jas_cmpxform_t;
-
-typedef struct {
-    int numpxforms;
-    int maxpxforms;
-    jas_cmpxform_t **pxforms;
-} jas_cmpxformseq_t;
-
-typedef struct {
-    int numinchans;
-    int numoutchans;
-    jas_cmpxformseq_t *pxformseq;
-} jas_cmxform_t;
-
-#define	JAS_CMPROF_TYPE_DEV	1
-#define	JAS_CMPROF_TYPE_CLRSPC	2
-
-#define	JAS_CMPROF_NUMPXFORMSEQS	13
-
-typedef struct {
-    int clrspc;
-    int numchans;
-    int refclrspc;
-    int numrefchans;
-    jas_iccprof_t *iccprof;
-    jas_cmpxformseq_t *pxformseqs[JAS_CMPROF_NUMPXFORMSEQS];
-} jas_cmprof_t;
-
-/* Create a profile. */
-
-/* Destroy a profile. */
-void jas_cmprof_destroy(jas_cmprof_t *prof);
-
-#if 0
-typedef int_fast32_t jas_cmattrname_t;
-typedef int_fast32_t jas_cmattrval_t;
-typedef int_fast32_t jas_cmattrtype_t;
-/* Load a profile. */
-int jas_cmprof_load(jas_cmprof_t *prof, jas_stream_t *in, int fmt);
-/* Save a profile. */
-int jas_cmprof_save(jas_cmprof_t *prof, jas_stream_t *out, int fmt);
-/* Set an attribute of a profile. */
-int jas_cm_prof_setattr(jas_cm_prof_t *prof, jas_cm_attrname_t name, void *val);
-/* Get an attribute of a profile. */
-void *jas_cm_prof_getattr(jas_cm_prof_t *prof, jas_cm_attrname_t name);
-#endif
-
-jas_cmxform_t *jas_cmxform_create(jas_cmprof_t *inprof, jas_cmprof_t *outprof,
-  jas_cmprof_t *proofprof, int op, int intent, int optimize);
-
-void jas_cmxform_destroy(jas_cmxform_t *xform);
-
-/* Apply a transform to data. */
-int jas_cmxform_apply(jas_cmxform_t *xform, jas_cmpixmap_t *in,
-  jas_cmpixmap_t *out);
-
-int jas_cxform_optimize(jas_cmxform_t *xform, int optimize);
-
-int jas_clrspc_numchans(int clrspc);
-jas_cmprof_t *jas_cmprof_createfromiccprof(jas_iccprof_t *iccprof);
-jas_cmprof_t *jas_cmprof_createfromclrspc(int clrspc);
-jas_iccprof_t *jas_iccprof_createfromcmprof(jas_cmprof_t *prof);
-
-#define	jas_cmprof_clrspc(prof) ((prof)->clrspc)
-jas_cmprof_t *jas_cmprof_copy(jas_cmprof_t *prof);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config.h
deleted file mode 100644
index d862a5c..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config.h
+++ /dev/null
@@ -1,172 +0,0 @@
-/* src/libjasper/include/jasper/jas_config.h.  Generated by configure.  */
-/* src/libjasper/include/jasper/jas_config.h.in.  Generated from configure.ac by autoheader.  */
-
-
-/* Avoid problems due to multiple inclusion. */
-#ifndef JAS_CONFIG_H
-#define JAS_CONFIG_H
-
-/* This preprocessor symbol identifies the version of JasPer. */
-#define	JAS_VERSION "1.900.1"
-/* If configure is being used, this symbol will be defined automatically
-  at this point in the configuration header file. */
-
-/* The preprocessor symbol JAS_WIN_MSVC_BUILD should not be defined
-  unless the JasPer software is being built under Microsoft Windows
-  using Microsoft Visual C. */
-#if !defined(JAS_WIN_MSVC_BUILD)
-/* A configure-based build is being used. */
-
-
-
-/* Extra debugging support */
-/* #undef DEBUG */
-
-/* Debugging memory allocator */
-/* #undef DEBUG_MEMALLOC */
-
-/* Debugging overflow detection */
-/* #undef DEBUG_OVERFLOW */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `getrusage' function. */
-#define HAVE_GETRUSAGE 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <io.h> header file. */
-/* #undef HAVE_IO_H */
-
-/* Define to 1 if you have the `m' library (-lm). */
-#define HAVE_LIBM 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Have variable length arrays */
-#define HAVE_VLA 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Define to 1 if you have the <windows.h> header file. */
-/* #undef HAVE_WINDOWS_H */
-
-/* JasPer configure */
-#define JAS_CONFIGURE 1
-
-/* JasPer version */
-#define JAS_VERSION "1.900.1"
-
-/* Name of package */
-#define PACKAGE "jasper"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "jasper"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "jasper 1.900.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "jasper"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.900.1"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "1.900.1"
-
-/* Define to 1 if the X Window System is missing or not being used. */
-/* #undef X_DISPLAY_MISSING */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long long' if <sys/types.h> does not define. */
-#define longlong long long
-
-/* Define to `unsigned' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef ssize_t */
-
-/* Define to `unsigned char' if <sys/types.h> does not define. */
-#define uchar unsigned char
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef uint */
-
-/* Define to `unsigned long' if <sys/types.h> does not define. */
-/* #undef ulong */
-
-/* Define to `unsigned long long' if <sys/types.h> does not define. */
-#define ulonglong unsigned long long
-
-/* Define to `unsigned short' if <sys/types.h> does not define. */
-/* #undef ushort */
-
-
-#else
-/* A configure-based build is not being used. */
-#include <jasper/jas_config2.h>
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config2.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config2.h
deleted file mode 100644
index 90fb728..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_config2.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JAS_CONFIG2_H
-#define	JAS_CONFIG2_H
-
-/*
- * Configuration for Microsoft Windows and Microsoft Visual C.
- *
- * We are not using a configure-based build.
- * Try to compensate for this here, by specifying the preprocessor symbols
- * normally defined by configure.
- */
-
-#define	uchar		unsigned char
-#define	ushort		unsigned short
-#define	uint		unsigned int
-#define	ulong		unsigned long
-#define	longlong	long long
-#define	ulonglong	unsigned long long
-/*#define	ssize_t		int*/
-
-#define	HAVE_FCNTL_H		1
-#define	HAVE_LIMITS_H		1
-#define	HAVE_IO_H		1
-#define	HAVE_WINDOWS_H		1
-#define	HAVE_SYS_TYPES_H	1
-#define	HAVE_STDLIB_H		1
-#define	HAVE_STDDEF_H		1
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_debug.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_debug.h
deleted file mode 100644
index 334beeb..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_debug.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Debugging-Related Code
- *
- * $Id$
- */
-
-#ifndef JAS_DEBUG_H
-#define JAS_DEBUG_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-
-#include <jasper/jas_config.h>
-#include "jasper/jas_types.h"
-#include "jasper/jas_debug.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Macros and functions.
-\******************************************************************************/
-
-/* Output debugging information to standard error provided that the debug
-  level is set sufficiently high. */
-#if defined(DEBUG)
-#define	JAS_DBGLOG(n, x) \
-    ((jas_getdbglevel() >= (n)) ? (jas_eprintf x) : 0)
-#else
-#define	JAS_DBGLOG(n, x)
-#endif
-
-/* Get the library debug level. */
-int jas_getdbglevel(void);
-
-/* Set the library debug level. */
-int jas_setdbglevel(int dbglevel);
-
-/* Perform formatted output to standard error. */
-int jas_eprintf(const char *fmt, ...);
-
-/* Dump memory to a stream. */
-int jas_memdump(FILE *out, void *data, size_t len);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_fix.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_fix.h
deleted file mode 100644
index 8081f20..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_fix.h
+++ /dev/null
@@ -1,358 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Fixed-Point Number Class
- *
- * $Id$
- */
-
-#ifndef JAS_FIX_H
-#define JAS_FIX_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* The representation of the value zero. */
-#define	JAS_FIX_ZERO(fix_t, fracbits) \
-    JAS_CAST(fix_t, 0)
-
-/* The representation of the value one. */
-#define	JAS_FIX_ONE(fix_t, fracbits) \
-    (JAS_CAST(fix_t, 1) << (fracbits))
-
-/* The representation of the value one half. */
-#define	JAS_FIX_HALF(fix_t, fracbits) \
-    (JAS_CAST(fix_t, 1) << ((fracbits) - 1))
-
-/******************************************************************************\
-* Conversion operations.
-\******************************************************************************/
-
-/* Convert an int to a fixed-point number. */
-#define JAS_INTTOFIX(fix_t, fracbits, x) \
-    JAS_CAST(fix_t, (x) << (fracbits))
-
-/* Convert a fixed-point number to an int. */
-#define JAS_FIXTOINT(fix_t, fracbits, x) \
-    JAS_CAST(int, (x) >> (fracbits))
-
-/* Convert a fixed-point number to a double. */
-#define JAS_FIXTODBL(fix_t, fracbits, x) \
-    (JAS_CAST(double, x) / (JAS_CAST(fix_t, 1) << (fracbits)))
-
-/* Convert a double to a fixed-point number. */
-#define JAS_DBLTOFIX(fix_t, fracbits, x) \
-    JAS_CAST(fix_t, ((x) * JAS_CAST(double, JAS_CAST(fix_t, 1) << (fracbits))))
-
-/******************************************************************************\
-* Basic arithmetic operations.
-* All other arithmetic operations are synthesized from these basic operations.
-* There are three macros for each type of arithmetic operation.
-* One macro always performs overflow/underflow checking, one never performs
-* overflow/underflow checking, and one is generic with its behavior
-* depending on compile-time flags.
-* Only the generic macros should be invoked directly by application code.
-\******************************************************************************/
-
-/* Calculate the sum of two fixed-point numbers. */
-#if !defined(DEBUG_OVERFLOW)
-#define JAS_FIX_ADD			JAS_FIX_ADD_FAST
-#else
-#define JAS_FIX_ADD			JAS_FIX_ADD_OFLOW
-#endif
-
-/* Calculate the sum of two fixed-point numbers without overflow checking. */
-#define	JAS_FIX_ADD_FAST(fix_t, fracbits, x, y)	((x) + (y))
-
-/* Calculate the sum of two fixed-point numbers with overflow checking. */
-#define	JAS_FIX_ADD_OFLOW(fix_t, fracbits, x, y) \
-    ((x) >= 0) ? \
-      (((y) >= 0) ? ((x) + (y) >= 0 || JAS_FIX_OFLOW(), (x) + (y)) : \
-      ((x) + (y))) : \
-      (((y) >= 0) ? ((x) + (y)) : ((x) + (y) < 0 || JAS_FIX_OFLOW(), \
-      (x) + (y)))
-
-/* Calculate the product of two fixed-point numbers. */
-#if !defined(DEBUG_OVERFLOW)
-#define JAS_FIX_MUL			JAS_FIX_MUL_FAST
-#else
-#define JAS_FIX_MUL			JAS_FIX_MUL_OFLOW
-#endif
-
-/* Calculate the product of two fixed-point numbers without overflow
-  checking. */
-#define	JAS_FIX_MUL_FAST(fix_t, fracbits, bigfix_t, x, y) \
-    JAS_CAST(fix_t, (JAS_CAST(bigfix_t, x) * JAS_CAST(bigfix_t, y)) >> \
-      (fracbits))
-
-/* Calculate the product of two fixed-point numbers with overflow
-  checking. */
-#define JAS_FIX_MUL_OFLOW(fix_t, fracbits, bigfix_t, x, y) \
-    ((JAS_CAST(bigfix_t, x) * JAS_CAST(bigfix_t, y) >> (fracbits)) == \
-      JAS_CAST(fix_t, (JAS_CAST(bigfix_t, x) * JAS_CAST(bigfix_t, y) >> \
-      (fracbits))) ? \
-      JAS_CAST(fix_t, (JAS_CAST(bigfix_t, x) * JAS_CAST(bigfix_t, y) >> \
-      (fracbits))) : JAS_FIX_OFLOW())
-
-/* Calculate the product of a fixed-point number and an int. */
-#if !defined(DEBUG_OVERFLOW)
-#define	JAS_FIX_MULBYINT	JAS_FIX_MULBYINT_FAST
-#else
-#define	JAS_FIX_MULBYINT	JAS_FIX_MULBYINT_OFLOW
-#endif
-
-/* Calculate the product of a fixed-point number and an int without overflow
-  checking. */
-#define	JAS_FIX_MULBYINT_FAST(fix_t, fracbits, x, y) \
-    JAS_CAST(fix_t, ((x) * (y)))
-
-/* Calculate the product of a fixed-point number and an int with overflow
-  checking. */
-#define	JAS_FIX_MULBYINT_OFLOW(fix_t, fracbits, x, y) \
-    JAS_FIX_MULBYINT_FAST(fix_t, fracbits, x, y)
-
-/* Calculate the quotient of two fixed-point numbers. */
-#if !defined(DEBUG_OVERFLOW)
-#define JAS_FIX_DIV			JAS_FIX_DIV_FAST
-#else
-#define JAS_FIX_DIV			JAS_FIX_DIV_UFLOW
-#endif
-
-/* Calculate the quotient of two fixed-point numbers without underflow
-  checking. */
-#define	JAS_FIX_DIV_FAST(fix_t, fracbits, bigfix_t, x, y) \
-    JAS_CAST(fix_t, (JAS_CAST(bigfix_t, x) << (fracbits)) / (y))
-
-/* Calculate the quotient of two fixed-point numbers with underflow
-  checking. */
-#define JAS_FIX_DIV_UFLOW(fix_t, fracbits, bigfix_t, x, y) \
-    JAS_FIX_DIV_FAST(fix_t, fracbits, bigfix_t, x, y)
-
-/* Negate a fixed-point number. */
-#if !defined(DEBUG_OVERFLOW)
-#define	JAS_FIX_NEG			JAS_FIX_NEG_FAST
-#else
-#define	JAS_FIX_NEG			JAS_FIX_NEG_OFLOW
-#endif
-
-/* Negate a fixed-point number without overflow checking. */
-#define	JAS_FIX_NEG_FAST(fix_t, fracbits, x) \
-    (-(x))
-
-/* Negate a fixed-point number with overflow checking. */
-/* Yes, overflow is actually possible for two's complement representations,
-  although highly unlikely to occur. */
-#define	JAS_FIX_NEG_OFLOW(fix_t, fracbits, x) \
-    (((x) < 0) ? (-(x) > 0 || JAS_FIX_OFLOW(), -(x)) : (-(x)))
-
-/* Perform an arithmetic shift left of a fixed-point number. */
-#if !defined(DEBUG_OVERFLOW)
-#define	JAS_FIX_ASL			JAS_FIX_ASL_FAST
-#else
-#define	JAS_FIX_ASL			JAS_FIX_ASL_OFLOW
-#endif
-
-/* Perform an arithmetic shift left of a fixed-point number without overflow
-  checking. */
-#define	JAS_FIX_ASL_FAST(fix_t, fracbits, x, n) \
-    ((x) << (n))
-
-/* Perform an arithmetic shift left of a fixed-point number with overflow
-  checking. */
-#define	JAS_FIX_ASL_OFLOW(fix_t, fracbits, x, n) \
-    ((((x) << (n)) >> (n)) == (x) || JAS_FIX_OFLOW(), (x) << (n))
-
-/* Perform an arithmetic shift right of a fixed-point number. */
-#if !defined(DEBUG_OVERFLOW)
-#define	JAS_FIX_ASR			JAS_FIX_ASR_FAST
-#else
-#define	JAS_FIX_ASR			JAS_FIX_ASR_UFLOW
-#endif
-
-/* Perform an arithmetic shift right of a fixed-point number without underflow
-  checking. */
-#define	JAS_FIX_ASR_FAST(fix_t, fracbits, x, n) \
-    ((x) >> (n))
-
-/* Perform an arithmetic shift right of a fixed-point number with underflow
-  checking. */
-#define	JAS_FIX_ASR_UFLOW(fix_t, fracbits, x, n) \
-    JAS_FIX_ASR_FAST(fix_t, fracbits, x, n)
-
-/******************************************************************************\
-* Other basic arithmetic operations.
-\******************************************************************************/
-
-/* Calculate the difference between two fixed-point numbers. */
-#define JAS_FIX_SUB(fix_t, fracbits, x, y) \
-    JAS_FIX_ADD(fix_t, fracbits, x, JAS_FIX_NEG(fix_t, fracbits, y))
-
-/* Add one fixed-point number to another. */
-#define JAS_FIX_PLUSEQ(fix_t, fracbits, x, y) \
-    ((x) = JAS_FIX_ADD(fix_t, fracbits, x, y))
-
-/* Subtract one fixed-point number from another. */
-#define JAS_FIX_MINUSEQ(fix_t, fracbits, x, y) \
-    ((x) = JAS_FIX_SUB(fix_t, fracbits, x, y))
-
-/* Multiply one fixed-point number by another. */
-#define	JAS_FIX_MULEQ(fix_t, fracbits, bigfix_t, x, y) \
-    ((x) = JAS_FIX_MUL(fix_t, fracbits, bigfix_t, x, y))
-
-/******************************************************************************\
-* Miscellaneous operations.
-\******************************************************************************/
-
-/* Calculate the absolute value of a fixed-point number. */
-#define	JAS_FIX_ABS(fix_t, fracbits, x) \
-    (((x) >= 0) ? (x) : (JAS_FIX_NEG(fix_t, fracbits, x)))
-
-/* Is a fixed-point number an integer? */
-#define	JAS_FIX_ISINT(fix_t, fracbits, x) \
-    (JAS_FIX_FLOOR(fix_t, fracbits, x) == (x))
-
-/* Get the sign of a fixed-point number. */
-#define JAS_FIX_SGN(fix_t, fracbits, x) \
-    ((x) >= 0 ? 1 : (-1))
-
-/******************************************************************************\
-* Relational operations.
-\******************************************************************************/
-
-/* Compare two fixed-point numbers. */
-#define JAS_FIX_CMP(fix_t, fracbits, x, y) \
-    ((x) > (y) ? 1 : (((x) == (y)) ? 0 : (-1)))
-
-/* Less than. */
-#define	JAS_FIX_LT(fix_t, fracbits, x, y) \
-    ((x) < (y))
-
-/* Less than or equal. */
-#define	JAS_FIX_LTE(fix_t, fracbits, x, y) \
-    ((x) <= (y))
-
-/* Greater than. */
-#define	JAS_FIX_GT(fix_t, fracbits, x, y) \
-    ((x) > (y))
-
-/* Greater than or equal. */
-#define	JAS_FIX_GTE(fix_t, fracbits, x, y) \
-    ((x) >= (y))
-
-/******************************************************************************\
-* Rounding functions.
-\******************************************************************************/
-
-/* Round a fixed-point number to the nearest integer. */
-#define	JAS_FIX_ROUND(fix_t, fracbits, x) \
-    (((x) < 0) ? JAS_FIX_FLOOR(fix_t, fracbits, JAS_FIX_ADD(fix_t, fracbits, \
-      (x), JAS_FIX_HALF(fix_t, fracbits))) : \
-      JAS_FIX_NEG(fix_t, fracbits, JAS_FIX_FLOOR(fix_t, fracbits, \
-      JAS_FIX_ADD(fix_t, fracbits, (-(x)), JAS_FIX_HALF(fix_t, fracbits)))))
-
-/* Round a fixed-point number to the nearest integer in the direction of
-  negative infinity (i.e., the floor function). */
-#define	JAS_FIX_FLOOR(fix_t, fracbits, x) \
-    ((x) & (~((JAS_CAST(fix_t, 1) << (fracbits)) - 1)))
-
-/* Round a fixed-point number to the nearest integer in the direction
-  of zero. */
-#define JAS_FIX_TRUNC(fix_t, fracbits, x) \
-    (((x) >= 0) ? JAS_FIX_FLOOR(fix_t, fracbits, x) : \
-      JAS_FIX_CEIL(fix_t, fracbits, x))
-
-/******************************************************************************\
-* The below macros are for internal library use only.  Do not invoke them
-* directly in application code.
-\******************************************************************************/
-
-/* Handle overflow. */
-#define	JAS_FIX_OFLOW() \
-    jas_eprintf("overflow error: file %s, line %d\n", __FILE__, __LINE__)
-
-/* Handle underflow. */
-#define	JAS_FIX_UFLOW() \
-    jas_eprintf("underflow error: file %s, line %d\n", __FILE__, __LINE__)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_getopt.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_getopt.h
deleted file mode 100644
index c1788ae..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_getopt.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Command Line Option Parsing Code
- *
- * $Id$
- */
-
-#ifndef JAS_GETOPT_H
-#define JAS_GETOPT_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <jasper/jas_config.h>
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define	JAS_GETOPT_EOF	(-1)
-#define	JAS_GETOPT_ERR	'?'
-
-/* option flags. */
-#define	JAS_OPT_HASARG	0x01	/* option has argument */
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Command line option type. */
-typedef struct {
-
-    int id;
-    /* The unique identifier for this option. */
-
-    char *name;
-    /* The name of this option. */
-
-    int flags;
-    /* option flags. */
-
-} jas_opt_t;
-
-/******************************************************************************\
-* External data.
-\******************************************************************************/
-
-/* The current option index. */
-extern int jas_optind;
-
-/* The current option argument. */
-extern char *jas_optarg;
-
-/* The debug level. */
-extern int jas_opterr;
-
-/******************************************************************************\
-* Prototypes.
-\******************************************************************************/
-
-/* Get the next option. */
-int jas_getopt(int argc, char **argv, jas_opt_t *opts);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_icc.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_icc.h
deleted file mode 100644
index 744f757..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_icc.h
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright (c) 2002-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JAS_ICC_H
-#define	JAS_ICC_H
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_types.h>
-#include <jasper/jas_stream.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Profile file signature. */
-#define	JAS_ICC_MAGIC		0x61637370
-
-#define	JAS_ICC_HDRLEN	128
-
-/* Profile/device class signatures. */
-#define	JAS_ICC_CLAS_IN	0x73636e72 /* input device */
-#define	JAS_ICC_CLAS_DPY	0x6d6e7472 /* display device */
-#define	JAS_ICC_CLAS_OUT	0x70727472 /* output device */
-#define	JAS_ICC_CLAS_LNK	0x6c696e6b /* device link */
-#define	JAS_ICC_CLAS_CNV	0x73706163 /* color space conversion */
-#define	JAS_ICC_CLAS_ABS	0x61627374 /* abstract */
-#define	JAS_ICC_CLAS_NAM	0x6e6d636c /* named color */
-
-/* Color space signatures. */
-#define	JAS_ICC_COLORSPC_XYZ	0x58595a20 /* XYZ */
-#define	JAS_ICC_COLORSPC_LAB	0x4c616220 /* LAB */
-#define	JAS_ICC_COLORSPC_LUV	0x4c757620 /* LUV */
-#define	JAS_ICC_COLORSPC_YCBCR	0x59436272 /* YCbCr */
-#define	JAS_ICC_COLORSPC_YXY	0x59787920 /* Yxy */
-#define	JAS_ICC_COLORSPC_RGB	0x52474220 /* RGB */
-#define	JAS_ICC_COLORSPC_GRAY	0x47524159 /* Gray */
-#define	JAS_ICC_COLORSPC_HSV	0x48535620 /* HSV */
-#define	JAS_ICC_COLORSPC_HLS	0x484c5320 /* HLS */
-#define	JAS_ICC_COLORSPC_CMYK	0x434d594b /* CMYK */
-#define	JAS_ICC_COLORSPC_CMY	0x434d5920 /* CMY */
-#define	JAS_ICC_COLORSPC_2	0x32434c52 /* 2 channel color */
-#define	JAS_ICC_COLORSPC_3	0x33434c52 /* 3 channel color */
-#define	JAS_ICC_COLORSPC_4	0x34434c52 /* 4 channel color */
-#define	JAS_ICC_COLORSPC_5	0x35434c52 /* 5 channel color */
-#define	JAS_ICC_COLORSPC_6	0x36434c52 /* 6 channel color */
-#define	JAS_ICC_COLORSPC_7	0x37434c52 /* 7 channel color */
-#define	JAS_ICC_COLORSPC_8	0x38434c52 /* 8 channel color */
-#define	JAS_ICC_COLORSPC_9	0x39434c52 /* 9 channel color */
-#define	JAS_ICC_COLORSPC_10	0x41434c52 /* 10 channel color */
-#define	JAS_ICC_COLORSPC_11	0x42434c52 /* 11 channel color */
-#define	JAS_ICC_COLORSPC_12	0x43434c52 /* 12 channel color */
-#define	JAS_ICC_COLORSPC_13	0x44434c52 /* 13 channel color */
-#define	JAS_ICC_COLORSPC_14	0x45434c52 /* 14 channel color */
-#define	JAS_ICC_COLORSPC_15	0x46434c52 /* 15 channel color */
-
-/* Profile connection color space (PCS) signatures. */
-#define	JAS_ICC_REFCOLORSPC_XYZ		0x58595a20 /* CIE XYZ */
-#define	JAS_ICC_REFCOLORSPC_LAB		0x4c616220 /* CIE Lab */
-
-/* Primary platform signatures. */
-#define	JAS_ICC_PLATFORM_APPL	0x4150504c /* Apple Computer */
-#define	JAS_ICC_PLATFORM_MSFT	0x4d534654 /* Microsoft */
-#define	JAS_ICC_PLATFORM_SGI	0x53474920 /* Silicon Graphics */
-#define	JAS_ICC_PLATFORM_SUNW	0x53554e57 /* Sun Microsystems */
-#define	JAS_ICC_PLATFORM_TGNT	0x54474e54 /* Taligent */
-
-/* Profile flags. */
-#define	JAS_ICC_FLAGS_EMBED	0x01 /* embedded */
-#define	JAS_ICC_FLAGS_NOSEP	0x02 /* no separate use */
-
-/* Attributes. */
-#define	JAS_ICC_ATTR_TRANS	0x01 /* transparent */
-#define	JAS_ICC_ATTR_MATTE	0x02 /* matte */
-
-/* Rendering intents. */
-#define	JAS_ICC_INTENT_PER	0 /* perceptual */
-#define	JAS_ICC_INTENT_REL	1 /* relative colorimetric */
-#define	JAS_ICC_INTENT_SAT	2 /* saturation */
-#define	JAS_ICC_INTENT_ABS	3 /* absolute colorimetric */
-
-/* Tag signatures. */
-#define	JAS_ICC_TAG_ATOB0		0x41324230 /* */
-#define	JAS_ICC_TAG_ATOB1		0x41324231 /* */
-#define	JAS_ICC_TAG_ATOB2		0x41324232 /* */
-#define	JAS_ICC_TAG_BLUMATCOL		0x6258595a /* */
-#define	JAS_ICC_TAG_BLUTRC		0x62545243 /* */
-#define	JAS_ICC_TAG_BTOA0		0x42324130 /* */
-#define	JAS_ICC_TAG_BTOA1		0x42324131 /* */
-#define	JAS_ICC_TAG_BTOA2		0x42324132 /* */
-#define	JAS_ICC_TAG_CALTIME		0x63616c74 /* */
-#define	JAS_ICC_TAG_CHARTARGET		0x74617267 /* */
-#define	JAS_ICC_TAG_CPYRT		0x63707274 /* */
-#define	JAS_ICC_TAG_CRDINFO		0x63726469 /* */
-#define	JAS_ICC_TAG_DEVMAKERDESC	0x646d6e64 /* */
-#define	JAS_ICC_TAG_DEVMODELDESC	0x646d6464 /* */
-#define	JAS_ICC_TAG_DEVSET		0x64657673 /* */
-#define	JAS_ICC_TAG_GAMUT		0x67616d74 /* */
-#define	JAS_ICC_TAG_GRYTRC		0x6b545243 /* */
-#define	JAS_ICC_TAG_GRNMATCOL		0x6758595a /* */
-#define	JAS_ICC_TAG_GRNTRC		0x67545243 /* */
-#define	JAS_ICC_TAG_LUM			0x6c756d69 /* */
-#define	JAS_ICC_TAG_MEASURE		0x6d656173 /* */
-#define	JAS_ICC_TAG_MEDIABLKPT		0x626b7074 /* */
-#define	JAS_ICC_TAG_MEDIAWHIPT		0x77747074 /* */
-#define	JAS_ICC_TAG_NAMCOLR		0x6e636f6c /* */
-#define	JAS_ICC_TAG_NAMCOLR2		0x6e636c32 /* */
-#define	JAS_ICC_TAG_OUTRESP		0x72657370 /* */
-#define	JAS_ICC_TAG_PREVIEW0		0x70726530 /* */
-#define	JAS_ICC_TAG_PREVIEW1		0x70726531 /* */
-#define	JAS_ICC_TAG_PREVIEW2		0x70726532 /* */
-#define	JAS_ICC_TAG_PROFDESC		0x64657363 /* */
-#define	JAS_ICC_TAG_PROFSEQDESC		0x70736571 /* */
-#define	JAS_ICC_TAG_PSDCRD0		0x70736430 /* */
-#define	JAS_ICC_TAG_PSCRDD1		0x70736431 /* */
-#define	JAS_ICC_TAG_PSCRDD2		0x70736432 /* */
-#define	JAS_ICC_TAG_PSCRDD3		0x70736433 /* */
-#define	JAS_ICC_TAG_PS2CSA		0x70733273 /* */
-#define	JAS_ICC_TAG_PS2RENINTENT	0x70733269 /* */
-#define	JAS_ICC_TAG_REDMATCOL		0x7258595a /* */
-#define	JAS_ICC_TAG_REDTRC		0x72545243 /* */
-#define	JAS_ICC_TAG_SCRNGDES		0x73637264 /* */
-#define	JAS_ICC_TAG_SCRNG		0x7363726e /* */
-#define	JAS_ICC_TAG_TECH		0x74656368 /* */
-#define	JAS_ICC_TAG_UCRBG		0x62666420 /* */
-#define	JAS_ICC_TAG_VIEWCONDDESC	0x76756564 /* */
-#define	JAS_ICC_TAG_VIEWCOND		0x76696577 /* */
-
-/* Type signatures. */
-#define	JAS_ICC_TYPE_CRDINFO		0x63726469 /* CRD information */
-#define	JAS_ICC_TYPE_CURV		0x63757276 /* curve */
-#define	JAS_ICC_TYPE_DATA		0x64617461 /* data */
-#define	JAS_ICC_TYPE_TIME		0x6474696d /* date/time */
-#define	JAS_ICC_TYPE_DEVSET		0x64657673 /* device settings */
-#define	JAS_ICC_TYPE_LUT16		0x6d667432 /* */
-#define	JAS_ICC_TYPE_LUT8		0x6d667431 /* */
-#define	JAS_ICC_TYPE_MEASURE		0x6d656173 /* */
-#define	JAS_ICC_TYPE_NAMCOLR		0x6e636f6c /* */
-#define	JAS_ICC_TYPE_NAMCOLR2		0x6e636c32 /* */
-#define	JAS_ICC_TYPE_PROFSEQDESC	0x70736571 /* profile sequence description */
-#define	JAS_ICC_TYPE_RESPCURVSET16	0x72637332 /* response curve set 16 */
-#define	JAS_ICC_TYPE_SF32		0x73663332 /* signed 32-bit fixed-point */
-#define	JAS_ICC_TYPE_SCRNG		0x7363726e /* screening */
-#define	JAS_ICC_TYPE_SIG		0x73696720 /* signature */
-#define	JAS_ICC_TYPE_TXTDESC		0x64657363 /* text description */
-#define	JAS_ICC_TYPE_TXT		0x74657874 /* text */
-#define	JAS_ICC_TYPE_UF32		0x75663332 /* unsigned 32-bit fixed-point */
-#define	JAS_ICC_TYPE_UCRBG		0x62666420 /* */
-#define	JAS_ICC_TYPE_UI16		0x75693136 /* */
-#define	JAS_ICC_TYPE_UI32		0x75693332 /* */
-#define	JAS_ICC_TYPE_UI8		0x75693038 /* */
-#define	JAS_ICC_TYPE_UI64		0x75693634 /* */
-#define	JAS_ICC_TYPE_VIEWCOND		0x76696577 /* */
-#define	JAS_ICC_TYPE_XYZ		0x58595a20 /* XYZ */
-
-typedef uint_fast8_t jas_iccuint8_t;
-typedef uint_fast16_t jas_iccuint16_t;
-typedef uint_fast32_t jas_iccuint32_t;
-typedef int_fast32_t jas_iccsint32_t;
-typedef int_fast32_t jas_iccs15fixed16_t;
-typedef uint_fast32_t jas_iccu16fixed16_t;
-typedef uint_fast64_t jas_iccuint64_t;
-typedef uint_fast32_t jas_iccsig_t;
-
-typedef jas_iccsig_t jas_icctagsig_t;
-typedef jas_iccsig_t jas_icctagtype_t;
-typedef jas_iccsig_t jas_iccattrname_t;
-
-/* Date/time type. */
-typedef struct {
-    jas_iccuint16_t year;
-    jas_iccuint16_t month;
-    jas_iccuint16_t day;
-    jas_iccuint16_t hour;
-    jas_iccuint16_t min;
-    jas_iccuint16_t sec;
-} jas_icctime_t;
-
-/* XYZ type. */
-typedef struct {
-    jas_iccs15fixed16_t x;
-    jas_iccs15fixed16_t y;
-    jas_iccs15fixed16_t z;
-} jas_iccxyz_t;
-
-/* Curve type. */
-typedef struct {
-    jas_iccuint32_t numents;
-    jas_iccuint16_t *ents;
-} jas_icccurv_t;
-
-/* Text description type. */
-typedef struct {
-    jas_iccuint32_t asclen;
-    char *ascdata; /* ASCII invariant description */
-    jas_iccuint32_t uclangcode; /* Unicode language code */
-    jas_iccuint32_t uclen; /* Unicode localizable description count */
-    uchar *ucdata; /* Unicode localizable description */
-    jas_iccuint16_t sccode; /* ScriptCode code */
-    jas_iccuint8_t maclen; /* Localizable Macintosh description count */
-    uchar macdata[69]; /* Localizable Macintosh description */
-} jas_icctxtdesc_t;
-
-/* Text type. */
-typedef struct {
-    char *string;	/* ASCII character string */
-} jas_icctxt_t;
-
-typedef struct {
-    jas_iccuint8_t numinchans;
-    jas_iccuint8_t numoutchans;
-    jas_iccsint32_t e[3][3];
-    jas_iccuint8_t clutlen;
-    jas_iccuint8_t *clut;
-    jas_iccuint16_t numintabents;
-    jas_iccuint8_t **intabs;
-    jas_iccuint8_t *intabsbuf;
-    jas_iccuint16_t numouttabents;
-    jas_iccuint8_t **outtabs;
-    jas_iccuint8_t *outtabsbuf;
-} jas_icclut8_t;
-
-typedef struct {
-    jas_iccuint8_t numinchans;
-    jas_iccuint8_t numoutchans;
-    jas_iccsint32_t e[3][3];
-    jas_iccuint8_t clutlen;
-    jas_iccuint16_t *clut;
-    jas_iccuint16_t numintabents;
-    jas_iccuint16_t **intabs;
-    jas_iccuint16_t *intabsbuf;
-    jas_iccuint16_t numouttabents;
-    jas_iccuint16_t **outtabs;
-    jas_iccuint16_t *outtabsbuf;
-} jas_icclut16_t;
-
-struct jas_iccattrval_s;
-
-typedef struct {
-    void (*destroy)(struct jas_iccattrval_s *);
-    int (*copy)(struct jas_iccattrval_s *, struct jas_iccattrval_s *);
-    int (*input)(struct jas_iccattrval_s *, jas_stream_t *, int);
-    int (*output)(struct jas_iccattrval_s *, jas_stream_t *);
-    int (*getsize)(struct jas_iccattrval_s *);
-    void (*dump)(struct jas_iccattrval_s *, FILE *);
-} jas_iccattrvalops_t;
-
-/* Attribute value type (type and value information). */
-typedef struct jas_iccattrval_s {
-    int refcnt; /* reference count */
-    jas_iccsig_t type; /* type */
-    jas_iccattrvalops_t *ops; /* type-dependent operations */
-    union {
-        jas_iccxyz_t xyz;
-        jas_icccurv_t curv;
-        jas_icctxtdesc_t txtdesc;
-        jas_icctxt_t txt;
-        jas_icclut8_t lut8;
-        jas_icclut16_t lut16;
-    } data; /* value */
-} jas_iccattrval_t;
-
-/* Header type. */
-typedef struct {
-    jas_iccuint32_t size; /* profile size */
-    jas_iccsig_t cmmtype; /* CMM type signature */
-    jas_iccuint32_t version; /* profile version */
-    jas_iccsig_t clas; /* profile/device class signature */
-    jas_iccsig_t colorspc; /* color space of data */
-    jas_iccsig_t refcolorspc; /* profile connection space */
-    jas_icctime_t ctime; /* creation time */
-    jas_iccsig_t magic; /* profile file signature */
-    jas_iccsig_t platform; /* primary platform */
-    jas_iccuint32_t flags; /* profile flags */
-    jas_iccsig_t maker; /* device manufacturer signature */
-    jas_iccsig_t model; /* device model signature */
-    jas_iccuint64_t attr; /* device setup attributes */
-    jas_iccsig_t intent; /* rendering intent */
-    jas_iccxyz_t illum; /* illuminant */
-    jas_iccsig_t creator; /* profile creator signature */
-} jas_icchdr_t;
-
-typedef struct {
-    jas_iccsig_t name;
-    jas_iccattrval_t *val;
-} jas_iccattr_t;
-
-typedef struct {
-    int numattrs;
-    int maxattrs;
-    jas_iccattr_t *attrs;
-} jas_iccattrtab_t;
-
-typedef struct jas_icctagtabent_s {
-    jas_iccuint32_t tag;
-    jas_iccuint32_t off;
-    jas_iccuint32_t len;
-    void *data;
-    struct jas_icctagtabent_s *first;
-} jas_icctagtabent_t;
-
-typedef struct {
-    jas_iccuint32_t numents;
-    jas_icctagtabent_t *ents;
-} jas_icctagtab_t;
-
-/* ICC profile type. */
-typedef struct {
-    jas_icchdr_t hdr;
-    jas_icctagtab_t tagtab;
-    jas_iccattrtab_t *attrtab;
-} jas_iccprof_t;
-
-typedef struct {
-    jas_iccuint32_t type;
-    jas_iccattrvalops_t ops;
-} jas_iccattrvalinfo_t;
-
-jas_iccprof_t *jas_iccprof_load(jas_stream_t *in);
-int jas_iccprof_save(jas_iccprof_t *prof, jas_stream_t *out);
-void jas_iccprof_destroy(jas_iccprof_t *prof);
-jas_iccattrval_t *jas_iccprof_getattr(jas_iccprof_t *prof,
-  jas_iccattrname_t name);
-int jas_iccprof_setattr(jas_iccprof_t *prof, jas_iccattrname_t name,
-  jas_iccattrval_t *val);
-void jas_iccprof_dump(jas_iccprof_t *prof, FILE *out);
-jas_iccprof_t *jas_iccprof_copy(jas_iccprof_t *prof);
-int jas_iccprof_gethdr(jas_iccprof_t *prof, jas_icchdr_t *hdr);
-int jas_iccprof_sethdr(jas_iccprof_t *prof, jas_icchdr_t *hdr);
-
-void jas_iccattrval_destroy(jas_iccattrval_t *attrval);
-void jas_iccattrval_dump(jas_iccattrval_t *attrval, FILE *out);
-int jas_iccattrval_allowmodify(jas_iccattrval_t **attrval);
-jas_iccattrval_t *jas_iccattrval_clone(jas_iccattrval_t *attrval);
-jas_iccattrval_t *jas_iccattrval_create(jas_iccuint32_t type);
-
-void jas_iccattrtab_dump(jas_iccattrtab_t *attrtab, FILE *out);
-
-extern uchar jas_iccprofdata_srgb[];
-extern int jas_iccprofdata_srgblen;
-extern uchar jas_iccprofdata_sgray[];
-extern int jas_iccprofdata_sgraylen;
-jas_iccprof_t *jas_iccprof_createfrombuf(uchar *buf, int len);
-jas_iccprof_t *jas_iccprof_createfromclrspc(int clrspc);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_image.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_image.h
deleted file mode 100644
index 2a2885c..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_image.h
+++ /dev/null
@@ -1,564 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Image Class
- *
- * $Id$
- */
-
-#ifndef JAS_IMAGE_H
-#define JAS_IMAGE_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_stream.h>
-#include <jasper/jas_seq.h>
-#include <jasper/jas_cm.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/*
- * Miscellaneous constants.
- */
-
-/* The threshold at which image data is no longer stored in memory. */
-#define JAS_IMAGE_INMEMTHRESH	(16 * 1024 * 1024)
-
-/*
- * Component types
- */
-
-#define	JAS_IMAGE_CT_UNKNOWN	0x10000
-#define	JAS_IMAGE_CT_COLOR(n)	((n) & 0x7fff)
-#define	JAS_IMAGE_CT_OPACITY	0x08000
-
-#define	JAS_IMAGE_CT_RGB_R	0
-#define	JAS_IMAGE_CT_RGB_G	1
-#define	JAS_IMAGE_CT_RGB_B	2
-
-#define	JAS_IMAGE_CT_YCBCR_Y	0
-#define	JAS_IMAGE_CT_YCBCR_CB	1
-#define	JAS_IMAGE_CT_YCBCR_CR	2
-
-#define	JAS_IMAGE_CT_GRAY_Y	0
-
-/******************************************************************************\
-* Simple types.
-\******************************************************************************/
-
-/* Image coordinate. */
-typedef int_fast32_t jas_image_coord_t;
-
-/* Color space (e.g., RGB, YCbCr). */
-typedef int_fast16_t jas_image_colorspc_t;
-
-/* Component type (e.g., color, opacity). */
-typedef int_fast32_t jas_image_cmpttype_t;
-
-/* Component sample data format (e.g., real/integer, signedness, precision). */
-typedef int_fast16_t jas_image_smpltype_t;
-
-/******************************************************************************\
-* Image class and supporting classes.
-\******************************************************************************/
-
-/* Image component class. */
-
-typedef struct {
-
-    jas_image_coord_t tlx_;
-    /* The x-coordinate of the top-left corner of the component. */
-
-    jas_image_coord_t tly_;
-    /* The y-coordinate of the top-left corner of the component. */
-
-    jas_image_coord_t hstep_;
-    /* The horizontal sampling period in units of the reference grid. */
-
-    jas_image_coord_t vstep_;
-    /* The vertical sampling period in units of the reference grid. */
-
-    jas_image_coord_t width_;
-    /* The component width in samples. */
-
-    jas_image_coord_t height_;
-    /* The component height in samples. */
-
-#ifdef FIX_ME
-    int smpltype_;
-#else
-    int prec_;
-    /* The precision of the sample data (i.e., the number of bits per
-    sample).  If the samples are signed values, this quantity
-    includes the sign bit. */
-
-    int sgnd_;
-    /* The signedness of the sample data. */
-#endif
-
-    jas_stream_t *stream_;
-    /* The stream containing the component data. */
-
-    int cps_;
-    /* The number of characters per sample in the stream. */
-
-    jas_image_cmpttype_t type_;
-    /* The type of component (e.g., opacity, red, green, blue, luma). */
-
-} jas_image_cmpt_t;
-
-/* Image class. */
-
-typedef struct {
-
-    jas_image_coord_t tlx_;
-    /* The x-coordinate of the top-left corner of the image bounding box. */
-
-    jas_image_coord_t tly_;
-    /* The y-coordinate of the top-left corner of the image bounding box. */
-
-    jas_image_coord_t brx_;
-    /* The x-coordinate of the bottom-right corner of the image bounding
-      box (plus one). */
-
-    jas_image_coord_t bry_;
-    /* The y-coordinate of the bottom-right corner of the image bounding
-      box (plus one). */
-
-    int numcmpts_;
-    /* The number of components. */
-
-    int maxcmpts_;
-    /* The maximum number of components that this image can have (i.e., the
-      allocated size of the components array). */
-
-    jas_image_cmpt_t **cmpts_;
-    /* Per-component information. */
-
-    jas_clrspc_t clrspc_;
-
-    jas_cmprof_t *cmprof_;
-
-    bool inmem_;
-
-} jas_image_t;
-
-/* Component parameters class. */
-/* This data type exists solely/mainly for the purposes of the
-  jas_image_create function. */
-
-typedef struct {
-
-    jas_image_coord_t tlx;
-    /* The x-coordinate of the top-left corner of the component. */
-
-    jas_image_coord_t tly;
-    /* The y-coordinate of the top-left corner of the component. */
-
-    jas_image_coord_t hstep;
-    /* The horizontal sampling period in units of the reference grid. */
-
-    jas_image_coord_t vstep;
-    /* The vertical sampling period in units of the reference grid. */
-
-    jas_image_coord_t width;
-    /* The width of the component in samples. */
-
-    jas_image_coord_t height;
-    /* The height of the component in samples. */
-
-#ifdef FIX_ME
-    int smpltype;
-#else
-    int prec;
-    /* The precision of the component sample data. */
-
-    int sgnd;
-    /* The signedness of the component sample data. */
-#endif
-
-} jas_image_cmptparm_t;
-
-/******************************************************************************\
-* File format related classes.
-\******************************************************************************/
-
-#define	JAS_IMAGE_MAXFMTS	32
-/* The maximum number of image data formats supported. */
-
-/* Image format-dependent operations. */
-
-typedef struct {
-
-    jas_image_t *(*decode)(jas_stream_t *in, char *opts);
-    /* Decode image data from a stream. */
-
-    int (*encode)(jas_image_t *image, jas_stream_t *out, char *opts);
-    /* Encode image data to a stream. */
-
-    int (*validate)(jas_stream_t *in);
-    /* Determine if stream data is in a particular format. */
-
-} jas_image_fmtops_t;
-
-/* Image format information. */
-
-typedef struct {
-
-    int id;
-    /* The ID for this format. */
-
-    char *name;
-    /* The name by which this format is identified. */
-
-    char *ext;
-    /* The file name extension associated with this format. */
-
-    char *desc;
-    /* A brief description of the format. */
-
-    jas_image_fmtops_t ops;
-    /* The operations for this format. */
-
-} jas_image_fmtinfo_t;
-
-/******************************************************************************\
-* Image operations.
-\******************************************************************************/
-
-/* Create an image. */
-jas_image_t *jas_image_create(int numcmpts,
-  jas_image_cmptparm_t *cmptparms, jas_clrspc_t clrspc);
-
-/* Create an "empty" image. */
-jas_image_t *jas_image_create0(void);
-
-/* Clone an image. */
-jas_image_t *jas_image_copy(jas_image_t *image);
-
-/* Deallocate any resources associated with an image. */
-void jas_image_destroy(jas_image_t *image);
-
-/* Get the width of the image in units of the image reference grid. */
-#define jas_image_width(image) \
-    ((image)->brx_ - (image)->tlx_)
-
-/* Get the height of the image in units of the image reference grid. */
-#define	jas_image_height(image) \
-    ((image)->bry_ - (image)->tly_)
-
-/* Get the x-coordinate of the top-left corner of the image bounding box
-  on the reference grid. */
-#define jas_image_tlx(image) \
-    ((image)->tlx_)
-
-/* Get the y-coordinate of the top-left corner of the image bounding box
-  on the reference grid. */
-#define jas_image_tly(image) \
-    ((image)->tly_)
-
-/* Get the x-coordinate of the bottom-right corner of the image bounding box
-  on the reference grid (plus one). */
-#define jas_image_brx(image) \
-    ((image)->brx_)
-
-/* Get the y-coordinate of the bottom-right corner of the image bounding box
-  on the reference grid (plus one). */
-#define jas_image_bry(image) \
-    ((image)->bry_)
-
-/* Get the number of image components. */
-#define	jas_image_numcmpts(image) \
-    ((image)->numcmpts_)
-
-/* Get the color model used by the image. */
-#define	jas_image_clrspc(image) \
-    ((image)->clrspc_)
-
-/* Set the color model for an image. */
-#define jas_image_setclrspc(image, clrspc) \
-    ((image)->clrspc_ = (clrspc))
-
-#define jas_image_cmpttype(image, cmptno) \
-    ((image)->cmpts_[(cmptno)]->type_)
-#define jas_image_setcmpttype(image, cmptno, type) \
-    ((image)->cmpts_[(cmptno)]->type_ = (type))
-
-/* Get the width of a component. */
-#define	jas_image_cmptwidth(image, cmptno) \
-    ((image)->cmpts_[cmptno]->width_)
-
-/* Get the height of a component. */
-#define	jas_image_cmptheight(image, cmptno) \
-    ((image)->cmpts_[cmptno]->height_)
-
-/* Get the signedness of the sample data for a component. */
-#define	jas_image_cmptsgnd(image, cmptno) \
-    ((image)->cmpts_[cmptno]->sgnd_)
-
-/* Get the precision of the sample data for a component. */
-#define	jas_image_cmptprec(image, cmptno) \
-    ((image)->cmpts_[cmptno]->prec_)
-
-/* Get the horizontal subsampling factor for a component. */
-#define	jas_image_cmpthstep(image, cmptno) \
-    ((image)->cmpts_[cmptno]->hstep_)
-
-/* Get the vertical subsampling factor for a component. */
-#define	jas_image_cmptvstep(image, cmptno) \
-    ((image)->cmpts_[cmptno]->vstep_)
-
-/* Get the x-coordinate of the top-left corner of a component. */
-#define	jas_image_cmpttlx(image, cmptno) \
-    ((image)->cmpts_[cmptno]->tlx_)
-
-/* Get the y-coordinate of the top-left corner of a component. */
-#define	jas_image_cmpttly(image, cmptno) \
-    ((image)->cmpts_[cmptno]->tly_)
-
-/* Get the x-coordinate of the bottom-right corner of a component
-  (plus "one"). */
-#define	jas_image_cmptbrx(image, cmptno) \
-    ((image)->cmpts_[cmptno]->tlx_ + (image)->cmpts_[cmptno]->width_ * \
-      (image)->cmpts_[cmptno]->hstep_)
-
-/* Get the y-coordinate of the bottom-right corner of a component
-  (plus "one"). */
-#define	jas_image_cmptbry(image, cmptno) \
-    ((image)->cmpts_[cmptno]->tly_ + (image)->cmpts_[cmptno]->height_ * \
-      (image)->cmpts_[cmptno]->vstep_)
-
-/* Get the raw size of an image (i.e., the nominal size of the image without
-  any compression. */
-uint_fast32_t jas_image_rawsize(jas_image_t *image);
-
-/* Create an image from a stream in some specified format. */
-jas_image_t *jas_image_decode(jas_stream_t *in, int fmt, char *optstr);
-
-/* Write an image to a stream in a specified format. */
-int jas_image_encode(jas_image_t *image, jas_stream_t *out, int fmt,
-  char *optstr);
-
-/* Read a rectangular region of an image component. */
-/* The position and size of the rectangular region to be read is specified
-relative to the component's coordinate system. */
-int jas_image_readcmpt(jas_image_t *image, int cmptno,
-  jas_image_coord_t x, jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  jas_matrix_t *data);
-
-/* Write a rectangular region of an image component. */
-int jas_image_writecmpt(jas_image_t *image, int cmptno,
-  jas_image_coord_t x, jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  jas_matrix_t *data);
-
-/* Delete a component from an image. */
-void jas_image_delcmpt(jas_image_t *image, int cmptno);
-
-/* Add a component to an image. */
-int jas_image_addcmpt(jas_image_t *image, int cmptno,
-  jas_image_cmptparm_t *cmptparm);
-
-/* Copy a component from one image to another. */
-int jas_image_copycmpt(jas_image_t *dstimage, int dstcmptno,
-  jas_image_t *srcimage, int srccmptno);
-
-#define	JAS_IMAGE_CDT_GETSGND(dtype) (((dtype) >> 7) & 1)
-#define	JAS_IMAGE_CDT_SETSGND(dtype) (((dtype) & 1) << 7)
-#define	JAS_IMAGE_CDT_GETPREC(dtype) ((dtype) & 0x7f)
-#define	JAS_IMAGE_CDT_SETPREC(dtype) ((dtype) & 0x7f)
-
-#define	jas_image_cmptdtype(image, cmptno) \
-    (JAS_IMAGE_CDT_SETSGND((image)->cmpts_[cmptno]->sgnd_) | JAS_IMAGE_CDT_SETPREC((image)->cmpts_[cmptno]->prec_))
-
-int jas_image_depalettize(jas_image_t *image, int cmptno, int numlutents,
-  int_fast32_t *lutents, int dtype, int newcmptno);
-
-int jas_image_readcmptsample(jas_image_t *image, int cmptno, int x, int y);
-void jas_image_writecmptsample(jas_image_t *image, int cmptno, int x, int y,
-  int_fast32_t v);
-
-int jas_image_getcmptbytype(jas_image_t *image, int ctype);
-
-/******************************************************************************\
-* Image format-related operations.
-\******************************************************************************/
-
-/* Clear the table of image formats. */
-void jas_image_clearfmts(void);
-
-/* Add entry to table of image formats. */
-int jas_image_addfmt(int id, char *name, char *ext, char *desc,
-  jas_image_fmtops_t *ops);
-
-/* Get the ID for the image format with the specified name. */
-int jas_image_strtofmt(char *s);
-
-/* Get the name of the image format with the specified ID. */
-char *jas_image_fmttostr(int fmt);
-
-/* Lookup image format information by the format ID. */
-jas_image_fmtinfo_t *jas_image_lookupfmtbyid(int id);
-
-/* Lookup image format information by the format name. */
-jas_image_fmtinfo_t *jas_image_lookupfmtbyname(const char *name);
-
-/* Guess the format of an image file based on its name. */
-int jas_image_fmtfromname(char *filename);
-
-/* Get the format of image data in a stream. */
-int jas_image_getfmt(jas_stream_t *in);
-
-
-#define	jas_image_cmprof(image)	((image)->cmprof_)
-int jas_image_ishomosamp(jas_image_t *image);
-int jas_image_sampcmpt(jas_image_t *image, int cmptno, int newcmptno,
-  jas_image_coord_t ho, jas_image_coord_t vo, jas_image_coord_t hs,
-  jas_image_coord_t vs, int sgnd, int prec);
-int jas_image_writecmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x,
-  jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  long *buf);
-int jas_image_readcmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x,
-  jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height,
-  long *buf);
-
-#define	jas_image_setcmprof(image, cmprof) ((image)->cmprof_ = cmprof)
-jas_image_t *jas_image_chclrspc(jas_image_t *image, jas_cmprof_t *outprof,
-  int intent);
-void jas_image_dump(jas_image_t *image, FILE *out);
-
-/******************************************************************************\
-* Image format-dependent operations.
-\******************************************************************************/
-
-#if !defined(EXCLUDE_JPG_SUPPORT)
-/* Format-dependent operations for JPG support. */
-jas_image_t *jpg_decode(jas_stream_t *in, char *optstr);
-int jpg_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int jpg_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_MIF_SUPPORT)
-/* Format-dependent operations for MIF support. */
-jas_image_t *mif_decode(jas_stream_t *in, char *optstr);
-int mif_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int mif_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_PNM_SUPPORT)
-/* Format-dependent operations for PNM support. */
-jas_image_t *pnm_decode(jas_stream_t *in, char *optstr);
-int pnm_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int pnm_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_RAS_SUPPORT)
-/* Format-dependent operations for Sun Rasterfile support. */
-jas_image_t *ras_decode(jas_stream_t *in, char *optstr);
-int ras_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int ras_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_BMP_SUPPORT)
-/* Format-dependent operations for BMP support. */
-jas_image_t *bmp_decode(jas_stream_t *in, char *optstr);
-int bmp_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int bmp_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_JP2_SUPPORT)
-/* Format-dependent operations for JP2 support. */
-jas_image_t *jp2_decode(jas_stream_t *in, char *optstr);
-int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int jp2_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_JPC_SUPPORT)
-/* Format-dependent operations for JPEG-2000 code stream support. */
-jas_image_t *jpc_decode(jas_stream_t *in, char *optstr);
-int jpc_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int jpc_validate(jas_stream_t *in);
-#endif
-
-#if !defined(EXCLUDE_PGX_SUPPORT)
-/* Format-dependent operations for PGX support. */
-jas_image_t *pgx_decode(jas_stream_t *in, char *optstr);
-int pgx_encode(jas_image_t *image, jas_stream_t *out, char *optstr);
-int pgx_validate(jas_stream_t *in);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_init.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_init.h
deleted file mode 100644
index 16b99fe..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_init.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JAS_INIT_H
-#define JAS_INIT_H
-
-#include <jasper/jas_config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-int jas_init(void);
-
-void jas_cleanup(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_malloc.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_malloc.h
deleted file mode 100644
index 5f05155..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_malloc.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Memory Allocator
- *
- * $Id$
- */
-
-#ifndef JAS_MALLOC_H
-#define JAS_MALLOC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Hack follows...
-\******************************************************************************/
-
-#if defined(DEBUG_MEMALLOC)
-/* This is somewhat of a hack, but it's a useful hack. :-) */
-/* Use my own custom memory allocator for debugging. */
-#include "../../../../local/src/memalloc.h"
-#define jas_malloc	MEMALLOC
-#define	jas_free	MEMFREE
-#define	jas_realloc	MEMREALLOC
-#define	jas_calloc	MEMCALLOC
-#endif
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-#if !defined(DEBUG_MEMALLOC)
-
-/* Allocate memory. */
-void *jas_malloc(size_t size);
-
-/* Free memory. */
-void jas_free(void *ptr);
-
-/* Resize a block of allocated memory. */
-void *jas_realloc(void *ptr, size_t size);
-
-/* Allocate a block of memory and initialize the contents to zero. */
-void *jas_calloc(size_t nmemb, size_t size);
-
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_math.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_math.h
deleted file mode 100644
index 417c2b9..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_math.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Math-Related Code
- *
- * $Id$
- */
-
-#ifndef	JAS_MATH_H
-#define	JAS_MATH_H
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-
-#include	<assert.h>
-#include	<stdio.h>
-#include	<string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Macros
-\******************************************************************************/
-
-/* Compute the absolute value. */
-#define	JAS_ABS(x) \
-    (((x) >= 0) ? (x) : (-(x)))
-
-/* Compute the minimum of two values. */
-#define	JAS_MIN(x, y) \
-    (((x) < (y)) ? (x) : (y))
-
-/* Compute the maximum of two values. */
-#define	JAS_MAX(x, y) \
-    (((x) > (y)) ? (x) : (y))
-
-/* Compute the remainder from division (where division is defined such
-  that the remainder is always nonnegative). */
-#define	JAS_MOD(x, y) \
-    (((x) < 0) ? (((-x) % (y)) ? ((y) - ((-(x)) % (y))) : (0)) : ((x) % (y)))
-
-/* Compute the integer with the specified number of least significant bits
-  set to one. */
-#define	JAS_ONES(n) \
-  ((1 << (n)) - 1)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_seq.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_seq.h
deleted file mode 100644
index 7ece8a8..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_seq.h
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sequence/Matrix Library
- *
- * $Id$
- */
-
-#ifndef JAS_SEQ_H
-#define JAS_SEQ_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-
-#include <jasper/jas_stream.h>
-#include <jasper/jas_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* This matrix is a reference to another matrix. */
-#define JAS_MATRIX_REF	0x0001
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* An element in a sequence. */
-typedef int_fast32_t jas_seqent_t;
-
-/* An element in a matrix. */
-typedef int_fast32_t jas_matent_t;
-
-/* Matrix. */
-
-typedef struct {
-
-    /* Additional state information. */
-    int flags_;
-
-    /* The starting horizontal index. */
-    int_fast32_t xstart_;
-
-    /* The starting vertical index. */
-    int_fast32_t ystart_;
-
-    /* The ending horizontal index. */
-    int_fast32_t xend_;
-
-    /* The ending vertical index. */
-    int_fast32_t yend_;
-
-    /* The number of rows in the matrix. */
-    int_fast32_t numrows_;
-
-    /* The number of columns in the matrix. */
-    int_fast32_t numcols_;
-
-    /* Pointers to the start of each row. */
-    jas_seqent_t **rows_;
-
-    /* The allocated size of the rows array. */
-    int_fast32_t maxrows_;
-
-    /* The matrix data buffer. */
-    jas_seqent_t *data_;
-
-    /* The allocated size of the data array. */
-    int_fast32_t datasize_;
-
-} jas_matrix_t;
-
-typedef jas_matrix_t jas_seq2d_t;
-typedef jas_matrix_t jas_seq_t;
-
-/******************************************************************************\
-* Functions/macros for matrix class.
-\******************************************************************************/
-
-/* Get the number of rows. */
-#define jas_matrix_numrows(matrix) \
-    ((matrix)->numrows_)
-
-/* Get the number of columns. */
-#define jas_matrix_numcols(matrix) \
-    ((matrix)->numcols_)
-
-/* Get a matrix element. */
-#define jas_matrix_get(matrix, i, j) \
-    ((matrix)->rows_[i][j])
-
-/* Set a matrix element. */
-#define jas_matrix_set(matrix, i, j, v) \
-    ((matrix)->rows_[i][j] = (v))
-
-/* Get an element from a matrix that is known to be a row or column vector. */
-#define jas_matrix_getv(matrix, i) \
-    (((matrix)->numrows_ == 1) ? ((matrix)->rows_[0][i]) : \
-      ((matrix)->rows_[i][0]))
-
-/* Set an element in a matrix that is known to be a row or column vector. */
-#define jas_matrix_setv(matrix, i, v) \
-    (((matrix)->numrows_ == 1) ? ((matrix)->rows_[0][i] = (v)) : \
-      ((matrix)->rows_[i][0] = (v)))
-
-/* Get the address of an element in a matrix. */
-#define	jas_matrix_getref(matrix, i, j) \
-    (&(matrix)->rows_[i][j])
-
-#define	jas_matrix_getvref(matrix, i) \
-    (((matrix)->numrows_ > 1) ? jas_matrix_getref(matrix, i, 0) : jas_matrix_getref(matrix, 0, i))
-
-#define jas_matrix_length(matrix) \
-    (max((matrix)->numrows_, (matrix)->numcols_))
-
-/* Create a matrix with the specified dimensions. */
-jas_matrix_t *jas_matrix_create(int numrows, int numcols);
-
-/* Destroy a matrix. */
-void jas_matrix_destroy(jas_matrix_t *matrix);
-
-/* Resize a matrix.  The previous contents of the matrix are lost. */
-int jas_matrix_resize(jas_matrix_t *matrix, int numrows, int numcols);
-
-int jas_matrix_output(jas_matrix_t *matrix, FILE *out);
-
-/* Create a matrix that references part of another matrix. */
-void jas_matrix_bindsub(jas_matrix_t *mat0, jas_matrix_t *mat1, int r0, int c0,
-  int r1, int c1);
-
-/* Create a matrix that is a reference to a row of another matrix. */
-#define jas_matrix_bindrow(mat0, mat1, r) \
-  (jas_matrix_bindsub((mat0), (mat1), (r), 0, (r), (mat1)->numcols_ - 1))
-
-/* Create a matrix that is a reference to a column of another matrix. */
-#define jas_matrix_bindcol(mat0, mat1, c) \
-  (jas_matrix_bindsub((mat0), (mat1), 0, (c), (mat1)->numrows_ - 1, (c)))
-
-/* Clip the values of matrix elements to the specified range. */
-void jas_matrix_clip(jas_matrix_t *matrix, jas_seqent_t minval,
-  jas_seqent_t maxval);
-
-/* Arithmetic shift left of all elements in a matrix. */
-void jas_matrix_asl(jas_matrix_t *matrix, int n);
-
-/* Arithmetic shift right of all elements in a matrix. */
-void jas_matrix_asr(jas_matrix_t *matrix, int n);
-
-/* Almost-but-not-quite arithmetic shift right of all elements in a matrix. */
-void jas_matrix_divpow2(jas_matrix_t *matrix, int n);
-
-/* Set all elements of a matrix to the specified value. */
-void jas_matrix_setall(jas_matrix_t *matrix, jas_seqent_t val);
-
-/* The spacing between rows of a matrix. */
-#define	jas_matrix_rowstep(matrix) \
-    (((matrix)->numrows_ > 1) ? ((matrix)->rows_[1] - (matrix)->rows_[0]) : (0))
-
-/* The spacing between columns of a matrix. */
-#define	jas_matrix_step(matrix) \
-    (((matrix)->numrows_ > 1) ? (jas_matrix_rowstep(matrix)) : (1))
-
-/* Compare two matrices for equality. */
-int jas_matrix_cmp(jas_matrix_t *mat0, jas_matrix_t *mat1);
-
-jas_matrix_t *jas_matrix_copy(jas_matrix_t *x);
-
-jas_matrix_t *jas_matrix_input(FILE *);
-
-/******************************************************************************\
-* Functions/macros for 2-D sequence class.
-\******************************************************************************/
-
-jas_seq2d_t *jas_seq2d_copy(jas_seq2d_t *x);
-
-jas_matrix_t *jas_seq2d_create(int xstart, int ystart, int xend, int yend);
-
-#define	jas_seq2d_destroy(s) \
-    jas_matrix_destroy(s)
-
-#define	jas_seq2d_xstart(s) \
-    ((s)->xstart_)
-#define	jas_seq2d_ystart(s) \
-    ((s)->ystart_)
-#define	jas_seq2d_xend(s) \
-    ((s)->xend_)
-#define	jas_seq2d_yend(s) \
-    ((s)->yend_)
-#define	jas_seq2d_getref(s, x, y) \
-    (jas_matrix_getref(s, (y) - (s)->ystart_, (x) - (s)->xstart_))
-#define	jas_seq2d_get(s, x, y) \
-    (jas_matrix_get(s, (y) - (s)->ystart_, (x) - (s)->xstart_))
-#define	jas_seq2d_rowstep(s) \
-    jas_matrix_rowstep(s)
-#define	jas_seq2d_width(s) \
-    ((s)->xend_ - (s)->xstart_)
-#define	jas_seq2d_height(s) \
-    ((s)->yend_ - (s)->ystart_)
-#define	jas_seq2d_setshift(s, x, y) \
-    ((s)->xstart_ = (x), (s)->ystart_ = (y), \
-      (s)->xend_ = (s)->xstart_ + (s)->numcols_, \
-      (s)->yend_ = (s)->ystart_ + (s)->numrows_)
-
-void jas_seq2d_bindsub(jas_matrix_t *s, jas_matrix_t *s1, int xstart,
-  int ystart, int xend, int yend);
-
-/******************************************************************************\
-* Functions/macros for 1-D sequence class.
-\******************************************************************************/
-
-#define	jas_seq_create(start, end) \
-    (jas_seq2d_create(start, 0, end, 1))
-
-#define	jas_seq_destroy(seq) \
-    (jas_seq2d_destroy(seq))
-
-#define jas_seq_set(seq, i, v) \
-    ((seq)->rows_[0][(i) - (seq)->xstart_] = (v))
-#define	jas_seq_getref(seq, i) \
-    (&(seq)->rows_[0][(i) - (seq)->xstart_])
-#define	jas_seq_get(seq, i) \
-    ((seq)->rows_[0][(i) - (seq)->xstart_])
-#define	jas_seq_start(seq) \
-    ((seq)->xstart_)
-#define	jas_seq_end(seq) \
-    ((seq)->xend_)
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_stream.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_stream.h
deleted file mode 100644
index b45baa5..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_stream.h
+++ /dev/null
@@ -1,464 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * I/O Stream Class
- *
- * $Id$
- */
-
-#ifndef JAS_STREAM_H
-#define JAS_STREAM_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-
-#include <stdio.h>
-#if defined(HAVE_FCNTL_H)
-#include <fcntl.h>
-#endif
-#include <string.h>
-#if defined(HAVE_UNISTD_H)
-#include <unistd.h>
-#endif
-#include <jasper/jas_types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* On most UNIX systems, we probably need to define O_BINARY ourselves. */
-#ifndef O_BINARY
-#define O_BINARY	0
-#endif
-
-/*
- * Stream open flags.
- */
-
-/* The stream was opened for reading. */
-#define JAS_STREAM_READ	0x0001
-/* The stream was opened for writing. */
-#define JAS_STREAM_WRITE	0x0002
-/* The stream was opened for appending. */
-#define JAS_STREAM_APPEND	0x0004
-/* The stream was opened in binary mode. */
-#define JAS_STREAM_BINARY	0x0008
-/* The stream should be created/truncated. */
-#define JAS_STREAM_CREATE	0x0010
-
-
-/*
- * Stream buffering flags.
- */
-
-/* The stream is unbuffered. */
-#define JAS_STREAM_UNBUF	0x0000
-/* The stream is line buffered. */
-#define JAS_STREAM_LINEBUF	0x0001
-/* The stream is fully buffered. */
-#define JAS_STREAM_FULLBUF	0x0002
-/* The buffering mode mask. */
-#define	JAS_STREAM_BUFMODEMASK	0x000f
-
-/* The memory associated with the buffer needs to be deallocated when the
-  stream is destroyed. */
-#define JAS_STREAM_FREEBUF	0x0008
-/* The buffer is currently being used for reading. */
-#define JAS_STREAM_RDBUF	0x0010
-/* The buffer is currently being used for writing. */
-#define JAS_STREAM_WRBUF	0x0020
-
-/*
- * Stream error flags.
- */
-
-/* The end-of-file has been encountered (on reading). */
-#define JAS_STREAM_EOF	0x0001
-/* An I/O error has been encountered on the stream. */
-#define JAS_STREAM_ERR	0x0002
-/* The read/write limit has been exceeded. */
-#define	JAS_STREAM_RWLIMIT	0x0004
-/* The error mask. */
-#define JAS_STREAM_ERRMASK \
-    (JAS_STREAM_EOF | JAS_STREAM_ERR | JAS_STREAM_RWLIMIT)
-
-/*
- * Other miscellaneous constants.
- */
-
-/* The default buffer size (for fully-buffered operation). */
-#define JAS_STREAM_BUFSIZE	8192
-/* The default permission mask for file creation. */
-#define JAS_STREAM_PERMS	0666
-
-/* The maximum number of characters that can always be put back on a stream. */
-#define	JAS_STREAM_MAXPUTBACK	16
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/*
- * Generic file object.
- */
-
-typedef void jas_stream_obj_t;
-
-/*
- * Generic file object operations.
- */
-
-typedef struct {
-
-    /* Read characters from a file object. */
-    int (*read_)(jas_stream_obj_t *obj, char *buf, int cnt);
-
-    /* Write characters to a file object. */
-    int (*write_)(jas_stream_obj_t *obj, char *buf, int cnt);
-
-    /* Set the position for a file object. */
-    long (*seek_)(jas_stream_obj_t *obj, long offset, int origin);
-
-    /* Close a file object. */
-    int (*close_)(jas_stream_obj_t *obj);
-
-} jas_stream_ops_t;
-
-/*
- * Stream object.
- */
-
-typedef struct {
-
-    /* The mode in which the stream was opened. */
-    int openmode_;
-
-    /* The buffering mode. */
-    int bufmode_;
-
-    /* The stream status. */
-    int flags_;
-
-    /* The start of the buffer area to use for reading/writing. */
-    uchar *bufbase_;
-
-    /* The start of the buffer area excluding the extra initial space for
-      character putback. */
-    uchar *bufstart_;
-
-    /* The buffer size. */
-    int bufsize_;
-
-    /* The current position in the buffer. */
-    uchar *ptr_;
-
-    /* The number of characters that must be read/written before
-    the buffer needs to be filled/flushed. */
-    int cnt_;
-
-    /* A trivial buffer to be used for unbuffered operation. */
-    uchar tinybuf_[JAS_STREAM_MAXPUTBACK + 1];
-
-    /* The operations for the underlying stream file object. */
-    jas_stream_ops_t *ops_;
-
-    /* The underlying stream file object. */
-    jas_stream_obj_t *obj_;
-
-    /* The number of characters read/written. */
-    long rwcnt_;
-
-    /* The maximum number of characters that may be read/written. */
-    long rwlimit_;
-
-} jas_stream_t;
-
-/*
- * Regular file object.
- */
-
-/*
- * File descriptor file object.
- */
-typedef struct {
-    int fd;
-    int flags;
-    char pathname[L_tmpnam + 1];
-} jas_stream_fileobj_t;
-
-#define	JAS_STREAM_FILEOBJ_DELONCLOSE	0x01
-#define JAS_STREAM_FILEOBJ_NOCLOSE	0x02
-
-/*
- * Memory file object.
- */
-
-typedef struct {
-
-    /* The data associated with this file. */
-    uchar *buf_;
-
-    /* The allocated size of the buffer for holding file data. */
-    int bufsize_;
-
-    /* The length of the file. */
-    int_fast32_t len_;
-
-    /* The seek position. */
-    int_fast32_t pos_;
-
-    /* Is the buffer growable? */
-    int growable_;
-
-    /* Was the buffer allocated internally? */
-    int myalloc_;
-
-} jas_stream_memobj_t;
-
-/******************************************************************************\
-* Macros/functions for opening and closing streams.
-\******************************************************************************/
-
-/* Open a file as a stream. */
-jas_stream_t *jas_stream_fopen(const char *filename, const char *mode);
-
-/* Open a memory buffer as a stream. */
-jas_stream_t *jas_stream_memopen(char *buf, int bufsize);
-
-/* Open a file descriptor as a stream. */
-jas_stream_t *jas_stream_fdopen(int fd, const char *mode);
-
-/* Open a stdio stream as a stream. */
-jas_stream_t *jas_stream_freopen(const char *path, const char *mode, FILE *fp);
-
-/* Open a temporary file as a stream. */
-jas_stream_t *jas_stream_tmpfile(void);
-
-/* Close a stream. */
-int jas_stream_close(jas_stream_t *stream);
-
-/******************************************************************************\
-* Macros/functions for getting/setting the stream state.
-\******************************************************************************/
-
-/* Get the EOF indicator for a stream. */
-#define jas_stream_eof(stream) \
-    (((stream)->flags_ & JAS_STREAM_EOF) != 0)
-
-/* Get the error indicator for a stream. */
-#define jas_stream_error(stream) \
-    (((stream)->flags_ & JAS_STREAM_ERR) != 0)
-
-/* Clear the error indicator for a stream. */
-#define jas_stream_clearerr(stream) \
-    ((stream)->flags_ &= ~(JAS_STREAM_ERR | JAS_STREAM_EOF))
-
-/* Get the read/write limit for a stream. */
-#define	jas_stream_getrwlimit(stream) \
-    (((const jas_stream_t *)(stream))->rwlimit_)
-
-/* Set the read/write limit for a stream. */
-int jas_stream_setrwlimit(jas_stream_t *stream, long rwlimit);
-
-/* Get the read/write count for a stream. */
-#define	jas_stream_getrwcount(stream) \
-    (((const jas_stream_t *)(stream))->rwcnt_)
-
-/* Set the read/write count for a stream. */
-long jas_stream_setrwcount(jas_stream_t *stream, long rwcnt);
-
-/******************************************************************************\
-* Macros/functions for I/O.
-\******************************************************************************/
-
-/* Read a character from a stream. */
-#if defined(DEBUG)
-#define	jas_stream_getc(stream)	jas_stream_getc_func(stream)
-#else
-#define jas_stream_getc(stream)	jas_stream_getc_macro(stream)
-#endif
-
-/* Write a character to a stream. */
-#if defined(DEBUG)
-#define jas_stream_putc(stream, c)	jas_stream_putc_func(stream, c)
-#else
-#define jas_stream_putc(stream, c)	jas_stream_putc_macro(stream, c)
-#endif
-
-/* Read characters from a stream into a buffer. */
-int jas_stream_read(jas_stream_t *stream, void *buf, int cnt);
-
-/* Write characters from a buffer to a stream. */
-int jas_stream_write(jas_stream_t *stream, const void *buf, int cnt);
-
-/* Write formatted output to a stream. */
-int jas_stream_printf(jas_stream_t *stream, const char *fmt, ...);
-
-/* Write a string to a stream. */
-int jas_stream_puts(jas_stream_t *stream, const char *s);
-
-/* Read a line of input from a stream. */
-char *jas_stream_gets(jas_stream_t *stream, char *buf, int bufsize);
-
-/* Look at the next character to be read from a stream without actually
-  removing it from the stream. */
-#define	jas_stream_peekc(stream) \
-    (((stream)->cnt_ <= 0) ? jas_stream_fillbuf(stream, 0) : \
-      ((int)(*(stream)->ptr_)))
-
-/* Put a character back on a stream. */
-int jas_stream_ungetc(jas_stream_t *stream, int c);
-
-/******************************************************************************\
-* Macros/functions for getting/setting the stream position.
-\******************************************************************************/
-
-/* Is it possible to seek on this stream? */
-int jas_stream_isseekable(jas_stream_t *stream);
-
-/* Set the current position within the stream. */
-long jas_stream_seek(jas_stream_t *stream, long offset, int origin);
-
-/* Get the current position within the stream. */
-long jas_stream_tell(jas_stream_t *stream);
-
-/* Seek to the beginning of a stream. */
-int jas_stream_rewind(jas_stream_t *stream);
-
-/******************************************************************************\
-* Macros/functions for flushing.
-\******************************************************************************/
-
-/* Flush any pending output to a stream. */
-int jas_stream_flush(jas_stream_t *stream);
-
-/******************************************************************************\
-* Miscellaneous macros/functions.
-\******************************************************************************/
-
-/* Copy data from one stream to another. */
-int jas_stream_copy(jas_stream_t *dst, jas_stream_t *src, int n);
-
-/* Display stream contents (for debugging purposes). */
-int jas_stream_display(jas_stream_t *stream, FILE *fp, int n);
-
-/* Consume (i.e., discard) characters from stream. */
-int jas_stream_gobble(jas_stream_t *stream, int n);
-
-/* Write a character multiple times to a stream. */
-int jas_stream_pad(jas_stream_t *stream, int n, int c);
-
-/* Get the size of the file associated with the specified stream.
-  The specified stream must be seekable. */
-long jas_stream_length(jas_stream_t *stream);
-
-/******************************************************************************\
-* Internal functions.
-\******************************************************************************/
-
-/* The following functions are for internal use only!  If you call them
-directly, you will die a horrible, miserable, and painful death! */
-
-/* Read a character from a stream. */
-#define jas_stream_getc_macro(stream) \
-    ((!((stream)->flags_ & (JAS_STREAM_ERR | JAS_STREAM_EOF | \
-      JAS_STREAM_RWLIMIT))) ? \
-      (((stream)->rwlimit_ >= 0 && (stream)->rwcnt_ >= (stream)->rwlimit_) ? \
-      (stream->flags_ |= JAS_STREAM_RWLIMIT, EOF) : \
-      jas_stream_getc2(stream)) : EOF)
-#define jas_stream_getc2(stream) \
-    ((--(stream)->cnt_ < 0) ? jas_stream_fillbuf(stream, 1) : \
-      (++(stream)->rwcnt_, (int)(*(stream)->ptr_++)))
-
-/* Write a character to a stream. */
-#define jas_stream_putc_macro(stream, c) \
-    ((!((stream)->flags_ & (JAS_STREAM_ERR | JAS_STREAM_EOF | \
-      JAS_STREAM_RWLIMIT))) ? \
-      (((stream)->rwlimit_ >= 0 && (stream)->rwcnt_ >= (stream)->rwlimit_) ? \
-      (stream->flags_ |= JAS_STREAM_RWLIMIT, EOF) : \
-      jas_stream_putc2(stream, c)) : EOF)
-#define jas_stream_putc2(stream, c) \
-    (((stream)->bufmode_ |= JAS_STREAM_WRBUF, --(stream)->cnt_ < 0) ? \
-      jas_stream_flushbuf((stream), (uchar)(c)) : \
-      (++(stream)->rwcnt_, (int)(*(stream)->ptr_++ = (c))))
-
-/* These prototypes need to be here for the sake of the stream_getc and
-stream_putc macros. */
-int jas_stream_fillbuf(jas_stream_t *stream, int getflag);
-int jas_stream_flushbuf(jas_stream_t *stream, int c);
-int jas_stream_getc_func(jas_stream_t *stream);
-int jas_stream_putc_func(jas_stream_t *stream, int c);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_string.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_string.h
deleted file mode 100644
index c123253..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_string.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * String Library
- *
- * $Id$
- */
-
-#ifndef	JAS_STRING_H
-#define	JAS_STRING_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-#include <string.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Copy a string (a la strdup). */
-char *jas_strdup(const char *);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tmr.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tmr.h
deleted file mode 100644
index 8b0de11..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tmr.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2004 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JAS_TMR_H
-#define JAS_TMR_H
-
-#include<time.h>
-#include <jasper/jas_config.h>
-#if defined(HAVE_SYS_TIME_H)
-#include <sys/time.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(HAVE_GETTIMEOFDAY)
-
-typedef struct {
-    struct timeval start;
-    struct timeval stop;
-} jas_tmr_t;
-
-#elif defined(HAVE_GETRUSAGE)
-
-typedef struct {
-    struct rusage start;
-    struct rusage stop;
-} jas_tmr_t;
-
-#else
-
-typedef int jas_tmr_t;
-
-#endif
-
-void jas_tmr_start(jas_tmr_t *tmr);
-void jas_tmr_stop(jas_tmr_t *tmr);
-double jas_tmr_get(jas_tmr_t *tmr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tvp.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tvp.h
deleted file mode 100644
index 1c0429d..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_tvp.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tag/Value Parser
- *
- * $Id$
- */
-
-#ifndef JAS_TVP_H
-#define JAS_TVP_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <jasper/jas_config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Tag information type. */
-
-typedef struct {
-
-    int id;
-    /* The ID for the tag. */
-
-    char *name;
-    /* The name of the tag. */
-
-} jas_taginfo_t;
-
-/* Tag-value parser type. */
-
-typedef struct {
-
-    char *buf;
-    /* The parsing buffer. */
-
-    char *tag;
-    /* The current tag name. */
-
-    char *val;
-    /* The current value. */
-
-    char *pos;
-    /* The current position in the parsing buffer. */
-
-} jas_tvparser_t;
-
-/******************************************************************************\
-* Tag information functions.
-\******************************************************************************/
-
-/* Lookup a tag by name. */
-jas_taginfo_t *jas_taginfos_lookup(jas_taginfo_t *taginfos, const char *name);
-
-/* This function returns a pointer to the specified taginfo object if it
-  exists (i.e., the pointer is nonnull); otherwise, a pointer to a dummy
-  object is returned.  This is useful in some situations to avoid checking
-  for a null pointer. */
-jas_taginfo_t *jas_taginfo_nonull(jas_taginfo_t *taginfo);
-
-/******************************************************************************\
-* Tag-value parser functions.
-\******************************************************************************/
-
-/* Create a tag-value parser for the specified string. */
-jas_tvparser_t *jas_tvparser_create(const char *s);
-
-/* Destroy a tag-value parser. */
-void jas_tvparser_destroy(jas_tvparser_t *tvparser);
-
-/* Get the next tag-value pair. */
-int jas_tvparser_next(jas_tvparser_t *tvparser);
-
-/* Get the tag name for the current tag-value pair. */
-char *jas_tvparser_gettag(jas_tvparser_t *tvparser);
-
-/* Get the value for the current tag-value pair. */
-char *jas_tvparser_getval(jas_tvparser_t *tvparser);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_types.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_types.h
deleted file mode 100644
index 596e9f0..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_types.h
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Primitive Types
- *
- * $Id$
- */
-
-#ifndef JAS_TYPES_H
-#define JAS_TYPES_H
-
-#include <jasper/jas_config.h>
-
-#if !defined(JAS_CONFIGURE)
-
-#if defined(WIN32) || defined(HAVE_WINDOWS_H)
-/*
-   We are dealing with Microsoft Windows and most likely Microsoft
-   Visual C (MSVC).  (Heaven help us.)  Sadly, MSVC does not correctly
-   define some of the standard types specified in ISO/IEC 9899:1999.
-   In particular, it does not define the "long long" and "unsigned long
-   long" types.  So, we work around this problem by using the "INT64"
-   and "UINT64" types that are defined in the header file "windows.h".
- */
-#include <windows.h>
-#undef longlong
-#define	longlong	INT64
-#undef ulonglong
-#define	ulonglong	UINT64
-#endif
-
-#endif
-
-#if defined(HAVE_STDLIB_H)
-#undef false
-#undef true
-#include <stdlib.h>
-#endif
-#if defined(HAVE_STDDEF_H)
-#include <stddef.h>
-#endif
-#if defined(HAVE_SYS_TYPES_H)
-#include <sys/types.h>
-#endif
-
-#ifndef __cplusplus
-#if defined(HAVE_STDBOOL_H)
-/*
- * The C language implementation does correctly provide the standard header
- * file "stdbool.h".
- */
-#include <stdbool.h>
-#else
-
-/*
- * The C language implementation does not provide the standard header file
- * "stdbool.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
- * braindamage below.
- */
-#if !defined(bool)
-#define	bool	int
-#endif
-#if !defined(true)
-#define true	1
-#endif
-#if !defined(false)
-#define	false	0
-#endif
-#endif
-
-#endif
-
-#if defined(HAVE_STDINT_H)
-/*
- * The C language implementation does correctly provide the standard header
- * file "stdint.h".
- */
-#include <stdint.h>
-#else
-/*
- * The C language implementation does not provide the standard header file
- * "stdint.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
- * braindamage below.
- */
-#include <limits.h>
-/**********/
-#if !defined(INT_FAST8_MIN)
-typedef signed char int_fast8_t;
-#define INT_FAST8_MIN	(-127)
-#define INT_FAST8_MAX	128
-#endif
-/**********/
-#if !defined(UINT_FAST8_MAX)
-typedef unsigned char uint_fast8_t;
-#define UINT_FAST8_MAX	255
-#endif
-/**********/
-#if !defined(INT_FAST16_MIN)
-typedef short int_fast16_t;
-#define INT_FAST16_MIN	SHRT_MIN
-#define INT_FAST16_MAX	SHRT_MAX
-#endif
-/**********/
-#if !defined(UINT_FAST16_MAX)
-typedef unsigned short uint_fast16_t;
-#define UINT_FAST16_MAX	USHRT_MAX
-#endif
-/**********/
-#if !defined(INT_FAST32_MIN)
-typedef int int_fast32_t;
-#define INT_FAST32_MIN	INT_MIN
-#define INT_FAST32_MAX	INT_MAX
-#endif
-/**********/
-#if !defined(UINT_FAST32_MAX)
-typedef unsigned int uint_fast32_t;
-#define UINT_FAST32_MAX	UINT_MAX
-#endif
-/**********/
-#if !defined(INT_FAST64_MIN)
-typedef longlong int_fast64_t;
-#define INT_FAST64_MIN	LLONG_MIN
-#define INT_FAST64_MAX	LLONG_MAX
-#endif
-/**********/
-#if !defined(UINT_FAST64_MAX)
-typedef ulonglong uint_fast64_t;
-#define UINT_FAST64_MAX	ULLONG_MAX
-#endif
-/**********/
-#endif
-
-/* Hopefully, these macro definitions will fix more problems than they cause. */
-#if !defined(uchar)
-#define uchar unsigned char
-#endif
-#if !defined(ushort)
-#define ushort unsigned short
-#endif
-#if !defined(uint)
-#define uint unsigned int
-#endif
-#if !defined(ulong)
-#define ulong unsigned long
-#endif
-#if !defined(longlong)
-#define longlong long long
-#endif
-#if !defined(ulonglong)
-#define ulonglong unsigned long long
-#endif
-
-/* The below macro is intended to be used for type casts.  By using this
-  macro, type casts can be easily located in the source code with
-  tools like "grep". */
-#define	JAS_CAST(t, e) \
-    ((t) (e))
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_version.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jas_version.h
deleted file mode 100644
index 004ecf1..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jas_version.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-#ifndef JAS_VERSION_H
-#define JAS_VERSION_H
-
-#include <jasper/jas_config.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/******************************************************************************\
-* Constants and types.
-\******************************************************************************/
-
-#if !defined(JAS_VERSION)
-/* The version information below should match that specified in
-  the "configure.in" file! */
-#define	JAS_VERSION		"unknown"
-#endif
-
-#define	JAS_COPYRIGHT \
-    "Copyright (c) 2001-2006 Michael David Adams.\n" \
-    "Copyright (c) 1999-2000 Image Power, Inc. and the University of\n" \
-    "  British Columbia.\n" \
-    "All rights reserved.\n"
-
-#define	JAS_NOTES \
-    "For more information about this software, please visit the following\n" \
-    "web sites/pages:\n" \
-    "    http://www.ece.uvic.ca/~mdadams/jasper\n" \
-    "    http://www.jpeg.org/software\n" \
-    "To be added to the (moderated) JasPer software announcements\n" \
-    "mailing list, send an email to:\n" \
-    "    jasper-announce-subscribe@yahoogroups.com\n" \
-    "To be added to the (unmoderated) JasPer software discussion\n" \
-    "mailing list, send an email to:\n" \
-    "    jasper-discussion-subscribe@yahoogroups.com\n" \
-    "Please send any bug reports to:\n" \
-    "    mdadams@ieee.org\n"
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-const char *jas_getversion(void);
-/* Get the version information for the JasPer library. */
-/* Note:  Since libjasper can be built as a shared library, the version
-  returned by this function may not necessarily correspond to JAS_VERSION. */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/include/jasper/jasper.h b/src/3rdparty/jasper/src/libjasper/include/jasper/jasper.h
deleted file mode 100644
index 9edfcb0..0000000
--- a/src/3rdparty/jasper/src/libjasper/include/jasper/jasper.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JAS_JASPER_H
-#define JAS_JASPER_H
-
-#include <jasper/jas_config.h>
-#include <jasper/jas_types.h>
-#include <jasper/jas_version.h>
-
-#include <jasper/jas_init.h>
-#include <jasper/jas_cm.h>
-#include <jasper/jas_icc.h>
-#include <jasper/jas_fix.h>
-#include <jasper/jas_debug.h>
-#include <jasper/jas_getopt.h>
-#include <jasper/jas_image.h>
-#include <jasper/jas_icc.h>
-#include <jasper/jas_math.h>
-#include <jasper/jas_malloc.h>
-#include <jasper/jas_seq.h>
-#include <jasper/jas_stream.h>
-#include <jasper/jas_string.h>
-#include <jasper/jas_tmr.h>
-#include <jasper/jas_tvp.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.c b/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.c
deleted file mode 100644
index 3f09eed..0000000
--- a/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.c
+++ /dev/null
@@ -1,921 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "jasper/jas_stream.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_debug.h"
-
-#include "jp2_cod.h"
-
-/******************************************************************************\
-* Function prototypes.
-\******************************************************************************/
-
-#define	ONES(n)	((1 << (n)) - 1)
-
-jp2_boxinfo_t *jp2_boxinfolookup(int type);
-
-static int jp2_getuint8(jas_stream_t *in, uint_fast8_t *val);
-static int jp2_getuint16(jas_stream_t *in, uint_fast16_t *val);
-static int jp2_getuint32(jas_stream_t *in, uint_fast32_t *val);
-static int jp2_getuint64(jas_stream_t *in, uint_fast64_t *val);
-static int jp2_putuint8(jas_stream_t *out, uint_fast8_t val);
-static int jp2_putuint16(jas_stream_t *out, uint_fast16_t val);
-static int jp2_putuint32(jas_stream_t *out, uint_fast32_t val);
-static int jp2_putuint64(jas_stream_t *out, uint_fast64_t val);
-
-static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val);
-
-jp2_box_t *jp2_box_get(jas_stream_t *in);
-void jp2_box_dump(jp2_box_t *box, FILE *out);
-
-static int jp2_jp_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_jp_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_ftyp_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_ftyp_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_ihdr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_ihdr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_bpcc_destroy(jp2_box_t *box);
-static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_bpcc_putdata(jp2_box_t *box, jas_stream_t *out);
-static int jp2_colr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_colr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_colr_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_colr_destroy(jp2_box_t *box);
-static void jp2_cdef_destroy(jp2_box_t *box);
-static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_cdef_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_cdef_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_cmap_destroy(jp2_box_t *box);
-static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_cmap_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_cmap_dumpdata(jp2_box_t *box, FILE *out);
-static void jp2_pclr_destroy(jp2_box_t *box);
-static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in);
-static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out);
-static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out);
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-jp2_boxinfo_t jp2_boxinfos[] = {
-    {JP2_BOX_JP, "JP", 0,
-      {0, 0, jp2_jp_getdata, jp2_jp_putdata, 0}},
-    {JP2_BOX_FTYP, "FTYP", 0,
-      {0, 0, jp2_ftyp_getdata, jp2_ftyp_putdata, 0}},
-    {JP2_BOX_JP2H, "JP2H", JP2_BOX_SUPER,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_IHDR, "IHDR", 0,
-      {0, 0, jp2_ihdr_getdata, jp2_ihdr_putdata, 0}},
-    {JP2_BOX_BPCC, "BPCC", 0,
-      {0, jp2_bpcc_destroy, jp2_bpcc_getdata, jp2_bpcc_putdata, 0}},
-    {JP2_BOX_COLR, "COLR", 0,
-      {0, jp2_colr_destroy, jp2_colr_getdata, jp2_colr_putdata, jp2_colr_dumpdata}},
-    {JP2_BOX_PCLR, "PCLR", 0,
-      {0, jp2_pclr_destroy, jp2_pclr_getdata, jp2_pclr_putdata, jp2_pclr_dumpdata}},
-    {JP2_BOX_CMAP, "CMAP", 0,
-      {0, jp2_cmap_destroy, jp2_cmap_getdata, jp2_cmap_putdata, jp2_cmap_dumpdata}},
-    {JP2_BOX_CDEF, "CDEF", 0,
-      {0, jp2_cdef_destroy, jp2_cdef_getdata, jp2_cdef_putdata, jp2_cdef_dumpdata}},
-    {JP2_BOX_RES, "RES", JP2_BOX_SUPER,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_RESC, "RESC", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_RESD, "RESD", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_JP2C, "JP2C", JP2_BOX_NODATA,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_JP2I, "JP2I", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_XML, "XML", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_UUID, "UUID", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_UINF, "UINF", JP2_BOX_SUPER,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_ULST, "ULST", 0,
-      {0, 0, 0, 0, 0}},
-    {JP2_BOX_URL, "URL", 0,
-      {0, 0, 0, 0, 0}},
-    {0, 0, 0, {0, 0, 0, 0, 0}},
-};
-
-jp2_boxinfo_t jp2_boxinfo_unk = {
-    0, "Unknown", 0, {0, 0, 0, 0, 0}
-};
-
-/******************************************************************************\
-* Box constructor.
-\******************************************************************************/
-
-jp2_box_t *jp2_box_create(int type)
-{
-    jp2_box_t *box;
-    jp2_boxinfo_t *boxinfo;
-
-    if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-        return 0;
-    }
-    memset(box, 0, sizeof(jp2_box_t));
-    box->type = type;
-    box->len = 0;
-    if (!(boxinfo = jp2_boxinfolookup(type))) {
-        return 0;
-    }
-    box->info = boxinfo;
-    box->ops = &boxinfo->ops;
-    return box;
-}
-
-/******************************************************************************\
-* Box destructor.
-\******************************************************************************/
-
-void jp2_box_destroy(jp2_box_t *box)
-{
-    if (box->ops->destroy) {
-        (*box->ops->destroy)(box);
-    }
-    jas_free(box);
-}
-
-static void jp2_bpcc_destroy(jp2_box_t *box)
-{
-    jp2_bpcc_t *bpcc = &box->data.bpcc;
-    if (bpcc->bpcs) {
-        jas_free(bpcc->bpcs);
-        bpcc->bpcs = 0;
-    }
-}
-
-static void jp2_cdef_destroy(jp2_box_t *box)
-{
-    jp2_cdef_t *cdef = &box->data.cdef;
-    if (cdef->ents) {
-        jas_free(cdef->ents);
-        cdef->ents = 0;
-    }
-}
-
-/******************************************************************************\
-* Box input.
-\******************************************************************************/
-
-jp2_box_t *jp2_box_get(jas_stream_t *in)
-{
-    jp2_box_t *box;
-    jp2_boxinfo_t *boxinfo;
-    jas_stream_t *tmpstream;
-    uint_fast32_t len;
-    uint_fast64_t extlen;
-    bool dataflag;
-
-    box = 0;
-    tmpstream = 0;
-
-    if (!(box = jas_malloc(sizeof(jp2_box_t)))) {
-        goto error;
-    }
-    box->ops = &jp2_boxinfo_unk.ops;
-    if (jp2_getuint32(in, &len) || jp2_getuint32(in, &box->type)) {
-        goto error;
-    }
-    boxinfo = jp2_boxinfolookup(box->type);
-    box->info = boxinfo;
-    box->ops = &boxinfo->ops;
-    box->len = len;
-    if (box->len == 1) {
-        if (jp2_getuint64(in, &extlen)) {
-            goto error;
-        }
-        if (extlen > 0xffffffffUL) {
-            jas_eprintf("warning: cannot handle large 64-bit box length\n");
-            extlen = 0xffffffffUL;
-        }
-        box->len = extlen;
-        box->datalen = extlen - JP2_BOX_HDRLEN(true);
-    } else {
-        box->datalen = box->len - JP2_BOX_HDRLEN(false);
-    }
-    if (box->len != 0 && box->len < 8) {
-        goto error;
-    }
-
-    dataflag = !(box->info->flags & (JP2_BOX_SUPER | JP2_BOX_NODATA));
-
-    if (dataflag) {
-        if (!(tmpstream = jas_stream_memopen(0, 0))) {
-            goto error;
-        }
-        if (jas_stream_copy(tmpstream, in, box->datalen)) {
-            jas_eprintf("cannot copy box data\n");
-            goto error;
-        }
-        jas_stream_rewind(tmpstream);
-
-        if (box->ops->getdata) {
-            if ((*box->ops->getdata)(box, tmpstream)) {
-                jas_eprintf("cannot parse box data\n");
-                goto error;
-            }
-        }
-        jas_stream_close(tmpstream);
-    }
-
-    if (jas_getdbglevel() >= 1) {
-        jp2_box_dump(box, stderr);
-    }
-
-    return box;
-    abort();
-
-error:
-    if (box) {
-        jp2_box_destroy(box);
-    }
-    if (tmpstream) {
-        jas_stream_close(tmpstream);
-    }
-    return 0;
-}
-
-void jp2_box_dump(jp2_box_t *box, FILE *out)
-{
-    jp2_boxinfo_t *boxinfo;
-    boxinfo = jp2_boxinfolookup(box->type);
-    assert(boxinfo);
-
-    fprintf(out, "JP2 box: ");
-    fprintf(out, "type=%c%s%c (0x%08x); length=%d\n", '"', boxinfo->name,
-      '"', box->type, box->len);
-    if (box->ops->dumpdata) {
-        (*box->ops->dumpdata)(box, out);
-    }
-}
-
-static int jp2_jp_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_jp_t *jp = &box->data.jp;
-    if (jp2_getuint32(in, &jp->magic)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_ftyp_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_ftyp_t *ftyp = &box->data.ftyp;
-    unsigned int i;
-    if (jp2_getuint32(in, &ftyp->majver) || jp2_getuint32(in, &ftyp->minver)) {
-        return -1;
-    }
-    ftyp->numcompatcodes = (box->datalen - 8) / 4;
-    if (ftyp->numcompatcodes > JP2_FTYP_MAXCOMPATCODES) {
-        return -1;
-    }
-    for (i = 0; i < ftyp->numcompatcodes; ++i) {
-        if (jp2_getuint32(in, &ftyp->compatcodes[i])) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jp2_ihdr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_ihdr_t *ihdr = &box->data.ihdr;
-    if (jp2_getuint32(in, &ihdr->height) || jp2_getuint32(in, &ihdr->width) ||
-      jp2_getuint16(in, &ihdr->numcmpts) || jp2_getuint8(in, &ihdr->bpc) ||
-      jp2_getuint8(in, &ihdr->comptype) || jp2_getuint8(in, &ihdr->csunk) ||
-      jp2_getuint8(in, &ihdr->ipr)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_bpcc_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_bpcc_t *bpcc = &box->data.bpcc;
-    unsigned int i;
-    bpcc->numcmpts = box->datalen;
-    if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts * sizeof(uint_fast8_t)))) {
-        return -1;
-    }
-    for (i = 0; i < bpcc->numcmpts; ++i) {
-        if (jp2_getuint8(in, &bpcc->bpcs[i])) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static void jp2_colr_dumpdata(jp2_box_t *box, FILE *out)
-{
-    jp2_colr_t *colr = &box->data.colr;
-    fprintf(out, "method=%d; pri=%d; approx=%d\n", (int)colr->method, (int)colr->pri, (int)colr->approx);
-    switch (colr->method) {
-    case JP2_COLR_ENUM:
-        fprintf(out, "csid=%d\n", (int)colr->csid);
-        break;
-    case JP2_COLR_ICC:
-        jas_memdump(out, colr->iccp, colr->iccplen);
-        break;
-    }
-}
-
-static int jp2_colr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_colr_t *colr = &box->data.colr;
-    colr->csid = 0;
-    colr->iccp = 0;
-    colr->iccplen = 0;
-
-    if (jp2_getuint8(in, &colr->method) || jp2_getuint8(in, &colr->pri) ||
-      jp2_getuint8(in, &colr->approx)) {
-        return -1;
-    }
-    switch (colr->method) {
-    case JP2_COLR_ENUM:
-        if (jp2_getuint32(in, &colr->csid)) {
-            return -1;
-        }
-        break;
-    case JP2_COLR_ICC:
-        colr->iccplen = box->datalen - 3;
-        if (!(colr->iccp = jas_malloc(colr->iccplen * sizeof(uint_fast8_t)))) {
-            return -1;
-        }
-        if (jas_stream_read(in, colr->iccp, colr->iccplen) != colr->iccplen) {
-            return -1;
-        }
-        break;
-    }
-    return 0;
-}
-
-static void jp2_cdef_dumpdata(jp2_box_t *box, FILE *out)
-{
-    jp2_cdef_t *cdef = &box->data.cdef;
-    unsigned int i;
-    for (i = 0; i < cdef->numchans; ++i) {
-        fprintf(out, "channo=%d; type=%d; assoc=%d\n",
-          cdef->ents[i].channo, cdef->ents[i].type, cdef->ents[i].assoc);
-    }
-}
-
-static void jp2_colr_destroy(jp2_box_t *box)
-{
-    jp2_colr_t *colr = &box->data.colr;
-    if (colr->iccp) {
-        jas_free(colr->iccp);
-    }
-}
-
-static int jp2_cdef_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_cdef_t *cdef = &box->data.cdef;
-    jp2_cdefchan_t *chan;
-    unsigned int channo;
-    if (jp2_getuint16(in, &cdef->numchans)) {
-        return -1;
-    }
-    if (!(cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t)))) {
-        return -1;
-    }
-    for (channo = 0; channo < cdef->numchans; ++channo) {
-        chan = &cdef->ents[channo];
-        if (jp2_getuint16(in, &chan->channo) || jp2_getuint16(in, &chan->type) ||
-          jp2_getuint16(in, &chan->assoc)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Box output.
-\******************************************************************************/
-
-int jp2_box_put(jp2_box_t *box, jas_stream_t *out)
-{
-    jas_stream_t *tmpstream;
-    bool extlen;
-    bool dataflag;
-
-    tmpstream = 0;
-
-    dataflag = !(box->info->flags & (JP2_BOX_SUPER | JP2_BOX_NODATA));
-
-    if (dataflag) {
-        tmpstream = jas_stream_memopen(0, 0);
-        if (box->ops->putdata) {
-            if ((*box->ops->putdata)(box, tmpstream)) {
-                goto error;
-            }
-        }
-        box->len = jas_stream_tell(tmpstream) + JP2_BOX_HDRLEN(false);
-        jas_stream_rewind(tmpstream);
-    }
-    extlen = (box->len >= (((uint_fast64_t)1) << 32)) != 0;
-    if (jp2_putuint32(out, extlen ? 1 : box->len)) {
-        goto error;
-    }
-    if (jp2_putuint32(out, box->type)) {
-        goto error;
-    }
-    if (extlen) {
-        if (jp2_putuint64(out, box->len)) {
-            goto error;
-        }
-    }
-
-    if (dataflag) {
-        if (jas_stream_copy(out, tmpstream, box->len - JP2_BOX_HDRLEN(false))) {
-            goto error;
-        }
-        jas_stream_close(tmpstream);
-    }
-
-    return 0;
-    abort();
-
-error:
-
-    if (tmpstream) {
-        jas_stream_close(tmpstream);
-    }
-    return -1;
-}
-
-static int jp2_jp_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_jp_t *jp = &box->data.jp;
-    if (jp2_putuint32(out, jp->magic)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_ftyp_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_ftyp_t *ftyp = &box->data.ftyp;
-    unsigned int i;
-    if (jp2_putuint32(out, ftyp->majver) || jp2_putuint32(out, ftyp->minver)) {
-        return -1;
-    }
-    for (i = 0; i < ftyp->numcompatcodes; ++i) {
-        if (jp2_putuint32(out, ftyp->compatcodes[i])) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jp2_ihdr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_ihdr_t *ihdr = &box->data.ihdr;
-    if (jp2_putuint32(out, ihdr->height) || jp2_putuint32(out, ihdr->width) ||
-      jp2_putuint16(out, ihdr->numcmpts) || jp2_putuint8(out, ihdr->bpc) ||
-      jp2_putuint8(out, ihdr->comptype) || jp2_putuint8(out, ihdr->csunk) ||
-      jp2_putuint8(out, ihdr->ipr)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_bpcc_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_bpcc_t *bpcc = &box->data.bpcc;
-    unsigned int i;
-    for (i = 0; i < bpcc->numcmpts; ++i) {
-        if (jp2_putuint8(out, bpcc->bpcs[i])) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jp2_colr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_colr_t *colr = &box->data.colr;
-    if (jp2_putuint8(out, colr->method) || jp2_putuint8(out, colr->pri) ||
-      jp2_putuint8(out, colr->approx)) {
-        return -1;
-    }
-    switch (colr->method) {
-    case JP2_COLR_ENUM:
-        if (jp2_putuint32(out, colr->csid)) {
-            return -1;
-        }
-        break;
-    case JP2_COLR_ICC:
-        if (jas_stream_write(out, colr->iccp,
-          JAS_CAST(int, colr->iccplen)) != JAS_CAST(int, colr->iccplen))
-            return -1;
-        break;
-    }
-    return 0;
-}
-
-static int jp2_cdef_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    jp2_cdef_t *cdef = &box->data.cdef;
-    unsigned int i;
-    jp2_cdefchan_t *ent;
-
-    if (jp2_putuint16(out, cdef->numchans)) {
-        return -1;
-    }
-
-    for (i = 0; i < cdef->numchans; ++i) {
-        ent = &cdef->ents[i];
-        if (jp2_putuint16(out, ent->channo) ||
-          jp2_putuint16(out, ent->type) ||
-          jp2_putuint16(out, ent->assoc)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Input operations for primitive types.
-\******************************************************************************/
-
-static int jp2_getuint8(jas_stream_t *in, uint_fast8_t *val)
-{
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    if (val) {
-        *val = c;
-    }
-    return 0;
-}
-
-static int jp2_getuint16(jas_stream_t *in, uint_fast16_t *val)
-{
-    uint_fast16_t v;
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-static int jp2_getuint32(jas_stream_t *in, uint_fast32_t *val)
-{
-    uint_fast32_t v;
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-static int jp2_getuint64(jas_stream_t *in, uint_fast64_t *val)
-{
-    uint_fast64_t tmpval;
-    int i;
-    int c;
-
-    tmpval = 0;
-    for (i = 0; i < 8; ++i) {
-        tmpval <<= 8;
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        tmpval |= (c & 0xff);
-    }
-    *val = tmpval;
-
-    return 0;
-}
-
-/******************************************************************************\
-* Output operations for primitive types.
-\******************************************************************************/
-
-static int jp2_putuint8(jas_stream_t *out, uint_fast8_t val)
-{
-    if (jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_putuint16(jas_stream_t *out, uint_fast16_t val)
-{
-    if (jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-      jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_putuint32(jas_stream_t *out, uint_fast32_t val)
-{
-    if (jas_stream_putc(out, (val >> 24) & 0xff) == EOF ||
-      jas_stream_putc(out, (val >> 16) & 0xff) == EOF ||
-      jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-      jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jp2_putuint64(jas_stream_t *out, uint_fast64_t val)
-{
-    if (jp2_putuint32(out, (val >> 32) & 0xffffffffUL) ||
-      jp2_putuint32(out, val & 0xffffffffUL)) {
-        return -1;
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Miscellaneous code.
-\******************************************************************************/
-
-jp2_boxinfo_t *jp2_boxinfolookup(int type)
-{
-    jp2_boxinfo_t *boxinfo;
-    for (boxinfo = jp2_boxinfos; boxinfo->name; ++boxinfo) {
-        if (boxinfo->type == type) {
-            return boxinfo;
-        }
-    }
-    return &jp2_boxinfo_unk;
-}
-
-
-
-
-
-static void jp2_cmap_destroy(jp2_box_t *box)
-{
-    jp2_cmap_t *cmap = &box->data.cmap;
-    if (cmap->ents) {
-        jas_free(cmap->ents);
-    }
-}
-
-static int jp2_cmap_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_cmap_t *cmap = &box->data.cmap;
-    jp2_cmapent_t *ent;
-    unsigned int i;
-
-    cmap->numchans = (box->datalen) / 4;
-    if (!(cmap->ents = jas_malloc(cmap->numchans * sizeof(jp2_cmapent_t)))) {
-        return -1;
-    }
-    for (i = 0; i < cmap->numchans; ++i) {
-        ent = &cmap->ents[i];
-        if (jp2_getuint16(in, &ent->cmptno) ||
-          jp2_getuint8(in, &ent->map) ||
-          jp2_getuint8(in, &ent->pcol)) {
-            return -1;
-        }
-    }
-
-    return 0;
-}
-
-static int jp2_cmap_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-    /* Eliminate compiler warning about unused variables. */
-    box = 0;
-    out = 0;
-
-    return -1;
-}
-
-static void jp2_cmap_dumpdata(jp2_box_t *box, FILE *out)
-{
-    jp2_cmap_t *cmap = &box->data.cmap;
-    unsigned int i;
-    jp2_cmapent_t *ent;
-    fprintf(out, "numchans = %d\n", (int) cmap->numchans);
-    for (i = 0; i < cmap->numchans; ++i) {
-        ent = &cmap->ents[i];
-        fprintf(out, "cmptno=%d; map=%d; pcol=%d\n",
-          (int) ent->cmptno, (int) ent->map, (int) ent->pcol);
-    }
-}
-
-static void jp2_pclr_destroy(jp2_box_t *box)
-{
-    jp2_pclr_t *pclr = &box->data.pclr;
-    if (pclr->lutdata) {
-        jas_free(pclr->lutdata);
-    }
-    if (pclr->bpc)
-        jas_free(pclr->bpc);
-}
-
-static int jp2_pclr_getdata(jp2_box_t *box, jas_stream_t *in)
-{
-    jp2_pclr_t *pclr = &box->data.pclr;
-    int lutsize;
-    unsigned int i;
-    unsigned int j;
-    int_fast32_t x;
-
-    pclr->lutdata = 0;
-
-    if (jp2_getuint16(in, &pclr->numlutents) ||
-      jp2_getuint8(in, &pclr->numchans)) {
-        return -1;
-    }
-    lutsize = pclr->numlutents * pclr->numchans;
-    if (!(pclr->lutdata = jas_malloc(lutsize * sizeof(int_fast32_t)))) {
-        return -1;
-    }
-    if (!(pclr->bpc = jas_malloc(pclr->numchans * sizeof(uint_fast8_t)))) {
-        return -1;
-    }
-    for (i = 0; i < pclr->numchans; ++i) {
-        if (jp2_getuint8(in, &pclr->bpc[i])) {
-            return -1;
-        }
-    }
-    for (i = 0; i < pclr->numlutents; ++i) {
-        for (j = 0; j < pclr->numchans; ++j) {
-            if (jp2_getint(in, (pclr->bpc[j] & 0x80) != 0,
-              (pclr->bpc[j] & 0x7f) + 1, &x)) {
-                return -1;
-            }
-            pclr->lutdata[i * pclr->numchans + j] = x;
-        }
-    }
-    return 0;
-}
-
-static int jp2_pclr_putdata(jp2_box_t *box, jas_stream_t *out)
-{
-#if 0
-    jp2_pclr_t *pclr = &box->data.pclr;
-#endif
-/* Eliminate warning about unused variable. */
-box = 0;
-out = 0;
-    return -1;
-}
-
-static void jp2_pclr_dumpdata(jp2_box_t *box, FILE *out)
-{
-    jp2_pclr_t *pclr = &box->data.pclr;
-    unsigned int i;
-    int j;
-    fprintf(out, "numents=%d; numchans=%d\n", (int) pclr->numlutents,
-      (int) pclr->numchans);
-    for (i = 0; i < pclr->numlutents; ++i) {
-        for (j = 0; j < pclr->numchans; ++j) {
-            fprintf(out, "LUT[%d][%d]=%d\n", i, j, pclr->lutdata[i * pclr->numchans + j]);
-        }
-    }
-}
-
-static int jp2_getint(jas_stream_t *in, int s, int n, int_fast32_t *val)
-{
-    int c;
-    int i;
-    uint_fast32_t v;
-    int m;
-
-    m = (n + 7) / 8;
-
-    v = 0;
-    for (i = 0; i < m; ++i) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        v = (v << 8) | c;
-    }
-    v &= ONES(n);
-    if (s) {
-        int sb;
-        sb = v & (1 << (8 * m - 1));
-        *val = ((~v) + 1) & ONES(8 * m);
-        if (sb) {
-            *val = -*val;
-        }
-    } else {
-        *val = v;
-    }
-
-    return 0;
-}
-
-jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo)
-{
-    unsigned int i;
-    jp2_cdefchan_t *cdefent;
-    for (i = 0; i < cdef->numchans; ++i) {
-        cdefent = &cdef->ents[i];
-        if (cdefent->channo == JAS_CAST(unsigned int, channo)) {
-            return cdefent;
-        }
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.h b/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.h
deleted file mode 100644
index 9699d49..0000000
--- a/src/3rdparty/jasper/src/libjasper/jp2/jp2_cod.h
+++ /dev/null
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-#ifndef JP2_COD_H
-#define JP2_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Macros.
-\******************************************************************************/
-
-#define	JP2_SPTOBPC(s, p) \
-    ((((p) - 1) & 0x7f) | (((s) & 1) << 7))
-
-/******************************************************************************\
-* Box class.
-\******************************************************************************/
-
-#define	JP2_BOX_HDRLEN(ext) ((ext) ? 16 : 8)
-
-/* Box types. */
-#define	JP2_BOX_JP		0x6a502020	/* Signature */
-#define JP2_BOX_FTYP	0x66747970	/* File Type */
-#define	JP2_BOX_JP2H	0x6a703268	/* JP2 Header */
-#define	JP2_BOX_IHDR	0x69686472	/* Image Header */
-#define	JP2_BOX_BPCC	0x62706363	/* Bits Per Component */
-#define	JP2_BOX_COLR	0x636f6c72	/* Color Specification */
-#define	JP2_BOX_PCLR	0x70636c72	/* Palette */
-#define	JP2_BOX_CMAP	0x636d6170	/* Component Mapping */
-#define	JP2_BOX_CDEF	0x63646566	/* Channel Definition */
-#define	JP2_BOX_RES		0x72657320	/* Resolution */
-#define	JP2_BOX_RESC	0x72657363	/* Capture Resolution */
-#define	JP2_BOX_RESD	0x72657364	/* Default Display Resolution */
-#define	JP2_BOX_JP2C	0x6a703263	/* Contiguous Code Stream */
-#define	JP2_BOX_JP2I	0x6a703269	/* Intellectual Property */
-#define	JP2_BOX_XML		0x786d6c20	/* XML */
-#define	JP2_BOX_UUID	0x75756964	/* UUID */
-#define	JP2_BOX_UINF	0x75696e66	/* UUID Info */
-#define	JP2_BOX_ULST	0x75637374	/* UUID List */
-#define	JP2_BOX_URL		0x75726c20	/* URL */
-
-#define	JP2_BOX_SUPER	0x01
-#define	JP2_BOX_NODATA	0x02
-
-/* JP box data. */
-
-#define	JP2_JP_MAGIC	0x0d0a870a
-#define	JP2_JP_LEN		12
-
-typedef struct {
-    uint_fast32_t magic;
-} jp2_jp_t;
-
-/* FTYP box data. */
-
-#define	JP2_FTYP_MAXCOMPATCODES	32
-#define	JP2_FTYP_MAJVER		0x6a703220
-#define	JP2_FTYP_MINVER		0
-#define	JP2_FTYP_COMPATCODE		JP2_FTYP_MAJVER
-
-typedef struct {
-    uint_fast32_t majver;
-    uint_fast32_t minver;
-    uint_fast32_t numcompatcodes;
-    uint_fast32_t compatcodes[JP2_FTYP_MAXCOMPATCODES];
-} jp2_ftyp_t;
-
-/* IHDR box data. */
-
-#define	JP2_IHDR_COMPTYPE	7
-#define	JP2_IHDR_BPCNULL	255
-
-typedef struct {
-    uint_fast32_t width;
-    uint_fast32_t height;
-    uint_fast16_t numcmpts;
-    uint_fast8_t bpc;
-    uint_fast8_t comptype;
-    uint_fast8_t csunk;
-    uint_fast8_t ipr;
-} jp2_ihdr_t;
-
-/* BPCC box data. */
-
-typedef struct {
-    uint_fast16_t numcmpts;
-    uint_fast8_t *bpcs;
-} jp2_bpcc_t;
-
-/* COLR box data. */
-
-#define	JP2_COLR_ENUM	1
-#define	JP2_COLR_ICC	2
-#define	JP2_COLR_PRI	0
-
-#define	JP2_COLR_SRGB	16
-#define	JP2_COLR_SGRAY	17
-#define	JP2_COLR_SYCC	18
-
-typedef struct {
-    uint_fast8_t method;
-    uint_fast8_t pri;
-    uint_fast8_t approx;
-    uint_fast32_t csid;
-    uint_fast8_t *iccp;
-    int iccplen;
-    /* XXX - Someday we ought to add ICC profile data here. */
-} jp2_colr_t;
-
-/* PCLR box data. */
-
-typedef struct {
-    uint_fast16_t numlutents;
-    uint_fast8_t numchans;
-    int_fast32_t *lutdata;
-    uint_fast8_t *bpc;
-} jp2_pclr_t;
-
-/* CDEF box per-channel data. */
-
-#define JP2_CDEF_RGB_R	1
-#define JP2_CDEF_RGB_G	2
-#define JP2_CDEF_RGB_B	3
-
-#define JP2_CDEF_YCBCR_Y	1
-#define JP2_CDEF_YCBCR_CB	2
-#define JP2_CDEF_YCBCR_CR	3
-
-#define	JP2_CDEF_GRAY_Y	1
-
-#define	JP2_CDEF_TYPE_COLOR	0
-#define	JP2_CDEF_TYPE_OPACITY	1
-#define	JP2_CDEF_TYPE_UNSPEC	65535
-#define	JP2_CDEF_ASOC_ALL	0
-#define	JP2_CDEF_ASOC_NONE	65535
-
-typedef struct {
-    uint_fast16_t channo;
-    uint_fast16_t type;
-    uint_fast16_t assoc;
-} jp2_cdefchan_t;
-
-/* CDEF box data. */
-
-typedef struct {
-    uint_fast16_t numchans;
-    jp2_cdefchan_t *ents;
-} jp2_cdef_t;
-
-typedef struct {
-    uint_fast16_t cmptno;
-    uint_fast8_t map;
-    uint_fast8_t pcol;
-} jp2_cmapent_t;
-
-typedef struct {
-    uint_fast16_t numchans;
-    jp2_cmapent_t *ents;
-} jp2_cmap_t;
-
-#define	JP2_CMAP_DIRECT		0
-#define	JP2_CMAP_PALETTE	1
-
-/* Generic box. */
-
-struct jp2_boxops_s;
-typedef struct {
-
-    struct jp2_boxops_s *ops;
-    struct jp2_boxinfo_s *info;
-
-    uint_fast32_t type;
-
-    /* The length of the box including the (variable-length) header. */
-    uint_fast32_t len;
-
-    /* The length of the box data. */
-    uint_fast32_t datalen;
-
-    union {
-        jp2_jp_t jp;
-        jp2_ftyp_t ftyp;
-        jp2_ihdr_t ihdr;
-        jp2_bpcc_t bpcc;
-        jp2_colr_t colr;
-        jp2_pclr_t pclr;
-        jp2_cdef_t cdef;
-        jp2_cmap_t cmap;
-    } data;
-
-} jp2_box_t;
-
-typedef struct jp2_boxops_s {
-    void (*init)(jp2_box_t *box);
-    void (*destroy)(jp2_box_t *box);
-    int (*getdata)(jp2_box_t *box, jas_stream_t *in);
-    int (*putdata)(jp2_box_t *box, jas_stream_t *out);
-    void (*dumpdata)(jp2_box_t *box, FILE *out);
-} jp2_boxops_t;
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-typedef struct jp2_boxinfo_s {
-    int type;
-    char *name;
-    int flags;
-    jp2_boxops_t ops;
-} jp2_boxinfo_t;
-
-/******************************************************************************\
-* Box class.
-\******************************************************************************/
-
-jp2_box_t *jp2_box_create(int type);
-void jp2_box_destroy(jp2_box_t *box);
-jp2_box_t *jp2_box_get(jas_stream_t *in);
-int jp2_box_put(jp2_box_t *box, jas_stream_t *out);
-
-#define JP2_DTYPETOBPC(dtype) \
-  ((JAS_IMAGE_CDT_GETSGND(dtype) << 7) | (JAS_IMAGE_CDT_GETPREC(dtype) - 1))
-#define	JP2_BPCTODTYPE(bpc) \
-  (JAS_IMAGE_CDT_SETSGND(bpc >> 7) | JAS_IMAGE_CDT_SETPREC((bpc & 0x7f) + 1))
-
-#define ICC_CS_RGB	0x52474220
-#define ICC_CS_YCBCR	0x59436272
-#define ICC_CS_GRAY	0x47524159
-
-jp2_cdefchan_t *jp2_cdef_lookup(jp2_cdef_t *cdef, int channo);
-
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.c b/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.c
deleted file mode 100644
index b11b881..0000000
--- a/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.c
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_version.h"
-
-#include "jp2_cod.h"
-#include "jp2_dec.h"
-
-#define	JP2_VALIDATELEN	(JAS_MIN(JP2_JP_LEN + 16, JAS_STREAM_MAXPUTBACK))
-
-static jp2_dec_t *jp2_dec_create(void);
-static void jp2_dec_destroy(jp2_dec_t *dec);
-static int jp2_getcs(jp2_colr_t *colr);
-static int fromiccpcs(int cs);
-static int jp2_getct(int colorspace, int type, int assoc);
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-jas_image_t *jp2_decode(jas_stream_t *in, char *optstr)
-{
-    jp2_box_t *box;
-    int found;
-    jas_image_t *image;
-    jp2_dec_t *dec;
-    bool samedtype;
-    int dtype;
-    unsigned int i;
-    jp2_cmap_t *cmapd;
-    jp2_pclr_t *pclrd;
-    jp2_cdef_t *cdefd;
-    unsigned int channo;
-    int newcmptno;
-    int_fast32_t *lutents;
-#if 0
-    jp2_cdefchan_t *cdefent;
-    int cmptno;
-#endif
-    jp2_cmapent_t *cmapent;
-    jas_icchdr_t icchdr;
-    jas_iccprof_t *iccprof;
-
-    dec = 0;
-    box = 0;
-    image = 0;
-
-    if (!(dec = jp2_dec_create())) {
-        goto error;
-    }
-
-    /* Get the first box.  This should be a JP box. */
-    if (!(box = jp2_box_get(in))) {
-        jas_eprintf("error: cannot get box\n");
-        goto error;
-    }
-    if (box->type != JP2_BOX_JP) {
-        jas_eprintf("error: expecting signature box\n");
-        goto error;
-    }
-    if (box->data.jp.magic != JP2_JP_MAGIC) {
-        jas_eprintf("incorrect magic number\n");
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /* Get the second box.  This should be a FTYP box. */
-    if (!(box = jp2_box_get(in))) {
-        goto error;
-    }
-    if (box->type != JP2_BOX_FTYP) {
-        jas_eprintf("expecting file type box\n");
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /* Get more boxes... */
-    found = 0;
-    while ((box = jp2_box_get(in))) {
-        if (jas_getdbglevel() >= 1) {
-            jas_eprintf("box type %s\n", box->info->name);
-        }
-        switch (box->type) {
-        case JP2_BOX_JP2C:
-            found = 1;
-            break;
-        case JP2_BOX_IHDR:
-            if (!dec->ihdr) {
-                dec->ihdr = box;
-                box = 0;
-            }
-            break;
-        case JP2_BOX_BPCC:
-            if (!dec->bpcc) {
-                dec->bpcc = box;
-                box = 0;
-            }
-            break;
-        case JP2_BOX_CDEF:
-            if (!dec->cdef) {
-                dec->cdef = box;
-                box = 0;
-            }
-            break;
-        case JP2_BOX_PCLR:
-            if (!dec->pclr) {
-                dec->pclr = box;
-                box = 0;
-            }
-            break;
-        case JP2_BOX_CMAP:
-            if (!dec->cmap) {
-                dec->cmap = box;
-                box = 0;
-            }
-            break;
-        case JP2_BOX_COLR:
-            if (!dec->colr) {
-                dec->colr = box;
-                box = 0;
-            }
-            break;
-        }
-        if (box) {
-            jp2_box_destroy(box);
-            box = 0;
-        }
-        if (found) {
-            break;
-        }
-    }
-
-    if (!found) {
-        jas_eprintf("error: no code stream found\n");
-        goto error;
-    }
-
-    if (!(dec->image = jpc_decode(in, optstr))) {
-        jas_eprintf("error: cannot decode code stream\n");
-        goto error;
-    }
-
-    /* An IHDR box must be present. */
-    if (!dec->ihdr) {
-        jas_eprintf("error: missing IHDR box\n");
-        goto error;
-    }
-
-    /* Does the number of components indicated in the IHDR box match
-      the value specified in the code stream? */
-    if (dec->ihdr->data.ihdr.numcmpts != JAS_CAST(uint, jas_image_numcmpts(dec->image))) {
-        jas_eprintf("warning: number of components mismatch\n");
-    }
-
-    /* At least one component must be present. */
-    if (!jas_image_numcmpts(dec->image)) {
-        jas_eprintf("error: no components\n");
-        goto error;
-    }
-
-    /* Determine if all components have the same data type. */
-    samedtype = true;
-    dtype = jas_image_cmptdtype(dec->image, 0);
-    for (i = 1; i < JAS_CAST(uint, jas_image_numcmpts(dec->image)); ++i) {
-        if (jas_image_cmptdtype(dec->image, i) != dtype) {
-            samedtype = false;
-            break;
-        }
-    }
-
-    /* Is the component data type indicated in the IHDR box consistent
-      with the data in the code stream? */
-    if ((samedtype && dec->ihdr->data.ihdr.bpc != JP2_DTYPETOBPC(dtype)) ||
-      (!samedtype && dec->ihdr->data.ihdr.bpc != JP2_IHDR_BPCNULL)) {
-        jas_eprintf("warning: component data type mismatch\n");
-    }
-
-    /* Is the compression type supported? */
-    if (dec->ihdr->data.ihdr.comptype != JP2_IHDR_COMPTYPE) {
-        jas_eprintf("error: unsupported compression type\n");
-        goto error;
-    }
-
-    if (dec->bpcc) {
-        /* Is the number of components indicated in the BPCC box
-          consistent with the code stream data? */
-        if (dec->bpcc->data.bpcc.numcmpts != JAS_CAST(uint, jas_image_numcmpts(
-          dec->image))) {
-            jas_eprintf("warning: number of components mismatch\n");
-        }
-        /* Is the component data type information indicated in the BPCC
-          box consistent with the code stream data? */
-        if (!samedtype) {
-            for (i = 0; i < JAS_CAST(uint, jas_image_numcmpts(dec->image)); ++i) {
-                if (jas_image_cmptdtype(dec->image, i) != JP2_BPCTODTYPE(dec->bpcc->data.bpcc.bpcs[i])) {
-                    jas_eprintf("warning: component data type mismatch\n");
-                }
-            }
-        } else {
-            jas_eprintf("warning: superfluous BPCC box\n");
-        }
-    }
-
-    /* A COLR box must be present. */
-    if (!dec->colr) {
-        jas_eprintf("error: no COLR box\n");
-        goto error;
-    }
-
-    switch (dec->colr->data.colr.method) {
-    case JP2_COLR_ENUM:
-        jas_image_setclrspc(dec->image, jp2_getcs(&dec->colr->data.colr));
-        break;
-    case JP2_COLR_ICC:
-        iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp,
-          dec->colr->data.colr.iccplen);
-        assert(iccprof);
-        jas_iccprof_gethdr(iccprof, &icchdr);
-        jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc);
-        jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc));
-        dec->image->cmprof_ = jas_cmprof_createfromiccprof(iccprof);
-        assert(dec->image->cmprof_);
-        jas_iccprof_destroy(iccprof);
-        break;
-    }
-
-    /* If a CMAP box is present, a PCLR box must also be present. */
-    if (dec->cmap && !dec->pclr) {
-        jas_eprintf("warning: missing PCLR box or superfluous CMAP box\n");
-        jp2_box_destroy(dec->cmap);
-        dec->cmap = 0;
-    }
-
-    /* If a CMAP box is not present, a PCLR box must not be present. */
-    if (!dec->cmap && dec->pclr) {
-        jas_eprintf("warning: missing CMAP box or superfluous PCLR box\n");
-        jp2_box_destroy(dec->pclr);
-        dec->pclr = 0;
-    }
-
-    /* Determine the number of channels (which is essentially the number
-      of components after any palette mappings have been applied). */
-    dec->numchans = dec->cmap ? dec->cmap->data.cmap.numchans : JAS_CAST(uint, jas_image_numcmpts(dec->image));
-
-    /* Perform a basic sanity check on the CMAP box if present. */
-    if (dec->cmap) {
-        for (i = 0; i < dec->numchans; ++i) {
-            /* Is the component number reasonable? */
-            if (dec->cmap->data.cmap.ents[i].cmptno >= JAS_CAST(uint, jas_image_numcmpts(dec->image))) {
-                jas_eprintf("error: invalid component number in CMAP box\n");
-                goto error;
-            }
-            /* Is the LUT index reasonable? */
-            if (dec->cmap->data.cmap.ents[i].pcol >= dec->pclr->data.pclr.numchans) {
-                jas_eprintf("error: invalid CMAP LUT index\n");
-                goto error;
-            }
-        }
-    }
-
-    /* Allocate space for the channel-number to component-number LUT. */
-    if (!(dec->chantocmptlut = jas_malloc(dec->numchans * sizeof(uint_fast16_t)))) {
-        jas_eprintf("error: no memory\n");
-        goto error;
-    }
-
-    if (!dec->cmap) {
-        for (i = 0; i < dec->numchans; ++i) {
-            dec->chantocmptlut[i] = i;
-        }
-    } else {
-        cmapd = &dec->cmap->data.cmap;
-        pclrd = &dec->pclr->data.pclr;
-        cdefd = &dec->cdef->data.cdef;
-        for (channo = 0; channo < cmapd->numchans; ++channo) {
-            cmapent = &cmapd->ents[channo];
-            if (cmapent->map == JP2_CMAP_DIRECT) {
-                dec->chantocmptlut[channo] = channo;
-            } else if (cmapent->map == JP2_CMAP_PALETTE) {
-                lutents = jas_malloc(pclrd->numlutents * sizeof(int_fast32_t));
-                for (i = 0; i < pclrd->numlutents; ++i) {
-                    lutents[i] = pclrd->lutdata[cmapent->pcol + i * pclrd->numchans];
-                }
-                newcmptno = jas_image_numcmpts(dec->image);
-                jas_image_depalettize(dec->image, cmapent->cmptno, pclrd->numlutents, lutents, JP2_BPCTODTYPE(pclrd->bpc[cmapent->pcol]), newcmptno);
-                dec->chantocmptlut[channo] = newcmptno;
-                jas_free(lutents);
-#if 0
-                if (dec->cdef) {
-                    cdefent = jp2_cdef_lookup(cdefd, channo);
-                    if (!cdefent) {
-                        abort();
-                    }
-                jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), cdefent->type, cdefent->assoc));
-                } else {
-                jas_image_setcmpttype(dec->image, newcmptno, jp2_getct(jas_image_clrspc(dec->image), 0, channo + 1));
-                }
-#endif
-            }
-        }
-    }
-
-    /* Mark all components as being of unknown type. */
-
-    for (i = 0; i < JAS_CAST(uint, jas_image_numcmpts(dec->image)); ++i) {
-        jas_image_setcmpttype(dec->image, i, JAS_IMAGE_CT_UNKNOWN);
-    }
-
-    /* Determine the type of each component. */
-    if (dec->cdef) {
-        for (i = 0; i < dec->numchans; ++i) {
-            jas_image_setcmpttype(dec->image,
-              dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo],
-              jp2_getct(jas_image_clrspc(dec->image),
-              dec->cdef->data.cdef.ents[i].type, dec->cdef->data.cdef.ents[i].assoc));
-        }
-    } else {
-        for (i = 0; i < dec->numchans; ++i) {
-            jas_image_setcmpttype(dec->image, dec->chantocmptlut[i],
-              jp2_getct(jas_image_clrspc(dec->image), 0, i + 1));
-        }
-    }
-
-    /* Delete any components that are not of interest. */
-    for (i = jas_image_numcmpts(dec->image); i > 0; --i) {
-        if (jas_image_cmpttype(dec->image, i - 1) == JAS_IMAGE_CT_UNKNOWN) {
-            jas_image_delcmpt(dec->image, i - 1);
-        }
-    }
-
-    /* Ensure that some components survived. */
-    if (!jas_image_numcmpts(dec->image)) {
-        jas_eprintf("error: no components\n");
-        goto error;
-    }
-#if 0
-jas_eprintf("no of components is %d\n", jas_image_numcmpts(dec->image));
-#endif
-
-    /* Prevent the image from being destroyed later. */
-    image = dec->image;
-    dec->image = 0;
-
-    jp2_dec_destroy(dec);
-
-    return image;
-
-error:
-    if (box) {
-        jp2_box_destroy(box);
-    }
-    if (dec) {
-        jp2_dec_destroy(dec);
-    }
-    return 0;
-}
-
-int jp2_validate(jas_stream_t *in)
-{
-    char buf[JP2_VALIDATELEN];
-    int i;
-    int n;
-#if 0
-    jas_stream_t *tmpstream;
-    jp2_box_t *box;
-#endif
-
-    assert(JAS_STREAM_MAXPUTBACK >= JP2_VALIDATELEN);
-
-    /* Read the validation data (i.e., the data used for detecting
-      the format). */
-    if ((n = jas_stream_read(in, buf, JP2_VALIDATELEN)) < 0) {
-        return -1;
-    }
-
-    /* Put the validation data back onto the stream, so that the
-      stream position will not be changed. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-
-    /* Did we read enough data? */
-    if (n < JP2_VALIDATELEN) {
-        return -1;
-    }
-
-    /* Is the box type correct? */
-    if (((buf[4] << 24) | (buf[5] << 16) | (buf[6] << 8) | buf[7]) !=
-      JP2_BOX_JP)
-    {
-        return -1;
-    }
-
-    return 0;
-}
-
-static jp2_dec_t *jp2_dec_create(void)
-{
-    jp2_dec_t *dec;
-
-    if (!(dec = jas_malloc(sizeof(jp2_dec_t)))) {
-        return 0;
-    }
-    dec->ihdr = 0;
-    dec->bpcc = 0;
-    dec->cdef = 0;
-    dec->pclr = 0;
-    dec->image = 0;
-    dec->chantocmptlut = 0;
-    dec->cmap = 0;
-    dec->colr = 0;
-    return dec;
-}
-
-static void jp2_dec_destroy(jp2_dec_t *dec)
-{
-    if (dec->ihdr) {
-        jp2_box_destroy(dec->ihdr);
-    }
-    if (dec->bpcc) {
-        jp2_box_destroy(dec->bpcc);
-    }
-    if (dec->cdef) {
-        jp2_box_destroy(dec->cdef);
-    }
-    if (dec->pclr) {
-        jp2_box_destroy(dec->pclr);
-    }
-    if (dec->image) {
-        jas_image_destroy(dec->image);
-    }
-    if (dec->cmap) {
-        jp2_box_destroy(dec->cmap);
-    }
-    if (dec->colr) {
-        jp2_box_destroy(dec->colr);
-    }
-    if (dec->chantocmptlut) {
-        jas_free(dec->chantocmptlut);
-    }
-    jas_free(dec);
-}
-
-static int jp2_getct(int colorspace, int type, int assoc)
-{
-    if (type == 1 && assoc == 0) {
-        return JAS_IMAGE_CT_OPACITY;
-    }
-    if (type == 0 && assoc >= 1 && assoc <= 65534) {
-        switch (colorspace) {
-        case JAS_CLRSPC_FAM_RGB:
-            switch (assoc) {
-            case JP2_CDEF_RGB_R:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R);
-                break;
-            case JP2_CDEF_RGB_G:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G);
-                break;
-            case JP2_CDEF_RGB_B:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B);
-                break;
-            }
-            break;
-        case JAS_CLRSPC_FAM_YCBCR:
-            switch (assoc) {
-            case JP2_CDEF_YCBCR_Y:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_Y);
-                break;
-            case JP2_CDEF_YCBCR_CB:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CB);
-                break;
-            case JP2_CDEF_YCBCR_CR:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CR);
-                break;
-            }
-            break;
-        case JAS_CLRSPC_FAM_GRAY:
-            switch (assoc) {
-            case JP2_CDEF_GRAY_Y:
-                return JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y);
-                break;
-            }
-            break;
-        default:
-            return JAS_IMAGE_CT_COLOR(assoc - 1);
-            break;
-        }
-    }
-    return JAS_IMAGE_CT_UNKNOWN;
-}
-
-static int jp2_getcs(jp2_colr_t *colr)
-{
-    if (colr->method == JP2_COLR_ENUM) {
-        switch (colr->csid) {
-        case JP2_COLR_SRGB:
-            return JAS_CLRSPC_SRGB;
-            break;
-        case JP2_COLR_SYCC:
-            return JAS_CLRSPC_SYCBCR;
-            break;
-        case JP2_COLR_SGRAY:
-            return JAS_CLRSPC_SGRAY;
-            break;
-        }
-    }
-    return JAS_CLRSPC_UNKNOWN;
-}
-
-static int fromiccpcs(int cs)
-{
-    switch (cs) {
-    case ICC_CS_RGB:
-        return JAS_CLRSPC_GENRGB;
-        break;
-    case ICC_CS_YCBCR:
-        return JAS_CLRSPC_GENYCBCR;
-        break;
-    case ICC_CS_GRAY:
-        return JAS_CLRSPC_GENGRAY;
-        break;
-    }
-    return JAS_CLRSPC_UNKNOWN;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.h b/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.h
deleted file mode 100644
index 63fe6e0..0000000
--- a/src/3rdparty/jasper/src/libjasper/jp2/jp2_dec.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JP2_DEC_H
-#define JP2_DEC_H
-
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jp2_cod.h"
-
-typedef struct {
-
-    jp2_box_t *pclr;
-    jp2_box_t *cdef;
-    jp2_box_t *ihdr;
-    jp2_box_t *bpcc;
-    jp2_box_t *cmap;
-    jp2_box_t *colr;
-    jas_image_t *image;
-    uint_fast16_t numchans;
-    uint_fast16_t *chantocmptlut;
-
-} jp2_dec_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jp2/jp2_enc.c b/src/3rdparty/jasper/src/libjasper/jp2/jp2_enc.c
deleted file mode 100644
index d9c25ce..0000000
--- a/src/3rdparty/jasper/src/libjasper/jp2/jp2_enc.c
+++ /dev/null
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JP2 Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_cm.h"
-#include "jasper/jas_icc.h"
-#include "jp2_cod.h"
-
-static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype);
-static int clrspctojp2(jas_clrspc_t clrspc);
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-int jp2_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    jp2_box_t *box;
-    jp2_ftyp_t *ftyp;
-    jp2_ihdr_t *ihdr;
-    jas_stream_t *tmpstream;
-    int allcmptssame;
-    jp2_bpcc_t *bpcc;
-    long len;
-    uint_fast16_t cmptno;
-    jp2_colr_t *colr;
-    char buf[4096];
-    uint_fast32_t overhead;
-    jp2_cdefchan_t *cdefchanent;
-    jp2_cdef_t *cdef;
-    int i;
-    uint_fast32_t typeasoc;
-jas_iccprof_t *iccprof;
-jas_stream_t *iccstream;
-int pos;
-int needcdef;
-int prec;
-int sgnd;
-
-    box = 0;
-    tmpstream = 0;
-
-    allcmptssame = 1;
-    sgnd = jas_image_cmptsgnd(image, 0);
-    prec = jas_image_cmptprec(image, 0);
-    for (i = 1; i < jas_image_numcmpts(image); ++i) {
-        if (jas_image_cmptsgnd(image, i) != sgnd ||
-          jas_image_cmptprec(image, i) != prec) {
-            allcmptssame = 0;
-            break;
-        }
-    }
-
-    /* Output the signature box. */
-
-    if (!(box = jp2_box_create(JP2_BOX_JP))) {
-        goto error;
-    }
-    box->data.jp.magic = JP2_JP_MAGIC;
-    if (jp2_box_put(box, out)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /* Output the file type box. */
-
-    if (!(box = jp2_box_create(JP2_BOX_FTYP))) {
-        goto error;
-    }
-    ftyp = &box->data.ftyp;
-    ftyp->majver = JP2_FTYP_MAJVER;
-    ftyp->minver = JP2_FTYP_MINVER;
-    ftyp->numcompatcodes = 1;
-    ftyp->compatcodes[0] = JP2_FTYP_COMPATCODE;
-    if (jp2_box_put(box, out)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /*
-     * Generate the data portion of the JP2 header box.
-     * We cannot simply output the header for this box
-     * since we do not yet know the correct value for the length
-     * field.
-     */
-
-    if (!(tmpstream = jas_stream_memopen(0, 0))) {
-        goto error;
-    }
-
-    /* Generate image header box. */
-
-    if (!(box = jp2_box_create(JP2_BOX_IHDR))) {
-        goto error;
-    }
-    ihdr = &box->data.ihdr;
-    ihdr->width = jas_image_width(image);
-    ihdr->height = jas_image_height(image);
-    ihdr->numcmpts = jas_image_numcmpts(image);
-    ihdr->bpc = allcmptssame ? JP2_SPTOBPC(jas_image_cmptsgnd(image, 0),
-      jas_image_cmptprec(image, 0)) : JP2_IHDR_BPCNULL;
-    ihdr->comptype = JP2_IHDR_COMPTYPE;
-    ihdr->csunk = 0;
-    ihdr->ipr = 0;
-    if (jp2_box_put(box, tmpstream)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /* Generate bits per component box. */
-
-    if (!allcmptssame) {
-        if (!(box = jp2_box_create(JP2_BOX_BPCC))) {
-            goto error;
-        }
-        bpcc = &box->data.bpcc;
-        bpcc->numcmpts = jas_image_numcmpts(image);
-        if (!(bpcc->bpcs = jas_malloc(bpcc->numcmpts *
-          sizeof(uint_fast8_t)))) {
-            goto error;
-        }
-        for (cmptno = 0; cmptno < bpcc->numcmpts; ++cmptno) {
-            bpcc->bpcs[cmptno] = JP2_SPTOBPC(jas_image_cmptsgnd(image,
-              cmptno), jas_image_cmptprec(image, cmptno));
-        }
-        if (jp2_box_put(box, tmpstream)) {
-            goto error;
-        }
-        jp2_box_destroy(box);
-        box = 0;
-    }
-
-    /* Generate color specification box. */
-
-    if (!(box = jp2_box_create(JP2_BOX_COLR))) {
-        goto error;
-    }
-    colr = &box->data.colr;
-    switch (jas_image_clrspc(image)) {
-    case JAS_CLRSPC_SRGB:
-    case JAS_CLRSPC_SYCBCR:
-    case JAS_CLRSPC_SGRAY:
-        colr->method = JP2_COLR_ENUM;
-        colr->csid = clrspctojp2(jas_image_clrspc(image));
-        colr->pri = JP2_COLR_PRI;
-        colr->approx = 0;
-        break;
-    default:
-        colr->method = JP2_COLR_ICC;
-        colr->pri = JP2_COLR_PRI;
-        colr->approx = 0;
-        iccprof = jas_iccprof_createfromcmprof(jas_image_cmprof(image));
-        assert(iccprof);
-        iccstream = jas_stream_memopen(0, 0);
-        assert(iccstream);
-        if (jas_iccprof_save(iccprof, iccstream))
-            abort();
-        if ((pos = jas_stream_tell(iccstream)) < 0)
-            abort();
-        colr->iccplen = pos;
-        colr->iccp = jas_malloc(pos);
-        assert(colr->iccp);
-        jas_stream_rewind(iccstream);
-        if (jas_stream_read(iccstream, colr->iccp, colr->iccplen) != colr->iccplen)
-            abort();
-        jas_stream_close(iccstream);
-        jas_iccprof_destroy(iccprof);
-        break;
-    }
-    if (jp2_box_put(box, tmpstream)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    needcdef = 1;
-    switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-    case JAS_CLRSPC_FAM_RGB:
-        if (jas_image_cmpttype(image, 0) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R) &&
-          jas_image_cmpttype(image, 1) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G) &&
-          jas_image_cmpttype(image, 2) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))
-            needcdef = 0;
-        break;
-    case JAS_CLRSPC_FAM_YCBCR:
-        if (jas_image_cmpttype(image, 0) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_Y) &&
-          jas_image_cmpttype(image, 1) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CB) &&
-          jas_image_cmpttype(image, 2) ==
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CR))
-            needcdef = 0;
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        if (jas_image_cmpttype(image, 0) ==
-          JAS_IMAGE_CT_COLOR(JAS_IMAGE_CT_GRAY_Y))
-            needcdef = 0;
-        break;
-    default:
-        abort();
-        break;
-    }
-
-    if (needcdef) {
-        if (!(box = jp2_box_create(JP2_BOX_CDEF))) {
-            goto error;
-        }
-        cdef = &box->data.cdef;
-        cdef->numchans = jas_image_numcmpts(image);
-        cdef->ents = jas_malloc(cdef->numchans * sizeof(jp2_cdefchan_t));
-        for (i = 0; i < jas_image_numcmpts(image); ++i) {
-            cdefchanent = &cdef->ents[i];
-            cdefchanent->channo = i;
-            typeasoc = jp2_gettypeasoc(jas_image_clrspc(image), jas_image_cmpttype(image, i));
-            cdefchanent->type = typeasoc >> 16;
-            cdefchanent->assoc = typeasoc & 0x7fff;
-        }
-        if (jp2_box_put(box, tmpstream)) {
-            goto error;
-        }
-        jp2_box_destroy(box);
-        box = 0;
-    }
-
-    /* Determine the total length of the JP2 header box. */
-
-    len = jas_stream_tell(tmpstream);
-    jas_stream_rewind(tmpstream);
-
-    /*
-     * Output the JP2 header box and all of the boxes which it contains.
-     */
-
-    if (!(box = jp2_box_create(JP2_BOX_JP2H))) {
-        goto error;
-    }
-    box->len = len + JP2_BOX_HDRLEN(false);
-    if (jp2_box_put(box, out)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    if (jas_stream_copy(out, tmpstream, len)) {
-        goto error;
-    }
-
-    jas_stream_close(tmpstream);
-    tmpstream = 0;
-
-    /*
-     * Output the contiguous code stream box.
-     */
-
-    if (!(box = jp2_box_create(JP2_BOX_JP2C))) {
-        goto error;
-    }
-    box->len = 0;
-    if (jp2_box_put(box, out)) {
-        goto error;
-    }
-    jp2_box_destroy(box);
-    box = 0;
-
-    /* Output the JPEG-2000 code stream. */
-
-    overhead = jas_stream_getrwcount(out);
-    sprintf(buf, "%s\n_jp2overhead=%lu\n", (optstr ? optstr : ""),
-      (unsigned long) overhead);
-
-    if (jpc_encode(image, out, buf)) {
-        goto error;
-    }
-
-    return 0;
-    abort();
-
-error:
-
-    if (box) {
-        jp2_box_destroy(box);
-    }
-    if (tmpstream) {
-        jas_stream_close(tmpstream);
-    }
-    return -1;
-}
-
-static uint_fast32_t jp2_gettypeasoc(int colorspace, int ctype)
-{
-    int type;
-    int asoc;
-
-    if (ctype & JAS_IMAGE_CT_OPACITY) {
-        type = JP2_CDEF_TYPE_OPACITY;
-        asoc = JP2_CDEF_ASOC_ALL;
-        goto done;
-    }
-
-    type = JP2_CDEF_TYPE_UNSPEC;
-    asoc = JP2_CDEF_ASOC_NONE;
-    switch (jas_clrspc_fam(colorspace)) {
-    case JAS_CLRSPC_FAM_RGB:
-        switch (JAS_IMAGE_CT_COLOR(ctype)) {
-        case JAS_IMAGE_CT_RGB_R:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_RGB_R;
-            break;
-        case JAS_IMAGE_CT_RGB_G:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_RGB_G;
-            break;
-        case JAS_IMAGE_CT_RGB_B:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_RGB_B;
-            break;
-        }
-        break;
-    case JAS_CLRSPC_FAM_YCBCR:
-        switch (JAS_IMAGE_CT_COLOR(ctype)) {
-        case JAS_IMAGE_CT_YCBCR_Y:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_YCBCR_Y;
-            break;
-        case JAS_IMAGE_CT_YCBCR_CB:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_YCBCR_CB;
-            break;
-        case JAS_IMAGE_CT_YCBCR_CR:
-            type = JP2_CDEF_TYPE_COLOR;
-            asoc = JP2_CDEF_YCBCR_CR;
-            break;
-        }
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        type = JP2_CDEF_TYPE_COLOR;
-        asoc = JP2_CDEF_GRAY_Y;
-        break;
-    }
-
-done:
-    return (type << 16) | asoc;
-}
-
-static int clrspctojp2(jas_clrspc_t clrspc)
-{
-    switch (clrspc) {
-    case JAS_CLRSPC_SRGB:
-        return JP2_COLR_SRGB;
-    case JAS_CLRSPC_SYCBCR:
-        return JP2_COLR_SYCC;
-    case JAS_CLRSPC_SGRAY:
-        return JP2_COLR_SGRAY;
-    default:
-        abort();
-        break;
-    }
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.c
deleted file mode 100644
index fb56398..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Copyright (c) 1999-2000, Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Bit Stream Class
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_bs.h"
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static jpc_bitstream_t *jpc_bitstream_alloc(void);
-
-/******************************************************************************\
-* Code for opening and closing bit streams.
-\******************************************************************************/
-
-/* Open a bit stream from a stream. */
-jpc_bitstream_t *jpc_bitstream_sopen(jas_stream_t *stream, char *mode)
-{
-    jpc_bitstream_t *bitstream;
-
-    /* Ensure that the open mode is valid. */
-#if 1
-/* This causes a string literal too long error (with c99 pedantic mode). */
-    assert(!strcmp(mode, "r") || !strcmp(mode, "w") || !strcmp(mode, "r+")
-      || !strcmp(mode, "w+"));
-#endif
-
-    if (!(bitstream = jpc_bitstream_alloc())) {
-        return 0;
-    }
-
-    /* By default, do not close the underlying (character) stream, upon
-      the close of the bit stream. */
-    bitstream->flags_ = JPC_BITSTREAM_NOCLOSE;
-
-    bitstream->stream_ = stream;
-    bitstream->openmode_ = (mode[0] == 'w') ? JPC_BITSTREAM_WRITE :
-      JPC_BITSTREAM_READ;
-
-    /* Mark the data buffer as empty. */
-    bitstream->cnt_ = (bitstream->openmode_ == JPC_BITSTREAM_READ) ? 0 : 8;
-    bitstream->buf_ = 0;
-
-    return bitstream;
-}
-
-/* Close a bit stream. */
-int jpc_bitstream_close(jpc_bitstream_t *bitstream)
-{
-    int ret = 0;
-
-    /* Align to the next byte boundary while considering the effects of
-      bit stuffing. */
-    if (jpc_bitstream_align(bitstream)) {
-        ret = -1;
-    }
-
-    /* If necessary, close the underlying (character) stream. */
-    if (!(bitstream->flags_ & JPC_BITSTREAM_NOCLOSE) && bitstream->stream_) {
-        if (jas_stream_close(bitstream->stream_)) {
-            ret = -1;
-        }
-        bitstream->stream_ = 0;
-    }
-
-    jas_free(bitstream);
-    return ret;
-}
-
-/* Allocate a new bit stream. */
-static jpc_bitstream_t *jpc_bitstream_alloc()
-{
-    jpc_bitstream_t *bitstream;
-
-    /* Allocate memory for the new bit stream object. */
-    if (!(bitstream = jas_malloc(sizeof(jpc_bitstream_t)))) {
-        return 0;
-    }
-    /* Initialize all of the data members. */
-    bitstream->stream_ = 0;
-    bitstream->cnt_ = 0;
-    bitstream->flags_ = 0;
-    bitstream->openmode_ = 0;
-
-    return bitstream;
-}
-
-/******************************************************************************\
-* Code for reading/writing from/to bit streams.
-\******************************************************************************/
-
-/* Get a bit from a bit stream. */
-int jpc_bitstream_getbit_func(jpc_bitstream_t *bitstream)
-{
-    int ret;
-    JAS_DBGLOG(1000, ("jpc_bitstream_getbit_func(%p)\n", bitstream));
-    ret = jpc_bitstream_getbit_macro(bitstream);
-    JAS_DBGLOG(1000, ("jpc_bitstream_getbit_func -> %d\n", ret));
-    return ret;
-}
-
-/* Put a bit to a bit stream. */
-int jpc_bitstream_putbit_func(jpc_bitstream_t *bitstream, int b)
-{
-    int ret;
-    JAS_DBGLOG(1000, ("jpc_bitstream_putbit_func(%p, %d)\n", bitstream, b));
-    ret = jpc_bitstream_putbit_macro(bitstream, b);
-    JAS_DBGLOG(1000, ("jpc_bitstream_putbit_func() -> %d\n", ret));
-    return ret;
-}
-
-/* Get one or more bits from a bit stream. */
-long jpc_bitstream_getbits(jpc_bitstream_t *bitstream, int n)
-{
-    long v;
-    int u;
-
-    /* We can reliably get at most 31 bits since ISO/IEC 9899 only
-      guarantees that a long can represent values up to 2^31-1. */
-    assert(n >= 0 && n < 32);
-
-    /* Get the number of bits requested from the specified bit stream. */
-    v = 0;
-    while (--n >= 0) {
-        if ((u = jpc_bitstream_getbit(bitstream)) < 0) {
-            return -1;
-        }
-        v = (v << 1) | u;
-    }
-    return v;
-}
-
-/* Put one or more bits to a bit stream. */
-int jpc_bitstream_putbits(jpc_bitstream_t *bitstream, int n, long v)
-{
-    int m;
-
-    /* We can reliably put at most 31 bits since ISO/IEC 9899 only
-      guarantees that a long can represent values up to 2^31-1. */
-    assert(n >= 0 && n < 32);
-    /* Ensure that only the bits to be output are nonzero. */
-    assert(!(v & (~JAS_ONES(n))));
-
-    /* Put the desired number of bits to the specified bit stream. */
-    m = n - 1;
-    while (--n >= 0) {
-        if (jpc_bitstream_putbit(bitstream, (v >> m) & 1) == EOF) {
-            return EOF;
-        }
-        v <<= 1;
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Code for buffer filling and flushing.
-\******************************************************************************/
-
-/* Fill the buffer for a bit stream. */
-int jpc_bitstream_fillbuf(jpc_bitstream_t *bitstream)
-{
-    int c;
-    /* Note: The count has already been decremented by the caller. */
-    assert(bitstream->openmode_ & JPC_BITSTREAM_READ);
-    assert(bitstream->cnt_ <= 0);
-
-    if (bitstream->flags_ & JPC_BITSTREAM_ERR) {
-        bitstream->cnt_ = 0;
-        return -1;
-    }
-
-    if (bitstream->flags_ & JPC_BITSTREAM_EOF) {
-        bitstream->buf_ = 0x7f;
-        bitstream->cnt_ = 7;
-        return 1;
-    }
-
-    bitstream->buf_ = (bitstream->buf_ << 8) & 0xffff;
-    if ((c = jas_stream_getc((bitstream)->stream_)) == EOF) {
-        bitstream->flags_ |= JPC_BITSTREAM_EOF;
-        return 1;
-    }
-    bitstream->cnt_ = (bitstream->buf_ == 0xff00) ? 6 : 7;
-    bitstream->buf_ |= c & ((1 << (bitstream->cnt_ + 1)) - 1);
-    return (bitstream->buf_ >> bitstream->cnt_) & 1;
-}
-
-
-/******************************************************************************\
-* Code related to flushing.
-\******************************************************************************/
-
-/* Does the bit stream need to be aligned to a byte boundary (considering
-  the effects of bit stuffing)? */
-int jpc_bitstream_needalign(jpc_bitstream_t *bitstream)
-{
-    if (bitstream->openmode_ & JPC_BITSTREAM_READ) {
-        /* The bit stream is open for reading. */
-        /* If there are any bits buffered for reading, or the
-          previous byte forced a stuffed bit, alignment is
-          required. */
-        if ((bitstream->cnt_ < 8 && bitstream->cnt_ > 0) ||
-          ((bitstream->buf_ >> 8) & 0xff) == 0xff) {
-            return 1;
-        }
-    } else if (bitstream->openmode_ & JPC_BITSTREAM_WRITE) {
-        /* The bit stream is open for writing. */
-        /* If there are any bits buffered for writing, or the
-          previous byte forced a stuffed bit, alignment is
-          required. */
-        if ((bitstream->cnt_ < 8 && bitstream->cnt_ >= 0) ||
-          ((bitstream->buf_ >> 8) & 0xff) == 0xff) {
-            return 1;
-        }
-    } else {
-        /* This should not happen.  Famous last words, eh? :-) */
-        assert(0);
-        return -1;
-    }
-    return 0;
-}
-
-/* How many additional bytes would be output if we align the bit stream? */
-int jpc_bitstream_pending(jpc_bitstream_t *bitstream)
-{
-    if (bitstream->openmode_ & JPC_BITSTREAM_WRITE) {
-        /* The bit stream is being used for writing. */
-#if 1
-        /* XXX - Is this really correct?  Check someday... */
-        if (bitstream->cnt_ < 8) {
-            return 1;
-        }
-#else
-        if (bitstream->cnt_ < 8) {
-            if (((bitstream->buf_ >> 8) & 0xff) == 0xff) {
-                return 2;
-            }
-            return 1;
-        }
-#endif
-        return 0;
-    } else {
-        /* This operation should not be invoked on a bit stream that
-          is being used for reading. */
-        return -1;
-    }
-}
-
-/* Align the bit stream to a byte boundary. */
-int jpc_bitstream_align(jpc_bitstream_t *bitstream)
-{
-    int ret;
-    if (bitstream->openmode_ & JPC_BITSTREAM_READ) {
-        ret = jpc_bitstream_inalign(bitstream, 0, 0);
-    } else if (bitstream->openmode_ & JPC_BITSTREAM_WRITE) {
-        ret = jpc_bitstream_outalign(bitstream, 0);
-    } else {
-        abort();
-    }
-    return ret;
-}
-
-/* Align a bit stream in the input case. */
-int jpc_bitstream_inalign(jpc_bitstream_t *bitstream, int fillmask,
-  int filldata)
-{
-    int n;
-    int v;
-    int u;
-    int numfill;
-    int m;
-
-    numfill = 7;
-    m = 0;
-    v = 0;
-    if (bitstream->cnt_ > 0) {
-        n = bitstream->cnt_;
-    } else if (!bitstream->cnt_) {
-        n = ((bitstream->buf_ & 0xff) == 0xff) ? 7 : 0;
-    } else {
-        n = 0;
-    }
-    if (n > 0) {
-        if ((u = jpc_bitstream_getbits(bitstream, n)) < 0) {
-            return -1;
-        }
-        m += n;
-        v = (v << n) | u;
-    }
-    if ((bitstream->buf_ & 0xff) == 0xff) {
-        if ((u = jpc_bitstream_getbits(bitstream, 7)) < 0) {
-            return -1;
-        }
-        v = (v << 7) | u;
-        m += 7;
-    }
-    if (m > numfill) {
-        v >>= m - numfill;
-    } else {
-        filldata >>= numfill - m;
-        fillmask >>= numfill - m;
-    }
-    if (((~(v ^ filldata)) & fillmask) != fillmask) {
-        /* The actual fill pattern does not match the expected one. */
-        return 1;
-    }
-
-    return 0;
-}
-
-/* Align a bit stream in the output case. */
-int jpc_bitstream_outalign(jpc_bitstream_t *bitstream, int filldata)
-{
-    int n;
-    int v;
-
-    /* Ensure that this bit stream is open for writing. */
-    assert(bitstream->openmode_ & JPC_BITSTREAM_WRITE);
-
-    /* Ensure that the first bit of fill data is zero. */
-    /* Note: The first bit of fill data must be zero.  If this were not
-      the case, the fill data itself could cause further bit stuffing to
-      be required (which would cause numerous complications). */
-    assert(!(filldata & (~0x3f)));
-
-    if (!bitstream->cnt_) {
-        if ((bitstream->buf_ & 0xff) == 0xff) {
-            n = 7;
-            v = filldata;
-        } else {
-            n = 0;
-            v = 0;
-        }
-    } else if (bitstream->cnt_ > 0 && bitstream->cnt_ < 8) {
-        n = bitstream->cnt_;
-        v = filldata >> (7 - n);
-    } else {
-        n = 0;
-        v = 0;
-        return 0;
-    }
-
-    /* Write the appropriate fill data to the bit stream. */
-    if (n > 0) {
-        if (jpc_bitstream_putbits(bitstream, n, v)) {
-            return -1;
-        }
-    }
-    if (bitstream->cnt_ < 8) {
-        assert(bitstream->cnt_ >= 0 && bitstream->cnt_ < 8);
-        assert((bitstream->buf_ & 0xff) != 0xff);
-        /* Force the pending byte of output to be written to the
-          underlying (character) stream. */
-        if (jas_stream_putc(bitstream->stream_, bitstream->buf_ & 0xff) == EOF) {
-            return -1;
-        }
-        bitstream->cnt_ = 8;
-        bitstream->buf_ = (bitstream->buf_ << 8) & 0xffff;
-    }
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.h
deleted file mode 100644
index ef6a556..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_bs.h
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Bit Stream Class
- *
- * $Id$
- */
-
-#ifndef JPC_BS_H
-#define JPC_BS_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/*
- * Bit stream open mode flags.
- */
-
-/* Bit stream open for reading. */
-#define	JPC_BITSTREAM_READ	0x01
-/* Bit stream open for writing. */
-#define	JPC_BITSTREAM_WRITE	0x02
-
-/*
- * Bit stream flags.
- */
-
-/* Do not close underlying character stream. */
-#define	JPC_BITSTREAM_NOCLOSE	0x01
-/* End of file has been reached while reading. */
-#define	JPC_BITSTREAM_EOF	0x02
-/* An I/O error has occured. */
-#define	JPC_BITSTREAM_ERR	0x04
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Bit stream class. */
-
-typedef struct {
-
-    /* Some miscellaneous flags. */
-    int flags_;
-
-    /* The input/output buffer. */
-    uint_fast16_t buf_;
-
-    /* The number of bits remaining in the byte being read/written. */
-    int cnt_;
-
-    /* The underlying stream associated with this bit stream. */
-    jas_stream_t *stream_;
-
-    /* The mode in which this bit stream was opened. */
-    int openmode_;
-
-} jpc_bitstream_t;
-
-/******************************************************************************\
-* Functions/macros for opening and closing bit streams..
-\******************************************************************************/
-
-/* Open a stream as a bit stream. */
-jpc_bitstream_t *jpc_bitstream_sopen(jas_stream_t *stream, char *mode);
-
-/* Close a bit stream. */
-int jpc_bitstream_close(jpc_bitstream_t *bitstream);
-
-/******************************************************************************\
-* Functions/macros for reading from and writing to bit streams..
-\******************************************************************************/
-
-/* Read a bit from a bit stream. */
-#if defined(DEBUG)
-#define	jpc_bitstream_getbit(bitstream) \
-    jpc_bitstream_getbit_func(bitstream)
-#else
-#define jpc_bitstream_getbit(bitstream) \
-    jpc_bitstream_getbit_macro(bitstream)
-#endif
-
-/* Write a bit to a bit stream. */
-#if defined(DEBUG)
-#define	jpc_bitstream_putbit(bitstream, v) \
-    jpc_bitstream_putbit_func(bitstream, v)
-#else
-#define	jpc_bitstream_putbit(bitstream, v) \
-    jpc_bitstream_putbit_macro(bitstream, v)
-#endif
-
-/* Read one or more bits from a bit stream. */
-long jpc_bitstream_getbits(jpc_bitstream_t *bitstream, int n);
-
-/* Write one or more bits to a bit stream. */
-int jpc_bitstream_putbits(jpc_bitstream_t *bitstream, int n, long v);
-
-/******************************************************************************\
-* Functions/macros for flushing and aligning bit streams.
-\******************************************************************************/
-
-/* Align the current position within the bit stream to the next byte
-  boundary. */
-int jpc_bitstream_align(jpc_bitstream_t *bitstream);
-
-/* Align the current position in the bit stream with the next byte boundary,
-  ensuring that certain bits consumed in the process match a particular
-  pattern. */
-int jpc_bitstream_inalign(jpc_bitstream_t *bitstream, int fillmask,
-  int filldata);
-
-/* Align the current position in the bit stream with the next byte boundary,
-  writing bits from the specified pattern (if necessary) in the process. */
-int jpc_bitstream_outalign(jpc_bitstream_t *bitstream, int filldata);
-
-/* Check if a bit stream needs alignment. */
-int jpc_bitstream_needalign(jpc_bitstream_t *bitstream);
-
-/* How many additional bytes would be output if the bit stream was aligned? */
-int jpc_bitstream_pending(jpc_bitstream_t *bitstream);
-
-/******************************************************************************\
-* Functions/macros for querying state information for bit streams.
-\******************************************************************************/
-
-/* Has EOF been encountered on a bit stream? */
-#define jpc_bitstream_eof(bitstream) \
-    ((bitstream)->flags_ & JPC_BITSTREAM_EOF)
-
-/******************************************************************************\
-* Internals.
-\******************************************************************************/
-
-/* DO NOT DIRECTLY INVOKE ANY OF THE MACROS OR FUNCTIONS BELOW.  THEY ARE
-  FOR INTERNAL USE ONLY. */
-
-int jpc_bitstream_getbit_func(jpc_bitstream_t *bitstream);
-
-int jpc_bitstream_putbit_func(jpc_bitstream_t *bitstream, int v);
-
-int jpc_bitstream_fillbuf(jpc_bitstream_t *bitstream);
-
-#define	jpc_bitstream_getbit_macro(bitstream) \
-    (assert((bitstream)->openmode_ & JPC_BITSTREAM_READ), \
-      (--(bitstream)->cnt_ >= 0) ? \
-      ((int)(((bitstream)->buf_ >> (bitstream)->cnt_) & 1)) : \
-      jpc_bitstream_fillbuf(bitstream))
-
-#define jpc_bitstream_putbit_macro(bitstream, bit) \
-    (assert((bitstream)->openmode_ & JPC_BITSTREAM_WRITE), \
-      (--(bitstream)->cnt_ < 0) ? \
-      ((bitstream)->buf_ = ((bitstream)->buf_ << 8) & 0xffff, \
-      (bitstream)->cnt_ = ((bitstream)->buf_ == 0xff00) ? 6 : 7, \
-      (bitstream)->buf_ |= ((bit) & 1) << (bitstream)->cnt_, \
-      (jas_stream_putc((bitstream)->stream_, (bitstream)->buf_ >> 8) == EOF) \
-      ? (EOF) : ((bit) & 1)) : \
-      ((bitstream)->buf_ |= ((bit) & 1) << (bitstream)->cnt_, \
-      (bit) & 1))
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cod.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_cod.h
deleted file mode 100644
index 7cef38c..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cod.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-#ifndef JPC_COD_H
-#define JPC_COD_H
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* The nominal word size used by this implementation. */
-#define	JPC_PREC	32
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.c
deleted file mode 100644
index f0f8e4d..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.c
+++ /dev/null
@@ -1,1644 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JPEG-2000 Code Stream Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdlib.h>
-#include <assert.h>
-#include <ctype.h>
-
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_cs.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Marker segment table entry. */
-typedef struct {
-    int id;
-    char *name;
-    jpc_msops_t ops;
-} jpc_mstabent_t;
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static jpc_mstabent_t *jpc_mstab_lookup(int id);
-
-static int jpc_poc_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_poc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_poc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static void jpc_poc_destroyparms(jpc_ms_t *ms);
-
-static int jpc_unk_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_sot_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_siz_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_cod_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_coc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_qcd_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_qcc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_rgn_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_sop_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_ppm_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_ppt_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_crg_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-static int jpc_com_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-
-static int jpc_sot_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_siz_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_cod_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_coc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_qcd_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_qcc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_rgn_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_unk_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_sop_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_ppm_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_ppt_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_crg_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-static int jpc_com_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-
-static int jpc_sot_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_siz_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_cod_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_coc_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_qcd_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_qcc_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_rgn_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_unk_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_sop_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_ppm_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_ppt_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_crg_dumpparms(jpc_ms_t *ms, FILE *out);
-static int jpc_com_dumpparms(jpc_ms_t *ms, FILE *out);
-
-static void jpc_siz_destroyparms(jpc_ms_t *ms);
-static void jpc_qcd_destroyparms(jpc_ms_t *ms);
-static void jpc_qcc_destroyparms(jpc_ms_t *ms);
-static void jpc_cod_destroyparms(jpc_ms_t *ms);
-static void jpc_coc_destroyparms(jpc_ms_t *ms);
-static void jpc_unk_destroyparms(jpc_ms_t *ms);
-static void jpc_ppm_destroyparms(jpc_ms_t *ms);
-static void jpc_ppt_destroyparms(jpc_ms_t *ms);
-static void jpc_crg_destroyparms(jpc_ms_t *ms);
-static void jpc_com_destroyparms(jpc_ms_t *ms);
-
-static void jpc_qcx_destroycompparms(jpc_qcxcp_t *compparms);
-static int jpc_qcx_getcompparms(jpc_qcxcp_t *compparms, jpc_cstate_t *cstate,
-  jas_stream_t *in, uint_fast16_t len);
-static int jpc_qcx_putcompparms(jpc_qcxcp_t *compparms, jpc_cstate_t *cstate,
-  jas_stream_t *out);
-static void jpc_cox_destroycompparms(jpc_coxcp_t *compparms);
-static int jpc_cox_getcompparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
-  jas_stream_t *in, int prtflag, jpc_coxcp_t *compparms);
-static int jpc_cox_putcompparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
-  jas_stream_t *out, int prtflag, jpc_coxcp_t *compparms);
-
-/******************************************************************************\
-* Global data.
-\******************************************************************************/
-
-static jpc_mstabent_t jpc_mstab[] = {
-    {JPC_MS_SOC, "SOC", {0, 0, 0, 0}},
-    {JPC_MS_SOT, "SOT", {0, jpc_sot_getparms, jpc_sot_putparms,
-      jpc_sot_dumpparms}},
-    {JPC_MS_SOD, "SOD", {0, 0, 0, 0}},
-    {JPC_MS_EOC, "EOC", {0, 0, 0, 0}},
-    {JPC_MS_SIZ, "SIZ", {jpc_siz_destroyparms, jpc_siz_getparms,
-      jpc_siz_putparms, jpc_siz_dumpparms}},
-    {JPC_MS_COD, "COD", {jpc_cod_destroyparms, jpc_cod_getparms,
-      jpc_cod_putparms, jpc_cod_dumpparms}},
-    {JPC_MS_COC, "COC", {jpc_coc_destroyparms, jpc_coc_getparms,
-      jpc_coc_putparms, jpc_coc_dumpparms}},
-    {JPC_MS_RGN, "RGN", {0, jpc_rgn_getparms, jpc_rgn_putparms,
-      jpc_rgn_dumpparms}},
-    {JPC_MS_QCD, "QCD", {jpc_qcd_destroyparms, jpc_qcd_getparms,
-      jpc_qcd_putparms, jpc_qcd_dumpparms}},
-    {JPC_MS_QCC, "QCC", {jpc_qcc_destroyparms, jpc_qcc_getparms,
-      jpc_qcc_putparms, jpc_qcc_dumpparms}},
-    {JPC_MS_POC, "POC", {jpc_poc_destroyparms, jpc_poc_getparms,
-      jpc_poc_putparms, jpc_poc_dumpparms}},
-    {JPC_MS_TLM, "TLM", {0, jpc_unk_getparms, jpc_unk_putparms, 0}},
-    {JPC_MS_PLM, "PLM", {0, jpc_unk_getparms, jpc_unk_putparms, 0}},
-    {JPC_MS_PPM, "PPM", {jpc_ppm_destroyparms, jpc_ppm_getparms,
-      jpc_ppm_putparms, jpc_ppm_dumpparms}},
-    {JPC_MS_PPT, "PPT", {jpc_ppt_destroyparms, jpc_ppt_getparms,
-      jpc_ppt_putparms, jpc_ppt_dumpparms}},
-    {JPC_MS_SOP, "SOP", {0, jpc_sop_getparms, jpc_sop_putparms,
-      jpc_sop_dumpparms}},
-    {JPC_MS_EPH, "EPH", {0, 0, 0, 0}},
-    {JPC_MS_CRG, "CRG", {0, jpc_crg_getparms, jpc_crg_putparms,
-      jpc_crg_dumpparms}},
-    {JPC_MS_COM, "COM", {jpc_com_destroyparms, jpc_com_getparms,
-      jpc_com_putparms, jpc_com_dumpparms}},
-    {-1, "UNKNOWN",  {jpc_unk_destroyparms, jpc_unk_getparms,
-      jpc_unk_putparms, jpc_unk_dumpparms}}
-};
-
-/******************************************************************************\
-* Code stream manipulation functions.
-\******************************************************************************/
-
-/* Create a code stream state object. */
-jpc_cstate_t *jpc_cstate_create()
-{
-    jpc_cstate_t *cstate;
-    if (!(cstate = jas_malloc(sizeof(jpc_cstate_t)))) {
-        return 0;
-    }
-    cstate->numcomps = 0;
-    return cstate;
-}
-
-/* Destroy a code stream state object. */
-void jpc_cstate_destroy(jpc_cstate_t *cstate)
-{
-    jas_free(cstate);
-}
-
-/* Read a marker segment from a stream. */
-jpc_ms_t *jpc_getms(jas_stream_t *in, jpc_cstate_t *cstate)
-{
-    jpc_ms_t *ms;
-    jpc_mstabent_t *mstabent;
-    jas_stream_t *tmpstream;
-
-    if (!(ms = jpc_ms_create(0))) {
-        return 0;
-    }
-
-    /* Get the marker type. */
-    if (jpc_getuint16(in, &ms->id) || ms->id < JPC_MS_MIN ||
-      ms->id > JPC_MS_MAX) {
-        jpc_ms_destroy(ms);
-        return 0;
-    }
-
-    mstabent = jpc_mstab_lookup(ms->id);
-    ms->ops = &mstabent->ops;
-
-    /* Get the marker segment length and parameters if present. */
-    /* Note: It is tacitly assumed that a marker segment cannot have
-      parameters unless it has a length field.  That is, there cannot
-      be a parameters field without a length field and vice versa. */
-    if (JPC_MS_HASPARMS(ms->id)) {
-        /* Get the length of the marker segment. */
-        if (jpc_getuint16(in, &ms->len) || ms->len < 3) {
-            jpc_ms_destroy(ms);
-            return 0;
-        }
-        /* Calculate the length of the marker segment parameters. */
-        ms->len -= 2;
-        /* Create and prepare a temporary memory stream from which to
-          read the marker segment parameters. */
-        /* Note: This approach provides a simple way of ensuring that
-          we never read beyond the end of the marker segment (even if
-          the marker segment length is errantly set too small). */
-        if (!(tmpstream = jas_stream_memopen(0, 0))) {
-            jpc_ms_destroy(ms);
-            return 0;
-        }
-        if (jas_stream_copy(tmpstream, in, ms->len) ||
-          jas_stream_seek(tmpstream, 0, SEEK_SET) < 0) {
-            jas_stream_close(tmpstream);
-            jpc_ms_destroy(ms);
-            return 0;
-        }
-        /* Get the marker segment parameters. */
-        if ((*ms->ops->getparms)(ms, cstate, tmpstream)) {
-            ms->ops = 0;
-            jpc_ms_destroy(ms);
-            jas_stream_close(tmpstream);
-            return 0;
-        }
-
-        if (jas_getdbglevel() > 0) {
-            jpc_ms_dump(ms, stderr);
-        }
-
-        if (JAS_CAST(ulong, jas_stream_tell(tmpstream)) != ms->len) {
-            jas_eprintf("warning: trailing garbage in marker segment (%ld bytes)\n",
-              ms->len - jas_stream_tell(tmpstream));
-        }
-
-        /* Close the temporary stream. */
-        jas_stream_close(tmpstream);
-
-    } else {
-        /* There are no marker segment parameters. */
-        ms->len = 0;
-
-        if (jas_getdbglevel() > 0) {
-            jpc_ms_dump(ms, stderr);
-        }
-    }
-
-    /* Update the code stream state information based on the type of
-      marker segment read. */
-    /* Note: This is a bit of a hack, but I'm not going to define another
-      type of virtual function for this one special case. */
-    if (ms->id == JPC_MS_SIZ) {
-        cstate->numcomps = ms->parms.siz.numcomps;
-    }
-
-    return ms;
-}
-
-/* Write a marker segment to a stream. */
-int jpc_putms(jas_stream_t *out, jpc_cstate_t *cstate, jpc_ms_t *ms)
-{
-    jas_stream_t *tmpstream;
-    int len;
-
-    /* Output the marker segment type. */
-    if (jpc_putuint16(out, ms->id)) {
-        return -1;
-    }
-
-    /* Output the marker segment length and parameters if necessary. */
-    if (ms->ops->putparms) {
-        /* Create a temporary stream in which to buffer the
-          parameter data. */
-        if (!(tmpstream = jas_stream_memopen(0, 0))) {
-            return -1;
-        }
-        if ((*ms->ops->putparms)(ms, cstate, tmpstream)) {
-            jas_stream_close(tmpstream);
-            return -1;
-        }
-        /* Get the number of bytes of parameter data written. */
-        if ((len = jas_stream_tell(tmpstream)) < 0) {
-            jas_stream_close(tmpstream);
-            return -1;
-        }
-        ms->len = len;
-        /* Write the marker segment length and parameter data to
-          the output stream. */
-        if (jas_stream_seek(tmpstream, 0, SEEK_SET) < 0 ||
-          jpc_putuint16(out, ms->len + 2) ||
-          jas_stream_copy(out, tmpstream, ms->len) < 0) {
-            jas_stream_close(tmpstream);
-            return -1;
-        }
-        /* Close the temporary stream. */
-        jas_stream_close(tmpstream);
-    }
-
-    /* This is a bit of a hack, but I'm not going to define another
-      type of virtual function for this one special case. */
-    if (ms->id == JPC_MS_SIZ) {
-        cstate->numcomps = ms->parms.siz.numcomps;
-    }
-
-    if (jas_getdbglevel() > 0) {
-        jpc_ms_dump(ms, stderr);
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Marker segment operations.
-\******************************************************************************/
-
-/* Create a marker segment of the specified type. */
-jpc_ms_t *jpc_ms_create(int type)
-{
-    jpc_ms_t *ms;
-    jpc_mstabent_t *mstabent;
-
-    if (!(ms = jas_malloc(sizeof(jpc_ms_t)))) {
-        return 0;
-    }
-    ms->id = type;
-    ms->len = 0;
-    mstabent = jpc_mstab_lookup(ms->id);
-    ms->ops = &mstabent->ops;
-    memset(&ms->parms, 0, sizeof(jpc_msparms_t));
-    return ms;
-}
-
-/* Destroy a marker segment. */
-void jpc_ms_destroy(jpc_ms_t *ms)
-{
-    if (ms->ops && ms->ops->destroyparms) {
-        (*ms->ops->destroyparms)(ms);
-    }
-    jas_free(ms);
-}
-
-/* Dump a marker segment to a stream for debugging. */
-void jpc_ms_dump(jpc_ms_t *ms, FILE *out)
-{
-    jpc_mstabent_t *mstabent;
-    mstabent = jpc_mstab_lookup(ms->id);
-    fprintf(out, "type = 0x%04x (%s);", ms->id, mstabent->name);
-    if (JPC_MS_HASPARMS(ms->id)) {
-        fprintf(out, " len = %d;", ms->len + 2);
-        if (ms->ops->dumpparms) {
-            (*ms->ops->dumpparms)(ms, out);
-        } else {
-            fprintf(out, "\n");
-        }
-    } else {
-        fprintf(out, "\n");
-    }
-}
-
-/******************************************************************************\
-* SOT marker segment operations.
-\******************************************************************************/
-
-static int jpc_sot_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_sot_t *sot = &ms->parms.sot;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (jpc_getuint16(in, &sot->tileno) ||
-      jpc_getuint32(in, &sot->len) ||
-      jpc_getuint8(in, &sot->partno) ||
-      jpc_getuint8(in, &sot->numparts)) {
-        return -1;
-    }
-    if (jas_stream_eof(in)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_sot_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_sot_t *sot = &ms->parms.sot;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (jpc_putuint16(out, sot->tileno) ||
-      jpc_putuint32(out, sot->len) ||
-      jpc_putuint8(out, sot->partno) ||
-      jpc_putuint8(out, sot->numparts)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_sot_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_sot_t *sot = &ms->parms.sot;
-    fprintf(out, "tileno = %d; len = %d; partno = %d; numparts = %d\n",
-      sot->tileno, sot->len, sot->partno, sot->numparts);
-    return 0;
-}
-
-/******************************************************************************\
-* SIZ marker segment operations.
-\******************************************************************************/
-
-static void jpc_siz_destroyparms(jpc_ms_t *ms)
-{
-    jpc_siz_t *siz = &ms->parms.siz;
-    if (siz->comps) {
-        jas_free(siz->comps);
-    }
-}
-
-static int jpc_siz_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
-  jas_stream_t *in)
-{
-    jpc_siz_t *siz = &ms->parms.siz;
-    unsigned int i;
-    uint_fast8_t tmp;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (jpc_getuint16(in, &siz->caps) ||
-      jpc_getuint32(in, &siz->width) ||
-      jpc_getuint32(in, &siz->height) ||
-      jpc_getuint32(in, &siz->xoff) ||
-      jpc_getuint32(in, &siz->yoff) ||
-      jpc_getuint32(in, &siz->tilewidth) ||
-      jpc_getuint32(in, &siz->tileheight) ||
-      jpc_getuint32(in, &siz->tilexoff) ||
-      jpc_getuint32(in, &siz->tileyoff) ||
-      jpc_getuint16(in, &siz->numcomps)) {
-        return -1;
-    }
-    if (!siz->width || !siz->height || !siz->tilewidth ||
-      !siz->tileheight || !siz->numcomps) {
-        return -1;
-    }
-    if (!(siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t)))) {
-        return -1;
-    }
-    for (i = 0; i < siz->numcomps; ++i) {
-        if (jpc_getuint8(in, &tmp) ||
-          jpc_getuint8(in, &siz->comps[i].hsamp) ||
-          jpc_getuint8(in, &siz->comps[i].vsamp)) {
-            jas_free(siz->comps);
-            return -1;
-        }
-        siz->comps[i].sgnd = (tmp >> 7) & 1;
-        siz->comps[i].prec = (tmp & 0x7f) + 1;
-    }
-    if (jas_stream_eof(in)) {
-        jas_free(siz->comps);
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_siz_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_siz_t *siz = &ms->parms.siz;
-    unsigned int i;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    assert(siz->width && siz->height && siz->tilewidth &&
-      siz->tileheight && siz->numcomps);
-    if (jpc_putuint16(out, siz->caps) ||
-      jpc_putuint32(out, siz->width) ||
-      jpc_putuint32(out, siz->height) ||
-      jpc_putuint32(out, siz->xoff) ||
-      jpc_putuint32(out, siz->yoff) ||
-      jpc_putuint32(out, siz->tilewidth) ||
-      jpc_putuint32(out, siz->tileheight) ||
-      jpc_putuint32(out, siz->tilexoff) ||
-      jpc_putuint32(out, siz->tileyoff) ||
-      jpc_putuint16(out, siz->numcomps)) {
-        return -1;
-    }
-    for (i = 0; i < siz->numcomps; ++i) {
-        if (jpc_putuint8(out, ((siz->comps[i].sgnd & 1) << 7) |
-          ((siz->comps[i].prec - 1) & 0x7f)) ||
-          jpc_putuint8(out, siz->comps[i].hsamp) ||
-          jpc_putuint8(out, siz->comps[i].vsamp)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jpc_siz_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_siz_t *siz = &ms->parms.siz;
-    unsigned int i;
-    fprintf(out, "caps = 0x%02x;\n", siz->caps);
-    fprintf(out, "width = %d; height = %d; xoff = %d; yoff = %d;\n",
-      siz->width, siz->height, siz->xoff, siz->yoff);
-    fprintf(out, "tilewidth = %d; tileheight = %d; tilexoff = %d; "
-      "tileyoff = %d;\n", siz->tilewidth, siz->tileheight, siz->tilexoff,
-      siz->tileyoff);
-    for (i = 0; i < siz->numcomps; ++i) {
-        fprintf(out, "prec[%d] = %d; sgnd[%d] = %d; hsamp[%d] = %d; "
-          "vsamp[%d] = %d\n", i, siz->comps[i].prec, i,
-          siz->comps[i].sgnd, i, siz->comps[i].hsamp, i,
-          siz->comps[i].vsamp);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* COD marker segment operations.
-\******************************************************************************/
-
-static void jpc_cod_destroyparms(jpc_ms_t *ms)
-{
-    jpc_cod_t *cod = &ms->parms.cod;
-    jpc_cox_destroycompparms(&cod->compparms);
-}
-
-static int jpc_cod_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_cod_t *cod = &ms->parms.cod;
-    if (jpc_getuint8(in, &cod->csty)) {
-        return -1;
-    }
-    if (jpc_getuint8(in, &cod->prg) ||
-      jpc_getuint16(in, &cod->numlyrs) ||
-      jpc_getuint8(in, &cod->mctrans)) {
-        return -1;
-    }
-    if (jpc_cox_getcompparms(ms, cstate, in,
-      (cod->csty & JPC_COX_PRT) != 0, &cod->compparms)) {
-        return -1;
-    }
-    if (jas_stream_eof(in)) {
-        jpc_cod_destroyparms(ms);
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_cod_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_cod_t *cod = &ms->parms.cod;
-    assert(cod->numlyrs > 0 && cod->compparms.numdlvls <= 32);
-    assert(cod->compparms.numdlvls == cod->compparms.numrlvls - 1);
-    if (jpc_putuint8(out, cod->compparms.csty) ||
-      jpc_putuint8(out, cod->prg) ||
-      jpc_putuint16(out, cod->numlyrs) ||
-      jpc_putuint8(out, cod->mctrans)) {
-        return -1;
-    }
-    if (jpc_cox_putcompparms(ms, cstate, out,
-      (cod->csty & JPC_COX_PRT) != 0, &cod->compparms)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_cod_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_cod_t *cod = &ms->parms.cod;
-    int i;
-    fprintf(out, "csty = 0x%02x;\n", cod->compparms.csty);
-    fprintf(out, "numdlvls = %d; qmfbid = %d; mctrans = %d\n",
-      cod->compparms.numdlvls, cod->compparms.qmfbid, cod->mctrans);
-    fprintf(out, "prg = %d; numlyrs = %d;\n",
-      cod->prg, cod->numlyrs);
-    fprintf(out, "cblkwidthval = %d; cblkheightval = %d; "
-      "cblksty = 0x%02x;\n", cod->compparms.cblkwidthval, cod->compparms.cblkheightval,
-      cod->compparms.cblksty);
-    if (cod->csty & JPC_COX_PRT) {
-        for (i = 0; i < cod->compparms.numrlvls; ++i) {
-            jas_eprintf("prcwidth[%d] = %d, prcheight[%d] = %d\n",
-              i, cod->compparms.rlvls[i].parwidthval,
-              i, cod->compparms.rlvls[i].parheightval);
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* COC marker segment operations.
-\******************************************************************************/
-
-static void jpc_coc_destroyparms(jpc_ms_t *ms)
-{
-    jpc_coc_t *coc = &ms->parms.coc;
-    jpc_cox_destroycompparms(&coc->compparms);
-}
-
-static int jpc_coc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_coc_t *coc = &ms->parms.coc;
-    uint_fast8_t tmp;
-    if (cstate->numcomps <= 256) {
-        if (jpc_getuint8(in, &tmp)) {
-            return -1;
-        }
-        coc->compno = tmp;
-    } else {
-        if (jpc_getuint16(in, &coc->compno)) {
-            return -1;
-        }
-    }
-    if (jpc_getuint8(in, &coc->compparms.csty)) {
-        return -1;
-    }
-    if (jpc_cox_getcompparms(ms, cstate, in,
-      (coc->compparms.csty & JPC_COX_PRT) != 0, &coc->compparms)) {
-        return -1;
-    }
-    if (jas_stream_eof(in)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_coc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_coc_t *coc = &ms->parms.coc;
-    assert(coc->compparms.numdlvls <= 32);
-    if (cstate->numcomps <= 256) {
-        if (jpc_putuint8(out, coc->compno)) {
-            return -1;
-        }
-    } else {
-        if (jpc_putuint16(out, coc->compno)) {
-            return -1;
-        }
-    }
-    if (jpc_putuint8(out, coc->compparms.csty)) {
-        return -1;
-    }
-    if (jpc_cox_putcompparms(ms, cstate, out,
-      (coc->compparms.csty & JPC_COX_PRT) != 0, &coc->compparms)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_coc_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_coc_t *coc = &ms->parms.coc;
-    fprintf(out, "compno = %d; csty = 0x%02x; numdlvls = %d;\n",
-      coc->compno, coc->compparms.csty, coc->compparms.numdlvls);
-    fprintf(out, "cblkwidthval = %d; cblkheightval = %d; "
-      "cblksty = 0x%02x; qmfbid = %d;\n", coc->compparms.cblkwidthval,
-      coc->compparms.cblkheightval, coc->compparms.cblksty, coc->compparms.qmfbid);
-    return 0;
-}
-/******************************************************************************\
-* COD/COC marker segment operation helper functions.
-\******************************************************************************/
-
-static void jpc_cox_destroycompparms(jpc_coxcp_t *compparms)
-{
-    /* Eliminate compiler warning about unused variables. */
-    compparms = 0;
-}
-
-static int jpc_cox_getcompparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
-  jas_stream_t *in, int prtflag, jpc_coxcp_t *compparms)
-{
-    uint_fast8_t tmp;
-    int i;
-
-    /* Eliminate compiler warning about unused variables. */
-    ms = 0;
-    cstate = 0;
-
-    if (jpc_getuint8(in, &compparms->numdlvls) ||
-      jpc_getuint8(in, &compparms->cblkwidthval) ||
-      jpc_getuint8(in, &compparms->cblkheightval) ||
-      jpc_getuint8(in, &compparms->cblksty) ||
-      jpc_getuint8(in, &compparms->qmfbid)) {
-        return -1;
-    }
-    compparms->numrlvls = compparms->numdlvls + 1;
-    if (prtflag) {
-        for (i = 0; i < compparms->numrlvls; ++i) {
-            if (jpc_getuint8(in, &tmp)) {
-                jpc_cox_destroycompparms(compparms);
-                return -1;
-            }
-            compparms->rlvls[i].parwidthval = tmp & 0xf;
-            compparms->rlvls[i].parheightval = (tmp >> 4) & 0xf;
-        }
-/* Sigh.  This bit should be in the same field in both COC and COD mrk segs. */
-compparms->csty |= JPC_COX_PRT;
-    } else {
-    }
-    if (jas_stream_eof(in)) {
-        jpc_cox_destroycompparms(compparms);
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_cox_putcompparms(jpc_ms_t *ms, jpc_cstate_t *cstate,
-  jas_stream_t *out, int prtflag, jpc_coxcp_t *compparms)
-{
-    int i;
-    assert(compparms->numdlvls <= 32);
-
-    /* Eliminate compiler warning about unused variables. */
-    ms = 0;
-    cstate = 0;
-
-    if (jpc_putuint8(out, compparms->numdlvls) ||
-      jpc_putuint8(out, compparms->cblkwidthval) ||
-      jpc_putuint8(out, compparms->cblkheightval) ||
-      jpc_putuint8(out, compparms->cblksty) ||
-      jpc_putuint8(out, compparms->qmfbid)) {
-        return -1;
-    }
-    if (prtflag) {
-        for (i = 0; i < compparms->numrlvls; ++i) {
-            if (jpc_putuint8(out,
-              ((compparms->rlvls[i].parheightval & 0xf) << 4) |
-              (compparms->rlvls[i].parwidthval & 0xf))) {
-                return -1;
-            }
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* RGN marker segment operations.
-\******************************************************************************/
-
-static int jpc_rgn_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_rgn_t *rgn = &ms->parms.rgn;
-    uint_fast8_t tmp;
-    if (cstate->numcomps <= 256) {
-        if (jpc_getuint8(in, &tmp)) {
-            return -1;
-        }
-        rgn->compno = tmp;
-    } else {
-        if (jpc_getuint16(in, &rgn->compno)) {
-            return -1;
-        }
-    }
-    if (jpc_getuint8(in, &rgn->roisty) ||
-      jpc_getuint8(in, &rgn->roishift)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_rgn_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_rgn_t *rgn = &ms->parms.rgn;
-    if (cstate->numcomps <= 256) {
-        if (jpc_putuint8(out, rgn->compno)) {
-            return -1;
-        }
-    } else {
-        if (jpc_putuint16(out, rgn->compno)) {
-            return -1;
-        }
-    }
-    if (jpc_putuint8(out, rgn->roisty) ||
-      jpc_putuint8(out, rgn->roishift)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_rgn_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_rgn_t *rgn = &ms->parms.rgn;
-    fprintf(out, "compno = %d; roisty = %d; roishift = %d\n",
-      rgn->compno, rgn->roisty, rgn->roishift);
-    return 0;
-}
-
-/******************************************************************************\
-* QCD marker segment operations.
-\******************************************************************************/
-
-static void jpc_qcd_destroyparms(jpc_ms_t *ms)
-{
-    jpc_qcd_t *qcd = &ms->parms.qcd;
-    jpc_qcx_destroycompparms(&qcd->compparms);
-}
-
-static int jpc_qcd_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_qcxcp_t *compparms = &ms->parms.qcd.compparms;
-    return jpc_qcx_getcompparms(compparms, cstate, in, ms->len);
-}
-
-static int jpc_qcd_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_qcxcp_t *compparms = &ms->parms.qcd.compparms;
-    return jpc_qcx_putcompparms(compparms, cstate, out);
-}
-
-static int jpc_qcd_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_qcd_t *qcd = &ms->parms.qcd;
-    int i;
-    fprintf(out, "qntsty = %d; numguard = %d; numstepsizes = %d\n",
-      (int) qcd->compparms.qntsty, qcd->compparms.numguard, qcd->compparms.numstepsizes);
-    for (i = 0; i < qcd->compparms.numstepsizes; ++i) {
-        fprintf(out, "expn[%d] = 0x%04x; mant[%d] = 0x%04x;\n",
-          i, (unsigned) JPC_QCX_GETEXPN(qcd->compparms.stepsizes[i]),
-          i, (unsigned) JPC_QCX_GETMANT(qcd->compparms.stepsizes[i]));
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* QCC marker segment operations.
-\******************************************************************************/
-
-static void jpc_qcc_destroyparms(jpc_ms_t *ms)
-{
-    jpc_qcc_t *qcc = &ms->parms.qcc;
-    jpc_qcx_destroycompparms(&qcc->compparms);
-}
-
-static int jpc_qcc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_qcc_t *qcc = &ms->parms.qcc;
-    uint_fast8_t tmp;
-    int len;
-    len = ms->len;
-    if (cstate->numcomps <= 256) {
-        jpc_getuint8(in, &tmp);
-        qcc->compno = tmp;
-        --len;
-    } else {
-        jpc_getuint16(in, &qcc->compno);
-        len -= 2;
-    }
-    if (jpc_qcx_getcompparms(&qcc->compparms, cstate, in, len)) {
-        return -1;
-    }
-    if (jas_stream_eof(in)) {
-        jpc_qcc_destroyparms(ms);
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_qcc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_qcc_t *qcc = &ms->parms.qcc;
-    if (cstate->numcomps <= 256) {
-        jpc_putuint8(out, qcc->compno);
-    } else {
-        jpc_putuint16(out, qcc->compno);
-    }
-    if (jpc_qcx_putcompparms(&qcc->compparms, cstate, out)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_qcc_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_qcc_t *qcc = &ms->parms.qcc;
-    int i;
-    fprintf(out, "compno = %d; qntsty = %d; numguard = %d; "
-      "numstepsizes = %d\n", qcc->compno, qcc->compparms.qntsty, qcc->compparms.numguard,
-      qcc->compparms.numstepsizes);
-    for (i = 0; i < qcc->compparms.numstepsizes; ++i) {
-        fprintf(out, "expn[%d] = 0x%04x; mant[%d] = 0x%04x;\n",
-          i, (unsigned) JPC_QCX_GETEXPN(qcc->compparms.stepsizes[i]),
-          i, (unsigned) JPC_QCX_GETMANT(qcc->compparms.stepsizes[i]));
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* QCD/QCC marker segment helper functions.
-\******************************************************************************/
-
-static void jpc_qcx_destroycompparms(jpc_qcxcp_t *compparms)
-{
-    if (compparms->stepsizes) {
-        jas_free(compparms->stepsizes);
-    }
-}
-
-static int jpc_qcx_getcompparms(jpc_qcxcp_t *compparms, jpc_cstate_t *cstate,
-  jas_stream_t *in, uint_fast16_t len)
-{
-    uint_fast8_t tmp;
-    int n;
-    int i;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    n = 0;
-    jpc_getuint8(in, &tmp);
-    ++n;
-    compparms->qntsty = tmp & 0x1f;
-    compparms->numguard = (tmp >> 5) & 7;
-    switch (compparms->qntsty) {
-    case JPC_QCX_SIQNT:
-        compparms->numstepsizes = 1;
-        break;
-    case JPC_QCX_NOQNT:
-        compparms->numstepsizes = (len - n);
-        break;
-    case JPC_QCX_SEQNT:
-        /* XXX - this is a hack */
-        compparms->numstepsizes = (len - n) / 2;
-        break;
-    }
-    if (compparms->numstepsizes > 0) {
-        compparms->stepsizes = jas_malloc(compparms->numstepsizes *
-          sizeof(uint_fast16_t));
-        assert(compparms->stepsizes);
-        for (i = 0; i < compparms->numstepsizes; ++i) {
-            if (compparms->qntsty == JPC_QCX_NOQNT) {
-                jpc_getuint8(in, &tmp);
-                compparms->stepsizes[i] = JPC_QCX_EXPN(tmp >> 3);
-            } else {
-                jpc_getuint16(in, &compparms->stepsizes[i]);
-            }
-        }
-    } else {
-        compparms->stepsizes = 0;
-    }
-    if (jas_stream_error(in) || jas_stream_eof(in)) {
-        jpc_qcx_destroycompparms(compparms);
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_qcx_putcompparms(jpc_qcxcp_t *compparms, jpc_cstate_t *cstate,
-  jas_stream_t *out)
-{
-    int i;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    jpc_putuint8(out, ((compparms->numguard & 7) << 5) | compparms->qntsty);
-    for (i = 0; i < compparms->numstepsizes; ++i) {
-        if (compparms->qntsty == JPC_QCX_NOQNT) {
-            jpc_putuint8(out, JPC_QCX_GETEXPN(
-              compparms->stepsizes[i]) << 3);
-        } else {
-            jpc_putuint16(out, compparms->stepsizes[i]);
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* SOP marker segment operations.
-\******************************************************************************/
-
-static int jpc_sop_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_sop_t *sop = &ms->parms.sop;
-
-    /* Eliminate compiler warning about unused variable. */
-    cstate = 0;
-
-    if (jpc_getuint16(in, &sop->seqno)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_sop_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_sop_t *sop = &ms->parms.sop;
-
-    /* Eliminate compiler warning about unused variable. */
-    cstate = 0;
-
-    if (jpc_putuint16(out, sop->seqno)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_sop_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_sop_t *sop = &ms->parms.sop;
-    fprintf(out, "seqno = %d;\n", sop->seqno);
-    return 0;
-}
-
-/******************************************************************************\
-* PPM marker segment operations.
-\******************************************************************************/
-
-static void jpc_ppm_destroyparms(jpc_ms_t *ms)
-{
-    jpc_ppm_t *ppm = &ms->parms.ppm;
-    if (ppm->data) {
-        jas_free(ppm->data);
-    }
-}
-
-static int jpc_ppm_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_ppm_t *ppm = &ms->parms.ppm;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    ppm->data = 0;
-
-    if (ms->len < 1) {
-        goto error;
-    }
-    if (jpc_getuint8(in, &ppm->ind)) {
-        goto error;
-    }
-
-    ppm->len = ms->len - 1;
-    if (ppm->len > 0) {
-        if (!(ppm->data = jas_malloc(ppm->len * sizeof(unsigned char)))) {
-            goto error;
-        }
-        if (JAS_CAST(uint, jas_stream_read(in, ppm->data, ppm->len)) != ppm->len) {
-            goto error;
-        }
-    } else {
-        ppm->data = 0;
-    }
-    return 0;
-
-error:
-    jpc_ppm_destroyparms(ms);
-    return -1;
-}
-
-static int jpc_ppm_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_ppm_t *ppm = &ms->parms.ppm;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (JAS_CAST(uint, jas_stream_write(out, (char *) ppm->data, ppm->len)) != ppm->len) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_ppm_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_ppm_t *ppm = &ms->parms.ppm;
-    fprintf(out, "ind=%d; len = %d;\n", ppm->ind, ppm->len);
-    if (ppm->len > 0) {
-        fprintf(out, "data =\n");
-        jas_memdump(out, ppm->data, ppm->len);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* PPT marker segment operations.
-\******************************************************************************/
-
-static void jpc_ppt_destroyparms(jpc_ms_t *ms)
-{
-    jpc_ppt_t *ppt = &ms->parms.ppt;
-    if (ppt->data) {
-        jas_free(ppt->data);
-    }
-}
-
-static int jpc_ppt_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_ppt_t *ppt = &ms->parms.ppt;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    ppt->data = 0;
-
-    if (ms->len < 1) {
-        goto error;
-    }
-    if (jpc_getuint8(in, &ppt->ind)) {
-        goto error;
-    }
-    ppt->len = ms->len - 1;
-    if (ppt->len > 0) {
-        if (!(ppt->data = jas_malloc(ppt->len * sizeof(unsigned char)))) {
-            goto error;
-        }
-        if (jas_stream_read(in, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-            goto error;
-        }
-    } else {
-        ppt->data = 0;
-    }
-    return 0;
-
-error:
-    jpc_ppt_destroyparms(ms);
-    return -1;
-}
-
-static int jpc_ppt_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_ppt_t *ppt = &ms->parms.ppt;
-
-    /* Eliminate compiler warning about unused variable. */
-    cstate = 0;
-
-    if (jpc_putuint8(out, ppt->ind)) {
-        return -1;
-    }
-    if (jas_stream_write(out, (char *) ppt->data, ppt->len) != JAS_CAST(int, ppt->len)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_ppt_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_ppt_t *ppt = &ms->parms.ppt;
-    fprintf(out, "ind=%d; len = %d;\n", ppt->ind, ppt->len);
-    if (ppt->len > 0) {
-        fprintf(out, "data =\n");
-        jas_memdump(out, ppt->data, ppt->len);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* POC marker segment operations.
-\******************************************************************************/
-
-static void jpc_poc_destroyparms(jpc_ms_t *ms)
-{
-    jpc_poc_t *poc = &ms->parms.poc;
-    if (poc->pchgs) {
-        jas_free(poc->pchgs);
-    }
-}
-
-static int jpc_poc_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_poc_t *poc = &ms->parms.poc;
-    jpc_pocpchg_t *pchg;
-    int pchgno;
-    uint_fast8_t tmp;
-    poc->numpchgs = (cstate->numcomps > 256) ? (ms->len / 9) :
-      (ms->len / 7);
-    if (!(poc->pchgs = jas_malloc(poc->numpchgs * sizeof(jpc_pocpchg_t)))) {
-        goto error;
-    }
-    for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-      ++pchg) {
-        if (jpc_getuint8(in, &pchg->rlvlnostart)) {
-            goto error;
-        }
-        if (cstate->numcomps > 256) {
-            if (jpc_getuint16(in, &pchg->compnostart)) {
-                goto error;
-            }
-        } else {
-            if (jpc_getuint8(in, &tmp)) {
-                goto error;
-            };
-            pchg->compnostart = tmp;
-        }
-        if (jpc_getuint16(in, &pchg->lyrnoend) ||
-          jpc_getuint8(in, &pchg->rlvlnoend)) {
-            goto error;
-        }
-        if (cstate->numcomps > 256) {
-            if (jpc_getuint16(in, &pchg->compnoend)) {
-                goto error;
-            }
-        } else {
-            if (jpc_getuint8(in, &tmp)) {
-                goto error;
-            }
-            pchg->compnoend = tmp;
-        }
-        if (jpc_getuint8(in, &pchg->prgord)) {
-            goto error;
-        }
-        if (pchg->rlvlnostart > pchg->rlvlnoend ||
-          pchg->compnostart > pchg->compnoend) {
-            goto error;
-        }
-    }
-    return 0;
-
-error:
-    jpc_poc_destroyparms(ms);
-    return -1;
-}
-
-static int jpc_poc_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_poc_t *poc = &ms->parms.poc;
-    jpc_pocpchg_t *pchg;
-    int pchgno;
-    for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs; ++pchgno,
-      ++pchg) {
-        if (jpc_putuint8(out, pchg->rlvlnostart) ||
-          ((cstate->numcomps > 256) ?
-          jpc_putuint16(out, pchg->compnostart) :
-          jpc_putuint8(out, pchg->compnostart)) ||
-          jpc_putuint16(out, pchg->lyrnoend) ||
-          jpc_putuint8(out, pchg->rlvlnoend) ||
-          ((cstate->numcomps > 256) ?
-          jpc_putuint16(out, pchg->compnoend) :
-          jpc_putuint8(out, pchg->compnoend)) ||
-          jpc_putuint8(out, pchg->prgord)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jpc_poc_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_poc_t *poc = &ms->parms.poc;
-    jpc_pocpchg_t *pchg;
-    int pchgno;
-    for (pchgno = 0, pchg = poc->pchgs; pchgno < poc->numpchgs;
-      ++pchgno, ++pchg) {
-        fprintf(out, "po[%d] = %d; ", pchgno, pchg->prgord);
-        fprintf(out, "cs[%d] = %d; ce[%d] = %d; ",
-          pchgno, pchg->compnostart, pchgno, pchg->compnoend);
-        fprintf(out, "rs[%d] = %d; re[%d] = %d; ",
-          pchgno, pchg->rlvlnostart, pchgno, pchg->rlvlnoend);
-        fprintf(out, "le[%d] = %d\n", pchgno, pchg->lyrnoend);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* CRG marker segment operations.
-\******************************************************************************/
-
-static void jpc_crg_destroyparms(jpc_ms_t *ms)
-{
-    jpc_crg_t *crg = &ms->parms.crg;
-    if (crg->comps) {
-        jas_free(crg->comps);
-    }
-}
-
-static int jpc_crg_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_crg_t *crg = &ms->parms.crg;
-    jpc_crgcomp_t *comp;
-    uint_fast16_t compno;
-    crg->numcomps = cstate->numcomps;
-    if (!(crg->comps = jas_malloc(cstate->numcomps * sizeof(uint_fast16_t)))) {
-        return -1;
-    }
-    for (compno = 0, comp = crg->comps; compno < cstate->numcomps;
-      ++compno, ++comp) {
-        if (jpc_getuint16(in, &comp->hoff) ||
-          jpc_getuint16(in, &comp->voff)) {
-            jpc_crg_destroyparms(ms);
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jpc_crg_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_crg_t *crg = &ms->parms.crg;
-    int compno;
-    jpc_crgcomp_t *comp;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    for (compno = 0, comp = crg->comps; compno < crg->numcomps; ++compno,
-      ++comp) {
-        if (jpc_putuint16(out, comp->hoff) ||
-          jpc_putuint16(out, comp->voff)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jpc_crg_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_crg_t *crg = &ms->parms.crg;
-    int compno;
-    jpc_crgcomp_t *comp;
-    for (compno = 0, comp = crg->comps; compno < crg->numcomps; ++compno,
-      ++comp) {
-        fprintf(out, "hoff[%d] = %d; voff[%d] = %d\n", compno,
-          comp->hoff, compno, comp->voff);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Operations for COM marker segment.
-\******************************************************************************/
-
-static void jpc_com_destroyparms(jpc_ms_t *ms)
-{
-    jpc_com_t *com = &ms->parms.com;
-    if (com->data) {
-        jas_free(com->data);
-    }
-}
-
-static int jpc_com_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_com_t *com = &ms->parms.com;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (jpc_getuint16(in, &com->regid)) {
-        return -1;
-    }
-    com->len = ms->len - 2;
-    if (com->len > 0) {
-        if (!(com->data = jas_malloc(com->len))) {
-            return -1;
-        }
-        if (jas_stream_read(in, com->data, com->len) != JAS_CAST(int, com->len)) {
-            return -1;
-        }
-    } else {
-        com->data = 0;
-    }
-    return 0;
-}
-
-static int jpc_com_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    jpc_com_t *com = &ms->parms.com;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (jpc_putuint16(out, com->regid)) {
-        return -1;
-    }
-    if (jas_stream_write(out, com->data, com->len) != JAS_CAST(int, com->len)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_com_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    jpc_com_t *com = &ms->parms.com;
-    unsigned int i;
-    int printable;
-    fprintf(out, "regid = %d;\n", com->regid);
-    printable = 1;
-    for (i = 0; i < com->len; ++i) {
-        if (!isprint(com->data[i])) {
-            printable = 0;
-            break;
-        }
-    }
-    if (printable) {
-        fprintf(out, "data = ");
-        fwrite(com->data, sizeof(char), com->len, out);
-        fprintf(out, "\n");
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Operations for unknown types of marker segments.
-\******************************************************************************/
-
-static void jpc_unk_destroyparms(jpc_ms_t *ms)
-{
-    jpc_unk_t *unk = &ms->parms.unk;
-    if (unk->data) {
-        jas_free(unk->data);
-    }
-}
-
-static int jpc_unk_getparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in)
-{
-    jpc_unk_t *unk = &ms->parms.unk;
-
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-
-    if (ms->len > 0) {
-        if (!(unk->data = jas_malloc(ms->len * sizeof(unsigned char)))) {
-            return -1;
-        }
-        if (jas_stream_read(in, (char *) unk->data, ms->len) != JAS_CAST(int, ms->len)) {
-            jas_free(unk->data);
-            return -1;
-        }
-        unk->len = ms->len;
-    } else {
-        unk->data = 0;
-        unk->len = 0;
-    }
-    return 0;
-}
-
-static int jpc_unk_putparms(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out)
-{
-    /* Eliminate compiler warning about unused variables. */
-    cstate = 0;
-    ms = 0;
-    out = 0;
-
-    /* If this function is called, we are trying to write an unsupported
-      type of marker segment.  Return with an error indication.  */
-    return -1;
-}
-
-static int jpc_unk_dumpparms(jpc_ms_t *ms, FILE *out)
-{
-    unsigned int i;
-    jpc_unk_t *unk = &ms->parms.unk;
-    for (i = 0; i < unk->len; ++i) {
-        fprintf(out, "%02x ", unk->data[i]);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Primitive I/O operations.
-\******************************************************************************/
-
-int jpc_getuint8(jas_stream_t *in, uint_fast8_t *val)
-{
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    if (val) {
-        *val = c;
-    }
-    return 0;
-}
-
-int jpc_putuint8(jas_stream_t *out, uint_fast8_t val)
-{
-    if (jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-int jpc_getuint16(jas_stream_t *in, uint_fast16_t *val)
-{
-    uint_fast16_t v;
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-int jpc_putuint16(jas_stream_t *out, uint_fast16_t val)
-{
-    if (jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-      jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-int jpc_getuint32(jas_stream_t *in, uint_fast32_t *val)
-{
-    uint_fast32_t v;
-    int c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | c;
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-int jpc_putuint32(jas_stream_t *out, uint_fast32_t val)
-{
-    if (jas_stream_putc(out, (val >> 24) & 0xff) == EOF ||
-      jas_stream_putc(out, (val >> 16) & 0xff) == EOF ||
-      jas_stream_putc(out, (val >> 8) & 0xff) == EOF ||
-      jas_stream_putc(out, val & 0xff) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Miscellany
-\******************************************************************************/
-
-static jpc_mstabent_t *jpc_mstab_lookup(int id)
-{
-    jpc_mstabent_t *mstabent;
-    for (mstabent = jpc_mstab;; ++mstabent) {
-        if (mstabent->id == id || mstabent->id < 0) {
-            return mstabent;
-        }
-    }
-    assert(0);
-    return 0;
-}
-
-int jpc_validate(jas_stream_t *in)
-{
-    int n;
-    int i;
-    unsigned char buf[2];
-
-    assert(JAS_STREAM_MAXPUTBACK >= 2);
-
-    if ((n = jas_stream_read(in, (char *) buf, 2)) < 0) {
-        return -1;
-    }
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-    if (n < 2) {
-        return -1;
-    }
-    if (buf[0] == (JPC_MS_SOC >> 8) && buf[1] == (JPC_MS_SOC & 0xff)) {
-        return 0;
-    }
-    return -1;
-}
-
-int jpc_getdata(jas_stream_t *in, jas_stream_t *out, long len)
-{
-    return jas_stream_copy(out, in, len);
-}
-
-int jpc_putdata(jas_stream_t *out, jas_stream_t *in, long len)
-{
-    return jas_stream_copy(out, in, len);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.h
deleted file mode 100644
index 81e2988..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_cs.h
+++ /dev/null
@@ -1,763 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JPEG-2000 Code Stream Library
- *
- * $Id$
- */
-
-#ifndef JPC_CS_H
-#define JPC_CS_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-
-#include "jpc_cod.h"
-
-/******************************************************************************\
-* Constants and Types.
-\******************************************************************************/
-
-/* The maximum number of resolution levels. */
-#define	JPC_MAXRLVLS	33
-
-/* The maximum number of bands. */
-#define	JPC_MAXBANDS	(3 * JPC_MAXRLVLS + 1)
-
-/* The maximum number of layers. */
-#define JPC_MAXLYRS	16384
-
-/**************************************\
-* Code stream.
-\**************************************/
-
-/*
- * Code stream states.
- */
-
-/* Initial. */
-#define	JPC_CS_INIT	0
-/* Main header. */
-#define	JPC_CS_MHDR	1
-/* Tile-part header. */
-#define	JPC_CS_THDR	2
-/* Main trailer. */
-#define	JPC_CS_MTLR	3
-/* Tile-part data. */
-#define	JPC_CS_TDATA	4
-
-/*
- * Unfortunately, the code stream syntax was not designed in such a way that
- * any given marker segment can be correctly decoded without additional state
- * derived from previously decoded marker segments.
- * For example, a RGN/COC/QCC marker segment cannot be decoded unless the
- * number of components is known.
- */
-
-/*
- * Code stream state information.
- */
-
-typedef struct {
-
-    /* The number of components. */
-    uint_fast16_t numcomps;
-
-} jpc_cstate_t;
-
-/**************************************\
-* SOT marker segment parameters.
-\**************************************/
-
-typedef struct {
-
-    /* The tile number. */
-    uint_fast16_t tileno;
-
-    /* The combined length of the marker segment and its auxilary data
-      (i.e., packet data). */
-    uint_fast32_t len;
-
-    /* The tile-part instance. */
-    uint_fast8_t partno;
-
-    /* The number of tile-parts. */
-    uint_fast8_t numparts;
-
-} jpc_sot_t;
-
-/**************************************\
-* SIZ marker segment parameters.
-\**************************************/
-
-/* Per component information. */
-
-typedef struct {
-
-    /* The precision of the samples. */
-    uint_fast8_t prec;
-
-    /* The signedness of the samples. */
-    uint_fast8_t sgnd;
-
-    /* The horizontal separation of samples with respect to the reference
-      grid. */
-    uint_fast8_t hsamp;
-
-    /* The vertical separation of samples with respect to the reference
-      grid. */
-    uint_fast8_t vsamp;
-
-} jpc_sizcomp_t;
-
-/* SIZ marker segment parameters. */
-
-typedef struct {
-
-    /* The code stream capabilities. */
-    uint_fast16_t caps;
-
-    /* The width of the image in units of the reference grid. */
-    uint_fast32_t width;
-
-    /* The height of the image in units of the reference grid. */
-    uint_fast32_t height;
-
-    /* The horizontal offset from the origin of the reference grid to the
-      left side of the image area. */
-    uint_fast32_t xoff;
-
-    /* The vertical offset from the origin of the reference grid to the
-      top side of the image area. */
-    uint_fast32_t yoff;
-
-    /* The nominal width of a tile in units of the reference grid. */
-    uint_fast32_t tilewidth;
-
-    /* The nominal height of a tile in units of the reference grid. */
-    uint_fast32_t tileheight;
-
-    /* The horizontal offset from the origin of the reference grid to the
-      left side of the first tile. */
-    uint_fast32_t tilexoff;
-
-    /* The vertical offset from the origin of the reference grid to the
-      top side of the first tile. */
-    uint_fast32_t tileyoff;
-
-    /* The number of components. */
-    uint_fast16_t numcomps;
-
-    /* The per-component information. */
-    jpc_sizcomp_t *comps;
-
-} jpc_siz_t;
-
-/**************************************\
-* COD marker segment parameters.
-\**************************************/
-
-/*
- * Coding style constants.
- */
-
-/* Precincts may be used. */
-#define	JPC_COX_PRT	0x01
-/* SOP marker segments may be used. */
-#define	JPC_COD_SOP	0x02
-/* EPH marker segments may be used. */
-#define	JPC_COD_EPH	0x04
-
-/*
- * Progression order constants.
- */
-
-/* Layer-resolution-component-precinct progressive
-  (i.e., progressive by fidelity). */
-#define	JPC_COD_LRCPPRG	0
-/* Resolution-layer-component-precinct progressive
-  (i.e., progressive by resolution). */
-#define	JPC_COD_RLCPPRG	1
-/* Resolution-precinct-component-layer progressive. */
-#define	JPC_COD_RPCLPRG	2
-/* Precinct-component-resolution-layer progressive. */
-#define	JPC_COD_PCRLPRG	3
-/* Component-position-resolution-layer progressive. */
-#define	JPC_COD_CPRLPRG	4
-
-/*
- * Code block style constants.
- */
-
-#define	JPC_COX_LAZY	0x01 /* Selective arithmetic coding bypass. */
-#define	JPC_COX_RESET	0x02 /* Reset context probabilities. */
-#define	JPC_COX_TERMALL	0x04 /* Terminate all coding passes. */
-#define	JPC_COX_VSC		0x08 /* Vertical stripe causal context formation. */
-#define	JPC_COX_PTERM	0x10 /* Predictable termination. */
-#define	JPC_COX_SEGSYM	0x20 /* Use segmentation symbols. */
-
-/* Transform constants. */
-#define	JPC_COX_INS	0x00 /* Irreversible 9/7. */
-#define	JPC_COX_RFT	0x01 /* Reversible 5/3. */
-
-/* Multicomponent transform constants. */
-#define	JPC_COD_NOMCT	0x00 /* No multicomponent transform. */
-#define	JPC_COD_MCT		0x01 /* Multicomponent transform. */
-
-/* Get the code block size value from the code block size exponent. */
-#define	JPC_COX_CBLKSIZEEXPN(x)		((x) - 2)
-/* Get the code block size exponent from the code block size value. */
-#define	JPC_COX_GETCBLKSIZEEXPN(x)	((x) + 2)
-
-/* Per resolution-level information. */
-
-typedef struct {
-
-    /* The packet partition width. */
-    uint_fast8_t parwidthval;
-
-    /* The packet partition height. */
-    uint_fast8_t parheightval;
-
-} jpc_coxrlvl_t;
-
-/* Per component information. */
-
-typedef struct {
-
-    /* The coding style. */
-    uint_fast8_t csty;
-
-    /* The number of decomposition levels. */
-    uint_fast8_t numdlvls;
-
-    /* The nominal code block width specifier. */
-    uint_fast8_t cblkwidthval;
-
-    /* The nominal code block height specifier. */
-    uint_fast8_t cblkheightval;
-
-    /* The style of coding passes. */
-    uint_fast8_t cblksty;
-
-    /* The QMFB employed. */
-    uint_fast8_t qmfbid;
-
-    /* The number of resolution levels. */
-    int numrlvls;
-
-    /* The per-resolution-level information. */
-    jpc_coxrlvl_t rlvls[JPC_MAXRLVLS];
-
-} jpc_coxcp_t;
-
-/* COD marker segment parameters. */
-
-typedef struct {
-
-    /* The general coding style. */
-    uint_fast8_t csty;
-
-    /* The progression order. */
-    uint_fast8_t prg;
-
-    /* The number of layers. */
-    uint_fast16_t numlyrs;
-
-    /* The multicomponent transform. */
-    uint_fast8_t mctrans;
-
-    /* Component-related parameters. */
-    jpc_coxcp_t compparms;
-
-} jpc_cod_t;
-
-/* COC marker segment parameters. */
-
-typedef struct {
-
-    /* The component number. */
-    uint_fast16_t compno;
-
-    /* Component-related parameters. */
-    jpc_coxcp_t compparms;
-
-} jpc_coc_t;
-
-/**************************************\
-* RGN marker segment parameters.
-\**************************************/
-
-/* The maxshift ROI style. */
-#define	JPC_RGN_MAXSHIFT	0x00
-
-typedef struct {
-
-    /* The component to which the marker applies. */
-    uint_fast16_t compno;
-
-    /* The ROI style. */
-    uint_fast8_t roisty;
-
-    /* The ROI shift value. */
-    uint_fast8_t roishift;
-
-} jpc_rgn_t;
-
-/**************************************\
-* QCD/QCC marker segment parameters.
-\**************************************/
-
-/*
- * Quantization style constants.
- */
-
-#define	JPC_QCX_NOQNT	0 /* No quantization. */
-#define	JPC_QCX_SIQNT	1 /* Scalar quantization, implicit. */
-#define	JPC_QCX_SEQNT	2 /* Scalar quantization, explicit. */
-
-/*
- * Stepsize manipulation macros.
- */
-
-#define	JPC_QCX_GETEXPN(x)	((x) >> 11)
-#define	JPC_QCX_GETMANT(x)	((x) & 0x07ff)
-#define	JPC_QCX_EXPN(x)		(assert(!((x) & (~0x1f))), (((x) & 0x1f) << 11))
-#define	JPC_QCX_MANT(x)		(assert(!((x) & (~0x7ff))), ((x) & 0x7ff))
-
-/* Per component information. */
-
-typedef struct {
-
-    /* The quantization style. */
-    uint_fast8_t qntsty;
-
-    /* The number of step sizes. */
-    int numstepsizes;
-
-    /* The step sizes. */
-    uint_fast16_t *stepsizes;
-
-    /* The number of guard bits. */
-    uint_fast8_t numguard;
-
-} jpc_qcxcp_t;
-
-/* QCC marker segment parameters. */
-
-typedef struct {
-
-    /* The component associated with this marker segment. */
-    uint_fast16_t compno;
-
-    /* The parameters. */
-    jpc_qcxcp_t compparms;
-
-} jpc_qcc_t;
-
-/* QCD marker segment parameters. */
-
-typedef struct {
-
-    /* The parameters. */
-    jpc_qcxcp_t compparms;
-
-} jpc_qcd_t;
-
-/**************************************\
-* POD marker segment parameters.
-\**************************************/
-
-typedef struct {
-
-    /* The progression order. */
-    uint_fast8_t prgord;
-
-    /* The lower bound (inclusive) on the resolution level for the
-      progression order volume. */
-    uint_fast8_t rlvlnostart;
-
-    /* The upper bound (exclusive) on the resolution level for the
-      progression order volume. */
-    uint_fast8_t rlvlnoend;
-
-    /* The lower bound (inclusive) on the component for the progression
-      order volume. */
-    uint_fast16_t compnostart;
-
-    /* The upper bound (exclusive) on the component for the progression
-      order volume. */
-    uint_fast16_t compnoend;
-
-    /* The upper bound (exclusive) on the layer for the progression
-      order volume. */
-    uint_fast16_t lyrnoend;
-
-} jpc_pocpchg_t;
-
-/* An alias for the above type. */
-typedef jpc_pocpchg_t jpc_pchg_t;
-
-/* POC marker segment parameters. */
-
-typedef struct {
-
-    /* The number of progression order changes. */
-    int numpchgs;
-
-    /* The per-progression-order-change information. */
-    jpc_pocpchg_t *pchgs;
-
-} jpc_poc_t;
-
-/**************************************\
-* PPM/PPT marker segment parameters.
-\**************************************/
-
-/* PPM marker segment parameters. */
-
-typedef struct {
-
-    /* The index. */
-    uint_fast8_t ind;
-
-    /* The length. */
-    uint_fast16_t len;
-
-    /* The data. */
-    uchar *data;
-
-} jpc_ppm_t;
-
-/* PPT marker segment parameters. */
-
-typedef struct {
-
-    /* The index. */
-    uint_fast8_t ind;
-
-    /* The length. */
-    uint_fast32_t len;
-
-    /* The data. */
-    unsigned char *data;
-
-} jpc_ppt_t;
-
-/**************************************\
-* COM marker segment parameters.
-\**************************************/
-
-/*
- * Registration IDs.
- */
-
-#define	JPC_COM_BIN		0x00
-#define	JPC_COM_LATIN	0x01
-
-typedef struct {
-
-    /* The registration ID. */
-    uint_fast16_t regid;
-
-    /* The length of the data in bytes. */
-    uint_fast16_t len;
-
-    /* The data. */
-    uchar *data;
-
-} jpc_com_t;
-
-/**************************************\
-* SOP marker segment parameters.
-\**************************************/
-
-typedef struct {
-
-    /* The sequence number. */
-    uint_fast16_t seqno;
-
-} jpc_sop_t;
-
-/**************************************\
-* CRG marker segment parameters.
-\**************************************/
-
-/* Per component information. */
-
-typedef struct {
-
-    /* The horizontal offset. */
-    uint_fast16_t hoff;
-
-    /* The vertical offset. */
-    uint_fast16_t voff;
-
-} jpc_crgcomp_t;
-
-typedef struct {
-
-    /* The number of components. */
-    int numcomps;
-
-    /* Per component information. */
-    jpc_crgcomp_t *comps;
-
-} jpc_crg_t;
-
-/**************************************\
-* Marker segment parameters for unknown marker type.
-\**************************************/
-
-typedef struct {
-
-    /* The data. */
-    uchar *data;
-
-    /* The length. */
-    uint_fast16_t len;
-
-} jpc_unk_t;
-
-/**************************************\
-* Generic marker segment parameters.
-\**************************************/
-
-typedef union {
-    int soc;	/* unused */
-    jpc_sot_t sot;
-    int sod;	/* unused */
-    int eoc;	/* unused */
-    jpc_siz_t siz;
-    jpc_cod_t cod;
-    jpc_coc_t coc;
-    jpc_rgn_t rgn;
-    jpc_qcd_t qcd;
-    jpc_qcc_t qcc;
-    jpc_poc_t poc;
-    /* jpc_plm_t plm; */
-    /* jpc_plt_t plt; */
-    jpc_ppm_t ppm;
-    jpc_ppt_t ppt;
-    jpc_sop_t sop;
-    int eph;	/* unused */
-    jpc_com_t com;
-    jpc_crg_t crg;
-    jpc_unk_t unk;
-} jpc_msparms_t;
-
-/**************************************\
-* Marker segment.
-\**************************************/
-
-/* Marker segment IDs. */
-
-/* The smallest valid marker value. */
-#define	JPC_MS_MIN	0xff00
-
-/* The largest valid marker value. */
-#define	JPC_MS_MAX	0xffff
-
-/* The minimum marker value that cannot occur within packet data. */
-#define	JPC_MS_INMIN	0xff80
-/* The maximum marker value that cannot occur within packet data. */
-#define	JPC_MS_INMAX	0xffff
-
-/* Delimiting marker segments. */
-#define	JPC_MS_SOC	0xff4f /* Start of code stream (SOC). */
-#define	JPC_MS_SOT	0xff90 /* Start of tile-part (SOT). */
-#define	JPC_MS_SOD	0xff93 /* Start of data (SOD). */
-#define	JPC_MS_EOC	0xffd9 /* End of code stream (EOC). */
-
-/* Fixed information marker segments. */
-#define	JPC_MS_SIZ	0xff51 /* Image and tile size (SIZ). */
-
-/* Functional marker segments. */
-#define	JPC_MS_COD	0xff52 /* Coding style default (COD). */
-#define JPC_MS_COC	0xff53 /* Coding style component (COC). */
-#define	JPC_MS_RGN	0xff5e /* Region of interest (RGN). */
-#define JPC_MS_QCD	0xff5c /* Quantization default (QCD). */
-#define JPC_MS_QCC	0xff5d /* Quantization component (QCC). */
-#define JPC_MS_POC	0xff5f /* Progression order default (POC). */
-
-/* Pointer marker segments. */
-#define	JPC_MS_TLM	0xff55 /* Tile-part lengths, main header (TLM). */
-#define	JPC_MS_PLM	0xff57 /* Packet length, main header (PLM). */
-#define	JPC_MS_PLT	0xff58 /* Packet length, tile-part header (PLT). */
-#define	JPC_MS_PPM	0xff60 /* Packed packet headers, main header (PPM). */
-#define	JPC_MS_PPT	0xff61 /* Packet packet headers, tile-part header (PPT). */
-
-/* In bit stream marker segments. */
-#define	JPC_MS_SOP	0xff91	/* Start of packet (SOP). */
-#define	JPC_MS_EPH	0xff92	/* End of packet header (EPH). */
-
-/* Informational marker segments. */
-#define	JPC_MS_CRG	0xff63 /* Component registration (CRG). */
-#define JPC_MS_COM	0xff64 /* Comment (COM). */
-
-/* Forward declaration. */
-struct jpc_msops_s;
-
-/* Generic marker segment class. */
-
-typedef struct {
-
-    /* The type of marker segment. */
-    uint_fast16_t id;
-
-    /* The length of the marker segment. */
-    uint_fast16_t len;
-
-    /* The starting offset within the stream. */
-    uint_fast32_t off;
-
-    /* The parameters of the marker segment. */
-    jpc_msparms_t parms;
-
-    /* The marker segment operations. */
-    struct jpc_msops_s *ops;
-
-} jpc_ms_t;
-
-/* Marker segment operations (which depend on the marker segment type). */
-
-typedef struct jpc_msops_s {
-
-    /* Destroy the marker segment parameters. */
-    void (*destroyparms)(jpc_ms_t *ms);
-
-    /* Get the marker segment parameters from a stream. */
-    int (*getparms)(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *in);
-
-    /* Put the marker segment parameters to a stream. */
-    int (*putparms)(jpc_ms_t *ms, jpc_cstate_t *cstate, jas_stream_t *out);
-
-    /* Dump the marker segment parameters (for debugging). */
-    int (*dumpparms)(jpc_ms_t *ms, FILE *out);
-
-} jpc_msops_t;
-
-/******************************************************************************\
-* Macros/Functions.
-\******************************************************************************/
-
-/* Create a code-stream state object. */
-jpc_cstate_t *jpc_cstate_create(void);
-
-/* Destroy a code-stream state object. */
-void jpc_cstate_destroy(jpc_cstate_t *cstate);
-
-/* Create a marker segment. */
-jpc_ms_t *jpc_ms_create(int type);
-
-/* Destroy a marker segment. */
-void jpc_ms_destroy(jpc_ms_t *ms);
-
-/* Does a marker segment have parameters? */
-#define	JPC_MS_HASPARMS(x) \
-    (!((x) == JPC_MS_SOC || (x) == JPC_MS_SOD || (x) == JPC_MS_EOC || \
-      (x) == JPC_MS_EPH || ((x) >= 0xff30 && (x) <= 0xff3f)))
-
-/* Get the marker segment type. */
-#define	jpc_ms_gettype(ms) \
-    ((ms)->id)
-
-/* Read a marker segment from a stream. */
-jpc_ms_t *jpc_getms(jas_stream_t *in, jpc_cstate_t *cstate);
-
-/* Write a marker segment to a stream. */
-int jpc_putms(jas_stream_t *out, jpc_cstate_t *cstate, jpc_ms_t *ms);
-
-/* Copy code stream data from one stream to another. */
-int jpc_getdata(jas_stream_t *in, jas_stream_t *out, long n);
-
-/* Copy code stream data from one stream to another. */
-int jpc_putdata(jas_stream_t *out, jas_stream_t *in, long n);
-
-/* Dump a marker segment (for debugging). */
-void jpc_ms_dump(jpc_ms_t *ms, FILE *out);
-
-/* Read a 8-bit unsigned integer from a stream. */
-int jpc_getuint8(jas_stream_t *in, uint_fast8_t *val);
-
-/* Read a 16-bit unsigned integer from a stream. */
-int jpc_getuint16(jas_stream_t *in, uint_fast16_t *val);
-
-/* Read a 32-bit unsigned integer from a stream. */
-int jpc_getuint32(jas_stream_t *in, uint_fast32_t *val);
-
-/* Write a 8-bit unsigned integer to a stream. */
-int jpc_putuint8(jas_stream_t *out, uint_fast8_t val);
-
-/* Write a 16-bit unsigned integer to a stream. */
-int jpc_putuint16(jas_stream_t *out, uint_fast16_t val);
-
-/* Write a 32-bit unsigned integer to a stream. */
-int jpc_putuint32(jas_stream_t *out, uint_fast32_t val);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.c
deleted file mode 100644
index 240f1af..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.c
+++ /dev/null
@@ -1,2305 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_fix.h"
-#include "jpc_dec.h"
-#include "jpc_cs.h"
-#include "jpc_mct.h"
-#include "jpc_t2dec.h"
-#include "jpc_t1dec.h"
-#include "jpc_math.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-#define	JPC_MHSOC	0x0001
-  /* In the main header, expecting a SOC marker segment. */
-#define	JPC_MHSIZ	0x0002
-  /* In the main header, expecting a SIZ marker segment. */
-#define	JPC_MH		0x0004
-  /* In the main header, expecting "other" marker segments. */
-#define	JPC_TPHSOT	0x0008
-  /* In a tile-part header, expecting a SOT marker segment. */
-#define	JPC_TPH		0x0010
-  /* In a tile-part header, expecting "other" marker segments. */
-#define	JPC_MT		0x0020
-  /* In the main trailer. */
-
-typedef struct {
-
-    uint_fast16_t id;
-    /* The marker segment type. */
-
-    int validstates;
-    /* The states in which this type of marker segment can be
-      validly encountered. */
-
-    int (*action)(jpc_dec_t *dec, jpc_ms_t *ms);
-    /* The action to take upon encountering this type of marker segment. */
-
-} jpc_dec_mstabent_t;
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-/* COD/COC parameters have been specified. */
-#define	JPC_CSET	0x0001
-/* QCD/QCC parameters have been specified. */
-#define	JPC_QSET	0x0002
-/* COD/COC parameters set from a COC marker segment. */
-#define	JPC_COC	0x0004
-/* QCD/QCC parameters set from a QCC marker segment. */
-#define	JPC_QCC	0x0008
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static int jpc_dec_dump(jpc_dec_t *dec, FILE *out);
-
-jpc_ppxstab_t *jpc_ppxstab_create(void);
-void jpc_ppxstab_destroy(jpc_ppxstab_t *tab);
-int jpc_ppxstab_grow(jpc_ppxstab_t *tab, int maxents);
-int jpc_ppxstab_insert(jpc_ppxstab_t *tab, jpc_ppxstabent_t *ent);
-jpc_streamlist_t *jpc_ppmstabtostreams(jpc_ppxstab_t *tab);
-int jpc_pptstabwrite(jas_stream_t *out, jpc_ppxstab_t *tab);
-jpc_ppxstabent_t *jpc_ppxstabent_create(void);
-void jpc_ppxstabent_destroy(jpc_ppxstabent_t *ent);
-
-int jpc_streamlist_numstreams(jpc_streamlist_t *streamlist);
-jpc_streamlist_t *jpc_streamlist_create(void);
-int jpc_streamlist_insert(jpc_streamlist_t *streamlist, int streamno,
-  jas_stream_t *stream);
-jas_stream_t *jpc_streamlist_remove(jpc_streamlist_t *streamlist, int streamno);
-void jpc_streamlist_destroy(jpc_streamlist_t *streamlist);
-jas_stream_t *jpc_streamlist_get(jpc_streamlist_t *streamlist, int streamno);
-
-static void jpc_dec_cp_resetflags(jpc_dec_cp_t *cp);
-static jpc_dec_cp_t *jpc_dec_cp_create(uint_fast16_t numcomps);
-static int jpc_dec_cp_isvalid(jpc_dec_cp_t *cp);
-static jpc_dec_cp_t *jpc_dec_cp_copy(jpc_dec_cp_t *cp);
-static int jpc_dec_cp_setfromcod(jpc_dec_cp_t *cp, jpc_cod_t *cod);
-static int jpc_dec_cp_setfromcoc(jpc_dec_cp_t *cp, jpc_coc_t *coc);
-static int jpc_dec_cp_setfromcox(jpc_dec_cp_t *cp, jpc_dec_ccp_t *ccp,
-  jpc_coxcp_t *compparms, int flags);
-static int jpc_dec_cp_setfromqcd(jpc_dec_cp_t *cp, jpc_qcd_t *qcd);
-static int jpc_dec_cp_setfromqcc(jpc_dec_cp_t *cp, jpc_qcc_t *qcc);
-static int jpc_dec_cp_setfromqcx(jpc_dec_cp_t *cp, jpc_dec_ccp_t *ccp,
-  jpc_qcxcp_t *compparms, int flags);
-static int jpc_dec_cp_setfromrgn(jpc_dec_cp_t *cp, jpc_rgn_t *rgn);
-static int jpc_dec_cp_prepare(jpc_dec_cp_t *cp);
-static void jpc_dec_cp_destroy(jpc_dec_cp_t *cp);
-static int jpc_dec_cp_setfrompoc(jpc_dec_cp_t *cp, jpc_poc_t *poc, int reset);
-static int jpc_pi_addpchgfrompoc(jpc_pi_t *pi, jpc_poc_t *poc);
-
-static int jpc_dec_decode(jpc_dec_t *dec);
-static jpc_dec_t *jpc_dec_create(jpc_dec_importopts_t *impopts, jas_stream_t *in);
-static void jpc_dec_destroy(jpc_dec_t *dec);
-static void jpc_dequantize(jas_matrix_t *x, jpc_fix_t absstepsize);
-static void jpc_undo_roi(jas_matrix_t *x, int roishift, int bgshift, int numbps);
-static jpc_fix_t jpc_calcabsstepsize(int stepsize, int numbits);
-static int jpc_dec_tiledecode(jpc_dec_t *dec, jpc_dec_tile_t *tile);
-static int jpc_dec_tileinit(jpc_dec_t *dec, jpc_dec_tile_t *tile);
-static int jpc_dec_tilefini(jpc_dec_t *dec, jpc_dec_tile_t *tile);
-static int jpc_dec_process_soc(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_sot(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_sod(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_eoc(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_cod(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_coc(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_rgn(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_qcd(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_qcc(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_poc(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_ppm(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_ppt(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_com(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_unk(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_process_crg(jpc_dec_t *dec, jpc_ms_t *ms);
-static int jpc_dec_parseopts(char *optstr, jpc_dec_importopts_t *opts);
-
-static jpc_dec_mstabent_t *jpc_dec_mstab_lookup(uint_fast16_t id);
-
-/******************************************************************************\
-* Global data.
-\******************************************************************************/
-
-jpc_dec_mstabent_t jpc_dec_mstab[] = {
-    {JPC_MS_SOC, JPC_MHSOC, jpc_dec_process_soc},
-    {JPC_MS_SOT, JPC_MH | JPC_TPHSOT, jpc_dec_process_sot},
-    {JPC_MS_SOD, JPC_TPH, jpc_dec_process_sod},
-    {JPC_MS_EOC, JPC_TPHSOT, jpc_dec_process_eoc},
-    {JPC_MS_SIZ, JPC_MHSIZ, jpc_dec_process_siz},
-    {JPC_MS_COD, JPC_MH | JPC_TPH, jpc_dec_process_cod},
-    {JPC_MS_COC, JPC_MH | JPC_TPH, jpc_dec_process_coc},
-    {JPC_MS_RGN, JPC_MH | JPC_TPH, jpc_dec_process_rgn},
-    {JPC_MS_QCD, JPC_MH | JPC_TPH, jpc_dec_process_qcd},
-    {JPC_MS_QCC, JPC_MH | JPC_TPH, jpc_dec_process_qcc},
-    {JPC_MS_POC, JPC_MH | JPC_TPH, jpc_dec_process_poc},
-    {JPC_MS_TLM, JPC_MH, 0},
-    {JPC_MS_PLM, JPC_MH, 0},
-    {JPC_MS_PLT, JPC_TPH, 0},
-    {JPC_MS_PPM, JPC_MH, jpc_dec_process_ppm},
-    {JPC_MS_PPT, JPC_TPH, jpc_dec_process_ppt},
-    {JPC_MS_SOP, 0, 0},
-    {JPC_MS_CRG, JPC_MH, jpc_dec_process_crg},
-    {JPC_MS_COM, JPC_MH | JPC_TPH, jpc_dec_process_com},
-    {0, JPC_MH | JPC_TPH, jpc_dec_process_unk}
-};
-
-/******************************************************************************\
-* The main entry point for the JPEG-2000 decoder.
-\******************************************************************************/
-
-jas_image_t *jpc_decode(jas_stream_t *in, char *optstr)
-{
-    jpc_dec_importopts_t opts;
-    jpc_dec_t *dec;
-    jas_image_t *image;
-
-    dec = 0;
-
-    if (jpc_dec_parseopts(optstr, &opts)) {
-        goto error;
-    }
-
-    jpc_initluts();
-
-    if (!(dec = jpc_dec_create(&opts, in))) {
-        goto error;
-    }
-
-    /* Do most of the work. */
-    if (jpc_dec_decode(dec)) {
-        goto error;
-    }
-
-    if (jas_image_numcmpts(dec->image) >= 3) {
-        jas_image_setclrspc(dec->image, JAS_CLRSPC_SRGB);
-        jas_image_setcmpttype(dec->image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R));
-        jas_image_setcmpttype(dec->image, 1,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G));
-        jas_image_setcmpttype(dec->image, 2,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B));
-    } else {
-        jas_image_setclrspc(dec->image, JAS_CLRSPC_SGRAY);
-        jas_image_setcmpttype(dec->image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-    }
-
-    /* Save the return value. */
-    image = dec->image;
-
-    /* Stop the image from being discarded. */
-    dec->image = 0;
-
-    /* Destroy decoder. */
-    jpc_dec_destroy(dec);
-
-    return image;
-
-error:
-    if (dec) {
-        jpc_dec_destroy(dec);
-    }
-    return 0;
-}
-
-typedef enum {
-    OPT_MAXLYRS,
-    OPT_MAXPKTS,
-    OPT_DEBUG
-} optid_t;
-
-jas_taginfo_t decopts[] = {
-    {OPT_MAXLYRS, "maxlyrs"},
-    {OPT_MAXPKTS, "maxpkts"},
-    {OPT_DEBUG, "debug"},
-    {-1, 0}
-};
-
-static int jpc_dec_parseopts(char *optstr, jpc_dec_importopts_t *opts)
-{
-    jas_tvparser_t *tvp;
-
-    opts->debug = 0;
-    opts->maxlyrs = JPC_MAXLYRS;
-    opts->maxpkts = -1;
-
-    if (!(tvp = jas_tvparser_create(optstr ? optstr : ""))) {
-        return -1;
-    }
-
-    while (!jas_tvparser_next(tvp)) {
-        switch (jas_taginfo_nonull(jas_taginfos_lookup(decopts,
-          jas_tvparser_gettag(tvp)))->id) {
-        case OPT_MAXLYRS:
-            opts->maxlyrs = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_DEBUG:
-            opts->debug = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_MAXPKTS:
-            opts->maxpkts = atoi(jas_tvparser_getval(tvp));
-            break;
-        default:
-            jas_eprintf("warning: ignoring invalid option %s\n",
-              jas_tvparser_gettag(tvp));
-            break;
-        }
-    }
-
-    jas_tvparser_destroy(tvp);
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for table-driven code stream decoder.
-\******************************************************************************/
-
-static jpc_dec_mstabent_t *jpc_dec_mstab_lookup(uint_fast16_t id)
-{
-    jpc_dec_mstabent_t *mstabent;
-    for (mstabent = jpc_dec_mstab; mstabent->id != 0; ++mstabent) {
-        if (mstabent->id == id) {
-            break;
-        }
-    }
-    return mstabent;
-}
-
-static int jpc_dec_decode(jpc_dec_t *dec)
-{
-    jpc_ms_t *ms;
-    jpc_dec_mstabent_t *mstabent;
-    int ret;
-    jpc_cstate_t *cstate;
-
-    if (!(cstate = jpc_cstate_create())) {
-        return -1;
-    }
-    dec->cstate = cstate;
-
-    /* Initially, we should expect to encounter a SOC marker segment. */
-    dec->state = JPC_MHSOC;
-
-    for (;;) {
-
-        /* Get the next marker segment in the code stream. */
-        if (!(ms = jpc_getms(dec->in, cstate))) {
-            jas_eprintf("cannot get marker segment\n");
-            return -1;
-        }
-
-        mstabent = jpc_dec_mstab_lookup(ms->id);
-        assert(mstabent);
-
-        /* Ensure that this type of marker segment is permitted
-          at this point in the code stream. */
-        if (!(dec->state & mstabent->validstates)) {
-            jas_eprintf("unexpected marker segment type\n");
-            jpc_ms_destroy(ms);
-            return -1;
-        }
-
-        /* Process the marker segment. */
-        if (mstabent->action) {
-            ret = (*mstabent->action)(dec, ms);
-        } else {
-            /* No explicit action is required. */
-            ret = 0;
-        }
-
-        /* Destroy the marker segment. */
-        jpc_ms_destroy(ms);
-
-        if (ret < 0) {
-            return -1;
-        } else if (ret > 0) {
-            break;
-        }
-
-    }
-
-    return 0;
-}
-
-static int jpc_dec_process_crg(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    int cmptno;
-    jpc_dec_cmpt_t *cmpt;
-    jpc_crg_t *crg;
-
-    crg = &ms->parms.crg;
-    for (cmptno = 0, cmpt = dec->cmpts; cmptno < dec->numcomps; ++cmptno,
-      ++cmpt) {
-        /* Ignore the information in the CRG marker segment for now.
-          This information serves no useful purpose for decoding anyhow.
-          Some other parts of the code need to be changed if these lines
-          are uncommented.
-        cmpt->hsubstep = crg->comps[cmptno].hoff;
-        cmpt->vsubstep = crg->comps[cmptno].voff;
-        */
-    }
-    return 0;
-}
-
-static int jpc_dec_process_soc(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    /* Eliminate warnings about unused variables. */
-    ms = 0;
-
-    /* We should expect to encounter a SIZ marker segment next. */
-    dec->state = JPC_MHSIZ;
-
-    return 0;
-}
-
-static int jpc_dec_process_sot(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_dec_tile_t *tile;
-    jpc_sot_t *sot = &ms->parms.sot;
-    jas_image_cmptparm_t *compinfos;
-    jas_image_cmptparm_t *compinfo;
-    jpc_dec_cmpt_t *cmpt;
-    int cmptno;
-
-    if (dec->state == JPC_MH) {
-
-        compinfos = jas_malloc(dec->numcomps * sizeof(jas_image_cmptparm_t));
-        assert(compinfos);
-        for (cmptno = 0, cmpt = dec->cmpts, compinfo = compinfos;
-          cmptno < dec->numcomps; ++cmptno, ++cmpt, ++compinfo) {
-            compinfo->tlx = 0;
-            compinfo->tly = 0;
-            compinfo->prec = cmpt->prec;
-            compinfo->sgnd = cmpt->sgnd;
-            compinfo->width = cmpt->width;
-            compinfo->height = cmpt->height;
-            compinfo->hstep = cmpt->hstep;
-            compinfo->vstep = cmpt->vstep;
-        }
-
-        if (!(dec->image = jas_image_create(dec->numcomps, compinfos,
-          JAS_CLRSPC_UNKNOWN))) {
-            return -1;
-        }
-        jas_free(compinfos);
-
-        /* Is the packet header information stored in PPM marker segments in
-          the main header? */
-        if (dec->ppmstab) {
-            /* Convert the PPM marker segment data into a collection of streams
-              (one stream per tile-part). */
-            if (!(dec->pkthdrstreams = jpc_ppmstabtostreams(dec->ppmstab))) {
-                abort();
-            }
-            jpc_ppxstab_destroy(dec->ppmstab);
-            dec->ppmstab = 0;
-        }
-    }
-
-    if (sot->len > 0) {
-        dec->curtileendoff = jas_stream_getrwcount(dec->in) - ms->len -
-          4 + sot->len;
-    } else {
-        dec->curtileendoff = 0;
-    }
-
-    if (JAS_CAST(int, sot->tileno) > dec->numtiles) {
-        jas_eprintf("invalid tile number in SOT marker segment\n");
-        return -1;
-    }
-    /* Set the current tile. */
-    dec->curtile = &dec->tiles[sot->tileno];
-    tile = dec->curtile;
-    /* Ensure that this is the expected part number. */
-    if (sot->partno != tile->partno) {
-        return -1;
-    }
-    if (tile->numparts > 0 && sot->partno >= tile->numparts) {
-        return -1;
-    }
-    if (!tile->numparts && sot->numparts > 0) {
-        tile->numparts = sot->numparts;
-    }
-
-    tile->pptstab = 0;
-
-    switch (tile->state) {
-    case JPC_TILE_INIT:
-        /* This is the first tile-part for this tile. */
-        tile->state = JPC_TILE_ACTIVE;
-        assert(!tile->cp);
-        if (!(tile->cp = jpc_dec_cp_copy(dec->cp))) {
-            return -1;
-        }
-        jpc_dec_cp_resetflags(dec->cp);
-        break;
-    default:
-        if (sot->numparts == sot->partno - 1) {
-            tile->state = JPC_TILE_ACTIVELAST;
-        }
-        break;
-    }
-
-    /* Note: We do not increment the expected tile-part number until
-      all processing for this tile-part is complete. */
-
-    /* We should expect to encounter other tile-part header marker
-      segments next. */
-    dec->state = JPC_TPH;
-
-    return 0;
-}
-
-static int jpc_dec_process_sod(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_dec_tile_t *tile;
-    int pos;
-
-    /* Eliminate compiler warnings about unused variables. */
-    ms = 0;
-
-    if (!(tile = dec->curtile)) {
-        return -1;
-    }
-
-    if (!tile->partno) {
-        if (!jpc_dec_cp_isvalid(tile->cp)) {
-            return -1;
-        }
-        jpc_dec_cp_prepare(tile->cp);
-        if (jpc_dec_tileinit(dec, tile)) {
-            return -1;
-        }
-    }
-
-    /* Are packet headers stored in the main header or tile-part header? */
-    if (dec->pkthdrstreams) {
-        /* Get the stream containing the packet header data for this
-          tile-part. */
-        if (!(tile->pkthdrstream = jpc_streamlist_remove(dec->pkthdrstreams, 0))) {
-            return -1;
-        }
-    }
-
-    if (tile->pptstab) {
-        if (!tile->pkthdrstream) {
-            if (!(tile->pkthdrstream = jas_stream_memopen(0, 0))) {
-                return -1;
-            }
-        }
-        pos = jas_stream_tell(tile->pkthdrstream);
-        jas_stream_seek(tile->pkthdrstream, 0, SEEK_END);
-        if (jpc_pptstabwrite(tile->pkthdrstream, tile->pptstab)) {
-            return -1;
-        }
-        jas_stream_seek(tile->pkthdrstream, pos, SEEK_SET);
-        jpc_ppxstab_destroy(tile->pptstab);
-        tile->pptstab = 0;
-    }
-
-    if (jas_getdbglevel() >= 10) {
-        jpc_dec_dump(dec, stderr);
-    }
-
-    if (jpc_dec_decodepkts(dec, (tile->pkthdrstream) ? tile->pkthdrstream :
-      dec->in, dec->in)) {
-        jas_eprintf("jpc_dec_decodepkts failed\n");
-        return -1;
-    }
-
-    /* Gobble any unconsumed tile data. */
-    if (dec->curtileendoff > 0) {
-        long curoff;
-        uint_fast32_t n;
-        curoff = jas_stream_getrwcount(dec->in);
-        if (curoff < dec->curtileendoff) {
-            n = dec->curtileendoff - curoff;
-            jas_eprintf("warning: ignoring trailing garbage (%lu bytes)\n",
-              (unsigned long) n);
-
-            while (n-- > 0) {
-                if (jas_stream_getc(dec->in) == EOF) {
-                    jas_eprintf("read error\n");
-                    return -1;
-                }
-            }
-        } else if (curoff > dec->curtileendoff) {
-            jas_eprintf("warning: not enough tile data (%lu bytes)\n",
-              (unsigned long) curoff - dec->curtileendoff);
-        }
-
-    }
-
-    if (tile->numparts > 0 && tile->partno == tile->numparts - 1) {
-        if (jpc_dec_tiledecode(dec, tile)) {
-            return -1;
-        }
-        jpc_dec_tilefini(dec, tile);
-    }
-
-    dec->curtile = 0;
-
-    /* Increment the expected tile-part number. */
-    ++tile->partno;
-
-    /* We should expect to encounter a SOT marker segment next. */
-    dec->state = JPC_TPHSOT;
-
-    return 0;
-}
-
-static int jpc_dec_tileinit(jpc_dec_t *dec, jpc_dec_tile_t *tile)
-{
-    jpc_dec_tcomp_t *tcomp;
-    int compno;
-    int rlvlno;
-    jpc_dec_rlvl_t *rlvl;
-    jpc_dec_band_t *band;
-    jpc_dec_prc_t *prc;
-    int bndno;
-    jpc_tsfb_band_t *bnd;
-    int bandno;
-    jpc_dec_ccp_t *ccp;
-    int prccnt;
-    jpc_dec_cblk_t *cblk;
-    int cblkcnt;
-    uint_fast32_t tlprcxstart;
-    uint_fast32_t tlprcystart;
-    uint_fast32_t brprcxend;
-    uint_fast32_t brprcyend;
-    uint_fast32_t tlcbgxstart;
-    uint_fast32_t tlcbgystart;
-    uint_fast32_t brcbgxend;
-    uint_fast32_t brcbgyend;
-    uint_fast32_t cbgxstart;
-    uint_fast32_t cbgystart;
-    uint_fast32_t cbgxend;
-    uint_fast32_t cbgyend;
-    uint_fast32_t tlcblkxstart;
-    uint_fast32_t tlcblkystart;
-    uint_fast32_t brcblkxend;
-    uint_fast32_t brcblkyend;
-    uint_fast32_t cblkxstart;
-    uint_fast32_t cblkystart;
-    uint_fast32_t cblkxend;
-    uint_fast32_t cblkyend;
-    uint_fast32_t tmpxstart;
-    uint_fast32_t tmpystart;
-    uint_fast32_t tmpxend;
-    uint_fast32_t tmpyend;
-    jpc_dec_cp_t *cp;
-    jpc_tsfb_band_t bnds[64];
-    jpc_pchg_t *pchg;
-    int pchgno;
-    jpc_dec_cmpt_t *cmpt;
-
-    cp = tile->cp;
-    tile->realmode = 0;
-    if (cp->mctid == JPC_MCT_ICT) {
-        tile->realmode = 1;
-    }
-
-    for (compno = 0, tcomp = tile->tcomps, cmpt = dec->cmpts; compno <
-      dec->numcomps; ++compno, ++tcomp, ++cmpt) {
-        ccp = &tile->cp->ccps[compno];
-        if (ccp->qmfbid == JPC_COX_INS) {
-            tile->realmode = 1;
-        }
-        tcomp->numrlvls = ccp->numrlvls;
-        if (!(tcomp->rlvls = jas_malloc(tcomp->numrlvls *
-          sizeof(jpc_dec_rlvl_t)))) {
-            return -1;
-        }
-        if (!(tcomp->data = jas_seq2d_create(JPC_CEILDIV(tile->xstart,
-          cmpt->hstep), JPC_CEILDIV(tile->ystart, cmpt->vstep),
-          JPC_CEILDIV(tile->xend, cmpt->hstep), JPC_CEILDIV(tile->yend,
-          cmpt->vstep)))) {
-            return -1;
-        }
-        if (!(tcomp->tsfb = jpc_cod_gettsfb(ccp->qmfbid,
-          tcomp->numrlvls - 1))) {
-            return -1;
-        }
-{
-    jpc_tsfb_getbands(tcomp->tsfb, jas_seq2d_xstart(tcomp->data), jas_seq2d_ystart(tcomp->data), jas_seq2d_xend(tcomp->data), jas_seq2d_yend(tcomp->data), bnds);
-}
-        for (rlvlno = 0, rlvl = tcomp->rlvls; rlvlno < tcomp->numrlvls;
-          ++rlvlno, ++rlvl) {
-rlvl->bands = 0;
-            rlvl->xstart = JPC_CEILDIVPOW2(tcomp->xstart,
-              tcomp->numrlvls - 1 - rlvlno);
-            rlvl->ystart = JPC_CEILDIVPOW2(tcomp->ystart,
-              tcomp->numrlvls - 1 - rlvlno);
-            rlvl->xend = JPC_CEILDIVPOW2(tcomp->xend,
-              tcomp->numrlvls - 1 - rlvlno);
-            rlvl->yend = JPC_CEILDIVPOW2(tcomp->yend,
-              tcomp->numrlvls - 1 - rlvlno);
-            rlvl->prcwidthexpn = ccp->prcwidthexpns[rlvlno];
-            rlvl->prcheightexpn = ccp->prcheightexpns[rlvlno];
-            tlprcxstart = JPC_FLOORDIVPOW2(rlvl->xstart,
-              rlvl->prcwidthexpn) << rlvl->prcwidthexpn;
-            tlprcystart = JPC_FLOORDIVPOW2(rlvl->ystart,
-              rlvl->prcheightexpn) << rlvl->prcheightexpn;
-            brprcxend = JPC_CEILDIVPOW2(rlvl->xend,
-              rlvl->prcwidthexpn) << rlvl->prcwidthexpn;
-            brprcyend = JPC_CEILDIVPOW2(rlvl->yend,
-              rlvl->prcheightexpn) << rlvl->prcheightexpn;
-            rlvl->numhprcs = (brprcxend - tlprcxstart) >>
-              rlvl->prcwidthexpn;
-            rlvl->numvprcs = (brprcyend - tlprcystart) >>
-              rlvl->prcheightexpn;
-            rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
-
-            if (rlvl->xstart >= rlvl->xend || rlvl->ystart >= rlvl->yend) {
-                rlvl->bands = 0;
-                rlvl->numprcs = 0;
-                rlvl->numhprcs = 0;
-                rlvl->numvprcs = 0;
-                continue;
-            }
-            if (!rlvlno) {
-                tlcbgxstart = tlprcxstart;
-                tlcbgystart = tlprcystart;
-                brcbgxend = brprcxend;
-                brcbgyend = brprcyend;
-                rlvl->cbgwidthexpn = rlvl->prcwidthexpn;
-                rlvl->cbgheightexpn = rlvl->prcheightexpn;
-            } else {
-                tlcbgxstart = JPC_CEILDIVPOW2(tlprcxstart, 1);
-                tlcbgystart = JPC_CEILDIVPOW2(tlprcystart, 1);
-                brcbgxend = JPC_CEILDIVPOW2(brprcxend, 1);
-                brcbgyend = JPC_CEILDIVPOW2(brprcyend, 1);
-                rlvl->cbgwidthexpn = rlvl->prcwidthexpn - 1;
-                rlvl->cbgheightexpn = rlvl->prcheightexpn - 1;
-            }
-            rlvl->cblkwidthexpn = JAS_MIN(ccp->cblkwidthexpn,
-              rlvl->cbgwidthexpn);
-            rlvl->cblkheightexpn = JAS_MIN(ccp->cblkheightexpn,
-              rlvl->cbgheightexpn);
-
-            rlvl->numbands = (!rlvlno) ? 1 : 3;
-            if (!(rlvl->bands = jas_malloc(rlvl->numbands *
-              sizeof(jpc_dec_band_t)))) {
-                return -1;
-            }
-            for (bandno = 0, band = rlvl->bands;
-              bandno < rlvl->numbands; ++bandno, ++band) {
-                bndno = (!rlvlno) ? 0 : (3 * (rlvlno - 1) +
-                  bandno + 1);
-                bnd = &bnds[bndno];
-
-                band->orient = bnd->orient;
-                band->stepsize = ccp->stepsizes[bndno];
-                band->analgain = JPC_NOMINALGAIN(ccp->qmfbid,
-                  tcomp->numrlvls - 1, rlvlno, band->orient);
-                band->absstepsize = jpc_calcabsstepsize(band->stepsize,
-                  cmpt->prec + band->analgain);
-                band->numbps = ccp->numguardbits +
-                  JPC_QCX_GETEXPN(band->stepsize) - 1;
-                band->roishift = (ccp->roishift + band->numbps >= JPC_PREC) ?
-                  (JPC_PREC - 1 - band->numbps) : ccp->roishift;
-                band->data = 0;
-                band->prcs = 0;
-                if (bnd->xstart == bnd->xend || bnd->ystart == bnd->yend) {
-                    continue;
-                }
-                if (!(band->data = jas_seq2d_create(0, 0, 0, 0))) {
-                    return -1;
-                }
-                jas_seq2d_bindsub(band->data, tcomp->data, bnd->locxstart, bnd->locystart, bnd->locxend, bnd->locyend);
-                jas_seq2d_setshift(band->data, bnd->xstart, bnd->ystart);
-
-                assert(rlvl->numprcs);
-
-                if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_dec_prc_t)))) {
-                    return -1;
-                }
-
-/************************************************/
-    cbgxstart = tlcbgxstart;
-    cbgystart = tlcbgystart;
-    for (prccnt = rlvl->numprcs, prc = band->prcs;
-      prccnt > 0; --prccnt, ++prc) {
-        cbgxend = cbgxstart + (1 << rlvl->cbgwidthexpn);
-        cbgyend = cbgystart + (1 << rlvl->cbgheightexpn);
-        prc->xstart = JAS_MAX(cbgxstart, JAS_CAST(uint_fast32_t, jas_seq2d_xstart(band->data)));
-        prc->ystart = JAS_MAX(cbgystart, JAS_CAST(uint_fast32_t, jas_seq2d_ystart(band->data)));
-        prc->xend = JAS_MIN(cbgxend, JAS_CAST(uint_fast32_t, jas_seq2d_xend(band->data)));
-        prc->yend = JAS_MIN(cbgyend, JAS_CAST(uint_fast32_t, jas_seq2d_yend(band->data)));
-        if (prc->xend > prc->xstart && prc->yend > prc->ystart) {
-            tlcblkxstart = JPC_FLOORDIVPOW2(prc->xstart,
-              rlvl->cblkwidthexpn) << rlvl->cblkwidthexpn;
-            tlcblkystart = JPC_FLOORDIVPOW2(prc->ystart,
-              rlvl->cblkheightexpn) << rlvl->cblkheightexpn;
-            brcblkxend = JPC_CEILDIVPOW2(prc->xend,
-              rlvl->cblkwidthexpn) << rlvl->cblkwidthexpn;
-            brcblkyend = JPC_CEILDIVPOW2(prc->yend,
-              rlvl->cblkheightexpn) << rlvl->cblkheightexpn;
-            prc->numhcblks = (brcblkxend - tlcblkxstart) >>
-              rlvl->cblkwidthexpn;
-            prc->numvcblks = (brcblkyend - tlcblkystart) >>
-              rlvl->cblkheightexpn;
-            prc->numcblks = prc->numhcblks * prc->numvcblks;
-            assert(prc->numcblks > 0);
-
-            if (!(prc->incltagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
-                return -1;
-            }
-            if (!(prc->numimsbstagtree = jpc_tagtree_create(prc->numhcblks, prc->numvcblks))) {
-                return -1;
-            }
-            if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_dec_cblk_t)))) {
-                return -1;
-            }
-
-            cblkxstart = cbgxstart;
-            cblkystart = cbgystart;
-            for (cblkcnt = prc->numcblks, cblk = prc->cblks; cblkcnt > 0;) {
-                cblkxend = cblkxstart + (1 << rlvl->cblkwidthexpn);
-                cblkyend = cblkystart + (1 << rlvl->cblkheightexpn);
-                tmpxstart = JAS_MAX(cblkxstart, prc->xstart);
-                tmpystart = JAS_MAX(cblkystart, prc->ystart);
-                tmpxend = JAS_MIN(cblkxend, prc->xend);
-                tmpyend = JAS_MIN(cblkyend, prc->yend);
-                if (tmpxend > tmpxstart && tmpyend > tmpystart) {
-                    cblk->firstpassno = -1;
-                    cblk->mqdec = 0;
-                    cblk->nulldec = 0;
-                    cblk->flags = 0;
-                    cblk->numpasses = 0;
-                    cblk->segs.head = 0;
-                    cblk->segs.tail = 0;
-                    cblk->curseg = 0;
-                    cblk->numimsbs = 0;
-                    cblk->numlenbits = 3;
-                    cblk->flags = 0;
-                    if (!(cblk->data = jas_seq2d_create(0, 0, 0, 0))) {
-                        return -1;
-                    }
-                    jas_seq2d_bindsub(cblk->data, band->data, tmpxstart, tmpystart, tmpxend, tmpyend);
-                    ++cblk;
-                    --cblkcnt;
-                }
-                cblkxstart += 1 << rlvl->cblkwidthexpn;
-                if (cblkxstart >= cbgxend) {
-                    cblkxstart = cbgxstart;
-                    cblkystart += 1 << rlvl->cblkheightexpn;
-                }
-            }
-
-        } else {
-            prc->cblks = 0;
-            prc->incltagtree = 0;
-            prc->numimsbstagtree = 0;
-        }
-        cbgxstart += 1 << rlvl->cbgwidthexpn;
-        if (cbgxstart >= brcbgxend) {
-            cbgxstart = tlcbgxstart;
-            cbgystart += 1 << rlvl->cbgheightexpn;
-        }
-
-    }
-/********************************************/
-            }
-        }
-    }
-
-if (!(tile->pi = jpc_dec_pi_create(dec, tile)))
-{
-    return -1;
-}
-
-    for (pchgno = 0; pchgno < jpc_pchglist_numpchgs(tile->cp->pchglist);
-      ++pchgno) {
-        pchg = jpc_pchg_copy(jpc_pchglist_get(tile->cp->pchglist, pchgno));
-        assert(pchg);
-        jpc_pi_addpchg(tile->pi, pchg);
-    }
-    jpc_pi_init(tile->pi);
-
-    return 0;
-}
-
-static int jpc_dec_tilefini(jpc_dec_t *dec, jpc_dec_tile_t *tile)
-{
-    jpc_dec_tcomp_t *tcomp;
-    int compno;
-    int bandno;
-    int rlvlno;
-    jpc_dec_band_t *band;
-    jpc_dec_rlvl_t *rlvl;
-    int prcno;
-    jpc_dec_prc_t *prc;
-    jpc_dec_seg_t *seg;
-    jpc_dec_cblk_t *cblk;
-    int cblkno;
-
-if (tile->tcomps) {
-
-    for (compno = 0, tcomp = tile->tcomps; compno < dec->numcomps;
-      ++compno, ++tcomp) {
-        for (rlvlno = 0, rlvl = tcomp->rlvls; rlvlno < tcomp->numrlvls;
-          ++rlvlno, ++rlvl) {
-if (!rlvl->bands) {
-    continue;
-}
-            for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands; ++bandno, ++band) {
-if (band->prcs) {
-                for (prcno = 0, prc = band->prcs; prcno <
-                  rlvl->numprcs; ++prcno, ++prc) {
-if (!prc->cblks) {
-    continue;
-}
-                    for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks; ++cblkno, ++cblk) {
-
-    while (cblk->segs.head) {
-        seg = cblk->segs.head;
-        jpc_seglist_remove(&cblk->segs, seg);
-        jpc_seg_destroy(seg);
-    }
-    jas_matrix_destroy(cblk->data);
-    if (cblk->mqdec) {
-        jpc_mqdec_destroy(cblk->mqdec);
-    }
-    if (cblk->nulldec) {
-        jpc_bitstream_close(cblk->nulldec);
-    }
-    if (cblk->flags) {
-        jas_matrix_destroy(cblk->flags);
-    }
-                    }
-                    if (prc->incltagtree) {
-                        jpc_tagtree_destroy(prc->incltagtree);
-                    }
-                    if (prc->numimsbstagtree) {
-                        jpc_tagtree_destroy(prc->numimsbstagtree);
-                    }
-                    if (prc->cblks) {
-                        jas_free(prc->cblks);
-                    }
-                }
-}
-                if (band->data) {
-                    jas_matrix_destroy(band->data);
-                }
-                if (band->prcs) {
-                    jas_free(band->prcs);
-                }
-            }
-            if (rlvl->bands) {
-                jas_free(rlvl->bands);
-            }
-        }
-        if (tcomp->rlvls) {
-            jas_free(tcomp->rlvls);
-        }
-        if (tcomp->data) {
-            jas_matrix_destroy(tcomp->data);
-        }
-        if (tcomp->tsfb) {
-            jpc_tsfb_destroy(tcomp->tsfb);
-        }
-    }
-}
-    if (tile->cp) {
-        jpc_dec_cp_destroy(tile->cp);
-        tile->cp = 0;
-    }
-    if (tile->tcomps) {
-        jas_free(tile->tcomps);
-        tile->tcomps = 0;
-    }
-    if (tile->pi) {
-        jpc_pi_destroy(tile->pi);
-        tile->pi = 0;
-    }
-    if (tile->pkthdrstream) {
-        jas_stream_close(tile->pkthdrstream);
-        tile->pkthdrstream = 0;
-    }
-    if (tile->pptstab) {
-        jpc_ppxstab_destroy(tile->pptstab);
-        tile->pptstab = 0;
-    }
-
-    tile->state = JPC_TILE_DONE;
-
-    return 0;
-}
-
-static int jpc_dec_tiledecode(jpc_dec_t *dec, jpc_dec_tile_t *tile)
-{
-    int i;
-    int j;
-    jpc_dec_tcomp_t *tcomp;
-    jpc_dec_rlvl_t *rlvl;
-    jpc_dec_band_t *band;
-    int compno;
-    int rlvlno;
-    int bandno;
-    int adjust;
-    int v;
-    jpc_dec_ccp_t *ccp;
-    jpc_dec_cmpt_t *cmpt;
-
-    if (jpc_dec_decodecblks(dec, tile)) {
-        jas_eprintf("jpc_dec_decodecblks failed\n");
-        return -1;
-    }
-
-    /* Perform dequantization. */
-    for (compno = 0, tcomp = tile->tcomps; compno < dec->numcomps;
-      ++compno, ++tcomp) {
-        ccp = &tile->cp->ccps[compno];
-        for (rlvlno = 0, rlvl = tcomp->rlvls; rlvlno < tcomp->numrlvls;
-          ++rlvlno, ++rlvl) {
-            if (!rlvl->bands) {
-                continue;
-            }
-            for (bandno = 0, band = rlvl->bands;
-              bandno < rlvl->numbands; ++bandno, ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                jpc_undo_roi(band->data, band->roishift, ccp->roishift -
-                  band->roishift, band->numbps);
-                if (tile->realmode) {
-                    jas_matrix_asl(band->data, JPC_FIX_FRACBITS);
-                    jpc_dequantize(band->data, band->absstepsize);
-                }
-
-            }
-        }
-    }
-
-    /* Apply an inverse wavelet transform if necessary. */
-    for (compno = 0, tcomp = tile->tcomps; compno < dec->numcomps;
-      ++compno, ++tcomp) {
-        ccp = &tile->cp->ccps[compno];
-        jpc_tsfb_synthesize(tcomp->tsfb, tcomp->data);
-    }
-
-
-    /* Apply an inverse intercomponent transform if necessary. */
-    switch (tile->cp->mctid) {
-    case JPC_MCT_RCT:
-        assert(dec->numcomps == 3);
-        jpc_irct(tile->tcomps[0].data, tile->tcomps[1].data,
-          tile->tcomps[2].data);
-        break;
-    case JPC_MCT_ICT:
-        assert(dec->numcomps == 3);
-        jpc_iict(tile->tcomps[0].data, tile->tcomps[1].data,
-          tile->tcomps[2].data);
-        break;
-    }
-
-    /* Perform rounding and convert to integer values. */
-    if (tile->realmode) {
-        for (compno = 0, tcomp = tile->tcomps; compno < dec->numcomps;
-          ++compno, ++tcomp) {
-            for (i = 0; i < jas_matrix_numrows(tcomp->data); ++i) {
-                for (j = 0; j < jas_matrix_numcols(tcomp->data); ++j) {
-                    v = jas_matrix_get(tcomp->data, i, j);
-                    v = jpc_fix_round(v);
-                    jas_matrix_set(tcomp->data, i, j, jpc_fixtoint(v));
-                }
-            }
-        }
-    }
-
-    /* Perform level shift. */
-    for (compno = 0, tcomp = tile->tcomps, cmpt = dec->cmpts; compno <
-      dec->numcomps; ++compno, ++tcomp, ++cmpt) {
-        adjust = cmpt->sgnd ? 0 : (1 << (cmpt->prec - 1));
-        for (i = 0; i < jas_matrix_numrows(tcomp->data); ++i) {
-            for (j = 0; j < jas_matrix_numcols(tcomp->data); ++j) {
-                *jas_matrix_getref(tcomp->data, i, j) += adjust;
-            }
-        }
-    }
-
-    /* Perform clipping. */
-    for (compno = 0, tcomp = tile->tcomps, cmpt = dec->cmpts; compno <
-      dec->numcomps; ++compno, ++tcomp, ++cmpt) {
-        jpc_fix_t mn;
-        jpc_fix_t mx;
-        mn = cmpt->sgnd ? (-(1 << (cmpt->prec - 1))) : (0);
-        mx = cmpt->sgnd ? ((1 << (cmpt->prec - 1)) - 1) : ((1 <<
-          cmpt->prec) - 1);
-        jas_matrix_clip(tcomp->data, mn, mx);
-    }
-
-    /* XXX need to free tsfb struct */
-
-    /* Write the data for each component of the image. */
-    for (compno = 0, tcomp = tile->tcomps, cmpt = dec->cmpts; compno <
-      dec->numcomps; ++compno, ++tcomp, ++cmpt) {
-        if (jas_image_writecmpt(dec->image, compno, tcomp->xstart -
-          JPC_CEILDIV(dec->xstart, cmpt->hstep), tcomp->ystart -
-          JPC_CEILDIV(dec->ystart, cmpt->vstep), jas_matrix_numcols(
-          tcomp->data), jas_matrix_numrows(tcomp->data), tcomp->data)) {
-            jas_eprintf("write component failed\n");
-            return -4;
-        }
-    }
-
-    return 0;
-}
-
-static int jpc_dec_process_eoc(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    int tileno;
-    jpc_dec_tile_t *tile;
-
-    /* Eliminate compiler warnings about unused variables. */
-    ms = 0;
-
-    for (tileno = 0, tile = dec->tiles; tileno < dec->numtiles; ++tileno,
-      ++tile) {
-        if (tile->state == JPC_TILE_ACTIVE) {
-            if (jpc_dec_tiledecode(dec, tile)) {
-                return -1;
-            }
-        }
-        jpc_dec_tilefini(dec, tile);
-    }
-
-    /* We are done processing the code stream. */
-    dec->state = JPC_MT;
-
-    return 1;
-}
-
-static int jpc_dec_process_siz(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_siz_t *siz = &ms->parms.siz;
-    int compno;
-    int tileno;
-    jpc_dec_tile_t *tile;
-    jpc_dec_tcomp_t *tcomp;
-    int htileno;
-    int vtileno;
-    jpc_dec_cmpt_t *cmpt;
-
-    dec->xstart = siz->xoff;
-    dec->ystart = siz->yoff;
-    dec->xend = siz->width;
-    dec->yend = siz->height;
-    dec->tilewidth = siz->tilewidth;
-    dec->tileheight = siz->tileheight;
-    dec->tilexoff = siz->tilexoff;
-    dec->tileyoff = siz->tileyoff;
-    dec->numcomps = siz->numcomps;
-    if (!(dec->cp = jpc_dec_cp_create(dec->numcomps))) {
-        return -1;
-    }
-
-    if (!(dec->cmpts = jas_malloc(dec->numcomps * sizeof(jpc_dec_cmpt_t)))) {
-        return -1;
-    }
-
-    for (compno = 0, cmpt = dec->cmpts; compno < dec->numcomps; ++compno,
-      ++cmpt) {
-        cmpt->prec = siz->comps[compno].prec;
-        cmpt->sgnd = siz->comps[compno].sgnd;
-        cmpt->hstep = siz->comps[compno].hsamp;
-        cmpt->vstep = siz->comps[compno].vsamp;
-        cmpt->width = JPC_CEILDIV(dec->xend, cmpt->hstep) -
-          JPC_CEILDIV(dec->xstart, cmpt->hstep);
-        cmpt->height = JPC_CEILDIV(dec->yend, cmpt->vstep) -
-          JPC_CEILDIV(dec->ystart, cmpt->vstep);
-        cmpt->hsubstep = 0;
-        cmpt->vsubstep = 0;
-    }
-
-    dec->image = 0;
-
-    dec->numhtiles = JPC_CEILDIV(dec->xend - dec->tilexoff, dec->tilewidth);
-    dec->numvtiles = JPC_CEILDIV(dec->yend - dec->tileyoff, dec->tileheight);
-    dec->numtiles = dec->numhtiles * dec->numvtiles;
-    if (!(dec->tiles = jas_malloc(dec->numtiles * sizeof(jpc_dec_tile_t)))) {
-        return -1;
-    }
-
-    for (tileno = 0, tile = dec->tiles; tileno < dec->numtiles; ++tileno,
-      ++tile) {
-        htileno = tileno % dec->numhtiles;
-        vtileno = tileno / dec->numhtiles;
-        tile->realmode = 0;
-        tile->state = JPC_TILE_INIT;
-        tile->xstart = JAS_MAX(dec->tilexoff + htileno * dec->tilewidth,
-          dec->xstart);
-        tile->ystart = JAS_MAX(dec->tileyoff + vtileno * dec->tileheight,
-          dec->ystart);
-        tile->xend = JAS_MIN(dec->tilexoff + (htileno + 1) *
-          dec->tilewidth, dec->xend);
-        tile->yend = JAS_MIN(dec->tileyoff + (vtileno + 1) *
-          dec->tileheight, dec->yend);
-        tile->numparts = 0;
-        tile->partno = 0;
-        tile->pkthdrstream = 0;
-        tile->pkthdrstreampos = 0;
-        tile->pptstab = 0;
-        tile->cp = 0;
-        if (!(tile->tcomps = jas_malloc(dec->numcomps *
-          sizeof(jpc_dec_tcomp_t)))) {
-            return -1;
-        }
-        for (compno = 0, cmpt = dec->cmpts, tcomp = tile->tcomps;
-          compno < dec->numcomps; ++compno, ++cmpt, ++tcomp) {
-            tcomp->rlvls = 0;
-            tcomp->data = 0;
-            tcomp->xstart = JPC_CEILDIV(tile->xstart, cmpt->hstep);
-            tcomp->ystart = JPC_CEILDIV(tile->ystart, cmpt->vstep);
-            tcomp->xend = JPC_CEILDIV(tile->xend, cmpt->hstep);
-            tcomp->yend = JPC_CEILDIV(tile->yend, cmpt->vstep);
-            tcomp->tsfb = 0;
-        }
-    }
-
-    dec->pkthdrstreams = 0;
-
-    /* We should expect to encounter other main header marker segments
-      or an SOT marker segment next. */
-    dec->state = JPC_MH;
-
-    return 0;
-}
-
-static int jpc_dec_process_cod(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_cod_t *cod = &ms->parms.cod;
-    jpc_dec_tile_t *tile;
-
-    switch (dec->state) {
-    case JPC_MH:
-        jpc_dec_cp_setfromcod(dec->cp, cod);
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (tile->partno != 0) {
-            return -1;
-        }
-        jpc_dec_cp_setfromcod(tile->cp, cod);
-        break;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_coc(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_coc_t *coc = &ms->parms.coc;
-    jpc_dec_tile_t *tile;
-
-    if (JAS_CAST(int, coc->compno) > dec->numcomps) {
-        jas_eprintf("invalid component number in COC marker segment\n");
-        return -1;
-    }
-    switch (dec->state) {
-    case JPC_MH:
-        jpc_dec_cp_setfromcoc(dec->cp, coc);
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (tile->partno > 0) {
-            return -1;
-        }
-        jpc_dec_cp_setfromcoc(tile->cp, coc);
-        break;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_rgn(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_rgn_t *rgn = &ms->parms.rgn;
-    jpc_dec_tile_t *tile;
-
-    if (JAS_CAST(int, rgn->compno) > dec->numcomps) {
-        jas_eprintf("invalid component number in RGN marker segment\n");
-        return -1;
-    }
-    switch (dec->state) {
-    case JPC_MH:
-        jpc_dec_cp_setfromrgn(dec->cp, rgn);
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (tile->partno > 0) {
-            return -1;
-        }
-        jpc_dec_cp_setfromrgn(tile->cp, rgn);
-        break;
-    }
-
-    return 0;
-}
-
-static int jpc_dec_process_qcd(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_qcd_t *qcd = &ms->parms.qcd;
-    jpc_dec_tile_t *tile;
-
-    switch (dec->state) {
-    case JPC_MH:
-        jpc_dec_cp_setfromqcd(dec->cp, qcd);
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (tile->partno > 0) {
-            return -1;
-        }
-        jpc_dec_cp_setfromqcd(tile->cp, qcd);
-        break;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_qcc(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_qcc_t *qcc = &ms->parms.qcc;
-    jpc_dec_tile_t *tile;
-
-    if (JAS_CAST(int, qcc->compno) > dec->numcomps) {
-        jas_eprintf("invalid component number in QCC marker segment\n");
-        return -1;
-    }
-    switch (dec->state) {
-    case JPC_MH:
-        jpc_dec_cp_setfromqcc(dec->cp, qcc);
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (tile->partno > 0) {
-            return -1;
-        }
-        jpc_dec_cp_setfromqcc(tile->cp, qcc);
-        break;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_poc(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_poc_t *poc = &ms->parms.poc;
-    jpc_dec_tile_t *tile;
-    switch (dec->state) {
-    case JPC_MH:
-        if (jpc_dec_cp_setfrompoc(dec->cp, poc, 1)) {
-            return -1;
-        }
-        break;
-    case JPC_TPH:
-        if (!(tile = dec->curtile)) {
-            return -1;
-        }
-        if (!tile->partno) {
-            if (jpc_dec_cp_setfrompoc(tile->cp, poc, (!tile->partno))) {
-                return -1;
-            }
-        } else {
-            jpc_pi_addpchgfrompoc(tile->pi, poc);
-        }
-        break;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_ppm(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_ppm_t *ppm = &ms->parms.ppm;
-    jpc_ppxstabent_t *ppmstabent;
-
-    if (!dec->ppmstab) {
-        if (!(dec->ppmstab = jpc_ppxstab_create())) {
-            return -1;
-        }
-    }
-
-    if (!(ppmstabent = jpc_ppxstabent_create())) {
-        return -1;
-    }
-    ppmstabent->ind = ppm->ind;
-    ppmstabent->data = ppm->data;
-    ppm->data = 0;
-    ppmstabent->len = ppm->len;
-    if (jpc_ppxstab_insert(dec->ppmstab, ppmstabent)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_ppt(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    jpc_ppt_t *ppt = &ms->parms.ppt;
-    jpc_dec_tile_t *tile;
-    jpc_ppxstabent_t *pptstabent;
-
-    tile = dec->curtile;
-    if (!tile->pptstab) {
-        if (!(tile->pptstab = jpc_ppxstab_create())) {
-            return -1;
-        }
-    }
-    if (!(pptstabent = jpc_ppxstabent_create())) {
-        return -1;
-    }
-    pptstabent->ind = ppt->ind;
-    pptstabent->data = ppt->data;
-    ppt->data = 0;
-    pptstabent->len = ppt->len;
-    if (jpc_ppxstab_insert(tile->pptstab, pptstabent)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_dec_process_com(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    /* Eliminate compiler warnings about unused variables. */
-    dec = 0;
-    ms = 0;
-
-    return 0;
-}
-
-static int jpc_dec_process_unk(jpc_dec_t *dec, jpc_ms_t *ms)
-{
-    /* Eliminate compiler warnings about unused variables. */
-    dec = 0;
-
-    jas_eprintf("warning: ignoring unknown marker segment\n");
-    jpc_ms_dump(ms, stderr);
-    return 0;
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static jpc_dec_cp_t *jpc_dec_cp_create(uint_fast16_t numcomps)
-{
-    jpc_dec_cp_t *cp;
-    jpc_dec_ccp_t *ccp;
-    int compno;
-
-    if (!(cp = jas_malloc(sizeof(jpc_dec_cp_t)))) {
-        return 0;
-    }
-    cp->flags = 0;
-    cp->numcomps = numcomps;
-    cp->prgord = 0;
-    cp->numlyrs = 0;
-    cp->mctid = 0;
-    cp->csty = 0;
-    if (!(cp->ccps = jas_malloc(cp->numcomps * sizeof(jpc_dec_ccp_t)))) {
-        return 0;
-    }
-    if (!(cp->pchglist = jpc_pchglist_create())) {
-        jas_free(cp->ccps);
-        return 0;
-    }
-    for (compno = 0, ccp = cp->ccps; compno < cp->numcomps;
-      ++compno, ++ccp) {
-        ccp->flags = 0;
-        ccp->numrlvls = 0;
-        ccp->cblkwidthexpn = 0;
-        ccp->cblkheightexpn = 0;
-        ccp->qmfbid = 0;
-        ccp->numstepsizes = 0;
-        ccp->numguardbits = 0;
-        ccp->roishift = 0;
-        ccp->cblkctx = 0;
-    }
-    return cp;
-}
-
-static jpc_dec_cp_t *jpc_dec_cp_copy(jpc_dec_cp_t *cp)
-{
-    jpc_dec_cp_t *newcp;
-    jpc_dec_ccp_t *newccp;
-    jpc_dec_ccp_t *ccp;
-    int compno;
-
-    if (!(newcp = jpc_dec_cp_create(cp->numcomps))) {
-        return 0;
-    }
-    newcp->flags = cp->flags;
-    newcp->prgord = cp->prgord;
-    newcp->numlyrs = cp->numlyrs;
-    newcp->mctid = cp->mctid;
-    newcp->csty = cp->csty;
-    jpc_pchglist_destroy(newcp->pchglist);
-    newcp->pchglist = 0;
-    if (!(newcp->pchglist = jpc_pchglist_copy(cp->pchglist))) {
-        jas_free(newcp);
-        return 0;
-    }
-    for (compno = 0, newccp = newcp->ccps, ccp = cp->ccps;
-      compno < cp->numcomps;
-      ++compno, ++newccp, ++ccp) {
-        *newccp = *ccp;
-    }
-    return newcp;
-}
-
-static void jpc_dec_cp_resetflags(jpc_dec_cp_t *cp)
-{
-    int compno;
-    jpc_dec_ccp_t *ccp;
-    cp->flags &= (JPC_CSET | JPC_QSET);
-    for (compno = 0, ccp = cp->ccps; compno < cp->numcomps;
-      ++compno, ++ccp) {
-        ccp->flags = 0;
-    }
-}
-
-static void jpc_dec_cp_destroy(jpc_dec_cp_t *cp)
-{
-    if (cp->ccps) {
-        jas_free(cp->ccps);
-    }
-    if (cp->pchglist) {
-        jpc_pchglist_destroy(cp->pchglist);
-    }
-    jas_free(cp);
-}
-
-static int jpc_dec_cp_isvalid(jpc_dec_cp_t *cp)
-{
-    uint_fast16_t compcnt;
-    jpc_dec_ccp_t *ccp;
-
-    if (!(cp->flags & JPC_CSET) || !(cp->flags & JPC_QSET)) {
-        return 0;
-    }
-    for (compcnt = cp->numcomps, ccp = cp->ccps; compcnt > 0; --compcnt,
-      ++ccp) {
-        /* Is there enough step sizes for the number of bands? */
-        if ((ccp->qsty != JPC_QCX_SIQNT && JAS_CAST(int, ccp->numstepsizes) < 3 *
-          ccp->numrlvls - 2) || (ccp->qsty == JPC_QCX_SIQNT &&
-          ccp->numstepsizes != 1)) {
-            return 0;
-        }
-    }
-    return 1;
-}
-
-static void calcstepsizes(uint_fast16_t refstepsize, int numrlvls,
-  uint_fast16_t *stepsizes)
-{
-    int bandno;
-    int numbands;
-    uint_fast16_t expn;
-    uint_fast16_t mant;
-    expn = JPC_QCX_GETEXPN(refstepsize);
-    mant = JPC_QCX_GETMANT(refstepsize);
-    numbands = 3 * numrlvls - 2;
-    for (bandno = 0; bandno < numbands; ++bandno) {
-        stepsizes[bandno] = JPC_QCX_MANT(mant) | JPC_QCX_EXPN(expn +
-          (numrlvls - 1) - (numrlvls - 1 - ((bandno > 0) ? ((bandno + 2) / 3) : (0))));
-    }
-}
-
-static int jpc_dec_cp_prepare(jpc_dec_cp_t *cp)
-{
-    jpc_dec_ccp_t *ccp;
-    int compno;
-    int i;
-    for (compno = 0, ccp = cp->ccps; compno < cp->numcomps;
-      ++compno, ++ccp) {
-        if (!(ccp->csty & JPC_COX_PRT)) {
-            for (i = 0; i < JPC_MAXRLVLS; ++i) {
-                ccp->prcwidthexpns[i] = 15;
-                ccp->prcheightexpns[i] = 15;
-            }
-        }
-        if (ccp->qsty == JPC_QCX_SIQNT) {
-            calcstepsizes(ccp->stepsizes[0], ccp->numrlvls, ccp->stepsizes);
-        }
-    }
-    return 0;
-}
-
-static int jpc_dec_cp_setfromcod(jpc_dec_cp_t *cp, jpc_cod_t *cod)
-{
-    jpc_dec_ccp_t *ccp;
-    int compno;
-    cp->flags |= JPC_CSET;
-    cp->prgord = cod->prg;
-    if (cod->mctrans) {
-        cp->mctid = (cod->compparms.qmfbid == JPC_COX_INS) ? (JPC_MCT_ICT) : (JPC_MCT_RCT);
-    } else {
-        cp->mctid = JPC_MCT_NONE;
-    }
-    cp->numlyrs = cod->numlyrs;
-    cp->csty = cod->csty & (JPC_COD_SOP | JPC_COD_EPH);
-    for (compno = 0, ccp = cp->ccps; compno < cp->numcomps;
-      ++compno, ++ccp) {
-        jpc_dec_cp_setfromcox(cp, ccp, &cod->compparms, 0);
-    }
-    cp->flags |= JPC_CSET;
-    return 0;
-}
-
-static int jpc_dec_cp_setfromcoc(jpc_dec_cp_t *cp, jpc_coc_t *coc)
-{
-    jpc_dec_cp_setfromcox(cp, &cp->ccps[coc->compno], &coc->compparms, JPC_COC);
-    return 0;
-}
-
-static int jpc_dec_cp_setfromcox(jpc_dec_cp_t *cp, jpc_dec_ccp_t *ccp,
-  jpc_coxcp_t *compparms, int flags)
-{
-    int rlvlno;
-
-    /* Eliminate compiler warnings about unused variables. */
-    cp = 0;
-
-    if ((flags & JPC_COC) || !(ccp->flags & JPC_COC)) {
-        ccp->numrlvls = compparms->numdlvls + 1;
-        ccp->cblkwidthexpn = JPC_COX_GETCBLKSIZEEXPN(
-          compparms->cblkwidthval);
-        ccp->cblkheightexpn = JPC_COX_GETCBLKSIZEEXPN(
-          compparms->cblkheightval);
-        ccp->qmfbid = compparms->qmfbid;
-        ccp->cblkctx = compparms->cblksty;
-        ccp->csty = compparms->csty & JPC_COX_PRT;
-        for (rlvlno = 0; rlvlno < compparms->numrlvls; ++rlvlno) {
-            ccp->prcwidthexpns[rlvlno] =
-              compparms->rlvls[rlvlno].parwidthval;
-            ccp->prcheightexpns[rlvlno] =
-              compparms->rlvls[rlvlno].parheightval;
-        }
-        ccp->flags |= flags | JPC_CSET;
-    }
-    return 0;
-}
-
-static int jpc_dec_cp_setfromqcd(jpc_dec_cp_t *cp, jpc_qcd_t *qcd)
-{
-    int compno;
-    jpc_dec_ccp_t *ccp;
-    for (compno = 0, ccp = cp->ccps; compno < cp->numcomps;
-      ++compno, ++ccp) {
-        jpc_dec_cp_setfromqcx(cp, ccp, &qcd->compparms, 0);
-    }
-    cp->flags |= JPC_QSET;
-    return 0;
-}
-
-static int jpc_dec_cp_setfromqcc(jpc_dec_cp_t *cp, jpc_qcc_t *qcc)
-{
-    return jpc_dec_cp_setfromqcx(cp, &cp->ccps[qcc->compno], &qcc->compparms, JPC_QCC);
-}
-
-static int jpc_dec_cp_setfromqcx(jpc_dec_cp_t *cp, jpc_dec_ccp_t *ccp,
-  jpc_qcxcp_t *compparms, int flags)
-{
-    int bandno;
-
-    /* Eliminate compiler warnings about unused variables. */
-    cp = 0;
-
-    if ((flags & JPC_QCC) || !(ccp->flags & JPC_QCC)) {
-        ccp->flags |= flags | JPC_QSET;
-        for (bandno = 0; bandno < compparms->numstepsizes; ++bandno) {
-            ccp->stepsizes[bandno] = compparms->stepsizes[bandno];
-        }
-        ccp->numstepsizes = compparms->numstepsizes;
-        ccp->numguardbits = compparms->numguard;
-        ccp->qsty = compparms->qntsty;
-    }
-    return 0;
-}
-
-static int jpc_dec_cp_setfromrgn(jpc_dec_cp_t *cp, jpc_rgn_t *rgn)
-{
-    jpc_dec_ccp_t *ccp;
-    ccp = &cp->ccps[rgn->compno];
-    ccp->roishift = rgn->roishift;
-    return 0;
-}
-
-static int jpc_pi_addpchgfrompoc(jpc_pi_t *pi, jpc_poc_t *poc)
-{
-    int pchgno;
-    jpc_pchg_t *pchg;
-    for (pchgno = 0; pchgno < poc->numpchgs; ++pchgno) {
-        if (!(pchg = jpc_pchg_copy(&poc->pchgs[pchgno]))) {
-            return -1;
-        }
-        if (jpc_pchglist_insert(pi->pchglist, -1, pchg)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static int jpc_dec_cp_setfrompoc(jpc_dec_cp_t *cp, jpc_poc_t *poc, int reset)
-{
-    int pchgno;
-    jpc_pchg_t *pchg;
-    if (reset) {
-        while (jpc_pchglist_numpchgs(cp->pchglist) > 0) {
-            pchg = jpc_pchglist_remove(cp->pchglist, 0);
-            jpc_pchg_destroy(pchg);
-        }
-    }
-    for (pchgno = 0; pchgno < poc->numpchgs; ++pchgno) {
-        if (!(pchg = jpc_pchg_copy(&poc->pchgs[pchgno]))) {
-            return -1;
-        }
-        if (jpc_pchglist_insert(cp->pchglist, -1, pchg)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static jpc_fix_t jpc_calcabsstepsize(int stepsize, int numbits)
-{
-    jpc_fix_t absstepsize;
-    int n;
-
-    absstepsize = jpc_inttofix(1);
-    n = JPC_FIX_FRACBITS - 11;
-    absstepsize |= (n >= 0) ? (JPC_QCX_GETMANT(stepsize) << n) :
-      (JPC_QCX_GETMANT(stepsize) >> (-n));
-    n = numbits - JPC_QCX_GETEXPN(stepsize);
-    absstepsize = (n >= 0) ? (absstepsize << n) : (absstepsize >> (-n));
-    return absstepsize;
-}
-
-static void jpc_dequantize(jas_matrix_t *x, jpc_fix_t absstepsize)
-{
-    int i;
-    int j;
-    int t;
-
-    assert(absstepsize >= 0);
-    if (absstepsize == jpc_inttofix(1)) {
-        return;
-    }
-
-    for (i = 0; i < jas_matrix_numrows(x); ++i) {
-        for (j = 0; j < jas_matrix_numcols(x); ++j) {
-            t = jas_matrix_get(x, i, j);
-            if (t) {
-                t = jpc_fix_mul(t, absstepsize);
-            } else {
-                t = 0;
-            }
-            jas_matrix_set(x, i, j, t);
-        }
-    }
-
-}
-
-static void jpc_undo_roi(jas_matrix_t *x, int roishift, int bgshift, int numbps)
-{
-    int i;
-    int j;
-    int thresh;
-    jpc_fix_t val;
-    jpc_fix_t mag;
-    bool warn;
-    uint_fast32_t mask;
-
-    if (roishift == 0 && bgshift == 0) {
-        return;
-    }
-    thresh = 1 << roishift;
-
-    warn = false;
-    for (i = 0; i < jas_matrix_numrows(x); ++i) {
-        for (j = 0; j < jas_matrix_numcols(x); ++j) {
-            val = jas_matrix_get(x, i, j);
-            mag = JAS_ABS(val);
-            if (mag >= thresh) {
-                /* We are dealing with ROI data. */
-                mag >>= roishift;
-                val = (val < 0) ? (-mag) : mag;
-                jas_matrix_set(x, i, j, val);
-            } else {
-                /* We are dealing with non-ROI (i.e., background) data. */
-                mag <<= bgshift;
-                mask = (1 << numbps) - 1;
-                /* Perform a basic sanity check on the sample value. */
-                /* Some implementations write garbage in the unused
-                  most-significant bit planes introduced by ROI shifting.
-                  Here we ensure that any such bits are masked off. */
-                if (mag & (~mask)) {
-                    if (!warn) {
-                        jas_eprintf("warning: possibly corrupt code stream\n");
-                        warn = true;
-                    }
-                    mag &= mask;
-                }
-                val = (val < 0) ? (-mag) : mag;
-                jas_matrix_set(x, i, j, val);
-            }
-        }
-    }
-}
-
-static jpc_dec_t *jpc_dec_create(jpc_dec_importopts_t *impopts, jas_stream_t *in)
-{
-    jpc_dec_t *dec;
-
-    if (!(dec = jas_malloc(sizeof(jpc_dec_t)))) {
-        return 0;
-    }
-
-    dec->image = 0;
-    dec->xstart = 0;
-    dec->ystart = 0;
-    dec->xend = 0;
-    dec->yend = 0;
-    dec->tilewidth = 0;
-    dec->tileheight = 0;
-    dec->tilexoff = 0;
-    dec->tileyoff = 0;
-    dec->numhtiles = 0;
-    dec->numvtiles = 0;
-    dec->numtiles = 0;
-    dec->tiles = 0;
-    dec->curtile = 0;
-    dec->numcomps = 0;
-    dec->in = in;
-    dec->cp = 0;
-    dec->maxlyrs = impopts->maxlyrs;
-    dec->maxpkts = impopts->maxpkts;
-dec->numpkts = 0;
-    dec->ppmseqno = 0;
-    dec->state = 0;
-    dec->cmpts = 0;
-    dec->pkthdrstreams = 0;
-    dec->ppmstab = 0;
-    dec->curtileendoff = 0;
-
-    return dec;
-}
-
-static void jpc_dec_destroy(jpc_dec_t *dec)
-{
-    if (dec->cstate) {
-        jpc_cstate_destroy(dec->cstate);
-    }
-    if (dec->pkthdrstreams) {
-        jpc_streamlist_destroy(dec->pkthdrstreams);
-    }
-    if (dec->image) {
-        jas_image_destroy(dec->image);
-    }
-
-    if (dec->cp) {
-        jpc_dec_cp_destroy(dec->cp);
-    }
-
-    if (dec->cmpts) {
-        jas_free(dec->cmpts);
-    }
-
-    if (dec->tiles) {
-        jas_free(dec->tiles);
-    }
-
-    jas_free(dec);
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-void jpc_seglist_insert(jpc_dec_seglist_t *list, jpc_dec_seg_t *ins, jpc_dec_seg_t *node)
-{
-    jpc_dec_seg_t *prev;
-    jpc_dec_seg_t *next;
-
-    prev = ins;
-    node->prev = prev;
-    next = prev ? (prev->next) : 0;
-    node->prev = prev;
-    node->next = next;
-    if (prev) {
-        prev->next = node;
-    } else {
-        list->head = node;
-    }
-    if (next) {
-        next->prev = node;
-    } else {
-        list->tail = node;
-    }
-}
-
-void jpc_seglist_remove(jpc_dec_seglist_t *list, jpc_dec_seg_t *seg)
-{
-    jpc_dec_seg_t *prev;
-    jpc_dec_seg_t *next;
-
-    prev = seg->prev;
-    next = seg->next;
-    if (prev) {
-        prev->next = next;
-    } else {
-        list->head = next;
-    }
-    if (next) {
-        next->prev = prev;
-    } else {
-        list->tail = prev;
-    }
-    seg->prev = 0;
-    seg->next = 0;
-}
-
-jpc_dec_seg_t *jpc_seg_alloc()
-{
-    jpc_dec_seg_t *seg;
-
-    if (!(seg = jas_malloc(sizeof(jpc_dec_seg_t)))) {
-        return 0;
-    }
-    seg->prev = 0;
-    seg->next = 0;
-    seg->passno = -1;
-    seg->numpasses = 0;
-    seg->maxpasses = 0;
-    seg->type = JPC_SEG_INVALID;
-    seg->stream = 0;
-    seg->cnt = 0;
-    seg->complete = 0;
-    seg->lyrno = -1;
-    return seg;
-}
-
-void jpc_seg_destroy(jpc_dec_seg_t *seg)
-{
-    if (seg->stream) {
-        jas_stream_close(seg->stream);
-    }
-    jas_free(seg);
-}
-
-static int jpc_dec_dump(jpc_dec_t *dec, FILE *out)
-{
-    jpc_dec_tile_t *tile;
-    int tileno;
-    jpc_dec_tcomp_t *tcomp;
-    int compno;
-    jpc_dec_rlvl_t *rlvl;
-    int rlvlno;
-    jpc_dec_band_t *band;
-    int bandno;
-    jpc_dec_prc_t *prc;
-    int prcno;
-    jpc_dec_cblk_t *cblk;
-    int cblkno;
-
-    for (tileno = 0, tile = dec->tiles; tileno < dec->numtiles;
-      ++tileno, ++tile) {
-        for (compno = 0, tcomp = tile->tcomps; compno < dec->numcomps;
-          ++compno, ++tcomp) {
-            for (rlvlno = 0, rlvl = tcomp->rlvls; rlvlno <
-              tcomp->numrlvls; ++rlvlno, ++rlvl) {
-fprintf(out, "RESOLUTION LEVEL %d\n", rlvlno);
-fprintf(out, "xs =%d, ys = %d, xe = %d, ye = %d, w = %d, h = %d\n",
-  rlvl->xstart, rlvl->ystart, rlvl->xend, rlvl->yend, rlvl->xend -
-  rlvl->xstart, rlvl->yend - rlvl->ystart);
-                for (bandno = 0, band = rlvl->bands;
-                  bandno < rlvl->numbands; ++bandno, ++band) {
-fprintf(out, "BAND %d\n", bandno);
-fprintf(out, "xs =%d, ys = %d, xe = %d, ye = %d, w = %d, h = %d\n",
-  jas_seq2d_xstart(band->data), jas_seq2d_ystart(band->data), jas_seq2d_xend(band->data),
-  jas_seq2d_yend(band->data), jas_seq2d_xend(band->data) - jas_seq2d_xstart(band->data),
-  jas_seq2d_yend(band->data) - jas_seq2d_ystart(band->data));
-                    for (prcno = 0, prc = band->prcs;
-                      prcno < rlvl->numprcs; ++prcno,
-                      ++prc) {
-fprintf(out, "CODE BLOCK GROUP %d\n", prcno);
-fprintf(out, "xs =%d, ys = %d, xe = %d, ye = %d, w = %d, h = %d\n",
-  prc->xstart, prc->ystart, prc->xend, prc->yend, prc->xend -
-  prc->xstart, prc->yend - prc->ystart);
-                        for (cblkno = 0, cblk =
-                          prc->cblks; cblkno <
-                          prc->numcblks; ++cblkno,
-                          ++cblk) {
-fprintf(out, "CODE BLOCK %d\n", cblkno);
-fprintf(out, "xs =%d, ys = %d, xe = %d, ye = %d, w = %d, h = %d\n",
-  jas_seq2d_xstart(cblk->data), jas_seq2d_ystart(cblk->data), jas_seq2d_xend(cblk->data),
-  jas_seq2d_yend(cblk->data), jas_seq2d_xend(cblk->data) - jas_seq2d_xstart(cblk->data),
-  jas_seq2d_yend(cblk->data) - jas_seq2d_ystart(cblk->data));
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    return 0;
-}
-
-jpc_streamlist_t *jpc_streamlist_create()
-{
-    jpc_streamlist_t *streamlist;
-    int i;
-
-    if (!(streamlist = jas_malloc(sizeof(jpc_streamlist_t)))) {
-        return 0;
-    }
-    streamlist->numstreams = 0;
-    streamlist->maxstreams = 100;
-    if (!(streamlist->streams = jas_malloc(streamlist->maxstreams *
-      sizeof(jas_stream_t *)))) {
-        jas_free(streamlist);
-        return 0;
-    }
-    for (i = 0; i < streamlist->maxstreams; ++i) {
-        streamlist->streams[i] = 0;
-    }
-    return streamlist;
-}
-
-int jpc_streamlist_insert(jpc_streamlist_t *streamlist, int streamno,
-  jas_stream_t *stream)
-{
-    jas_stream_t **newstreams;
-    int newmaxstreams;
-    int i;
-    /* Grow the array of streams if necessary. */
-    if (streamlist->numstreams >= streamlist->maxstreams) {
-        newmaxstreams = streamlist->maxstreams + 1024;
-        if (!(newstreams = jas_realloc(streamlist->streams,
-          (newmaxstreams + 1024) * sizeof(jas_stream_t *)))) {
-            return -1;
-        }
-        for (i = streamlist->numstreams; i < streamlist->maxstreams; ++i) {
-            streamlist->streams[i] = 0;
-        }
-        streamlist->maxstreams = newmaxstreams;
-        streamlist->streams = newstreams;
-    }
-    if (streamno != streamlist->numstreams) {
-        /* Can only handle insertion at start of list. */
-        return -1;
-    }
-    streamlist->streams[streamno] = stream;
-    ++streamlist->numstreams;
-    return 0;
-}
-
-jas_stream_t *jpc_streamlist_remove(jpc_streamlist_t *streamlist, int streamno)
-{
-    jas_stream_t *stream;
-    int i;
-    if (streamno >= streamlist->numstreams) {
-        abort();
-    }
-    stream = streamlist->streams[streamno];
-    for (i = streamno + 1; i < streamlist->numstreams; ++i) {
-        streamlist->streams[i - 1] = streamlist->streams[i];
-    }
-    --streamlist->numstreams;
-    return stream;
-}
-
-void jpc_streamlist_destroy(jpc_streamlist_t *streamlist)
-{
-    int streamno;
-    if (streamlist->streams) {
-        for (streamno = 0; streamno < streamlist->numstreams;
-          ++streamno) {
-            jas_stream_close(streamlist->streams[streamno]);
-        }
-        jas_free(streamlist->streams);
-    }
-    jas_free(streamlist);
-}
-
-jas_stream_t *jpc_streamlist_get(jpc_streamlist_t *streamlist, int streamno)
-{
-    assert(streamno < streamlist->numstreams);
-    return streamlist->streams[streamno];
-}
-
-int jpc_streamlist_numstreams(jpc_streamlist_t *streamlist)
-{
-    return streamlist->numstreams;
-}
-
-jpc_ppxstab_t *jpc_ppxstab_create()
-{
-    jpc_ppxstab_t *tab;
-
-    if (!(tab = jas_malloc(sizeof(jpc_ppxstab_t)))) {
-        return 0;
-    }
-    tab->numents = 0;
-    tab->maxents = 0;
-    tab->ents = 0;
-    return tab;
-}
-
-void jpc_ppxstab_destroy(jpc_ppxstab_t *tab)
-{
-    int i;
-    for (i = 0; i < tab->numents; ++i) {
-        jpc_ppxstabent_destroy(tab->ents[i]);
-    }
-    if (tab->ents) {
-        jas_free(tab->ents);
-    }
-    jas_free(tab);
-}
-
-int jpc_ppxstab_grow(jpc_ppxstab_t *tab, int maxents)
-{
-    jpc_ppxstabent_t **newents;
-    if (tab->maxents < maxents) {
-        newents = (tab->ents) ? jas_realloc(tab->ents, maxents *
-          sizeof(jpc_ppxstabent_t *)) : jas_malloc(maxents * sizeof(jpc_ppxstabent_t *));
-        if (!newents) {
-            return -1;
-        }
-        tab->ents = newents;
-        tab->maxents = maxents;
-    }
-    return 0;
-}
-
-int jpc_ppxstab_insert(jpc_ppxstab_t *tab, jpc_ppxstabent_t *ent)
-{
-    int inspt;
-    int i;
-
-    for (i = 0; i < tab->numents; ++i) {
-        if (tab->ents[i]->ind > ent->ind) {
-            break;
-        }
-    }
-    inspt = i;
-
-    if (tab->numents >= tab->maxents) {
-        if (jpc_ppxstab_grow(tab, tab->maxents + 128)) {
-            return -1;
-        }
-    }
-
-    for (i = tab->numents; i > inspt; --i) {
-        tab->ents[i] = tab->ents[i - 1];
-    }
-    tab->ents[i] = ent;
-    ++tab->numents;
-
-    return 0;
-}
-
-jpc_streamlist_t *jpc_ppmstabtostreams(jpc_ppxstab_t *tab)
-{
-    jpc_streamlist_t *streams;
-    uchar *dataptr;
-    uint_fast32_t datacnt;
-    uint_fast32_t tpcnt;
-    jpc_ppxstabent_t *ent;
-    int entno;
-    jas_stream_t *stream;
-    int n;
-
-    if (!(streams = jpc_streamlist_create())) {
-        goto error;
-    }
-
-    if (!tab->numents) {
-        return streams;
-    }
-
-    entno = 0;
-    ent = tab->ents[entno];
-    dataptr = ent->data;
-    datacnt = ent->len;
-    for (;;) {
-
-        /* Get the length of the packet header data for the current
-          tile-part. */
-        if (datacnt < 4) {
-            goto error;
-        }
-        if (!(stream = jas_stream_memopen(0, 0))) {
-            goto error;
-        }
-        if (jpc_streamlist_insert(streams, jpc_streamlist_numstreams(streams),
-          stream)) {
-            goto error;
-        }
-        tpcnt = (dataptr[0] << 24) | (dataptr[1] << 16) | (dataptr[2] << 8)
-          | dataptr[3];
-        datacnt -= 4;
-        dataptr += 4;
-
-        /* Get the packet header data for the current tile-part. */
-        while (tpcnt) {
-            if (!datacnt) {
-                if (++entno >= tab->numents) {
-                    goto error;
-                }
-                ent = tab->ents[entno];
-                dataptr = ent->data;
-                datacnt = ent->len;
-            }
-            n = JAS_MIN(tpcnt, datacnt);
-            if (jas_stream_write(stream, dataptr, n) != n) {
-                goto error;
-            }
-            tpcnt -= n;
-            dataptr += n;
-            datacnt -= n;
-        }
-        jas_stream_rewind(stream);
-        if (!datacnt) {
-            if (++entno >= tab->numents) {
-                break;
-            }
-            ent = tab->ents[entno];
-            dataptr = ent->data;
-            datacnt = ent->len;
-        }
-    }
-
-    return streams;
-
-error:
-    jpc_streamlist_destroy(streams);
-    return 0;
-}
-
-int jpc_pptstabwrite(jas_stream_t *out, jpc_ppxstab_t *tab)
-{
-    int i;
-    jpc_ppxstabent_t *ent;
-    for (i = 0; i < tab->numents; ++i) {
-        ent = tab->ents[i];
-        if (jas_stream_write(out, ent->data, ent->len) != JAS_CAST(int, ent->len)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-jpc_ppxstabent_t *jpc_ppxstabent_create()
-{
-    jpc_ppxstabent_t *ent;
-    if (!(ent = jas_malloc(sizeof(jpc_ppxstabent_t)))) {
-        return 0;
-    }
-    ent->data = 0;
-    ent->len = 0;
-    ent->ind = 0;
-    return ent;
-}
-
-void jpc_ppxstabent_destroy(jpc_ppxstabent_t *ent)
-{
-    if (ent->data) {
-        jas_free(ent->data);
-    }
-    jas_free(ent);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.h
deleted file mode 100644
index ca73e4c..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_dec.h
+++ /dev/null
@@ -1,696 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JPEG-2000 Decoder
- *
- * $Id$
- */
-
-#ifndef JPC_DEC_H
-#define JPC_DEC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_stream.h"
-
-#include "jpc_tsfb.h"
-#include "jpc_bs.h"
-#include "jpc_tagtree.h"
-#include "jpc_cs.h"
-#include "jpc_cod.h"
-#include "jpc_mqdec.h"
-#include "jpc_t2cod.h"
-
-/******************************************************************************\
-* Below are some ugly warts necessary to support packed packet headers.
-\******************************************************************************/
-
-/* PPM/PPT marker segment table entry. */
-
-typedef struct {
-
-    /* The index for this entry. */
-    uint_fast16_t ind;
-
-    /* The data length. */
-    uint_fast32_t len;
-
-    /* The data. */
-    uchar *data;
-
-} jpc_ppxstabent_t;
-
-/* PPM/PPT marker segment table. */
-
-typedef struct {
-
-    /* The number of entries. */
-    int numents;
-
-    /* The maximum number of entries (i.e., the allocated size of the array
-      below). */
-    int maxents;
-
-    /* The table entries. */
-    jpc_ppxstabent_t **ents;
-
-} jpc_ppxstab_t;
-
-/* Stream list class. */
-
-typedef struct {
-
-    /* The number of streams in this list. */
-    int numstreams;
-
-    /* The maximum number of streams that can be accomodated without
-      growing the streams array. */
-    int maxstreams;
-
-    /* The streams. */
-    jas_stream_t **streams;
-
-} jpc_streamlist_t;
-
-/******************************************************************************\
-* Coding parameters class.
-\******************************************************************************/
-
-/* Per-component coding parameters. */
-
-typedef struct {
-
-    /* How were various coding parameters set? */
-    int flags;
-
-    /* Per-component coding style parameters (e.g., explicit precinct sizes) */
-    uint_fast8_t csty;
-
-    /* The number of resolution levels. */
-    uint_fast8_t numrlvls;
-
-    /* The code block width exponent. */
-    uint_fast8_t cblkwidthexpn;
-
-    /* The code block height exponent. */
-    uint_fast8_t cblkheightexpn;
-
-    /* The QMFB ID. */
-    uint_fast8_t qmfbid;
-
-    /* The quantization style. */
-    uint_fast8_t qsty;
-
-    /* The number of quantizer step sizes. */
-    uint_fast16_t numstepsizes;
-
-    /* The step sizes. */
-    uint_fast16_t stepsizes[3 * JPC_MAXRLVLS + 1];
-
-    /* The number of guard bits. */
-    uint_fast8_t numguardbits;
-
-    /* The ROI shift value. */
-    uint_fast8_t roishift;
-
-    /* The code block parameters. */
-    uint_fast8_t cblkctx;
-
-    /* The precinct width exponents. */
-    uint_fast8_t prcwidthexpns[JPC_MAXRLVLS];
-
-    /* The precinct height exponents. */
-    uint_fast8_t prcheightexpns[JPC_MAXRLVLS];
-
-} jpc_dec_ccp_t;
-
-/* Coding paramters. */
-
-typedef struct {
-
-    /* How were these coding parameters set? */
-    int flags;
-
-    /* Progression change list. */
-    jpc_pchglist_t *pchglist;
-
-    /* Progression order. */
-    uint_fast8_t prgord;
-
-    /* The number of layers. */
-    uint_fast16_t numlyrs;
-
-    /* The MCT ID. */
-    uint_fast8_t mctid;
-
-    /* The coding style parameters (e.g., SOP, EPH). */
-    uint_fast8_t csty;
-
-    /* The number of components. */
-    int numcomps;
-
-    /* The per-component coding parameters. */
-    jpc_dec_ccp_t *ccps;
-
-} jpc_dec_cp_t;
-
-/******************************************************************************\
-* Decoder class.
-\******************************************************************************/
-
-/* Decoder per-segment state information. */
-
-typedef struct jpc_dec_seg_s {
-
-    /* The next segment in the list. */
-    struct jpc_dec_seg_s *next;
-
-    /* The previous segment in the list. */
-    struct jpc_dec_seg_s *prev;
-
-    /* The starting pass number for this segment. */
-    int passno;
-
-    /* The number of passes in this segment. */
-    int numpasses;
-
-    /* The maximum number of passes in this segment. */
-    int maxpasses;
-
-    /* The type of data in this segment (i.e., MQ or raw). */
-    int type;
-
-    /* A stream containing the data for this segment. */
-    jas_stream_t *stream;
-
-    /* The number of bytes destined for this segment from the packet
-      currently being decoded. */
-    int cnt;
-
-    /* A flag indicating if this segment has been terminated. */
-    int complete;
-
-    /* The layer number to which this segment belongs. */
-    /* If the segment spans multiple layers, then the largest layer number
-      spanned by the segment is used. */
-    int lyrno;
-
-} jpc_dec_seg_t;
-
-/* Decoder segment list. */
-
-typedef struct {
-
-    /* The first entry in the list. */
-    jpc_dec_seg_t *head;
-
-    /* The last entry in the list. */
-    jpc_dec_seg_t *tail;
-
-} jpc_dec_seglist_t;
-
-/* Decoder per-code-block state information. */
-
-typedef struct {
-
-    /* The number of passes. */
-    int numpasses;
-
-    /* A list of segments that still need to be decoded. */
-    jpc_dec_seglist_t segs;
-
-    /* The first incomplete/partial segment. */
-    jpc_dec_seg_t *curseg;
-
-    /* The number of leading insignificant bit planes for this code block. */
-    int numimsbs;
-
-    /* The number of bits used to encode pass data lengths. */
-    int numlenbits;
-
-    /* The first pass number containing data for this code block. */
-    int firstpassno;
-
-    /* The MQ decoder. */
-    jpc_mqdec_t *mqdec;
-
-    /* The raw bit stream decoder. */
-    jpc_bitstream_t *nulldec;
-
-    /* The per-sample state information for this code block. */
-    jas_matrix_t *flags;
-
-    /* The sample data associated with this code block. */
-    jas_matrix_t *data;
-
-} jpc_dec_cblk_t;
-
-/* Decoder per-code-block-group state information. */
-
-typedef struct {
-
-    /* The x-coordinate of the top-left corner of the precinct. */
-    uint_fast32_t xstart;
-
-    /* The y-coordinate of the top-left corner of the precinct. */
-    uint_fast32_t ystart;
-
-    /* The x-coordinate of the bottom-right corner of the precinct
-      (plus one). */
-    uint_fast32_t xend;
-
-    /* The y-coordinate of the bottom-right corner of the precinct
-      (plus one). */
-    uint_fast32_t yend;
-
-    /* The number of code blocks spanning this precinct in the horizontal
-      direction. */
-    int numhcblks;
-
-    /* The number of code blocks spanning this precinct in the vertical
-      direction. */
-    int numvcblks;
-
-    /* The total number of code blocks in this precinct. */
-    int numcblks;
-
-    /* The per code block information. */
-    jpc_dec_cblk_t *cblks;
-
-    /* The inclusion tag tree. */
-    jpc_tagtree_t *incltagtree;
-
-    /* The insignificant MSBs tag tree. */
-    jpc_tagtree_t *numimsbstagtree;
-
-} jpc_dec_prc_t;
-
-/* Decoder per-band state information. */
-
-typedef struct {
-
-    /* The per-code-block-group state information. */
-    jpc_dec_prc_t *prcs;
-
-    /* The sample data associated with this band. */
-    jas_matrix_t *data;
-
-    /* The orientation of this band (i.e., LL, LH, HL, or HH). */
-    int orient;
-
-    /* The encoded quantizer step size. */
-    int stepsize;
-
-    /* The absolute quantizer step size. */
-    jpc_fix_t absstepsize;
-
-    /* The number of bit planes for this band. */
-    int numbps;
-
-    /* The analysis gain associated with this band. */
-    int analgain;
-
-    /* The ROI shift value for this band. */
-    int roishift;
-
-} jpc_dec_band_t;
-
-/* Decoder per-resolution-level state information. */
-
-typedef struct {
-
-    /* The number of bands associated with this resolution level. */
-    int numbands;
-
-    /* The per-band information. */
-    jpc_dec_band_t *bands;
-
-    /* The x-coordinate of the top-left corner of the tile-component
-      at this resolution. */
-    uint_fast32_t xstart;
-
-    /* The y-coordinate of the top-left corner of the tile-component
-      at this resolution. */
-    uint_fast32_t ystart;
-
-    /* The x-coordinate of the bottom-right corner of the tile-component
-      at this resolution (plus one). */
-    uint_fast32_t xend;
-
-    /* The y-coordinate of the bottom-right corner of the tile-component
-      at this resolution (plus one). */
-    uint_fast32_t yend;
-
-    /* The exponent value for the nominal precinct width measured
-      relative to the associated LL band. */
-    int prcwidthexpn;
-
-    /* The exponent value for the nominal precinct height measured
-      relative to the associated LL band. */
-    int prcheightexpn;
-
-    /* The number of precincts in the horizontal direction. */
-    int numhprcs;
-
-    /* The number of precincts in the vertical direction. */
-    int numvprcs;
-
-    /* The total number of precincts. */
-    int numprcs;
-
-    /* The exponent value for the nominal code block group width.
-      This quantity is associated with the next lower resolution level
-      (assuming that there is one). */
-    int cbgwidthexpn;
-
-    /* The exponent value for the nominal code block group height
-      This quantity is associated with the next lower resolution level
-      (assuming that there is one). */
-    int cbgheightexpn;
-
-    /* The exponent value for the code block width. */
-    uint_fast16_t cblkwidthexpn;
-
-    /* The exponent value for the code block height. */
-    uint_fast16_t cblkheightexpn;
-
-} jpc_dec_rlvl_t;
-
-/* Decoder per-tile-component state information. */
-
-typedef struct {
-
-    /* The x-coordinate of the top-left corner of the tile-component
-      in the coordinate system of the tile-component. */
-    uint_fast32_t xstart;
-
-    /* The y-coordinate of the top-left corner of the tile-component
-      in the coordinate system of the tile-component. */
-    uint_fast32_t ystart;
-
-    /* The x-coordinate of the bottom-right corner of the tile-component
-      in the coordinate system of the tile-component (plus one). */
-    uint_fast32_t xend;
-
-    /* The y-coordinate of the bottom-right corner of the tile-component
-      in the coordinate system of the tile-component (plus one). */
-    uint_fast32_t yend;
-
-    /* The component data for the current tile. */
-    jas_matrix_t *data;
-
-    /* The number of resolution levels. */
-    int numrlvls;
-
-    /* The per resolution level information. */
-    jpc_dec_rlvl_t *rlvls;
-
-    /* The TSFB. */
-    jpc_tsfb_t *tsfb;
-
-} jpc_dec_tcomp_t;
-
-/*
- * Tile states.
- */
-
-#define	JPC_TILE_INIT	0
-#define	JPC_TILE_ACTIVE	1
-#define	JPC_TILE_ACTIVELAST	2
-#define	JPC_TILE_DONE	3
-
-/* Decoder per-tile state information. */
-
-typedef struct {
-
-    /* The processing state for this tile. */
-    int state;
-
-    /* The x-coordinate of the top-left corner of the tile on the reference
-      grid. */
-    uint_fast32_t xstart;
-
-    /* The y-coordinate of the top-left corner of the tile on the reference
-      grid. */
-    uint_fast32_t ystart;
-
-    /* The x-coordinate of the bottom-right corner of the tile on the
-      reference grid (plus one). */
-    uint_fast32_t xend;
-
-    /* The y-coordinate of the bottom-right corner of the tile on the
-      reference grid (plus one). */
-    uint_fast32_t yend;
-
-    /* The packed packet header data for this tile. */
-    jpc_ppxstab_t *pptstab;
-
-    /* A stream containing the packed packet header data for this tile. */
-    jas_stream_t *pkthdrstream;
-
-    /* The current position within the packed packet header stream. */
-    long pkthdrstreampos;
-
-    /* The coding parameters for this tile. */
-    jpc_dec_cp_t *cp;
-
-    /* The per tile-component information. */
-    jpc_dec_tcomp_t *tcomps;
-
-    /* The next expected tile-part number. */
-    int partno;
-
-    /* The number of tile-parts. */
-    int numparts;
-
-    /* The coding mode. */
-    int realmode;
-
-    /* The packet iterator for this tile. */
-    jpc_pi_t *pi;
-
-} jpc_dec_tile_t;
-
-/* Decoder per-component state information. */
-
-typedef struct {
-
-    /* The horizontal sampling period. */
-    uint_fast32_t hstep;
-
-    /* The vertical sampling period. */
-    uint_fast32_t vstep;
-
-    /* The number of samples in the horizontal direction. */
-    uint_fast32_t width;
-
-    /* The number of samples in the vertical direction. */
-    uint_fast32_t height;
-
-    /* The precision of the sample data. */
-    uint_fast16_t prec;
-
-    /* The signedness of the sample data. */
-    bool sgnd;
-
-    /* The sample alignment horizontal offset. */
-    uint_fast32_t hsubstep;
-
-    /* The sample alignment vertical offset. */
-    uint_fast32_t vsubstep;
-
-} jpc_dec_cmpt_t;
-
-/* Decoder state information. */
-
-typedef struct {
-
-    /* The decoded image. */
-    jas_image_t *image;
-
-    /* The x-coordinate of the top-left corner of the image area on
-      the reference grid. */
-    uint_fast32_t xstart;
-
-    /* The y-coordinate of the top-left corner of the image area on
-      the reference grid. */
-    uint_fast32_t ystart;
-
-    /* The x-coordinate of the bottom-right corner of the image area on
-      the reference grid (plus one). */
-    uint_fast32_t xend;
-
-    /* The y-coordinate of the bottom-right corner of the image area on
-      the reference grid (plus one). */
-    uint_fast32_t yend;
-
-    /* The nominal tile width in units of the image reference grid. */
-    uint_fast32_t tilewidth;
-
-    /* The nominal tile height in units of the image reference grid. */
-    uint_fast32_t tileheight;
-
-    /* The horizontal offset from the origin of the reference grid to the
-      left side of the first tile. */
-    uint_fast32_t tilexoff;
-
-    /* The vertical offset from the origin of the reference grid to the
-      top side of the first tile. */
-    uint_fast32_t tileyoff;
-
-    /* The number of tiles spanning the image area in the vertical
-      direction. */
-    int numhtiles;
-
-    /* The number of tiles spanning the image area in the horizontal
-      direction. */
-    int numvtiles;
-
-    /* The total number of tiles. */
-    int numtiles;
-
-    /* The per-tile information. */
-    jpc_dec_tile_t *tiles;
-
-    /* The tile currently being processed. */
-    jpc_dec_tile_t *curtile;
-
-    /* The number of components. */
-    int numcomps;
-
-    /* The stream containing the input JPEG-2000 code stream data. */
-    jas_stream_t *in;
-
-    /* The default coding parameters for all tiles. */
-    jpc_dec_cp_t *cp;
-
-    /* The maximum number of layers that may be decoded. */
-    int maxlyrs;
-
-    /* The maximum number of packets that may be decoded. */
-    int maxpkts;
-
-    /* The number of packets decoded so far in the processing of the entire
-      code stream. */
-    int numpkts;
-
-    /* The next expected PPM marker segment sequence number. */
-    int ppmseqno;
-
-    /* The current state for code stream processing. */
-    int state;
-
-    /* The per-component information. */
-    jpc_dec_cmpt_t *cmpts;
-
-    /* The information from PPM marker segments. */
-    jpc_ppxstab_t *ppmstab;
-
-    /* A list of streams containing packet header data from PPM marker
-      segments. */
-    jpc_streamlist_t *pkthdrstreams;
-
-    /* The expected ending offset for a tile-part. */
-    long curtileendoff;
-
-    /* This is required by the tier-2 decoder. */
-    jpc_cstate_t *cstate;
-
-} jpc_dec_t;
-
-/* Decoder options. */
-
-typedef struct {
-
-    /* The debug level for the decoder. */
-    int debug;
-
-    /* The maximum number of layers to decode. */
-    int maxlyrs;
-
-    /* The maximum number of packets to decode. */
-    int maxpkts;
-
-} jpc_dec_importopts_t;
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Create a decoder segment object. */
-jpc_dec_seg_t *jpc_seg_alloc(void);
-
-/* Destroy a decoder segment object. */
-void jpc_seg_destroy(jpc_dec_seg_t *seg);
-
-/* Remove a segment from a segment list. */
-void jpc_seglist_remove(jpc_dec_seglist_t *list, jpc_dec_seg_t *node);
-
-/* Insert a segment into a segment list. */
-void jpc_seglist_insert(jpc_dec_seglist_t *list, jpc_dec_seg_t *ins,
-  jpc_dec_seg_t *node);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.c
deleted file mode 100644
index 63d9ea6..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.c
+++ /dev/null
@@ -1,2620 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-#include <float.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_fix.h"
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_version.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_flt.h"
-#include "jpc_fix.h"
-#include "jpc_tagtree.h"
-#include "jpc_enc.h"
-#include "jpc_cs.h"
-#include "jpc_mct.h"
-#include "jpc_tsfb.h"
-#include "jpc_qmfb.h"
-#include "jpc_t1enc.h"
-#include "jpc_t2enc.h"
-#include "jpc_cod.h"
-#include "jpc_math.h"
-#include "jpc_util.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-#define JPC_POW2(n) \
-    (1 << (n))
-
-#define JPC_FLOORTOMULTPOW2(x, n) \
-  (((n) > 0) ? ((x) & (~((1 << n) - 1))) : (x))
-/* Round to the nearest multiple of the specified power of two in the
-  direction of negative infinity. */
-
-#define	JPC_CEILTOMULTPOW2(x, n) \
-  (((n) > 0) ? JPC_FLOORTOMULTPOW2(((x) + (1 << (n)) - 1), n) : (x))
-/* Round to the nearest multiple of the specified power of two in the
-  direction of positive infinity. */
-
-#define	JPC_POW2(n)	\
-  (1 << (n))
-
-jpc_enc_tile_t *jpc_enc_tile_create(jpc_enc_cp_t *cp, jas_image_t *image, int tileno);
-void jpc_enc_tile_destroy(jpc_enc_tile_t *tile);
-
-static jpc_enc_tcmpt_t *tcmpt_create(jpc_enc_tcmpt_t *tcmpt, jpc_enc_cp_t *cp,
-  jas_image_t *image, jpc_enc_tile_t *tile);
-static void tcmpt_destroy(jpc_enc_tcmpt_t *tcmpt);
-static jpc_enc_rlvl_t *rlvl_create(jpc_enc_rlvl_t *rlvl, jpc_enc_cp_t *cp,
-  jpc_enc_tcmpt_t *tcmpt, jpc_tsfb_band_t *bandinfos);
-static void rlvl_destroy(jpc_enc_rlvl_t *rlvl);
-static jpc_enc_band_t *band_create(jpc_enc_band_t *band, jpc_enc_cp_t *cp,
-  jpc_enc_rlvl_t *rlvl, jpc_tsfb_band_t *bandinfos);
-static void band_destroy(jpc_enc_band_t *bands);
-static jpc_enc_prc_t *prc_create(jpc_enc_prc_t *prc, jpc_enc_cp_t *cp,
-  jpc_enc_band_t *band);
-static void prc_destroy(jpc_enc_prc_t *prcs);
-static jpc_enc_cblk_t *cblk_create(jpc_enc_cblk_t *cblk, jpc_enc_cp_t *cp,
-  jpc_enc_prc_t *prc);
-static void cblk_destroy(jpc_enc_cblk_t *cblks);
-int ratestrtosize(char *s, uint_fast32_t rawsize, uint_fast32_t *size);
-static void pass_destroy(jpc_enc_pass_t *pass);
-void jpc_enc_dump(jpc_enc_t *enc);
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-int dump_passes(jpc_enc_pass_t *passes, int numpasses, jpc_enc_cblk_t *cblk);
-void calcrdslopes(jpc_enc_cblk_t *cblk);
-void dump_layeringinfo(jpc_enc_t *enc);
-static int jpc_calcssexp(jpc_fix_t stepsize);
-static int jpc_calcssmant(jpc_fix_t stepsize);
-void jpc_quantize(jas_matrix_t *data, jpc_fix_t stepsize);
-static int jpc_enc_encodemainhdr(jpc_enc_t *enc);
-static int jpc_enc_encodemainbody(jpc_enc_t *enc);
-int jpc_enc_encodetiledata(jpc_enc_t *enc);
-jpc_enc_t *jpc_enc_create(jpc_enc_cp_t *cp, jas_stream_t *out, jas_image_t *image);
-void jpc_enc_destroy(jpc_enc_t *enc);
-static int jpc_enc_encodemainhdr(jpc_enc_t *enc);
-static int jpc_enc_encodemainbody(jpc_enc_t *enc);
-int jpc_enc_encodetiledata(jpc_enc_t *enc);
-int rateallocate(jpc_enc_t *enc, int numlyrs, uint_fast32_t *cumlens);
-int setins(int numvalues, jpc_flt_t *values, jpc_flt_t value);
-static jpc_enc_cp_t *cp_create(char *optstr, jas_image_t *image);
-void jpc_enc_cp_destroy(jpc_enc_cp_t *cp);
-static uint_fast32_t jpc_abstorelstepsize(jpc_fix_t absdelta, int scaleexpn);
-
-static uint_fast32_t jpc_abstorelstepsize(jpc_fix_t absdelta, int scaleexpn)
-{
-    int p;
-    uint_fast32_t mant;
-    uint_fast32_t expn;
-    int n;
-
-    if (absdelta < 0) {
-        abort();
-    }
-
-    p = jpc_firstone(absdelta) - JPC_FIX_FRACBITS;
-    n = 11 - jpc_firstone(absdelta);
-    mant = ((n < 0) ? (absdelta >> (-n)) : (absdelta << n)) & 0x7ff;
-    expn = scaleexpn - p;
-    if (scaleexpn < p) {
-        abort();
-    }
-    return JPC_QCX_EXPN(expn) | JPC_QCX_MANT(mant);
-}
-
-typedef enum {
-    OPT_DEBUG,
-    OPT_IMGAREAOFFX,
-    OPT_IMGAREAOFFY,
-    OPT_TILEGRDOFFX,
-    OPT_TILEGRDOFFY,
-    OPT_TILEWIDTH,
-    OPT_TILEHEIGHT,
-    OPT_PRCWIDTH,
-    OPT_PRCHEIGHT,
-    OPT_CBLKWIDTH,
-    OPT_CBLKHEIGHT,
-    OPT_MODE,
-    OPT_PRG,
-    OPT_NOMCT,
-    OPT_MAXRLVLS,
-    OPT_SOP,
-    OPT_EPH,
-    OPT_LAZY,
-    OPT_TERMALL,
-    OPT_SEGSYM,
-    OPT_VCAUSAL,
-    OPT_RESET,
-    OPT_PTERM,
-    OPT_NUMGBITS,
-    OPT_RATE,
-    OPT_ILYRRATES,
-    OPT_JP2OVERHEAD
-} optid_t;
-
-jas_taginfo_t encopts[] = {
-    {OPT_DEBUG, "debug"},
-    {OPT_IMGAREAOFFX, "imgareatlx"},
-    {OPT_IMGAREAOFFY, "imgareatly"},
-    {OPT_TILEGRDOFFX, "tilegrdtlx"},
-    {OPT_TILEGRDOFFY, "tilegrdtly"},
-    {OPT_TILEWIDTH, "tilewidth"},
-    {OPT_TILEHEIGHT, "tileheight"},
-    {OPT_PRCWIDTH, "prcwidth"},
-    {OPT_PRCHEIGHT, "prcheight"},
-    {OPT_CBLKWIDTH, "cblkwidth"},
-    {OPT_CBLKHEIGHT, "cblkheight"},
-    {OPT_MODE, "mode"},
-    {OPT_PRG, "prg"},
-    {OPT_NOMCT, "nomct"},
-    {OPT_MAXRLVLS, "numrlvls"},
-    {OPT_SOP, "sop"},
-    {OPT_EPH, "eph"},
-    {OPT_LAZY, "lazy"},
-    {OPT_TERMALL, "termall"},
-    {OPT_SEGSYM, "segsym"},
-    {OPT_VCAUSAL, "vcausal"},
-    {OPT_PTERM, "pterm"},
-    {OPT_RESET, "resetprob"},
-    {OPT_NUMGBITS, "numgbits"},
-    {OPT_RATE, "rate"},
-    {OPT_ILYRRATES, "ilyrrates"},
-    {OPT_JP2OVERHEAD, "_jp2overhead"},
-    {-1, 0}
-};
-
-typedef enum {
-    PO_L = 0,
-    PO_R
-} poid_t;
-
-
-jas_taginfo_t prgordtab[] = {
-    {JPC_COD_LRCPPRG, "lrcp"},
-    {JPC_COD_RLCPPRG, "rlcp"},
-    {JPC_COD_RPCLPRG, "rpcl"},
-    {JPC_COD_PCRLPRG, "pcrl"},
-    {JPC_COD_CPRLPRG, "cprl"},
-    {-1, 0}
-};
-
-typedef enum {
-    MODE_INT,
-    MODE_REAL
-} modeid_t;
-
-jas_taginfo_t modetab[] = {
-    {MODE_INT, "int"},
-    {MODE_REAL, "real"},
-    {-1, 0}
-};
-
-/******************************************************************************\
-* The main encoder entry point.
-\******************************************************************************/
-
-int jpc_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    jpc_enc_t *enc;
-    jpc_enc_cp_t *cp;
-
-    enc = 0;
-    cp = 0;
-
-    jpc_initluts();
-
-    if (!(cp = cp_create(optstr, image))) {
-        jas_eprintf("invalid JP encoder options\n");
-        goto error;
-    }
-
-    if (!(enc = jpc_enc_create(cp, out, image))) {
-        goto error;
-    }
-    cp = 0;
-
-    /* Encode the main header. */
-    if (jpc_enc_encodemainhdr(enc)) {
-        goto error;
-    }
-
-    /* Encode the main body.  This constitutes most of the encoding work. */
-    if (jpc_enc_encodemainbody(enc)) {
-        goto error;
-    }
-
-    /* Write EOC marker segment. */
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_EOC))) {
-        goto error;
-    }
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write EOI marker\n");
-        goto error;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-    if (jas_stream_flush(enc->out)) {
-        goto error;
-    }
-
-    jpc_enc_destroy(enc);
-
-    return 0;
-
-error:
-    if (cp) {
-        jpc_enc_cp_destroy(cp);
-    }
-    if (enc) {
-        jpc_enc_destroy(enc);
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Option parsing code.
-\******************************************************************************/
-
-static jpc_enc_cp_t *cp_create(char *optstr, jas_image_t *image)
-{
-    jpc_enc_cp_t *cp;
-    jas_tvparser_t *tvp;
-    int ret;
-    int numilyrrates;
-    double *ilyrrates;
-    int i;
-    int tagid;
-    jpc_enc_tcp_t *tcp;
-    jpc_enc_tccp_t *tccp;
-    jpc_enc_ccp_t *ccp;
-    int cmptno;
-    uint_fast16_t rlvlno;
-    uint_fast16_t prcwidthexpn;
-    uint_fast16_t prcheightexpn;
-    bool enablemct;
-    uint_fast32_t jp2overhead;
-    uint_fast16_t lyrno;
-    uint_fast32_t hsteplcm;
-    uint_fast32_t vsteplcm;
-    bool mctvalid;
-
-    tvp = 0;
-    cp = 0;
-    ilyrrates = 0;
-    numilyrrates = 0;
-
-    if (!(cp = jas_malloc(sizeof(jpc_enc_cp_t)))) {
-        goto error;
-    }
-
-    prcwidthexpn = 15;
-    prcheightexpn = 15;
-    enablemct = true;
-    jp2overhead = 0;
-
-    cp->ccps = 0;
-    cp->debug = 0;
-    cp->imgareatlx = UINT_FAST32_MAX;
-    cp->imgareatly = UINT_FAST32_MAX;
-    cp->refgrdwidth = 0;
-    cp->refgrdheight = 0;
-    cp->tilegrdoffx = UINT_FAST32_MAX;
-    cp->tilegrdoffy = UINT_FAST32_MAX;
-    cp->tilewidth = 0;
-    cp->tileheight = 0;
-    cp->numcmpts = jas_image_numcmpts(image);
-
-    hsteplcm = 1;
-    vsteplcm = 1;
-    for (cmptno = 0; cmptno < jas_image_numcmpts(image); ++cmptno) {
-        if (jas_image_cmptbrx(image, cmptno) + jas_image_cmpthstep(image, cmptno) <=
-          jas_image_brx(image) || jas_image_cmptbry(image, cmptno) +
-          jas_image_cmptvstep(image, cmptno) <= jas_image_bry(image)) {
-            jas_eprintf("unsupported image type\n");
-            goto error;
-        }
-        /* Note: We ought to be calculating the LCMs here.  Fix some day. */
-        hsteplcm *= jas_image_cmpthstep(image, cmptno);
-        vsteplcm *= jas_image_cmptvstep(image, cmptno);
-    }
-
-    if (!(cp->ccps = jas_malloc(cp->numcmpts * sizeof(jpc_enc_ccp_t)))) {
-        goto error;
-    }
-    for (cmptno = 0, ccp = cp->ccps; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno,
-      ++ccp) {
-        ccp->sampgrdstepx = jas_image_cmpthstep(image, cmptno);
-        ccp->sampgrdstepy = jas_image_cmptvstep(image, cmptno);
-        /* XXX - this isn't quite correct for more general image */
-        ccp->sampgrdsubstepx = 0;
-        ccp->sampgrdsubstepx = 0;
-        ccp->prec = jas_image_cmptprec(image, cmptno);
-        ccp->sgnd = jas_image_cmptsgnd(image, cmptno);
-        ccp->numstepsizes = 0;
-        memset(ccp->stepsizes, 0, sizeof(ccp->stepsizes));
-    }
-
-    cp->rawsize = jas_image_rawsize(image);
-    cp->totalsize = UINT_FAST32_MAX;
-
-    tcp = &cp->tcp;
-    tcp->csty = 0;
-    tcp->intmode = true;
-    tcp->prg = JPC_COD_LRCPPRG;
-    tcp->numlyrs = 1;
-    tcp->ilyrrates = 0;
-
-    tccp = &cp->tccp;
-    tccp->csty = 0;
-    tccp->maxrlvls = 6;
-    tccp->cblkwidthexpn = 6;
-    tccp->cblkheightexpn = 6;
-    tccp->cblksty = 0;
-    tccp->numgbits = 2;
-
-    if (!(tvp = jas_tvparser_create(optstr ? optstr : ""))) {
-        goto error;
-    }
-
-    while (!(ret = jas_tvparser_next(tvp))) {
-        switch (jas_taginfo_nonull(jas_taginfos_lookup(encopts,
-          jas_tvparser_gettag(tvp)))->id) {
-        case OPT_DEBUG:
-            cp->debug = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_IMGAREAOFFX:
-            cp->imgareatlx = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_IMGAREAOFFY:
-            cp->imgareatly = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_TILEGRDOFFX:
-            cp->tilegrdoffx = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_TILEGRDOFFY:
-            cp->tilegrdoffy = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_TILEWIDTH:
-            cp->tilewidth = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_TILEHEIGHT:
-            cp->tileheight = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_PRCWIDTH:
-            prcwidthexpn = jpc_floorlog2(atoi(jas_tvparser_getval(tvp)));
-            break;
-        case OPT_PRCHEIGHT:
-            prcheightexpn = jpc_floorlog2(atoi(jas_tvparser_getval(tvp)));
-            break;
-        case OPT_CBLKWIDTH:
-            tccp->cblkwidthexpn =
-              jpc_floorlog2(atoi(jas_tvparser_getval(tvp)));
-            break;
-        case OPT_CBLKHEIGHT:
-            tccp->cblkheightexpn =
-              jpc_floorlog2(atoi(jas_tvparser_getval(tvp)));
-            break;
-        case OPT_MODE:
-            if ((tagid = jas_taginfo_nonull(jas_taginfos_lookup(modetab,
-              jas_tvparser_getval(tvp)))->id) < 0) {
-                jas_eprintf("ignoring invalid mode %s\n",
-                  jas_tvparser_getval(tvp));
-            } else {
-                tcp->intmode = (tagid == MODE_INT);
-            }
-            break;
-        case OPT_PRG:
-            if ((tagid = jas_taginfo_nonull(jas_taginfos_lookup(prgordtab,
-              jas_tvparser_getval(tvp)))->id) < 0) {
-                jas_eprintf("ignoring invalid progression order %s\n",
-                  jas_tvparser_getval(tvp));
-            } else {
-                tcp->prg = tagid;
-            }
-            break;
-        case OPT_NOMCT:
-            enablemct = false;
-            break;
-        case OPT_MAXRLVLS:
-            tccp->maxrlvls = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_SOP:
-            cp->tcp.csty |= JPC_COD_SOP;
-            break;
-        case OPT_EPH:
-            cp->tcp.csty |= JPC_COD_EPH;
-            break;
-        case OPT_LAZY:
-            tccp->cblksty |= JPC_COX_LAZY;
-            break;
-        case OPT_TERMALL:
-            tccp->cblksty |= JPC_COX_TERMALL;
-            break;
-        case OPT_SEGSYM:
-            tccp->cblksty |= JPC_COX_SEGSYM;
-            break;
-        case OPT_VCAUSAL:
-            tccp->cblksty |= JPC_COX_VSC;
-            break;
-        case OPT_RESET:
-            tccp->cblksty |= JPC_COX_RESET;
-            break;
-        case OPT_PTERM:
-            tccp->cblksty |= JPC_COX_PTERM;
-            break;
-        case OPT_NUMGBITS:
-            cp->tccp.numgbits = atoi(jas_tvparser_getval(tvp));
-            break;
-        case OPT_RATE:
-            if (ratestrtosize(jas_tvparser_getval(tvp), cp->rawsize,
-              &cp->totalsize)) {
-                jas_eprintf("ignoring bad rate specifier %s\n",
-                  jas_tvparser_getval(tvp));
-            }
-            break;
-        case OPT_ILYRRATES:
-            if (jpc_atoaf(jas_tvparser_getval(tvp), &numilyrrates,
-              &ilyrrates)) {
-                jas_eprintf("warning: invalid intermediate layer rates specifier ignored (%s)\n",
-                  jas_tvparser_getval(tvp));
-            }
-            break;
-
-        case OPT_JP2OVERHEAD:
-            jp2overhead = atoi(jas_tvparser_getval(tvp));
-            break;
-        default:
-            jas_eprintf("warning: ignoring invalid option %s\n",
-             jas_tvparser_gettag(tvp));
-            break;
-        }
-    }
-
-    jas_tvparser_destroy(tvp);
-    tvp = 0;
-
-    if (cp->totalsize != UINT_FAST32_MAX) {
-        cp->totalsize = (cp->totalsize > jp2overhead) ?
-          (cp->totalsize - jp2overhead) : 0;
-    }
-
-    if (cp->imgareatlx == UINT_FAST32_MAX) {
-        cp->imgareatlx = 0;
-    } else {
-        if (hsteplcm != 1) {
-            jas_eprintf("warning: overriding imgareatlx value\n");
-        }
-        cp->imgareatlx *= hsteplcm;
-    }
-    if (cp->imgareatly == UINT_FAST32_MAX) {
-        cp->imgareatly = 0;
-    } else {
-        if (vsteplcm != 1) {
-            jas_eprintf("warning: overriding imgareatly value\n");
-        }
-        cp->imgareatly *= vsteplcm;
-    }
-    cp->refgrdwidth = cp->imgareatlx + jas_image_width(image);
-    cp->refgrdheight = cp->imgareatly + jas_image_height(image);
-    if (cp->tilegrdoffx == UINT_FAST32_MAX) {
-        cp->tilegrdoffx = cp->imgareatlx;
-    }
-    if (cp->tilegrdoffy == UINT_FAST32_MAX) {
-        cp->tilegrdoffy = cp->imgareatly;
-    }
-    if (!cp->tilewidth) {
-        cp->tilewidth = cp->refgrdwidth - cp->tilegrdoffx;
-    }
-    if (!cp->tileheight) {
-        cp->tileheight = cp->refgrdheight - cp->tilegrdoffy;
-    }
-
-    if (cp->numcmpts == 3) {
-        mctvalid = true;
-        for (cmptno = 0; cmptno < jas_image_numcmpts(image); ++cmptno) {
-            if (jas_image_cmptprec(image, cmptno) != jas_image_cmptprec(image, 0) ||
-              jas_image_cmptsgnd(image, cmptno) != jas_image_cmptsgnd(image, 0) ||
-              jas_image_cmptwidth(image, cmptno) != jas_image_cmptwidth(image, 0) ||
-              jas_image_cmptheight(image, cmptno) != jas_image_cmptheight(image, 0)) {
-                mctvalid = false;
-            }
-        }
-    } else {
-        mctvalid = false;
-    }
-    if (mctvalid && enablemct && jas_clrspc_fam(jas_image_clrspc(image)) != JAS_CLRSPC_FAM_RGB) {
-        jas_eprintf("warning: color space apparently not RGB\n");
-    }
-    if (mctvalid && enablemct && jas_clrspc_fam(jas_image_clrspc(image)) == JAS_CLRSPC_FAM_RGB) {
-        tcp->mctid = (tcp->intmode) ? (JPC_MCT_RCT) : (JPC_MCT_ICT);
-    } else {
-        tcp->mctid = JPC_MCT_NONE;
-    }
-    tccp->qmfbid = (tcp->intmode) ? (JPC_COX_RFT) : (JPC_COX_INS);
-
-    for (rlvlno = 0; rlvlno < tccp->maxrlvls; ++rlvlno) {
-        tccp->prcwidthexpns[rlvlno] = prcwidthexpn;
-        tccp->prcheightexpns[rlvlno] = prcheightexpn;
-    }
-    if (prcwidthexpn != 15 || prcheightexpn != 15) {
-        tccp->csty |= JPC_COX_PRT;
-    }
-
-    /* Ensure that the tile width and height is valid. */
-    if (!cp->tilewidth) {
-        jas_eprintf("invalid tile width %lu\n", (unsigned long)
-          cp->tilewidth);
-        goto error;
-    }
-    if (!cp->tileheight) {
-        jas_eprintf("invalid tile height %lu\n", (unsigned long)
-          cp->tileheight);
-        goto error;
-    }
-
-    /* Ensure that the tile grid offset is valid. */
-    if (cp->tilegrdoffx > cp->imgareatlx ||
-      cp->tilegrdoffy > cp->imgareatly ||
-      cp->tilegrdoffx + cp->tilewidth < cp->imgareatlx ||
-      cp->tilegrdoffy + cp->tileheight < cp->imgareatly) {
-        jas_eprintf("invalid tile grid offset (%lu, %lu)\n",
-          (unsigned long) cp->tilegrdoffx, (unsigned long)
-          cp->tilegrdoffy);
-        goto error;
-    }
-
-    cp->numhtiles = JPC_CEILDIV(cp->refgrdwidth - cp->tilegrdoffx,
-      cp->tilewidth);
-    cp->numvtiles = JPC_CEILDIV(cp->refgrdheight - cp->tilegrdoffy,
-      cp->tileheight);
-    cp->numtiles = cp->numhtiles * cp->numvtiles;
-
-    if (ilyrrates && numilyrrates > 0) {
-        tcp->numlyrs = numilyrrates + 1;
-        if (!(tcp->ilyrrates = jas_malloc((tcp->numlyrs - 1) *
-          sizeof(jpc_fix_t)))) {
-            goto error;
-        }
-        for (i = 0; i < JAS_CAST(int, tcp->numlyrs - 1); ++i) {
-            tcp->ilyrrates[i] = jpc_dbltofix(ilyrrates[i]);
-        }
-    }
-
-    /* Ensure that the integer mode is used in the case of lossless
-      coding. */
-    if (cp->totalsize == UINT_FAST32_MAX && (!cp->tcp.intmode)) {
-        jas_eprintf("cannot use real mode for lossless coding\n");
-        goto error;
-    }
-
-    /* Ensure that the precinct width is valid. */
-    if (prcwidthexpn > 15) {
-        jas_eprintf("invalid precinct width\n");
-        goto error;
-    }
-
-    /* Ensure that the precinct height is valid. */
-    if (prcheightexpn > 15) {
-        jas_eprintf("invalid precinct height\n");
-        goto error;
-    }
-
-    /* Ensure that the code block width is valid. */
-    if (cp->tccp.cblkwidthexpn < 2 || cp->tccp.cblkwidthexpn > 12) {
-        jas_eprintf("invalid code block width %d\n",
-          JPC_POW2(cp->tccp.cblkwidthexpn));
-        goto error;
-    }
-
-    /* Ensure that the code block height is valid. */
-    if (cp->tccp.cblkheightexpn < 2 || cp->tccp.cblkheightexpn > 12) {
-        jas_eprintf("invalid code block height %d\n",
-          JPC_POW2(cp->tccp.cblkheightexpn));
-        goto error;
-    }
-
-    /* Ensure that the code block size is not too large. */
-    if (cp->tccp.cblkwidthexpn + cp->tccp.cblkheightexpn > 12) {
-        jas_eprintf("code block size too large\n");
-        goto error;
-    }
-
-    /* Ensure that the number of layers is valid. */
-    if (cp->tcp.numlyrs > 16384) {
-        jas_eprintf("too many layers\n");
-        goto error;
-    }
-
-    /* There must be at least one resolution level. */
-    if (cp->tccp.maxrlvls < 1) {
-        jas_eprintf("must be at least one resolution level\n");
-        goto error;
-    }
-
-    /* Ensure that the number of guard bits is valid. */
-    if (cp->tccp.numgbits > 8) {
-        jas_eprintf("invalid number of guard bits\n");
-        goto error;
-    }
-
-    /* Ensure that the rate is within the legal range. */
-    if (cp->totalsize != UINT_FAST32_MAX && cp->totalsize > cp->rawsize) {
-        jas_eprintf("warning: specified rate is unreasonably large (%lu > %lu)\n", (unsigned long) cp->totalsize, (unsigned long) cp->rawsize);
-    }
-
-    /* Ensure that the intermediate layer rates are valid. */
-    if (tcp->numlyrs > 1) {
-        /* The intermediate layers rates must increase monotonically. */
-        for (lyrno = 0; lyrno + 2 < tcp->numlyrs; ++lyrno) {
-            if (tcp->ilyrrates[lyrno] >= tcp->ilyrrates[lyrno + 1]) {
-                jas_eprintf("intermediate layer rates must increase monotonically\n");
-                goto error;
-            }
-        }
-        /* The intermediate layer rates must be less than the overall rate. */
-        if (cp->totalsize != UINT_FAST32_MAX) {
-            for (lyrno = 0; lyrno < tcp->numlyrs - 1; ++lyrno) {
-                if (jpc_fixtodbl(tcp->ilyrrates[lyrno]) > ((double) cp->totalsize)
-                  / cp->rawsize) {
-                    jas_eprintf("warning: intermediate layer rates must be less than overall rate\n");
-                    goto error;
-                }
-            }
-        }
-    }
-
-    if (ilyrrates) {
-        jas_free(ilyrrates);
-    }
-
-    return cp;
-
-error:
-
-    if (ilyrrates) {
-        jas_free(ilyrrates);
-    }
-    if (tvp) {
-        jas_tvparser_destroy(tvp);
-    }
-    if (cp) {
-        jpc_enc_cp_destroy(cp);
-    }
-    return 0;
-}
-
-void jpc_enc_cp_destroy(jpc_enc_cp_t *cp)
-{
-    if (cp->ccps) {
-        if (cp->tcp.ilyrrates) {
-            jas_free(cp->tcp.ilyrrates);
-        }
-        jas_free(cp->ccps);
-    }
-    jas_free(cp);
-}
-
-int ratestrtosize(char *s, uint_fast32_t rawsize, uint_fast32_t *size)
-{
-    char *cp;
-    jpc_flt_t f;
-
-    /* Note: This function must not modify output size on failure. */
-    if ((cp = strchr(s, 'B'))) {
-        *size = atoi(s);
-    } else {
-        f = atof(s);
-        if (f < 0) {
-            *size = 0;
-        } else if (f > 1.0) {
-            *size = rawsize + 1;
-        } else {
-            *size = f * rawsize;
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Encoder constructor and destructor.
-\******************************************************************************/
-
-jpc_enc_t *jpc_enc_create(jpc_enc_cp_t *cp, jas_stream_t *out, jas_image_t *image)
-{
-    jpc_enc_t *enc;
-
-    enc = 0;
-
-    if (!(enc = jas_malloc(sizeof(jpc_enc_t)))) {
-        goto error;
-    }
-
-    enc->image = image;
-    enc->out = out;
-    enc->cp = cp;
-    enc->cstate = 0;
-    enc->tmpstream = 0;
-    enc->mrk = 0;
-    enc->curtile = 0;
-
-    if (!(enc->cstate = jpc_cstate_create())) {
-        goto error;
-    }
-    enc->len = 0;
-    enc->mainbodysize = 0;
-
-    return enc;
-
-error:
-
-    if (enc) {
-        jpc_enc_destroy(enc);
-    }
-    return 0;
-}
-
-void jpc_enc_destroy(jpc_enc_t *enc)
-{
-    /* The image object (i.e., enc->image) and output stream object
-    (i.e., enc->out) are created outside of the encoder.
-    Therefore, they must not be destroyed here. */
-
-    if (enc->curtile) {
-        jpc_enc_tile_destroy(enc->curtile);
-    }
-    if (enc->cp) {
-        jpc_enc_cp_destroy(enc->cp);
-    }
-    if (enc->cstate) {
-        jpc_cstate_destroy(enc->cstate);
-    }
-    if (enc->tmpstream) {
-        jas_stream_close(enc->tmpstream);
-    }
-
-    jas_free(enc);
-}
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-static int jpc_calcssmant(jpc_fix_t stepsize)
-{
-    int n;
-    int e;
-    int m;
-
-    n = jpc_firstone(stepsize);
-    e = n - JPC_FIX_FRACBITS;
-    if (n >= 11) {
-        m = (stepsize >> (n - 11)) & 0x7ff;
-    } else {
-        m = (stepsize & ((1 << n) - 1)) << (11 - n);
-    }
-    return m;
-}
-
-static int jpc_calcssexp(jpc_fix_t stepsize)
-{
-    return jpc_firstone(stepsize) - JPC_FIX_FRACBITS;
-}
-
-static int jpc_enc_encodemainhdr(jpc_enc_t *enc)
-{
-    jpc_siz_t *siz;
-    jpc_cod_t *cod;
-    jpc_qcd_t *qcd;
-    int i;
-long startoff;
-long mainhdrlen;
-    jpc_enc_cp_t *cp;
-    jpc_qcc_t *qcc;
-    jpc_enc_tccp_t *tccp;
-    uint_fast16_t cmptno;
-    jpc_tsfb_band_t bandinfos[JPC_MAXBANDS];
-    jpc_fix_t mctsynweight;
-    jpc_enc_tcp_t *tcp;
-    jpc_tsfb_t *tsfb;
-    jpc_tsfb_band_t *bandinfo;
-    uint_fast16_t numbands;
-    uint_fast16_t bandno;
-    uint_fast16_t rlvlno;
-    uint_fast16_t analgain;
-    jpc_fix_t absstepsize;
-    char buf[1024];
-    jpc_com_t *com;
-
-    cp = enc->cp;
-
-startoff = jas_stream_getrwcount(enc->out);
-
-    /* Write SOC marker segment. */
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_SOC))) {
-        return -1;
-    }
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write SOC marker\n");
-        return -1;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-    /* Write SIZ marker segment. */
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_SIZ))) {
-        return -1;
-    }
-    siz = &enc->mrk->parms.siz;
-    siz->caps = 0;
-    siz->xoff = cp->imgareatlx;
-    siz->yoff = cp->imgareatly;
-    siz->width = cp->refgrdwidth;
-    siz->height = cp->refgrdheight;
-    siz->tilexoff = cp->tilegrdoffx;
-    siz->tileyoff = cp->tilegrdoffy;
-    siz->tilewidth = cp->tilewidth;
-    siz->tileheight = cp->tileheight;
-    siz->numcomps = cp->numcmpts;
-    siz->comps = jas_malloc(siz->numcomps * sizeof(jpc_sizcomp_t));
-    assert(siz->comps);
-    for (i = 0; i < JAS_CAST(int, cp->numcmpts); ++i) {
-        siz->comps[i].prec = cp->ccps[i].prec;
-        siz->comps[i].sgnd = cp->ccps[i].sgnd;
-        siz->comps[i].hsamp = cp->ccps[i].sampgrdstepx;
-        siz->comps[i].vsamp = cp->ccps[i].sampgrdstepy;
-    }
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write SIZ marker\n");
-        return -1;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_COM))) {
-        return -1;
-    }
-    sprintf(buf, "Creator: JasPer Version %s", jas_getversion());
-    com = &enc->mrk->parms.com;
-    com->len = strlen(buf);
-    com->regid = JPC_COM_LATIN;
-    if (!(com->data = JAS_CAST(uchar *, jas_strdup(buf)))) {
-        abort();
-    }
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write COM marker\n");
-        return -1;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-#if 0
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_CRG))) {
-        return -1;
-    }
-    crg = &enc->mrk->parms.crg;
-    crg->comps = jas_malloc(crg->numcomps * sizeof(jpc_crgcomp_t));
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write CRG marker\n");
-        return -1;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-#endif
-
-    tcp = &cp->tcp;
-    tccp = &cp->tccp;
-    for (cmptno = 0; cmptno < cp->numcmpts; ++cmptno) {
-        tsfb = jpc_cod_gettsfb(tccp->qmfbid, tccp->maxrlvls - 1);
-        jpc_tsfb_getbands(tsfb, 0, 0, 1 << tccp->maxrlvls, 1 << tccp->maxrlvls,
-          bandinfos);
-        jpc_tsfb_destroy(tsfb);
-        mctsynweight = jpc_mct_getsynweight(tcp->mctid, cmptno);
-        numbands = 3 * tccp->maxrlvls - 2;
-        for (bandno = 0, bandinfo = bandinfos; bandno < numbands;
-          ++bandno, ++bandinfo) {
-            rlvlno = (bandno) ? ((bandno - 1) / 3 + 1) : 0;
-            analgain = JPC_NOMINALGAIN(tccp->qmfbid, tccp->maxrlvls,
-              rlvlno, bandinfo->orient);
-            if (!tcp->intmode) {
-                absstepsize = jpc_fix_div(jpc_inttofix(1 <<
-                  (analgain + 1)), bandinfo->synenergywt);
-            } else {
-                absstepsize = jpc_inttofix(1);
-            }
-            cp->ccps[cmptno].stepsizes[bandno] =
-              jpc_abstorelstepsize(absstepsize,
-              cp->ccps[cmptno].prec + analgain);
-        }
-        cp->ccps[cmptno].numstepsizes = numbands;
-    }
-
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_COD))) {
-        return -1;
-    }
-    cod = &enc->mrk->parms.cod;
-    cod->csty = cp->tccp.csty | cp->tcp.csty;
-    cod->compparms.csty = cp->tccp.csty | cp->tcp.csty;
-    cod->compparms.numdlvls = cp->tccp.maxrlvls - 1;
-    cod->compparms.numrlvls = cp->tccp.maxrlvls;
-    cod->prg = cp->tcp.prg;
-    cod->numlyrs = cp->tcp.numlyrs;
-    cod->compparms.cblkwidthval = JPC_COX_CBLKSIZEEXPN(cp->tccp.cblkwidthexpn);
-    cod->compparms.cblkheightval = JPC_COX_CBLKSIZEEXPN(cp->tccp.cblkheightexpn);
-    cod->compparms.cblksty = cp->tccp.cblksty;
-    cod->compparms.qmfbid = cp->tccp.qmfbid;
-    cod->mctrans = (cp->tcp.mctid != JPC_MCT_NONE);
-    if (tccp->csty & JPC_COX_PRT) {
-        for (rlvlno = 0; rlvlno < tccp->maxrlvls; ++rlvlno) {
-            cod->compparms.rlvls[rlvlno].parwidthval = tccp->prcwidthexpns[rlvlno];
-            cod->compparms.rlvls[rlvlno].parheightval = tccp->prcheightexpns[rlvlno];
-        }
-    }
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        jas_eprintf("cannot write COD marker\n");
-        return -1;
-    }
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-    if (!(enc->mrk = jpc_ms_create(JPC_MS_QCD))) {
-        return -1;
-    }
-    qcd = &enc->mrk->parms.qcd;
-    qcd->compparms.qntsty = (tccp->qmfbid == JPC_COX_INS) ?
-      JPC_QCX_SEQNT : JPC_QCX_NOQNT;
-    qcd->compparms.numstepsizes = cp->ccps[0].numstepsizes;
-    qcd->compparms.numguard = cp->tccp.numgbits;
-    qcd->compparms.stepsizes = cp->ccps[0].stepsizes;
-    if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-        return -1;
-    }
-    /* We do not want the step size array to be freed! */
-    qcd->compparms.stepsizes = 0;
-    jpc_ms_destroy(enc->mrk);
-    enc->mrk = 0;
-
-    tccp = &cp->tccp;
-    for (cmptno = 1; cmptno < cp->numcmpts; ++cmptno) {
-        if (!(enc->mrk = jpc_ms_create(JPC_MS_QCC))) {
-            return -1;
-        }
-        qcc = &enc->mrk->parms.qcc;
-        qcc->compno = cmptno;
-        qcc->compparms.qntsty = (tccp->qmfbid == JPC_COX_INS) ?
-          JPC_QCX_SEQNT : JPC_QCX_NOQNT;
-        qcc->compparms.numstepsizes = cp->ccps[cmptno].numstepsizes;
-        qcc->compparms.numguard = cp->tccp.numgbits;
-        qcc->compparms.stepsizes = cp->ccps[cmptno].stepsizes;
-        if (jpc_putms(enc->out, enc->cstate, enc->mrk)) {
-            return -1;
-        }
-        /* We do not want the step size array to be freed! */
-        qcc->compparms.stepsizes = 0;
-        jpc_ms_destroy(enc->mrk);
-        enc->mrk = 0;
-    }
-
-#define MAINTLRLEN	2
-    mainhdrlen = jas_stream_getrwcount(enc->out) - startoff;
-    enc->len += mainhdrlen;
-    if (enc->cp->totalsize != UINT_FAST32_MAX) {
-        uint_fast32_t overhead;
-        overhead = mainhdrlen + MAINTLRLEN;
-        enc->mainbodysize = (enc->cp->totalsize >= overhead) ?
-          (enc->cp->totalsize - overhead) : 0;
-    } else {
-        enc->mainbodysize = UINT_FAST32_MAX;
-    }
-
-    return 0;
-}
-
-static int jpc_enc_encodemainbody(jpc_enc_t *enc)
-{
-    int tileno;
-    int tilex;
-    int tiley;
-    int i;
-    jpc_sot_t *sot;
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_rlvl_t *lvl;
-    int rlvlno;
-    jpc_qcc_t *qcc;
-    jpc_cod_t *cod;
-    int adjust;
-    int j;
-    int absbandno;
-    long numbytes;
-    long tilehdrlen;
-    long tilelen;
-    jpc_enc_tile_t *tile;
-    jpc_enc_cp_t *cp;
-    double rho;
-    int lyrno;
-    int cmptno;
-    int samestepsizes;
-    jpc_enc_ccp_t *ccps;
-    jpc_enc_tccp_t *tccp;
-int bandno;
-uint_fast32_t x;
-uint_fast32_t y;
-int mingbits;
-int actualnumbps;
-jpc_fix_t mxmag;
-jpc_fix_t mag;
-int numgbits;
-
-    cp = enc->cp;
-
-    /* Avoid compile warnings. */
-    numbytes = 0;
-
-    for (tileno = 0; tileno < JAS_CAST(int, cp->numtiles); ++tileno) {
-        tilex = tileno % cp->numhtiles;
-        tiley = tileno / cp->numhtiles;
-
-        if (!(enc->curtile = jpc_enc_tile_create(enc->cp, enc->image, tileno))) {
-            abort();
-        }
-
-        tile = enc->curtile;
-
-        if (jas_getdbglevel() >= 10) {
-            jpc_enc_dump(enc);
-        }
-
-        endcomps = &tile->tcmpts[tile->numtcmpts];
-        for (cmptno = 0, comp = tile->tcmpts; cmptno < tile->numtcmpts; ++cmptno, ++comp) {
-            if (!cp->ccps[cmptno].sgnd) {
-                adjust = 1 << (cp->ccps[cmptno].prec - 1);
-                for (i = 0; i < jas_matrix_numrows(comp->data); ++i) {
-                    for (j = 0; j < jas_matrix_numcols(comp->data); ++j) {
-                        *jas_matrix_getref(comp->data, i, j) -= adjust;
-                    }
-                }
-            }
-        }
-
-        if (!tile->intmode) {
-                endcomps = &tile->tcmpts[tile->numtcmpts];
-                for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-                    jas_matrix_asl(comp->data, JPC_FIX_FRACBITS);
-                }
-        }
-
-        switch (tile->mctid) {
-        case JPC_MCT_RCT:
-assert(jas_image_numcmpts(enc->image) == 3);
-            jpc_rct(tile->tcmpts[0].data, tile->tcmpts[1].data,
-              tile->tcmpts[2].data);
-            break;
-        case JPC_MCT_ICT:
-assert(jas_image_numcmpts(enc->image) == 3);
-            jpc_ict(tile->tcmpts[0].data, tile->tcmpts[1].data,
-              tile->tcmpts[2].data);
-            break;
-        default:
-            break;
-        }
-
-        for (i = 0; i < jas_image_numcmpts(enc->image); ++i) {
-            comp = &tile->tcmpts[i];
-            jpc_tsfb_analyze(comp->tsfb, comp->data);
-
-        }
-
-
-        endcomps = &tile->tcmpts[tile->numtcmpts];
-        for (cmptno = 0, comp = tile->tcmpts; comp != endcomps; ++cmptno, ++comp) {
-            mingbits = 0;
-            absbandno = 0;
-            /* All bands must have a corresponding quantizer step size,
-              even if they contain no samples and are never coded. */
-            /* Some bands may not be hit by the loop below, so we must
-              initialize all of the step sizes to a sane value. */
-            memset(comp->stepsizes, 0, sizeof(comp->stepsizes));
-            for (rlvlno = 0, lvl = comp->rlvls; rlvlno < comp->numrlvls; ++rlvlno, ++lvl) {
-                if (!lvl->bands) {
-                    absbandno += rlvlno ? 3 : 1;
-                    continue;
-                }
-                endbands = &lvl->bands[lvl->numbands];
-                for (band = lvl->bands; band != endbands; ++band) {
-                    if (!band->data) {
-                        ++absbandno;
-                        continue;
-                    }
-                    actualnumbps = 0;
-                    mxmag = 0;
-                    for (y = 0; y < JAS_CAST(uint_fast32_t, jas_matrix_numrows(band->data)); ++y) {
-                        for (x = 0; x < JAS_CAST(uint_fast32_t, jas_matrix_numcols(band->data)); ++x) {
-                            mag = abs(jas_matrix_get(band->data, y, x));
-                            if (mag > mxmag) {
-                                mxmag = mag;
-                            }
-                        }
-                    }
-                    if (tile->intmode) {
-                        actualnumbps = jpc_firstone(mxmag) + 1;
-                    } else {
-                        actualnumbps = jpc_firstone(mxmag) + 1 - JPC_FIX_FRACBITS;
-                    }
-                    numgbits = actualnumbps - (cp->ccps[cmptno].prec - 1 +
-                      band->analgain);
-#if 0
-jas_eprintf("%d %d mag=%d actual=%d numgbits=%d\n", cp->ccps[cmptno].prec, band->analgain, mxmag, actualnumbps, numgbits);
-#endif
-                    if (numgbits > mingbits) {
-                        mingbits = numgbits;
-                    }
-                    if (!tile->intmode) {
-                        band->absstepsize = jpc_fix_div(jpc_inttofix(1
-                          << (band->analgain + 1)),
-                          band->synweight);
-                    } else {
-                        band->absstepsize = jpc_inttofix(1);
-                    }
-                    band->stepsize = jpc_abstorelstepsize(
-                      band->absstepsize, cp->ccps[cmptno].prec +
-                      band->analgain);
-                    band->numbps = cp->tccp.numgbits +
-                      JPC_QCX_GETEXPN(band->stepsize) - 1;
-
-                    if ((!tile->intmode) && band->data) {
-                        jpc_quantize(band->data, band->absstepsize);
-                    }
-
-                    comp->stepsizes[absbandno] = band->stepsize;
-                    ++absbandno;
-                }
-            }
-
-            assert(JPC_FIX_FRACBITS >= JPC_NUMEXTRABITS);
-            if (!tile->intmode) {
-                jas_matrix_divpow2(comp->data, JPC_FIX_FRACBITS - JPC_NUMEXTRABITS);
-            } else {
-                jas_matrix_asl(comp->data, JPC_NUMEXTRABITS);
-            }
-
-#if 0
-jas_eprintf("mingbits %d\n", mingbits);
-#endif
-            if (mingbits > cp->tccp.numgbits) {
-                jas_eprintf("error: too few guard bits (need at least %d)\n",
-                  mingbits);
-                return -1;
-            }
-        }
-
-        if (!(enc->tmpstream = jas_stream_memopen(0, 0))) {
-            jas_eprintf("cannot open tmp file\n");
-            return -1;
-        }
-
-        /* Write the tile header. */
-        if (!(enc->mrk = jpc_ms_create(JPC_MS_SOT))) {
-            return -1;
-        }
-        sot = &enc->mrk->parms.sot;
-        sot->len = 0;
-        sot->tileno = tileno;
-        sot->partno = 0;
-        sot->numparts = 1;
-        if (jpc_putms(enc->tmpstream, enc->cstate, enc->mrk)) {
-            jas_eprintf("cannot write SOT marker\n");
-            return -1;
-        }
-        jpc_ms_destroy(enc->mrk);
-        enc->mrk = 0;
-
-/************************************************************************/
-/************************************************************************/
-/************************************************************************/
-
-        tccp = &cp->tccp;
-        for (cmptno = 0; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno) {
-            comp = &tile->tcmpts[cmptno];
-            if (comp->numrlvls != tccp->maxrlvls) {
-                if (!(enc->mrk = jpc_ms_create(JPC_MS_COD))) {
-                    return -1;
-                }
-/* XXX = this is not really correct. we are using comp #0's precint sizes
-and other characteristics */
-                comp = &tile->tcmpts[0];
-                cod = &enc->mrk->parms.cod;
-                cod->compparms.csty = 0;
-                cod->compparms.numdlvls = comp->numrlvls - 1;
-                cod->prg = tile->prg;
-                cod->numlyrs = tile->numlyrs;
-                cod->compparms.cblkwidthval = JPC_COX_CBLKSIZEEXPN(comp->cblkwidthexpn);
-                cod->compparms.cblkheightval = JPC_COX_CBLKSIZEEXPN(comp->cblkheightexpn);
-                cod->compparms.cblksty = comp->cblksty;
-                cod->compparms.qmfbid = comp->qmfbid;
-                cod->mctrans = (tile->mctid != JPC_MCT_NONE);
-                for (i = 0; i < comp->numrlvls; ++i) {
-                    cod->compparms.rlvls[i].parwidthval = comp->rlvls[i].prcwidthexpn;
-                    cod->compparms.rlvls[i].parheightval = comp->rlvls[i].prcheightexpn;
-                }
-                if (jpc_putms(enc->tmpstream, enc->cstate, enc->mrk)) {
-                    return -1;
-                }
-                jpc_ms_destroy(enc->mrk);
-                enc->mrk = 0;
-            }
-        }
-
-        for (cmptno = 0, comp = tile->tcmpts; cmptno < JAS_CAST(int, cp->numcmpts); ++cmptno, ++comp) {
-            ccps = &cp->ccps[cmptno];
-            if (JAS_CAST(int, ccps->numstepsizes) == comp->numstepsizes) {
-                samestepsizes = 1;
-                for (bandno = 0; bandno < JAS_CAST(int, ccps->numstepsizes); ++bandno) {
-                    if (ccps->stepsizes[bandno] != comp->stepsizes[bandno]) {
-                        samestepsizes = 0;
-                        break;
-                    }
-                }
-            } else {
-                samestepsizes = 0;
-            }
-            if (!samestepsizes) {
-                if (!(enc->mrk = jpc_ms_create(JPC_MS_QCC))) {
-                    return -1;
-                }
-                qcc = &enc->mrk->parms.qcc;
-                qcc->compno = cmptno;
-                qcc->compparms.numguard = cp->tccp.numgbits;
-                qcc->compparms.qntsty = (comp->qmfbid == JPC_COX_INS) ?
-                  JPC_QCX_SEQNT : JPC_QCX_NOQNT;
-                qcc->compparms.numstepsizes = comp->numstepsizes;
-                qcc->compparms.stepsizes = comp->stepsizes;
-                if (jpc_putms(enc->tmpstream, enc->cstate, enc->mrk)) {
-                    return -1;
-                }
-                qcc->compparms.stepsizes = 0;
-                jpc_ms_destroy(enc->mrk);
-                enc->mrk = 0;
-            }
-        }
-
-        /* Write a SOD marker to indicate the end of the tile header. */
-        if (!(enc->mrk = jpc_ms_create(JPC_MS_SOD))) {
-            return -1;
-        }
-        if (jpc_putms(enc->tmpstream, enc->cstate, enc->mrk)) {
-            jas_eprintf("cannot write SOD marker\n");
-            return -1;
-        }
-        jpc_ms_destroy(enc->mrk);
-        enc->mrk = 0;
-tilehdrlen = jas_stream_getrwcount(enc->tmpstream);
-
-/************************************************************************/
-/************************************************************************/
-/************************************************************************/
-
-if (jpc_enc_enccblks(enc)) {
-    abort();
-    return -1;
-}
-
-        cp = enc->cp;
-        rho = (double) (tile->brx - tile->tlx) * (tile->bry - tile->tly) /
-          ((cp->refgrdwidth - cp->imgareatlx) * (cp->refgrdheight -
-          cp->imgareatly));
-        tile->rawsize = cp->rawsize * rho;
-
-        for (lyrno = 0; lyrno < tile->numlyrs - 1; ++lyrno) {
-            tile->lyrsizes[lyrno] = tile->rawsize * jpc_fixtodbl(
-              cp->tcp.ilyrrates[lyrno]);
-        }
-        tile->lyrsizes[tile->numlyrs - 1] = (cp->totalsize != UINT_FAST32_MAX) ?
-          (rho * enc->mainbodysize) : UINT_FAST32_MAX;
-        for (lyrno = 0; lyrno < tile->numlyrs; ++lyrno) {
-            if (tile->lyrsizes[lyrno] != UINT_FAST32_MAX) {
-                if (tilehdrlen <= JAS_CAST(long, tile->lyrsizes[lyrno])) {
-                    tile->lyrsizes[lyrno] -= tilehdrlen;
-                } else {
-                    tile->lyrsizes[lyrno] = 0;
-                }
-            }
-        }
-
-        if (rateallocate(enc, tile->numlyrs, tile->lyrsizes)) {
-            return -1;
-        }
-
-#if 0
-jas_eprintf("ENCODE TILE DATA\n");
-#endif
-        if (jpc_enc_encodetiledata(enc)) {
-            jas_eprintf("dotile failed\n");
-            return -1;
-        }
-
-/************************************************************************/
-/************************************************************************/
-/************************************************************************/
-
-/************************************************************************/
-/************************************************************************/
-/************************************************************************/
-
-        tilelen = jas_stream_tell(enc->tmpstream);
-
-        if (jas_stream_seek(enc->tmpstream, 6, SEEK_SET) < 0) {
-            return -1;
-        }
-        jpc_putuint32(enc->tmpstream, tilelen);
-
-        if (jas_stream_seek(enc->tmpstream, 0, SEEK_SET) < 0) {
-            return -1;
-        }
-        if (jpc_putdata(enc->out, enc->tmpstream, -1)) {
-            return -1;
-        }
-        enc->len += tilelen;
-
-        jas_stream_close(enc->tmpstream);
-        enc->tmpstream = 0;
-
-        jpc_enc_tile_destroy(enc->curtile);
-        enc->curtile = 0;
-
-    }
-
-    return 0;
-}
-
-int jpc_enc_encodetiledata(jpc_enc_t *enc)
-{
-assert(enc->tmpstream);
-    if (jpc_enc_encpkts(enc, enc->tmpstream)) {
-        return -1;
-    }
-    return 0;
-}
-
-int dump_passes(jpc_enc_pass_t *passes, int numpasses, jpc_enc_cblk_t *cblk)
-{
-    jpc_enc_pass_t *pass;
-    int i;
-    jas_stream_memobj_t *smo;
-
-    smo = cblk->stream->obj_;
-
-    pass = passes;
-    for (i = 0; i < numpasses; ++i) {
-        jas_eprintf("start=%d end=%d type=%d term=%d lyrno=%d firstchar=%02x size=%ld pos=%ld\n",
-          (int)pass->start, (int)pass->end, (int)pass->type, (int)pass->term, (int)pass->lyrno,
-          smo->buf_[pass->start], (long)smo->len_, (long)smo->pos_);
-#if 0
-        jas_memdump(stderr, &smo->buf_[pass->start], pass->end - pass->start);
-#endif
-        ++pass;
-    }
-    return 0;
-}
-
-void jpc_quantize(jas_matrix_t *data, jpc_fix_t stepsize)
-{
-    int i;
-    int j;
-    jpc_fix_t t;
-
-    if (stepsize == jpc_inttofix(1)) {
-        return;
-    }
-
-    for (i = 0; i < jas_matrix_numrows(data); ++i) {
-        for (j = 0; j < jas_matrix_numcols(data); ++j) {
-            t = jas_matrix_get(data, i, j);
-
-{
-    if (t < 0) {
-        t = jpc_fix_neg(jpc_fix_div(jpc_fix_neg(t), stepsize));
-    } else {
-        t = jpc_fix_div(t, stepsize);
-    }
-}
-
-            jas_matrix_set(data, i, j, t);
-        }
-    }
-}
-
-void calcrdslopes(jpc_enc_cblk_t *cblk)
-{
-    jpc_enc_pass_t *endpasses;
-    jpc_enc_pass_t *pass0;
-    jpc_enc_pass_t *pass1;
-    jpc_enc_pass_t *pass2;
-    jpc_flt_t slope0;
-    jpc_flt_t slope;
-    jpc_flt_t dd;
-    long dr;
-
-    endpasses = &cblk->passes[cblk->numpasses];
-    pass2 = cblk->passes;
-    slope0 = 0;
-    while (pass2 != endpasses) {
-        pass0 = 0;
-        for (pass1 = cblk->passes; pass1 != endpasses; ++pass1) {
-            dd = pass1->cumwmsedec;
-            dr = pass1->end;
-            if (pass0) {
-                dd -= pass0->cumwmsedec;
-                dr -= pass0->end;
-            }
-            if (dd <= 0) {
-                pass1->rdslope = JPC_BADRDSLOPE;
-                if (pass1 >= pass2) {
-                    pass2 = &pass1[1];
-                }
-                continue;
-            }
-            if (pass1 < pass2 && pass1->rdslope <= 0) {
-                continue;
-            }
-            if (!dr) {
-                assert(pass0);
-                pass0->rdslope = 0;
-                break;
-            }
-            slope = dd / dr;
-            if (pass0 && slope >= slope0) {
-                pass0->rdslope = 0;
-                break;
-            }
-            pass1->rdslope = slope;
-            if (pass1 >= pass2) {
-                pass2 = &pass1[1];
-            }
-            pass0 = pass1;
-            slope0 = slope;
-        }
-    }
-
-#if 0
-    for (pass0 = cblk->passes; pass0 != endpasses; ++pass0) {
-if (pass0->rdslope > 0.0) {
-        jas_eprintf("pass %02d nmsedec=%lf dec=%lf end=%d %lf\n", pass0 - cblk->passes,
-          fixtodbl(pass0->nmsedec), pass0->wmsedec, pass0->end, pass0->rdslope);
-}
-    }
-#endif
-}
-
-void dump_layeringinfo(jpc_enc_t *enc)
-{
-
-    jpc_enc_tcmpt_t *tcmpt;
-    int tcmptno;
-    jpc_enc_rlvl_t *rlvl;
-    int rlvlno;
-    jpc_enc_band_t *band;
-    int bandno;
-    jpc_enc_prc_t *prc;
-    int prcno;
-    jpc_enc_cblk_t *cblk;
-    int cblkno;
-    jpc_enc_pass_t *pass;
-    int passno;
-    int lyrno;
-    jpc_enc_tile_t *tile;
-
-    tile = enc->curtile;
-
-    for (lyrno = 0; lyrno < tile->numlyrs; ++lyrno) {
-        jas_eprintf("lyrno = %02d\n", lyrno);
-        for (tcmptno = 0, tcmpt = tile->tcmpts; tcmptno < tile->numtcmpts;
-          ++tcmptno, ++tcmpt) {
-            for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-              ++rlvlno, ++rlvl) {
-                if (!rlvl->bands) {
-                    continue;
-                }
-                for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-                  ++bandno, ++band) {
-                    if (!band->data) {
-                        continue;
-                    }
-                    for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs;
-                      ++prcno, ++prc) {
-                        if (!prc->cblks) {
-                            continue;
-                        }
-                        for (cblkno = 0, cblk = prc->cblks; cblkno <
-                          prc->numcblks; ++cblkno, ++cblk) {
-                            for (passno = 0, pass = cblk->passes; passno <
-                              cblk->numpasses && pass->lyrno == lyrno;
-                              ++passno, ++pass) {
-                                jas_eprintf("lyrno=%02d cmptno=%02d rlvlno=%02d bandno=%02d prcno=%02d cblkno=%03d passno=%03d\n", lyrno, tcmptno, rlvlno, bandno, prcno, cblkno, passno);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-int rateallocate(jpc_enc_t *enc, int numlyrs, uint_fast32_t *cumlens)
-{
-    jpc_flt_t lo;
-    jpc_flt_t hi;
-    jas_stream_t *out;
-    long cumlen;
-    int lyrno;
-    jpc_flt_t thresh;
-    jpc_flt_t goodthresh;
-    int success;
-    long pos;
-    long oldpos;
-    int numiters;
-
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_rlvl_t *endlvls;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    jpc_enc_pass_t *pass;
-    jpc_enc_pass_t *endpasses;
-    jpc_enc_pass_t *pass1;
-    jpc_flt_t mxrdslope;
-    jpc_flt_t mnrdslope;
-    jpc_enc_tile_t *tile;
-    jpc_enc_prc_t *prc;
-    int prcno;
-
-    tile = enc->curtile;
-
-    for (lyrno = 1; lyrno < numlyrs - 1; ++lyrno) {
-        if (cumlens[lyrno - 1] > cumlens[lyrno]) {
-            abort();
-        }
-    }
-
-    if (!(out = jas_stream_memopen(0, 0))) {
-        return -1;
-    }
-
-
-    /* Find minimum and maximum R-D slope values. */
-    mnrdslope = DBL_MAX;
-    mxrdslope = 0;
-    endcomps = &tile->tcmpts[tile->numtcmpts];
-    for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-        endlvls = &comp->rlvls[comp->numrlvls];
-        for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-            if (!lvl->bands) {
-                continue;
-            }
-            endbands = &lvl->bands[lvl->numbands];
-            for (band = lvl->bands; band != endbands; ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    endcblks = &prc->cblks[prc->numcblks];
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        calcrdslopes(cblk);
-                        endpasses = &cblk->passes[cblk->numpasses];
-                        for (pass = cblk->passes; pass != endpasses; ++pass) {
-                            if (pass->rdslope > 0) {
-                                if (pass->rdslope < mnrdslope) {
-                                    mnrdslope = pass->rdslope;
-                                }
-                                if (pass->rdslope > mxrdslope) {
-                                    mxrdslope = pass->rdslope;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-if (jas_getdbglevel()) {
-    jas_eprintf("min rdslope = %f max rdslope = %f\n", mnrdslope, mxrdslope);
-}
-
-    jpc_init_t2state(enc, 1);
-
-    for (lyrno = 0; lyrno < numlyrs; ++lyrno) {
-
-        lo = mnrdslope;
-        hi = mxrdslope;
-
-        success = 0;
-        goodthresh = 0;
-        numiters = 0;
-
-        do {
-
-            cumlen = cumlens[lyrno];
-            if (cumlen == UINT_FAST32_MAX) {
-                /* Only the last layer can be free of a rate
-                  constraint (e.g., for lossless coding). */
-                assert(lyrno == numlyrs - 1);
-                goodthresh = -1;
-                success = 1;
-                break;
-            }
-
-            thresh = (lo + hi) / 2;
-
-            /* Save the tier 2 coding state. */
-            jpc_save_t2state(enc);
-            oldpos = jas_stream_tell(out);
-            assert(oldpos >= 0);
-
-            /* Assign all passes with R-D slopes greater than or
-              equal to the current threshold to this layer. */
-            endcomps = &tile->tcmpts[tile->numtcmpts];
-            for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-                endlvls = &comp->rlvls[comp->numrlvls];
-                for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-                    if (!lvl->bands) {
-                        continue;
-                    }
-                    endbands = &lvl->bands[lvl->numbands];
-                    for (band = lvl->bands; band != endbands; ++band) {
-                        if (!band->data) {
-                            continue;
-                        }
-                        for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                            if (!prc->cblks) {
-                                continue;
-                            }
-                            endcblks = &prc->cblks[prc->numcblks];
-                            for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                                if (cblk->curpass) {
-                                    endpasses = &cblk->passes[cblk->numpasses];
-                                    pass1 = cblk->curpass;
-                                    for (pass = cblk->curpass; pass != endpasses; ++pass) {
-                                        if (pass->rdslope >= thresh) {
-                                            pass1 = &pass[1];
-                                        }
-                                    }
-                                    for (pass = cblk->curpass; pass != pass1; ++pass) {
-                                        pass->lyrno = lyrno;
-                                    }
-                                    for (; pass != endpasses; ++pass) {
-                                        pass->lyrno = -1;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-
-            /* Perform tier 2 coding. */
-            endcomps = &tile->tcmpts[tile->numtcmpts];
-            for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-                endlvls = &comp->rlvls[comp->numrlvls];
-                for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-                    if (!lvl->bands) {
-                        continue;
-                    }
-                    for (prcno = 0; prcno < lvl->numprcs; ++prcno) {
-                        if (jpc_enc_encpkt(enc, out, comp - tile->tcmpts, lvl - comp->rlvls, prcno, lyrno)) {
-                            return -1;
-                        }
-                    }
-                }
-            }
-
-            pos = jas_stream_tell(out);
-
-            /* Check the rate constraint. */
-            assert(pos >= 0);
-            if (pos > cumlen) {
-                /* The rate is too high. */
-                lo = thresh;
-            } else if (pos <= cumlen) {
-                /* The rate is low enough, so try higher. */
-                hi = thresh;
-                if (!success || thresh < goodthresh) {
-                    goodthresh = thresh;
-                    success = 1;
-                }
-            }
-
-            /* Save the tier 2 coding state. */
-            jpc_restore_t2state(enc);
-            if (jas_stream_seek(out, oldpos, SEEK_SET) < 0) {
-                abort();
-            }
-
-if (jas_getdbglevel()) {
-jas_eprintf("maxlen=%08ld actuallen=%08ld thresh=%f\n", cumlen, pos, thresh);
-}
-
-            ++numiters;
-        } while (lo < hi - 1e-3 && numiters < 32);
-
-        if (!success) {
-            jas_eprintf("warning: empty layer generated\n");
-        }
-
-if (jas_getdbglevel()) {
-jas_eprintf("success %d goodthresh %f\n", success, goodthresh);
-}
-
-        /* Assign all passes with R-D slopes greater than or
-          equal to the selected threshold to this layer. */
-        endcomps = &tile->tcmpts[tile->numtcmpts];
-        for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-            endlvls = &comp->rlvls[comp->numrlvls];
-            for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-if (!lvl->bands) {
-    continue;
-}
-                endbands = &lvl->bands[lvl->numbands];
-                for (band = lvl->bands; band != endbands; ++band) {
-                    if (!band->data) {
-                        continue;
-                    }
-                    for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                        if (!prc->cblks) {
-                            continue;
-                        }
-                        endcblks = &prc->cblks[prc->numcblks];
-                        for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                            if (cblk->curpass) {
-                                endpasses = &cblk->passes[cblk->numpasses];
-                                pass1 = cblk->curpass;
-                                if (success) {
-                                    for (pass = cblk->curpass; pass != endpasses; ++pass) {
-                                        if (pass->rdslope >= goodthresh) {
-                                            pass1 = &pass[1];
-                                        }
-                                    }
-                                }
-                                for (pass = cblk->curpass; pass != pass1; ++pass) {
-                                    pass->lyrno = lyrno;
-                                }
-                                for (; pass != endpasses; ++pass) {
-                                    pass->lyrno = -1;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        /* Perform tier 2 coding. */
-        endcomps = &tile->tcmpts[tile->numtcmpts];
-        for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-            endlvls = &comp->rlvls[comp->numrlvls];
-            for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-                if (!lvl->bands) {
-                    continue;
-                }
-                for (prcno = 0; prcno < lvl->numprcs; ++prcno) {
-                    if (jpc_enc_encpkt(enc, out, comp - tile->tcmpts, lvl - comp->rlvls, prcno, lyrno)) {
-                        return -1;
-                    }
-                }
-            }
-        }
-    }
-
-    if (jas_getdbglevel() >= 5) {
-        dump_layeringinfo(enc);
-    }
-
-    jas_stream_close(out);
-
-    JAS_DBGLOG(10, ("done doing rateallocation\n"));
-#if 0
-jas_eprintf("DONE RATE ALLOCATE\n");
-#endif
-
-    return 0;
-}
-
-/******************************************************************************\
-* Tile constructors and destructors.
-\******************************************************************************/
-
-jpc_enc_tile_t *jpc_enc_tile_create(jpc_enc_cp_t *cp, jas_image_t *image, int tileno)
-{
-    jpc_enc_tile_t *tile;
-    uint_fast32_t htileno;
-    uint_fast32_t vtileno;
-    uint_fast16_t lyrno;
-    uint_fast16_t cmptno;
-    jpc_enc_tcmpt_t *tcmpt;
-
-    if (!(tile = jas_malloc(sizeof(jpc_enc_tile_t)))) {
-        goto error;
-    }
-
-    /* Initialize a few members used in error recovery. */
-    tile->tcmpts = 0;
-    tile->lyrsizes = 0;
-    tile->numtcmpts = cp->numcmpts;
-    tile->pi = 0;
-
-    tile->tileno = tileno;
-    htileno = tileno % cp->numhtiles;
-    vtileno = tileno / cp->numhtiles;
-
-    /* Calculate the coordinates of the top-left and bottom-right
-      corners of the tile. */
-    tile->tlx = JAS_MAX(cp->tilegrdoffx + htileno * cp->tilewidth,
-      cp->imgareatlx);
-    tile->tly = JAS_MAX(cp->tilegrdoffy + vtileno * cp->tileheight,
-      cp->imgareatly);
-    tile->brx = JAS_MIN(cp->tilegrdoffx + (htileno + 1) * cp->tilewidth,
-      cp->refgrdwidth);
-    tile->bry = JAS_MIN(cp->tilegrdoffy + (vtileno + 1) * cp->tileheight,
-      cp->refgrdheight);
-
-    /* Initialize some tile coding parameters. */
-    tile->intmode = cp->tcp.intmode;
-    tile->csty = cp->tcp.csty;
-    tile->prg = cp->tcp.prg;
-    tile->mctid = cp->tcp.mctid;
-
-    tile->numlyrs = cp->tcp.numlyrs;
-    if (!(tile->lyrsizes = jas_malloc(tile->numlyrs *
-      sizeof(uint_fast32_t)))) {
-        goto error;
-    }
-    for (lyrno = 0; lyrno < tile->numlyrs; ++lyrno) {
-        tile->lyrsizes[lyrno] = 0;
-    }
-
-    /* Allocate an array for the per-tile-component information. */
-    if (!(tile->tcmpts = jas_malloc(cp->numcmpts * sizeof(jpc_enc_tcmpt_t)))) {
-        goto error;
-    }
-    /* Initialize a few members critical for error recovery. */
-    for (cmptno = 0, tcmpt = tile->tcmpts; cmptno < cp->numcmpts;
-      ++cmptno, ++tcmpt) {
-        tcmpt->rlvls = 0;
-        tcmpt->tsfb = 0;
-        tcmpt->data = 0;
-    }
-    /* Initialize the per-tile-component information. */
-    for (cmptno = 0, tcmpt = tile->tcmpts; cmptno < cp->numcmpts;
-      ++cmptno, ++tcmpt) {
-        if (!tcmpt_create(tcmpt, cp, image, tile)) {
-            goto error;
-        }
-    }
-
-    /* Initialize the synthesis weights for the MCT. */
-    switch (tile->mctid) {
-    case JPC_MCT_RCT:
-        tile->tcmpts[0].synweight = jpc_dbltofix(sqrt(3.0));
-        tile->tcmpts[1].synweight = jpc_dbltofix(sqrt(0.6875));
-        tile->tcmpts[2].synweight = jpc_dbltofix(sqrt(0.6875));
-        break;
-    case JPC_MCT_ICT:
-        tile->tcmpts[0].synweight = jpc_dbltofix(sqrt(3.0000));
-        tile->tcmpts[1].synweight = jpc_dbltofix(sqrt(3.2584));
-        tile->tcmpts[2].synweight = jpc_dbltofix(sqrt(2.4755));
-        break;
-    default:
-    case JPC_MCT_NONE:
-        for (cmptno = 0, tcmpt = tile->tcmpts; cmptno < cp->numcmpts;
-          ++cmptno, ++tcmpt) {
-            tcmpt->synweight = JPC_FIX_ONE;
-        }
-        break;
-    }
-
-    if (!(tile->pi = jpc_enc_pi_create(cp, tile))) {
-        goto error;
-    }
-
-    return tile;
-
-error:
-
-    if (tile) {
-        jpc_enc_tile_destroy(tile);
-    }
-    return 0;
-}
-
-void jpc_enc_tile_destroy(jpc_enc_tile_t *tile)
-{
-    jpc_enc_tcmpt_t *tcmpt;
-    uint_fast16_t cmptno;
-
-    if (tile->tcmpts) {
-        for (cmptno = 0, tcmpt = tile->tcmpts; cmptno <
-          tile->numtcmpts; ++cmptno, ++tcmpt) {
-            tcmpt_destroy(tcmpt);
-        }
-        jas_free(tile->tcmpts);
-    }
-    if (tile->lyrsizes) {
-        jas_free(tile->lyrsizes);
-    }
-    if (tile->pi) {
-        jpc_pi_destroy(tile->pi);
-    }
-    jas_free(tile);
-}
-
-static jpc_enc_tcmpt_t *tcmpt_create(jpc_enc_tcmpt_t *tcmpt, jpc_enc_cp_t *cp,
-  jas_image_t *image, jpc_enc_tile_t *tile)
-{
-    uint_fast16_t cmptno;
-    uint_fast16_t rlvlno;
-    jpc_enc_rlvl_t *rlvl;
-    uint_fast32_t tlx;
-    uint_fast32_t tly;
-    uint_fast32_t brx;
-    uint_fast32_t bry;
-    uint_fast32_t cmpttlx;
-    uint_fast32_t cmpttly;
-    jpc_enc_ccp_t *ccp;
-    jpc_tsfb_band_t bandinfos[JPC_MAXBANDS];
-
-    tcmpt->tile = tile;
-    tcmpt->tsfb = 0;
-    tcmpt->data = 0;
-    tcmpt->rlvls = 0;
-
-    /* Deduce the component number. */
-    cmptno = tcmpt - tile->tcmpts;
-
-    ccp = &cp->ccps[cmptno];
-
-    /* Compute the coordinates of the top-left and bottom-right
-      corners of this tile-component. */
-    tlx = JPC_CEILDIV(tile->tlx, ccp->sampgrdstepx);
-    tly = JPC_CEILDIV(tile->tly, ccp->sampgrdstepy);
-    brx = JPC_CEILDIV(tile->brx, ccp->sampgrdstepx);
-    bry = JPC_CEILDIV(tile->bry, ccp->sampgrdstepy);
-
-    /* Create a sequence to hold the tile-component sample data. */
-    if (!(tcmpt->data = jas_seq2d_create(tlx, tly, brx, bry))) {
-        goto error;
-    }
-
-    /* Get the image data associated with this tile-component. */
-    cmpttlx = JPC_CEILDIV(cp->imgareatlx, ccp->sampgrdstepx);
-    cmpttly = JPC_CEILDIV(cp->imgareatly, ccp->sampgrdstepy);
-    if (jas_image_readcmpt(image, cmptno, tlx - cmpttlx, tly - cmpttly,
-      brx - tlx, bry - tly, tcmpt->data)) {
-        goto error;
-    }
-
-    tcmpt->synweight = 0;
-    tcmpt->qmfbid = cp->tccp.qmfbid;
-    tcmpt->numrlvls = cp->tccp.maxrlvls;
-    tcmpt->numbands = 3 * tcmpt->numrlvls - 2;
-    if (!(tcmpt->tsfb = jpc_cod_gettsfb(tcmpt->qmfbid, tcmpt->numrlvls - 1))) {
-        goto error;
-    }
-
-    for (rlvlno = 0; rlvlno < tcmpt->numrlvls; ++rlvlno) {
-        tcmpt->prcwidthexpns[rlvlno] = cp->tccp.prcwidthexpns[rlvlno];
-        tcmpt->prcheightexpns[rlvlno] = cp->tccp.prcheightexpns[rlvlno];
-    }
-    tcmpt->cblkwidthexpn = cp->tccp.cblkwidthexpn;
-    tcmpt->cblkheightexpn = cp->tccp.cblkheightexpn;
-    tcmpt->cblksty = cp->tccp.cblksty;
-    tcmpt->csty = cp->tccp.csty;
-
-    tcmpt->numstepsizes = tcmpt->numbands;
-    assert(tcmpt->numstepsizes <= JPC_MAXBANDS);
-    memset(tcmpt->stepsizes, 0, sizeof(tcmpt->numstepsizes *
-      sizeof(uint_fast16_t)));
-
-    /* Retrieve information about the various bands. */
-    jpc_tsfb_getbands(tcmpt->tsfb, jas_seq2d_xstart(tcmpt->data),
-      jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data),
-      jas_seq2d_yend(tcmpt->data), bandinfos);
-
-    if (!(tcmpt->rlvls = jas_malloc(tcmpt->numrlvls * sizeof(jpc_enc_rlvl_t)))) {
-        goto error;
-    }
-    for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-      ++rlvlno, ++rlvl) {
-        rlvl->bands = 0;
-        rlvl->tcmpt = tcmpt;
-    }
-    for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-      ++rlvlno, ++rlvl) {
-        if (!rlvl_create(rlvl, cp, tcmpt, bandinfos)) {
-            goto error;
-        }
-    }
-
-    return tcmpt;
-
-error:
-
-    tcmpt_destroy(tcmpt);
-    return 0;
-
-}
-
-static void tcmpt_destroy(jpc_enc_tcmpt_t *tcmpt)
-{
-    jpc_enc_rlvl_t *rlvl;
-    uint_fast16_t rlvlno;
-
-    if (tcmpt->rlvls) {
-        for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-          ++rlvlno, ++rlvl) {
-            rlvl_destroy(rlvl);
-        }
-        jas_free(tcmpt->rlvls);
-    }
-
-    if (tcmpt->data) {
-        jas_seq2d_destroy(tcmpt->data);
-    }
-    if (tcmpt->tsfb) {
-        jpc_tsfb_destroy(tcmpt->tsfb);
-    }
-}
-
-static jpc_enc_rlvl_t *rlvl_create(jpc_enc_rlvl_t *rlvl, jpc_enc_cp_t *cp,
-  jpc_enc_tcmpt_t *tcmpt, jpc_tsfb_band_t *bandinfos)
-{
-    uint_fast16_t rlvlno;
-    uint_fast32_t tlprctlx;
-    uint_fast32_t tlprctly;
-    uint_fast32_t brprcbrx;
-    uint_fast32_t brprcbry;
-    uint_fast16_t bandno;
-    jpc_enc_band_t *band;
-
-    /* Deduce the resolution level. */
-    rlvlno = rlvl - tcmpt->rlvls;
-
-    /* Initialize members required for error recovery. */
-    rlvl->bands = 0;
-    rlvl->tcmpt = tcmpt;
-
-    /* Compute the coordinates of the top-left and bottom-right
-      corners of the tile-component at this resolution. */
-    rlvl->tlx = JPC_CEILDIVPOW2(jas_seq2d_xstart(tcmpt->data), tcmpt->numrlvls -
-      1 - rlvlno);
-    rlvl->tly = JPC_CEILDIVPOW2(jas_seq2d_ystart(tcmpt->data), tcmpt->numrlvls -
-      1 - rlvlno);
-    rlvl->brx = JPC_CEILDIVPOW2(jas_seq2d_xend(tcmpt->data), tcmpt->numrlvls -
-      1 - rlvlno);
-    rlvl->bry = JPC_CEILDIVPOW2(jas_seq2d_yend(tcmpt->data), tcmpt->numrlvls -
-      1 - rlvlno);
-
-    if (rlvl->tlx >= rlvl->brx || rlvl->tly >= rlvl->bry) {
-        rlvl->numhprcs = 0;
-        rlvl->numvprcs = 0;
-        rlvl->numprcs = 0;
-        return rlvl;
-    }
-
-    rlvl->numbands = (!rlvlno) ? 1 : 3;
-    rlvl->prcwidthexpn = cp->tccp.prcwidthexpns[rlvlno];
-    rlvl->prcheightexpn = cp->tccp.prcheightexpns[rlvlno];
-    if (!rlvlno) {
-        rlvl->cbgwidthexpn = rlvl->prcwidthexpn;
-        rlvl->cbgheightexpn = rlvl->prcheightexpn;
-    } else {
-        rlvl->cbgwidthexpn = rlvl->prcwidthexpn - 1;
-        rlvl->cbgheightexpn = rlvl->prcheightexpn - 1;
-    }
-    rlvl->cblkwidthexpn = JAS_MIN(cp->tccp.cblkwidthexpn, rlvl->cbgwidthexpn);
-    rlvl->cblkheightexpn = JAS_MIN(cp->tccp.cblkheightexpn, rlvl->cbgheightexpn);
-
-    /* Compute the number of precincts. */
-    tlprctlx = JPC_FLOORTOMULTPOW2(rlvl->tlx, rlvl->prcwidthexpn);
-    tlprctly = JPC_FLOORTOMULTPOW2(rlvl->tly, rlvl->prcheightexpn);
-    brprcbrx = JPC_CEILTOMULTPOW2(rlvl->brx, rlvl->prcwidthexpn);
-    brprcbry = JPC_CEILTOMULTPOW2(rlvl->bry, rlvl->prcheightexpn);
-    rlvl->numhprcs = JPC_FLOORDIVPOW2(brprcbrx - tlprctlx, rlvl->prcwidthexpn);
-    rlvl->numvprcs = JPC_FLOORDIVPOW2(brprcbry - tlprctly, rlvl->prcheightexpn);
-    rlvl->numprcs = rlvl->numhprcs * rlvl->numvprcs;
-
-    if (!(rlvl->bands = jas_malloc(rlvl->numbands * sizeof(jpc_enc_band_t)))) {
-        goto error;
-    }
-    for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-      ++bandno, ++band) {
-        band->prcs = 0;
-        band->data = 0;
-        band->rlvl = rlvl;
-    }
-    for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-      ++bandno, ++band) {
-        if (!band_create(band, cp, rlvl, bandinfos)) {
-            goto error;
-        }
-    }
-
-    return rlvl;
-error:
-
-    rlvl_destroy(rlvl);
-    return 0;
-}
-
-static void rlvl_destroy(jpc_enc_rlvl_t *rlvl)
-{
-    jpc_enc_band_t *band;
-    uint_fast16_t bandno;
-
-    if (rlvl->bands) {
-        for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-          ++bandno, ++band) {
-            band_destroy(band);
-        }
-        jas_free(rlvl->bands);
-    }
-}
-
-static jpc_enc_band_t *band_create(jpc_enc_band_t *band, jpc_enc_cp_t *cp,
-  jpc_enc_rlvl_t *rlvl, jpc_tsfb_band_t *bandinfos)
-{
-    uint_fast16_t bandno;
-    uint_fast16_t gblbandno;
-    uint_fast16_t rlvlno;
-    jpc_tsfb_band_t *bandinfo;
-    jpc_enc_tcmpt_t *tcmpt;
-    uint_fast32_t prcno;
-    jpc_enc_prc_t *prc;
-
-    tcmpt = rlvl->tcmpt;
-    band->data = 0;
-    band->prcs = 0;
-    band->rlvl = rlvl;
-
-    /* Deduce the resolution level and band number. */
-    rlvlno = rlvl - rlvl->tcmpt->rlvls;
-    bandno = band - rlvl->bands;
-    gblbandno = (!rlvlno) ? 0 : (3 * (rlvlno - 1) + bandno + 1);
-
-    bandinfo = &bandinfos[gblbandno];
-
-if (bandinfo->xstart != bandinfo->xend && bandinfo->ystart != bandinfo->yend) {
-    if (!(band->data = jas_seq2d_create(0, 0, 0, 0))) {
-        goto error;
-    }
-    jas_seq2d_bindsub(band->data, tcmpt->data, bandinfo->locxstart,
-      bandinfo->locystart, bandinfo->locxend, bandinfo->locyend);
-    jas_seq2d_setshift(band->data, bandinfo->xstart, bandinfo->ystart);
-}
-    band->orient = bandinfo->orient;
-    band->analgain = JPC_NOMINALGAIN(cp->tccp.qmfbid, tcmpt->numrlvls, rlvlno,
-      band->orient);
-    band->numbps = 0;
-    band->absstepsize = 0;
-    band->stepsize = 0;
-    band->synweight = bandinfo->synenergywt;
-
-if (band->data) {
-    if (!(band->prcs = jas_malloc(rlvl->numprcs * sizeof(jpc_enc_prc_t)))) {
-        goto error;
-    }
-    for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-      ++prc) {
-        prc->cblks = 0;
-        prc->incltree = 0;
-        prc->nlibtree = 0;
-        prc->savincltree = 0;
-        prc->savnlibtree = 0;
-        prc->band = band;
-    }
-    for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs; ++prcno,
-      ++prc) {
-        if (!prc_create(prc, cp, band)) {
-            goto error;
-        }
-    }
-}
-
-    return band;
-
-error:
-    band_destroy(band);
-    return 0;
-}
-
-static void band_destroy(jpc_enc_band_t *band)
-{
-    jpc_enc_prc_t *prc;
-    jpc_enc_rlvl_t *rlvl;
-    uint_fast32_t prcno;
-
-    if (band->prcs) {
-        rlvl = band->rlvl;
-        for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs;
-          ++prcno, ++prc) {
-            prc_destroy(prc);
-        }
-        jas_free(band->prcs);
-    }
-    if (band->data) {
-        jas_seq2d_destroy(band->data);
-    }
-}
-
-static jpc_enc_prc_t *prc_create(jpc_enc_prc_t *prc, jpc_enc_cp_t *cp, jpc_enc_band_t *band)
-{
-    uint_fast32_t prcno;
-    uint_fast32_t prcxind;
-    uint_fast32_t prcyind;
-    uint_fast32_t cbgtlx;
-    uint_fast32_t cbgtly;
-    uint_fast32_t tlprctlx;
-    uint_fast32_t tlprctly;
-    uint_fast32_t tlcbgtlx;
-    uint_fast32_t tlcbgtly;
-    uint_fast16_t rlvlno;
-    jpc_enc_rlvl_t *rlvl;
-    uint_fast32_t tlcblktlx;
-    uint_fast32_t tlcblktly;
-    uint_fast32_t brcblkbrx;
-    uint_fast32_t brcblkbry;
-    uint_fast32_t cblkno;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_tcmpt_t *tcmpt;
-
-    prc->cblks = 0;
-    prc->incltree = 0;
-    prc->savincltree = 0;
-    prc->nlibtree = 0;
-    prc->savnlibtree = 0;
-
-    rlvl = band->rlvl;
-    tcmpt = rlvl->tcmpt;
-rlvlno = rlvl - tcmpt->rlvls;
-    prcno = prc - band->prcs;
-    prcxind = prcno % rlvl->numhprcs;
-    prcyind = prcno / rlvl->numhprcs;
-    prc->band = band;
-
-tlprctlx = JPC_FLOORTOMULTPOW2(rlvl->tlx, rlvl->prcwidthexpn);
-tlprctly = JPC_FLOORTOMULTPOW2(rlvl->tly, rlvl->prcheightexpn);
-if (!rlvlno) {
-    tlcbgtlx = tlprctlx;
-    tlcbgtly = tlprctly;
-} else {
-    tlcbgtlx = JPC_CEILDIVPOW2(tlprctlx, 1);
-    tlcbgtly = JPC_CEILDIVPOW2(tlprctly, 1);
-}
-
-    /* Compute the coordinates of the top-left and bottom-right
-      corners of the precinct. */
-    cbgtlx = tlcbgtlx + (prcxind << rlvl->cbgwidthexpn);
-    cbgtly = tlcbgtly + (prcyind << rlvl->cbgheightexpn);
-    prc->tlx = JAS_MAX(jas_seq2d_xstart(band->data), cbgtlx);
-    prc->tly = JAS_MAX(jas_seq2d_ystart(band->data), cbgtly);
-    prc->brx = JAS_MIN(jas_seq2d_xend(band->data), cbgtlx +
-      (1 << rlvl->cbgwidthexpn));
-    prc->bry = JAS_MIN(jas_seq2d_yend(band->data), cbgtly +
-      (1 << rlvl->cbgheightexpn));
-
-    if (prc->tlx < prc->brx && prc->tly < prc->bry) {
-        /* The precinct contains at least one code block. */
-
-        tlcblktlx = JPC_FLOORTOMULTPOW2(prc->tlx, rlvl->cblkwidthexpn);
-        tlcblktly = JPC_FLOORTOMULTPOW2(prc->tly, rlvl->cblkheightexpn);
-        brcblkbrx = JPC_CEILTOMULTPOW2(prc->brx, rlvl->cblkwidthexpn);
-        brcblkbry = JPC_CEILTOMULTPOW2(prc->bry, rlvl->cblkheightexpn);
-        prc->numhcblks = JPC_FLOORDIVPOW2(brcblkbrx - tlcblktlx,
-          rlvl->cblkwidthexpn);
-        prc->numvcblks = JPC_FLOORDIVPOW2(brcblkbry - tlcblktly,
-          rlvl->cblkheightexpn);
-        prc->numcblks = prc->numhcblks * prc->numvcblks;
-
-        if (!(prc->incltree = jpc_tagtree_create(prc->numhcblks,
-          prc->numvcblks))) {
-            goto error;
-        }
-        if (!(prc->nlibtree = jpc_tagtree_create(prc->numhcblks,
-          prc->numvcblks))) {
-            goto error;
-        }
-        if (!(prc->savincltree = jpc_tagtree_create(prc->numhcblks,
-          prc->numvcblks))) {
-            goto error;
-        }
-        if (!(prc->savnlibtree = jpc_tagtree_create(prc->numhcblks,
-          prc->numvcblks))) {
-            goto error;
-        }
-
-        if (!(prc->cblks = jas_malloc(prc->numcblks * sizeof(jpc_enc_cblk_t)))) {
-            goto error;
-        }
-        for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-          ++cblkno, ++cblk) {
-            cblk->passes = 0;
-            cblk->stream = 0;
-            cblk->mqenc = 0;
-            cblk->data = 0;
-            cblk->flags = 0;
-            cblk->prc = prc;
-        }
-        for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-          ++cblkno, ++cblk) {
-            if (!cblk_create(cblk, cp, prc)) {
-                goto error;
-            }
-        }
-    } else {
-        /* The precinct does not contain any code blocks. */
-        prc->tlx = prc->brx;
-        prc->tly = prc->bry;
-        prc->numcblks = 0;
-        prc->numhcblks = 0;
-        prc->numvcblks = 0;
-        prc->cblks = 0;
-        prc->incltree = 0;
-        prc->nlibtree = 0;
-        prc->savincltree = 0;
-        prc->savnlibtree = 0;
-    }
-
-    return prc;
-
-error:
-    prc_destroy(prc);
-    return 0;
-}
-
-static void prc_destroy(jpc_enc_prc_t *prc)
-{
-    jpc_enc_cblk_t *cblk;
-    uint_fast32_t cblkno;
-
-    if (prc->cblks) {
-        for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-          ++cblkno, ++cblk) {
-            cblk_destroy(cblk);
-        }
-        jas_free(prc->cblks);
-    }
-    if (prc->incltree) {
-        jpc_tagtree_destroy(prc->incltree);
-    }
-    if (prc->nlibtree) {
-        jpc_tagtree_destroy(prc->nlibtree);
-    }
-    if (prc->savincltree) {
-        jpc_tagtree_destroy(prc->savincltree);
-    }
-    if (prc->savnlibtree) {
-        jpc_tagtree_destroy(prc->savnlibtree);
-    }
-}
-
-static jpc_enc_cblk_t *cblk_create(jpc_enc_cblk_t *cblk, jpc_enc_cp_t *cp, jpc_enc_prc_t *prc)
-{
-    jpc_enc_band_t *band;
-    uint_fast32_t cblktlx;
-    uint_fast32_t cblktly;
-    uint_fast32_t cblkbrx;
-    uint_fast32_t cblkbry;
-    jpc_enc_rlvl_t *rlvl;
-    uint_fast32_t cblkxind;
-    uint_fast32_t cblkyind;
-    uint_fast32_t cblkno;
-    uint_fast32_t tlcblktlx;
-    uint_fast32_t tlcblktly;
-
-    cblkno = cblk - prc->cblks;
-    cblkxind = cblkno % prc->numhcblks;
-    cblkyind = cblkno / prc->numhcblks;
-    rlvl = prc->band->rlvl;
-    cblk->prc = prc;
-
-    cblk->numpasses = 0;
-    cblk->passes = 0;
-    cblk->numencpasses = 0;
-    cblk->numimsbs = 0;
-    cblk->numlenbits = 0;
-    cblk->stream = 0;
-    cblk->mqenc = 0;
-    cblk->flags = 0;
-    cblk->numbps = 0;
-    cblk->curpass = 0;
-    cblk->data = 0;
-    cblk->savedcurpass = 0;
-    cblk->savednumlenbits = 0;
-    cblk->savednumencpasses = 0;
-
-    band = prc->band;
-    tlcblktlx = JPC_FLOORTOMULTPOW2(prc->tlx, rlvl->cblkwidthexpn);
-    tlcblktly = JPC_FLOORTOMULTPOW2(prc->tly, rlvl->cblkheightexpn);
-    cblktlx = JAS_MAX(tlcblktlx + (cblkxind << rlvl->cblkwidthexpn), prc->tlx);
-    cblktly = JAS_MAX(tlcblktly + (cblkyind << rlvl->cblkheightexpn), prc->tly);
-    cblkbrx = JAS_MIN(tlcblktlx + ((cblkxind + 1) << rlvl->cblkwidthexpn),
-      prc->brx);
-    cblkbry = JAS_MIN(tlcblktly + ((cblkyind + 1) << rlvl->cblkheightexpn),
-      prc->bry);
-
-    assert(cblktlx < cblkbrx && cblktly < cblkbry);
-    if (!(cblk->data = jas_seq2d_create(0, 0, 0, 0))) {
-        goto error;
-    }
-    jas_seq2d_bindsub(cblk->data, band->data, cblktlx, cblktly, cblkbrx, cblkbry);
-
-    return cblk;
-
-error:
-    cblk_destroy(cblk);
-    return 0;
-}
-
-static void cblk_destroy(jpc_enc_cblk_t *cblk)
-{
-    uint_fast16_t passno;
-    jpc_enc_pass_t *pass;
-    if (cblk->passes) {
-        for (passno = 0, pass = cblk->passes; passno < cblk->numpasses;
-          ++passno, ++pass) {
-            pass_destroy(pass);
-        }
-        jas_free(cblk->passes);
-    }
-    if (cblk->stream) {
-        jas_stream_close(cblk->stream);
-    }
-    if (cblk->mqenc) {
-        jpc_mqenc_destroy(cblk->mqenc);
-    }
-    if (cblk->data) {
-        jas_seq2d_destroy(cblk->data);
-    }
-    if (cblk->flags) {
-        jas_seq2d_destroy(cblk->flags);
-    }
-}
-
-static void pass_destroy(jpc_enc_pass_t *pass)
-{
-    /* XXX - need to free resources here */
-}
-
-void jpc_enc_dump(jpc_enc_t *enc)
-{
-    jpc_enc_tile_t *tile;
-    jpc_enc_tcmpt_t *tcmpt;
-    jpc_enc_rlvl_t *rlvl;
-    jpc_enc_band_t *band;
-    jpc_enc_prc_t *prc;
-    jpc_enc_cblk_t *cblk;
-    uint_fast16_t cmptno;
-    uint_fast16_t rlvlno;
-    uint_fast16_t bandno;
-    uint_fast32_t prcno;
-    uint_fast32_t cblkno;
-
-    tile = enc->curtile;
-
-    for (cmptno = 0, tcmpt = tile->tcmpts; cmptno < tile->numtcmpts; ++cmptno,
-      ++tcmpt) {
-        jas_eprintf("  tcmpt %5d %5d %5d %5d\n", jas_seq2d_xstart(tcmpt->data), jas_seq2d_ystart(tcmpt->data), jas_seq2d_xend(tcmpt->data), jas_seq2d_yend(tcmpt->data));
-        for (rlvlno = 0, rlvl = tcmpt->rlvls; rlvlno < tcmpt->numrlvls;
-          ++rlvlno, ++rlvl) {
-            jas_eprintf("    rlvl %5d %5d %5d %5d\n", rlvl->tlx, rlvl->tly, rlvl->brx, rlvl->bry);
-            for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-              ++bandno, ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                jas_eprintf("      band %5d %5d %5d %5d\n", jas_seq2d_xstart(band->data), jas_seq2d_ystart(band->data), jas_seq2d_xend(band->data), jas_seq2d_yend(band->data));
-                for (prcno = 0, prc = band->prcs; prcno < rlvl->numprcs;
-                  ++prcno, ++prc) {
-                    jas_eprintf("        prc %5d %5d %5d %5d (%5d %5d)\n", prc->tlx, prc->tly, prc->brx, prc->bry, prc->brx - prc->tlx, prc->bry - prc->tly);
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-                      ++cblkno, ++cblk) {
-                        jas_eprintf("         cblk %5d %5d %5d %5d\n", jas_seq2d_xstart(cblk->data), jas_seq2d_ystart(cblk->data), jas_seq2d_xend(cblk->data), jas_seq2d_yend(cblk->data));
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.h
deleted file mode 100644
index c8af508..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_enc.h
+++ /dev/null
@@ -1,646 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-#ifndef JPC_ENC_H
-#define JPC_ENC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_seq.h"
-
-#include "jpc_t2cod.h"
-#include "jpc_mqenc.h"
-#include "jpc_cod.h"
-#include "jpc_tagtree.h"
-#include "jpc_cs.h"
-#include "jpc_flt.h"
-#include "jpc_tsfb.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* The number of bits used in various lookup tables. */
-#define	JPC_NUMEXTRABITS	JPC_NMSEDEC_FRACBITS
-
-/* An invalid R-D slope value. */
-#define	JPC_BADRDSLOPE	(-1)
-
-/******************************************************************************\
-* Coding parameters types.
-\******************************************************************************/
-
-/* Per-component coding paramters. */
-
-typedef struct {
-
-    /* The horizontal sampling period. */
-    uint_fast8_t sampgrdstepx;
-
-    /* The vertical sampling period. */
-    uint_fast8_t sampgrdstepy;
-
-    /* The sample alignment horizontal offset. */
-    uint_fast8_t sampgrdsubstepx;
-
-    /* The sample alignment vertical offset. */
-    uint_fast8_t sampgrdsubstepy;
-
-    /* The precision of the samples. */
-    uint_fast8_t prec;
-
-    /* The signedness of the samples. */
-    bool sgnd;
-
-    /* The number of step sizes. */
-    uint_fast16_t numstepsizes;
-
-    /* The quantizer step sizes. */
-    uint_fast16_t stepsizes[JPC_MAXBANDS];
-
-} jpc_enc_ccp_t;
-
-/* Per-tile coding parameters. */
-
-typedef struct {
-
-    /* The coding mode. */
-    bool intmode;
-
-    /* The coding style (i.e., SOP, EPH). */
-    uint_fast8_t csty;
-
-    /* The progression order. */
-    uint_fast8_t prg;
-
-    /* The multicomponent transform. */
-    uint_fast8_t mctid;
-
-    /* The number of layers. */
-    uint_fast16_t numlyrs;
-
-    /* The normalized bit rates associated with the various
-      intermediate layers. */
-    jpc_fix_t *ilyrrates;
-
-} jpc_enc_tcp_t;
-
-/* Per tile-component coding parameters. */
-
-typedef struct {
-
-    /* The coding style (i.e., explicit precinct sizes). */
-    uint_fast8_t csty;
-
-    /* The maximum number of resolution levels allowed. */
-    uint_fast8_t maxrlvls;
-
-    /* The exponent for the nominal code block width. */
-    uint_fast16_t cblkwidthexpn;
-
-    /* The exponent for the nominal code block height. */
-    uint_fast16_t cblkheightexpn;
-
-    /* The code block style parameters (e.g., lazy, terminate all,
-      segmentation symbols, causal, reset probability models). */
-    uint_fast8_t cblksty;
-
-    /* The QMFB. */
-    uint_fast8_t qmfbid;
-
-    /* The precinct width values. */
-    uint_fast16_t prcwidthexpns[JPC_MAXRLVLS];
-
-    /* The precinct height values. */
-    uint_fast16_t prcheightexpns[JPC_MAXRLVLS];
-
-    /* The number of guard bits. */
-    uint_fast8_t numgbits;
-
-} jpc_enc_tccp_t;
-
-/* Coding parameters. */
-
-typedef struct {
-
-    /* The debug level. */
-    int debug;
-
-    /* The horizontal offset from the origin of the reference grid to the
-      left edge of the image area. */
-    uint_fast32_t imgareatlx;
-
-    /* The vertical offset from the origin of the reference grid to the
-      top edge of the image area. */
-    uint_fast32_t imgareatly;
-
-    /* The horizontal offset from the origin of the reference grid to the
-      right edge of the image area (plus one). */
-    uint_fast32_t refgrdwidth;
-
-    /* The vertical offset from the origin of the reference grid to the
-      bottom edge of the image area (plus one). */
-    uint_fast32_t refgrdheight;
-
-    /* The horizontal offset from the origin of the tile grid to the
-      origin of the reference grid. */
-    uint_fast32_t tilegrdoffx;
-
-    /* The vertical offset from the origin of the tile grid to the
-      origin of the reference grid. */
-    uint_fast32_t tilegrdoffy;
-
-    /* The nominal tile width in units of the image reference grid. */
-    uint_fast32_t tilewidth;
-
-    /* The nominal tile height in units of the image reference grid. */
-    uint_fast32_t tileheight;
-
-    /* The number of tiles spanning the image area in the horizontal
-      direction. */
-    uint_fast32_t numhtiles;
-
-    /* The number of tiles spanning the image area in the vertical
-      direction. */
-    uint_fast32_t numvtiles;
-
-    /* The number of tiles. */
-    uint_fast32_t numtiles;
-
-    /* The number of components. */
-    uint_fast16_t numcmpts;
-
-    /* The per-component coding parameters. */
-    jpc_enc_ccp_t *ccps;
-
-    /* The per-tile coding parameters. */
-    jpc_enc_tcp_t tcp;
-
-    /* The per-tile-component coding parameters. */
-    jpc_enc_tccp_t tccp;
-
-    /* The target code stream length in bytes. */
-    uint_fast32_t totalsize;
-
-    /* The raw (i.e., uncompressed) size of the image in bytes. */
-    uint_fast32_t rawsize;
-
-} jpc_enc_cp_t;
-
-/******************************************************************************\
-* Encoder class.
-\******************************************************************************/
-
-/* Encoder per-coding-pass state information. */
-
-typedef struct {
-
-    /* The starting offset for this pass. */
-    int start;
-
-    /* The ending offset for this pass. */
-    int end;
-
-    /* The type of data in this pass (i.e., MQ or raw). */
-    int type;
-
-    /* Flag indicating that this pass is terminated. */
-    int term;
-
-    /* The entropy coder state after coding this pass. */
-    jpc_mqencstate_t mqencstate;
-
-    /* The layer to which this pass has been assigned. */
-    int lyrno;
-
-    /* The R-D slope for this pass. */
-    jpc_flt_t rdslope;
-
-    /* The weighted MSE reduction associated with this pass. */
-    jpc_flt_t wmsedec;
-
-    /* The cumulative weighted MSE reduction. */
-    jpc_flt_t cumwmsedec;
-
-    /* The normalized MSE reduction. */
-    long nmsedec;
-
-} jpc_enc_pass_t;
-
-/* Encoder per-code-block state information. */
-
-typedef struct {
-
-    /* The number of passes. */
-    int numpasses;
-
-    /* The per-pass information. */
-    jpc_enc_pass_t *passes;
-
-    /* The number of passes encoded so far. */
-    int numencpasses;
-
-    /* The number of insignificant MSBs. */
-    int numimsbs;
-
-    /* The number of bits used to encode pass data lengths. */
-    int numlenbits;
-
-    /* The byte stream for this code block. */
-    jas_stream_t *stream;
-
-    /* The entropy encoder. */
-    jpc_mqenc_t *mqenc;
-
-    /* The data for this code block. */
-    jas_matrix_t *data;
-
-    /* The state for this code block. */
-    jas_matrix_t *flags;
-
-    /* The number of bit planes required for this code block. */
-    int numbps;
-
-    /* The next pass to be encoded. */
-    jpc_enc_pass_t *curpass;
-
-    /* The per-code-block-group state information. */
-    struct jpc_enc_prc_s *prc;
-
-    /* The saved current pass. */
-    /* This is used by the rate control code. */
-    jpc_enc_pass_t *savedcurpass;
-
-    /* The saved length indicator size. */
-    /* This is used by the rate control code. */
-    int savednumlenbits;
-
-    /* The saved number of encoded passes. */
-    /* This is used by the rate control code. */
-    int savednumencpasses;
-
-} jpc_enc_cblk_t;
-
-/* Encoder per-code-block-group state information. */
-
-typedef struct jpc_enc_prc_s {
-
-    /* The x-coordinate of the top-left corner of the precinct. */
-    uint_fast32_t tlx;
-
-    /* The y-coordinate of the top-left corner of the precinct. */
-    uint_fast32_t tly;
-
-    /* The x-coordinate of the bottom-right corner of the precinct
-      (plus one). */
-    uint_fast32_t brx;
-
-    /* The y-coordinate of the bottom-right corner of the precinct
-      (plus one). */
-    uint_fast32_t bry;
-
-    /* The number of code blocks spanning the precinct in the horizontal
-    direction. */
-    int numhcblks;
-
-    /* The number of code blocks spanning the precinct in the vertical
-    direction. */
-    int numvcblks;
-
-    /* The total number of code blocks. */
-    int numcblks;
-
-    /* The per-code-block information. */
-    jpc_enc_cblk_t *cblks;
-
-    /* The inclusion tag tree. */
-    jpc_tagtree_t *incltree;
-
-    /* The insignifcant MSBs tag tree. */
-    jpc_tagtree_t *nlibtree;
-
-    /* The per-band information. */
-    struct jpc_enc_band_s *band;
-
-    /* The saved inclusion tag tree. */
-    /* This is used by rate control. */
-    jpc_tagtree_t *savincltree;
-
-    /* The saved leading-insignificant-bit-planes tag tree. */
-    /* This is used by rate control. */
-    jpc_tagtree_t *savnlibtree;
-
-} jpc_enc_prc_t;
-
-/* Encoder per-band state information. */
-
-typedef struct jpc_enc_band_s {
-
-    /* The per precinct information. */
-    jpc_enc_prc_t *prcs;
-
-    /* The coefficient data for this band. */
-    jas_matrix_t *data;
-
-    /* The orientation of this band (i.e., LL, LH, HL, or HH). */
-    int orient;
-
-    /* The number of bit planes associated with this band. */
-    int numbps;
-
-    /* The quantizer step size. */
-    jpc_fix_t absstepsize;
-
-    /* The encoded quantizer step size. */
-    int stepsize;
-
-    /* The L2 norm of the synthesis basis functions associated with
-      this band.  (The MCT is not considered in this value.) */
-    jpc_fix_t synweight;
-
-    /* The analysis gain for this band. */
-    int analgain;
-
-    /* The per-resolution-level information. */
-    struct jpc_enc_rlvl_s *rlvl;
-
-} jpc_enc_band_t;
-
-/* Encoder per-resolution-level state information. */
-
-typedef struct jpc_enc_rlvl_s {
-
-    /* The x-coordinate of the top-left corner of the tile-component
-      at this resolution. */
-    uint_fast32_t tlx;
-
-    /* The y-coordinate of the top-left corner of the tile-component
-      at this resolution. */
-    uint_fast32_t tly;
-
-    /* The x-coordinate of the bottom-right corner of the tile-component
-      at this resolution (plus one). */
-    uint_fast32_t brx;
-
-    /* The y-coordinate of the bottom-right corner of the tile-component
-      at this resolution (plus one). */
-    uint_fast32_t bry;
-
-    /* The exponent value for the nominal precinct width measured
-      relative to the associated LL band. */
-    int prcwidthexpn;
-
-    /* The exponent value for the nominal precinct height measured
-      relative to the associated LL band. */
-    int prcheightexpn;
-
-    /* The number of precincts spanning the resolution level in the
-      horizontal direction. */
-    int numhprcs;
-
-    /* The number of precincts spanning the resolution level in the
-      vertical direction. */
-    int numvprcs;
-
-    /* The total number of precincts. */
-    int numprcs;
-
-    /* The exponent value for the nominal code block group width.
-      This quantity is associated with the next lower resolution level
-      (assuming that there is one). */
-    int cbgwidthexpn;
-
-    /* The exponent value for the nominal code block group height.
-      This quantity is associated with the next lower resolution level
-      (assuming that there is one). */
-    int cbgheightexpn;
-
-    /* The exponent value for the code block width. */
-    uint_fast16_t cblkwidthexpn;
-
-    /* The exponent value for the code block height. */
-    uint_fast16_t cblkheightexpn;
-
-    /* The number of bands associated with this resolution level. */
-    int numbands;
-
-    /* The per-band information. */
-    jpc_enc_band_t *bands;
-
-    /* The parent tile-component. */
-    struct jpc_enc_tcmpt_s *tcmpt;
-
-} jpc_enc_rlvl_t;
-
-/* Encoder per-tile-component state information. */
-
-typedef struct jpc_enc_tcmpt_s {
-
-    /* The number of resolution levels. */
-    int numrlvls;
-
-    /* The per-resolution-level information. */
-    jpc_enc_rlvl_t *rlvls;
-
-    /* The tile-component data. */
-    jas_matrix_t *data;
-
-    /* The QMFB. */
-    int qmfbid;
-
-    /* The number of bands. */
-    int numbands;
-
-    /* The TSFB. */
-    jpc_tsfb_t *tsfb;
-
-    /* The synthesis energy weight (for the MCT). */
-    jpc_fix_t synweight;
-
-    /* The precinct width exponents. */
-    int prcwidthexpns[JPC_MAXRLVLS];
-
-    /* The precinct height exponents. */
-    int prcheightexpns[JPC_MAXRLVLS];
-
-    /* The code block width exponent. */
-    int cblkwidthexpn;
-
-    /* The code block height exponent. */
-    int cblkheightexpn;
-
-    /* Coding style (i.e., explicit precinct sizes). */
-    int csty;
-
-    /* Code block style. */
-    int cblksty;
-
-    /* The number of quantizer step sizes. */
-    int numstepsizes;
-
-    /* The encoded quantizer step sizes. */
-    uint_fast16_t stepsizes[JPC_MAXBANDS];
-
-    /* The parent tile. */
-    struct jpc_enc_tile_s *tile;
-
-} jpc_enc_tcmpt_t;
-
-/* Encoder per-tile state information. */
-
-typedef struct jpc_enc_tile_s {
-
-    /* The tile number. */
-    uint_fast32_t tileno;
-
-    /* The x-coordinate of the top-left corner of the tile measured with
-      respect to the reference grid. */
-    uint_fast32_t tlx;
-
-    /* The y-coordinate of the top-left corner of the tile measured with
-      respect to the reference grid. */
-    uint_fast32_t tly;
-
-    /* The x-coordinate of the bottom-right corner of the tile measured
-      with respect to the reference grid (plus one). */
-    uint_fast32_t brx;
-
-    /* The y-coordinate of the bottom-right corner of the tile measured
-      with respect to the reference grid (plus one). */
-    uint_fast32_t bry;
-
-    /* The coding style. */
-    uint_fast8_t csty;
-
-    /* The progression order. */
-    uint_fast8_t prg;
-
-    /* The number of layers. */
-    int numlyrs;
-
-    /* The MCT to employ (if any). */
-    uint_fast8_t mctid;
-
-    /* The packet iterator (used to determine the order of packet
-      generation). */
-    jpc_pi_t *pi;
-
-    /* The coding mode (i.e., integer or real). */
-    bool intmode;
-
-    /* The number of bytes to allocate to the various layers. */
-    uint_fast32_t *lyrsizes;
-
-    /* The number of tile-components. */
-    int numtcmpts;
-
-    /* The per tile-component information. */
-    jpc_enc_tcmpt_t *tcmpts;
-
-    /* The raw (i.e., uncompressed) size of this tile. */
-    uint_fast32_t rawsize;
-
-} jpc_enc_tile_t;
-
-/* Encoder class. */
-
-typedef struct jpc_enc_s {
-
-    /* The image being encoded. */
-    jas_image_t *image;
-
-    /* The output stream. */
-    jas_stream_t *out;
-
-    /* The coding parameters. */
-    jpc_enc_cp_t *cp;
-
-    /* The tile currently being processed. */
-    jpc_enc_tile_t *curtile;
-
-    /* The code stream state. */
-    jpc_cstate_t *cstate;
-
-    /* The number of bytes output so far. */
-    uint_fast32_t len;
-
-    /* The number of bytes available for the main body of the code stream. */
-    /* This is used for rate allocation purposes. */
-    uint_fast32_t mainbodysize;
-
-    /* The marker segment currently being processed. */
-    /* This member is a convenience for making cleanup easier. */
-    jpc_ms_t *mrk;
-
-    /* The stream used to temporarily hold tile-part data. */
-    jas_stream_t *tmpstream;
-
-} jpc_enc_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_fix.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_fix.h
deleted file mode 100644
index 816605a..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_fix.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Fixed-Point Number Class
- *
- * $Id$
- */
-
-#ifndef JPC_FIX_H
-#define JPC_FIX_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_fix.h"
-
-/******************************************************************************\
-* Basic parameters of the fixed-point type.
-\******************************************************************************/
-
-/* The integral type used to represent a fixed-point number.  This
-  type must be capable of representing values from -(2^31) to 2^31-1
-  (inclusive). */
-typedef int_fast32_t jpc_fix_t;
-
-/* The integral type used to respresent higher-precision intermediate results.
-  This type should be capable of representing values from -(2^63) to 2^63-1
-  (inclusive). */
-typedef int_fast64_t jpc_fix_big_t;
-
-/* The number of bits used for the fractional part of a fixed-point number. */
-#define JPC_FIX_FRACBITS	13
-
-/******************************************************************************\
-* Instantiations of the generic fixed-point number macros for the
-* parameters given above.  (Too bad C does not support templates, eh?)
-* The purpose of these macros is self-evident if one examines the
-* corresponding macros in the jasper/jas_fix.h header file.
-\******************************************************************************/
-
-#define	JPC_FIX_ZERO	JAS_FIX_ZERO(jpc_fix_t, JPC_FIX_FRACBITS)
-#define	JPC_FIX_ONE		JAS_FIX_ONE(jpc_fix_t, JPC_FIX_FRACBITS)
-#define	JPC_FIX_HALF	JAS_FIX_HALF(jpc_fix_t, JPC_FIX_FRACBITS)
-
-#define jpc_inttofix(x)	JAS_INTTOFIX(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define jpc_fixtoint(x)	JAS_FIXTOINT(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define jpc_fixtodbl(x)	JAS_FIXTODBL(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define jpc_dbltofix(x)	JAS_DBLTOFIX(jpc_fix_t, JPC_FIX_FRACBITS, x)
-
-#define	jpc_fix_add(x, y)	JAS_FIX_ADD(jpc_fix_t, JPC_FIX_FRACBITS, x, y)
-#define	jpc_fix_sub(x, y)	JAS_FIX_SUB(jpc_fix_t, JPC_FIX_FRACBITS, x, y)
-#define	jpc_fix_mul(x, y) \
-    JAS_FIX_MUL(jpc_fix_t, JPC_FIX_FRACBITS, jpc_fix_big_t, x, y)
-#define	jpc_fix_mulbyint(x, y) \
-    JAS_FIX_MULBYINT(jpc_fix_t, JPC_FIX_FRACBITS, x, y)
-#define	jpc_fix_div(x, y) \
-    JAS_FIX_DIV(jpc_fix_t, JPC_FIX_FRACBITS, jpc_fix_big_t, x, y)
-#define	jpc_fix_neg(x)		JAS_FIX_NEG(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define	jpc_fix_asl(x, n)	JAS_FIX_ASL(jpc_fix_t, JPC_FIX_FRACBITS, x, n)
-#define	jpc_fix_asr(x, n)	JAS_FIX_ASR(jpc_fix_t, JPC_FIX_FRACBITS, x, n)
-
-#define jpc_fix_pluseq(x, y)	JAS_FIX_PLUSEQ(jpc_fix_t, JPC_FIX_FRACBITS, x, y)
-#define jpc_fix_minuseq(x, y)	JAS_FIX_MINUSEQ(jpc_fix_t, JPC_FIX_FRACBITS, x, y)
-#define	jpc_fix_muleq(x, y)	\
-    JAS_FIX_MULEQ(jpc_fix_t, JPC_FIX_FRACBITS, jpc_fix_big_t, x, y)
-
-#define	jpc_fix_abs(x)		JAS_FIX_ABS(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define	jpc_fix_isint(x)	JAS_FIX_ISINT(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define jpc_fix_sgn(x)		JAS_FIX_SGN(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define	jpc_fix_round(x)	JAS_FIX_ROUND(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define	jpc_fix_floor(x)	JAS_FIX_FLOOR(jpc_fix_t, JPC_FIX_FRACBITS, x)
-#define jpc_fix_trunc(x)	JAS_FIX_TRUNC(jpc_fix_t, JPC_FIX_FRACBITS, x)
-
-/******************************************************************************\
-* Extra macros for convenience.
-\******************************************************************************/
-
-/* Compute the sum of three fixed-point numbers. */
-#define jpc_fix_add3(x, y, z)	jpc_fix_add(jpc_fix_add(x, y), z)
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_flt.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_flt.h
deleted file mode 100644
index a712128..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_flt.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Floating-Point Class
- *
- * $Id$
- */
-
-#ifndef JPC_FLT_H
-#define JPC_FLT_H
-
-#include <float.h>
-
-/* The code ought to be modified so this type is not used at all. */
-/* Very few places in the code rely on floating-point arithmetic, aside
-  from conversions in printf's. */
-typedef double jpc_flt_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.c
deleted file mode 100644
index fc9175d..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Math Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "jpc_math.h"
-
-/******************************************************************************\
-* Miscellaneous Functions
-\******************************************************************************/
-
-/* Calculate the integer quantity floor(log2(x)), where x is a positive
-  integer. */
-int jpc_floorlog2(int x)
-{
-    int y;
-
-    /* The argument must be positive. */
-    assert(x > 0);
-
-    y = 0;
-    while (x > 1) {
-        x >>= 1;
-        ++y;
-    }
-    return y;
-}
-
-/* Calculate the bit position of the first leading one in a nonnegative
-  integer. */
-/* This function is the basically the same as ceillog2(x), except that the
-  allowable range for x is slightly different. */
-int jpc_firstone(int x)
-{
-    int n;
-
-    /* The argument must be nonnegative. */
-    assert(x >= 0);
-
-    n = -1;
-    while (x > 0) {
-        x >>= 1;
-        ++n;
-    }
-    return n;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.h
deleted file mode 100644
index f9b6590..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_math.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef	JPC_MATH_H
-#define	JPC_MATH_H
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include	<assert.h>
-
-/******************************************************************************\
-* Macros
-\******************************************************************************/
-
-/* Compute the floor of the quotient of two integers. */
-#define	JPC_FLOORDIV(x, y)	((x) / (y))
-
-/* Compute the ceiling of the quotient of two integers. */
-#define	JPC_CEILDIV(x, y)	(((x) + (y) - 1) / (y))
-
-/* Compute the floor of (x / 2^y). */
-#define	JPC_FLOORDIVPOW2(x, y)	((x) >> (y))
-
-/* Compute the ceiling of (x / 2^y). */
-#define	JPC_CEILDIVPOW2(x, y)	(((x) + (1 << (y)) - 1) >> (y))
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Calculate the bit position of the first leading one in a nonnegative
-  integer. */
-int jpc_firstone(int x);
-
-/* Calculate the integer quantity floor(log2(x)), where x is a positive
-  integer. */
-int jpc_floorlog2(int x);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.c
deleted file mode 100644
index 4f81f4b..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.c
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Multicomponent Transform Code
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_seq.h"
-
-#include "jpc_fix.h"
-#include "jpc_mct.h"
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-/* Compute the forward RCT. */
-
-void jpc_rct(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2)
-{
-    int numrows;
-    int numcols;
-    int i;
-    int j;
-    jpc_fix_t *c0p;
-    jpc_fix_t *c1p;
-    jpc_fix_t *c2p;
-
-    numrows = jas_matrix_numrows(c0);
-    numcols = jas_matrix_numcols(c0);
-
-    /* All three matrices must have the same dimensions. */
-    assert(jas_matrix_numrows(c1) == numrows && jas_matrix_numcols(c1) == numcols
-      && jas_matrix_numrows(c2) == numrows && jas_matrix_numcols(c2) == numcols);
-
-    for (i = 0; i < numrows; i++) {
-        c0p = jas_matrix_getref(c0, i, 0);
-        c1p = jas_matrix_getref(c1, i, 0);
-        c2p = jas_matrix_getref(c2, i, 0);
-        for (j = numcols; j > 0; --j) {
-            int r;
-            int g;
-            int b;
-            int y;
-            int u;
-            int v;
-            r = *c0p;
-            g = *c1p;
-            b = *c2p;
-            y = (r + (g << 1) + b) >> 2;
-            u = b - g;
-            v = r - g;
-            *c0p++ = y;
-            *c1p++ = u;
-            *c2p++ = v;
-        }
-    }
-}
-
-/* Compute the inverse RCT. */
-
-void jpc_irct(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2)
-{
-    int numrows;
-    int numcols;
-    int i;
-    int j;
-    jpc_fix_t *c0p;
-    jpc_fix_t *c1p;
-    jpc_fix_t *c2p;
-
-    numrows = jas_matrix_numrows(c0);
-    numcols = jas_matrix_numcols(c0);
-
-    /* All three matrices must have the same dimensions. */
-    assert(jas_matrix_numrows(c1) == numrows && jas_matrix_numcols(c1) == numcols
-      && jas_matrix_numrows(c2) == numrows && jas_matrix_numcols(c2) == numcols);
-
-    for (i = 0; i < numrows; i++) {
-        c0p = jas_matrix_getref(c0, i, 0);
-        c1p = jas_matrix_getref(c1, i, 0);
-        c2p = jas_matrix_getref(c2, i, 0);
-        for (j = numcols; j > 0; --j) {
-            int r;
-            int g;
-            int b;
-            int y;
-            int u;
-            int v;
-            y = *c0p;
-            u = *c1p;
-            v = *c2p;
-            g = y - ((u + v) >> 2);
-            r = v + g;
-            b = u + g;
-            *c0p++ = r;
-            *c1p++ = g;
-            *c2p++ = b;
-        }
-    }
-}
-
-void jpc_ict(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2)
-{
-    int numrows;
-    int numcols;
-    int i;
-    int j;
-    jpc_fix_t r;
-    jpc_fix_t g;
-    jpc_fix_t b;
-    jpc_fix_t y;
-    jpc_fix_t u;
-    jpc_fix_t v;
-    jpc_fix_t *c0p;
-    jpc_fix_t *c1p;
-    jpc_fix_t *c2p;
-
-    numrows = jas_matrix_numrows(c0);
-    assert(jas_matrix_numrows(c1) == numrows && jas_matrix_numrows(c2) == numrows);
-    numcols = jas_matrix_numcols(c0);
-    assert(jas_matrix_numcols(c1) == numcols && jas_matrix_numcols(c2) == numcols);
-    for (i = 0; i < numrows; ++i) {
-        c0p = jas_matrix_getref(c0, i, 0);
-        c1p = jas_matrix_getref(c1, i, 0);
-        c2p = jas_matrix_getref(c2, i, 0);
-        for (j = numcols; j > 0; --j) {
-            r = *c0p;
-            g = *c1p;
-            b = *c2p;
-            y = jpc_fix_add3(jpc_fix_mul(jpc_dbltofix(0.299), r), jpc_fix_mul(jpc_dbltofix(0.587), g),
-              jpc_fix_mul(jpc_dbltofix(0.114), b));
-            u = jpc_fix_add3(jpc_fix_mul(jpc_dbltofix(-0.16875), r), jpc_fix_mul(jpc_dbltofix(-0.33126), g),
-              jpc_fix_mul(jpc_dbltofix(0.5), b));
-            v = jpc_fix_add3(jpc_fix_mul(jpc_dbltofix(0.5), r), jpc_fix_mul(jpc_dbltofix(-0.41869), g),
-              jpc_fix_mul(jpc_dbltofix(-0.08131), b));
-            *c0p++ = y;
-            *c1p++ = u;
-            *c2p++ = v;
-        }
-    }
-}
-
-void jpc_iict(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2)
-{
-    int numrows;
-    int numcols;
-    int i;
-    int j;
-    jpc_fix_t r;
-    jpc_fix_t g;
-    jpc_fix_t b;
-    jpc_fix_t y;
-    jpc_fix_t u;
-    jpc_fix_t v;
-    jpc_fix_t *c0p;
-    jpc_fix_t *c1p;
-    jpc_fix_t *c2p;
-
-    numrows = jas_matrix_numrows(c0);
-    assert(jas_matrix_numrows(c1) == numrows && jas_matrix_numrows(c2) == numrows);
-    numcols = jas_matrix_numcols(c0);
-    assert(jas_matrix_numcols(c1) == numcols && jas_matrix_numcols(c2) == numcols);
-    for (i = 0; i < numrows; ++i) {
-        c0p = jas_matrix_getref(c0, i, 0);
-        c1p = jas_matrix_getref(c1, i, 0);
-        c2p = jas_matrix_getref(c2, i, 0);
-        for (j = numcols; j > 0; --j) {
-            y = *c0p;
-            u = *c1p;
-            v = *c2p;
-            r = jpc_fix_add(y, jpc_fix_mul(jpc_dbltofix(1.402), v));
-            g = jpc_fix_add3(y, jpc_fix_mul(jpc_dbltofix(-0.34413), u),
-              jpc_fix_mul(jpc_dbltofix(-0.71414), v));
-            b = jpc_fix_add(y, jpc_fix_mul(jpc_dbltofix(1.772), u));
-            *c0p++ = r;
-            *c1p++ = g;
-            *c2p++ = b;
-        }
-    }
-}
-
-jpc_fix_t jpc_mct_getsynweight(int mctid, int cmptno)
-{
-    jpc_fix_t synweight;
-
-    synweight = JPC_FIX_ONE;
-    switch (mctid) {
-    case JPC_MCT_RCT:
-        switch (cmptno) {
-        case 0:
-            synweight = jpc_dbltofix(sqrt(3.0));
-            break;
-        case 1:
-            synweight = jpc_dbltofix(sqrt(0.6875));
-            break;
-        case 2:
-            synweight = jpc_dbltofix(sqrt(0.6875));
-            break;
-        }
-        break;
-    case JPC_MCT_ICT:
-        switch (cmptno) {
-        case 0:
-            synweight = jpc_dbltofix(sqrt(3.0000));
-            break;
-        case 1:
-            synweight = jpc_dbltofix(sqrt(3.2584));
-            break;
-        case 2:
-            synweight = jpc_dbltofix(sqrt(2.4755));
-            break;
-        }
-        break;
-#if 0
-    default:
-        synweight = JPC_FIX_ONE;
-        break;
-#endif
-    }
-
-    return synweight;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.h
deleted file mode 100644
index 5509baa..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mct.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Multicomponent Transform Code
- *
- * $Id$
- */
-
-#ifndef JPC_MCT_H
-#define JPC_MCT_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_seq.h"
-#include "jasper/jas_fix.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/*
- * Multicomponent transform IDs.
- */
-
-#define JPC_MCT_NONE	0
-#define JPC_MCT_ICT		1
-#define JPC_MCT_RCT		2
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Calculate the forward RCT. */
-void jpc_rct(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2);
-
-/* Calculate the inverse RCT. */
-void jpc_irct(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2);
-
-/* Calculate the forward ICT. */
-void jpc_ict(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2);
-
-/* Calculate the inverse ICT. */
-void jpc_iict(jas_matrix_t *c0, jas_matrix_t *c1, jas_matrix_t *c2);
-
-/* Get the synthesis weight associated with a particular component. */
-jpc_fix_t jpc_mct_getsynweight(int mctid, int cmptno);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.c
deleted file mode 100644
index e502338..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Coder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_malloc.h"
-
-#include "jpc_mqcod.h"
-
-/******************************************************************************\
-* Data.
-\******************************************************************************/
-
-/* MQ coder per-state information. */
-
-jpc_mqstate_t jpc_mqstates[47 * 2] = {
-    {0x5601, 0, &jpc_mqstates[ 2], &jpc_mqstates[ 3]},
-    {0x5601, 1, &jpc_mqstates[ 3], &jpc_mqstates[ 2]},
-    {0x3401, 0, &jpc_mqstates[ 4], &jpc_mqstates[12]},
-    {0x3401, 1, &jpc_mqstates[ 5], &jpc_mqstates[13]},
-    {0x1801, 0, &jpc_mqstates[ 6], &jpc_mqstates[18]},
-    {0x1801, 1, &jpc_mqstates[ 7], &jpc_mqstates[19]},
-    {0x0ac1, 0, &jpc_mqstates[ 8], &jpc_mqstates[24]},
-    {0x0ac1, 1, &jpc_mqstates[ 9], &jpc_mqstates[25]},
-    {0x0521, 0, &jpc_mqstates[10], &jpc_mqstates[58]},
-    {0x0521, 1, &jpc_mqstates[11], &jpc_mqstates[59]},
-    {0x0221, 0, &jpc_mqstates[76], &jpc_mqstates[66]},
-    {0x0221, 1, &jpc_mqstates[77], &jpc_mqstates[67]},
-    {0x5601, 0, &jpc_mqstates[14], &jpc_mqstates[13]},
-    {0x5601, 1, &jpc_mqstates[15], &jpc_mqstates[12]},
-    {0x5401, 0, &jpc_mqstates[16], &jpc_mqstates[28]},
-    {0x5401, 1, &jpc_mqstates[17], &jpc_mqstates[29]},
-    {0x4801, 0, &jpc_mqstates[18], &jpc_mqstates[28]},
-    {0x4801, 1, &jpc_mqstates[19], &jpc_mqstates[29]},
-    {0x3801, 0, &jpc_mqstates[20], &jpc_mqstates[28]},
-    {0x3801, 1, &jpc_mqstates[21], &jpc_mqstates[29]},
-    {0x3001, 0, &jpc_mqstates[22], &jpc_mqstates[34]},
-    {0x3001, 1, &jpc_mqstates[23], &jpc_mqstates[35]},
-    {0x2401, 0, &jpc_mqstates[24], &jpc_mqstates[36]},
-    {0x2401, 1, &jpc_mqstates[25], &jpc_mqstates[37]},
-    {0x1c01, 0, &jpc_mqstates[26], &jpc_mqstates[40]},
-    {0x1c01, 1, &jpc_mqstates[27], &jpc_mqstates[41]},
-    {0x1601, 0, &jpc_mqstates[58], &jpc_mqstates[42]},
-    {0x1601, 1, &jpc_mqstates[59], &jpc_mqstates[43]},
-    {0x5601, 0, &jpc_mqstates[30], &jpc_mqstates[29]},
-    {0x5601, 1, &jpc_mqstates[31], &jpc_mqstates[28]},
-    {0x5401, 0, &jpc_mqstates[32], &jpc_mqstates[28]},
-    {0x5401, 1, &jpc_mqstates[33], &jpc_mqstates[29]},
-    {0x5101, 0, &jpc_mqstates[34], &jpc_mqstates[30]},
-    {0x5101, 1, &jpc_mqstates[35], &jpc_mqstates[31]},
-    {0x4801, 0, &jpc_mqstates[36], &jpc_mqstates[32]},
-    {0x4801, 1, &jpc_mqstates[37], &jpc_mqstates[33]},
-    {0x3801, 0, &jpc_mqstates[38], &jpc_mqstates[34]},
-    {0x3801, 1, &jpc_mqstates[39], &jpc_mqstates[35]},
-    {0x3401, 0, &jpc_mqstates[40], &jpc_mqstates[36]},
-    {0x3401, 1, &jpc_mqstates[41], &jpc_mqstates[37]},
-    {0x3001, 0, &jpc_mqstates[42], &jpc_mqstates[38]},
-    {0x3001, 1, &jpc_mqstates[43], &jpc_mqstates[39]},
-    {0x2801, 0, &jpc_mqstates[44], &jpc_mqstates[38]},
-    {0x2801, 1, &jpc_mqstates[45], &jpc_mqstates[39]},
-    {0x2401, 0, &jpc_mqstates[46], &jpc_mqstates[40]},
-    {0x2401, 1, &jpc_mqstates[47], &jpc_mqstates[41]},
-    {0x2201, 0, &jpc_mqstates[48], &jpc_mqstates[42]},
-    {0x2201, 1, &jpc_mqstates[49], &jpc_mqstates[43]},
-    {0x1c01, 0, &jpc_mqstates[50], &jpc_mqstates[44]},
-    {0x1c01, 1, &jpc_mqstates[51], &jpc_mqstates[45]},
-    {0x1801, 0, &jpc_mqstates[52], &jpc_mqstates[46]},
-    {0x1801, 1, &jpc_mqstates[53], &jpc_mqstates[47]},
-    {0x1601, 0, &jpc_mqstates[54], &jpc_mqstates[48]},
-    {0x1601, 1, &jpc_mqstates[55], &jpc_mqstates[49]},
-    {0x1401, 0, &jpc_mqstates[56], &jpc_mqstates[50]},
-    {0x1401, 1, &jpc_mqstates[57], &jpc_mqstates[51]},
-    {0x1201, 0, &jpc_mqstates[58], &jpc_mqstates[52]},
-    {0x1201, 1, &jpc_mqstates[59], &jpc_mqstates[53]},
-    {0x1101, 0, &jpc_mqstates[60], &jpc_mqstates[54]},
-    {0x1101, 1, &jpc_mqstates[61], &jpc_mqstates[55]},
-    {0x0ac1, 0, &jpc_mqstates[62], &jpc_mqstates[56]},
-    {0x0ac1, 1, &jpc_mqstates[63], &jpc_mqstates[57]},
-    {0x09c1, 0, &jpc_mqstates[64], &jpc_mqstates[58]},
-    {0x09c1, 1, &jpc_mqstates[65], &jpc_mqstates[59]},
-    {0x08a1, 0, &jpc_mqstates[66], &jpc_mqstates[60]},
-    {0x08a1, 1, &jpc_mqstates[67], &jpc_mqstates[61]},
-    {0x0521, 0, &jpc_mqstates[68], &jpc_mqstates[62]},
-    {0x0521, 1, &jpc_mqstates[69], &jpc_mqstates[63]},
-    {0x0441, 0, &jpc_mqstates[70], &jpc_mqstates[64]},
-    {0x0441, 1, &jpc_mqstates[71], &jpc_mqstates[65]},
-    {0x02a1, 0, &jpc_mqstates[72], &jpc_mqstates[66]},
-    {0x02a1, 1, &jpc_mqstates[73], &jpc_mqstates[67]},
-    {0x0221, 0, &jpc_mqstates[74], &jpc_mqstates[68]},
-    {0x0221, 1, &jpc_mqstates[75], &jpc_mqstates[69]},
-    {0x0141, 0, &jpc_mqstates[76], &jpc_mqstates[70]},
-    {0x0141, 1, &jpc_mqstates[77], &jpc_mqstates[71]},
-    {0x0111, 0, &jpc_mqstates[78], &jpc_mqstates[72]},
-    {0x0111, 1, &jpc_mqstates[79], &jpc_mqstates[73]},
-    {0x0085, 0, &jpc_mqstates[80], &jpc_mqstates[74]},
-    {0x0085, 1, &jpc_mqstates[81], &jpc_mqstates[75]},
-    {0x0049, 0, &jpc_mqstates[82], &jpc_mqstates[76]},
-    {0x0049, 1, &jpc_mqstates[83], &jpc_mqstates[77]},
-    {0x0025, 0, &jpc_mqstates[84], &jpc_mqstates[78]},
-    {0x0025, 1, &jpc_mqstates[85], &jpc_mqstates[79]},
-    {0x0015, 0, &jpc_mqstates[86], &jpc_mqstates[80]},
-    {0x0015, 1, &jpc_mqstates[87], &jpc_mqstates[81]},
-    {0x0009, 0, &jpc_mqstates[88], &jpc_mqstates[82]},
-    {0x0009, 1, &jpc_mqstates[89], &jpc_mqstates[83]},
-    {0x0005, 0, &jpc_mqstates[90], &jpc_mqstates[84]},
-    {0x0005, 1, &jpc_mqstates[91], &jpc_mqstates[85]},
-    {0x0001, 0, &jpc_mqstates[90], &jpc_mqstates[86]},
-    {0x0001, 1, &jpc_mqstates[91], &jpc_mqstates[87]},
-    {0x5601, 0, &jpc_mqstates[92], &jpc_mqstates[92]},
-    {0x5601, 1, &jpc_mqstates[93], &jpc_mqstates[93]},
-};
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.h
deleted file mode 100644
index 123e8b2..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqcod.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Coder
- *
- * $Id$
- */
-
-#ifndef JPC_MQCOD_H
-#define JPC_MQCOD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/*
- * MQ coder context information.
- */
-
-typedef struct {
-
-    /* The most probable symbol (MPS). */
-    int mps;
-
-    /* The state index. */
-    int_fast16_t ind;
-
-} jpc_mqctx_t;
-
-/*
- * MQ coder state table entry.
- */
-
-typedef struct jpc_mqstate_s {
-
-    /* The Qe value. */
-    uint_fast16_t qeval;
-
-    /* The MPS. */
-    int mps;
-
-    /* The NMPS state. */
-    struct jpc_mqstate_s *nmps;
-
-    /* The NLPS state. */
-    struct jpc_mqstate_s *nlps;
-
-} jpc_mqstate_t;
-
-/******************************************************************************\
-* Data.
-\******************************************************************************/
-
-/* The state table for the MQ coder. */
-extern jpc_mqstate_t jpc_mqstates[];
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.c
deleted file mode 100644
index 6f740a7..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.c
+++ /dev/null
@@ -1,306 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Decoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_mqdec.h"
-
-/******************************************************************************\
-* Local macros.
-\******************************************************************************/
-
-#if defined(DEBUG)
-#define	MQDEC_CALL(n, x) \
-    ((jas_getdbglevel() >= (n)) ? ((void)(x)) : ((void)0))
-#else
-#define	MQDEC_CALL(n, x)
-#endif
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static void jpc_mqdec_bytein(jpc_mqdec_t *mqdec);
-
-/******************************************************************************\
-* Code for creation and destruction of a MQ decoder.
-\******************************************************************************/
-
-/* Create a MQ decoder. */
-jpc_mqdec_t *jpc_mqdec_create(int maxctxs, jas_stream_t *in)
-{
-    jpc_mqdec_t *mqdec;
-
-    /* There must be at least one context. */
-    assert(maxctxs > 0);
-
-    /* Allocate memory for the MQ decoder. */
-    if (!(mqdec = jas_malloc(sizeof(jpc_mqdec_t)))) {
-        goto error;
-    }
-    mqdec->in = in;
-    mqdec->maxctxs = maxctxs;
-    /* Allocate memory for the per-context state information. */
-    if (!(mqdec->ctxs = jas_malloc(mqdec->maxctxs * sizeof(jpc_mqstate_t *)))) {
-        goto error;
-    }
-    /* Set the current context to the first context. */
-    mqdec->curctx = mqdec->ctxs;
-
-    /* If an input stream has been associated with the MQ decoder,
-      initialize the decoder state from the stream. */
-    if (mqdec->in) {
-        jpc_mqdec_init(mqdec);
-    }
-    /* Initialize the per-context state information. */
-    jpc_mqdec_setctxs(mqdec, 0, 0);
-
-    return mqdec;
-
-error:
-    /* Oops...  Something has gone wrong. */
-    if (mqdec) {
-        jpc_mqdec_destroy(mqdec);
-    }
-    return 0;
-}
-
-/* Destroy a MQ decoder. */
-void jpc_mqdec_destroy(jpc_mqdec_t *mqdec)
-{
-    if (mqdec->ctxs) {
-        jas_free(mqdec->ctxs);
-    }
-    jas_free(mqdec);
-}
-
-/******************************************************************************\
-* Code for initialization of a MQ decoder.
-\******************************************************************************/
-
-/* Initialize the state of a MQ decoder. */
-
-void jpc_mqdec_init(jpc_mqdec_t *mqdec)
-{
-    int c;
-
-    mqdec->eof = 0;
-    mqdec->creg = 0;
-    /* Get the next byte from the input stream. */
-    if ((c = jas_stream_getc(mqdec->in)) == EOF) {
-        /* We have encountered an I/O error or EOF. */
-        c = 0xff;
-        mqdec->eof = 1;
-    }
-    mqdec->inbuffer = c;
-    mqdec->creg += mqdec->inbuffer << 16;
-    jpc_mqdec_bytein(mqdec);
-    mqdec->creg <<= 7;
-    mqdec->ctreg -= 7;
-    mqdec->areg = 0x8000;
-}
-
-/* Set the input stream for a MQ decoder. */
-
-void jpc_mqdec_setinput(jpc_mqdec_t *mqdec, jas_stream_t *in)
-{
-    mqdec->in = in;
-}
-
-/* Initialize one or more contexts. */
-
-void jpc_mqdec_setctxs(jpc_mqdec_t *mqdec, int numctxs, jpc_mqctx_t *ctxs)
-{
-    jpc_mqstate_t **ctx;
-    int n;
-
-    ctx = mqdec->ctxs;
-    n = JAS_MIN(mqdec->maxctxs, numctxs);
-    while (--n >= 0) {
-        *ctx = &jpc_mqstates[2 * ctxs->ind + ctxs->mps];
-        ++ctx;
-        ++ctxs;
-    }
-    n = mqdec->maxctxs - numctxs;
-    while (--n >= 0) {
-        *ctx = &jpc_mqstates[0];
-        ++ctx;
-    }
-}
-
-/* Initialize a context. */
-
-void jpc_mqdec_setctx(jpc_mqdec_t *mqdec, int ctxno, jpc_mqctx_t *ctx)
-{
-    jpc_mqstate_t **ctxi;
-    ctxi = &mqdec->ctxs[ctxno];
-    *ctxi = &jpc_mqstates[2 * ctx->ind + ctx->mps];
-}
-
-/******************************************************************************\
-* Code for decoding a bit.
-\******************************************************************************/
-
-/* Decode a bit. */
-
-int jpc_mqdec_getbit_func(register jpc_mqdec_t *mqdec)
-{
-    int bit;
-    JAS_DBGLOG(100, ("jpc_mqdec_getbit_func(%p)\n", mqdec));
-    MQDEC_CALL(100, jpc_mqdec_dump(mqdec, stderr));
-    bit = jpc_mqdec_getbit_macro(mqdec);
-    MQDEC_CALL(100, jpc_mqdec_dump(mqdec, stderr));
-    JAS_DBGLOG(100, ("ctx = %d, decoded %d\n", mqdec->curctx -
-      mqdec->ctxs, bit));
-    return bit;
-}
-
-/* Apply MPS_EXCHANGE algorithm (with RENORMD). */
-int jpc_mqdec_mpsexchrenormd(register jpc_mqdec_t *mqdec)
-{
-    int ret;
-    register jpc_mqstate_t *state = *mqdec->curctx;
-    jpc_mqdec_mpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
-    jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
-      mqdec->eof, mqdec->inbuffer);
-    return ret;
-}
-
-/* Apply LPS_EXCHANGE algorithm (with RENORMD). */
-int jpc_mqdec_lpsexchrenormd(register jpc_mqdec_t *mqdec)
-{
-    int ret;
-    register jpc_mqstate_t *state = *mqdec->curctx;
-    jpc_mqdec_lpsexchange(mqdec->areg, state->qeval, mqdec->curctx, ret);
-    jpc_mqdec_renormd(mqdec->areg, mqdec->creg, mqdec->ctreg, mqdec->in,
-      mqdec->eof, mqdec->inbuffer);
-    return ret;
-}
-
-/******************************************************************************\
-* Support code.
-\******************************************************************************/
-
-/* Apply the BYTEIN algorithm. */
-static void jpc_mqdec_bytein(jpc_mqdec_t *mqdec)
-{
-    int c;
-    unsigned char prevbuf;
-
-    if (!mqdec->eof) {
-        if ((c = jas_stream_getc(mqdec->in)) == EOF) {
-            mqdec->eof = 1;
-            c = 0xff;
-        }
-        prevbuf = mqdec->inbuffer;
-        mqdec->inbuffer = c;
-        if (prevbuf == 0xff) {
-            if (c > 0x8f) {
-                mqdec->creg += 0xff00;
-                mqdec->ctreg = 8;
-            } else {
-                mqdec->creg += c << 9;
-                mqdec->ctreg = 7;
-            }
-        } else {
-            mqdec->creg += c << 8;
-            mqdec->ctreg = 8;
-        }
-    } else {
-        mqdec->creg += 0xff00;
-        mqdec->ctreg = 8;
-    }
-}
-
-/******************************************************************************\
-* Code for debugging.
-\******************************************************************************/
-
-/* Dump a MQ decoder to a stream for debugging. */
-
-void jpc_mqdec_dump(jpc_mqdec_t *mqdec, FILE *out)
-{
-    fprintf(out, "MQDEC A = %08lx, C = %08lx, CT=%08lx, ",
-      (unsigned long) mqdec->areg, (unsigned long) mqdec->creg,
-      (unsigned long) mqdec->ctreg);
-    fprintf(out, "CTX = %d, ", mqdec->curctx - mqdec->ctxs);
-    fprintf(out, "IND %d, MPS %d, QEVAL %x\n", *mqdec->curctx -
-      jpc_mqstates, (*mqdec->curctx)->mps, (*mqdec->curctx)->qeval);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.h
deleted file mode 100644
index 309e500..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqdec.h
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Decoder
- *
- * $Id$
- */
-
-#ifndef JPC_MQDEC_H
-#define JPC_MQDEC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-
-#include "jpc_mqcod.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* MQ arithmetic decoder. */
-
-typedef struct {
-
-    /* The C register. */
-    uint_fast32_t creg;
-
-    /* The A register. */
-    uint_fast32_t areg;
-
-    /* The CT register. */
-    uint_fast32_t ctreg;
-
-    /* The current context. */
-    jpc_mqstate_t **curctx;
-
-    /* The per-context information. */
-    jpc_mqstate_t **ctxs;
-
-    /* The maximum number of contexts. */
-    int maxctxs;
-
-    /* The stream from which to read data. */
-    jas_stream_t *in;
-
-    /* The last character read. */
-    uchar inbuffer;
-
-    /* The EOF indicator. */
-    int eof;
-
-} jpc_mqdec_t;
-
-/******************************************************************************\
-* Functions/macros for construction and destruction.
-\******************************************************************************/
-
-/* Create a MQ decoder. */
-jpc_mqdec_t *jpc_mqdec_create(int maxctxs, jas_stream_t *in);
-
-/* Destroy a MQ decoder. */
-void jpc_mqdec_destroy(jpc_mqdec_t *dec);
-
-/******************************************************************************\
-* Functions/macros for initialization.
-\******************************************************************************/
-
-/* Set the input stream associated with a MQ decoder. */
-void jpc_mqdec_setinput(jpc_mqdec_t *dec, jas_stream_t *in);
-
-/* Initialize a MQ decoder. */
-void jpc_mqdec_init(jpc_mqdec_t *dec);
-
-/******************************************************************************\
-* Functions/macros for manipulating contexts.
-\******************************************************************************/
-
-/* Set the current context for a MQ decoder. */
-#define	jpc_mqdec_setcurctx(dec, ctxno) \
-    ((mqdec)->curctx = &(mqdec)->ctxs[ctxno]);
-
-/* Set the state information for a particular context of a MQ decoder. */
-void jpc_mqdec_setctx(jpc_mqdec_t *dec, int ctxno, jpc_mqctx_t *ctx);
-
-/* Set the state information for all contexts of a MQ decoder. */
-void jpc_mqdec_setctxs(jpc_mqdec_t *dec, int numctxs, jpc_mqctx_t *ctxs);
-
-/******************************************************************************\
-* Functions/macros for decoding bits.
-\******************************************************************************/
-
-/* Decode a symbol. */
-#if !defined(DEBUG)
-#define	jpc_mqdec_getbit(dec) \
-    jpc_mqdec_getbit_macro(dec)
-#else
-#define	jpc_mqdec_getbit(dec) \
-    jpc_mqdec_getbit_func(dec)
-#endif
-
-/* Decode a symbol (assuming an unskewed probability distribution). */
-#if !defined(DEBUG)
-#define	jpc_mqdec_getbitnoskew(dec) \
-    jpc_mqdec_getbit_macro(dec)
-#else
-#define	jpc_mqdec_getbitnoskew(dec) \
-    jpc_mqdec_getbit_func(dec)
-#endif
-
-/******************************************************************************\
-* Functions/macros for debugging.
-\******************************************************************************/
-
-/* Dump the MQ decoder state for debugging. */
-void jpc_mqdec_dump(jpc_mqdec_t *dec, FILE *out);
-
-/******************************************************************************\
-* EVERYTHING BELOW THIS POINT IS IMPLEMENTATION SPECIFIC AND NOT PART OF THE
-* APPLICATION INTERFACE.  DO NOT RELY ON ANY OF THE INTERNAL FUNCTIONS/MACROS
-* GIVEN BELOW.
-\******************************************************************************/
-
-#define	jpc_mqdec_getbit_macro(dec) \
-    ((((dec)->areg -= (*(dec)->curctx)->qeval), \
-      (dec)->creg >> 16 >= (*(dec)->curctx)->qeval) ? \
-      ((((dec)->creg -= (*(dec)->curctx)->qeval << 16), \
-      (dec)->areg & 0x8000) ?  (*(dec)->curctx)->mps : \
-      jpc_mqdec_mpsexchrenormd(dec)) : \
-      jpc_mqdec_lpsexchrenormd(dec))
-
-#define	jpc_mqdec_mpsexchange(areg, delta, curctx, bit) \
-{ \
-    if ((areg) < (delta)) { \
-        register jpc_mqstate_t *state = *(curctx); \
-        /* LPS decoded. */ \
-        (bit) = state->mps ^ 1; \
-        *(curctx) = state->nlps; \
-    } else { \
-        register jpc_mqstate_t *state = *(curctx); \
-        /* MPS decoded. */ \
-        (bit) = state->mps; \
-        *(curctx) = state->nmps; \
-    } \
-}
-
-#define	jpc_mqdec_lpsexchange(areg, delta, curctx, bit) \
-{ \
-    if ((areg) >= (delta)) { \
-        register jpc_mqstate_t *state = *(curctx); \
-        (areg) = (delta); \
-        (bit) = state->mps ^ 1; \
-        *(curctx) = state->nlps; \
-    } else { \
-        register jpc_mqstate_t *state = *(curctx); \
-        (areg) = (delta); \
-        (bit) = state->mps; \
-        *(curctx) = state->nmps; \
-    } \
-}
-
-#define	jpc_mqdec_renormd(areg, creg, ctreg, in, eof, inbuf) \
-{ \
-    do { \
-        if (!(ctreg)) { \
-            jpc_mqdec_bytein2(creg, ctreg, in, eof, inbuf); \
-        } \
-        (areg) <<= 1; \
-        (creg) <<= 1; \
-        --(ctreg); \
-    } while (!((areg) & 0x8000)); \
-}
-
-#define	jpc_mqdec_bytein2(creg, ctreg, in, eof, inbuf) \
-{ \
-    int c; \
-    unsigned char prevbuf; \
-    if (!(eof)) { \
-        if ((c = jas_stream_getc(in)) == EOF) { \
-            (eof) = 1; \
-            c = 0xff; \
-        } \
-        prevbuf = (inbuf); \
-        (inbuf) = c; \
-        if (prevbuf == 0xff) { \
-            if (c > 0x8f) { \
-                (creg) += 0xff00; \
-                (ctreg) = 8; \
-            } else { \
-                (creg) += c << 9; \
-                (ctreg) = 7; \
-            } \
-        } else { \
-            (creg) += c << 8; \
-            (ctreg) = 8; \
-        } \
-    } else { \
-        (creg) += 0xff00; \
-        (ctreg) = 8; \
-    } \
-}
-
-int jpc_mqdec_getbit_func(jpc_mqdec_t *dec);
-int jpc_mqdec_mpsexchrenormd(jpc_mqdec_t *dec);
-int jpc_mqdec_lpsexchrenormd(jpc_mqdec_t *dec);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.c
deleted file mode 100644
index 89d2df9..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.c
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Encoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "jasper/jas_stream.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_mqenc.h"
-
-/******************************************************************************\
-* Macros
-\******************************************************************************/
-
-#if defined(DEBUG)
-#define	JPC_MQENC_CALL(n, x) \
-    ((jas_getdbglevel() >= (n)) ? ((void)(x)) : ((void)0))
-#else
-#define	JPC_MQENC_CALL(n, x)
-#endif
-
-#define	jpc_mqenc_codemps9(areg, creg, ctreg, curctx, enc) \
-{ \
-    jpc_mqstate_t *state = *(curctx); \
-    (areg) -= state->qeval; \
-    if (!((areg) & 0x8000)) { \
-        if ((areg) < state->qeval) { \
-            (areg) = state->qeval; \
-        } else { \
-            (creg) += state->qeval; \
-        } \
-        *(curctx) = state->nmps; \
-        jpc_mqenc_renorme((areg), (creg), (ctreg), (enc)); \
-    } else { \
-        (creg) += state->qeval; \
-    } \
-}
-
-#define	jpc_mqenc_codelps2(areg, creg, ctreg, curctx, enc) \
-{ \
-    jpc_mqstate_t *state = *(curctx); \
-    (areg) -= state->qeval; \
-    if ((areg) < state->qeval) { \
-        (creg) += state->qeval; \
-    } else { \
-        (areg) = state->qeval; \
-    } \
-    *(curctx) = state->nlps; \
-    jpc_mqenc_renorme((areg), (creg), (ctreg), (enc)); \
-}
-
-#define	jpc_mqenc_renorme(areg, creg, ctreg, enc) \
-{ \
-    do { \
-        (areg) <<= 1; \
-        (creg) <<= 1; \
-        if (!--(ctreg)) { \
-            jpc_mqenc_byteout((areg), (creg), (ctreg), (enc)); \
-        } \
-    } while (!((areg) & 0x8000)); \
-}
-
-#define	jpc_mqenc_byteout(areg, creg, ctreg, enc) \
-{ \
-    if ((enc)->outbuf != 0xff) { \
-        if ((creg) & 0x8000000) { \
-            if (++((enc)->outbuf) == 0xff) { \
-                (creg) &= 0x7ffffff; \
-                jpc_mqenc_byteout2(enc); \
-                enc->outbuf = ((creg) >> 20) & 0xff; \
-                (creg) &= 0xfffff; \
-                (ctreg) = 7; \
-            } else { \
-                jpc_mqenc_byteout2(enc); \
-                enc->outbuf = ((creg) >> 19) & 0xff; \
-                (creg) &= 0x7ffff; \
-                (ctreg) = 8; \
-            } \
-        } else { \
-            jpc_mqenc_byteout2(enc); \
-            (enc)->outbuf = ((creg) >> 19) & 0xff; \
-            (creg) &= 0x7ffff; \
-            (ctreg) = 8; \
-        } \
-    } else { \
-        jpc_mqenc_byteout2(enc); \
-        (enc)->outbuf = ((creg) >> 20) & 0xff; \
-        (creg) &= 0xfffff; \
-        (ctreg) = 7; \
-    } \
-}
-
-#define	jpc_mqenc_byteout2(enc) \
-{ \
-    if (enc->outbuf >= 0) { \
-        if (jas_stream_putc(enc->out, (unsigned char)enc->outbuf) == EOF) { \
-            enc->err |= 1; \
-        } \
-    } \
-    enc->lastbyte = enc->outbuf; \
-}
-
-/******************************************************************************\
-* Local function protoypes.
-\******************************************************************************/
-
-static void jpc_mqenc_setbits(jpc_mqenc_t *mqenc);
-
-/******************************************************************************\
-* Code for creation and destruction of encoder.
-\******************************************************************************/
-
-/* Create a MQ encoder. */
-
-jpc_mqenc_t *jpc_mqenc_create(int maxctxs, jas_stream_t *out)
-{
-    jpc_mqenc_t *mqenc;
-
-    /* Allocate memory for the MQ encoder. */
-    if (!(mqenc = jas_malloc(sizeof(jpc_mqenc_t)))) {
-        goto error;
-    }
-    mqenc->out = out;
-    mqenc->maxctxs = maxctxs;
-
-    /* Allocate memory for the per-context state information. */
-    if (!(mqenc->ctxs = jas_malloc(mqenc->maxctxs * sizeof(jpc_mqstate_t *)))) {
-        goto error;
-    }
-
-    /* Set the current context to the first one. */
-    mqenc->curctx = mqenc->ctxs;
-
-    jpc_mqenc_init(mqenc);
-
-    /* Initialize the per-context state information to something sane. */
-    jpc_mqenc_setctxs(mqenc, 0, 0);
-
-    return mqenc;
-
-error:
-    if (mqenc) {
-        jpc_mqenc_destroy(mqenc);
-    }
-    return 0;
-}
-
-/* Destroy a MQ encoder. */
-
-void jpc_mqenc_destroy(jpc_mqenc_t *mqenc)
-{
-    if (mqenc->ctxs) {
-        jas_free(mqenc->ctxs);
-    }
-    jas_free(mqenc);
-}
-
-/******************************************************************************\
-* State initialization code.
-\******************************************************************************/
-
-/* Initialize the coding state of a MQ encoder. */
-
-void jpc_mqenc_init(jpc_mqenc_t *mqenc)
-{
-    mqenc->areg = 0x8000;
-    mqenc->outbuf = -1;
-    mqenc->creg = 0;
-    mqenc->ctreg = 12;
-    mqenc->lastbyte = -1;
-    mqenc->err = 0;
-}
-
-/* Initialize one or more contexts. */
-
-void jpc_mqenc_setctxs(jpc_mqenc_t *mqenc, int numctxs, jpc_mqctx_t *ctxs)
-{
-    jpc_mqstate_t **ctx;
-    int n;
-
-    ctx = mqenc->ctxs;
-    n = JAS_MIN(mqenc->maxctxs, numctxs);
-    while (--n >= 0) {
-        *ctx = &jpc_mqstates[2 * ctxs->ind + ctxs->mps];
-        ++ctx;
-        ++ctxs;
-    }
-    n = mqenc->maxctxs - numctxs;
-    while (--n >= 0) {
-        *ctx = &jpc_mqstates[0];
-        ++ctx;
-    }
-
-}
-
-/* Get the coding state for a MQ encoder. */
-
-void jpc_mqenc_getstate(jpc_mqenc_t *mqenc, jpc_mqencstate_t *state)
-{
-    state->areg = mqenc->areg;
-    state->creg = mqenc->creg;
-    state->ctreg = mqenc->ctreg;
-    state->lastbyte = mqenc->lastbyte;
-}
-
-/******************************************************************************\
-* Code for coding symbols.
-\******************************************************************************/
-
-/* Encode a bit. */
-
-int jpc_mqenc_putbit_func(jpc_mqenc_t *mqenc, int bit)
-{
-    const jpc_mqstate_t *state;
-    JAS_DBGLOG(100, ("jpc_mqenc_putbit(%p, %d)\n", mqenc, bit));
-    JPC_MQENC_CALL(100, jpc_mqenc_dump(mqenc, stderr));
-
-    state = *(mqenc->curctx);
-
-    if (state->mps == bit) {
-        /* Apply the CODEMPS algorithm as defined in the standard. */
-        mqenc->areg -= state->qeval;
-        if (!(mqenc->areg & 0x8000)) {
-            jpc_mqenc_codemps2(mqenc);
-        } else {
-            mqenc->creg += state->qeval;
-        }
-    } else {
-        /* Apply the CODELPS algorithm as defined in the standard. */
-        jpc_mqenc_codelps2(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc->curctx, mqenc);
-    }
-
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
-
-int jpc_mqenc_codemps2(jpc_mqenc_t *mqenc)
-{
-    /* Note: This function only performs part of the work associated with
-    the CODEMPS algorithm from the standard.  Some of the work is also
-    performed by the caller. */
-
-    jpc_mqstate_t *state = *(mqenc->curctx);
-    if (mqenc->areg < state->qeval) {
-        mqenc->areg = state->qeval;
-    } else {
-        mqenc->creg += state->qeval;
-    }
-    *mqenc->curctx = state->nmps;
-    jpc_mqenc_renorme(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc);
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
-
-int jpc_mqenc_codelps(jpc_mqenc_t *mqenc)
-{
-    jpc_mqenc_codelps2(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc->curctx, mqenc);
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
-
-/******************************************************************************\
-* Miscellaneous code.
-\******************************************************************************/
-
-/* Terminate the code word. */
-
-int jpc_mqenc_flush(jpc_mqenc_t *mqenc, int termmode)
-{
-    int_fast16_t k;
-
-    switch (termmode) {
-    case JPC_MQENC_PTERM:
-        k = 11 - mqenc->ctreg + 1;
-        while (k > 0) {
-            mqenc->creg <<= mqenc->ctreg;
-            mqenc->ctreg = 0;
-            jpc_mqenc_byteout(mqenc->areg, mqenc->creg, mqenc->ctreg,
-              mqenc);
-            k -= mqenc->ctreg;
-        }
-        if (mqenc->outbuf != 0xff) {
-            jpc_mqenc_byteout(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc);
-        }
-        break;
-    case JPC_MQENC_DEFTERM:
-        jpc_mqenc_setbits(mqenc);
-        mqenc->creg <<= mqenc->ctreg;
-        jpc_mqenc_byteout(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc);
-        mqenc->creg <<= mqenc->ctreg;
-        jpc_mqenc_byteout(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc);
-        if (mqenc->outbuf != 0xff) {
-            jpc_mqenc_byteout(mqenc->areg, mqenc->creg, mqenc->ctreg, mqenc);
-        }
-        break;
-    default:
-        abort();
-        break;
-    }
-    return 0;
-}
-
-static void jpc_mqenc_setbits(jpc_mqenc_t *mqenc)
-{
-    uint_fast32_t tmp = mqenc->creg + mqenc->areg;
-    mqenc->creg |= 0xffff;
-    if (mqenc->creg >= tmp) {
-        mqenc->creg -= 0x8000;
-    }
-}
-
-/* Dump a MQ encoder to a stream for debugging. */
-
-int jpc_mqenc_dump(jpc_mqenc_t *mqenc, FILE *out)
-{
-    fprintf(out, "AREG = %08x, CREG = %08x, CTREG = %d\n",
-      mqenc->areg, mqenc->creg, mqenc->ctreg);
-    fprintf(out, "IND = %02d, MPS = %d, QEVAL = %04x\n",
-      *mqenc->curctx - jpc_mqstates, (*mqenc->curctx)->mps,
-      (*mqenc->curctx)->qeval);
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.h
deleted file mode 100644
index 67d6732..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_mqenc.h
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * MQ Arithmetic Encoder
- *
- * $Id$
- */
-
-#ifndef JPC_MQENC_H
-#define JPC_MQENC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-
-#include "jpc_mqcod.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/*
- * Termination modes.
- */
-
-#define	JPC_MQENC_DEFTERM	0	/* default termination */
-#define	JPC_MQENC_PTERM		1	/* predictable termination */
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* MQ arithmetic encoder class. */
-
-typedef struct {
-
-    /* The C register. */
-    uint_fast32_t creg;
-
-    /* The A register. */
-    uint_fast32_t areg;
-
-    /* The CT register. */
-    uint_fast32_t ctreg;
-
-    /* The maximum number of contexts. */
-    int maxctxs;
-
-    /* The per-context information. */
-    jpc_mqstate_t **ctxs;
-
-    /* The current context. */
-    jpc_mqstate_t **curctx;
-
-    /* The stream for encoder output. */
-    jas_stream_t *out;
-
-    /* The byte buffer (i.e., the B variable in the standard). */
-    int_fast16_t outbuf;
-
-    /* The last byte output. */
-    int_fast16_t lastbyte;
-
-    /* The error indicator. */
-    int err;
-
-} jpc_mqenc_t;
-
-/* MQ arithmetic encoder state information. */
-
-typedef struct {
-
-    /* The A register. */
-    unsigned areg;
-
-    /* The C register. */
-    unsigned creg;
-
-    /* The CT register. */
-    unsigned ctreg;
-
-    /* The last byte output by the encoder. */
-    int lastbyte;
-
-} jpc_mqencstate_t;
-
-/******************************************************************************\
-* Functions/macros for construction and destruction.
-\******************************************************************************/
-
-/* Create a MQ encoder. */
-jpc_mqenc_t *jpc_mqenc_create(int maxctxs, jas_stream_t *out);
-
-/* Destroy a MQ encoder. */
-void jpc_mqenc_destroy(jpc_mqenc_t *enc);
-
-/******************************************************************************\
-* Functions/macros for initialization.
-\******************************************************************************/
-
-/* Initialize a MQ encoder. */
-void jpc_mqenc_init(jpc_mqenc_t *enc);
-
-/******************************************************************************\
-* Functions/macros for context manipulation.
-\******************************************************************************/
-
-/* Set the current context. */
-#define	jpc_mqenc_setcurctx(enc, ctxno) \
-        ((enc)->curctx = &(enc)->ctxs[ctxno]);
-
-/* Set the state information for a particular context. */
-void jpc_mqenc_setctx(jpc_mqenc_t *enc, int ctxno, jpc_mqctx_t *ctx);
-
-/* Set the state information for multiple contexts. */
-void jpc_mqenc_setctxs(jpc_mqenc_t *enc, int numctxs, jpc_mqctx_t *ctxs);
-
-/******************************************************************************\
-* Miscellaneous functions/macros.
-\******************************************************************************/
-
-/* Get the error state of a MQ encoder. */
-#define	jpc_mqenc_error(enc) \
-    ((enc)->err)
-
-/* Get the current encoder state. */
-void jpc_mqenc_getstate(jpc_mqenc_t *enc, jpc_mqencstate_t *state);
-
-/* Terminate the code. */
-int jpc_mqenc_flush(jpc_mqenc_t *enc, int termmode);
-
-/******************************************************************************\
-* Functions/macros for encoding bits.
-\******************************************************************************/
-
-/* Encode a bit. */
-#if !defined(DEBUG)
-#define	jpc_mqenc_putbit(enc, bit)	jpc_mqenc_putbit_macro(enc, bit)
-#else
-#define	jpc_mqenc_putbit(enc, bit)	jpc_mqenc_putbit_func(enc, bit)
-#endif
-
-/******************************************************************************\
-* Functions/macros for debugging.
-\******************************************************************************/
-
-int jpc_mqenc_dump(jpc_mqenc_t *mqenc, FILE *out);
-
-/******************************************************************************\
-* Implementation-specific details.
-\******************************************************************************/
-
-/* Note: This macro is included only to satisfy the needs of
-  the mqenc_putbit macro. */
-#define	jpc_mqenc_putbit_macro(enc, bit) \
-    (((*((enc)->curctx))->mps == (bit)) ? \
-      (((enc)->areg -= (*(enc)->curctx)->qeval), \
-      ((!((enc)->areg & 0x8000)) ? (jpc_mqenc_codemps2(enc)) : \
-      ((enc)->creg += (*(enc)->curctx)->qeval))) : \
-      jpc_mqenc_codelps(enc))
-
-/* Note: These function prototypes are included only to satisfy the
-  needs of the mqenc_putbit_macro macro.  Do not call any of these
-  functions directly. */
-int jpc_mqenc_codemps2(jpc_mqenc_t *enc);
-int jpc_mqenc_codelps(jpc_mqenc_t *enc);
-
-/* Note: This function prototype is included only to satisfy the needs of
-  the mqenc_putbit macro. */
-int jpc_mqenc_putbit_func(jpc_mqenc_t *enc, int bit);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.c
deleted file mode 100644
index 99a5ff5..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.c
+++ /dev/null
@@ -1,3143 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Quadrature Mirror-Image Filter Bank (QMFB) Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-#undef WT_LENONE /* This is not needed due to normalization. */
-#define WT_DOSCALE
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include "jasper/jas_fix.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_qmfb.h"
-#include "jpc_tsfb.h"
-#include "jpc_math.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-#define QMFB_SPLITBUFSIZE	4096
-#define	QMFB_JOINBUFSIZE	4096
-
-int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
-  int stride);
-int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
-  int stride);
-
-int jpc_ns_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
-  int stride);
-int jpc_ns_synthesize(jpc_fix_t *a, int xstart, int ystart, int width,
-  int height, int stride);
-
-void jpc_ft_fwdlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ft_fwdlift_col(jpc_fix_t *a, int numrows, int stride,
-  int parity);
-void jpc_ft_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity);
-void jpc_ft_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity);
-
-void jpc_ft_invlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ft_invlift_col(jpc_fix_t *a, int numrows, int stride,
-  int parity);
-void jpc_ft_invlift_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity);
-void jpc_ft_invlift_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity);
-
-void jpc_ns_fwdlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ns_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_ns_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity);
-void jpc_ns_invlift_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_ns_invlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_ns_invlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity);
-
-void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity);
-
-void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity);
-void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride, int parity);
-void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity);
-
-double jpc_ft_lpenergywts[32] = {
-    1.2247448713915889,
-    1.6583123951776999,
-    2.3184046238739260,
-    3.2691742076555053,
-    4.6199296531440819,
-    6.5323713152269596,
-    9.2377452606141937,
-    13.0639951297449581,
-    18.4752262333915667,
-    26.1278968190610392,
-    36.9504194305524791,
-    52.2557819580462777,
-    73.9008347315741645,
-    104.5115624560829133,
-    147.8016689469569656,
-    209.0231247296646018,
-    295.6033378293900000,
-    418.0462494347059419,
-    591.2066756503630813,
-    836.0924988714708661,
-    /* approximations */
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661,
-    836.0924988714708661
-};
-
-double jpc_ft_hpenergywts[32] = {
-    0.8477912478906585,
-    0.9601432184835760,
-    1.2593401049756179,
-    1.7444107171191079,
-    2.4538713036750726,
-    3.4656517695088755,
-    4.8995276398597856,
-    6.9283970402160842,
-    9.7980274940131444,
-    13.8564306871112652,
-    19.5959265076535587,
-    27.7128159494245487,
-    39.1918369552045860,
-    55.4256262207444053,
-    78.3836719028959124,
-    110.8512517317256822,
-    156.7673435548526868,
-    221.7025033739244293,
-    313.5346870787551552,
-    443.4050067351659550,
-    /* approximations */
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550,
-    443.4050067351659550
-};
-
-double jpc_ns_lpenergywts[32] = {
-    1.4021081679297411,
-    2.0303718560817923,
-    2.9011625562785555,
-    4.1152851751758002,
-    5.8245108637728071,
-    8.2387599345725171,
-    11.6519546479210838,
-    16.4785606470644375,
-    23.3042776444606794,
-    32.9572515613740435,
-    46.6086013487782793,
-    65.9145194076860861,
-    93.2172084551803977,
-    131.8290408510004283,
-    186.4344176300625691,
-    263.6580819564562148,
-    372.8688353500955373,
-    527.3161639447193920,
-    745.7376707114038936,
-    1054.6323278917823245,
-    /* approximations follow */
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245,
-    1054.6323278917823245
-};
-
-double jpc_ns_hpenergywts[32] = {
-    1.4425227650161456,
-    1.9669426082455688,
-    2.8839248082788891,
-    4.1475208393432981,
-    5.8946497530677817,
-    8.3471789178590949,
-    11.8086046551047463,
-    16.7012780415647804,
-    23.6196657032246620,
-    33.4034255108592362,
-    47.2396388881632632,
-    66.8069597416714061,
-    94.4793162154500692,
-    133.6139330736999113,
-    188.9586372358249378,
-    267.2278678461869390,
-    377.9172750722391356,
-    534.4557359047058753,
-    755.8345502191498326,
-    1068.9114718353569060,
-    /* approximations follow */
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060,
-    1068.9114718353569060
-};
-
-jpc_qmfb2d_t jpc_ft_qmfb2d = {
-    jpc_ft_analyze,
-    jpc_ft_synthesize,
-    jpc_ft_lpenergywts,
-    jpc_ft_hpenergywts
-};
-
-jpc_qmfb2d_t jpc_ns_qmfb2d = {
-    jpc_ns_analyze,
-    jpc_ns_synthesize,
-    jpc_ns_lpenergywts,
-    jpc_ns_hpenergywts
-};
-
-/******************************************************************************\
-* generic
-\******************************************************************************/
-
-void jpc_qmfb_split_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numcols, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
-    jpc_fix_t splitbuf[bufsize];
-#endif
-    jpc_fix_t *buf = splitbuf;
-    register jpc_fix_t *srcptr;
-    register jpc_fix_t *dstptr;
-    register int n;
-    register int m;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Get a buffer. */
-    if (bufsize > QMFB_SPLITBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide in this case. */
-            abort();
-        }
-    }
-#endif
-
-    if (numcols >= 2) {
-        hstartcol = (numcols + 1 - parity) >> 1;
-        m = (parity) ? hstartcol : (numcols - hstartcol);
-        /* Save the samples destined for the highpass channel. */
-        n = m;
-        dstptr = buf;
-        srcptr = &a[1 - parity];
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            ++dstptr;
-            srcptr += 2;
-        }
-        /* Copy the appropriate samples into the lowpass channel. */
-        dstptr = &a[1 - parity];
-        srcptr = &a[2 - parity];
-        n = numcols - m - (!parity);
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            ++dstptr;
-            srcptr += 2;
-        }
-        /* Copy the saved samples into the highpass channel. */
-        dstptr = &a[hstartcol];
-        srcptr = buf;
-        n = m;
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            ++dstptr;
-            ++srcptr;
-        }
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the split buffer was allocated on the heap, free this memory. */
-    if (buf != splitbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_split_col(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE];
-#else
-    jpc_fix_t splitbuf[bufsize];
-#endif
-    jpc_fix_t *buf = splitbuf;
-    register jpc_fix_t *srcptr;
-    register jpc_fix_t *dstptr;
-    register int n;
-    register int m;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Get a buffer. */
-    if (bufsize > QMFB_SPLITBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide in this case. */
-            abort();
-        }
-    }
-#endif
-
-    if (numrows >= 2) {
-        hstartcol = (numrows + 1 - parity) >> 1;
-        m = (parity) ? hstartcol : (numrows - hstartcol);
-        /* Save the samples destined for the highpass channel. */
-        n = m;
-        dstptr = buf;
-        srcptr = &a[(1 - parity) * stride];
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            ++dstptr;
-            srcptr += stride << 1;
-        }
-        /* Copy the appropriate samples into the lowpass channel. */
-        dstptr = &a[(1 - parity) * stride];
-        srcptr = &a[(2 - parity) * stride];
-        n = numrows - m - (!parity);
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            dstptr += stride;
-            srcptr += stride << 1;
-        }
-        /* Copy the saved samples into the highpass channel. */
-        dstptr = &a[hstartcol * stride];
-        srcptr = buf;
-        n = m;
-        while (n-- > 0) {
-            *dstptr = *srcptr;
-            dstptr += stride;
-            ++srcptr;
-        }
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the split buffer was allocated on the heap, free this memory. */
-    if (buf != splitbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_split_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
-    jpc_fix_t splitbuf[bufsize * JPC_QMFB_COLGRPSIZE];
-#endif
-    jpc_fix_t *buf = splitbuf;
-    jpc_fix_t *srcptr;
-    jpc_fix_t *dstptr;
-    register jpc_fix_t *srcptr2;
-    register jpc_fix_t *dstptr2;
-    register int n;
-    register int i;
-    int m;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Get a buffer. */
-    if (bufsize > QMFB_SPLITBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide in this case. */
-            abort();
-        }
-    }
-#endif
-
-    if (numrows >= 2) {
-        hstartcol = (numrows + 1 - parity) >> 1;
-        m = (parity) ? hstartcol : (numrows - hstartcol);
-        /* Save the samples destined for the highpass channel. */
-        n = m;
-        dstptr = buf;
-        srcptr = &a[(1 - parity) * stride];
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += JPC_QMFB_COLGRPSIZE;
-            srcptr += stride << 1;
-        }
-        /* Copy the appropriate samples into the lowpass channel. */
-        dstptr = &a[(1 - parity) * stride];
-        srcptr = &a[(2 - parity) * stride];
-        n = numrows - m - (!parity);
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += stride;
-            srcptr += stride << 1;
-        }
-        /* Copy the saved samples into the highpass channel. */
-        dstptr = &a[hstartcol * stride];
-        srcptr = buf;
-        n = m;
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += stride;
-            srcptr += JPC_QMFB_COLGRPSIZE;
-        }
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the split buffer was allocated on the heap, free this memory. */
-    if (buf != splitbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_split_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t splitbuf[QMFB_SPLITBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
-    jpc_fix_t splitbuf[bufsize * numcols];
-#endif
-    jpc_fix_t *buf = splitbuf;
-    jpc_fix_t *srcptr;
-    jpc_fix_t *dstptr;
-    register jpc_fix_t *srcptr2;
-    register jpc_fix_t *dstptr2;
-    register int n;
-    register int i;
-    int m;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Get a buffer. */
-    if (bufsize > QMFB_SPLITBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide in this case. */
-            abort();
-        }
-    }
-#endif
-
-    if (numrows >= 2) {
-        hstartcol = (numrows + 1 - parity) >> 1;
-        m = (parity) ? hstartcol : (numrows - hstartcol);
-        /* Save the samples destined for the highpass channel. */
-        n = m;
-        dstptr = buf;
-        srcptr = &a[(1 - parity) * stride];
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < numcols; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += numcols;
-            srcptr += stride << 1;
-        }
-        /* Copy the appropriate samples into the lowpass channel. */
-        dstptr = &a[(1 - parity) * stride];
-        srcptr = &a[(2 - parity) * stride];
-        n = numrows - m - (!parity);
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < numcols; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += stride;
-            srcptr += stride << 1;
-        }
-        /* Copy the saved samples into the highpass channel. */
-        dstptr = &a[hstartcol * stride];
-        srcptr = buf;
-        n = m;
-        while (n-- > 0) {
-            dstptr2 = dstptr;
-            srcptr2 = srcptr;
-            for (i = 0; i < numcols; ++i) {
-                *dstptr2 = *srcptr2;
-                ++dstptr2;
-                ++srcptr2;
-            }
-            dstptr += stride;
-            srcptr += numcols;
-        }
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the split buffer was allocated on the heap, free this memory. */
-    if (buf != splitbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_join_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numcols, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
-    jpc_fix_t joinbuf[bufsize];
-#endif
-    jpc_fix_t *buf = joinbuf;
-    register jpc_fix_t *srcptr;
-    register jpc_fix_t *dstptr;
-    register int n;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Allocate memory for the join buffer from the heap. */
-    if (bufsize > QMFB_JOINBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide. */
-            abort();
-        }
-    }
-#endif
-
-    hstartcol = (numcols + 1 - parity) >> 1;
-
-    /* Save the samples from the lowpass channel. */
-    n = hstartcol;
-    srcptr = &a[0];
-    dstptr = buf;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        ++srcptr;
-        ++dstptr;
-    }
-    /* Copy the samples from the highpass channel into place. */
-    srcptr = &a[hstartcol];
-    dstptr = &a[1 - parity];
-    n = numcols - hstartcol;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        dstptr += 2;
-        ++srcptr;
-    }
-    /* Copy the samples from the lowpass channel into place. */
-    srcptr = buf;
-    dstptr = &a[parity];
-    n = hstartcol;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        dstptr += 2;
-        ++srcptr;
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the join buffer was allocated on the heap, free this memory. */
-    if (buf != joinbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_join_col(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t joinbuf[QMFB_JOINBUFSIZE];
-#else
-    jpc_fix_t joinbuf[bufsize];
-#endif
-    jpc_fix_t *buf = joinbuf;
-    register jpc_fix_t *srcptr;
-    register jpc_fix_t *dstptr;
-    register int n;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Allocate memory for the join buffer from the heap. */
-    if (bufsize > QMFB_JOINBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide. */
-            abort();
-        }
-    }
-#endif
-
-    hstartcol = (numrows + 1 - parity) >> 1;
-
-    /* Save the samples from the lowpass channel. */
-    n = hstartcol;
-    srcptr = &a[0];
-    dstptr = buf;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        srcptr += stride;
-        ++dstptr;
-    }
-    /* Copy the samples from the highpass channel into place. */
-    srcptr = &a[hstartcol * stride];
-    dstptr = &a[(1 - parity) * stride];
-    n = numrows - hstartcol;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        dstptr += 2 * stride;
-        srcptr += stride;
-    }
-    /* Copy the samples from the lowpass channel into place. */
-    srcptr = buf;
-    dstptr = &a[parity * stride];
-    n = hstartcol;
-    while (n-- > 0) {
-        *dstptr = *srcptr;
-        dstptr += 2 * stride;
-        ++srcptr;
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the join buffer was allocated on the heap, free this memory. */
-    if (buf != joinbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_join_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
-    jpc_fix_t joinbuf[bufsize * JPC_QMFB_COLGRPSIZE];
-#endif
-    jpc_fix_t *buf = joinbuf;
-    jpc_fix_t *srcptr;
-    jpc_fix_t *dstptr;
-    register jpc_fix_t *srcptr2;
-    register jpc_fix_t *dstptr2;
-    register int n;
-    register int i;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Allocate memory for the join buffer from the heap. */
-    if (bufsize > QMFB_JOINBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * JPC_QMFB_COLGRPSIZE * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide. */
-            abort();
-        }
-    }
-#endif
-
-    hstartcol = (numrows + 1 - parity) >> 1;
-
-    /* Save the samples from the lowpass channel. */
-    n = hstartcol;
-    srcptr = &a[0];
-    dstptr = buf;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        srcptr += stride;
-        dstptr += JPC_QMFB_COLGRPSIZE;
-    }
-    /* Copy the samples from the highpass channel into place. */
-    srcptr = &a[hstartcol * stride];
-    dstptr = &a[(1 - parity) * stride];
-    n = numrows - hstartcol;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        dstptr += 2 * stride;
-        srcptr += stride;
-    }
-    /* Copy the samples from the lowpass channel into place. */
-    srcptr = buf;
-    dstptr = &a[parity * stride];
-    n = hstartcol;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        dstptr += 2 * stride;
-        srcptr += JPC_QMFB_COLGRPSIZE;
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the join buffer was allocated on the heap, free this memory. */
-    if (buf != joinbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-void jpc_qmfb_join_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity)
-{
-
-    int bufsize = JPC_CEILDIVPOW2(numrows, 1);
-#if !defined(HAVE_VLA)
-    jpc_fix_t joinbuf[QMFB_JOINBUFSIZE * JPC_QMFB_COLGRPSIZE];
-#else
-    jpc_fix_t joinbuf[bufsize * numcols];
-#endif
-    jpc_fix_t *buf = joinbuf;
-    jpc_fix_t *srcptr;
-    jpc_fix_t *dstptr;
-    register jpc_fix_t *srcptr2;
-    register jpc_fix_t *dstptr2;
-    register int n;
-    register int i;
-    int hstartcol;
-
-#if !defined(HAVE_VLA)
-    /* Allocate memory for the join buffer from the heap. */
-    if (bufsize > QMFB_JOINBUFSIZE) {
-        if (!(buf = jas_malloc(bufsize * numcols * sizeof(jpc_fix_t)))) {
-            /* We have no choice but to commit suicide. */
-            abort();
-        }
-    }
-#endif
-
-    hstartcol = (numrows + 1 - parity) >> 1;
-
-    /* Save the samples from the lowpass channel. */
-    n = hstartcol;
-    srcptr = &a[0];
-    dstptr = buf;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < numcols; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        srcptr += stride;
-        dstptr += numcols;
-    }
-    /* Copy the samples from the highpass channel into place. */
-    srcptr = &a[hstartcol * stride];
-    dstptr = &a[(1 - parity) * stride];
-    n = numrows - hstartcol;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < numcols; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        dstptr += 2 * stride;
-        srcptr += stride;
-    }
-    /* Copy the samples from the lowpass channel into place. */
-    srcptr = buf;
-    dstptr = &a[parity * stride];
-    n = hstartcol;
-    while (n-- > 0) {
-        dstptr2 = dstptr;
-        srcptr2 = srcptr;
-        for (i = 0; i < numcols; ++i) {
-            *dstptr2 = *srcptr2;
-            ++dstptr2;
-            ++srcptr2;
-        }
-        dstptr += 2 * stride;
-        srcptr += numcols;
-    }
-
-#if !defined(HAVE_VLA)
-    /* If the join buffer was allocated on the heap, free this memory. */
-    if (buf != joinbuf) {
-        jas_free(buf);
-    }
-#endif
-
-}
-
-/******************************************************************************\
-* 5/3 transform
-\******************************************************************************/
-
-void jpc_ft_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    register jpc_fix_t *lptr;
-    register jpc_fix_t *hptr;
-    register int n;
-    int llen;
-
-    llen = (numcols + 1 - parity) >> 1;
-
-    if (numcols > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            hptr[0] -= lptr[0];
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            hptr[0] -= (lptr[0] + lptr[1]) >> 1;
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            hptr[0] -= lptr[0];
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            lptr[0] += (hptr[0] + 1) >> 1;
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            lptr[0] += (hptr[0] + hptr[1] + 2) >> 2;
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            lptr[0] += (hptr[0] + 1) >> 1;
-        }
-
-    } else {
-
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] <<= 1;
-        }
-
-    }
-
-}
-
-void jpc_ft_fwdlift_col(jpc_fix_t *a, int numrows, int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-#if 0
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int i;
-#endif
-    register int n;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            hptr[0] -= lptr[0];
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            hptr[0] -= (lptr[0] + lptr[stride]) >> 1;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            hptr[0] -= lptr[0];
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr[0] += (hptr[0] + 1) >> 1;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr[0] += (hptr[0] + hptr[stride] + 2) >> 2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr[0] += (hptr[0] + 1) >> 1;
-        }
-
-    } else {
-
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] <<= 1;
-        }
-
-    }
-
-}
-
-void jpc_ft_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] -= lptr2[0];
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] -= (lptr2[0] + lptr2[stride]) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] -= lptr2[0];
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] += (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] += (hptr2[0] + hptr2[stride] + 2) >> 2;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] += (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] <<= 1;
-                ++lptr2;
-            }
-        }
-
-    }
-
-}
-
-void jpc_ft_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] -= lptr2[0];
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] -= (lptr2[0] + lptr2[stride]) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] -= lptr2[0];
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] += (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] += (hptr2[0] + hptr2[stride] + 2) >> 2;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] += (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] <<= 1;
-                ++lptr2;
-            }
-        }
-
-    }
-
-}
-
-void jpc_ft_invlift_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    register jpc_fix_t *lptr;
-    register jpc_fix_t *hptr;
-    register int n;
-    int llen;
-
-    llen = (numcols + 1 - parity) >> 1;
-
-    if (numcols > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            lptr[0] -= (hptr[0] + 1) >> 1;
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            lptr[0] -= (hptr[0] + hptr[1] + 2) >> 2;
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            lptr[0] -= (hptr[0] + 1) >> 1;
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            hptr[0] += lptr[0];
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            hptr[0] += (lptr[0] + lptr[1]) >> 1;
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            hptr[0] += lptr[0];
-        }
-
-    } else {
-
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] >>= 1;
-        }
-
-    }
-
-}
-
-void jpc_ft_invlift_col(jpc_fix_t *a, int numrows, int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-#if 0
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int i;
-#endif
-    register int n;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr[0] -= (hptr[0] + 1) >> 1;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr[0] -= (hptr[0] + hptr[stride] + 2) >> 2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr[0] -= (hptr[0] + 1) >> 1;
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            hptr[0] += lptr[0];
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            hptr[0] += (lptr[0] + lptr[stride]) >> 1;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            hptr[0] += lptr[0];
-        }
-
-    } else {
-
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] >>= 1;
-        }
-
-    }
-
-}
-
-void jpc_ft_invlift_colgrp(jpc_fix_t *a, int numrows, int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] -= (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] -= (hptr2[0] + hptr2[stride] + 2) >> 2;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] -= (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] += lptr2[0];
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] += (lptr2[0] + lptr2[stride]) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] += lptr2[0];
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] >>= 1;
-                ++lptr2;
-            }
-        }
-
-    }
-
-}
-
-void jpc_ft_invlift_colres(jpc_fix_t *a, int numrows, int numcols, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] -= (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] -= (hptr2[0] + hptr2[stride] + 2) >> 2;
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] -= (hptr2[0] + 1) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] += lptr2[0];
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] += (lptr2[0] + lptr2[stride]) >> 1;
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] += lptr2[0];
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] >>= 1;
-                ++lptr2;
-            }
-        }
-
-    }
-
-}
-
-int jpc_ft_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
-  int stride)
-{
-    int numrows = height;
-    int numcols = width;
-    int rowparity = ystart & 1;
-    int colparity = xstart & 1;
-    int i;
-    jpc_fix_t *startptr;
-    int maxcols;
-
-    maxcols = (numcols / JPC_QMFB_COLGRPSIZE) * JPC_QMFB_COLGRPSIZE;
-    startptr = &a[0];
-    for (i = 0; i < maxcols; i += JPC_QMFB_COLGRPSIZE) {
-        jpc_qmfb_split_colgrp(startptr, numrows, stride, rowparity);
-        jpc_ft_fwdlift_colgrp(startptr, numrows, stride, rowparity);
-        startptr += JPC_QMFB_COLGRPSIZE;
-    }
-    if (maxcols < numcols) {
-        jpc_qmfb_split_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-        jpc_ft_fwdlift_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-    }
-
-    startptr = &a[0];
-    for (i = 0; i < numrows; ++i) {
-        jpc_qmfb_split_row(startptr, numcols, colparity);
-        jpc_ft_fwdlift_row(startptr, numcols, colparity);
-        startptr += stride;
-    }
-
-    return 0;
-
-}
-
-int jpc_ft_synthesize(int *a, int xstart, int ystart, int width, int height,
-  int stride)
-{
-    int numrows = height;
-    int numcols = width;
-    int rowparity = ystart & 1;
-    int colparity = xstart & 1;
-
-    int maxcols;
-    jpc_fix_t *startptr;
-    int i;
-
-    startptr = &a[0];
-    for (i = 0; i < numrows; ++i) {
-        jpc_ft_invlift_row(startptr, numcols, colparity);
-        jpc_qmfb_join_row(startptr, numcols, colparity);
-        startptr += stride;
-    }
-
-    maxcols = (numcols / JPC_QMFB_COLGRPSIZE) * JPC_QMFB_COLGRPSIZE;
-    startptr = &a[0];
-    for (i = 0; i < maxcols; i += JPC_QMFB_COLGRPSIZE) {
-        jpc_ft_invlift_colgrp(startptr, numrows, stride, rowparity);
-        jpc_qmfb_join_colgrp(startptr, numrows, stride, rowparity);
-        startptr += JPC_QMFB_COLGRPSIZE;
-    }
-    if (maxcols < numcols) {
-        jpc_ft_invlift_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-        jpc_qmfb_join_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-    }
-
-    return 0;
-
-}
-
-/******************************************************************************\
-* 9/7 transform
-\******************************************************************************/
-
-#define ALPHA (-1.586134342059924)
-#define BETA (-0.052980118572961)
-#define GAMMA (0.882911075530934)
-#define DELTA (0.443506852043971)
-#define LGAIN (1.0 / 1.23017410558578)
-#define HGAIN (1.0 / 1.62578613134411)
-
-void jpc_ns_fwdlift_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    register jpc_fix_t *lptr;
-    register jpc_fix_t *hptr;
-    register int n;
-    int llen;
-
-    llen = (numcols + 1 - parity) >> 1;
-
-    if (numcols > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr[0]));
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-              jpc_fix_add(lptr[0], lptr[1])));
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr[0]));
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr[0]));
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(BETA),
-              jpc_fix_add(hptr[0], hptr[1])));
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr[0]));
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr[0]));
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-              jpc_fix_add(lptr[0], lptr[1])));
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            jpc_fix_pluseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr[0]));
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr[0]));
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-              jpc_fix_add(hptr[0], hptr[1])));
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            jpc_fix_pluseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr[0]));
-        }
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr[0] = jpc_fix_mul(lptr[0], jpc_dbltofix(LGAIN));
-            ++lptr;
-        }
-        hptr = &a[llen];
-        n = numcols - llen;
-        while (n-- > 0) {
-            hptr[0] = jpc_fix_mul(hptr[0], jpc_dbltofix(HGAIN));
-            ++hptr;
-        }
-#endif
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] <<= 1;
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_fwdlift_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-                  lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-                  lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-                  lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-                  lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(LGAIN));
-                ++lptr2;
-            }
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(HGAIN));
-                ++hptr2;
-            }
-            hptr += stride;
-        }
-#endif
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] <<= 1;
-                ++lptr2;
-            }
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_fwdlift_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-                  lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-                  lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-                  lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-                  lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(LGAIN));
-                ++lptr2;
-            }
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(HGAIN));
-                ++hptr2;
-            }
-            hptr += stride;
-        }
-#endif
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] <<= 1;
-                ++lptr2;
-            }
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_fwdlift_col(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr2[0]));
-            ++hptr2;
-            ++lptr2;
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-              jpc_fix_add(lptr2[0], lptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-              jpc_fix_add(hptr2[0], hptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr2[0]));
-            ++hptr2;
-            ++lptr2;
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-              jpc_fix_add(lptr2[0], lptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-              jpc_fix_add(hptr2[0], hptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_pluseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(LGAIN));
-            ++lptr2;
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(HGAIN));
-            ++hptr2;
-            hptr += stride;
-        }
-#endif
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            lptr2[0] <<= 1;
-            ++lptr2;
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_invlift_row(jpc_fix_t *a, int numcols, int parity)
-{
-
-    register jpc_fix_t *lptr;
-    register jpc_fix_t *hptr;
-    register int n;
-    int llen;
-
-    llen = (numcols + 1 - parity) >> 1;
-
-    if (numcols > 1) {
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr[0] = jpc_fix_mul(lptr[0], jpc_dbltofix(1.0 / LGAIN));
-            ++lptr;
-        }
-        hptr = &a[llen];
-        n = numcols - llen;
-        while (n-- > 0) {
-            hptr[0] = jpc_fix_mul(hptr[0], jpc_dbltofix(1.0 / HGAIN));
-            ++hptr;
-        }
-#endif
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr[0]));
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-              jpc_fix_add(hptr[0], hptr[1])));
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * DELTA),
-              hptr[0]));
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr[0]));
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-              jpc_fix_add(lptr[0], lptr[1])));
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * GAMMA),
-              lptr[0]));
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (!parity) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr[0]));
-            ++lptr;
-        }
-        n = llen - (!parity) - (parity != (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(BETA),
-              jpc_fix_add(hptr[0], hptr[1])));
-            ++lptr;
-            ++hptr;
-        }
-        if (parity != (numcols & 1)) {
-            jpc_fix_minuseq(lptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr[0]));
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen];
-        if (parity) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr[0]));
-            ++hptr;
-        }
-        n = numcols - llen - parity - (parity == (numcols & 1));
-        while (n-- > 0) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-              jpc_fix_add(lptr[0], lptr[1])));
-            ++hptr;
-            ++lptr;
-        }
-        if (parity == (numcols & 1)) {
-            jpc_fix_minuseq(hptr[0], jpc_fix_mul(jpc_dbltofix(2.0 * ALPHA),
-              lptr[0]));
-        }
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr = &a[0];
-            lptr[0] >>= 1;
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_invlift_colgrp(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(1.0 / LGAIN));
-                ++lptr2;
-            }
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(1.0 / HGAIN));
-                ++hptr2;
-            }
-            hptr += stride;
-        }
-#endif
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  DELTA), hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  DELTA), hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  GAMMA), lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  GAMMA), lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  ALPHA), lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  ALPHA), lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < JPC_QMFB_COLGRPSIZE; ++i) {
-                lptr2[0] >>= 1;
-                ++lptr2;
-            }
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_invlift_colres(jpc_fix_t *a, int numrows, int numcols,
-  int stride, int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    register int i;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(1.0 / LGAIN));
-                ++lptr2;
-            }
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(1.0 / HGAIN));
-                ++hptr2;
-            }
-            hptr += stride;
-        }
-#endif
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  DELTA), hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  DELTA), hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  GAMMA), lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  GAMMA), lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-                  jpc_fix_add(hptr2[0], hptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-                  hptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  ALPHA), lptr2[0]));
-                ++hptr2;
-                ++lptr2;
-            }
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-                  jpc_fix_add(lptr2[0], lptr2[stride])));
-                ++lptr2;
-                ++hptr2;
-            }
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            for (i = 0; i < numcols; ++i) {
-                jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-                  ALPHA), lptr2[0]));
-                ++lptr2;
-                ++hptr2;
-            }
-        }
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            for (i = 0; i < numcols; ++i) {
-                lptr2[0] >>= 1;
-                ++lptr2;
-            }
-        }
-#endif
-
-    }
-
-}
-
-void jpc_ns_invlift_col(jpc_fix_t *a, int numrows, int stride,
-  int parity)
-{
-
-    jpc_fix_t *lptr;
-    jpc_fix_t *hptr;
-    register jpc_fix_t *lptr2;
-    register jpc_fix_t *hptr2;
-    register int n;
-    int llen;
-
-    llen = (numrows + 1 - parity) >> 1;
-
-    if (numrows > 1) {
-
-        /* Apply the scaling step. */
-#if defined(WT_DOSCALE)
-        lptr = &a[0];
-        n = llen;
-        while (n-- > 0) {
-            lptr2 = lptr;
-            lptr2[0] = jpc_fix_mul(lptr2[0], jpc_dbltofix(1.0 / LGAIN));
-            ++lptr2;
-            lptr += stride;
-        }
-        hptr = &a[llen * stride];
-        n = numrows - llen;
-        while (n-- > 0) {
-            hptr2 = hptr;
-            hptr2[0] = jpc_fix_mul(hptr2[0], jpc_dbltofix(1.0 / HGAIN));
-            ++hptr2;
-            hptr += stride;
-        }
-#endif
-
-        /* Apply the first lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              DELTA), hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(DELTA),
-              jpc_fix_add(hptr2[0], hptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              DELTA), hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the second lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              GAMMA), lptr2[0]));
-            ++hptr2;
-            ++lptr2;
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(GAMMA),
-              jpc_fix_add(lptr2[0], lptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              GAMMA), lptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the third lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (!parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-        }
-        n = llen - (!parity) - (parity != (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(BETA),
-              jpc_fix_add(hptr2[0], hptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            lptr += stride;
-            hptr += stride;
-        }
-        if (parity != (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(lptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 * BETA),
-              hptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-        /* Apply the fourth lifting step. */
-        lptr = &a[0];
-        hptr = &a[llen * stride];
-        if (parity) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              ALPHA), lptr2[0]));
-            ++hptr2;
-            ++lptr2;
-            hptr += stride;
-        }
-        n = numrows - llen - parity - (parity == (numrows & 1));
-        while (n-- > 0) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(ALPHA),
-              jpc_fix_add(lptr2[0], lptr2[stride])));
-            ++lptr2;
-            ++hptr2;
-            hptr += stride;
-            lptr += stride;
-        }
-        if (parity == (numrows & 1)) {
-            lptr2 = lptr;
-            hptr2 = hptr;
-            jpc_fix_minuseq(hptr2[0], jpc_fix_mul(jpc_dbltofix(2.0 *
-              ALPHA), lptr2[0]));
-            ++lptr2;
-            ++hptr2;
-        }
-
-    } else {
-
-#if defined(WT_LENONE)
-        if (parity) {
-            lptr2 = &a[0];
-            lptr2[0] >>= 1;
-            ++lptr2;
-        }
-#endif
-
-    }
-
-}
-
-int jpc_ns_analyze(jpc_fix_t *a, int xstart, int ystart, int width, int height,
-  int stride)
-{
-
-    int numrows = height;
-    int numcols = width;
-    int rowparity = ystart & 1;
-    int colparity = xstart & 1;
-    int i;
-    jpc_fix_t *startptr;
-    int maxcols;
-
-    maxcols = (numcols / JPC_QMFB_COLGRPSIZE) * JPC_QMFB_COLGRPSIZE;
-    startptr = &a[0];
-    for (i = 0; i < maxcols; i += JPC_QMFB_COLGRPSIZE) {
-        jpc_qmfb_split_colgrp(startptr, numrows, stride, rowparity);
-        jpc_ns_fwdlift_colgrp(startptr, numrows, stride, rowparity);
-        startptr += JPC_QMFB_COLGRPSIZE;
-    }
-    if (maxcols < numcols) {
-        jpc_qmfb_split_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-        jpc_ns_fwdlift_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-    }
-
-    startptr = &a[0];
-    for (i = 0; i < numrows; ++i) {
-        jpc_qmfb_split_row(startptr, numcols, colparity);
-        jpc_ns_fwdlift_row(startptr, numcols, colparity);
-        startptr += stride;
-    }
-
-    return 0;
-
-}
-
-int jpc_ns_synthesize(jpc_fix_t *a, int xstart, int ystart, int width,
-  int height, int stride)
-{
-
-    int numrows = height;
-    int numcols = width;
-    int rowparity = ystart & 1;
-    int colparity = xstart & 1;
-    int maxcols;
-    jpc_fix_t *startptr;
-    int i;
-
-    startptr = &a[0];
-    for (i = 0; i < numrows; ++i) {
-        jpc_ns_invlift_row(startptr, numcols, colparity);
-        jpc_qmfb_join_row(startptr, numcols, colparity);
-        startptr += stride;
-    }
-
-    maxcols = (numcols / JPC_QMFB_COLGRPSIZE) * JPC_QMFB_COLGRPSIZE;
-    startptr = &a[0];
-    for (i = 0; i < maxcols; i += JPC_QMFB_COLGRPSIZE) {
-        jpc_ns_invlift_colgrp(startptr, numrows, stride, rowparity);
-        jpc_qmfb_join_colgrp(startptr, numrows, stride, rowparity);
-        startptr += JPC_QMFB_COLGRPSIZE;
-    }
-    if (maxcols < numcols) {
-        jpc_ns_invlift_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-        jpc_qmfb_join_colres(startptr, numrows, numcols - maxcols, stride,
-          rowparity);
-    }
-
-    return 0;
-
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.h
deleted file mode 100644
index d24e2f7..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_qmfb.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2004 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Quadrature Mirror-Image Filter Bank (QMFB) Routines
- *
- * $Id$
- */
-
-#ifndef JPC_QMFB_H
-#define JPC_QMFB_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_seq.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* QMFB IDs. */
-#define	JPC_QMFB1D_FT	1	/* 5/3 */
-#define	JPC_QMFB1D_NS	2	/* 9/7 */
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-#if !defined(JPC_QMFB_COLGRPSIZE)
-/* The number of columns to group together during the vertical processing
-stage of the wavelet transform. */
-/* The default value for this parameter is probably not optimal for
-any particular platform.  Hopefully, it is not too unreasonable, however. */
-#define JPC_QMFB_COLGRPSIZE	16
-#endif
-
-typedef struct {
-    int (*analyze)(int *, int, int, int, int, int);
-    int (*synthesize)(int *, int, int, int, int, int);
-    double *lpenergywts;
-    double *hpenergywts;
-} jpc_qmfb2d_t;
-
-extern jpc_qmfb2d_t jpc_ft_qmfb2d;
-extern jpc_qmfb2d_t jpc_ns_qmfb2d;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.c
deleted file mode 100644
index 2652895..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.c
+++ /dev/null
@@ -1,497 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_bs.h"
-#include "jpc_dec.h"
-#include "jpc_cs.h"
-#include "jpc_mqcod.h"
-#include "jpc_t1cod.h"
-#include "jpc_tsfb.h"
-
-double jpc_pow2i(int n);
-
-/******************************************************************************\
-* Global data.
-\******************************************************************************/
-
-int jpc_zcctxnolut[4 * 256];
-int jpc_spblut[256];
-int jpc_scctxnolut[256];
-int jpc_magctxnolut[4096];
-
-jpc_fix_t jpc_signmsedec[1 << JPC_NMSEDEC_BITS];
-jpc_fix_t jpc_refnmsedec[1 << JPC_NMSEDEC_BITS];
-jpc_fix_t jpc_signmsedec0[1 << JPC_NMSEDEC_BITS];
-jpc_fix_t jpc_refnmsedec0[1 << JPC_NMSEDEC_BITS];
-
-jpc_mqctx_t jpc_mqctxs[JPC_NUMCTXS];
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-void jpc_initmqctxs(void);
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-int JPC_PASSTYPE(int passno)
-{
-    int passtype;
-    switch (passno % 3) {
-    case 0:
-        passtype = JPC_CLNPASS;
-        break;
-    case 1:
-        passtype = JPC_SIGPASS;
-        break;
-    case 2:
-        passtype = JPC_REFPASS;
-        break;
-    default:
-        passtype = -1;
-        assert(0);
-        break;
-    }
-    return passtype;
-}
-
-int JPC_NOMINALGAIN(int qmfbid, int numlvls, int lvlno, int orient)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    numlvls = 0;
-
-if (qmfbid == JPC_COX_INS) {
-    return 0;
-}
-    assert(qmfbid == JPC_COX_RFT);
-    if (lvlno == 0) {
-        assert(orient == JPC_TSFB_LL);
-        return 0;
-    } else {
-        switch (orient) {
-        case JPC_TSFB_LH:
-        case JPC_TSFB_HL:
-            return 1;
-            break;
-        case JPC_TSFB_HH:
-            return 2;
-            break;
-        }
-    }
-    abort();
-}
-
-/******************************************************************************\
-* Coding pass related functions.
-\******************************************************************************/
-
-int JPC_SEGTYPE(int passno, int firstpassno, int bypass)
-{
-    int passtype;
-    if (bypass) {
-        passtype = JPC_PASSTYPE(passno);
-        if (passtype == JPC_CLNPASS) {
-            return JPC_SEG_MQ;
-        }
-        return ((passno < firstpassno + 10) ? JPC_SEG_MQ : JPC_SEG_RAW);
-    } else {
-        return JPC_SEG_MQ;
-    }
-}
-
-int JPC_SEGPASSCNT(int passno, int firstpassno, int numpasses, int bypass, int termall)
-{
-    int ret;
-    int passtype;
-
-    if (termall) {
-        ret = 1;
-    } else if (bypass) {
-        if (passno < firstpassno + 10) {
-            ret = 10 - (passno - firstpassno);
-        } else {
-            passtype = JPC_PASSTYPE(passno);
-            switch (passtype) {
-            case JPC_SIGPASS:
-                ret = 2;
-                break;
-            case JPC_REFPASS:
-                ret = 1;
-                break;
-            case JPC_CLNPASS:
-                ret = 1;
-                break;
-            default:
-                ret = -1;
-                assert(0);
-                break;
-            }
-        }
-    } else {
-        ret = JPC_PREC * 3 - 2;
-    }
-    ret = JAS_MIN(ret, numpasses - passno);
-    return ret;
-}
-
-int JPC_ISTERMINATED(int passno, int firstpassno, int numpasses, int termall,
-  int lazy)
-{
-    int ret;
-    int n;
-    if (passno - firstpassno == numpasses - 1) {
-        ret = 1;
-    } else {
-        n = JPC_SEGPASSCNT(passno, firstpassno, numpasses, lazy, termall);
-        ret = (n <= 1) ? 1 : 0;
-    }
-
-    return ret;
-}
-
-/******************************************************************************\
-* Lookup table code.
-\******************************************************************************/
-
-void jpc_initluts()
-{
-    int i;
-    int orient;
-    int refine;
-    float u;
-    float v;
-    float t;
-
-/* XXX - hack */
-jpc_initmqctxs();
-
-    for (orient = 0; orient < 4; ++orient) {
-        for (i = 0; i < 256; ++i) {
-            jpc_zcctxnolut[(orient << 8) | i] = jpc_getzcctxno(i, orient);
-        }
-    }
-
-    for (i = 0; i < 256; ++i) {
-        jpc_spblut[i] = jpc_getspb(i << 4);
-    }
-
-    for (i = 0; i < 256; ++i) {
-        jpc_scctxnolut[i] = jpc_getscctxno(i << 4);
-    }
-
-    for (refine = 0; refine < 2; ++refine) {
-        for (i = 0; i < 2048; ++i) {
-            jpc_magctxnolut[(refine << 11) + i] = jpc_getmagctxno((refine ? JPC_REFINE : 0) | i);
-        }
-    }
-
-    for (i = 0; i < (1 << JPC_NMSEDEC_BITS); ++i) {
-        t = i * jpc_pow2i(-JPC_NMSEDEC_FRACBITS);
-        u = t;
-        v = t - 1.5;
-        jpc_signmsedec[i] = jpc_dbltofix(floor((u * u - v * v) * jpc_pow2i(JPC_NMSEDEC_FRACBITS) + 0.5) / jpc_pow2i(JPC_NMSEDEC_FRACBITS));
-/* XXX - this calc is not correct */
-        jpc_signmsedec0[i] = jpc_dbltofix(floor((u * u) * jpc_pow2i(JPC_NMSEDEC_FRACBITS) + 0.5) / jpc_pow2i(JPC_NMSEDEC_FRACBITS));
-        u = t - 1.0;
-        if (i & (1 << (JPC_NMSEDEC_BITS - 1))) {
-            v = t - 1.5;
-        } else {
-            v = t - 0.5;
-        }
-        jpc_refnmsedec[i] = jpc_dbltofix(floor((u * u - v * v) * jpc_pow2i(JPC_NMSEDEC_FRACBITS) + 0.5) / jpc_pow2i(JPC_NMSEDEC_FRACBITS));
-/* XXX - this calc is not correct */
-        jpc_refnmsedec0[i] = jpc_dbltofix(floor((u * u) * jpc_pow2i(JPC_NMSEDEC_FRACBITS) + 0.5) / jpc_pow2i(JPC_NMSEDEC_FRACBITS));
-    }
-}
-
-jpc_fix_t jpc_getsignmsedec_func(jpc_fix_t x, int bitpos)
-{
-    jpc_fix_t y;
-    assert(!(x & (~JAS_ONES(bitpos + 1))));
-    y = jpc_getsignmsedec_macro(x, bitpos);
-    return y;
-}
-
-int jpc_getzcctxno(int f, int orient)
-{
-    int h;
-    int v;
-    int d;
-    int n;
-    int t;
-    int hv;
-
-    /* Avoid compiler warning. */
-    n = 0;
-
-    h = ((f & JPC_WSIG) != 0) + ((f & JPC_ESIG) != 0);
-    v = ((f & JPC_NSIG) != 0) + ((f & JPC_SSIG) != 0);
-    d = ((f & JPC_NWSIG) != 0) + ((f & JPC_NESIG) != 0) + ((f & JPC_SESIG) != 0) + ((f & JPC_SWSIG) != 0);
-    switch (orient) {
-    case JPC_TSFB_HL:
-        t = h;
-        h = v;
-        v = t;
-    case JPC_TSFB_LL:
-    case JPC_TSFB_LH:
-        if (!h) {
-            if (!v) {
-                if (!d) {
-                    n = 0;
-                } else if (d == 1) {
-                    n = 1;
-                } else {
-                    n = 2;
-                }
-            } else if (v == 1) {
-                n = 3;
-            } else {
-                n = 4;
-            }
-        } else if (h == 1) {
-            if (!v) {
-                if (!d) {
-                    n = 5;
-                } else {
-                    n = 6;
-                }
-            } else {
-                n = 7;
-            }
-        } else {
-            n = 8;
-        }
-        break;
-    case JPC_TSFB_HH:
-        hv = h + v;
-        if (!d) {
-            if (!hv) {
-                n = 0;
-            } else if (hv == 1) {
-                n = 1;
-            } else {
-                n = 2;
-            }
-        } else if (d == 1) {
-            if (!hv) {
-                n = 3;
-            } else if (hv == 1) {
-                n = 4;
-            } else {
-                n = 5;
-            }
-        } else if (d == 2) {
-            if (!hv) {
-                n = 6;
-            } else {
-                n = 7;
-            }
-        } else {
-            n = 8;
-        }
-        break;
-    }
-    assert(n < JPC_NUMZCCTXS);
-    return JPC_ZCCTXNO + n;
-}
-
-int jpc_getspb(int f)
-{
-    int hc;
-    int vc;
-    int n;
-
-    hc = JAS_MIN(((f & (JPC_ESIG | JPC_ESGN)) == JPC_ESIG) + ((f & (JPC_WSIG | JPC_WSGN)) == JPC_WSIG), 1) -
-      JAS_MIN(((f & (JPC_ESIG | JPC_ESGN)) == (JPC_ESIG | JPC_ESGN)) + ((f & (JPC_WSIG | JPC_WSGN)) == (JPC_WSIG | JPC_WSGN)), 1);
-    vc = JAS_MIN(((f & (JPC_NSIG | JPC_NSGN)) == JPC_NSIG) + ((f & (JPC_SSIG | JPC_SSGN)) == JPC_SSIG), 1) -
-      JAS_MIN(((f & (JPC_NSIG | JPC_NSGN)) == (JPC_NSIG | JPC_NSGN)) + ((f & (JPC_SSIG | JPC_SSGN)) == (JPC_SSIG | JPC_SSGN)), 1);
-    if (!hc && !vc) {
-        n = 0;
-    } else {
-        n = (!(hc > 0 || (!hc && vc > 0)));
-    }
-    return n;
-}
-
-int jpc_getscctxno(int f)
-{
-    int hc;
-    int vc;
-    int n;
-
-    /* Avoid compiler warning. */
-    n = 0;
-
-    hc = JAS_MIN(((f & (JPC_ESIG | JPC_ESGN)) == JPC_ESIG) + ((f & (JPC_WSIG | JPC_WSGN)) == JPC_WSIG),
-      1) - JAS_MIN(((f & (JPC_ESIG | JPC_ESGN)) == (JPC_ESIG | JPC_ESGN)) +
-      ((f & (JPC_WSIG | JPC_WSGN)) == (JPC_WSIG | JPC_WSGN)), 1);
-    vc = JAS_MIN(((f & (JPC_NSIG | JPC_NSGN)) == JPC_NSIG) + ((f & (JPC_SSIG | JPC_SSGN)) == JPC_SSIG),
-      1) - JAS_MIN(((f & (JPC_NSIG | JPC_NSGN)) == (JPC_NSIG | JPC_NSGN)) +
-      ((f & (JPC_SSIG | JPC_SSGN)) == (JPC_SSIG | JPC_SSGN)), 1);
-    assert(hc >= -1 && hc <= 1 && vc >= -1 && vc <= 1);
-    if (hc < 0) {
-        hc = -hc;
-        vc = -vc;
-    }
-    if (!hc) {
-        if (vc == -1) {
-            n = 1;
-        } else if (!vc) {
-            n = 0;
-        } else {
-            n = 1;
-        }
-    } else if (hc == 1) {
-        if (vc == -1) {
-            n = 2;
-        } else if (!vc) {
-            n = 3;
-        } else {
-            n = 4;
-        }
-    }
-    assert(n < JPC_NUMSCCTXS);
-    return JPC_SCCTXNO + n;
-}
-
-int jpc_getmagctxno(int f)
-{
-    int n;
-
-    if (!(f & JPC_REFINE)) {
-        n = (f & (JPC_OTHSIGMSK)) ? 1 : 0;
-    } else {
-        n = 2;
-    }
-
-    assert(n < JPC_NUMMAGCTXS);
-    return JPC_MAGCTXNO + n;
-}
-
-void jpc_initctxs(jpc_mqctx_t *ctxs)
-{
-    jpc_mqctx_t *ctx;
-    int i;
-
-    ctx = ctxs;
-    for (i = 0; i < JPC_NUMCTXS; ++i) {
-        ctx->mps = 0;
-        switch (i) {
-        case JPC_UCTXNO:
-            ctx->ind = 46;
-            break;
-        case JPC_ZCCTXNO:
-            ctx->ind = 4;
-            break;
-        case JPC_AGGCTXNO:
-            ctx->ind = 3;
-            break;
-        default:
-            ctx->ind = 0;
-            break;
-        }
-        ++ctx;
-    }
-}
-
-void jpc_initmqctxs()
-{
-    jpc_initctxs(jpc_mqctxs);
-}
-
-/* Calculate the real quantity exp2(n), where x is an integer. */
-double jpc_pow2i(int n)
-{
-    double x;
-    double a;
-
-    x = 1.0;
-    if (n < 0) {
-        a = 0.5;
-        n = -n;
-    } else {
-        a = 2.0;
-    }
-    while (--n >= 0) {
-        x *= a;
-    }
-    return x;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.h
deleted file mode 100644
index dc3e9b0..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1cod.h
+++ /dev/null
@@ -1,295 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-#ifndef JPC_T1COD_H
-#define JPC_T1COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_fix.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_mqcod.h"
-#include "jpc_tsfb.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* The number of bits used to index into various lookup tables. */
-#define JPC_NMSEDEC_BITS	7
-#define JPC_NMSEDEC_FRACBITS	(JPC_NMSEDEC_BITS - 1)
-
-/*
- * Segment types.
- */
-
-/* Invalid. */
-#define JPC_SEG_INVALID	0
-/* MQ. */
-#define JPC_SEG_MQ		1
-/* Raw. */
-#define JPC_SEG_RAW		2
-
-/* The nominal word size. */
-#define	JPC_PREC	32
-
-/* Tier-1 coding pass types. */
-#define	JPC_SIGPASS	0	/* significance */
-#define	JPC_REFPASS	1	/* refinement */
-#define	JPC_CLNPASS	2	/* cleanup */
-
-/*
- * Per-sample state information for tier-1 coding.
- */
-
-/* The northeast neighbour has been found to be significant. */
-#define	JPC_NESIG	0x0001
-/* The southeast neighbour has been found to be significant. */
-#define	JPC_SESIG	0x0002
-/* The southwest neighbour has been found to be significant. */
-#define	JPC_SWSIG	0x0004
-/* The northwest neighbour has been found to be significant. */
-#define	JPC_NWSIG	0x0008
-/* The north neighbour has been found to be significant. */
-#define	JPC_NSIG	0x0010
-/* The east neighbour has been found to be significant. */
-#define	JPC_ESIG	0x0020
-/* The south neighbour has been found to be significant. */
-#define	JPC_SSIG	0x0040
-/* The west neighbour has been found to be significant. */
-#define	JPC_WSIG	0x0080
-/* The significance mask for 8-connected neighbours. */
-#define	JPC_OTHSIGMSK \
-    (JPC_NSIG | JPC_NESIG | JPC_ESIG | JPC_SESIG | JPC_SSIG | JPC_SWSIG | JPC_WSIG | JPC_NWSIG)
-/* The significance mask for 4-connected neighbours. */
-#define	JPC_PRIMSIGMSK	(JPC_NSIG | JPC_ESIG | JPC_SSIG | JPC_WSIG)
-
-/* The north neighbour is negative in value. */
-#define	JPC_NSGN	0x0100
-/* The east neighbour is negative in value. */
-#define	JPC_ESGN	0x0200
-/* The south neighbour is negative in value. */
-#define	JPC_SSGN	0x0400
-/* The west neighbour is negative in value. */
-#define	JPC_WSGN	0x0800
-/* The sign mask for 4-connected neighbours. */
-#define	JPC_SGNMSK	(JPC_NSGN | JPC_ESGN | JPC_SSGN | JPC_WSGN)
-
-/* This sample has been found to be significant. */
-#define JPC_SIG		0x1000
-/* The sample has been refined. */
-#define	JPC_REFINE	0x2000
-/* This sample has been processed during the significance pass. */
-#define	JPC_VISIT	0x4000
-
-/* The number of aggregation contexts. */
-#define	JPC_NUMAGGCTXS	1
-/* The number of zero coding contexts. */
-#define	JPC_NUMZCCTXS	9
-/* The number of magnitude contexts. */
-#define	JPC_NUMMAGCTXS	3
-/* The number of sign coding contexts. */
-#define	JPC_NUMSCCTXS	5
-/* The number of uniform contexts. */
-#define	JPC_NUMUCTXS	1
-
-/* The context ID for the first aggregation context. */
-#define	JPC_AGGCTXNO	0
-/* The context ID for the first zero coding context. */
-#define	JPC_ZCCTXNO		(JPC_AGGCTXNO + JPC_NUMAGGCTXS)
-/* The context ID for the first magnitude context. */
-#define	JPC_MAGCTXNO	(JPC_ZCCTXNO + JPC_NUMZCCTXS)
-/* The context ID for the first sign coding context. */
-#define	JPC_SCCTXNO		(JPC_MAGCTXNO + JPC_NUMMAGCTXS)
-/* The context ID for the first uniform context. */
-#define	JPC_UCTXNO		(JPC_SCCTXNO + JPC_NUMSCCTXS)
-/* The total number of contexts. */
-#define	JPC_NUMCTXS		(JPC_UCTXNO + JPC_NUMUCTXS)
-
-/******************************************************************************\
-* External data.
-\******************************************************************************/
-
-/* These lookup tables are used by various macros/functions. */
-/* Do not access these lookup tables directly. */
-extern int jpc_zcctxnolut[];
-extern int jpc_spblut[];
-extern int jpc_scctxnolut[];
-extern int jpc_magctxnolut[];
-extern jpc_fix_t jpc_refnmsedec[];
-extern jpc_fix_t jpc_signmsedec[];
-extern jpc_fix_t jpc_refnmsedec0[];
-extern jpc_fix_t jpc_signmsedec0[];
-
-/* The initial settings for the MQ contexts. */
-extern jpc_mqctx_t jpc_mqctxs[];
-
-/******************************************************************************\
-* Functions and macros.
-\******************************************************************************/
-
-/* Initialize the MQ contexts. */
-void jpc_initctxs(jpc_mqctx_t *ctxs);
-
-/* Get the zero coding context. */
-int jpc_getzcctxno(int f, int orient);
-#define	JPC_GETZCCTXNO(f, orient) \
-    (jpc_zcctxnolut[((orient) << 8) | ((f) & JPC_OTHSIGMSK)])
-
-/* Get the sign prediction bit. */
-int jpc_getspb(int f);
-#define	JPC_GETSPB(f) \
-    (jpc_spblut[((f) & (JPC_PRIMSIGMSK | JPC_SGNMSK)) >> 4])
-
-/* Get the sign coding context. */
-int jpc_getscctxno(int f);
-#define	JPC_GETSCCTXNO(f) \
-    (jpc_scctxnolut[((f) & (JPC_PRIMSIGMSK | JPC_SGNMSK)) >> 4])
-
-/* Get the magnitude context. */
-int jpc_getmagctxno(int f);
-#define	JPC_GETMAGCTXNO(f) \
-    (jpc_magctxnolut[((f) & JPC_OTHSIGMSK) | ((((f) & JPC_REFINE) != 0) << 11)])
-
-/* Get the normalized MSE reduction for significance passes. */
-#define	JPC_GETSIGNMSEDEC(x, bitpos)	jpc_getsignmsedec_macro(x, bitpos)
-jpc_fix_t jpc_getsignmsedec_func(jpc_fix_t x, int bitpos);
-#define	jpc_getsignmsedec_macro(x, bitpos) \
-    ((bitpos > JPC_NMSEDEC_FRACBITS) ? jpc_signmsedec[JPC_ASR(x, bitpos - JPC_NMSEDEC_FRACBITS) & JAS_ONES(JPC_NMSEDEC_BITS)] : \
-      (jpc_signmsedec0[JPC_ASR(x, bitpos - JPC_NMSEDEC_FRACBITS) & JAS_ONES(JPC_NMSEDEC_BITS)]))
-
-/* Get the normalized MSE reduction for refinement passes. */
-#define	JPC_GETREFNMSEDEC(x, bitpos)	jpc_getrefnmsedec_macro(x, bitpos)
-jpc_fix_t jpc_refsignmsedec_func(jpc_fix_t x, int bitpos);
-#define	jpc_getrefnmsedec_macro(x, bitpos) \
-    ((bitpos > JPC_NMSEDEC_FRACBITS) ? jpc_refnmsedec[JPC_ASR(x, bitpos - JPC_NMSEDEC_FRACBITS) & JAS_ONES(JPC_NMSEDEC_BITS)] : \
-      (jpc_refnmsedec0[JPC_ASR(x, bitpos - JPC_NMSEDEC_FRACBITS) & JAS_ONES(JPC_NMSEDEC_BITS)]))
-
-/* Arithmetic shift right (with ability to shift left also). */
-#define	JPC_ASR(x, n) \
-    (((n) >= 0) ? ((x) >> (n)) : ((x) << (-(n))))
-
-/* Update the per-sample state information. */
-#define	JPC_UPDATEFLAGS4(fp, rowstep, s, vcausalflag) \
-{ \
-    register jpc_fix_t *np = (fp) - (rowstep); \
-    register jpc_fix_t *sp = (fp) + (rowstep); \
-    if ((vcausalflag)) { \
-        sp[-1] |= JPC_NESIG; \
-        sp[1] |= JPC_NWSIG; \
-        if (s) { \
-            *sp |= JPC_NSIG | JPC_NSGN; \
-            (fp)[-1] |= JPC_ESIG | JPC_ESGN; \
-            (fp)[1] |= JPC_WSIG | JPC_WSGN; \
-        } else { \
-            *sp |= JPC_NSIG; \
-            (fp)[-1] |= JPC_ESIG; \
-            (fp)[1] |= JPC_WSIG; \
-        } \
-    } else { \
-        np[-1] |= JPC_SESIG; \
-        np[1] |= JPC_SWSIG; \
-        sp[-1] |= JPC_NESIG; \
-        sp[1] |= JPC_NWSIG; \
-        if (s) { \
-            *np |= JPC_SSIG | JPC_SSGN; \
-            *sp |= JPC_NSIG | JPC_NSGN; \
-            (fp)[-1] |= JPC_ESIG | JPC_ESGN; \
-            (fp)[1] |= JPC_WSIG | JPC_WSGN; \
-        } else { \
-            *np |= JPC_SSIG; \
-            *sp |= JPC_NSIG; \
-            (fp)[-1] |= JPC_ESIG; \
-            (fp)[1] |= JPC_WSIG; \
-        } \
-    } \
-}
-
-/* Initialize the lookup tables used by the codec. */
-void jpc_initluts(void);
-
-/* Get the nominal gain associated with a particular band. */
-int JPC_NOMINALGAIN(int qmfbid, int numlvls, int lvlno, int orient);
-
-/* Get the coding pass type. */
-int JPC_PASSTYPE(int passno);
-
-/* Get the segment type. */
-int JPC_SEGTYPE(int passno, int firstpassno, int bypass);
-
-/* Get the number of coding passess in the segment. */
-int JPC_SEGPASSCNT(int passno, int firstpassno, int numpasses, int bypass,
-  int termall);
-
-/* Is the coding pass terminated? */
-int JPC_ISTERMINATED(int passno, int firstpassno, int numpasses, int termall,
-  int lazy);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c
deleted file mode 100644
index 7c85407..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.c
+++ /dev/null
@@ -1,923 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 1 Decoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_debug.h"
-#include "jasper/jas_fix.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_bs.h"
-#include "jpc_mqdec.h"
-#include "jpc_t1dec.h"
-#include "jpc_t1cod.h"
-#include "jpc_dec.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int jpc_dec_decodecblk(jpc_dec_t *dec, jpc_dec_tile_t *tile, jpc_dec_tcomp_t *tcomp, jpc_dec_band_t *band,
-  jpc_dec_cblk_t *cblk, int dopartial, int maxlyrs);
-static int dec_sigpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int orient,
-  int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data);
-static int dec_rawsigpass(jpc_dec_t *dec, jpc_bitstream_t *in, int bitpos,
-  int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data);
-static int dec_refpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int vcausalflag,
-  jas_matrix_t *flags, jas_matrix_t *data);
-static int dec_rawrefpass(jpc_dec_t *dec, jpc_bitstream_t *in, int bitpos,
-  int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data);
-static int dec_clnpass(jpc_dec_t *dec, jpc_mqdec_t *mqdec, int bitpos, int orient,
-  int vcausalflag, int segsymflag, jas_matrix_t *flags, jas_matrix_t *data);
-
-#if defined(DEBUG)
-static long t1dec_cnt = 0;
-#endif
-
-#if !defined(DEBUG)
-#define	JPC_T1D_GETBIT(mqdec, v, passtypename, symtypename) \
-    ((v) = jpc_mqdec_getbit(mqdec))
-#else
-#define	JPC_T1D_GETBIT(mqdec, v, passtypename, symtypename) \
-{ \
-    (v) = jpc_mqdec_getbit(mqdec); \
-    if (jas_getdbglevel() >= 100) { \
-        jas_eprintf("index = %ld; passtype = %s; symtype = %s; sym = %d\n", t1dec_cnt, passtypename, symtypename, v); \
-        ++t1dec_cnt; \
-    } \
-}
-#endif
-#define	JPC_T1D_GETBITNOSKEW(mqdec, v, passtypename, symtypename) \
-    JPC_T1D_GETBIT(mqdec, v, passtypename, symtypename)
-
-#if !defined(DEBUG)
-#define	JPC_T1D_RAWGETBIT(bitstream, v, passtypename, symtypename) \
-    ((v) = jpc_bitstream_getbit(bitstream))
-#else
-#define	JPC_T1D_RAWGETBIT(bitstream, v, passtypename, symtypename) \
-{ \
-    (v) = jpc_bitstream_getbit(bitstream); \
-    if (jas_getdbglevel() >= 100) { \
-        jas_eprintf("index = %ld; passtype = %s; symtype = %s; sym = %d\n", t1dec_cnt, passtypename, symtypename, v); \
-        ++t1dec_cnt; \
-    } \
-}
-#endif
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-int jpc_dec_decodecblks(jpc_dec_t *dec, jpc_dec_tile_t *tile)
-{
-    jpc_dec_tcomp_t *tcomp;
-    int compcnt;
-    jpc_dec_rlvl_t *rlvl;
-    int rlvlcnt;
-    jpc_dec_band_t *band;
-    int bandcnt;
-    jpc_dec_prc_t *prc;
-    int prccnt;
-    jpc_dec_cblk_t *cblk;
-    int cblkcnt;
-
-    for (compcnt = dec->numcomps, tcomp = tile->tcomps; compcnt > 0;
-      --compcnt, ++tcomp) {
-        for (rlvlcnt = tcomp->numrlvls, rlvl = tcomp->rlvls;
-          rlvlcnt > 0; --rlvlcnt, ++rlvl) {
-            if (!rlvl->bands) {
-                continue;
-            }
-            for (bandcnt = rlvl->numbands, band = rlvl->bands;
-              bandcnt > 0; --bandcnt, ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prccnt = rlvl->numprcs, prc = band->prcs;
-                  prccnt > 0; --prccnt, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    for (cblkcnt = prc->numcblks,
-                      cblk = prc->cblks; cblkcnt > 0;
-                      --cblkcnt, ++cblk) {
-                        if (jpc_dec_decodecblk(dec, tile, tcomp,
-                          band, cblk, 1, JPC_MAXLYRS)) {
-                            return -1;
-                        }
-                    }
-                }
-
-            }
-        }
-    }
-
-    return 0;
-}
-
-static int jpc_dec_decodecblk(jpc_dec_t *dec, jpc_dec_tile_t *tile, jpc_dec_tcomp_t *tcomp, jpc_dec_band_t *band,
-  jpc_dec_cblk_t *cblk, int dopartial, int maxlyrs)
-{
-    jpc_dec_seg_t *seg;
-    int i;
-    int bpno;
-    int passtype;
-    int ret;
-    int compno;
-    int filldata;
-    int fillmask;
-    jpc_dec_ccp_t *ccp;
-
-    compno = tcomp - tile->tcomps;
-
-    if (!cblk->flags) {
-        /* Note: matrix is assumed to be zeroed */
-        if (!(cblk->flags = jas_matrix_create(jas_matrix_numrows(cblk->data) +
-          2, jas_matrix_numcols(cblk->data) + 2))) {
-            return -1;
-        }
-    }
-
-    seg = cblk->segs.head;
-    while (seg && (seg != cblk->curseg || dopartial) && (maxlyrs < 0 ||
-      seg->lyrno < maxlyrs)) {
-        assert(seg->numpasses >= seg->maxpasses || dopartial);
-        assert(seg->stream);
-        jas_stream_rewind(seg->stream);
-        jas_stream_setrwcount(seg->stream, 0);
-        if (seg->type == JPC_SEG_MQ) {
-            if (!cblk->mqdec) {
-                if (!(cblk->mqdec = jpc_mqdec_create(JPC_NUMCTXS, 0))) {
-                    return -1;
-                }
-                jpc_mqdec_setctxs(cblk->mqdec, JPC_NUMCTXS, jpc_mqctxs);
-            }
-            jpc_mqdec_setinput(cblk->mqdec, seg->stream);
-            jpc_mqdec_init(cblk->mqdec);
-        } else {
-            assert(seg->type == JPC_SEG_RAW);
-            if (!cblk->nulldec) {
-                if (!(cblk->nulldec = jpc_bitstream_sopen(seg->stream, "r"))) {
-                    assert(0);
-                }
-            }
-        }
-
-
-        for (i = 0; i < seg->numpasses; ++i) {
-            if (cblk->numimsbs > band->numbps) {
-                ccp = &tile->cp->ccps[compno];
-                if (ccp->roishift <= 0) {
-                    jas_eprintf("warning: corrupt code stream\n");
-                } else {
-                    if (cblk->numimsbs < ccp->roishift - band->numbps) {
-                        jas_eprintf("warning: corrupt code stream\n");
-                    }
-                }
-            }
-            bpno = band->roishift + band->numbps - 1 - (cblk->numimsbs +
-              (seg->passno + i - cblk->firstpassno + 2) / 3);
-if (bpno < 0) {
-    goto premature_exit;
-}
-#if 1
-            passtype = (seg->passno + i + 2) % 3;
-#else
-            passtype = JPC_PASSTYPE(seg->passno + i + 2);
-#endif
-            assert(bpno >= 0 && bpno < 31);
-            switch (passtype) {
-            case JPC_SIGPASS:
-                ret = (seg->type == JPC_SEG_MQ) ? dec_sigpass(dec,
-                  cblk->mqdec, bpno, band->orient,
-                  (tile->cp->ccps[compno].cblkctx & JPC_COX_VSC) != 0,
-                  cblk->flags, cblk->data) :
-                  dec_rawsigpass(dec, cblk->nulldec, bpno,
-                  (tile->cp->ccps[compno].cblkctx & JPC_COX_VSC) != 0,
-                  cblk->flags, cblk->data);
-                break;
-            case JPC_REFPASS:
-                ret = (seg->type == JPC_SEG_MQ) ?
-                  dec_refpass(dec, cblk->mqdec, bpno,
-                  (tile->cp->ccps[compno].cblkctx & JPC_COX_VSC) != 0,
-                  cblk->flags, cblk->data) :
-                  dec_rawrefpass(dec, cblk->nulldec, bpno,
-                  (tile->cp->ccps[compno].cblkctx & JPC_COX_VSC) != 0,
-                  cblk->flags, cblk->data);
-                break;
-            case JPC_CLNPASS:
-                assert(seg->type == JPC_SEG_MQ);
-                ret = dec_clnpass(dec, cblk->mqdec, bpno,
-                  band->orient, (tile->cp->ccps[compno].cblkctx &
-                  JPC_COX_VSC) != 0, (tile->cp->ccps[compno].cblkctx &
-                  JPC_COX_SEGSYM) != 0, cblk->flags,
-                  cblk->data);
-                break;
-            default:
-                ret = -1;
-                break;
-            }
-            /* Do we need to reset after each coding pass? */
-            if (tile->cp->ccps[compno].cblkctx & JPC_COX_RESET) {
-                jpc_mqdec_setctxs(cblk->mqdec, JPC_NUMCTXS, jpc_mqctxs);
-            }
-
-            if (ret) {
-                jas_eprintf("coding pass failed passtype=%d segtype=%d\n", passtype, seg->type);
-                return -1;
-            }
-
-        }
-
-        if (seg->type == JPC_SEG_MQ) {
-/* Note: dont destroy mq decoder because context info will be lost */
-        } else {
-            assert(seg->type == JPC_SEG_RAW);
-            if (tile->cp->ccps[compno].cblkctx & JPC_COX_PTERM) {
-                fillmask = 0x7f;
-                filldata = 0x2a;
-            } else {
-                fillmask = 0;
-                filldata = 0;
-            }
-            if ((ret = jpc_bitstream_inalign(cblk->nulldec, fillmask,
-              filldata)) < 0) {
-                return -1;
-            } else if (ret > 0) {
-                jas_eprintf("warning: bad termination pattern detected\n");
-            }
-            jpc_bitstream_close(cblk->nulldec);
-            cblk->nulldec = 0;
-        }
-
-        cblk->curseg = seg->next;
-        jpc_seglist_remove(&cblk->segs, seg);
-        jpc_seg_destroy(seg);
-        seg = cblk->curseg;
-    }
-
-    assert(dopartial ? (!cblk->curseg) : 1);
-
-premature_exit:
-    return 0;
-}
-
-/******************************************************************************\
-* Code for significance pass.
-\******************************************************************************/
-
-#define	jpc_sigpass_step(fp, frowstep, dp, bitpos, oneplushalf, orient, mqdec, vcausalflag) \
-{ \
-    int f; \
-    int v; \
-    f = *(fp); \
-    if ((f & JPC_OTHSIGMSK) && !(f & (JPC_SIG | JPC_VISIT))) { \
-        jpc_mqdec_setcurctx((mqdec), JPC_GETZCCTXNO(f, (orient))); \
-        JPC_T1D_GETBIT((mqdec), v, "SIG", "ZC"); \
-        if (v) { \
-            jpc_mqdec_setcurctx((mqdec), JPC_GETSCCTXNO(f)); \
-            JPC_T1D_GETBIT((mqdec), v, "SIG", "SC"); \
-            v ^= JPC_GETSPB(f); \
-            JPC_UPDATEFLAGS4((fp), (frowstep), v, (vcausalflag)); \
-            *(fp) |= JPC_SIG; \
-            *(dp) = (v) ? (-(oneplushalf)) : (oneplushalf); \
-        } \
-        *(fp) |= JPC_VISIT; \
-    } \
-}
-
-static int dec_sigpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
-  int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
-{
-    int i;
-    int j;
-    int one;
-    int half;
-    int oneplushalf;
-    int vscanlen;
-    int width;
-    int height;
-    jpc_fix_t *fp;
-    int frowstep;
-    int fstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dp;
-    int drowstep;
-    int dstripestep;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *dvscanstart;
-    int k;
-
-    /* Avoid compiler warning about unused parameters. */
-    dec = 0;
-
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << bitpos;
-    half = one >> 1;
-    oneplushalf = one | half;
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            /* Process first sample in vertical scan. */
-            jpc_sigpass_step(fp, frowstep, dp, bitpos, oneplushalf,
-              orient, mqdec, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process second sample in vertical scan. */
-            jpc_sigpass_step(fp, frowstep, dp, bitpos, oneplushalf,
-              orient, mqdec, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process third sample in vertical scan. */
-            jpc_sigpass_step(fp, frowstep, dp, bitpos, oneplushalf,
-              orient, mqdec, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process fourth sample in vertical scan. */
-            jpc_sigpass_step(fp, frowstep, dp, bitpos, oneplushalf,
-              orient, mqdec, 0);
-        }
-    }
-    return 0;
-}
-
-#define	jpc_rawsigpass_step(fp, frowstep, dp, oneplushalf, in, vcausalflag) \
-{ \
-    jpc_fix_t f = *(fp); \
-    jpc_fix_t v; \
-    if ((f & JPC_OTHSIGMSK) && !(f & (JPC_SIG | JPC_VISIT))) { \
-        JPC_T1D_RAWGETBIT(in, v, "SIG", "ZC"); \
-        if (v < 0) { \
-            return -1; \
-        } \
-        if (v) { \
-            JPC_T1D_RAWGETBIT(in, v, "SIG", "SC"); \
-            if (v < 0) { \
-                return -1; \
-            } \
-            JPC_UPDATEFLAGS4((fp), (frowstep), v, (vcausalflag)); \
-            *(fp) |= JPC_SIG; \
-            *(dp) = v ? (-oneplushalf) : (oneplushalf); \
-        } \
-        *(fp) |= JPC_VISIT; \
-    } \
-}
-
-static int dec_rawsigpass(jpc_dec_t *dec, jpc_bitstream_t *in, int bitpos, int vcausalflag,
-  jas_matrix_t *flags, jas_matrix_t *data)
-{
-    int i;
-    int j;
-    int k;
-    int one;
-    int half;
-    int oneplushalf;
-    int vscanlen;
-    int width;
-    int height;
-    jpc_fix_t *fp;
-    int frowstep;
-    int fstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dp;
-    int drowstep;
-    int dstripestep;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *dvscanstart;
-
-    /* Avoid compiler warning about unused parameters. */
-    dec = 0;
-
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << bitpos;
-    half = one >> 1;
-    oneplushalf = one | half;
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            /* Process first sample in vertical scan. */
-            jpc_rawsigpass_step(fp, frowstep, dp, oneplushalf,
-              in, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process second sample in vertical scan. */
-            jpc_rawsigpass_step(fp, frowstep, dp, oneplushalf,
-              in, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process third sample in vertical scan. */
-            jpc_rawsigpass_step(fp, frowstep, dp, oneplushalf,
-              in, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process fourth sample in vertical scan. */
-            jpc_rawsigpass_step(fp, frowstep, dp, oneplushalf,
-              in, 0);
-
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Code for refinement pass.
-\******************************************************************************/
-
-#define	jpc_refpass_step(fp, dp, poshalf, neghalf, mqdec, vcausalflag) \
-{ \
-    int v; \
-    int t; \
-    if (((*(fp)) & (JPC_SIG | JPC_VISIT)) == JPC_SIG) { \
-        jpc_mqdec_setcurctx((mqdec), JPC_GETMAGCTXNO(*(fp))); \
-        JPC_T1D_GETBITNOSKEW((mqdec), v, "REF", "MR"); \
-        t = (v ? (poshalf) : (neghalf)); \
-        *(dp) += (*(dp) < 0) ? (-t) : t; \
-        *(fp) |= JPC_REFINE; \
-    } \
-}
-
-static int dec_refpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos,
-  int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data)
-{
-    int i;
-    int j;
-    int vscanlen;
-    int width;
-    int height;
-    int one;
-    int poshalf;
-    int neghalf;
-    jpc_fix_t *fp;
-    int frowstep;
-    int fstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dp;
-    int drowstep;
-    int dstripestep;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *dvscanstart;
-    int k;
-
-    /* Avoid compiler warning about unused parameters. */
-    dec = 0;
-    vcausalflag = 0;
-
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << bitpos;
-    poshalf = one >> 1;
-    neghalf = (bitpos > 0) ? (-poshalf) : (-1);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            /* Process first sample in vertical scan. */
-            jpc_refpass_step(fp, dp, poshalf, neghalf, mqdec,
-              vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process second sample in vertical scan. */
-            jpc_refpass_step(fp, dp, poshalf, neghalf, mqdec, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process third sample in vertical scan. */
-            jpc_refpass_step(fp, dp, poshalf, neghalf, mqdec, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process fourth sample in vertical scan. */
-            jpc_refpass_step(fp, dp, poshalf, neghalf, mqdec, 0);
-        }
-    }
-
-    return 0;
-}
-
-#define	jpc_rawrefpass_step(fp, dp, poshalf, neghalf, in, vcausalflag) \
-{ \
-    jpc_fix_t v; \
-    jpc_fix_t t; \
-    if (((*(fp)) & (JPC_SIG | JPC_VISIT)) == JPC_SIG) { \
-        JPC_T1D_RAWGETBIT(in, v, "REF", "MAGREF"); \
-        if (v < 0) { \
-            return -1; \
-        } \
-        t = (v ? poshalf : neghalf); \
-        *(dp) += (*(dp) < 0) ? (-t) : t; \
-        *(fp) |= JPC_REFINE; \
-    } \
-}
-
-static int dec_rawrefpass(jpc_dec_t *dec, jpc_bitstream_t *in, int bitpos, int vcausalflag,
-  jas_matrix_t *flags, jas_matrix_t *data)
-{
-    int i;
-    int j;
-    int k;
-    int vscanlen;
-    int width;
-    int height;
-    int one;
-    int poshalf;
-    int neghalf;
-    jpc_fix_t *fp;
-    int frowstep;
-    int fstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dp;
-    int drowstep;
-    int dstripestep;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *dvscanstart;
-
-    /* Avoid compiler warning about unused parameters. */
-    dec = 0;
-    vcausalflag = 0;
-
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << bitpos;
-    poshalf = one >> 1;
-    neghalf = (bitpos > 0) ? (-poshalf) : (-1);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            /* Process first sample in vertical scan. */
-            jpc_rawrefpass_step(fp, dp, poshalf, neghalf, in,
-              vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process second sample in vertical scan. */
-            jpc_rawrefpass_step(fp, dp, poshalf, neghalf, in, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process third sample in vertical scan. */
-            jpc_rawrefpass_step(fp, dp, poshalf, neghalf, in, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process fourth sample in vertical scan. */
-            jpc_rawrefpass_step(fp, dp, poshalf, neghalf, in, 0);
-        }
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Code for cleanup pass.
-\******************************************************************************/
-
-#define	jpc_clnpass_step(f, fp, frowstep, dp, oneplushalf, orient, mqdec, flabel, plabel, vcausalflag) \
-{ \
-    int v; \
-flabel \
-    if (!((f) & (JPC_SIG | JPC_VISIT))) { \
-        jpc_mqdec_setcurctx((mqdec), JPC_GETZCCTXNO((f), (orient))); \
-        JPC_T1D_GETBIT((mqdec), v, "CLN", "ZC"); \
-        if (v) { \
-plabel \
-            /* Coefficient is significant. */ \
-            jpc_mqdec_setcurctx((mqdec), JPC_GETSCCTXNO(f)); \
-            JPC_T1D_GETBIT((mqdec), v, "CLN", "SC"); \
-            v ^= JPC_GETSPB(f); \
-            *(dp) = (v) ? (-(oneplushalf)) : (oneplushalf); \
-            JPC_UPDATEFLAGS4((fp), (frowstep), v, (vcausalflag)); \
-            *(fp) |= JPC_SIG; \
-        } \
-    } \
-    /* XXX - Is this correct?  Can aggregation cause some VISIT bits not to be reset?  Check. */ \
-    *(fp) &= ~JPC_VISIT; \
-}
-
-static int dec_clnpass(jpc_dec_t *dec, register jpc_mqdec_t *mqdec, int bitpos, int orient,
-  int vcausalflag, int segsymflag, jas_matrix_t *flags, jas_matrix_t *data)
-{
-    int i;
-    int j;
-    int k;
-    int vscanlen;
-    int v;
-    int half;
-    int runlen;
-    int f;
-    int width;
-    int height;
-    int one;
-    int oneplushalf;
-
-    jpc_fix_t *fp;
-    int frowstep;
-    int fstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *fvscanstart;
-
-    jpc_fix_t *dp;
-    int drowstep;
-    int dstripestep;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *dvscanstart;
-
-    /* Avoid compiler warning about unused parameters. */
-    dec = 0;
-
-    one = 1 << bitpos;
-    half = one >> 1;
-    oneplushalf = one | half;
-
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = 0; i < height; i += 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(4, height - i);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            if (vscanlen >= 4 && (!((*fp) & (JPC_SIG | JPC_VISIT |
-              JPC_OTHSIGMSK))) && (fp += frowstep, !((*fp) & (JPC_SIG |
-              JPC_VISIT | JPC_OTHSIGMSK))) && (fp += frowstep, !((*fp) &
-              (JPC_SIG | JPC_VISIT | JPC_OTHSIGMSK))) && (fp += frowstep,
-              !((*fp) & (JPC_SIG | JPC_VISIT | JPC_OTHSIGMSK)))) {
-
-                jpc_mqdec_setcurctx(mqdec, JPC_AGGCTXNO);
-                JPC_T1D_GETBIT(mqdec, v, "CLN", "AGG");
-                if (!v) {
-                    continue;
-                }
-                jpc_mqdec_setcurctx(mqdec, JPC_UCTXNO);
-                JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "RL");
-                runlen = v;
-                JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "RL");
-                runlen = (runlen << 1) | v;
-                f = *(fp = fvscanstart + frowstep * runlen);
-                dp = dvscanstart + drowstep * runlen;
-                k = vscanlen - runlen;
-                switch (runlen) {
-                case 0:
-                    goto clnpass_partial0;
-                    break;
-                case 1:
-                    goto clnpass_partial1;
-                    break;
-                case 2:
-                    goto clnpass_partial2;
-                    break;
-                case 3:
-                    goto clnpass_partial3;
-                    break;
-                }
-            } else {
-                f = *(fp = fvscanstart);
-                dp = dvscanstart;
-                k = vscanlen;
-                goto clnpass_full0;
-            }
-
-            /* Process first sample in vertical scan. */
-            jpc_clnpass_step(f, fp, frowstep, dp, oneplushalf, orient,
-              mqdec, clnpass_full0:, clnpass_partial0:,
-              vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process second sample in vertical scan. */
-            f = *fp;
-            jpc_clnpass_step(f, fp, frowstep, dp, oneplushalf, orient,
-                mqdec, ;, clnpass_partial1:, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process third sample in vertical scan. */
-            f = *fp;
-            jpc_clnpass_step(f, fp, frowstep, dp, oneplushalf, orient,
-                mqdec, ;, clnpass_partial2:, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            /* Process fourth sample in vertical scan. */
-            f = *fp;
-            jpc_clnpass_step(f, fp, frowstep, dp, oneplushalf, orient,
-                mqdec, ;, clnpass_partial3:, 0);
-        }
-    }
-
-    if (segsymflag) {
-        int segsymval;
-        segsymval = 0;
-        jpc_mqdec_setcurctx(mqdec, JPC_UCTXNO);
-        JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "SEGSYM");
-        segsymval = (segsymval << 1) | (v & 1);
-        JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "SEGSYM");
-        segsymval = (segsymval << 1) | (v & 1);
-        JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "SEGSYM");
-        segsymval = (segsymval << 1) | (v & 1);
-        JPC_T1D_GETBITNOSKEW(mqdec, v, "CLN", "SEGSYM");
-        segsymval = (segsymval << 1) | (v & 1);
-        if (segsymval != 0xa) {
-            jas_eprintf("warning: bad segmentation symbol\n");
-        }
-    }
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.h
deleted file mode 100644
index 6a11428..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1dec.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 1 Decoder
- *
- * $Id$
- */
-
-#ifndef JPC_T1DEC_H
-#define JPC_T1DEC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jpc_dec.h"
-#include "jpc_mqdec.h"
-#include "jpc_t1cod.h"
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Decode all of the code blocks for a particular tile. */
-int jpc_dec_decodecblks(jpc_dec_t *dec, jpc_dec_tile_t *tile);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.c
deleted file mode 100644
index 01333bb..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.c
+++ /dev/null
@@ -1,959 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 1 Encoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_fix.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_t1enc.h"
-#include "jpc_t1cod.h"
-#include "jpc_enc.h"
-#include "jpc_cod.h"
-#include "jpc_math.h"
-
-static int jpc_encsigpass(jpc_mqenc_t *mqenc, int bitpos, int orient, int,
-  jas_matrix_t *flags, jas_matrix_t *data, int term, long *nmsedec);
-
-static int jpc_encrefpass(jpc_mqenc_t *mqenc, int bitpos, int, jas_matrix_t *flags,
-  jas_matrix_t *data, int term, long *nmsedec);
-
-static int jpc_encclnpass(jpc_mqenc_t *mqenc, int bitpos, int orient, int,
-  int, jas_matrix_t *flags, jas_matrix_t *data, int term, long *nmsedec);
-
-static int jpc_encrawsigpass(jpc_bitstream_t *out, int bitpos, int,
-  jas_matrix_t *flags, jas_matrix_t *data, int term, long *nmsedec);
-
-static int jpc_encrawrefpass(jpc_bitstream_t *out, int bitpos, int,
-  jas_matrix_t *flags, jas_matrix_t *data, int term, long *nmsedec);
-
-/******************************************************************************\
-* Code for encoding code blocks.
-\******************************************************************************/
-
-/* Encode all of the code blocks associated with the current tile. */
-int jpc_enc_enccblks(jpc_enc_t *enc)
-{
-    jpc_enc_tcmpt_t *tcmpt;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_rlvl_t *endlvls;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    int i;
-    int j;
-    int mx;
-    int bmx;
-    int v;
-    jpc_enc_tile_t *tile;
-    uint_fast32_t prcno;
-    jpc_enc_prc_t *prc;
-
-    tile = enc->curtile;
-
-    endcomps = &tile->tcmpts[tile->numtcmpts];
-    for (tcmpt = tile->tcmpts; tcmpt != endcomps; ++tcmpt) {
-        endlvls = &tcmpt->rlvls[tcmpt->numrlvls];
-        for (lvl = tcmpt->rlvls; lvl != endlvls; ++lvl) {
-            if (!lvl->bands) {
-                continue;
-            }
-            endbands = &lvl->bands[lvl->numbands];
-            for (band = lvl->bands; band != endbands; ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    bmx = 0;
-                    endcblks = &prc->cblks[prc->numcblks];
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        mx = 0;
-                        for (i = 0; i < jas_matrix_numrows(cblk->data); ++i) {
-                            for (j = 0; j < jas_matrix_numcols(cblk->data); ++j) {
-                                v = abs(jas_matrix_get(cblk->data, i, j));
-                                if (v > mx) {
-                                    mx = v;
-                                }
-                            }
-                        }
-                        if (mx > bmx) {
-                            bmx = mx;
-                        }
-                        cblk->numbps = JAS_MAX(jpc_firstone(mx) + 1 - JPC_NUMEXTRABITS, 0);
-                    }
-
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        cblk->numimsbs = band->numbps - cblk->numbps;
-                        assert(cblk->numimsbs >= 0);
-                    }
-
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        if (jpc_enc_enccblk(enc, cblk->stream, tcmpt, band, cblk)) {
-                            return -1;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return 0;
-}
-
-int getthebyte(jas_stream_t *in, long off)
-{
-    int c;
-    long oldpos;
-    oldpos = jas_stream_tell(in);
-    assert(oldpos >= 0);
-    jas_stream_seek(in, off, SEEK_SET);
-    c = jas_stream_peekc(in);
-    jas_stream_seek(in, oldpos, SEEK_SET);
-    return c;
-}
-
-/* Encode a single code block. */
-int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *tcmpt, jpc_enc_band_t *band, jpc_enc_cblk_t *cblk)
-{
-    jpc_enc_pass_t *pass;
-    jpc_enc_pass_t *endpasses;
-    int bitpos;
-    int n;
-    int adjust;
-    int ret;
-    int passtype;
-    int t;
-    jpc_bitstream_t *bout;
-    jpc_enc_pass_t *termpass;
-    jpc_enc_rlvl_t *rlvl;
-    int vcausal;
-    int segsym;
-    int termmode;
-    int c;
-
-    bout = 0;
-    rlvl = band->rlvl;
-
-    cblk->stream = jas_stream_memopen(0, 0);
-    assert(cblk->stream);
-    cblk->mqenc = jpc_mqenc_create(JPC_NUMCTXS, cblk->stream);
-    assert(cblk->mqenc);
-    jpc_mqenc_setctxs(cblk->mqenc, JPC_NUMCTXS, jpc_mqctxs);
-
-    cblk->numpasses = (cblk->numbps > 0) ? (3 * cblk->numbps - 2) : 0;
-    if (cblk->numpasses > 0) {
-        cblk->passes = jas_malloc(cblk->numpasses * sizeof(jpc_enc_pass_t));
-        assert(cblk->passes);
-    } else {
-        cblk->passes = 0;
-    }
-    endpasses = &cblk->passes[cblk->numpasses];
-    for (pass = cblk->passes; pass != endpasses; ++pass) {
-        pass->start = 0;
-        pass->end = 0;
-        pass->term = JPC_ISTERMINATED(pass - cblk->passes, 0, cblk->numpasses, (tcmpt->cblksty & JPC_COX_TERMALL) != 0, (tcmpt->cblksty & JPC_COX_LAZY) != 0);
-        pass->type = JPC_SEGTYPE(pass - cblk->passes, 0, (tcmpt->cblksty & JPC_COX_LAZY) != 0);
-        pass->lyrno = -1;
-if (pass == endpasses - 1) {
-assert(pass->term == 1);
-    pass->term = 1;
-}
-    }
-
-    cblk->flags = jas_matrix_create(jas_matrix_numrows(cblk->data) + 2,
-      jas_matrix_numcols(cblk->data) + 2);
-    assert(cblk->flags);
-
-
-    bitpos = cblk->numbps - 1;
-    pass = cblk->passes;
-    n = cblk->numpasses;
-    while (--n >= 0) {
-
-        if (pass->type == JPC_SEG_MQ) {
-            /* NOP */
-        } else {
-            assert(pass->type == JPC_SEG_RAW);
-            if (!bout) {
-                bout = jpc_bitstream_sopen(cblk->stream, "w");
-                assert(bout);
-            }
-        }
-
-#if 1
-        passtype = (pass - cblk->passes + 2) % 3;
-#else
-        passtype = JPC_PASSTYPE(pass - cblk->passes + 2);
-#endif
-        pass->start = jas_stream_tell(cblk->stream);
-#if 0
-assert(jas_stream_tell(cblk->stream) == jas_stream_getrwcount(cblk->stream));
-#endif
-        assert(bitpos >= 0);
-        vcausal = (tcmpt->cblksty & JPC_COX_VSC) != 0;
-        segsym = (tcmpt->cblksty & JPC_COX_SEGSYM) != 0;
-        if (pass->term) {
-            termmode = ((tcmpt->cblksty & JPC_COX_PTERM) ?
-              JPC_MQENC_PTERM : JPC_MQENC_DEFTERM) + 1;
-        } else {
-            termmode = 0;
-        }
-        switch (passtype) {
-        case JPC_SIGPASS:
-            ret = (pass->type == JPC_SEG_MQ) ? jpc_encsigpass(cblk->mqenc,
-              bitpos, band->orient, vcausal, cblk->flags,
-              cblk->data, termmode, &pass->nmsedec) :
-              jpc_encrawsigpass(bout, bitpos, vcausal, cblk->flags,
-              cblk->data, termmode, &pass->nmsedec);
-            break;
-        case JPC_REFPASS:
-            ret = (pass->type == JPC_SEG_MQ) ? jpc_encrefpass(cblk->mqenc,
-              bitpos, vcausal, cblk->flags, cblk->data, termmode,
-              &pass->nmsedec) : jpc_encrawrefpass(bout, bitpos,
-              vcausal, cblk->flags, cblk->data, termmode,
-              &pass->nmsedec);
-            break;
-        case JPC_CLNPASS:
-            assert(pass->type == JPC_SEG_MQ);
-            ret = jpc_encclnpass(cblk->mqenc, bitpos, band->orient,
-              vcausal, segsym, cblk->flags, cblk->data, termmode,
-              &pass->nmsedec);
-            break;
-        default:
-            assert(0);
-            break;
-        }
-
-        if (pass->type == JPC_SEG_MQ) {
-            if (pass->term) {
-                jpc_mqenc_init(cblk->mqenc);
-            }
-            jpc_mqenc_getstate(cblk->mqenc, &pass->mqencstate);
-            pass->end = jas_stream_tell(cblk->stream);
-            if (tcmpt->cblksty & JPC_COX_RESET) {
-                jpc_mqenc_setctxs(cblk->mqenc, JPC_NUMCTXS, jpc_mqctxs);
-            }
-        } else {
-            if (pass->term) {
-                if (jpc_bitstream_pending(bout)) {
-                    jpc_bitstream_outalign(bout, 0x2a);
-                }
-                jpc_bitstream_close(bout);
-                bout = 0;
-                pass->end = jas_stream_tell(cblk->stream);
-            } else {
-                pass->end = jas_stream_tell(cblk->stream) +
-                  jpc_bitstream_pending(bout);
-/* NOTE - This will not work.  need to adjust by # of pending output bytes */
-            }
-        }
-#if 0
-/* XXX - This assertion fails sometimes when various coding modes are used.
-This seems to be harmless, but why does it happen at all? */
-assert(jas_stream_tell(cblk->stream) == jas_stream_getrwcount(cblk->stream));
-#endif
-
-        pass->wmsedec = jpc_fixtodbl(band->rlvl->tcmpt->synweight) *
-          jpc_fixtodbl(band->rlvl->tcmpt->synweight) *
-          jpc_fixtodbl(band->synweight) *
-          jpc_fixtodbl(band->synweight) *
-          jpc_fixtodbl(band->absstepsize) * jpc_fixtodbl(band->absstepsize) *
-          ((double) (1 << bitpos)) * ((double)(1 << bitpos)) *
-          jpc_fixtodbl(pass->nmsedec);
-        pass->cumwmsedec = pass->wmsedec;
-        if (pass != cblk->passes) {
-            pass->cumwmsedec += pass[-1].cumwmsedec;
-        }
-        if (passtype == JPC_CLNPASS) {
-            --bitpos;
-        }
-        ++pass;
-    }
-
-#if 0
-dump_passes(cblk->passes, cblk->numpasses, cblk);
-#endif
-
-    n = 0;
-    endpasses = &cblk->passes[cblk->numpasses];
-    for (pass = cblk->passes; pass != endpasses; ++pass) {
-        if (pass->start < n) {
-            pass->start = n;
-        }
-        if (pass->end < n) {
-            pass->end = n;
-        }
-        if (!pass->term) {
-            termpass = pass;
-            while (termpass - pass < cblk->numpasses &&
-              !termpass->term) {
-                ++termpass;
-            }
-            if (pass->type == JPC_SEG_MQ) {
-                t = (pass->mqencstate.lastbyte == 0xff) ? 1 : 0;
-                if (pass->mqencstate.ctreg >= 5) {
-                    adjust = 4 + t;
-                } else {
-                    adjust = 5 + t;
-                }
-                pass->end += adjust;
-            }
-            if (pass->end > termpass->end) {
-                pass->end = termpass->end;
-            }
-            if ((c = getthebyte(cblk->stream, pass->end - 1)) == EOF) {
-                abort();
-            }
-            if (c == 0xff) {
-                ++pass->end;
-            }
-            n = JAS_MAX(n, pass->end);
-        } else {
-            n = JAS_MAX(n, pass->end);
-        }
-    }
-
-#if 0
-dump_passes(cblk->passes, cblk->numpasses, cblk);
-#endif
-
-    if (bout) {
-        jpc_bitstream_close(bout);
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for significance pass.
-\******************************************************************************/
-
-#define	sigpass_step(fp, frowstep, dp, bitpos, one, nmsedec, orient, mqenc, vcausalflag) \
-{ \
-    int f; \
-    int v; \
-    f = *(fp); \
-    if ((f & JPC_OTHSIGMSK) && !(f & (JPC_SIG | JPC_VISIT))) { \
-        v = (abs(*(dp)) & (one)) ? 1 : 0; \
-        jpc_mqenc_setcurctx(mqenc, JPC_GETZCCTXNO(f, (orient))); \
-        jpc_mqenc_putbit(mqenc, v); \
-        if (v) { \
-            *(nmsedec) += JPC_GETSIGNMSEDEC(abs(*(dp)), (bitpos) + JPC_NUMEXTRABITS); \
-            v = ((*(dp) < 0) ? 1 : 0); \
-            jpc_mqenc_setcurctx(mqenc, JPC_GETSCCTXNO(f)); \
-            jpc_mqenc_putbit(mqenc, v ^ JPC_GETSPB(f)); \
-            JPC_UPDATEFLAGS4(fp, frowstep, v, vcausalflag); \
-            *(fp) |= JPC_SIG; \
-        } \
-        *(fp) |= JPC_VISIT; \
-    } \
-}
-
-static int jpc_encsigpass(jpc_mqenc_t *mqenc, int bitpos, int orient, int vcausalflag,
-  jas_matrix_t *flags, jas_matrix_t *data, int term, long *nmsedec)
-{
-    int i;
-    int j;
-    int one;
-    int vscanlen;
-    int width;
-    int height;
-    int frowstep;
-    int drowstep;
-    int fstripestep;
-    int dstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *fp;
-    jpc_fix_t *dp;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dvscanstart;
-    int k;
-
-    *nmsedec = 0;
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << (bitpos + JPC_NUMEXTRABITS);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            sigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, orient, mqenc, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            sigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, orient, mqenc, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            sigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, orient, mqenc, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            sigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, orient, mqenc, 0);
-
-        }
-    }
-
-    if (term) {
-        jpc_mqenc_flush(mqenc, term - 1);
-    }
-
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
-
-#define	rawsigpass_step(fp, frowstep, dp, bitpos, one, nmsedec, out, vcausalflag) \
-{ \
-    jpc_fix_t f = *(fp); \
-    jpc_fix_t v; \
-    if ((f & JPC_OTHSIGMSK) && !(f & (JPC_SIG | JPC_VISIT))) { \
-        v = (abs(*(dp)) & (one)) ? 1 : 0; \
-        if ((jpc_bitstream_putbit((out), v)) == EOF) { \
-            return -1; \
-        } \
-        if (v) { \
-            *(nmsedec) += JPC_GETSIGNMSEDEC(abs(*(dp)), (bitpos) + JPC_NUMEXTRABITS); \
-            v = ((*(dp) < 0) ? 1 : 0); \
-            if (jpc_bitstream_putbit(out, v) == EOF) { \
-                return -1; \
-            } \
-            JPC_UPDATEFLAGS4(fp, frowstep, v, vcausalflag); \
-            *(fp) |= JPC_SIG; \
-        } \
-        *(fp) |= JPC_VISIT; \
-    } \
-}
-
-static int jpc_encrawsigpass(jpc_bitstream_t *out, int bitpos, int vcausalflag, jas_matrix_t *flags,
-  jas_matrix_t *data, int term, long *nmsedec)
-{
-    int i;
-    int j;
-    int k;
-    int one;
-    int vscanlen;
-    int width;
-    int height;
-    int frowstep;
-    int drowstep;
-    int fstripestep;
-    int dstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *fp;
-    jpc_fix_t *dp;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dvscanstart;
-
-    *nmsedec = 0;
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << (bitpos + JPC_NUMEXTRABITS);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            rawsigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, out, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            rawsigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, out, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            rawsigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, out, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-            rawsigpass_step(fp, frowstep, dp, bitpos, one,
-              nmsedec, out, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-
-        }
-    }
-
-    if (term) {
-        jpc_bitstream_outalign(out, 0x2a);
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for refinement pass.
-\******************************************************************************/
-
-#define	refpass_step(fp, dp, bitpos, one, nmsedec, mqenc, vcausalflag) \
-{ \
-    int v; \
-    if (((*(fp)) & (JPC_SIG | JPC_VISIT)) == JPC_SIG) { \
-        (d) = *(dp); \
-        *(nmsedec) += JPC_GETREFNMSEDEC(abs(d), (bitpos) + JPC_NUMEXTRABITS); \
-        jpc_mqenc_setcurctx((mqenc), JPC_GETMAGCTXNO(*(fp))); \
-        v = (abs(d) & (one)) ? 1 : 0; \
-        jpc_mqenc_putbit((mqenc), v); \
-        *(fp) |= JPC_REFINE; \
-    } \
-}
-
-static int jpc_encrefpass(jpc_mqenc_t *mqenc, int bitpos, int vcausalflag, jas_matrix_t *flags, jas_matrix_t *data,
-  int term, long *nmsedec)
-{
-    int i;
-    int j;
-    int one;
-    int vscanlen;
-    int d;
-    int width;
-    int height;
-    int frowstep;
-    int drowstep;
-    int fstripestep;
-    int dstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dvscanstart;
-    jpc_fix_t *dp;
-    jpc_fix_t *fp;
-int k;
-
-    *nmsedec = 0;
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << (bitpos + JPC_NUMEXTRABITS);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            refpass_step(fp, dp, bitpos, one, nmsedec,
-              mqenc, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            refpass_step(fp, dp, bitpos, one, nmsedec,
-              mqenc, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            refpass_step(fp, dp, bitpos, one, nmsedec,
-              mqenc, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            refpass_step(fp, dp, bitpos, one, nmsedec,
-              mqenc, 0);
-
-        }
-    }
-
-    if (term) {
-        jpc_mqenc_flush(mqenc, term - 1);
-    }
-
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
-
-#define	rawrefpass_step(fp, dp, bitpos, one, nmsedec, out, vcausalflag) \
-{ \
-    jpc_fix_t d; \
-    jpc_fix_t v; \
-    if (((*(fp)) & (JPC_SIG | JPC_VISIT)) == JPC_SIG) { \
-        d = *(dp); \
-        *(nmsedec) += JPC_GETREFNMSEDEC(abs(d), (bitpos) + JPC_NUMEXTRABITS); \
-        v = (abs(d) & (one)) ? 1 : 0; \
-        if (jpc_bitstream_putbit((out), v) == EOF) { \
-            return -1; \
-        } \
-        *(fp) |= JPC_REFINE; \
-    } \
-}
-
-static int jpc_encrawrefpass(jpc_bitstream_t *out, int bitpos, int vcausalflag, jas_matrix_t *flags,
-  jas_matrix_t *data, int term, long *nmsedec)
-{
-    int i;
-    int j;
-    int k;
-    int one;
-    int vscanlen;
-    int width;
-    int height;
-    int frowstep;
-    int drowstep;
-    int fstripestep;
-    int dstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dvscanstart;
-    jpc_fix_t *dp;
-    jpc_fix_t *fp;
-
-    *nmsedec = 0;
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << (bitpos + JPC_NUMEXTRABITS);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-            fp = fvscanstart;
-            dp = dvscanstart;
-            k = vscanlen;
-
-            rawrefpass_step(fp, dp, bitpos, one, nmsedec,
-              out, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            rawrefpass_step(fp, dp, bitpos, one, nmsedec,
-              out, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            rawrefpass_step(fp, dp, bitpos, one, nmsedec,
-              out, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            rawrefpass_step(fp, dp, bitpos, one, nmsedec,
-              out, vcausalflag);
-
-        }
-    }
-
-    if (term) {
-        jpc_bitstream_outalign(out, 0x2a);
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for cleanup pass.
-\******************************************************************************/
-
-#define	clnpass_step(fp, frowstep, dp, bitpos, one, orient, nmsedec, mqenc, label1, label2, vcausalflag) \
-{ \
-    int f; \
-    int v; \
-label1 \
-    f = *(fp); \
-    if (!(f & (JPC_SIG | JPC_VISIT))) { \
-        jpc_mqenc_setcurctx(mqenc, JPC_GETZCCTXNO(f, (orient))); \
-        v = (abs(*(dp)) & (one)) ? 1 : 0; \
-        jpc_mqenc_putbit((mqenc), v); \
-        if (v) { \
-label2 \
-            f = *(fp); \
-            /* Coefficient is significant. */ \
-            *(nmsedec) += JPC_GETSIGNMSEDEC(abs(*(dp)), (bitpos) + JPC_NUMEXTRABITS); \
-            jpc_mqenc_setcurctx((mqenc), JPC_GETSCCTXNO(f)); \
-            v = ((*(dp) < 0) ? 1 : 0); \
-            jpc_mqenc_putbit((mqenc), v ^ JPC_GETSPB(f)); \
-            JPC_UPDATEFLAGS4((fp), (frowstep), v, vcausalflag); \
-            *(fp) |= JPC_SIG; \
-        } \
-    } \
-    *(fp) &= ~JPC_VISIT; \
-}
-
-static int jpc_encclnpass(jpc_mqenc_t *mqenc, int bitpos, int orient, int vcausalflag, int segsymflag, jas_matrix_t *flags,
-  jas_matrix_t *data, int term, long *nmsedec)
-{
-    int i;
-    int j;
-    int k;
-    int vscanlen;
-    int v;
-    int runlen;
-    jpc_fix_t *fp;
-    int width;
-    int height;
-    jpc_fix_t *dp;
-    int one;
-    int frowstep;
-    int drowstep;
-    int fstripestep;
-    int dstripestep;
-    jpc_fix_t *fstripestart;
-    jpc_fix_t *dstripestart;
-    jpc_fix_t *fvscanstart;
-    jpc_fix_t *dvscanstart;
-
-    *nmsedec = 0;
-    width = jas_matrix_numcols(data);
-    height = jas_matrix_numrows(data);
-    frowstep = jas_matrix_rowstep(flags);
-    drowstep = jas_matrix_rowstep(data);
-    fstripestep = frowstep << 2;
-    dstripestep = drowstep << 2;
-
-    one = 1 << (bitpos + JPC_NUMEXTRABITS);
-
-    fstripestart = jas_matrix_getref(flags, 1, 1);
-    dstripestart = jas_matrix_getref(data, 0, 0);
-    for (i = height; i > 0; i -= 4, fstripestart += fstripestep,
-      dstripestart += dstripestep) {
-        fvscanstart = fstripestart;
-        dvscanstart = dstripestart;
-        vscanlen = JAS_MIN(i, 4);
-        for (j = width; j > 0; --j, ++fvscanstart, ++dvscanstart) {
-
-            fp = fvscanstart;
-            if (vscanlen >= 4 && !((*fp) & (JPC_SIG | JPC_VISIT |
-              JPC_OTHSIGMSK)) && (fp += frowstep, !((*fp) & (JPC_SIG |
-              JPC_VISIT | JPC_OTHSIGMSK))) && (fp += frowstep, !((*fp) &
-              (JPC_SIG | JPC_VISIT | JPC_OTHSIGMSK))) && (fp += frowstep,
-              !((*fp) & (JPC_SIG | JPC_VISIT | JPC_OTHSIGMSK)))) {
-                dp = dvscanstart;
-                for (k = 0; k < vscanlen; ++k) {
-                    v = (abs(*dp) & one) ? 1 : 0;
-                    if (v) {
-                        break;
-                    }
-                    dp += drowstep;
-                }
-                runlen = k;
-                if (runlen >= 4) {
-                    jpc_mqenc_setcurctx(mqenc, JPC_AGGCTXNO);
-                    jpc_mqenc_putbit(mqenc, 0);
-                    continue;
-                }
-                jpc_mqenc_setcurctx(mqenc, JPC_AGGCTXNO);
-                jpc_mqenc_putbit(mqenc, 1);
-                jpc_mqenc_setcurctx(mqenc, JPC_UCTXNO);
-                jpc_mqenc_putbit(mqenc, runlen >> 1);
-                jpc_mqenc_putbit(mqenc, runlen & 1);
-                fp = fvscanstart + frowstep * runlen;
-                dp = dvscanstart + drowstep * runlen;
-                k = vscanlen - runlen;
-                switch (runlen) {
-                case 0:
-                    goto clnpass_partial0;
-                    break;
-                case 1:
-                    goto clnpass_partial1;
-                    break;
-                case 2:
-                    goto clnpass_partial2;
-                    break;
-                case 3:
-                    goto clnpass_partial3;
-                    break;
-                }
-            } else {
-                runlen = 0;
-                fp = fvscanstart;
-                dp = dvscanstart;
-                k = vscanlen;
-                goto clnpass_full0;
-            }
-            clnpass_step(fp, frowstep, dp, bitpos, one,
-              orient, nmsedec, mqenc, clnpass_full0:, clnpass_partial0:, vcausalflag);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            clnpass_step(fp, frowstep, dp, bitpos, one,
-                orient, nmsedec, mqenc, ;, clnpass_partial1:, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            clnpass_step(fp, frowstep, dp, bitpos, one,
-                orient, nmsedec, mqenc, ;, clnpass_partial2:, 0);
-            if (--k <= 0) {
-                continue;
-            }
-            fp += frowstep;
-            dp += drowstep;
-            clnpass_step(fp, frowstep, dp, bitpos, one,
-                orient, nmsedec, mqenc, ;, clnpass_partial3:, 0);
-        }
-    }
-
-    if (segsymflag) {
-        jpc_mqenc_setcurctx(mqenc, JPC_UCTXNO);
-        jpc_mqenc_putbit(mqenc, 1);
-        jpc_mqenc_putbit(mqenc, 0);
-        jpc_mqenc_putbit(mqenc, 1);
-        jpc_mqenc_putbit(mqenc, 0);
-    }
-
-    if (term) {
-        jpc_mqenc_flush(mqenc, term - 1);
-    }
-
-    return jpc_mqenc_error(mqenc) ? (-1) : 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.h
deleted file mode 100644
index 6f880e4..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t1enc.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 1 Encoder
- *
- * $Id$
- */
-
-#ifndef JPC_T1ENC_H
-#define JPC_T1ENC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_seq.h"
-
-#include "jpc_enc.h"
-#include "jpc_t1cod.h"
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Encode all of the code blocks. */
-int jpc_enc_enccblks(jpc_enc_t *enc);
-
-/* Encode a single code block. */
-int jpc_enc_enccblk(jpc_enc_t *enc, jas_stream_t *out, jpc_enc_tcmpt_t *comp,
-  jpc_enc_band_t *band, jpc_enc_cblk_t *cblk);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.c
deleted file mode 100644
index 8a41c6e..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.c
+++ /dev/null
@@ -1,684 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier-2 Coding Library
- *
- * $Id$
- */
-
-#include "jasper/jas_math.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-
-#include "jpc_cs.h"
-#include "jpc_t2cod.h"
-#include "jpc_math.h"
-
-static int jpc_pi_nextlrcp(jpc_pi_t *pi);
-static int jpc_pi_nextrlcp(jpc_pi_t *pi);
-static int jpc_pi_nextrpcl(jpc_pi_t *pi);
-static int jpc_pi_nextpcrl(jpc_pi_t *pi);
-static int jpc_pi_nextcprl(jpc_pi_t *pi);
-
-int jpc_pi_next(jpc_pi_t *pi)
-{
-    jpc_pchg_t *pchg;
-    int ret;
-
-
-    for (;;) {
-
-        pi->valid = false;
-
-        if (!pi->pchg) {
-            ++pi->pchgno;
-            pi->compno = 0;
-            pi->rlvlno = 0;
-            pi->prcno = 0;
-            pi->lyrno = 0;
-            pi->prgvolfirst = true;
-            if (pi->pchgno < jpc_pchglist_numpchgs(pi->pchglist)) {
-                pi->pchg = jpc_pchglist_get(pi->pchglist, pi->pchgno);
-            } else if (pi->pchgno == jpc_pchglist_numpchgs(pi->pchglist)) {
-                pi->pchg = &pi->defaultpchg;
-            } else {
-                return 1;
-            }
-        }
-
-        pchg = pi->pchg;
-        switch (pchg->prgord) {
-        case JPC_COD_LRCPPRG:
-            ret = jpc_pi_nextlrcp(pi);
-            break;
-        case JPC_COD_RLCPPRG:
-            ret = jpc_pi_nextrlcp(pi);
-            break;
-        case JPC_COD_RPCLPRG:
-            ret = jpc_pi_nextrpcl(pi);
-            break;
-        case JPC_COD_PCRLPRG:
-            ret = jpc_pi_nextpcrl(pi);
-            break;
-        case JPC_COD_CPRLPRG:
-            ret = jpc_pi_nextcprl(pi);
-            break;
-        default:
-            ret = -1;
-            break;
-        }
-        if (!ret) {
-            pi->valid = true;
-            ++pi->pktno;
-            return 0;
-        }
-        pi->pchg = 0;
-    }
-}
-
-static int jpc_pi_nextlrcp(register jpc_pi_t *pi)
-{
-    jpc_pchg_t *pchg;
-    int *prclyrno;
-
-    pchg = pi->pchg;
-    if (!pi->prgvolfirst) {
-        prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
-        goto skip;
-    } else {
-        pi->prgvolfirst = false;
-    }
-
-    for (pi->lyrno = 0; pi->lyrno < pi->numlyrs && pi->lyrno <
-      JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
-        for (pi->rlvlno = pchg->rlvlnostart; pi->rlvlno < pi->maxrlvls &&
-          pi->rlvlno < pchg->rlvlnoend; ++pi->rlvlno) {
-            for (pi->compno = pchg->compnostart, pi->picomp =
-              &pi->picomps[pi->compno]; pi->compno < pi->numcomps
-              && pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
-              ++pi->picomp) {
-                if (pi->rlvlno >= pi->picomp->numrlvls) {
-                    continue;
-                }
-                pi->pirlvl = &pi->picomp->pirlvls[pi->rlvlno];
-                for (pi->prcno = 0, prclyrno =
-                  pi->pirlvl->prclyrnos; pi->prcno <
-                  pi->pirlvl->numprcs; ++pi->prcno,
-                  ++prclyrno) {
-                    if (pi->lyrno >= *prclyrno) {
-                        *prclyrno = pi->lyrno;
-                        ++(*prclyrno);
-                        return 0;
-                    }
-skip:
-                    ;
-                }
-            }
-        }
-    }
-    return 1;
-}
-
-static int jpc_pi_nextrlcp(register jpc_pi_t *pi)
-{
-    jpc_pchg_t *pchg;
-    int *prclyrno;
-
-    pchg = pi->pchg;
-    if (!pi->prgvolfirst) {
-        assert(pi->prcno < pi->pirlvl->numprcs);
-        prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
-        goto skip;
-    } else {
-        pi->prgvolfirst = 0;
-    }
-
-    for (pi->rlvlno = pchg->rlvlnostart; pi->rlvlno < pi->maxrlvls &&
-      pi->rlvlno < pchg->rlvlnoend; ++pi->rlvlno) {
-        for (pi->lyrno = 0; pi->lyrno < pi->numlyrs && pi->lyrno <
-          JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
-            for (pi->compno = pchg->compnostart, pi->picomp =
-              &pi->picomps[pi->compno]; pi->compno < pi->numcomps &&
-              pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno, ++pi->picomp) {
-                if (pi->rlvlno >= pi->picomp->numrlvls) {
-                    continue;
-                }
-                pi->pirlvl = &pi->picomp->pirlvls[pi->rlvlno];
-                for (pi->prcno = 0, prclyrno = pi->pirlvl->prclyrnos;
-                  pi->prcno < pi->pirlvl->numprcs; ++pi->prcno, ++prclyrno) {
-                    if (pi->lyrno >= *prclyrno) {
-                        *prclyrno = pi->lyrno;
-                        ++(*prclyrno);
-                        return 0;
-                    }
-skip:
-                    ;
-                }
-            }
-        }
-    }
-    return 1;
-}
-
-static int jpc_pi_nextrpcl(register jpc_pi_t *pi)
-{
-    int rlvlno;
-    jpc_pirlvl_t *pirlvl;
-    jpc_pchg_t *pchg;
-    int prchind;
-    int prcvind;
-    int *prclyrno;
-    int compno;
-    jpc_picomp_t *picomp;
-    int xstep;
-    int ystep;
-    uint_fast32_t r;
-    uint_fast32_t rpx;
-    uint_fast32_t rpy;
-    uint_fast32_t trx0;
-    uint_fast32_t try0;
-
-    pchg = pi->pchg;
-    if (!pi->prgvolfirst) {
-        goto skip;
-    } else {
-        pi->xstep = 0;
-        pi->ystep = 0;
-        for (compno = 0, picomp = pi->picomps; compno < pi->numcomps;
-          ++compno, ++picomp) {
-            for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-              picomp->numrlvls; ++rlvlno, ++pirlvl) {
-                xstep = picomp->hsamp * (1 << (pirlvl->prcwidthexpn +
-                  picomp->numrlvls - rlvlno - 1));
-                ystep = picomp->vsamp * (1 << (pirlvl->prcheightexpn +
-                  picomp->numrlvls - rlvlno - 1));
-                pi->xstep = (!pi->xstep) ? xstep : JAS_MIN(pi->xstep, xstep);
-                pi->ystep = (!pi->ystep) ? ystep : JAS_MIN(pi->ystep, ystep);
-            }
-        }
-        pi->prgvolfirst = 0;
-    }
-
-    for (pi->rlvlno = pchg->rlvlnostart; pi->rlvlno < pchg->rlvlnoend &&
-      pi->rlvlno < pi->maxrlvls; ++pi->rlvlno) {
-        for (pi->y = pi->ystart; pi->y < pi->yend; pi->y +=
-          pi->ystep - (pi->y % pi->ystep)) {
-            for (pi->x = pi->xstart; pi->x < pi->xend; pi->x +=
-              pi->xstep - (pi->x % pi->xstep)) {
-                for (pi->compno = pchg->compnostart,
-                  pi->picomp = &pi->picomps[pi->compno];
-                  pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno <
-                  pi->numcomps; ++pi->compno, ++pi->picomp) {
-                    if (pi->rlvlno >= pi->picomp->numrlvls) {
-                        continue;
-                    }
-                    pi->pirlvl = &pi->picomp->pirlvls[pi->rlvlno];
-                    if (pi->pirlvl->numprcs == 0) {
-                        continue;
-                    }
-                    r = pi->picomp->numrlvls - 1 - pi->rlvlno;
-                    rpx = r + pi->pirlvl->prcwidthexpn;
-                    rpy = r + pi->pirlvl->prcheightexpn;
-                    trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
-                    try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
-                    if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx)))
-                      || !(pi->x % (1 << rpx))) &&
-                      ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy)))
-                      || !(pi->y % (1 << rpy)))) {
-                        prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
-                          << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
-                          pi->pirlvl->prcwidthexpn);
-                        prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
-                          << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
-                          pi->pirlvl->prcheightexpn);
-                        pi->prcno = prcvind * pi->pirlvl->numhprcs + prchind;
-
-                        assert(pi->prcno < pi->pirlvl->numprcs);
-                        for (pi->lyrno = 0; pi->lyrno <
-                          pi->numlyrs && pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
-                            prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
-                            if (pi->lyrno >= *prclyrno) {
-                                ++(*prclyrno);
-                                return 0;
-                            }
-skip:
-                            ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return 1;
-}
-
-static int jpc_pi_nextpcrl(register jpc_pi_t *pi)
-{
-    int rlvlno;
-    jpc_pirlvl_t *pirlvl;
-    jpc_pchg_t *pchg;
-    int prchind;
-    int prcvind;
-    int *prclyrno;
-    int compno;
-    jpc_picomp_t *picomp;
-    int xstep;
-    int ystep;
-    uint_fast32_t trx0;
-    uint_fast32_t try0;
-    uint_fast32_t r;
-    uint_fast32_t rpx;
-    uint_fast32_t rpy;
-
-    pchg = pi->pchg;
-    if (!pi->prgvolfirst) {
-        goto skip;
-    } else {
-        pi->xstep = 0;
-        pi->ystep = 0;
-        for (compno = 0, picomp = pi->picomps; compno < pi->numcomps;
-          ++compno, ++picomp) {
-            for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-              picomp->numrlvls; ++rlvlno, ++pirlvl) {
-                xstep = picomp->hsamp * (1 <<
-                  (pirlvl->prcwidthexpn + picomp->numrlvls -
-                  rlvlno - 1));
-                ystep = picomp->vsamp * (1 <<
-                  (pirlvl->prcheightexpn + picomp->numrlvls -
-                  rlvlno - 1));
-                pi->xstep = (!pi->xstep) ? xstep :
-                  JAS_MIN(pi->xstep, xstep);
-                pi->ystep = (!pi->ystep) ? ystep :
-                  JAS_MIN(pi->ystep, ystep);
-            }
-        }
-        pi->prgvolfirst = 0;
-    }
-
-    for (pi->y = pi->ystart; pi->y < pi->yend; pi->y += pi->ystep -
-      (pi->y % pi->ystep)) {
-        for (pi->x = pi->xstart; pi->x < pi->xend; pi->x += pi->xstep -
-          (pi->x % pi->xstep)) {
-            for (pi->compno = pchg->compnostart, pi->picomp =
-              &pi->picomps[pi->compno]; pi->compno < pi->numcomps
-              && pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
-              ++pi->picomp) {
-                for (pi->rlvlno = pchg->rlvlnostart,
-                  pi->pirlvl = &pi->picomp->pirlvls[pi->rlvlno];
-                  pi->rlvlno < pi->picomp->numrlvls &&
-                  pi->rlvlno < pchg->rlvlnoend; ++pi->rlvlno,
-                  ++pi->pirlvl) {
-                    if (pi->pirlvl->numprcs == 0) {
-                        continue;
-                    }
-                    r = pi->picomp->numrlvls - 1 - pi->rlvlno;
-                    trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
-                    try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
-                    rpx = r + pi->pirlvl->prcwidthexpn;
-                    rpy = r + pi->pirlvl->prcheightexpn;
-                    if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx))) ||
-                      !(pi->x % (pi->picomp->hsamp << rpx))) &&
-                      ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy))) ||
-                      !(pi->y % (pi->picomp->vsamp << rpy)))) {
-                        prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
-                          << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
-                          pi->pirlvl->prcwidthexpn);
-                        prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
-                          << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
-                          pi->pirlvl->prcheightexpn);
-                        pi->prcno = prcvind * pi->pirlvl->numhprcs + prchind;
-                        assert(pi->prcno < pi->pirlvl->numprcs);
-                        for (pi->lyrno = 0; pi->lyrno < pi->numlyrs &&
-                          pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
-                            prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
-                            if (pi->lyrno >= *prclyrno) {
-                                ++(*prclyrno);
-                                return 0;
-                            }
-skip:
-                            ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return 1;
-}
-
-static int jpc_pi_nextcprl(register jpc_pi_t *pi)
-{
-    int rlvlno;
-    jpc_pirlvl_t *pirlvl;
-    jpc_pchg_t *pchg;
-    int prchind;
-    int prcvind;
-    int *prclyrno;
-    uint_fast32_t trx0;
-    uint_fast32_t try0;
-    uint_fast32_t r;
-    uint_fast32_t rpx;
-    uint_fast32_t rpy;
-
-    pchg = pi->pchg;
-    if (!pi->prgvolfirst) {
-        goto skip;
-    } else {
-        pi->prgvolfirst = 0;
-    }
-
-    for (pi->compno = pchg->compnostart, pi->picomp =
-      &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
-      ++pi->picomp) {
-        pirlvl = pi->picomp->pirlvls;
-        pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn +
-          pi->picomp->numrlvls - 1));
-        pi->ystep = pi->picomp->vsamp * (1 << (pirlvl->prcheightexpn +
-          pi->picomp->numrlvls - 1));
-        for (rlvlno = 1, pirlvl = &pi->picomp->pirlvls[1];
-          rlvlno < pi->picomp->numrlvls; ++rlvlno, ++pirlvl) {
-            pi->xstep = JAS_MIN(pi->xstep, pi->picomp->hsamp * (1 <<
-              (pirlvl->prcwidthexpn + pi->picomp->numrlvls -
-              rlvlno - 1)));
-            pi->ystep = JAS_MIN(pi->ystep, pi->picomp->vsamp * (1 <<
-              (pirlvl->prcheightexpn + pi->picomp->numrlvls -
-              rlvlno - 1)));
-        }
-        for (pi->y = pi->ystart; pi->y < pi->yend;
-          pi->y += pi->ystep - (pi->y % pi->ystep)) {
-            for (pi->x = pi->xstart; pi->x < pi->xend;
-              pi->x += pi->xstep - (pi->x % pi->xstep)) {
-                for (pi->rlvlno = pchg->rlvlnostart,
-                  pi->pirlvl = &pi->picomp->pirlvls[pi->rlvlno];
-                  pi->rlvlno < pi->picomp->numrlvls && pi->rlvlno <
-                  pchg->rlvlnoend; ++pi->rlvlno, ++pi->pirlvl) {
-                    if (pi->pirlvl->numprcs == 0) {
-                        continue;
-                    }
-                    r = pi->picomp->numrlvls - 1 - pi->rlvlno;
-                    trx0 = JPC_CEILDIV(pi->xstart, pi->picomp->hsamp << r);
-                    try0 = JPC_CEILDIV(pi->ystart, pi->picomp->vsamp << r);
-                    rpx = r + pi->pirlvl->prcwidthexpn;
-                    rpy = r + pi->pirlvl->prcheightexpn;
-                    if (((pi->x == pi->xstart && ((trx0 << r) % (1 << rpx))) ||
-                      !(pi->x % (pi->picomp->hsamp << rpx))) &&
-                      ((pi->y == pi->ystart && ((try0 << r) % (1 << rpy))) ||
-                      !(pi->y % (pi->picomp->vsamp << rpy)))) {
-                        prchind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->x, pi->picomp->hsamp
-                          << r), pi->pirlvl->prcwidthexpn) - JPC_FLOORDIVPOW2(trx0,
-                          pi->pirlvl->prcwidthexpn);
-                        prcvind = JPC_FLOORDIVPOW2(JPC_CEILDIV(pi->y, pi->picomp->vsamp
-                          << r), pi->pirlvl->prcheightexpn) - JPC_FLOORDIVPOW2(try0,
-                          pi->pirlvl->prcheightexpn);
-                        pi->prcno = prcvind *
-                          pi->pirlvl->numhprcs +
-                          prchind;
-                        assert(pi->prcno <
-                          pi->pirlvl->numprcs);
-                        for (pi->lyrno = 0; pi->lyrno <
-                          pi->numlyrs && pi->lyrno < JAS_CAST(int, pchg->lyrnoend); ++pi->lyrno) {
-                            prclyrno = &pi->pirlvl->prclyrnos[pi->prcno];
-                            if (pi->lyrno >= *prclyrno) {
-                                ++(*prclyrno);
-                                return 0;
-                            }
-skip:
-                            ;
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return 1;
-}
-
-static void pirlvl_destroy(jpc_pirlvl_t *rlvl)
-{
-    if (rlvl->prclyrnos) {
-        jas_free(rlvl->prclyrnos);
-    }
-}
-
-static void jpc_picomp_destroy(jpc_picomp_t *picomp)
-{
-    int rlvlno;
-    jpc_pirlvl_t *pirlvl;
-    if (picomp->pirlvls) {
-        for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-          picomp->numrlvls; ++rlvlno, ++pirlvl) {
-            pirlvl_destroy(pirlvl);
-        }
-        jas_free(picomp->pirlvls);
-    }
-}
-
-void jpc_pi_destroy(jpc_pi_t *pi)
-{
-    jpc_picomp_t *picomp;
-    int compno;
-    if (pi->picomps) {
-        for (compno = 0, picomp = pi->picomps; compno < pi->numcomps;
-          ++compno, ++picomp) {
-            jpc_picomp_destroy(picomp);
-        }
-        jas_free(pi->picomps);
-    }
-    if (pi->pchglist) {
-        jpc_pchglist_destroy(pi->pchglist);
-    }
-    jas_free(pi);
-}
-
-jpc_pi_t *jpc_pi_create0()
-{
-    jpc_pi_t *pi;
-    if (!(pi = jas_malloc(sizeof(jpc_pi_t)))) {
-        return 0;
-    }
-    pi->picomps = 0;
-    pi->pchgno = 0;
-    if (!(pi->pchglist = jpc_pchglist_create())) {
-        jas_free(pi);
-        return 0;
-    }
-    return pi;
-}
-
-int jpc_pi_addpchg(jpc_pi_t *pi, jpc_pocpchg_t *pchg)
-{
-    return jpc_pchglist_insert(pi->pchglist, -1, pchg);
-}
-
-jpc_pchglist_t *jpc_pchglist_create()
-{
-    jpc_pchglist_t *pchglist;
-    if (!(pchglist = jas_malloc(sizeof(jpc_pchglist_t)))) {
-        return 0;
-    }
-    pchglist->numpchgs = 0;
-    pchglist->maxpchgs = 0;
-    pchglist->pchgs = 0;
-    return pchglist;
-}
-
-int jpc_pchglist_insert(jpc_pchglist_t *pchglist, int pchgno, jpc_pchg_t *pchg)
-{
-    int i;
-    int newmaxpchgs;
-    jpc_pchg_t **newpchgs;
-    if (pchgno < 0) {
-        pchgno = pchglist->numpchgs;
-    }
-    if (pchglist->numpchgs >= pchglist->maxpchgs) {
-        newmaxpchgs = pchglist->maxpchgs + 128;
-        if (!(newpchgs = jas_realloc(pchglist->pchgs, newmaxpchgs * sizeof(jpc_pchg_t *)))) {
-            return -1;
-        }
-        pchglist->maxpchgs = newmaxpchgs;
-        pchglist->pchgs = newpchgs;
-    }
-    for (i = pchglist->numpchgs; i > pchgno; --i) {
-        pchglist->pchgs[i] = pchglist->pchgs[i - 1];
-    }
-    pchglist->pchgs[pchgno] = pchg;
-    ++pchglist->numpchgs;
-    return 0;
-}
-
-jpc_pchg_t *jpc_pchglist_remove(jpc_pchglist_t *pchglist, int pchgno)
-{
-    int i;
-    jpc_pchg_t *pchg;
-    assert(pchgno < pchglist->numpchgs);
-    pchg = pchglist->pchgs[pchgno];
-    for (i = pchgno + 1; i < pchglist->numpchgs; ++i) {
-        pchglist->pchgs[i - 1] = pchglist->pchgs[i];
-    }
-    --pchglist->numpchgs;
-    return pchg;
-}
-
-jpc_pchg_t *jpc_pchg_copy(jpc_pchg_t *pchg)
-{
-    jpc_pchg_t *newpchg;
-    if (!(newpchg = jas_malloc(sizeof(jpc_pchg_t)))) {
-        return 0;
-    }
-    *newpchg = *pchg;
-    return newpchg;
-}
-
-jpc_pchglist_t *jpc_pchglist_copy(jpc_pchglist_t *pchglist)
-{
-    jpc_pchglist_t *newpchglist;
-    jpc_pchg_t *newpchg;
-    int pchgno;
-    if (!(newpchglist = jpc_pchglist_create())) {
-        return 0;
-    }
-    for (pchgno = 0; pchgno < pchglist->numpchgs; ++pchgno) {
-        if (!(newpchg = jpc_pchg_copy(pchglist->pchgs[pchgno])) ||
-          jpc_pchglist_insert(newpchglist, -1, newpchg)) {
-            jpc_pchglist_destroy(newpchglist);
-            return 0;
-        }
-    }
-    return newpchglist;
-}
-
-void jpc_pchglist_destroy(jpc_pchglist_t *pchglist)
-{
-    int pchgno;
-    if (pchglist->pchgs) {
-        for (pchgno = 0; pchgno < pchglist->numpchgs; ++pchgno) {
-            jpc_pchg_destroy(pchglist->pchgs[pchgno]);
-        }
-        jas_free(pchglist->pchgs);
-    }
-    jas_free(pchglist);
-}
-
-void jpc_pchg_destroy(jpc_pchg_t *pchg)
-{
-    jas_free(pchg);
-}
-
-jpc_pchg_t *jpc_pchglist_get(jpc_pchglist_t *pchglist, int pchgno)
-{
-    return pchglist->pchgs[pchgno];
-}
-
-int jpc_pchglist_numpchgs(jpc_pchglist_t *pchglist)
-{
-    return pchglist->numpchgs;
-}
-
-int jpc_pi_init(jpc_pi_t *pi)
-{
-    int compno;
-    int rlvlno;
-    int prcno;
-    jpc_picomp_t *picomp;
-    jpc_pirlvl_t *pirlvl;
-    int *prclyrno;
-
-    pi->prgvolfirst = 0;
-    pi->valid = 0;
-    pi->pktno = -1;
-    pi->pchgno = -1;
-    pi->pchg = 0;
-
-    for (compno = 0, picomp = pi->picomps; compno < pi->numcomps;
-      ++compno, ++picomp) {
-        for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-          picomp->numrlvls; ++rlvlno, ++pirlvl) {
-            for (prcno = 0, prclyrno = pirlvl->prclyrnos;
-              prcno < pirlvl->numprcs; ++prcno, ++prclyrno) {
-                *prclyrno = 0;
-            }
-        }
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.h
deleted file mode 100644
index d972da6..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2cod.h
+++ /dev/null
@@ -1,299 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier-2 Coding Library
- *
- * $Id$
- */
-
-#ifndef JPC_T2COD_H
-#define	JPC_T2COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jpc_cs.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Progression change list. */
-
-typedef struct {
-
-    /* The number of progression changes. */
-    int numpchgs;
-
-    /* The maximum number of progression changes that can be accomodated
-      without growing the progression change array. */
-    int maxpchgs;
-
-    /* The progression changes. */
-    jpc_pchg_t **pchgs;
-
-} jpc_pchglist_t;
-
-/* Packet iterator per-resolution-level information. */
-
-typedef struct {
-
-    /* The number of precincts. */
-    int numprcs;
-
-    /* The last layer processed for each precinct. */
-    int *prclyrnos;
-
-    /* The precinct width exponent. */
-    int prcwidthexpn;
-
-    /* The precinct height exponent. */
-    int prcheightexpn;
-
-    /* The number of precincts spanning the resolution level in the horizontal
-      direction. */
-    int numhprcs;
-
-} jpc_pirlvl_t;
-
-/* Packet iterator per-component information. */
-
-typedef struct {
-
-    /* The number of resolution levels. */
-    int numrlvls;
-
-    /* The per-resolution-level information. */
-    jpc_pirlvl_t *pirlvls;
-
-    /* The horizontal sampling period. */
-    int hsamp;
-
-    /* The vertical sampling period. */
-    int vsamp;
-
-} jpc_picomp_t;
-
-/* Packet iterator class. */
-
-typedef struct {
-
-    /* The number of layers. */
-    int numlyrs;
-
-    /* The number of resolution levels. */
-    int maxrlvls;
-
-    /* The number of components. */
-    int numcomps;
-
-    /* The per-component information. */
-    jpc_picomp_t *picomps;
-
-    /* The current component. */
-    jpc_picomp_t *picomp;
-
-    /* The current resolution level. */
-    jpc_pirlvl_t *pirlvl;
-
-    /* The number of the current component. */
-    int compno;
-
-    /* The number of the current resolution level. */
-    int rlvlno;
-
-    /* The number of the current precinct. */
-    int prcno;
-
-    /* The number of the current layer. */
-    int lyrno;
-
-    /* The x-coordinate of the current position. */
-    int x;
-
-    /* The y-coordinate of the current position. */
-    int y;
-
-    /* The horizontal step size. */
-    int xstep;
-
-    /* The vertical step size. */
-    int ystep;
-
-    /* The x-coordinate of the top-left corner of the tile on the reference
-      grid. */
-    int xstart;
-
-    /* The y-coordinate of the top-left corner of the tile on the reference
-      grid. */
-    int ystart;
-
-    /* The x-coordinate of the bottom-right corner of the tile on the
-      reference grid (plus one). */
-    int xend;
-
-    /* The y-coordinate of the bottom-right corner of the tile on the
-      reference grid (plus one). */
-    int yend;
-
-    /* The current progression change. */
-    jpc_pchg_t *pchg;
-
-    /* The progression change list. */
-    jpc_pchglist_t *pchglist;
-
-    /* The progression to use in the absense of explicit specification. */
-    jpc_pchg_t defaultpchg;
-
-    /* The current progression change number. */
-    int pchgno;
-
-    /* Is this the first time in the current progression volume? */
-    bool prgvolfirst;
-
-    /* Is the current iterator value valid? */
-    bool valid;
-
-    /* The current packet number. */
-    int pktno;
-
-} jpc_pi_t;
-
-/******************************************************************************\
-* Functions/macros for packet iterators.
-\******************************************************************************/
-
-/* Create a packet iterator. */
-jpc_pi_t *jpc_pi_create0(void);
-
-/* Destroy a packet iterator. */
-void jpc_pi_destroy(jpc_pi_t *pi);
-
-/* Add a progression change to a packet iterator. */
-int jpc_pi_addpchg(jpc_pi_t *pi, jpc_pocpchg_t *pchg);
-
-/* Prepare a packet iterator for iteration. */
-int jpc_pi_init(jpc_pi_t *pi);
-
-/* Set the iterator to the first packet. */
-int jpc_pi_begin(jpc_pi_t *pi);
-
-/* Proceed to the next packet in sequence. */
-int jpc_pi_next(jpc_pi_t *pi);
-
-/* Get the index of the current packet. */
-#define	jpc_pi_getind(pi)	((pi)->pktno)
-
-/* Get the component number of the current packet. */
-#define jpc_pi_cmptno(pi)	(assert(pi->valid), (pi)->compno)
-
-/* Get the resolution level of the current packet. */
-#define jpc_pi_rlvlno(pi)	(assert(pi->valid), (pi)->rlvlno)
-
-/* Get the layer number of the current packet. */
-#define jpc_pi_lyrno(pi)	(assert(pi->valid), (pi)->lyrno)
-
-/* Get the precinct number of the current packet. */
-#define jpc_pi_prcno(pi)	(assert(pi->valid), (pi)->prcno)
-
-/* Get the progression order for the current packet. */
-#define jpc_pi_prg(pi)	(assert(pi->valid), (pi)->pchg->prgord)
-
-/******************************************************************************\
-* Functions/macros for progression change lists.
-\******************************************************************************/
-
-/* Create a progression change list. */
-jpc_pchglist_t *jpc_pchglist_create(void);
-
-/* Destroy a progression change list. */
-void jpc_pchglist_destroy(jpc_pchglist_t *pchglist);
-
-/* Insert a new element into a progression change list. */
-int jpc_pchglist_insert(jpc_pchglist_t *pchglist, int pchgno, jpc_pchg_t *pchg);
-
-/* Remove an element from a progression change list. */
-jpc_pchg_t *jpc_pchglist_remove(jpc_pchglist_t *pchglist, int pchgno);
-
-/* Get an element from a progression change list. */
-jpc_pchg_t *jpc_pchglist_get(jpc_pchglist_t *pchglist, int pchgno);
-
-/* Copy a progression change list. */
-jpc_pchglist_t *jpc_pchglist_copy(jpc_pchglist_t *pchglist);
-
-/* Get the number of elements in a progression change list. */
-int jpc_pchglist_numpchgs(jpc_pchglist_t *pchglist);
-
-/******************************************************************************\
-* Functions/macros for progression changes.
-\******************************************************************************/
-
-/* Destroy a progression change. */
-void jpc_pchg_destroy(jpc_pchg_t *pchg);
-
-/* Copy a progression change. */
-jpc_pchg_t *jpc_pchg_copy(jpc_pchg_t *pchg);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.c
deleted file mode 100644
index 7a001b3..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.c
+++ /dev/null
@@ -1,581 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 2 Decoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_fix.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_bs.h"
-#include "jpc_dec.h"
-#include "jpc_cs.h"
-#include "jpc_mqdec.h"
-#include "jpc_t2dec.h"
-#include "jpc_t1cod.h"
-#include "jpc_math.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-long jpc_dec_lookahead(jas_stream_t *in);
-static int jpc_getcommacode(jpc_bitstream_t *in);
-static int jpc_getnumnewpasses(jpc_bitstream_t *in);
-static int jpc_dec_decodepkt(jpc_dec_t *dec, jas_stream_t *pkthdrstream, jas_stream_t *in, int compno, int lvlno,
-  int prcno, int lyrno);
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-static int jpc_getcommacode(jpc_bitstream_t *in)
-{
-    int n;
-    int v;
-
-    n = 0;
-    for (;;) {
-        if ((v = jpc_bitstream_getbit(in)) < 0) {
-            return -1;
-        }
-        if (jpc_bitstream_eof(in)) {
-            return -1;
-        }
-        if (!v) {
-            break;
-        }
-        ++n;
-    }
-
-    return n;
-}
-
-static int jpc_getnumnewpasses(jpc_bitstream_t *in)
-{
-    int n;
-
-    if ((n = jpc_bitstream_getbit(in)) > 0) {
-        if ((n = jpc_bitstream_getbit(in)) > 0) {
-            if ((n = jpc_bitstream_getbits(in, 2)) == 3) {
-                if ((n = jpc_bitstream_getbits(in, 5)) == 31) {
-                    if ((n = jpc_bitstream_getbits(in, 7)) >= 0) {
-                        n += 36 + 1;
-                    }
-                } else if (n >= 0) {
-                    n += 5 + 1;
-                }
-            } else if (n >= 0) {
-                n += 2 + 1;
-            }
-        } else if (!n) {
-            n += 2;
-        }
-    } else if (!n) {
-        ++n;
-    }
-
-    return n;
-}
-
-static int jpc_dec_decodepkt(jpc_dec_t *dec, jas_stream_t *pkthdrstream, jas_stream_t *in, int compno, int rlvlno,
-  int prcno, int lyrno)
-{
-    jpc_bitstream_t *inb;
-    jpc_dec_tcomp_t *tcomp;
-    jpc_dec_rlvl_t *rlvl;
-    jpc_dec_band_t *band;
-    jpc_dec_cblk_t *cblk;
-    int n;
-    int m;
-    int i;
-    jpc_tagtreenode_t *leaf;
-    int included;
-    int ret;
-    int numnewpasses;
-    jpc_dec_seg_t *seg;
-    int len;
-    int present;
-    int savenumnewpasses;
-    int mycounter;
-    jpc_ms_t *ms;
-    jpc_dec_tile_t *tile;
-    jpc_dec_ccp_t *ccp;
-    jpc_dec_cp_t *cp;
-    int bandno;
-    jpc_dec_prc_t *prc;
-    int usedcblkcnt;
-    int cblkno;
-    uint_fast32_t bodylen;
-    bool discard;
-    int passno;
-    int maxpasses;
-    int hdrlen;
-    int hdroffstart;
-    int hdroffend;
-
-    /* Avoid compiler warning about possible use of uninitialized
-      variable. */
-    bodylen = 0;
-
-    discard = (lyrno >= dec->maxlyrs);
-
-    tile = dec->curtile;
-    cp = tile->cp;
-    ccp = &cp->ccps[compno];
-
-    /*
-     * Decode the packet header.
-     */
-
-    /* Decode the SOP marker segment if present. */
-    if (cp->csty & JPC_COD_SOP) {
-        if (jpc_dec_lookahead(in) == JPC_MS_SOP) {
-            if (!(ms = jpc_getms(in, dec->cstate))) {
-                return -1;
-            }
-            if (jpc_ms_gettype(ms) != JPC_MS_SOP) {
-                jpc_ms_destroy(ms);
-                jas_eprintf("missing SOP marker segment\n");
-                return -1;
-            }
-            jpc_ms_destroy(ms);
-        }
-    }
-
-hdroffstart = jas_stream_getrwcount(pkthdrstream);
-
-    if (!(inb = jpc_bitstream_sopen(pkthdrstream, "r"))) {
-        return -1;
-    }
-
-    if ((present = jpc_bitstream_getbit(inb)) < 0) {
-        return 1;
-    }
-    JAS_DBGLOG(10, ("\n", present));
-    JAS_DBGLOG(10, ("present=%d ", present));
-
-    /* Is the packet non-empty? */
-    if (present) {
-        /* The packet is non-empty. */
-        tcomp = &tile->tcomps[compno];
-        rlvl = &tcomp->rlvls[rlvlno];
-        bodylen = 0;
-        for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-          ++bandno, ++band) {
-            if (!band->data) {
-                continue;
-            }
-            prc = &band->prcs[prcno];
-            if (!prc->cblks) {
-                continue;
-            }
-            usedcblkcnt = 0;
-            for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-              ++cblkno, ++cblk) {
-                ++usedcblkcnt;
-                if (!cblk->numpasses) {
-                    leaf = jpc_tagtree_getleaf(prc->incltagtree, usedcblkcnt - 1);
-                    if ((included = jpc_tagtree_decode(prc->incltagtree, leaf, lyrno + 1, inb)) < 0) {
-                        return -1;
-                    }
-                } else {
-                    if ((included = jpc_bitstream_getbit(inb)) < 0) {
-                        return -1;
-                    }
-                }
-                JAS_DBGLOG(10, ("\n"));
-                JAS_DBGLOG(10, ("included=%d ", included));
-                if (!included) {
-                    continue;
-                }
-                if (!cblk->numpasses) {
-                    i = 1;
-                    leaf = jpc_tagtree_getleaf(prc->numimsbstagtree, usedcblkcnt - 1);
-                    for (;;) {
-                        if ((ret = jpc_tagtree_decode(prc->numimsbstagtree, leaf, i, inb)) < 0) {
-                            return -1;
-                        }
-                        if (ret) {
-                            break;
-                        }
-                        ++i;
-                    }
-                    cblk->numimsbs = i - 1;
-                    cblk->firstpassno = cblk->numimsbs * 3;
-                }
-                if ((numnewpasses = jpc_getnumnewpasses(inb)) < 0) {
-                    return -1;
-                }
-                JAS_DBGLOG(10, ("numnewpasses=%d ", numnewpasses));
-                seg = cblk->curseg;
-                savenumnewpasses = numnewpasses;
-                mycounter = 0;
-                if (numnewpasses > 0) {
-                    if ((m = jpc_getcommacode(inb)) < 0) {
-                        return -1;
-                    }
-                    cblk->numlenbits += m;
-                    JAS_DBGLOG(10, ("increment=%d ", m));
-                    while (numnewpasses > 0) {
-                        passno = cblk->firstpassno + cblk->numpasses + mycounter;
-    /* XXX - the maxpasses is not set precisely but this doesn't matter... */
-                        maxpasses = JPC_SEGPASSCNT(passno, cblk->firstpassno, 10000, (ccp->cblkctx & JPC_COX_LAZY) != 0, (ccp->cblkctx & JPC_COX_TERMALL) != 0);
-                        if (!discard && !seg) {
-                            if (!(seg = jpc_seg_alloc())) {
-                                return -1;
-                            }
-                            jpc_seglist_insert(&cblk->segs, cblk->segs.tail, seg);
-                            if (!cblk->curseg) {
-                                cblk->curseg = seg;
-                            }
-                            seg->passno = passno;
-                            seg->type = JPC_SEGTYPE(seg->passno, cblk->firstpassno, (ccp->cblkctx & JPC_COX_LAZY) != 0);
-                            seg->maxpasses = maxpasses;
-                        }
-                        n = JAS_MIN(numnewpasses, maxpasses);
-                        mycounter += n;
-                        numnewpasses -= n;
-                        if ((len = jpc_bitstream_getbits(inb, cblk->numlenbits + jpc_floorlog2(n))) < 0) {
-                            return -1;
-                        }
-                        JAS_DBGLOG(10, ("len=%d ", len));
-                        if (!discard) {
-                            seg->lyrno = lyrno;
-                            seg->numpasses += n;
-                            seg->cnt = len;
-                            seg = seg->next;
-                        }
-                        bodylen += len;
-                    }
-                }
-                cblk->numpasses += savenumnewpasses;
-            }
-        }
-
-        jpc_bitstream_inalign(inb, 0, 0);
-
-    } else {
-        if (jpc_bitstream_inalign(inb, 0x7f, 0)) {
-            jas_eprintf("alignment failed\n");
-            return -1;
-        }
-    }
-    jpc_bitstream_close(inb);
-
-    hdroffend = jas_stream_getrwcount(pkthdrstream);
-    hdrlen = hdroffend - hdroffstart;
-    if (jas_getdbglevel() >= 5) {
-        jas_eprintf("hdrlen=%lu bodylen=%lu \n", (unsigned long) hdrlen,
-          (unsigned long) bodylen);
-    }
-
-    if (cp->csty & JPC_COD_EPH) {
-        if (jpc_dec_lookahead(pkthdrstream) == JPC_MS_EPH) {
-            if (!(ms = jpc_getms(pkthdrstream, dec->cstate))) {
-                jas_eprintf("cannot get (EPH) marker segment\n");
-                return -1;
-            }
-            if (jpc_ms_gettype(ms) != JPC_MS_EPH) {
-                jpc_ms_destroy(ms);
-                jas_eprintf("missing EPH marker segment\n");
-                return -1;
-            }
-            jpc_ms_destroy(ms);
-        }
-    }
-
-    /* decode the packet body. */
-
-    if (jas_getdbglevel() >= 1) {
-        jas_eprintf("packet body offset=%06ld\n", (long) jas_stream_getrwcount(in));
-    }
-
-    if (!discard) {
-        tcomp = &tile->tcomps[compno];
-        rlvl = &tcomp->rlvls[rlvlno];
-        for (bandno = 0, band = rlvl->bands; bandno < rlvl->numbands;
-          ++bandno, ++band) {
-            if (!band->data) {
-                continue;
-            }
-            prc = &band->prcs[prcno];
-            if (!prc->cblks) {
-                continue;
-            }
-            for (cblkno = 0, cblk = prc->cblks; cblkno < prc->numcblks;
-              ++cblkno, ++cblk) {
-                seg = cblk->curseg;
-                while (seg) {
-                    if (!seg->stream) {
-                        if (!(seg->stream = jas_stream_memopen(0, 0))) {
-                            return -1;
-                        }
-                    }
-#if 0
-jas_eprintf("lyrno=%02d, compno=%02d, lvlno=%02d, prcno=%02d, bandno=%02d, cblkno=%02d, passno=%02d numpasses=%02d cnt=%d numbps=%d, numimsbs=%d\n", lyrno, compno, rlvlno, prcno, band - rlvl->bands, cblk - prc->cblks, seg->passno, seg->numpasses, seg->cnt, band->numbps, cblk->numimsbs);
-#endif
-                    if (seg->cnt > 0) {
-                        if (jpc_getdata(in, seg->stream, seg->cnt) < 0) {
-                            return -1;
-                        }
-                        seg->cnt = 0;
-                    }
-                    if (seg->numpasses >= seg->maxpasses) {
-                        cblk->curseg = seg->next;
-                    }
-                    seg = seg->next;
-                }
-            }
-        }
-    } else {
-        if (jas_stream_gobble(in, bodylen) != JAS_CAST(int, bodylen)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-/********************************************************************************************/
-/********************************************************************************************/
-
-int jpc_dec_decodepkts(jpc_dec_t *dec, jas_stream_t *pkthdrstream, jas_stream_t *in)
-{
-    jpc_dec_tile_t *tile;
-    jpc_pi_t *pi;
-    int ret;
-
-    tile = dec->curtile;
-    pi = tile->pi;
-    for (;;) {
-if (!tile->pkthdrstream || jas_stream_peekc(tile->pkthdrstream) == EOF) {
-        switch (jpc_dec_lookahead(in)) {
-        case JPC_MS_EOC:
-        case JPC_MS_SOT:
-            return 0;
-            break;
-        case JPC_MS_SOP:
-        case JPC_MS_EPH:
-        case 0:
-            break;
-        default:
-            return -1;
-            break;
-        }
-}
-        if ((ret = jpc_pi_next(pi))) {
-            return ret;
-        }
-if (dec->maxpkts >= 0 && dec->numpkts >= dec->maxpkts) {
-    jas_eprintf("warning: stopping decode prematurely as requested\n");
-    return 0;
-}
-        if (jas_getdbglevel() >= 1) {
-            jas_eprintf("packet offset=%08ld prg=%d cmptno=%02d "
-              "rlvlno=%02d prcno=%03d lyrno=%02d\n", (long)
-              jas_stream_getrwcount(in), jpc_pi_prg(pi), jpc_pi_cmptno(pi),
-              jpc_pi_rlvlno(pi), jpc_pi_prcno(pi), jpc_pi_lyrno(pi));
-        }
-        if (jpc_dec_decodepkt(dec, pkthdrstream, in, jpc_pi_cmptno(pi), jpc_pi_rlvlno(pi),
-          jpc_pi_prcno(pi), jpc_pi_lyrno(pi))) {
-            return -1;
-        }
-++dec->numpkts;
-    }
-
-    return 0;
-}
-
-jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *dec, jpc_dec_tile_t *tile)
-{
-    jpc_pi_t *pi;
-    int compno;
-    jpc_picomp_t *picomp;
-    jpc_pirlvl_t *pirlvl;
-    jpc_dec_tcomp_t *tcomp;
-    int rlvlno;
-    jpc_dec_rlvl_t *rlvl;
-    int prcno;
-    int *prclyrno;
-    jpc_dec_cmpt_t *cmpt;
-
-    if (!(pi = jpc_pi_create0())) {
-        return 0;
-    }
-    pi->numcomps = dec->numcomps;
-    if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-        jpc_pi_destroy(pi);
-        return 0;
-    }
-    for (compno = 0, picomp = pi->picomps; compno < pi->numcomps; ++compno,
-      ++picomp) {
-        picomp->pirlvls = 0;
-    }
-
-    for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps;
-      compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
-        picomp->numrlvls = tcomp->numrlvls;
-        if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-          sizeof(jpc_pirlvl_t)))) {
-            jpc_pi_destroy(pi);
-            return 0;
-        }
-        for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-          picomp->numrlvls; ++rlvlno, ++pirlvl) {
-            pirlvl->prclyrnos = 0;
-        }
-        for (rlvlno = 0, pirlvl = picomp->pirlvls, rlvl = tcomp->rlvls;
-          rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
-/* XXX sizeof(long) should be sizeof different type */
-            pirlvl->numprcs = rlvl->numprcs;
-            if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-              sizeof(long)))) {
-                jpc_pi_destroy(pi);
-                return 0;
-            }
-        }
-    }
-
-    pi->maxrlvls = 0;
-    for (compno = 0, tcomp = tile->tcomps, picomp = pi->picomps, cmpt =
-      dec->cmpts; compno < pi->numcomps; ++compno, ++tcomp, ++picomp,
-      ++cmpt) {
-        picomp->hsamp = cmpt->hstep;
-        picomp->vsamp = cmpt->vstep;
-        for (rlvlno = 0, pirlvl = picomp->pirlvls, rlvl = tcomp->rlvls;
-          rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
-            pirlvl->prcwidthexpn = rlvl->prcwidthexpn;
-            pirlvl->prcheightexpn = rlvl->prcheightexpn;
-            for (prcno = 0, prclyrno = pirlvl->prclyrnos;
-              prcno < pirlvl->numprcs; ++prcno, ++prclyrno) {
-                *prclyrno = 0;
-            }
-            pirlvl->numhprcs = rlvl->numhprcs;
-        }
-        if (pi->maxrlvls < tcomp->numrlvls) {
-            pi->maxrlvls = tcomp->numrlvls;
-        }
-    }
-
-    pi->numlyrs = tile->cp->numlyrs;
-    pi->xstart = tile->xstart;
-    pi->ystart = tile->ystart;
-    pi->xend = tile->xend;
-    pi->yend = tile->yend;
-
-    pi->picomp = 0;
-    pi->pirlvl = 0;
-    pi->x = 0;
-    pi->y = 0;
-    pi->compno = 0;
-    pi->rlvlno = 0;
-    pi->prcno = 0;
-    pi->lyrno = 0;
-    pi->xstep = 0;
-    pi->ystep = 0;
-
-    pi->pchgno = -1;
-
-    pi->defaultpchg.prgord = tile->cp->prgord;
-    pi->defaultpchg.compnostart = 0;
-    pi->defaultpchg.compnoend = pi->numcomps;
-    pi->defaultpchg.rlvlnostart = 0;
-    pi->defaultpchg.rlvlnoend = pi->maxrlvls;
-    pi->defaultpchg.lyrnoend = pi->numlyrs;
-    pi->pchg = 0;
-
-    pi->valid = 0;
-
-    return pi;
-}
-
-long jpc_dec_lookahead(jas_stream_t *in)
-{
-    uint_fast16_t x;
-    if (jpc_getuint16(in, &x)) {
-        return -1;
-    }
-    if (jas_stream_ungetc(in, x & 0xff) == EOF ||
-      jas_stream_ungetc(in, x >> 8) == EOF) {
-        return -1;
-    }
-    if (x >= JPC_MS_INMIN && x <= JPC_MS_INMAX) {
-        return x;
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.h
deleted file mode 100644
index bd37437..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2dec.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 2 Decoder
- *
- * $Id$
- */
-
-#ifndef JPC_T2DEC_H
-#define JPC_T2DEC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_fix.h"
-#include "jasper/jas_stream.h"
-
-#include "jpc_bs.h"
-#include "jpc_dec.h"
-#include "jpc_mqdec.h"
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Decode the packets for a tile-part. */
-int jpc_dec_decodepkts(jpc_dec_t *dec, jas_stream_t *pkthdrstream,
-  jas_stream_t *in);
-
-/* Create a packet iterator for the decoder. */
-jpc_pi_t *jpc_dec_pi_create(jpc_dec_t *dec, jpc_dec_tile_t *tile);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.c
deleted file mode 100644
index 7499a87..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 2 Encoder
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_fix.h"
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_math.h"
-#include "jasper/jas_debug.h"
-
-#include "jpc_flt.h"
-#include "jpc_t2enc.h"
-#include "jpc_t2cod.h"
-#include "jpc_tagtree.h"
-#include "jpc_enc.h"
-#include "jpc_math.h"
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-static int jpc_putcommacode(jpc_bitstream_t *out, int n)
-{
-    assert(n >= 0);
-
-    while (--n >= 0) {
-        if (jpc_bitstream_putbit(out, 1) == EOF) {
-            return -1;
-        }
-    }
-    if (jpc_bitstream_putbit(out, 0) == EOF) {
-        return -1;
-    }
-    return 0;
-}
-
-static int jpc_putnumnewpasses(jpc_bitstream_t *out, int n)
-{
-    int ret;
-
-    if (n <= 0) {
-        return -1;
-    } else if (n == 1) {
-        ret = jpc_bitstream_putbit(out, 0);
-    } else if (n == 2) {
-        ret = jpc_bitstream_putbits(out, 2, 2);
-    } else if (n <= 5) {
-        ret = jpc_bitstream_putbits(out, 4, 0xc | (n - 3));
-    } else if (n <= 36) {
-        ret = jpc_bitstream_putbits(out, 9, 0x1e0 | (n - 6));
-    } else if (n <= 164) {
-        ret = jpc_bitstream_putbits(out, 16, 0xff80 | (n - 37));
-    } else {
-        /* The standard has no provision for encoding a larger value.
-        In practice, however, it is highly unlikely that this
-        limitation will ever be encountered. */
-        return -1;
-    }
-
-    return (ret != EOF) ? 0 : (-1);
-}
-
-int jpc_enc_encpkts(jpc_enc_t *enc, jas_stream_t *out)
-{
-    jpc_enc_tile_t *tile;
-    jpc_pi_t *pi;
-
-    tile = enc->curtile;
-
-    jpc_init_t2state(enc, 0);
-    pi = tile->pi;
-    jpc_pi_init(pi);
-
-    if (!jpc_pi_next(pi)) {
-        for (;;) {
-            if (jpc_enc_encpkt(enc, out, jpc_pi_cmptno(pi), jpc_pi_rlvlno(pi),
-              jpc_pi_prcno(pi), jpc_pi_lyrno(pi))) {
-                return -1;
-            }
-            if (jpc_pi_next(pi)) {
-                break;
-            }
-        }
-    }
-
-    return 0;
-}
-
-int jpc_enc_encpkt(jpc_enc_t *enc, jas_stream_t *out, int compno, int lvlno, int prcno, int lyrno)
-{
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    jpc_bitstream_t *outb;
-    jpc_enc_pass_t *pass;
-    jpc_enc_pass_t *startpass;
-    jpc_enc_pass_t *lastpass;
-    jpc_enc_pass_t *endpass;
-    jpc_enc_pass_t *endpasses;
-    int i;
-    int included;
-    int ret;
-    jpc_tagtreenode_t *leaf;
-    int n;
-    int t1;
-    int t2;
-    int adjust;
-    int maxadjust;
-    int datalen;
-    int numnewpasses;
-    int passcount;
-    jpc_enc_tile_t *tile;
-    jpc_enc_prc_t *prc;
-    jpc_enc_cp_t *cp;
-    jpc_ms_t *ms;
-
-    tile = enc->curtile;
-    cp = enc->cp;
-
-    if (cp->tcp.csty & JPC_COD_SOP) {
-        if (!(ms = jpc_ms_create(JPC_MS_SOP))) {
-            return -1;
-        }
-        ms->parms.sop.seqno = jpc_pi_getind(tile->pi);
-        if (jpc_putms(out, enc->cstate, ms)) {
-            return -1;
-        }
-        jpc_ms_destroy(ms);
-    }
-
-    outb = jpc_bitstream_sopen(out, "w+");
-    assert(outb);
-
-    if (jpc_bitstream_putbit(outb, 1) == EOF) {
-        return -1;
-    }
-    JAS_DBGLOG(10, ("\n"));
-    JAS_DBGLOG(10, ("present. "));
-
-    comp = &tile->tcmpts[compno];
-    lvl = &comp->rlvls[lvlno];
-    endbands = &lvl->bands[lvl->numbands];
-    for (band = lvl->bands; band != endbands; ++band) {
-        if (!band->data) {
-            continue;
-        }
-        prc = &band->prcs[prcno];
-        if (!prc->cblks) {
-            continue;
-        }
-
-        endcblks = &prc->cblks[prc->numcblks];
-        for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-            if (!lyrno) {
-                leaf = jpc_tagtree_getleaf(prc->nlibtree, cblk - prc->cblks);
-                jpc_tagtree_setvalue(prc->nlibtree, leaf, cblk->numimsbs);
-            }
-            pass = cblk->curpass;
-            included = (pass && pass->lyrno == lyrno);
-            if (included && (!cblk->numencpasses)) {
-                assert(pass->lyrno == lyrno);
-                leaf = jpc_tagtree_getleaf(prc->incltree,
-                  cblk - prc->cblks);
-                jpc_tagtree_setvalue(prc->incltree, leaf, pass->lyrno);
-            }
-        }
-
-        endcblks = &prc->cblks[prc->numcblks];
-        for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-            pass = cblk->curpass;
-            included = (pass && pass->lyrno == lyrno);
-            if (!cblk->numencpasses) {
-                leaf = jpc_tagtree_getleaf(prc->incltree,
-                  cblk - prc->cblks);
-                if (jpc_tagtree_encode(prc->incltree, leaf, lyrno
-                  + 1, outb) < 0) {
-                    return -1;
-                }
-            } else {
-                if (jpc_bitstream_putbit(outb, included) == EOF) {
-                    return -1;
-                }
-            }
-            JAS_DBGLOG(10, ("included=%d ", included));
-            if (!included) {
-                continue;
-            }
-            if (!cblk->numencpasses) {
-                i = 1;
-                leaf = jpc_tagtree_getleaf(prc->nlibtree, cblk - prc->cblks);
-                for (;;) {
-                    if ((ret = jpc_tagtree_encode(prc->nlibtree, leaf, i, outb)) < 0) {
-                        return -1;
-                    }
-                    if (ret) {
-                        break;
-                    }
-                    ++i;
-                }
-                assert(leaf->known_ && i == leaf->value_ + 1);
-            }
-
-            endpasses = &cblk->passes[cblk->numpasses];
-            startpass = pass;
-            endpass = startpass;
-            while (endpass != endpasses && endpass->lyrno == lyrno){
-                ++endpass;
-            }
-            numnewpasses = endpass - startpass;
-            if (jpc_putnumnewpasses(outb, numnewpasses)) {
-                return -1;
-            }
-            JAS_DBGLOG(10, ("numnewpasses=%d ", numnewpasses));
-
-            lastpass = endpass - 1;
-            n = startpass->start;
-            passcount = 1;
-            maxadjust = 0;
-            for (pass = startpass; pass != endpass; ++pass) {
-                if (pass->term || pass == lastpass) {
-                    datalen = pass->end - n;
-                    t1 = jpc_firstone(datalen) + 1;
-                    t2 = cblk->numlenbits + jpc_floorlog2(passcount);
-                    adjust = JAS_MAX(t1 - t2, 0);
-                    maxadjust = JAS_MAX(adjust, maxadjust);
-                    n += datalen;
-                    passcount = 1;
-                } else {
-                    ++passcount;
-                }
-            }
-            if (jpc_putcommacode(outb, maxadjust)) {
-                return -1;
-            }
-            cblk->numlenbits += maxadjust;
-
-            lastpass = endpass - 1;
-            n = startpass->start;
-            passcount = 1;
-            for (pass = startpass; pass != endpass; ++pass) {
-                if (pass->term || pass == lastpass) {
-                    datalen = pass->end - n;
-assert(jpc_firstone(datalen) < cblk->numlenbits + jpc_floorlog2(passcount));
-                    if (jpc_bitstream_putbits(outb, cblk->numlenbits + jpc_floorlog2(passcount), datalen) == EOF) {
-                        return -1;
-                    }
-                    n += datalen;
-                    passcount = 1;
-                } else {
-                    ++passcount;
-                }
-            }
-        }
-    }
-
-    jpc_bitstream_outalign(outb, 0);
-    jpc_bitstream_close(outb);
-
-    if (cp->tcp.csty & JPC_COD_EPH) {
-        if (!(ms = jpc_ms_create(JPC_MS_EPH))) {
-            return -1;
-        }
-        jpc_putms(out, enc->cstate, ms);
-        jpc_ms_destroy(ms);
-    }
-
-    comp = &tile->tcmpts[compno];
-    lvl = &comp->rlvls[lvlno];
-    endbands = &lvl->bands[lvl->numbands];
-    for (band = lvl->bands; band != endbands; ++band) {
-        if (!band->data) {
-            continue;
-        }
-        prc = &band->prcs[prcno];
-        if (!prc->cblks) {
-            continue;
-        }
-        endcblks = &prc->cblks[prc->numcblks];
-        for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-            pass = cblk->curpass;
-
-            if (!pass) {
-                continue;
-            }
-            if (pass->lyrno != lyrno) {
-                assert(pass->lyrno < 0 || pass->lyrno > lyrno);
-                continue;
-            }
-
-            endpasses = &cblk->passes[cblk->numpasses];
-            startpass = pass;
-            endpass = startpass;
-            while (endpass != endpasses && endpass->lyrno == lyrno){
-                ++endpass;
-            }
-            lastpass = endpass - 1;
-            numnewpasses = endpass - startpass;
-
-            jas_stream_seek(cblk->stream, startpass->start, SEEK_SET);
-            assert(jas_stream_tell(cblk->stream) == startpass->start);
-            if (jas_stream_copy(out, cblk->stream, lastpass->end - startpass->start)) {
-                return -1;
-            }
-            cblk->curpass = (endpass != endpasses) ? endpass : 0;
-            cblk->numencpasses += numnewpasses;
-
-        }
-    }
-
-    return 0;
-}
-
-void jpc_save_t2state(jpc_enc_t *enc)
-{
-/* stream pos in embedded T1 stream may be wrong since not saved/restored! */
-
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_rlvl_t *endlvls;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    jpc_enc_tile_t *tile;
-    int prcno;
-    jpc_enc_prc_t *prc;
-
-    tile = enc->curtile;
-
-    endcomps = &tile->tcmpts[tile->numtcmpts];
-    for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-        endlvls = &comp->rlvls[comp->numrlvls];
-        for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-            if (!lvl->bands) {
-                continue;
-            }
-            endbands = &lvl->bands[lvl->numbands];
-            for (band = lvl->bands; band != endbands; ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    jpc_tagtree_copy(prc->savincltree, prc->incltree);
-                    jpc_tagtree_copy(prc->savnlibtree, prc->nlibtree);
-                    endcblks = &prc->cblks[prc->numcblks];
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        cblk->savedcurpass = cblk->curpass;
-                        cblk->savednumencpasses = cblk->numencpasses;
-                        cblk->savednumlenbits = cblk->numlenbits;
-                    }
-                }
-            }
-        }
-    }
-
-}
-
-void jpc_restore_t2state(jpc_enc_t *enc)
-{
-
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_rlvl_t *endlvls;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    jpc_enc_tile_t *tile;
-    int prcno;
-    jpc_enc_prc_t *prc;
-
-    tile = enc->curtile;
-
-    endcomps = &tile->tcmpts[tile->numtcmpts];
-    for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-        endlvls = &comp->rlvls[comp->numrlvls];
-        for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-            if (!lvl->bands) {
-                continue;
-            }
-            endbands = &lvl->bands[lvl->numbands];
-            for (band = lvl->bands; band != endbands; ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    jpc_tagtree_copy(prc->incltree, prc->savincltree);
-                    jpc_tagtree_copy(prc->nlibtree, prc->savnlibtree);
-                    endcblks = &prc->cblks[prc->numcblks];
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        cblk->curpass = cblk->savedcurpass;
-                        cblk->numencpasses = cblk->savednumencpasses;
-                        cblk->numlenbits = cblk->savednumlenbits;
-                    }
-                }
-            }
-        }
-    }
-}
-
-void jpc_init_t2state(jpc_enc_t *enc, int raflag)
-{
-/* It is assumed that band->numbps and cblk->numbps precomputed */
-
-    jpc_enc_tcmpt_t *comp;
-    jpc_enc_tcmpt_t *endcomps;
-    jpc_enc_rlvl_t *lvl;
-    jpc_enc_rlvl_t *endlvls;
-    jpc_enc_band_t *band;
-    jpc_enc_band_t *endbands;
-    jpc_enc_cblk_t *cblk;
-    jpc_enc_cblk_t *endcblks;
-    jpc_enc_pass_t *pass;
-    jpc_enc_pass_t *endpasses;
-    jpc_tagtreenode_t *leaf;
-    jpc_enc_tile_t *tile;
-    int prcno;
-    jpc_enc_prc_t *prc;
-
-    tile = enc->curtile;
-
-    endcomps = &tile->tcmpts[tile->numtcmpts];
-    for (comp = tile->tcmpts; comp != endcomps; ++comp) {
-        endlvls = &comp->rlvls[comp->numrlvls];
-        for (lvl = comp->rlvls; lvl != endlvls; ++lvl) {
-            if (!lvl->bands) {
-                continue;
-            }
-            endbands = &lvl->bands[lvl->numbands];
-            for (band = lvl->bands; band != endbands; ++band) {
-                if (!band->data) {
-                    continue;
-                }
-                for (prcno = 0, prc = band->prcs; prcno < lvl->numprcs; ++prcno, ++prc) {
-                    if (!prc->cblks) {
-                        continue;
-                    }
-                    jpc_tagtree_reset(prc->incltree);
-                    jpc_tagtree_reset(prc->nlibtree);
-                    endcblks = &prc->cblks[prc->numcblks];
-                    for (cblk = prc->cblks; cblk != endcblks; ++cblk) {
-                        if (jas_stream_rewind(cblk->stream)) {
-                            assert(0);
-                        }
-                        cblk->curpass = (cblk->numpasses > 0) ? cblk->passes : 0;
-                        cblk->numencpasses = 0;
-                        cblk->numlenbits = 3;
-                        cblk->numimsbs = band->numbps - cblk->numbps;
-                        assert(cblk->numimsbs >= 0);
-                        leaf = jpc_tagtree_getleaf(prc->nlibtree, cblk - prc->cblks);
-                        jpc_tagtree_setvalue(prc->nlibtree, leaf, cblk->numimsbs);
-
-                        if (raflag) {
-                            endpasses = &cblk->passes[cblk->numpasses];
-                            for (pass = cblk->passes; pass != endpasses; ++pass) {
-                                pass->lyrno = -1;
-                                pass->lyrno = 0;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-}
-
-jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t *cp, jpc_enc_tile_t *tile)
-{
-    jpc_pi_t *pi;
-    int compno;
-    jpc_picomp_t *picomp;
-    jpc_pirlvl_t *pirlvl;
-    jpc_enc_tcmpt_t *tcomp;
-    int rlvlno;
-    jpc_enc_rlvl_t *rlvl;
-    int prcno;
-    int *prclyrno;
-
-    if (!(pi = jpc_pi_create0())) {
-        return 0;
-    }
-    pi->pktno = -1;
-    pi->numcomps = cp->numcmpts;
-    if (!(pi->picomps = jas_malloc(pi->numcomps * sizeof(jpc_picomp_t)))) {
-        jpc_pi_destroy(pi);
-        return 0;
-    }
-    for (compno = 0, picomp = pi->picomps; compno < pi->numcomps; ++compno,
-      ++picomp) {
-        picomp->pirlvls = 0;
-    }
-
-    for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
-      compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
-        picomp->numrlvls = tcomp->numrlvls;
-        if (!(picomp->pirlvls = jas_malloc(picomp->numrlvls *
-          sizeof(jpc_pirlvl_t)))) {
-            jpc_pi_destroy(pi);
-            return 0;
-        }
-        for (rlvlno = 0, pirlvl = picomp->pirlvls; rlvlno <
-          picomp->numrlvls; ++rlvlno, ++pirlvl) {
-            pirlvl->prclyrnos = 0;
-        }
-        for (rlvlno = 0, pirlvl = picomp->pirlvls, rlvl = tcomp->rlvls;
-          rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
-/* XXX sizeof(long) should be sizeof different type */
-            pirlvl->numprcs = rlvl->numprcs;
-            if (rlvl->numprcs) {
-                if (!(pirlvl->prclyrnos = jas_malloc(pirlvl->numprcs *
-                  sizeof(long)))) {
-                    jpc_pi_destroy(pi);
-                    return 0;
-                }
-            } else {
-                pirlvl->prclyrnos = 0;
-            }
-        }
-    }
-
-    pi->maxrlvls = 0;
-    for (compno = 0, tcomp = tile->tcmpts, picomp = pi->picomps;
-      compno < pi->numcomps; ++compno, ++tcomp, ++picomp) {
-        picomp->hsamp = cp->ccps[compno].sampgrdstepx;
-        picomp->vsamp = cp->ccps[compno].sampgrdstepy;
-        for (rlvlno = 0, pirlvl = picomp->pirlvls, rlvl = tcomp->rlvls;
-          rlvlno < picomp->numrlvls; ++rlvlno, ++pirlvl, ++rlvl) {
-            pirlvl->prcwidthexpn = rlvl->prcwidthexpn;
-            pirlvl->prcheightexpn = rlvl->prcheightexpn;
-            for (prcno = 0, prclyrno = pirlvl->prclyrnos;
-              prcno < pirlvl->numprcs; ++prcno, ++prclyrno) {
-                *prclyrno = 0;
-            }
-            pirlvl->numhprcs = rlvl->numhprcs;
-        }
-        if (pi->maxrlvls < tcomp->numrlvls) {
-            pi->maxrlvls = tcomp->numrlvls;
-        }
-    }
-
-    pi->numlyrs = tile->numlyrs;
-    pi->xstart = tile->tlx;
-    pi->ystart = tile->tly;
-    pi->xend = tile->brx;
-    pi->yend = tile->bry;
-
-    pi->picomp = 0;
-    pi->pirlvl = 0;
-    pi->x = 0;
-    pi->y = 0;
-    pi->compno = 0;
-    pi->rlvlno = 0;
-    pi->prcno = 0;
-    pi->lyrno = 0;
-    pi->xstep = 0;
-    pi->ystep = 0;
-
-    pi->pchgno = -1;
-
-    pi->defaultpchg.prgord = tile->prg;
-    pi->defaultpchg.compnostart = 0;
-    pi->defaultpchg.compnoend = pi->numcomps;
-    pi->defaultpchg.rlvlnostart = 0;
-    pi->defaultpchg.rlvlnoend = pi->maxrlvls;
-    pi->defaultpchg.lyrnoend = pi->numlyrs;
-    pi->pchg = 0;
-
-    pi->valid = 0;
-
-    return pi;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.h
deleted file mode 100644
index c1a7dca..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_t2enc.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tier 2 Encoder
- *
- * $Id$
- */
-
-#ifndef JPC_T2ENC_H
-#define JPC_T2ENC_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jpc_enc.h"
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Encode the packets for a tile. */
-int jpc_enc_encpkts(jpc_enc_t *enc, jas_stream_t *out);
-
-/* Encode the specified packet. */
-int jpc_enc_encpkt(jpc_enc_t *enc, jas_stream_t *out, int compno, int lvlno,
-  int prcno, int lyrno);
-
-/* Save the tier-2 coding state. */
-void jpc_save_t2state(jpc_enc_t *enc);
-
-/* Restore the tier-2 coding state. */
-void jpc_restore_t2state(jpc_enc_t *enc);
-
-/* Initialize the tier-2 coding state. */
-void jpc_init_t2state(jpc_enc_t *enc, int raflag);
-
-/* Create a packet iterator for the encoder. */
-jpc_pi_t *jpc_enc_pi_create(jpc_enc_cp_t *cp, jpc_enc_tile_t *tile);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.c
deleted file mode 100644
index 49c3bd0..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.c
+++ /dev/null
@@ -1,393 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tag Tree Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <limits.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-
-#include "jasper/jas_malloc.h"
-
-#include "jpc_tagtree.h"
-
-/******************************************************************************\
-* Prototypes.
-\******************************************************************************/
-
-static jpc_tagtree_t *jpc_tagtree_alloc(void);
-
-/******************************************************************************\
-* Code for creating and destroying tag trees.
-\******************************************************************************/
-
-/* Create a tag tree. */
-
-jpc_tagtree_t *jpc_tagtree_create(int numleafsh, int numleafsv)
-{
-    int nplh[JPC_TAGTREE_MAXDEPTH];
-    int nplv[JPC_TAGTREE_MAXDEPTH];
-    jpc_tagtreenode_t *node;
-    jpc_tagtreenode_t *parentnode;
-    jpc_tagtreenode_t *parentnode0;
-    jpc_tagtree_t *tree;
-    int i;
-    int j;
-    int k;
-    int numlvls;
-    int n;
-
-    assert(numleafsh > 0 && numleafsv > 0);
-
-    if (!(tree = jpc_tagtree_alloc())) {
-        return 0;
-    }
-    tree->numleafsh_ = numleafsh;
-    tree->numleafsv_ = numleafsv;
-
-    numlvls = 0;
-    nplh[0] = numleafsh;
-    nplv[0] = numleafsv;
-    do {
-        n = nplh[numlvls] * nplv[numlvls];
-        nplh[numlvls + 1] = (nplh[numlvls] + 1) / 2;
-        nplv[numlvls + 1] = (nplv[numlvls] + 1) / 2;
-        tree->numnodes_ += n;
-        ++numlvls;
-    } while (n > 1);
-
-    if (!(tree->nodes_ = jas_malloc(tree->numnodes_ * sizeof(jpc_tagtreenode_t)))) {
-        return 0;
-    }
-
-    /* Initialize the parent links for all nodes in the tree. */
-
-    node = tree->nodes_;
-    parentnode = &tree->nodes_[tree->numleafsh_ * tree->numleafsv_];
-    parentnode0 = parentnode;
-
-    for (i = 0; i < numlvls - 1; ++i) {
-        for (j = 0; j < nplv[i]; ++j) {
-            k = nplh[i];
-            while (--k >= 0) {
-                node->parent_ = parentnode;
-                ++node;
-                if (--k >= 0) {
-                    node->parent_ = parentnode;
-                    ++node;
-                }
-                ++parentnode;
-            }
-            if ((j & 1) || j == nplv[i] - 1) {
-                parentnode0 = parentnode;
-            } else {
-                parentnode = parentnode0;
-                parentnode0 += nplh[i];
-            }
-        }
-    }
-    node->parent_ = 0;
-
-    /* Initialize the data values to something sane. */
-
-    jpc_tagtree_reset(tree);
-
-    return tree;
-}
-
-/* Destroy a tag tree. */
-
-void jpc_tagtree_destroy(jpc_tagtree_t *tree)
-{
-    if (tree->nodes_) {
-        jas_free(tree->nodes_);
-    }
-    jas_free(tree);
-}
-
-static jpc_tagtree_t *jpc_tagtree_alloc()
-{
-    jpc_tagtree_t *tree;
-
-    if (!(tree = jas_malloc(sizeof(jpc_tagtree_t)))) {
-        return 0;
-    }
-    tree->numleafsh_ = 0;
-    tree->numleafsv_ = 0;
-    tree->numnodes_ = 0;
-    tree->nodes_ = 0;
-
-    return tree;
-}
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-/* Copy state information from one tag tree to another. */
-
-void jpc_tagtree_copy(jpc_tagtree_t *dsttree, jpc_tagtree_t *srctree)
-{
-    int n;
-    jpc_tagtreenode_t *srcnode;
-    jpc_tagtreenode_t *dstnode;
-
-    /* The two tag trees must have similar sizes. */
-    assert(srctree->numleafsh_ == dsttree->numleafsh_ &&
-      srctree->numleafsv_ == dsttree->numleafsv_);
-
-    n = srctree->numnodes_;
-    srcnode = srctree->nodes_;
-    dstnode = dsttree->nodes_;
-    while (--n >= 0) {
-        dstnode->value_ = srcnode->value_;
-        dstnode->low_ = srcnode->low_;
-        dstnode->known_ = srcnode->known_;
-        ++dstnode;
-        ++srcnode;
-    }
-}
-
-/* Reset all of the state information associated with a tag tree. */
-
-void jpc_tagtree_reset(jpc_tagtree_t *tree)
-{
-    int n;
-    jpc_tagtreenode_t *node;
-
-    n = tree->numnodes_;
-    node = tree->nodes_;
-
-    while (--n >= 0) {
-        node->value_ = INT_MAX;
-        node->low_ = 0;
-        node->known_ = 0;
-        ++node;
-    }
-}
-
-/* Set the value associated with the specified leaf node, updating
-the other nodes as necessary. */
-
-void jpc_tagtree_setvalue(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int value)
-{
-    jpc_tagtreenode_t *node;
-
-    /* Avoid compiler warnings about unused parameters. */
-    tree = 0;
-
-    assert(value >= 0);
-
-    node = leaf;
-    while (node && node->value_ > value) {
-        node->value_ = value;
-        node = node->parent_;
-    }
-}
-
-/* Get a particular leaf node. */
-
-jpc_tagtreenode_t *jpc_tagtree_getleaf(jpc_tagtree_t *tree, int n)
-{
-    return &tree->nodes_[n];
-}
-
-/* Invoke the tag tree encoding procedure. */
-
-int jpc_tagtree_encode(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int threshold, jpc_bitstream_t *out)
-{
-    jpc_tagtreenode_t *stk[JPC_TAGTREE_MAXDEPTH - 1];
-    jpc_tagtreenode_t **stkptr;
-    jpc_tagtreenode_t *node;
-    int low;
-
-    /* Avoid compiler warnings about unused parameters. */
-    tree = 0;
-
-    assert(leaf);
-    assert(threshold >= 0);
-
-    /* Traverse to the root of the tree, recording the path taken. */
-    stkptr = stk;
-    node = leaf;
-    while (node->parent_) {
-        *stkptr++ = node;
-        node = node->parent_;
-    }
-
-    low = 0;
-    for (;;) {
-        if (low > node->low_) {
-            /* Deferred propagation of the lower bound downward in
-              the tree. */
-            node->low_ = low;
-        } else {
-            low = node->low_;
-        }
-
-        while (low < threshold) {
-            if (low >= node->value_) {
-                if (!node->known_) {
-                    if (jpc_bitstream_putbit(out, 1) == EOF) {
-                        return -1;
-                    }
-                    node->known_ = 1;
-                }
-                break;
-            }
-            if (jpc_bitstream_putbit(out, 0) == EOF) {
-                return -1;
-            }
-            ++low;
-        }
-        node->low_ = low;
-        if (stkptr == stk) {
-            break;
-        }
-        node = *--stkptr;
-
-    }
-    return (leaf->low_ < threshold) ? 1 : 0;
-
-}
-
-/* Invoke the tag tree decoding procedure. */
-
-int jpc_tagtree_decode(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int threshold, jpc_bitstream_t *in)
-{
-    jpc_tagtreenode_t *stk[JPC_TAGTREE_MAXDEPTH - 1];
-    jpc_tagtreenode_t **stkptr;
-    jpc_tagtreenode_t *node;
-    int low;
-    int ret;
-
-    /* Avoid compiler warnings about unused parameters. */
-    tree = 0;
-
-    assert(threshold >= 0);
-
-    /* Traverse to the root of the tree, recording the path taken. */
-    stkptr = stk;
-    node = leaf;
-    while (node->parent_) {
-        *stkptr++ = node;
-        node = node->parent_;
-    }
-
-    low = 0;
-    for (;;) {
-        if (low > node->low_) {
-            node->low_ = low;
-        } else {
-            low = node->low_;
-        }
-        while (low < threshold && low < node->value_) {
-            if ((ret = jpc_bitstream_getbit(in)) < 0) {
-                return -1;
-            }
-            if (ret) {
-                node->value_ = low;
-            } else {
-                ++low;
-            }
-        }
-        node->low_ = low;
-        if (stkptr == stk) {
-            break;
-        }
-        node = *--stkptr;
-    }
-
-    return (node->value_ < threshold) ? 1 : 0;
-}
-
-/******************************************************************************\
-* Code for debugging.
-\******************************************************************************/
-
-void jpc_tagtree_dump(jpc_tagtree_t *tree, FILE *out)
-{
-    jpc_tagtreenode_t *node;
-    int n;
-
-    node = tree->nodes_;
-    n = tree->numnodes_;
-    while (--n >= 0) {
-        fprintf(out, "node %p, parent %p, value %d, lower %d, known %d\n",
-          (void *) node, (void *) node->parent_, node->value_, node->low_,
-          node->known_);
-        ++node;
-    }
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.h
deleted file mode 100644
index fdcfa73..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tagtree.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tag Tree Library
- *
- * $Id$
- */
-
-#ifndef JPC_TAGTREE_H
-#define JPC_TAGTREE_H
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include <limits.h>
-#include <stdio.h>
-
-#include "jpc_bs.h"
-
-/******************************************************************************\
-* Constants
-\******************************************************************************/
-
-/* The maximum allowable depth for a tag tree. */
-#define JPC_TAGTREE_MAXDEPTH	32
-
-/******************************************************************************\
-* Types
-\******************************************************************************/
-
-/*
- * Tag tree node.
- */
-
-typedef struct jpc_tagtreenode_ {
-
-    /* The parent of this node. */
-    struct jpc_tagtreenode_ *parent_;
-
-    /* The value associated with this node. */
-    int value_;
-
-    /* The lower bound on the value associated with this node. */
-    int low_;
-
-    /* A flag indicating if the value is known exactly. */
-    int known_;
-
-} jpc_tagtreenode_t;
-
-/*
- * Tag tree.
- */
-
-typedef struct {
-
-    /* The number of leaves in the horizontal direction. */
-    int numleafsh_;
-
-    /* The number of leaves in the vertical direction. */
-    int numleafsv_;
-
-    /* The total number of nodes in the tree. */
-    int numnodes_;
-
-    /* The nodes. */
-    jpc_tagtreenode_t *nodes_;
-
-} jpc_tagtree_t;
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Create a tag tree. */
-jpc_tagtree_t *jpc_tagtree_create(int numleafsh, int numleafsv);
-
-/* Destroy a tag tree. */
-void jpc_tagtree_destroy(jpc_tagtree_t *tree);
-
-/* Copy data from one tag tree to another. */
-void jpc_tagtree_copy(jpc_tagtree_t *dsttree, jpc_tagtree_t *srctree);
-
-/* Reset the tag tree state. */
-void jpc_tagtree_reset(jpc_tagtree_t *tree);
-
-/* Set the value associated with a particular leaf node of a tag tree. */
-void jpc_tagtree_setvalue(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int value);
-
-/* Get a pointer to a particular leaf node. */
-jpc_tagtreenode_t *jpc_tagtree_getleaf(jpc_tagtree_t *tree, int n);
-
-/* Invoke the tag tree decoding procedure. */
-int jpc_tagtree_decode(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int threshold, jpc_bitstream_t *in);
-
-/* Invoke the tag tree encoding procedure. */
-int jpc_tagtree_encode(jpc_tagtree_t *tree, jpc_tagtreenode_t *leaf,
-  int threshold, jpc_bitstream_t *out);
-
-/* Dump a tag tree (for debugging purposes). */
-void jpc_tagtree_dump(jpc_tagtree_t *tree, FILE *out);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c
deleted file mode 100644
index 54854af..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.c
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2004 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tree-Structured Filter Bank (TSFB) Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_malloc.h"
-#include "jasper/jas_seq.h"
-
-#include "jpc_tsfb.h"
-#include "jpc_cod.h"
-#include "jpc_cs.h"
-#include "jpc_util.h"
-#include "jpc_math.h"
-
-void jpc_tsfb_getbands2(jpc_tsfb_t *tsfb, int locxstart, int locystart,
-  int xstart, int ystart, int xend, int yend, jpc_tsfb_band_t **bands,
-  int numlvls);
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-jpc_tsfb_t *jpc_cod_gettsfb(int qmfbid, int numlvls)
-{
-    jpc_tsfb_t *tsfb;
-
-    if (!(tsfb = malloc(sizeof(jpc_tsfb_t))))
-        return 0;
-
-    if (numlvls > 0) {
-        switch (qmfbid) {
-        case JPC_COX_INS:
-            tsfb->qmfb = &jpc_ns_qmfb2d;
-            break;
-        default:
-        case JPC_COX_RFT:
-            tsfb->qmfb = &jpc_ft_qmfb2d;
-            break;
-        }
-    } else {
-        tsfb->qmfb = 0;
-    }
-    tsfb->numlvls = numlvls;
-    return tsfb;
-}
-
-void jpc_tsfb_destroy(jpc_tsfb_t *tsfb)
-{
-    free(tsfb);
-}
-
-int jpc_tsfb_analyze2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
-  int width, int height, int stride, int numlvls)
-{
-    if (width > 0 && height > 0) {
-        if ((*tsfb->qmfb->analyze)(a, xstart, ystart, width, height, stride))
-            return -1;
-        if (numlvls > 0) {
-            if (jpc_tsfb_analyze2(tsfb, a, JPC_CEILDIVPOW2(xstart,
-              1), JPC_CEILDIVPOW2(ystart, 1), JPC_CEILDIVPOW2(
-              xstart + width, 1) - JPC_CEILDIVPOW2(xstart, 1),
-              JPC_CEILDIVPOW2(ystart + height, 1) -
-              JPC_CEILDIVPOW2(ystart, 1), stride, numlvls - 1)) {
-                return -1;
-            }
-        }
-    }
-    return 0;
-}
-
-int jpc_tsfb_analyze(jpc_tsfb_t *tsfb, jas_seq2d_t *a)
-{
-    return (tsfb->numlvls > 0) ? jpc_tsfb_analyze2(tsfb, jas_seq2d_getref(a,
-      jas_seq2d_xstart(a), jas_seq2d_ystart(a)), jas_seq2d_xstart(a),
-      jas_seq2d_ystart(a), jas_seq2d_width(a),
-      jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
-}
-
-int jpc_tsfb_synthesize2(jpc_tsfb_t *tsfb, int *a, int xstart, int ystart,
-  int width, int height, int stride, int numlvls)
-{
-    if (numlvls > 0) {
-        if (jpc_tsfb_synthesize2(tsfb, a, JPC_CEILDIVPOW2(xstart, 1),
-          JPC_CEILDIVPOW2(ystart, 1), JPC_CEILDIVPOW2(xstart + width,
-          1) - JPC_CEILDIVPOW2(xstart, 1), JPC_CEILDIVPOW2(ystart +
-          height, 1) - JPC_CEILDIVPOW2(ystart, 1), stride, numlvls -
-          1)) {
-            return -1;
-        }
-    }
-    if (width > 0 && height > 0) {
-        if ((*tsfb->qmfb->synthesize)(a, xstart, ystart, width, height, stride)) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *a)
-{
-    return (tsfb->numlvls > 0) ? jpc_tsfb_synthesize2(tsfb,
-      jas_seq2d_getref(a, jas_seq2d_xstart(a), jas_seq2d_ystart(a)),
-      jas_seq2d_xstart(a), jas_seq2d_ystart(a), jas_seq2d_width(a),
-      jas_seq2d_height(a), jas_seq2d_rowstep(a), tsfb->numlvls - 1) : 0;
-}
-
-int jpc_tsfb_getbands(jpc_tsfb_t *tsfb, uint_fast32_t xstart,
-  uint_fast32_t ystart, uint_fast32_t xend, uint_fast32_t yend,
-  jpc_tsfb_band_t *bands)
-{
-    jpc_tsfb_band_t *band;
-
-    band = bands;
-    if (tsfb->numlvls > 0) {
-        jpc_tsfb_getbands2(tsfb, xstart, ystart, xstart, ystart, xend, yend,
-          &band, tsfb->numlvls);
-    } else {
-
-        band->xstart = xstart;
-        band->ystart = ystart;
-        band->xend = xend;
-        band->yend = yend;
-        band->locxstart = xstart;
-        band->locystart = ystart;
-        band->locxend = band->locxstart + band->xend - band->xstart;
-        band->locyend = band->locystart + band->yend - band->ystart;
-        band->orient = JPC_TSFB_LL;
-        band->synenergywt = JPC_FIX_ONE;
-        ++band;
-    }
-    return band - bands;
-}
-
-void jpc_tsfb_getbands2(jpc_tsfb_t *tsfb, int locxstart, int locystart,
-  int xstart, int ystart, int xend, int yend, jpc_tsfb_band_t **bands,
-  int numlvls)
-{
-    int newxstart;
-    int newystart;
-    int newxend;
-    int newyend;
-    jpc_tsfb_band_t *band;
-
-    newxstart = JPC_CEILDIVPOW2(xstart, 1);
-    newystart = JPC_CEILDIVPOW2(ystart, 1);
-    newxend = JPC_CEILDIVPOW2(xend, 1);
-    newyend = JPC_CEILDIVPOW2(yend, 1);
-
-    if (numlvls > 0) {
-
-        jpc_tsfb_getbands2(tsfb, locxstart, locystart, newxstart, newystart,
-          newxend, newyend, bands, numlvls - 1);
-
-        band = *bands;
-        band->xstart = JPC_FLOORDIVPOW2(xstart, 1);
-        band->ystart = newystart;
-        band->xend = JPC_FLOORDIVPOW2(xend, 1);
-        band->yend = newyend;
-        band->locxstart = locxstart + newxend - newxstart;
-        band->locystart = locystart;
-        band->locxend = band->locxstart + band->xend - band->xstart;
-        band->locyend = band->locystart + band->yend - band->ystart;
-        band->orient = JPC_TSFB_HL;
-        band->synenergywt = jpc_dbltofix(tsfb->qmfb->hpenergywts[
-          tsfb->numlvls - numlvls] * tsfb->qmfb->lpenergywts[
-          tsfb->numlvls - numlvls]);
-        ++(*bands);
-
-        band = *bands;
-        band->xstart = newxstart;
-        band->ystart = JPC_FLOORDIVPOW2(ystart, 1);
-        band->xend = newxend;
-        band->yend = JPC_FLOORDIVPOW2(yend, 1);
-        band->locxstart = locxstart;
-        band->locystart = locystart + newyend - newystart;
-        band->locxend = band->locxstart + band->xend - band->xstart;
-        band->locyend = band->locystart + band->yend - band->ystart;
-        band->orient = JPC_TSFB_LH;
-        band->synenergywt = jpc_dbltofix(tsfb->qmfb->lpenergywts[
-          tsfb->numlvls - numlvls] * tsfb->qmfb->hpenergywts[
-          tsfb->numlvls - numlvls]);
-        ++(*bands);
-
-        band = *bands;
-        band->xstart = JPC_FLOORDIVPOW2(xstart, 1);
-        band->ystart = JPC_FLOORDIVPOW2(ystart, 1);
-        band->xend = JPC_FLOORDIVPOW2(xend, 1);
-        band->yend = JPC_FLOORDIVPOW2(yend, 1);
-        band->locxstart = locxstart + newxend - newxstart;
-        band->locystart = locystart + newyend - newystart;
-        band->locxend = band->locxstart + band->xend - band->xstart;
-        band->locyend = band->locystart + band->yend - band->ystart;
-        band->orient = JPC_TSFB_HH;
-        band->synenergywt = jpc_dbltofix(tsfb->qmfb->hpenergywts[
-          tsfb->numlvls - numlvls] * tsfb->qmfb->hpenergywts[
-          tsfb->numlvls - numlvls]);
-        ++(*bands);
-
-    } else {
-
-        band = *bands;
-        band->xstart = xstart;
-        band->ystart = ystart;
-        band->xend = xend;
-        band->yend = yend;
-        band->locxstart = locxstart;
-        band->locystart = locystart;
-        band->locxend = band->locxstart + band->xend - band->xstart;
-        band->locyend = band->locystart + band->yend - band->ystart;
-        band->orient = JPC_TSFB_LL;
-        band->synenergywt = jpc_dbltofix(tsfb->qmfb->lpenergywts[
-          tsfb->numlvls - numlvls - 1] * tsfb->qmfb->lpenergywts[
-          tsfb->numlvls - numlvls - 1]);
-        ++(*bands);
-
-    }
-
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.h
deleted file mode 100644
index 4352aca..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_tsfb.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2004 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Tree-Structured Filter Bank (TSFB) Library
- *
- * $Id$
- */
-
-#ifndef JPC_TSFB_H
-#define JPC_TSFB_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_seq.h"
-
-#include "jpc_fix.h"
-#include "jpc_qmfb.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define	JPC_TSFB_MAXBANDS	(JPC_TSFB_MAXDEPTH * 3 + 1)
-#define	JPC_TSFB_MAXDEPTH	32
-#define	JPC_TSFB_RITIMODE	JPC_QMFB1D_RITIMODE
-
-#define JPC_TSFB_LL	0
-#define JPC_TSFB_LH	1
-#define JPC_TSFB_HL	2
-#define JPC_TSFB_HH	3
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-typedef struct {
-    int xstart;
-    int ystart;
-    int xend;
-    int yend;
-    int orient;
-    int locxstart;
-    int locystart;
-    int locxend;
-    int locyend;
-    jpc_fix_t synenergywt;
-} jpc_tsfb_band_t;
-
-typedef struct {
-    int numlvls;
-    jpc_qmfb2d_t *qmfb;
-} jpc_tsfb_t;
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-/* Create a TSFB. */
-jpc_tsfb_t *jpc_cod_gettsfb(int qmfbid, int numlevels);
-
-/* Destroy a TSFB. */
-void jpc_tsfb_destroy(jpc_tsfb_t *tsfb);
-
-/* Perform analysis. */
-int jpc_tsfb_analyze(jpc_tsfb_t *tsfb, jas_seq2d_t *x);
-
-/* Perform synthesis. */
-int jpc_tsfb_synthesize(jpc_tsfb_t *tsfb, jas_seq2d_t *x);
-
-/* Get band information for a TSFB. */
-int jpc_tsfb_getbands(jpc_tsfb_t *tsfb, uint_fast32_t xstart,
-  uint_fast32_t ystart, uint_fast32_t xend, uint_fast32_t yend,
-  jpc_tsfb_band_t *bands);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.c b/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.c
deleted file mode 100644
index d2deb73..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * $Id$
- */
-
-/******************************************************************************\
-* Includes
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "jasper/jas_math.h"
-#include "jasper/jas_malloc.h"
-
-#include "jpc_fix.h"
-#include "jpc_cs.h"
-#include "jpc_flt.h"
-#include "jpc_util.h"
-
-/******************************************************************************\
-* Miscellaneous Functions
-\******************************************************************************/
-
-int jpc_atoaf(char *s, int *numvalues, double **values)
-{
-    static char delim[] = ", \t\n";
-    char buf[4096];
-    int n;
-    double *vs;
-    char *cp;
-
-    strncpy(buf, s, sizeof(buf));
-    buf[sizeof(buf) - 1] = '\0';
-    n = 0;
-    if ((cp = strtok(buf, delim))) {
-        ++n;
-        while ((cp = strtok(0, delim))) {
-            if (cp != '\0') {
-                ++n;
-            }
-        }
-    }
-
-    if (n) {
-        if (!(vs = jas_malloc(n * sizeof(double)))) {
-            return -1;
-        }
-
-        strncpy(buf, s, sizeof(buf));
-        buf[sizeof(buf) - 1] = '\0';
-        n = 0;
-        if ((cp = strtok(buf, delim))) {
-            vs[n] = atof(cp);
-            ++n;
-            while ((cp = strtok(0, delim))) {
-                if (cp != '\0') {
-                    vs[n] = atof(cp);
-                    ++n;
-                }
-            }
-        }
-    } else {
-        vs = 0;
-    }
-
-    *numvalues = n;
-    *values = vs;
-
-    return 0;
-}
-
-jas_seq_t *jpc_seq_upsample(jas_seq_t *x, int m)
-{
-    jas_seq_t *z;
-    int i;
-
-    if (!(z = jas_seq_create(jas_seq_start(x) * m, (jas_seq_end(x) - 1) * m + 1)))
-        return 0;
-    for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
-        *jas_seq_getref(z, i) = (!JAS_MOD(i, m)) ? jas_seq_get(x, i / m) :
-          jpc_inttofix(0);
-    }
-
-    return z;
-}
-
-jpc_fix_t jpc_seq_norm(jas_seq_t *x)
-{
-    jpc_fix_t s;
-    int i;
-
-    s = jpc_inttofix(0);
-    for (i = jas_seq_start(x); i < jas_seq_end(x); i++) {
-        s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(x, i), jas_seq_get(x, i)));
-    }
-
-    return jpc_dbltofix(sqrt(jpc_fixtodbl(s)));
-}
-
-jas_seq_t *jpc_seq_conv(jas_seq_t *x, jas_seq_t *y)
-{
-    int i;
-    int j;
-    int k;
-    jas_seq_t *z;
-    jpc_fix_t s;
-    jpc_fix_t v;
-
-    z = jas_seq_create(jas_seq_start(x) + jas_seq_start(y),
-      jas_seq_end(x) + jas_seq_end(y) - 1);
-    assert(z);
-    for (i = jas_seq_start(z); i < jas_seq_end(z); i++) {
-        s = jpc_inttofix(0);
-        for (j = jas_seq_start(y); j < jas_seq_end(y); j++) {
-            k = i - j;
-            if (k < jas_seq_start(x) || k >= jas_seq_end(x)) {
-                v = JPC_FIX_ZERO;
-            } else {
-                v = jas_seq_get(x, k);
-            }
-            s = jpc_fix_add(s, jpc_fix_mul(jas_seq_get(y, j), v));
-        }
-        *jas_seq_getref(z, i) = s;
-    }
-
-    return z;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.h b/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.h
deleted file mode 100644
index 70887a7..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpc/jpc_util.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JPC_UTIL_H
-#define JPC_UTIL_H
-
-/* Parse a comma separated list of real numbers into an array of doubles. */
-int jpc_atoaf(char *s, int *numvalues, double **values);
-
-/* Upsample a sequence. */
-jas_seq_t *jpc_seq_upsample(jas_seq_t *seq, int n);
-
-/* Convolve two sequences. */
-jas_seq_t *jpc_seq_conv(jas_seq_t *seq0, jas_seq_t *seq1);
-
-/* Compute the norm of a sequence. */
-jpc_fix_t jpc_seq_norm(jas_seq_t *x);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/README b/src/3rdparty/jasper/src/libjasper/jpg/README
deleted file mode 100644
index 00ff0ff..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This directory contains code to support the JPEG image format.  In order
-for the code in this directory to be useful, the free JPEG library from
-the Independent JPEG Group (IJG) is needed.  For legal reasons, the
-IJG JPEG software is not included in the JasPer software distribution.
-The IJG JPEG software can be obtained, however, from:
-    http://www.ijg.org
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_cod.h b/src/3rdparty/jasper/src/libjasper/jpg/jpg_cod.h
deleted file mode 100644
index d7521df..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_cod.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * JPG Format Library
- *
- * $Id$
- */
-
-#ifndef JPG_COD_H
-#define JPG_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define	JPG_MAGIC	0xffd8
-#define JPG_MAGICLEN 2
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_dec.c b/src/3rdparty/jasper/src/libjasper/jpg/jpg_dec.c
deleted file mode 100644
index 8d851e9..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_dec.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <assert.h>
-#include <ctype.h>
-
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-
-#include "jpg_jpeglib.h"
-#include "jpg_cod.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* JPEG decoder data sink type. */
-
-typedef struct jpg_dest_s {
-
-    /* Initialize output. */
-    void (*start_output)(j_decompress_ptr cinfo, struct jpg_dest_s *dinfo);
-
-    /* Output rows of decompressed data. */
-    void (*put_pixel_rows)(j_decompress_ptr cinfo, struct jpg_dest_s *dinfo,
-      JDIMENSION rows_supplied);
-
-    /* Cleanup output. */
-    void (*finish_output)(j_decompress_ptr cinfo, struct jpg_dest_s *dinfo);
-
-    /* Output buffer. */
-    JSAMPARRAY buffer;
-
-    /* Height of output buffer. */
-    JDIMENSION buffer_height;
-
-    /* The current row. */
-    JDIMENSION row;
-
-    /* The image used to hold the decompressed sample data. */
-    jas_image_t *image;
-
-    /* The row buffer. */
-    jas_matrix_t *data;
-
-    /* The error indicator.  If this is nonzero, something has gone wrong
-      during decompression. */
-    int error;
-
-} jpg_dest_t;
-
-/******************************************************************************\
-* Local functions.
-\******************************************************************************/
-
-static void jpg_start_output(j_decompress_ptr cinfo, jpg_dest_t *dinfo);
-static void jpg_put_pixel_rows(j_decompress_ptr cinfo, jpg_dest_t *dinfo,
-  JDIMENSION rows_supplied);
-static void jpg_finish_output(j_decompress_ptr cinfo, jpg_dest_t *dinfo);
-static int jpg_copystreamtofile(FILE *out, jas_stream_t *in);
-static jas_image_t *jpg_mkimage(j_decompress_ptr cinfo);
-
-/******************************************************************************\
-* Code for load operation.
-\******************************************************************************/
-
-/* Load an image from a stream in the JPG format. */
-
-jas_image_t *jpg_decode(jas_stream_t *in, char *optstr)
-{
-    struct jpeg_decompress_struct cinfo;
-    struct jpeg_error_mgr jerr;
-    FILE *input_file;
-    jpg_dest_t dest_mgr_buf;
-    jpg_dest_t *dest_mgr = &dest_mgr_buf;
-    int num_scanlines;
-    jas_image_t *image;
-
-    /* Avoid compiler warnings about unused parameters. */
-    optstr = 0;
-
-    image = 0;
-    input_file = 0;
-    if (!(input_file = tmpfile())) {
-        goto error;
-    }
-    if (jpg_copystreamtofile(input_file, in)) {
-        goto error;
-    }
-    rewind(input_file);
-
-    /* Allocate and initialize a JPEG decompression object. */
-    cinfo.err = jpeg_std_error(&jerr);
-    jpeg_create_decompress(&cinfo);
-
-    /* Specify the data source for decompression. */
-    jpeg_stdio_src(&cinfo, input_file);
-
-    /* Read the file header to obtain the image information. */
-    jpeg_read_header(&cinfo, TRUE);
-
-    /* Start the decompressor. */
-    jpeg_start_decompress(&cinfo);
-
-    /* Create an image object to hold the decoded data. */
-    if (!(image = jpg_mkimage(&cinfo))) {
-        goto error;
-    }
-
-    /* Initialize the data sink object. */
-    dest_mgr->image = image;
-    dest_mgr->data = jas_matrix_create(1, cinfo.output_width);
-    dest_mgr->start_output = jpg_start_output;
-    dest_mgr->put_pixel_rows = jpg_put_pixel_rows;
-    dest_mgr->finish_output = jpg_finish_output;
-    dest_mgr->buffer = (*cinfo.mem->alloc_sarray)
-      ((j_common_ptr) &cinfo, JPOOL_IMAGE,
-       cinfo.output_width * cinfo.output_components, (JDIMENSION) 1);
-    dest_mgr->buffer_height = 1;
-    dest_mgr->error = 0;
-
-    /* Process the compressed data. */
-    (*dest_mgr->start_output)(&cinfo, dest_mgr);
-    while (cinfo.output_scanline < cinfo.output_height) {
-        num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
-          dest_mgr->buffer_height);
-        (*dest_mgr->put_pixel_rows)(&cinfo, dest_mgr, num_scanlines);
-    }
-    (*dest_mgr->finish_output)(&cinfo, dest_mgr);
-
-    /* Complete the decompression process. */
-    jpeg_finish_decompress(&cinfo);
-
-    /* Destroy the JPEG decompression object. */
-    jpeg_destroy_decompress(&cinfo);
-
-    jas_matrix_destroy(dest_mgr->data);
-
-    fclose(input_file);
-
-    if (dest_mgr->error) {
-        goto error;
-    }
-
-    return image;
-
-error:
-    if (image) {
-        jas_image_destroy(image);
-    }
-    if (input_file) {
-        fclose(input_file);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static jas_image_t *jpg_mkimage(j_decompress_ptr cinfo)
-{
-    jas_image_t *image;
-    int cmptno;
-    jas_image_cmptparm_t cmptparm;
-    int numcmpts;
-
-    image = 0;
-    numcmpts = cinfo->output_components;
-    if (!(image = jas_image_create0())) {
-        goto error;
-    }
-    for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-        cmptparm.tlx = 0;
-        cmptparm.tly = 0;
-        cmptparm.hstep = 1;
-        cmptparm.vstep = 1;
-        cmptparm.width = cinfo->image_width;
-        cmptparm.height = cinfo->image_height;
-        cmptparm.prec = 8;
-        cmptparm.sgnd = false;
-        if (jas_image_addcmpt(image, cmptno, &cmptparm)) {
-            goto error;
-        }
-    }
-
-    if (numcmpts == 3) {
-        jas_image_setclrspc(image, JAS_CLRSPC_SRGB);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R));
-        jas_image_setcmpttype(image, 1,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G));
-        jas_image_setcmpttype(image, 2,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B));
-    } else {
-        jas_image_setclrspc(image, JAS_CLRSPC_SGRAY);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-    }
-
-    return image;
-
-error:
-    if (image) {
-        jas_image_destroy(image);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Data source code.
-\******************************************************************************/
-
-static int jpg_copystreamtofile(FILE *out, jas_stream_t *in)
-{
-    int c;
-
-    while ((c = jas_stream_getc(in)) != EOF) {
-        if (fputc(c, out) == EOF) {
-            return -1;
-        }
-    }
-    if (jas_stream_error(in)) {
-        return -1;
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Data sink code.
-\******************************************************************************/
-
-static void jpg_start_output(j_decompress_ptr cinfo, jpg_dest_t *dinfo)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    cinfo = 0;
-
-    dinfo->row = 0;
-}
-
-static void jpg_put_pixel_rows(j_decompress_ptr cinfo, jpg_dest_t *dinfo,
-  JDIMENSION rows_supplied)
-{
-    JSAMPLE *bufptr;
-    int cmptno;
-    JDIMENSION x;
-    uint_fast32_t width;
-
-    if (dinfo->error) {
-        return;
-    }
-
-    assert(cinfo->output_components == jas_image_numcmpts(dinfo->image));
-
-    for (cmptno = 0; cmptno < cinfo->output_components; ++cmptno) {
-        width = jas_image_cmptwidth(dinfo->image, cmptno);
-        bufptr = (dinfo->buffer[0]) + cmptno;
-        for (x = 0; x < width; ++x) {
-            jas_matrix_set(dinfo->data, 0, x, GETJSAMPLE(*bufptr));
-            bufptr += cinfo->output_components;
-        }
-        if (jas_image_writecmpt(dinfo->image, cmptno, 0, dinfo->row, width, 1,
-          dinfo->data)) {
-            dinfo->error = 1;
-        }
-    }
-    dinfo->row += rows_supplied;
-}
-
-static void jpg_finish_output(j_decompress_ptr cinfo, jpg_dest_t *dinfo)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    cinfo = 0;
-    dinfo = 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_dummy.c b/src/3rdparty/jasper/src/libjasper/jpg/jpg_dummy.c
deleted file mode 100644
index ebccb1d..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_dummy.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_debug.h"
-
-#include "jpg_cod.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-#define	JPG_IJGINFO \
-    "The source code for the IJG JPEG library can be downloaded from:\n" \
-    "    http://www.ijg.org\n"
-
-/******************************************************************************\
-* Code for load operation.
-\******************************************************************************/
-
-/* Load an image from a stream in the JPG format. */
-
-jas_image_t *jpg_decode(jas_stream_t *in, char *optstr)
-{
-    jas_eprintf("error: JPEG decoder not available\n");
-    jas_eprintf("The IJG JPEG library is required for JPEG decoding support.\n");
-    jas_eprintf("%s", JPG_IJGINFO);
-    return 0;
-}
-
-/******************************************************************************\
-* Code for save operation.
-\******************************************************************************/
-
-/* Save an image to a stream in the the JPG format. */
-
-int jpg_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    jas_eprintf("error: JPEG encoder not available\n");
-    jas_eprintf("The IJG JPEG library is required for JPEG encoding support.\n");
-    jas_eprintf("%s", JPG_IJGINFO);
-    return -1;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.c b/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.c
deleted file mode 100644
index 5663076..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include "jasper/jas_types.h"
-
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_debug.h"
-
-#include "jpg_jpeglib.h"
-#include "jpg_cod.h"
-#include "jpg_enc.h"
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-typedef struct jpg_src_s {
-
-    /* Output buffer. */
-    JSAMPARRAY buffer;
-
-    /* Height of output buffer. */
-    JDIMENSION buffer_height;
-
-    /* The current row. */
-    JDIMENSION row;
-
-    /* The image used to hold the decompressed sample data. */
-    jas_image_t *image;
-
-    /* The row buffer. */
-    jas_matrix_t *data;
-
-    /* The error indicator.  If this is nonzero, something has gone wrong
-      during decompression. */
-    int error;
-
-    jpg_enc_t *enc;
-
-} jpg_src_t;
-
-typedef struct {
-    int qual;
-} jpg_encopts_t;
-
-typedef enum {
-    OPT_QUAL
-} jpg_optid_t;
-
-jas_taginfo_t jpg_opttab[] = {
-    {OPT_QUAL, "quality"},
-    {-1, 0}
-};
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static int jpg_copyfiletostream(jas_stream_t *out, FILE *in);
-static void jpg_start_input(j_compress_ptr cinfo, struct jpg_src_s *sinfo);
-static JDIMENSION jpg_get_pixel_rows(j_compress_ptr cinfo, struct jpg_src_s *sinfo);
-static void jpg_finish_input(j_compress_ptr cinfo, struct jpg_src_s *sinfo);
-static J_COLOR_SPACE tojpgcs(int colorspace);
-static int jpg_parseencopts(char *optstr, jpg_encopts_t *encopts);
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int jpg_copyfiletostream(jas_stream_t *out, FILE *in)
-{
-    int c;
-    while ((c = fgetc(in)) != EOF) {
-        if (jas_stream_putc(out, c) == EOF) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static void jpg_start_input(j_compress_ptr cinfo, struct jpg_src_s *sinfo)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    cinfo = 0;
-
-    sinfo->row = 0;
-}
-
-static JDIMENSION jpg_get_pixel_rows(j_compress_ptr cinfo, struct jpg_src_s *sinfo)
-{
-    JSAMPLE *bufptr;
-    int i;
-    int cmptno;
-    int width;
-    int *cmpts;
-
-    cmpts = sinfo->enc->cmpts;
-
-    width = jas_image_width(sinfo->image);
-
-    if (sinfo->error) {
-        return 0;
-    }
-    for (cmptno = 0; cmptno < cinfo->input_components; ++cmptno) {
-        if (jas_image_readcmpt(sinfo->image, cmpts[cmptno], 0, sinfo->row, width, 1, sinfo->data)) {
-            ;
-        }
-        bufptr = (sinfo->buffer[0]) + cmptno;
-        for (i = 0; i < width; ++i) {
-            *bufptr = jas_matrix_get(sinfo->data, 0, i);
-            bufptr += cinfo->input_components;
-        }
-    }
-    ++sinfo->row;
-    return 1;
-}
-
-static void jpg_finish_input(j_compress_ptr cinfo, struct jpg_src_s *sinfo)
-{
-    /* Avoid compiler warnings about unused parameters. */
-    cinfo = 0;
-    sinfo = 0;
-}
-
-/******************************************************************************\
-* Code for save operation.
-\******************************************************************************/
-
-/* Save an image to a stream in the the JPG format. */
-
-int jpg_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    JDIMENSION numscanlines;
-    struct jpeg_compress_struct cinfo;
-    struct jpeg_error_mgr jerr;
-    jas_image_coord_t width;
-    jas_image_coord_t height;
-    jpg_src_t src_mgr_buf;
-    jpg_src_t *src_mgr = &src_mgr_buf;
-    FILE *output_file;
-    int cmptno;
-    jpg_enc_t encbuf;
-    jpg_enc_t *enc = &encbuf;
-    jpg_encopts_t encopts;
-
-    output_file = 0;
-
-    if (jpg_parseencopts(optstr, &encopts))
-        goto error;
-
-    switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-    case JAS_CLRSPC_FAM_RGB:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SRGB)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 3;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R))) < 0 ||
-          (enc->cmpts[1] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G))) < 0 ||
-          (enc->cmpts[2] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            goto error;
-        }
-        break;
-    case JAS_CLRSPC_FAM_YCBCR:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SYCBCR)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 3;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_Y))) < 0 ||
-          (enc->cmpts[1] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CB))) < 0 ||
-          (enc->cmpts[2] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_YCBCR_CR))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            goto error;
-        }
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SGRAY)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 1;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            goto error;
-        }
-        break;
-    default:
-        jas_eprintf("error: JPG format does not support color space\n");
-        goto error;
-        break;
-    }
-
-    width = jas_image_width(image);
-    height = jas_image_height(image);
-
-    for (cmptno = 0; cmptno < enc->numcmpts; ++cmptno) {
-        if (jas_image_cmptwidth(image, enc->cmpts[cmptno]) != width ||
-          jas_image_cmptheight(image, enc->cmpts[cmptno]) != height ||
-          jas_image_cmpttlx(image, enc->cmpts[cmptno]) != 0 ||
-          jas_image_cmpttly(image, enc->cmpts[cmptno]) != 0 ||
-          jas_image_cmpthstep(image, enc->cmpts[cmptno]) != 1 ||
-          jas_image_cmptvstep(image, enc->cmpts[cmptno]) != 1 ||
-          jas_image_cmptprec(image, enc->cmpts[cmptno]) != 8 ||
-          jas_image_cmptsgnd(image, enc->cmpts[cmptno]) != false) {
-            jas_eprintf("error: The JPG encoder cannot handle an image with this geometry.\n");
-            goto error;
-        }
-    }
-
-    if (!(output_file = tmpfile())) {
-        goto error;
-    }
-
-    /* Create a JPEG compression object. */
-    cinfo.err = jpeg_std_error(&jerr);
-    jpeg_create_compress(&cinfo);
-
-    /* Specify data destination for compression */
-    jpeg_stdio_dest(&cinfo, output_file);
-
-    cinfo.in_color_space = tojpgcs(jas_image_clrspc(image));
-    cinfo.image_width = width;
-    cinfo.image_height = height;
-    cinfo.input_components = enc->numcmpts;
-    jpeg_set_defaults(&cinfo);
-
-    src_mgr->error = 0;
-    src_mgr->image = image;
-    src_mgr->data = jas_matrix_create(1, width);
-    assert(src_mgr->data);
-    src_mgr->buffer = (*cinfo.mem->alloc_sarray)((j_common_ptr) &cinfo,
-      JPOOL_IMAGE, (JDIMENSION) width * cinfo.input_components,
-      (JDIMENSION) 1);
-    src_mgr->buffer_height = 1;
-    src_mgr->enc = enc;
-
-    /* Read the input file header to obtain file size & colorspace. */
-    jpg_start_input(&cinfo, src_mgr);
-
-    if (encopts.qual >= 0) {
-        jpeg_set_quality(&cinfo, encopts.qual, TRUE);
-    }
-
-    /* Now that we know input colorspace, fix colorspace-dependent defaults */
-    jpeg_default_colorspace(&cinfo);
-
-    /* Start compressor */
-    jpeg_start_compress(&cinfo, TRUE);
-
-    /* Process data */
-    while (cinfo.next_scanline < cinfo.image_height) {
-        if ((numscanlines = jpg_get_pixel_rows(&cinfo, src_mgr)) <= 0) {
-            break;
-        }
-        jpeg_write_scanlines(&cinfo, src_mgr->buffer, numscanlines);
-    }
-
-    /* Finish compression and release memory */
-    jpg_finish_input(&cinfo, src_mgr);
-    jpeg_finish_compress(&cinfo);
-    jpeg_destroy_compress(&cinfo);
-    jas_matrix_destroy(src_mgr->data);
-
-    rewind(output_file);
-    jpg_copyfiletostream(out, output_file);
-    fclose(output_file);
-    output_file = 0;
-
-    return 0;
-
-error:
-    if (output_file) {
-        fclose(output_file);
-    }
-    return -1;
-}
-
-static J_COLOR_SPACE tojpgcs(int colorspace)
-{
-    switch (jas_clrspc_fam(colorspace)) {
-    case JAS_CLRSPC_FAM_RGB:
-        return JCS_RGB;
-        break;
-    case JAS_CLRSPC_FAM_YCBCR:
-        return JCS_YCbCr;
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        return JCS_GRAYSCALE;
-        break;
-    default:
-        abort();
-        break;
-    }
-}
-
-/* Parse the encoder options string. */
-static int jpg_parseencopts(char *optstr, jpg_encopts_t *encopts)
-{
-    jas_tvparser_t *tvp;
-    char *qual_str;
-    int ret;
-
-    tvp = 0;
-
-    /* Initialize default values for encoder options. */
-    encopts->qual = -1;
-
-    /* Create the tag-value parser. */
-    if (!(tvp = jas_tvparser_create(optstr ? optstr : ""))) {
-        goto error;
-    }
-
-    /* Get tag-value pairs, and process as necessary. */
-    while (!(ret = jas_tvparser_next(tvp))) {
-        switch (jas_taginfo_nonull(jas_taginfos_lookup(jpg_opttab,
-          jas_tvparser_gettag(tvp)))->id) {
-        case OPT_QUAL:
-            qual_str = jas_tvparser_getval(tvp);
-            if (sscanf(qual_str, "%d", &encopts->qual) != 1) {
-                jas_eprintf("ignoring bad quality specifier %s\n",
-                    jas_tvparser_getval(tvp));
-                encopts->qual = -1;
-            }
-            break;
-        default:
-            jas_eprintf("warning: ignoring invalid option %s\n",
-              jas_tvparser_gettag(tvp));
-            break;
-        }
-    }
-    if (ret < 0) {
-        goto error;
-    }
-
-    /* Destroy the tag-value parser. */
-    jas_tvparser_destroy(tvp);
-
-    return 0;
-
-error:
-    if (tvp) {
-        jas_tvparser_destroy(tvp);
-    }
-    return -1;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.h b/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.h
deleted file mode 100644
index d05d285..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_enc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JPG_ENC_H
-#define JPG_ENC_H
-
-typedef struct {
-    int numcmpts;
-    int cmpts[4];
-} jpg_enc_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_jpeglib.h b/src/3rdparty/jasper/src/libjasper/jpg/jpg_jpeglib.h
deleted file mode 100644
index 690e35e..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_jpeglib.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef JPG_JPEGLIB_H
-#define JPG_JPEGLIB_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include "jasper/jas_types.h"
-
-/* Note: The jpeglib.h header file does not include definitions of
-  FILE, size_t, etc. */
-#include <jpeglib.h>
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/jpg/jpg_val.c b/src/3rdparty/jasper/src/libjasper/jpg/jpg_val.c
deleted file mode 100644
index 47856de..0000000
--- a/src/3rdparty/jasper/src/libjasper/jpg/jpg_val.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-#include <assert.h>
-
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-
-#include "jpg_cod.h"
-
-/******************************************************************************\
-* Code for validate operation.
-\******************************************************************************/
-
-int jpg_validate(jas_stream_t *in)
-{
-    uchar buf[JPG_MAGICLEN];
-    int i;
-    int n;
-
-    assert(JAS_STREAM_MAXPUTBACK >= JPG_MAGICLEN);
-
-    /* Read the validation data (i.e., the data used for detecting
-      the format). */
-    if ((n = jas_stream_read(in, buf, JPG_MAGICLEN)) < 0) {
-        return -1;
-    }
-
-    /* Put the validation data back onto the stream, so that the
-      stream position will not be changed. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-
-    /* Did we read enough data? */
-    if (n < JPG_MAGICLEN) {
-        return -1;
-    }
-
-    /* Does this look like JPEG? */
-    if (buf[0] != (JPG_MAGIC >> 8) || buf[1] != (JPG_MAGIC & 0xff)) {
-        return -1;
-    }
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c b/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c
deleted file mode 100644
index 3b1e7f5..0000000
--- a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.c
+++ /dev/null
@@ -1,752 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_debug.h"
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_malloc.h"
-
-#include "mif_cod.h"
-
-/******************************************************************************\
-* Local types.
-\******************************************************************************/
-
-typedef enum {
-    MIF_END = 0,
-    MIF_CMPT
-} mif_tagid2_t;
-
-typedef enum {
-    MIF_TLX = 0,
-    MIF_TLY,
-    MIF_WIDTH,
-    MIF_HEIGHT,
-    MIF_HSAMP,
-    MIF_VSAMP,
-    MIF_PREC,
-    MIF_SGND,
-    MIF_DATA
-} mif_tagid_t;
-
-/******************************************************************************\
-* Local functions.
-\******************************************************************************/
-
-static mif_hdr_t *mif_hdr_create(int maxcmpts);
-static void mif_hdr_destroy(mif_hdr_t *hdr);
-static int mif_hdr_growcmpts(mif_hdr_t *hdr, int maxcmpts);
-static mif_hdr_t *mif_hdr_get(jas_stream_t *in);
-static int mif_process_cmpt(mif_hdr_t *hdr, char *buf);
-static int mif_hdr_put(mif_hdr_t *hdr, jas_stream_t *out);
-static int mif_hdr_addcmpt(mif_hdr_t *hdr, int cmptno, mif_cmpt_t *cmpt);
-static mif_cmpt_t *mif_cmpt_create(void);
-static void mif_cmpt_destroy(mif_cmpt_t *cmpt);
-static char *mif_getline(jas_stream_t *jas_stream, char *buf, int bufsize);
-static int mif_getc(jas_stream_t *in);
-static mif_hdr_t *mif_makehdrfromimage(jas_image_t *image);
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-jas_taginfo_t mif_tags2[] = {
-    {MIF_CMPT, "component"},
-    {MIF_END, "end"},
-    {-1, 0}
-};
-
-jas_taginfo_t mif_tags[] = {
-    {MIF_TLX, "tlx"},
-    {MIF_TLY, "tly"},
-    {MIF_WIDTH, "width"},
-    {MIF_HEIGHT, "height"},
-    {MIF_HSAMP, "sampperx"},
-    {MIF_VSAMP, "samppery"},
-    {MIF_PREC, "prec"},
-    {MIF_SGND, "sgnd"},
-    {MIF_DATA, "data"},
-    {-1, 0}
-};
-
-/******************************************************************************\
-* Code for load operation.
-\******************************************************************************/
-
-/* Load an image from a stream in the MIF format. */
-
-jas_image_t *mif_decode(jas_stream_t *in, char *optstr)
-{
-    mif_hdr_t *hdr;
-    jas_image_t *image;
-    jas_image_t *tmpimage;
-    jas_stream_t *tmpstream;
-    int cmptno;
-    mif_cmpt_t *cmpt;
-    jas_image_cmptparm_t cmptparm;
-    jas_seq2d_t *data;
-    int_fast32_t x;
-    int_fast32_t y;
-    int bias;
-
-    /* Avoid warnings about unused parameters. */
-    optstr = 0;
-
-    hdr = 0;
-    image = 0;
-    tmpimage = 0;
-    tmpstream = 0;
-    data = 0;
-
-    if (!(hdr = mif_hdr_get(in))) {
-        goto error;
-    }
-
-    if (!(image = jas_image_create0())) {
-        goto error;
-    }
-
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        cmpt = hdr->cmpts[cmptno];
-        tmpstream = cmpt->data ? jas_stream_fopen(cmpt->data, "rb") : in;
-        if (!tmpstream) {
-            goto error;
-        }
-        if (!(tmpimage = jas_image_decode(tmpstream, -1, 0))) {
-            goto error;
-        }
-        if (tmpstream != in) {
-            jas_stream_close(tmpstream);
-            tmpstream = 0;
-        }
-        if (!cmpt->width) {
-            cmpt->width = jas_image_cmptwidth(tmpimage, 0);
-        }
-        if (!cmpt->height) {
-            cmpt->height = jas_image_cmptwidth(tmpimage, 0);
-        }
-        if (!cmpt->prec) {
-            cmpt->prec = jas_image_cmptprec(tmpimage, 0);
-        }
-        if (cmpt->sgnd < 0) {
-            cmpt->sgnd = jas_image_cmptsgnd(tmpimage, 0);
-        }
-        cmptparm.tlx = cmpt->tlx;
-        cmptparm.tly = cmpt->tly;
-        cmptparm.hstep = cmpt->sampperx;
-        cmptparm.vstep = cmpt->samppery;
-        cmptparm.width = cmpt->width;
-        cmptparm.height = cmpt->height;
-        cmptparm.prec = cmpt->prec;
-        cmptparm.sgnd = cmpt->sgnd;
-        if (jas_image_addcmpt(image, jas_image_numcmpts(image), &cmptparm)) {
-            goto error;
-        }
-        if (!(data = jas_seq2d_create(0, 0, cmpt->width, cmpt->height))) {
-            goto error;
-        }
-        if (jas_image_readcmpt(tmpimage, 0, 0, 0, cmpt->width, cmpt->height,
-          data)) {
-            goto error;
-        }
-        if (cmpt->sgnd) {
-            bias = 1 << (cmpt->prec - 1);
-            for (y = 0; y < cmpt->height; ++y) {
-                for (x = 0; x < cmpt->width; ++x) {
-                    *jas_seq2d_getref(data, x, y) -= bias;
-                }
-            }
-        }
-        if (jas_image_writecmpt(image, jas_image_numcmpts(image) - 1, 0, 0,
-          cmpt->width, cmpt->height, data)) {
-            goto error;
-        }
-        jas_seq2d_destroy(data);
-        data = 0;
-        jas_image_destroy(tmpimage);
-        tmpimage = 0;
-    }
-
-    mif_hdr_destroy(hdr);
-    hdr = 0;
-    return image;
-
-error:
-    if (image) {
-        jas_image_destroy(image);
-    }
-    if (hdr) {
-        mif_hdr_destroy(hdr);
-    }
-    if (tmpstream && tmpstream != in) {
-        jas_stream_close(tmpstream);
-    }
-    if (tmpimage) {
-        jas_image_destroy(tmpimage);
-    }
-    if (data) {
-        jas_seq2d_destroy(data);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Code for save operation.
-\******************************************************************************/
-
-/* Save an image to a stream in the the MIF format. */
-
-int mif_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    mif_hdr_t *hdr;
-    jas_image_t *tmpimage;
-    int fmt;
-    int cmptno;
-    mif_cmpt_t *cmpt;
-    jas_image_cmptparm_t cmptparm;
-    jas_seq2d_t *data;
-    int_fast32_t x;
-    int_fast32_t y;
-    int bias;
-
-    hdr = 0;
-    tmpimage = 0;
-    data = 0;
-
-    if (optstr && *optstr != '\0') {
-        jas_eprintf("warning: ignoring unsupported options\n");
-    }
-
-    if ((fmt = jas_image_strtofmt("pnm")) < 0) {
-        jas_eprintf("error: PNM support required\n");
-        goto error;
-    }
-
-    if (!(hdr = mif_makehdrfromimage(image))) {
-        goto error;
-    }
-    if (mif_hdr_put(hdr, out)) {
-        goto error;
-    }
-
-    /* Output component data. */
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        cmpt = hdr->cmpts[cmptno];
-        if (!cmpt->data) {
-            if (!(tmpimage = jas_image_create0())) {
-                goto error;
-            }
-            cmptparm.tlx = 0;
-            cmptparm.tly = 0;
-            cmptparm.hstep = cmpt->sampperx;
-            cmptparm.vstep = cmpt->samppery;
-            cmptparm.width = cmpt->width;
-            cmptparm.height = cmpt->height;
-            cmptparm.prec = cmpt->prec;
-            cmptparm.sgnd = false;
-            if (jas_image_addcmpt(tmpimage, jas_image_numcmpts(tmpimage), &cmptparm)) {
-                goto error;
-            }
-            if (!(data = jas_seq2d_create(0, 0, cmpt->width, cmpt->height))) {
-                goto error;
-            }
-            if (jas_image_readcmpt(image, cmptno, 0, 0, cmpt->width, cmpt->height,
-              data)) {
-                goto error;
-            }
-            if (cmpt->sgnd) {
-                bias = 1 << (cmpt->prec - 1);
-                for (y = 0; y < cmpt->height; ++y) {
-                    for (x = 0; x < cmpt->width; ++x) {
-                        *jas_seq2d_getref(data, x, y) += bias;
-                    }
-                }
-            }
-            if (jas_image_writecmpt(tmpimage, 0, 0, 0, cmpt->width, cmpt->height,
-              data)) {
-                goto error;
-            }
-            jas_seq2d_destroy(data);
-            data = 0;
-            if (jas_image_encode(tmpimage, out, fmt, 0)) {
-                goto error;
-            }
-            jas_image_destroy(tmpimage);
-            tmpimage = 0;
-        }
-    }
-
-    mif_hdr_destroy(hdr);
-
-    return 0;
-
-error:
-    if (hdr) {
-        mif_hdr_destroy(hdr);
-    }
-    if (tmpimage) {
-        jas_image_destroy(tmpimage);
-    }
-    if (data) {
-        jas_seq2d_destroy(data);
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Code for validate operation.
-\******************************************************************************/
-
-int mif_validate(jas_stream_t *in)
-{
-    uchar buf[MIF_MAGICLEN];
-    uint_fast32_t magic;
-    int i;
-    int n;
-
-    assert(JAS_STREAM_MAXPUTBACK >= MIF_MAGICLEN);
-
-    /* Read the validation data (i.e., the data used for detecting
-      the format). */
-    if ((n = jas_stream_read(in, buf, MIF_MAGICLEN)) < 0) {
-        return -1;
-    }
-
-    /* Put the validation data back onto the stream, so that the
-      stream position will not be changed. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-
-    /* Was enough data read? */
-    if (n < MIF_MAGICLEN) {
-        return -1;
-    }
-
-    /* Compute the signature value. */
-    magic = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    /* Ensure that the signature is correct for this format. */
-    if (magic != MIF_MAGIC) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for MIF header class.
-\******************************************************************************/
-
-static mif_hdr_t *mif_hdr_create(int maxcmpts)
-{
-    mif_hdr_t *hdr;
-    if (!(hdr = jas_malloc(sizeof(mif_hdr_t)))) {
-        return 0;
-    }
-    hdr->numcmpts = 0;
-    hdr->maxcmpts = 0;
-    hdr->cmpts = 0;
-    if (mif_hdr_growcmpts(hdr, maxcmpts)) {
-        mif_hdr_destroy(hdr);
-        return 0;
-    }
-    return hdr;
-}
-
-static void mif_hdr_destroy(mif_hdr_t *hdr)
-{
-    int cmptno;
-    if (hdr->cmpts) {
-        for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-            mif_cmpt_destroy(hdr->cmpts[cmptno]);
-        }
-        jas_free(hdr->cmpts);
-    }
-    jas_free(hdr);
-}
-
-static int mif_hdr_growcmpts(mif_hdr_t *hdr, int maxcmpts)
-{
-    int cmptno;
-    mif_cmpt_t **newcmpts;
-    assert(maxcmpts >= hdr->numcmpts);
-    newcmpts = (!hdr->cmpts) ? jas_malloc(maxcmpts * sizeof(mif_cmpt_t *)) :
-      jas_realloc(hdr->cmpts, maxcmpts * sizeof(mif_cmpt_t *));
-    if (!newcmpts) {
-        return -1;
-    }
-    hdr->maxcmpts = maxcmpts;
-    hdr->cmpts = newcmpts;
-    for (cmptno = hdr->numcmpts; cmptno < hdr->maxcmpts; ++cmptno) {
-        hdr->cmpts[cmptno] = 0;
-    }
-    return 0;
-}
-
-static mif_hdr_t *mif_hdr_get(jas_stream_t *in)
-{
-    uchar magicbuf[MIF_MAGICLEN];
-    char buf[4096];
-    mif_hdr_t *hdr;
-    bool done;
-    jas_tvparser_t *tvp;
-    int id;
-
-    hdr = 0;
-
-    if (jas_stream_read(in, magicbuf, MIF_MAGICLEN) != MIF_MAGICLEN) {
-        goto error;
-    }
-    if (magicbuf[0] != (MIF_MAGIC >> 24) || magicbuf[1] != ((MIF_MAGIC >> 16) &
-      0xff) || magicbuf[2] != ((MIF_MAGIC >> 8) & 0xff) || magicbuf[3] !=
-      (MIF_MAGIC & 0xff)) {
-        jas_eprintf("error: bad signature\n");
-        goto error;
-    }
-
-    if (!(hdr = mif_hdr_create(0))) {
-        goto error;
-    }
-
-    done = false;
-    do {
-        if (!mif_getline(in, buf, sizeof(buf))) {
-            goto error;
-        }
-        if (buf[0] == '\0') {
-            continue;
-        }
-        if (!(tvp = jas_tvparser_create(buf))) {
-            goto error;
-        }
-        if (jas_tvparser_next(tvp)) {
-            abort();
-        }
-        id = jas_taginfo_nonull(jas_taginfos_lookup(mif_tags2, jas_tvparser_gettag(tvp)))->id;
-        jas_tvparser_destroy(tvp);
-        switch (id) {
-        case MIF_CMPT:
-            mif_process_cmpt(hdr, buf);
-            break;
-        case MIF_END:
-            done = 1;
-            break;
-        }
-    } while (!done);
-
-    return hdr;
-
-error:
-    if (hdr) {
-        mif_hdr_destroy(hdr);
-    }
-    return 0;
-}
-
-static int mif_process_cmpt(mif_hdr_t *hdr, char *buf)
-{
-    jas_tvparser_t *tvp;
-    mif_cmpt_t *cmpt;
-    int id;
-
-    cmpt = 0;
-    tvp = 0;
-
-    if (!(cmpt = mif_cmpt_create())) {
-        goto error;
-    }
-    cmpt->tlx = 0;
-    cmpt->tly = 0;
-    cmpt->sampperx = 0;
-    cmpt->samppery = 0;
-    cmpt->width = 0;
-    cmpt->height = 0;
-    cmpt->prec = 0;
-    cmpt->sgnd = -1;
-    cmpt->data = 0;
-
-    if (!(tvp = jas_tvparser_create(buf))) {
-        goto error;
-    }
-    while (!(id = jas_tvparser_next(tvp))) {
-        switch (jas_taginfo_nonull(jas_taginfos_lookup(mif_tags,
-          jas_tvparser_gettag(tvp)))->id) {
-        case MIF_TLX:
-            cmpt->tlx = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_TLY:
-            cmpt->tly = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_WIDTH:
-            cmpt->width = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_HEIGHT:
-            cmpt->height = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_HSAMP:
-            cmpt->sampperx = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_VSAMP:
-            cmpt->samppery = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_PREC:
-            cmpt->prec = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_SGND:
-            cmpt->sgnd = atoi(jas_tvparser_getval(tvp));
-            break;
-        case MIF_DATA:
-            if (!(cmpt->data = jas_strdup(jas_tvparser_getval(tvp)))) {
-                return -1;
-            }
-            break;
-        }
-    }
-    jas_tvparser_destroy(tvp);
-    if (!cmpt->sampperx || !cmpt->samppery) {
-        goto error;
-    }
-    if (mif_hdr_addcmpt(hdr, hdr->numcmpts, cmpt)) {
-        goto error;
-    }
-    return 0;
-
-error:
-    if (cmpt) {
-        mif_cmpt_destroy(cmpt);
-    }
-    if (tvp) {
-        jas_tvparser_destroy(tvp);
-    }
-    return -1;
-}
-
-static int mif_hdr_put(mif_hdr_t *hdr, jas_stream_t *out)
-{
-    int cmptno;
-    mif_cmpt_t *cmpt;
-
-    /* Output signature. */
-    jas_stream_putc(out, (MIF_MAGIC >> 24) & 0xff);
-    jas_stream_putc(out, (MIF_MAGIC >> 16) & 0xff);
-    jas_stream_putc(out, (MIF_MAGIC >> 8) & 0xff);
-    jas_stream_putc(out, MIF_MAGIC & 0xff);
-
-    /* Output component information. */
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        cmpt = hdr->cmpts[cmptno];
-        jas_stream_printf(out, "component tlx=%ld tly=%ld "
-          "sampperx=%ld samppery=%ld width=%ld height=%ld prec=%d sgnd=%d",
-          cmpt->tlx, cmpt->tly, cmpt->sampperx, cmpt->samppery, cmpt->width,
-          cmpt->height, cmpt->prec, cmpt->sgnd);
-        if (cmpt->data) {
-            jas_stream_printf(out, " data=%s", cmpt->data);
-        }
-        jas_stream_printf(out, "\n");
-    }
-
-    /* Output end of header indicator. */
-    jas_stream_printf(out, "end\n");
-
-    return 0;
-}
-
-static int mif_hdr_addcmpt(mif_hdr_t *hdr, int cmptno, mif_cmpt_t *cmpt)
-{
-    assert(cmptno >= hdr->numcmpts);
-    if (hdr->numcmpts >= hdr->maxcmpts) {
-        if (mif_hdr_growcmpts(hdr, hdr->numcmpts + 128)) {
-            return -1;
-        }
-    }
-    hdr->cmpts[hdr->numcmpts] = cmpt;
-    ++hdr->numcmpts;
-    return 0;
-}
-
-/******************************************************************************\
-* Code for MIF component class.
-\******************************************************************************/
-
-static mif_cmpt_t *mif_cmpt_create()
-{
-    mif_cmpt_t *cmpt;
-    if (!(cmpt = jas_malloc(sizeof(mif_cmpt_t)))) {
-        return 0;
-    }
-    memset(cmpt, 0, sizeof(mif_cmpt_t));
-    return cmpt;
-}
-
-static void mif_cmpt_destroy(mif_cmpt_t *cmpt)
-{
-    if (cmpt->data) {
-        jas_free(cmpt->data);
-    }
-    jas_free(cmpt);
-}
-
-/******************************************************************************\
-* MIF parsing code.
-\******************************************************************************/
-
-static char *mif_getline(jas_stream_t *stream, char *buf, int bufsize)
-{
-    int c;
-    char *bufptr;
-    assert(bufsize > 0);
-
-    bufptr = buf;
-    while (bufsize > 1) {
-        if ((c = mif_getc(stream)) == EOF) {
-            break;
-        }
-        *bufptr++ = c;
-        --bufsize;
-        if (c == '\n') {
-            break;
-        }
-    }
-    *bufptr = '\0';
-    if (!(bufptr = strchr(buf, '\n'))) {
-        return 0;
-    }
-    *bufptr = '\0';
-    return buf;
-}
-
-static int mif_getc(jas_stream_t *in)
-{
-    int c;
-    bool done;
-
-    done = false;
-    do {
-        switch (c = jas_stream_getc(in)) {
-        case EOF:
-            done = 1;
-            break;
-        case '#':
-            for (;;) {
-                if ((c = jas_stream_getc(in)) == EOF) {
-                    done = 1;
-                    break;
-                }
-                if (c == '\n') {
-                    break;
-                }
-            }
-            break;
-        case '\\':
-            if (jas_stream_peekc(in) == '\n') {
-                jas_stream_getc(in);
-            }
-            break;
-        default:
-            done = 1;
-            break;
-        }
-    } while (!done);
-
-    return c;
-}
-
-/******************************************************************************\
-* Miscellaneous functions.
-\******************************************************************************/
-
-static mif_hdr_t *mif_makehdrfromimage(jas_image_t *image)
-{
-    mif_hdr_t *hdr;
-    int cmptno;
-    mif_cmpt_t *cmpt;
-
-    if (!(hdr = mif_hdr_create(jas_image_numcmpts(image)))) {
-        return 0;
-    }
-    hdr->magic = MIF_MAGIC;
-    hdr->numcmpts = jas_image_numcmpts(image);
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        hdr->cmpts[cmptno] = jas_malloc(sizeof(mif_cmpt_t));
-        cmpt = hdr->cmpts[cmptno];
-        cmpt->tlx = jas_image_cmpttlx(image, cmptno);
-        cmpt->tly = jas_image_cmpttly(image, cmptno);
-        cmpt->width = jas_image_cmptwidth(image, cmptno);
-        cmpt->height = jas_image_cmptheight(image, cmptno);
-        cmpt->sampperx = jas_image_cmpthstep(image, cmptno);
-        cmpt->samppery = jas_image_cmptvstep(image, cmptno);
-        cmpt->prec = jas_image_cmptprec(image, cmptno);
-        cmpt->sgnd = jas_image_cmptsgnd(image, cmptno);
-        cmpt->data = 0;
-    }
-    return hdr;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.h b/src/3rdparty/jasper/src/libjasper/mif/mif_cod.h
deleted file mode 100644
index 207dd01..0000000
--- a/src/3rdparty/jasper/src/libjasper/mif/mif_cod.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef MIF_COD_H
-#define MIF_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define	MIF_MAGIC		0x4d49460a
-/* signature */
-
-#define	MIF_MAGICLEN	4
-/* length of signature in bytes */
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Per-component information. */
-
-typedef struct {
-
-    int_fast32_t tlx;
-
-    int_fast32_t tly;
-
-    int_fast32_t width;
-
-    int_fast32_t height;
-
-    int_fast32_t sampperx;
-
-    int_fast32_t samppery;
-
-    int_fast16_t prec;
-
-    int_fast16_t sgnd;
-
-    char *data;
-
-} mif_cmpt_t;
-
-/* MIF header. */
-
-typedef struct {
-
-    uint_fast32_t magic;
-
-    int numcmpts;
-
-    int maxcmpts;
-
-    mif_cmpt_t **cmpts;
-
-} mif_hdr_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.c b/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.c
deleted file mode 100644
index 79e9f1c..0000000
--- a/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "pgx_cod.h"
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-void pgx_dumphdr(FILE *out, pgx_hdr_t *hdr)
-{
-    fprintf(out, "byteorder=%s sgnd=%s prec=%d width=%d height=%d\n",
-      hdr->bigendian ? "bigendian" : "littleendian",
-      hdr->sgnd ? "signed" : "unsigned",
-      hdr->prec, hdr->width, hdr->height);
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.h b/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.h
deleted file mode 100644
index 2080d73..0000000
--- a/src/3rdparty/jasper/src/libjasper/pgx/pgx_cod.h
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * PGX Format Library
- *
- * $Id$
- */
-
-#ifndef PGX_COD_H
-#define PGX_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <stdio.h>
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define PGX_MAGIC	0x5047
-#define PGX_MAGICLEN	2
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-typedef struct {
-
-    uint_fast16_t magic;
-    /* The signature. */
-
-    bool bigendian;
-    /* The byte ordering used. */
-
-    bool sgnd;
-    /* The signedness of the samples. */
-
-    uint_fast32_t prec;
-    /* The precision of the samples. */
-
-    uint_fast32_t width;
-    /* The width of the component. */
-
-    uint_fast32_t height;
-    /* The height of the component. */
-
-} pgx_hdr_t;
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-void pgx_dumphdr(FILE *out, pgx_hdr_t *hdr);
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/pgx/pgx_dec.c b/src/3rdparty/jasper/src/libjasper/pgx/pgx_dec.c
deleted file mode 100644
index 1f2b1b0..0000000
--- a/src/3rdparty/jasper/src/libjasper/pgx/pgx_dec.c
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <ctype.h>
-
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-
-#include "pgx_cod.h"
-
-/******************************************************************************\
-* Local prototypes.
-\******************************************************************************/
-
-static int pgx_gethdr(jas_stream_t *in, pgx_hdr_t *hdr);
-static int pgx_getdata(jas_stream_t *in, pgx_hdr_t *hdr, jas_image_t *image);
-static int_fast32_t pgx_getword(jas_stream_t *in, bool bigendian, int prec);
-static int pgx_getsgnd(jas_stream_t *in, bool *sgnd);
-static int pgx_getbyteorder(jas_stream_t *in, bool *bigendian);
-static int pgx_getc(jas_stream_t *in);
-static int pgx_getuint32(jas_stream_t *in, uint_fast32_t *val);
-static jas_seqent_t pgx_wordtoint(uint_fast32_t word, int prec, bool sgnd);
-
-/******************************************************************************\
-* Code for load operation.
-\******************************************************************************/
-
-/* Load an image from a stream in the PGX format. */
-
-jas_image_t *pgx_decode(jas_stream_t *in, char *optstr)
-{
-    jas_image_t *image;
-    pgx_hdr_t hdr;
-    jas_image_cmptparm_t cmptparm;
-
-    /* Avoid compiler warnings about unused parameters. */
-    optstr = 0;
-
-    image = 0;
-
-    if (pgx_gethdr(in, &hdr)) {
-        goto error;
-    }
-
-#ifdef PGX_DEBUG
-    pgx_dumphdr(stderr, &hdr);
-#endif
-
-    if (!(image = jas_image_create0())) {
-        goto error;
-    }
-    cmptparm.tlx = 0;
-    cmptparm.tly = 0;
-    cmptparm.hstep = 1;
-    cmptparm.vstep = 1;
-    cmptparm.width = hdr.width;
-    cmptparm.height = hdr.height;
-    cmptparm.prec = hdr.prec;
-    cmptparm.sgnd = hdr.sgnd;
-    if (jas_image_addcmpt(image, 0, &cmptparm)) {
-        goto error;
-    }
-    if (pgx_getdata(in, &hdr, image)) {
-        goto error;
-    }
-
-    jas_image_setclrspc(image, JAS_CLRSPC_SGRAY);
-    jas_image_setcmpttype(image, 0,
-      JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-
-    return image;
-
-error:
-    if (image) {
-        jas_image_destroy(image);
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Code for validate operation.
-\******************************************************************************/
-
-int pgx_validate(jas_stream_t *in)
-{
-    uchar buf[PGX_MAGICLEN];
-    uint_fast32_t magic;
-    int i;
-    int n;
-
-    assert(JAS_STREAM_MAXPUTBACK >= PGX_MAGICLEN);
-
-    /* Read the validation data (i.e., the data used for detecting
-      the format). */
-    if ((n = jas_stream_read(in, buf, PGX_MAGICLEN)) < 0) {
-        return -1;
-    }
-
-    /* Put the validation data back onto the stream, so that the
-      stream position will not be changed. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-
-    /* Did we read enough data? */
-    if (n < PGX_MAGICLEN) {
-        return -1;
-    }
-
-    /* Compute the signature value. */
-    magic = (buf[0] << 8) | buf[1];
-
-    /* Ensure that the signature is correct for this format. */
-    if (magic != PGX_MAGIC) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-*
-\******************************************************************************/
-
-static int pgx_gethdr(jas_stream_t *in, pgx_hdr_t *hdr)
-{
-    int c;
-    uchar buf[2];
-
-    if ((c = jas_stream_getc(in)) == EOF) {
-        goto error;
-    }
-    buf[0] = c;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        goto error;
-    }
-    buf[1] = c;
-    hdr->magic = buf[0] << 8 | buf[1];
-    if (hdr->magic != PGX_MAGIC) {
-        goto error;
-    }
-    if ((c = pgx_getc(in)) == EOF || !isspace(c)) {
-        goto error;
-    }
-    if (pgx_getbyteorder(in, &hdr->bigendian)) {
-        goto error;
-    }
-    if (pgx_getsgnd(in, &hdr->sgnd)) {
-        goto error;
-    }
-    if (pgx_getuint32(in, &hdr->prec)) {
-        goto error;
-    }
-    if (pgx_getuint32(in, &hdr->width)) {
-        goto error;
-    }
-    if (pgx_getuint32(in, &hdr->height)) {
-        goto error;
-    }
-    return 0;
-
-error:
-    return -1;
-}
-
-static int pgx_getdata(jas_stream_t *in, pgx_hdr_t *hdr, jas_image_t *image)
-{
-    jas_matrix_t *data;
-    uint_fast32_t x;
-    uint_fast32_t y;
-    uint_fast32_t word;
-    int_fast32_t v;
-
-    data = 0;
-
-    if (!(data = jas_matrix_create(1, hdr->width))) {
-        goto error;
-    }
-    for (y = 0; y < hdr->height; ++y) {
-        for (x = 0; x < hdr->width; ++x) {
-            /* Need to adjust signed value. */
-            if ((v = pgx_getword(in, hdr->bigendian, hdr->prec)) < 0) {
-                goto error;
-            }
-            word = v;
-            v = pgx_wordtoint(word, hdr->prec, hdr->sgnd);
-            jas_matrix_set(data, 0, x, v);
-        }
-        if (jas_image_writecmpt(image, 0, 0, y, hdr->width, 1, data)) {
-            goto error;
-        }
-    }
-    jas_matrix_destroy(data);
-    return 0;
-
-error:
-    if (data) {
-        jas_matrix_destroy(data);
-    }
-    return -1;
-}
-
-static int_fast32_t pgx_getword(jas_stream_t *in, bool bigendian, int prec)
-{
-    uint_fast32_t val;
-    int i;
-    int j;
-    int c;
-    int wordsize;
-
-    wordsize = (prec + 7) / 8;
-
-    if (prec > 32) {
-        goto error;
-    }
-
-    val = 0;
-    for (i = 0; i < wordsize; ++i) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            goto error;
-        }
-        j = bigendian ? (wordsize - 1 - i) : i;
-        val = val | ((c & 0xff) << (8 * j));
-    }
-    val &= (1 << prec) - 1;
-    return val;
-
-error:
-    return -1;
-}
-
-static int pgx_getc(jas_stream_t *in)
-{
-    int c;
-    for (;;) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        if (c != '#') {
-            return c;
-        }
-        do {
-            if ((c = jas_stream_getc(in)) == EOF) {
-                return -1;
-            }
-        } while (c != '\n' && c != '\r');
-    }
-}
-
-static int pgx_getbyteorder(jas_stream_t *in, bool *bigendian)
-{
-    int c;
-    char buf[2];
-
-    do {
-        if ((c = pgx_getc(in)) == EOF) {
-            return -1;
-        }
-    } while (isspace(c));
-
-    buf[0] = c;
-    if ((c = pgx_getc(in)) == EOF) {
-        goto error;
-    }
-    buf[1] = c;
-    if (buf[0] == 'M' && buf[1] == 'L') {
-        *bigendian = true;
-    } else if (buf[0] == 'L' && buf[1] == 'M') {
-        *bigendian = false;
-    } else {
-        goto error;
-    }
-
-    while ((c = pgx_getc(in)) != EOF && !isspace(c)) {
-        ;
-    }
-    if (c == EOF) {
-        goto error;
-    }
-    return 0;
-
-error:
-    return -1;
-}
-
-static int pgx_getsgnd(jas_stream_t *in, bool *sgnd)
-{
-    int c;
-
-    do {
-        if ((c = pgx_getc(in)) == EOF) {
-            return -1;
-        }
-    } while (isspace(c));
-
-    if (c == '+') {
-        *sgnd = false;
-    } else if (c == '-') {
-        *sgnd = true;
-    } else {
-        goto error;
-    }
-    while ((c = pgx_getc(in)) != EOF && !isspace(c)) {
-        ;
-    }
-    if (c == EOF) {
-        goto error;
-    }
-    return 0;
-
-error:
-    return -1;
-}
-
-static int pgx_getuint32(jas_stream_t *in, uint_fast32_t *val)
-{
-    int c;
-    uint_fast32_t v;
-
-    do {
-        if ((c = pgx_getc(in)) == EOF) {
-            return -1;
-        }
-    } while (isspace(c));
-
-    v = 0;
-    while (isdigit(c)) {
-        v = 10 * v + c - '0';
-        if ((c = pgx_getc(in)) < 0) {
-            return -1;
-        }
-    }
-    if (!isspace(c)) {
-        return -1;
-    }
-    *val = v;
-
-    return 0;
-}
-
-static jas_seqent_t pgx_wordtoint(uint_fast32_t v, int prec, bool sgnd)
-{
-    jas_seqent_t ret;
-    v &= (1 << prec) - 1;
-    ret = (sgnd && (v & (1 << (prec - 1)))) ? (v - (1 << prec)) : v;
-    return ret;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.c b/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.c
deleted file mode 100644
index 11687f1..0000000
--- a/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_string.h"
-#include "jasper/jas_debug.h"
-
-#include "pgx_cod.h"
-#include "pgx_enc.h"
-
-/******************************************************************************\
-* Local functions.
-\******************************************************************************/
-
-static int pgx_puthdr(jas_stream_t *out, pgx_hdr_t *hdr);
-static int pgx_putdata(jas_stream_t *out, pgx_hdr_t *hdr, jas_image_t *image, int cmpt);
-static int pgx_putword(jas_stream_t *out, bool bigendian, int prec,
-  uint_fast32_t val);
-static uint_fast32_t pgx_inttoword(int_fast32_t val, int prec, bool sgnd);
-
-/******************************************************************************\
-* Code for save operation.
-\******************************************************************************/
-
-/* Save an image to a stream in the the PGX format. */
-
-int pgx_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    pgx_hdr_t hdr;
-    uint_fast32_t width;
-    uint_fast32_t height;
-    bool sgnd;
-    int prec;
-    pgx_enc_t encbuf;
-    pgx_enc_t *enc = &encbuf;
-
-    /* Avoid compiler warnings about unused parameters. */
-    optstr = 0;
-
-    switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-    case JAS_CLRSPC_FAM_GRAY:
-        if ((enc->cmpt = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    default:
-        jas_eprintf("error: BMP format does not support color space\n");
-        return -1;
-        break;
-    }
-
-    width = jas_image_cmptwidth(image, enc->cmpt);
-    height = jas_image_cmptheight(image, enc->cmpt);
-    prec = jas_image_cmptprec(image, enc->cmpt);
-    sgnd = jas_image_cmptsgnd(image, enc->cmpt);
-
-    /* The PGX format is quite limited in the set of image geometries
-      that it can handle.  Here, we check to ensure that the image to
-      be saved can actually be represented reasonably accurately using the
-      PGX format. */
-    /* There must be exactly one component. */
-    if (jas_image_numcmpts(image) > 1 || prec > 16) {
-        jas_eprintf("The PNM format cannot be used to represent an image with this geometry.\n");
-        return -1;
-    }
-
-    hdr.magic = PGX_MAGIC;
-    hdr.bigendian = true;
-    hdr.sgnd = sgnd;
-    hdr.prec = prec;
-    hdr.width = width;
-    hdr.height = height;
-
-#ifdef PGX_DEBUG
-    pgx_dumphdr(stderr, &hdr);
-#endif
-
-    if (pgx_puthdr(out, &hdr)) {
-        return -1;
-    }
-
-    if (pgx_putdata(out, &hdr, image, enc->cmpt)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-\******************************************************************************/
-
-static int pgx_puthdr(jas_stream_t *out, pgx_hdr_t *hdr)
-{
-    jas_stream_printf(out, "%c%c", hdr->magic >> 8, hdr->magic & 0xff);
-    jas_stream_printf(out, " %s %s %d %ld %ld\n", hdr->bigendian ? "ML" : "LM",
-      hdr->sgnd ? "-" : "+", hdr->prec, (long) hdr->width, (long) hdr->height);
-    if (jas_stream_error(out)) {
-        return -1;
-    }
-    return 0;
-}
-
-static int pgx_putdata(jas_stream_t *out, pgx_hdr_t *hdr, jas_image_t *image, int cmpt)
-{
-    jas_matrix_t *data;
-    uint_fast32_t x;
-    uint_fast32_t y;
-    int_fast32_t v;
-    uint_fast32_t word;
-
-    data = 0;
-
-    if (!(data = jas_matrix_create(1, hdr->width))) {
-        goto error;
-    }
-    for (y = 0; y < hdr->height; ++y) {
-        if (jas_image_readcmpt(image, cmpt, 0, y, hdr->width, 1, data)) {
-            goto error;
-        }
-        for (x = 0; x < hdr->width; ++x) {
-            v = jas_matrix_get(data, 0, x);
-            word = pgx_inttoword(v, hdr->prec, hdr->sgnd);
-            if (pgx_putword(out, hdr->bigendian, hdr->prec, word)) {
-                goto error;
-            }
-        }
-    }
-    jas_matrix_destroy(data);
-    data = 0;
-    return 0;
-
-error:
-    if (data) {
-        jas_matrix_destroy(data);
-    }
-    return -1;
-}
-
-static int pgx_putword(jas_stream_t *out, bool bigendian, int prec,
-  uint_fast32_t val)
-{
-    int i;
-    int j;
-    int wordsize;
-
-    val &= (1 << prec) - 1;
-    wordsize = (prec + 7) /8;
-    for (i = 0; i < wordsize; ++i) {
-        j = bigendian ? (wordsize - 1 - i) : i;
-        if (jas_stream_putc(out, (val >> (8 * j)) & 0xff) == EOF) {
-            return -1;
-        }
-    }
-    return 0;
-}
-
-static uint_fast32_t pgx_inttoword(jas_seqent_t v, int prec, bool sgnd)
-{
-    uint_fast32_t ret;
-    ret = ((sgnd && v < 0) ? ((1 << prec) + v) : v) & ((1 << prec) - 1);
-    return ret;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.h b/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.h
deleted file mode 100644
index 7bc3728..0000000
--- a/src/3rdparty/jasper/src/libjasper/pgx/pgx_enc.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef PGX_ENC_H
-#define PGX_ENC_H
-
-typedef struct {
-    int cmpt;
-} pgx_enc_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.c b/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.c
deleted file mode 100644
index fd5760f..0000000
--- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Portable Pixmap/Graymap Format Support
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_math.h"
-
-#include "pnm_cod.h"
-
-/******************************************************************************\
-* Miscellaneous utilities.
-\******************************************************************************/
-
-/* Determine the PNM type (i.e., PGM or PPM) from the magic number. */
-int pnm_type(uint_fast16_t magic)
-{
-    int type;
-    switch (magic) {
-    case PNM_MAGIC_TXTPPM:
-    case PNM_MAGIC_BINPPM:
-        type = PNM_TYPE_PPM;
-        break;
-    case PNM_MAGIC_TXTPGM:
-    case PNM_MAGIC_BINPGM:
-        type = PNM_TYPE_PGM;
-        break;
-    case PNM_MAGIC_TXTPBM:
-    case PNM_MAGIC_BINPBM:
-        type = PNM_TYPE_PBM;
-        break;
-    default:
-        /* This should not happen. */
-        abort();
-        break;
-    }
-    return type;
-}
-
-/* Determine the PNM format (i.e., text or binary) from the magic number. */
-int pnm_fmt(uint_fast16_t magic)
-{
-    int fmt;
-    switch (magic) {
-    case PNM_MAGIC_TXTPBM:
-    case PNM_MAGIC_TXTPGM:
-    case PNM_MAGIC_TXTPPM:
-        fmt = PNM_FMT_TXT;
-        break;
-    case PNM_MAGIC_BINPBM:
-    case PNM_MAGIC_BINPGM:
-    case PNM_MAGIC_BINPPM:
-        fmt = PNM_FMT_BIN;
-        break;
-    default:
-        /* This should not happen. */
-        abort();
-        break;
-    }
-    return fmt;
-}
-
-/* Determine the depth (i.e., precision) from the maximum value. */
-int pnm_maxvaltodepth(uint_fast32_t maxval)
-{
-    int n;
-
-    n = 0;
-    while (maxval > 0) {
-        maxval >>= 1;
-        ++n;
-    }
-    return n;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.h b/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.h
deleted file mode 100644
index 8320304..0000000
--- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_cod.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Portable Pixmap/Graymap Format Support
- *
- * $Id$
- */
-
-#ifndef PNM_COD_H
-#define PNM_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-/* Magic numbers. */
-#define PNM_MAGIC_TXTPBM	0x5031 /* Text Portable BitMap (P1) */
-#define PNM_MAGIC_TXTPGM	0x5032 /* Text Portable GrayMap (P2) */
-#define PNM_MAGIC_TXTPPM	0x5033 /* Text Portable PixMap (P3) */
-#define PNM_MAGIC_BINPBM	0x5034 /* Binary Portable BitMap (P4) */
-#define PNM_MAGIC_BINPGM	0x5035 /* Binary Portable GrayMap (P5) */
-#define PNM_MAGIC_BINPPM	0x5036 /* Binary Portable PixMap (P6) */
-#define	PNM_MAGIC_PAM		0x5037 /* PAM (P7) */
-
-/* Type of image data. */
-#define PNM_TYPE_PPM	0 /* PixMap */
-#define PNM_TYPE_PGM	1 /* GrayMap */
-#define PNM_TYPE_PBM	2 /* BitMap */
-
-/* Format of image data. */
-#define PNM_FMT_TXT	0 /* Text */
-#define PNM_FMT_BIN	1 /* Binary */
-
-#define	PNM_MAXLINELEN	79
-
-#define	PNM_TUPLETYPE_UNKNOWN	0
-#define	PNM_TUPLETYPE_MONO	1
-#define	PNM_TUPLETYPE_GRAY	2
-#define	PNM_TUPLETYPE_GRAYA	3
-#define	PNM_TUPLETYPE_RGB	4
-#define	PNM_TUPLETYPE_RGBA	5
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* File header. */
-
-typedef struct {
-
-    int magic;
-    /* The magic number. */
-
-    int width;
-    /* The image width. */
-
-    int height;
-    /* The image height. */
-
-    int numcmpts;
-
-    int maxval;
-    /* The maximum allowable sample value. */
-
-#if 0
-    int tupletype;
-#endif
-
-    bool sgnd;
-    /* The sample data is signed. */
-
-} pnm_hdr_t;
-
-/******************************************************************************\
-* Functions.
-\******************************************************************************/
-
-int pnm_type(uint_fast16_t magic);
-/* Determine type (i.e., PGM or PPM) from magic number. */
-
-int pnm_fmt(uint_fast16_t magic);
-/* Determine format (i.e., text or binary) from magic number. */
-
-int pnm_maxvaltodepth(uint_fast32_t maxval);
-/* Determine depth (i.e., precision) from maximum value. */
-
-#define	PNM_ONES(n) \
-    (((n) < 32) ? ((1UL << (n)) - 1) : 0xffffffffUL)
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c b/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c
deleted file mode 100644
index c996640..0000000
--- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_dec.c
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Portable Pixmap/Graymap Format Support
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_debug.h"
-#include "jasper/jas_types.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-
-#include "pnm_cod.h"
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static int pnm_gethdr(jas_stream_t *in, pnm_hdr_t *hdr);
-static int pnm_getdata(jas_stream_t *in, pnm_hdr_t *hdr, jas_image_t *image);
-
-static int pnm_getsintstr(jas_stream_t *in, int_fast32_t *val);
-static int pnm_getuintstr(jas_stream_t *in, uint_fast32_t *val);
-static int pnm_getbitstr(jas_stream_t *in, int *val);
-static int pnm_getc(jas_stream_t *in);
-
-static int pnm_getsint(jas_stream_t *in, int wordsize, int_fast32_t *val);
-static int pnm_getuint(jas_stream_t *in, int wordsize, uint_fast32_t *val);
-static int pnm_getint16(jas_stream_t *in, int *val);
-#define	pnm_getuint32(in, val)	pnm_getuint(in, 32, val)
-
-/******************************************************************************\
-* Local data.
-\******************************************************************************/
-
-static int pnm_allowtrunc = 1;
-
-/******************************************************************************\
-* Load function.
-\******************************************************************************/
-
-jas_image_t *pnm_decode(jas_stream_t *in, char *opts)
-{
-    pnm_hdr_t hdr;
-    jas_image_t *image;
-    jas_image_cmptparm_t cmptparms[3];
-    jas_image_cmptparm_t *cmptparm;
-    int i;
-
-    if (opts) {
-        jas_eprintf("warning: ignoring options\n");
-    }
-
-    /* Read the file header. */
-    if (pnm_gethdr(in, &hdr)) {
-        return 0;
-    }
-
-    /* Create an image of the correct size. */
-    for (i = 0, cmptparm = cmptparms; i < hdr.numcmpts; ++i, ++cmptparm) {
-        cmptparm->tlx = 0;
-        cmptparm->tly = 0;
-        cmptparm->hstep = 1;
-        cmptparm->vstep = 1;
-        cmptparm->width = hdr.width;
-        cmptparm->height = hdr.height;
-        cmptparm->prec = pnm_maxvaltodepth(hdr.maxval);
-        cmptparm->sgnd = hdr.sgnd;
-    }
-    if (!(image = jas_image_create(hdr.numcmpts, cmptparms, JAS_CLRSPC_UNKNOWN))) {
-        return 0;
-    }
-
-    if (hdr.numcmpts == 3) {
-        jas_image_setclrspc(image, JAS_CLRSPC_SRGB);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R));
-        jas_image_setcmpttype(image, 1,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G));
-        jas_image_setcmpttype(image, 2,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B));
-    } else {
-        jas_image_setclrspc(image, JAS_CLRSPC_SGRAY);
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-    }
-
-    /* Read image data from stream into image. */
-    if (pnm_getdata(in, &hdr, image)) {
-        jas_image_destroy(image);
-        return 0;
-    }
-
-    return image;
-}
-
-/******************************************************************************\
-* Validation function.
-\******************************************************************************/
-
-int pnm_validate(jas_stream_t *in)
-{
-    uchar buf[2];
-    int i;
-    int n;
-
-    assert(JAS_STREAM_MAXPUTBACK >= 2);
-
-    /* Read the first two characters that constitute the signature. */
-    if ((n = jas_stream_read(in, buf, 2)) < 0) {
-        return -1;
-    }
-    /* Put these characters back to the stream. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-    /* Did we read enough data? */
-    if (n < 2) {
-        return -1;
-    }
-    /* Is this the correct signature for a PNM file? */
-    if (buf[0] == 'P' && isdigit(buf[1])) {
-        return 0;
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Functions for reading the header.
-\******************************************************************************/
-
-static int pnm_gethdr(jas_stream_t *in, pnm_hdr_t *hdr)
-{
-    int_fast32_t maxval;
-    int_fast32_t width;
-    int_fast32_t height;
-    if (pnm_getint16(in, &hdr->magic) || pnm_getsintstr(in, &width) ||
-      pnm_getsintstr(in, &height)) {
-        return -1;
-    }
-    hdr->width = width;
-    hdr->height = height;
-    if (pnm_type(hdr->magic) != PNM_TYPE_PBM) {
-        if (pnm_getsintstr(in, &maxval)) {
-            return -1;
-        }
-    } else {
-        maxval = 1;
-    }
-    if (maxval < 0) {
-        hdr->maxval = -maxval;
-        hdr->sgnd = true;
-    } else {
-        hdr->maxval = maxval;
-        hdr->sgnd = false;
-    }
-
-    switch (pnm_type(hdr->magic)) {
-    case PNM_TYPE_PBM:
-    case PNM_TYPE_PGM:
-        hdr->numcmpts = 1;
-        break;
-    case PNM_TYPE_PPM:
-        hdr->numcmpts = 3;
-        break;
-    default:
-        abort();
-        break;
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Functions for processing the sample data.
-\******************************************************************************/
-
-static int pnm_getdata(jas_stream_t *in, pnm_hdr_t *hdr, jas_image_t *image)
-{
-    int ret;
-#if 0
-    int numcmpts;
-#endif
-    int cmptno;
-    int fmt;
-    jas_matrix_t *data[3];
-    int x;
-    int y;
-    int_fast64_t v;
-    int depth;
-    int type;
-    int c;
-    int n;
-
-    ret = -1;
-
-#if 0
-    numcmpts = jas_image_numcmpts(image);
-#endif
-    fmt = pnm_fmt(hdr->magic);
-    type = pnm_type(hdr->magic);
-    depth = pnm_maxvaltodepth(hdr->maxval);
-
-    data[0] = 0;
-    data[1] = 0;
-    data[2] = 0;
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        if (!(data[cmptno] = jas_matrix_create(1, hdr->width))) {
-            goto done;
-        }
-    }
-
-    for (y = 0; y < hdr->height; ++y) {
-        if (type == PNM_TYPE_PBM) {
-            if (fmt == PNM_FMT_BIN) {
-                for (x = 0; x < hdr->width;) {
-                    if ((c = jas_stream_getc(in)) == EOF) {
-                        goto done;
-                    }
-                    n = 8;
-                    while (n > 0 && x < hdr->width) {
-                        jas_matrix_set(data[0], 0, x, 1 - ((c >> 7) & 1));
-                        c <<= 1;
-                        --n;
-                        ++x;
-                    }
-                }
-            } else {
-                for (x = 0; x < hdr->width; ++x) {
-                    int uv;
-                    if (pnm_getbitstr(in, &uv)) {
-                        goto done;
-                    }
-                    jas_matrix_set(data[0], 0, x, 1 - uv);
-                }
-            }
-        } else {
-            for (x = 0; x < hdr->width; ++x) {
-                for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-                    if (fmt == PNM_FMT_BIN) {
-                        /* The sample data is in binary format. */
-                        if (hdr->sgnd) {
-                            /* The sample data is signed. */
-                            int_fast32_t sv;
-                            if (pnm_getsint(in, depth, &sv)) {
-                                if (!pnm_allowtrunc) {
-                                    goto done;
-                                }
-                                sv = 0;
-                            }
-                            v = sv;
-                        } else {
-                            /* The sample data is unsigned. */
-                            uint_fast32_t uv;
-                            if (pnm_getuint(in, depth, &uv)) {
-                                if (!pnm_allowtrunc) {
-                                    goto done;
-                                }
-                                uv = 0;
-                            }
-                            v = uv;
-                        }
-                    } else {
-                        /* The sample data is in text format. */
-                        if (hdr->sgnd) {
-                            /* The sample data is signed. */
-                            int_fast32_t sv;
-                            if (pnm_getsintstr(in, &sv)) {
-                                if (!pnm_allowtrunc) {
-                                    goto done;
-                                }
-                                sv = 0;
-                            }
-                            v = sv;
-                        } else {
-                            /* The sample data is unsigned. */
-                            uint_fast32_t uv;
-                            if (pnm_getuintstr(in, &uv)) {
-                                if (!pnm_allowtrunc) {
-                                    goto done;
-                                }
-                                uv = 0;
-                            }
-                            v = uv;
-                        }
-                    }
-                    jas_matrix_set(data[cmptno], 0, x, v);
-                }
-            }
-        }
-        for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-            if (jas_image_writecmpt(image, cmptno, 0, y, hdr->width, 1,
-              data[cmptno])) {
-                goto done;
-            }
-        }
-    }
-
-    ret = 0;
-
-done:
-
-    for (cmptno = 0; cmptno < hdr->numcmpts; ++cmptno) {
-        if (data[cmptno]) {
-            jas_matrix_destroy(data[cmptno]);
-        }
-    }
-
-    return ret;
-}
-
-/******************************************************************************\
-* Miscellaneous functions.
-\******************************************************************************/
-
-static int pnm_getsint(jas_stream_t *in, int wordsize, int_fast32_t *val)
-{
-    uint_fast32_t tmpval;
-
-    if (pnm_getuint(in, wordsize, &tmpval)) {
-        return -1;
-    }
-    if (val) {
-        assert((tmpval & (1 << (wordsize - 1))) == 0);
-        *val = tmpval;
-    }
-
-    return 0;
-}
-
-static int pnm_getuint(jas_stream_t *in, int wordsize, uint_fast32_t *val)
-{
-    uint_fast32_t tmpval;
-    int c;
-    int n;
-
-    tmpval = 0;
-    n = (wordsize + 7) / 8;
-    while (--n >= 0) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        tmpval = (tmpval << 8) | c;
-    }
-    tmpval &= (((uint_fast64_t) 1) << wordsize) - 1;
-    if (val) {
-        *val = tmpval;
-    }
-
-    return 0;
-}
-
-static int pnm_getbitstr(jas_stream_t *in, int *val)
-{
-    int c;
-    int_fast32_t v;
-    for (;;) {
-        if ((c = pnm_getc(in)) == EOF) {
-            return -1;
-        }
-        if (c == '#') {
-            for (;;) {
-                if ((c = pnm_getc(in)) == EOF) {
-                    return -1;
-                }
-                if (c == '\n') {
-                    break;
-                }
-            }
-        } else if (c == '0' || c == '1') {
-            v = c - '0';
-            break;
-        }
-    }
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-static int pnm_getuintstr(jas_stream_t *in, uint_fast32_t *val)
-{
-    uint_fast32_t v;
-    int c;
-
-    /* Discard any leading whitespace. */
-    do {
-        if ((c = pnm_getc(in)) == EOF) {
-            return -1;
-        }
-    } while (isspace(c));
-
-    /* Parse the number. */
-    v = 0;
-    while (isdigit(c)) {
-        v = 10 * v + c - '0';
-        if ((c = pnm_getc(in)) < 0) {
-            return -1;
-        }
-    }
-
-    /* The number must be followed by whitespace. */
-    if (!isspace(c)) {
-        return -1;
-    }
-
-    if (val) {
-        *val = v;
-    }
-    return 0;
-}
-
-static int pnm_getsintstr(jas_stream_t *in, int_fast32_t *val)
-{
-    int c;
-    int s;
-    int_fast32_t v;
-
-    /* Discard any leading whitespace. */
-    do {
-        if ((c = pnm_getc(in)) == EOF) {
-            return -1;
-        }
-    } while (isspace(c));
-
-    /* Get the number, allowing for a negative sign. */
-    s = 1;
-    if (c == '-') {
-        s = -1;
-        if ((c = pnm_getc(in)) == EOF) {
-            return -1;
-        }
-    } else if (c == '+') {
-        if ((c = pnm_getc(in)) == EOF) {
-            return -1;
-        }
-    }
-    v = 0;
-    while (isdigit(c)) {
-        v = 10 * v + c - '0';
-        if ((c = pnm_getc(in)) < 0) {
-            return -1;
-        }
-    }
-
-    /* The number must be followed by whitespace. */
-    if (!isspace(c)) {
-        return -1;
-    }
-
-    if (val) {
-        *val = (s >= 0) ? v : (-v);
-    }
-
-    return 0;
-}
-
-static int pnm_getc(jas_stream_t *in)
-{
-    int c;
-    for (;;) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        if (c != '#') {
-            return c;
-        }
-        do {
-            if ((c = jas_stream_getc(in)) == EOF) {
-                return -1;
-            }
-        } while (c != '\n' && c != '\r');
-    }
-}
-
-static int pnm_getint16(jas_stream_t *in, int *val)
-{
-    int v;
-    int c;
-
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = c & 0xff;
-    if ((c = jas_stream_getc(in)) == EOF) {
-        return -1;
-    }
-    v = (v << 8) | (c & 0xff);
-    *val = v;
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.c b/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.c
deleted file mode 100644
index 9b19c64..0000000
--- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.c
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Portable Pixmap/Graymap Format Support
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <ctype.h>
-#include <math.h>
-#include <stdlib.h>
-#include <assert.h>
-
-#include "jasper/jas_types.h"
-#include "jasper/jas_tvp.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_debug.h"
-
-#include "pnm_cod.h"
-#include "pnm_enc.h"
-
-/******************************************************************************\
-* Local types.
-\******************************************************************************/
-
-typedef struct {
-    bool bin;
-} pnm_encopts_t;
-
-typedef enum {
-    OPT_TEXT
-} pnm_optid_t;
-
-jas_taginfo_t pnm_opttab[] = {
-    {OPT_TEXT, "text"},
-    {-1, 0}
-};
-
-/******************************************************************************\
-* Local function prototypes.
-\******************************************************************************/
-
-static int pnm_parseencopts(char *optstr, pnm_encopts_t *encopts);
-static int pnm_puthdr(jas_stream_t *out, pnm_hdr_t *hdr);
-static int pnm_putdata(jas_stream_t *out, pnm_hdr_t *hdr, jas_image_t *image, int numcmpts, int *cmpts);
-
-static int pnm_putsint(jas_stream_t *out, int wordsize, int_fast32_t *val);
-static int pnm_putuint(jas_stream_t *out, int wordsize, uint_fast32_t *val);
-static int pnm_putuint16(jas_stream_t *out, uint_fast16_t val);
-
-/******************************************************************************\
-* Save function.
-\******************************************************************************/
-
-int pnm_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    int width;
-    int height;
-    int cmptno;
-    pnm_hdr_t hdr;
-    pnm_encopts_t encopts;
-    int prec;
-    int sgnd;
-    pnm_enc_t encbuf;
-    pnm_enc_t *enc = &encbuf;
-
-    /* Parse the encoder option string. */
-    if (pnm_parseencopts(optstr, &encopts)) {
-        jas_eprintf("invalid PNM encoder options specified\n");
-        return -1;
-    }
-
-    switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-    case JAS_CLRSPC_FAM_RGB:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SRGB)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 3;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R))) < 0 ||
-          (enc->cmpts[1] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G))) < 0 ||
-          (enc->cmpts[2] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SGRAY)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 1;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    default:
-        jas_eprintf("error: unsupported color space\n");
-        return -1;
-        break;
-    }
-
-
-    width = jas_image_cmptwidth(image, enc->cmpts[0]);
-    height = jas_image_cmptheight(image, enc->cmpts[0]);
-    prec = jas_image_cmptprec(image, enc->cmpts[0]);
-    sgnd = jas_image_cmptsgnd(image, enc->cmpts[0]);
-
-    /* The PNM format is quite limited in the set of image geometries
-      that it can handle.  Here, we check to ensure that the image to
-      be saved can actually be represented reasonably accurately using the
-      PNM format. */
-    /* All of the components must have the same width and height. */
-    /* All of the components must have unsigned samples with the same
-      precision.*/
-    /* All of the components must have their top-left corner located at
-      the origin. */
-    for (cmptno = 0; cmptno < enc->numcmpts; ++cmptno) {
-        if (jas_image_cmptwidth(image, enc->cmpts[cmptno]) != width ||
-          jas_image_cmptheight(image, enc->cmpts[cmptno]) != height ||
-          jas_image_cmptprec(image, enc->cmpts[cmptno]) != prec ||
-          jas_image_cmptsgnd(image, enc->cmpts[cmptno]) != sgnd ||
-          jas_image_cmpthstep(image, enc->cmpts[cmptno]) != jas_image_cmpthstep(image, 0) ||
-          jas_image_cmptvstep(image, enc->cmpts[cmptno]) != jas_image_cmptvstep(image, 0) ||
-          jas_image_cmpttlx(image, enc->cmpts[cmptno]) != jas_image_cmpttlx(image, 0) ||
-          jas_image_cmpttly(image, enc->cmpts[cmptno]) != jas_image_cmpttly(image, 0)) {
-            jas_eprintf("The PNM format cannot be used to represent an image with this geometry.\n");
-            return -1;
-        }
-    }
-
-    if (sgnd) {
-        jas_eprintf("warning: support for signed sample data requires use of nonstandard extension to PNM format\n");
-        jas_eprintf("You may not be able to read or correctly display the resulting PNM data with other software.\n");
-    }
-
-    /* Initialize the header. */
-    if (enc->numcmpts == 1) {
-        hdr.magic = encopts.bin ? PNM_MAGIC_BINPGM : PNM_MAGIC_TXTPGM;
-    } else if (enc->numcmpts == 3) {
-        hdr.magic = encopts.bin ? PNM_MAGIC_BINPPM : PNM_MAGIC_TXTPPM;
-    } else {
-        return -1;
-    }
-    hdr.width = width;
-    hdr.height = height;
-    hdr.maxval = (1 << prec) - 1;
-    hdr.sgnd = sgnd;
-
-    /* Write the header. */
-    if (pnm_puthdr(out, &hdr)) {
-        return -1;
-    }
-
-    /* Write the image data. */
-    if (pnm_putdata(out, &hdr, image, enc->numcmpts, enc->cmpts)) {
-        return -1;
-    }
-
-    /* Flush the output stream. */
-    if (jas_stream_flush(out)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-/******************************************************************************\
-* Code for parsing options.
-\******************************************************************************/
-
-/* Parse the encoder options string. */
-static int pnm_parseencopts(char *optstr, pnm_encopts_t *encopts)
-{
-    jas_tvparser_t *tvp;
-    int ret;
-
-    tvp = 0;
-
-    /* Initialize default values for encoder options. */
-    encopts->bin = true;
-
-    /* Create the tag-value parser. */
-    if (!(tvp = jas_tvparser_create(optstr ? optstr : ""))) {
-        goto error;
-    }
-
-    /* Get tag-value pairs, and process as necessary. */
-    while (!(ret = jas_tvparser_next(tvp))) {
-        switch (jas_taginfo_nonull(jas_taginfos_lookup(pnm_opttab,
-          jas_tvparser_gettag(tvp)))->id) {
-        case OPT_TEXT:
-            encopts->bin = false;
-            break;
-        default:
-            jas_eprintf("warning: ignoring invalid option %s\n",
-              jas_tvparser_gettag(tvp));
-            break;
-        }
-    }
-    if (ret < 0) {
-        goto error;
-    }
-
-    /* Destroy the tag-value parser. */
-    jas_tvparser_destroy(tvp);
-
-    return 0;
-
-error:
-    if (tvp) {
-        jas_tvparser_destroy(tvp);
-    }
-    return -1;
-}
-
-/******************************************************************************\
-* Function for writing header.
-\******************************************************************************/
-
-/* Write the header. */
-static int pnm_puthdr(jas_stream_t *out, pnm_hdr_t *hdr)
-{
-    int_fast32_t maxval;
-
-    if (pnm_putuint16(out, hdr->magic)) {
-        return -1;
-    }
-    if (hdr->sgnd) {
-        maxval = -hdr->maxval;
-    } else {
-        maxval = hdr->maxval;
-    }
-    jas_stream_printf(out, "\n%lu %lu\n%ld\n", (unsigned long) hdr->width,
-      (unsigned long) hdr->height, (long) maxval);
-    if (jas_stream_error(out)) {
-        return -1;
-    }
-    return 0;
-}
-
-/******************************************************************************\
-* Functions for processing the sample data.
-\******************************************************************************/
-
-/* Write the image sample data. */
-static int pnm_putdata(jas_stream_t *out, pnm_hdr_t *hdr, jas_image_t *image, int numcmpts, int *cmpts)
-{
-    int ret;
-    int cmptno;
-    int x;
-    int y;
-    jas_matrix_t *data[3];
-    int fmt;
-    jas_seqent_t *d[3];
-    jas_seqent_t v;
-    int minval;
-    int linelen;
-    int n;
-    char buf[256];
-    int depth;
-
-    ret = -1;
-    fmt = pnm_fmt(hdr->magic);
-    minval = -((int) hdr->maxval + 1);
-    depth = pnm_maxvaltodepth(hdr->maxval);
-
-    data[0] = 0;
-    data[1] = 0;
-    data[2] = 0;
-    for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-        if (!(data[cmptno] = jas_matrix_create(1, hdr->width))) {
-            goto done;
-        }
-    }
-
-    for (y = 0; y < hdr->height; ++y) {
-        for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-            if (jas_image_readcmpt(image, cmpts[cmptno], 0, y, hdr->width, 1,
-              data[cmptno])) {
-                goto done;
-            }
-            d[cmptno] = jas_matrix_getref(data[cmptno], 0, 0);
-        }
-        linelen = 0;
-        for (x = 0; x < hdr->width; ++x) {
-            for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-                v = *d[cmptno];
-                if (v < minval) {
-                    v = minval;
-                }
-                if (v > ((int) hdr->maxval)) {
-                    v = hdr->maxval;
-                }
-                if (fmt == PNM_FMT_BIN) {
-                    if (hdr->sgnd) {
-                        int_fast32_t sv;
-                        sv = v;
-                        if (pnm_putsint(out, depth, &sv)) {
-                            goto done;
-                        }
-                    } else {
-                        uint_fast32_t uv;
-                        uv = v;
-                        if (pnm_putuint(out, depth, &uv)) {
-                            goto done;
-                        }
-                    }
-                } else {
-                    n = sprintf(buf, "%s%ld", ((!(!x && !cmptno)) ? " " : ""),
-                      (long) v);
-                    if (linelen > 0 && linelen + n > PNM_MAXLINELEN) {
-                        jas_stream_printf(out, "\n");
-                        linelen = 0;
-                    }
-                    jas_stream_printf(out, "%s", buf);
-                    linelen += n;
-                }
-                ++d[cmptno];
-            }
-        }
-        if (fmt != PNM_FMT_BIN) {
-            jas_stream_printf(out, "\n");
-            linelen = 0;
-        }
-        if (jas_stream_error(out)) {
-            goto done;
-        }
-    }
-
-    ret = 0;
-
-done:
-
-    for (cmptno = 0; cmptno < numcmpts; ++cmptno) {
-        if (data[cmptno]) {
-            jas_matrix_destroy(data[cmptno]);
-        }
-    }
-
-    return ret;
-}
-
-/******************************************************************************\
-* Miscellaneous functions.
-\******************************************************************************/
-
-static int pnm_putsint(jas_stream_t *out, int wordsize, int_fast32_t *val)
-{
-    uint_fast32_t tmpval;
-    tmpval = (*val < 0) ?
-      ((~(JAS_CAST(uint_fast32_t, -(*val)) + 1)) & PNM_ONES(wordsize)) :
-      JAS_CAST(uint_fast32_t, (*val));
-    return pnm_putuint(out, wordsize, &tmpval);
-}
-
-static int pnm_putuint(jas_stream_t *out, int wordsize, uint_fast32_t *val)
-{
-    int n;
-    uint_fast32_t tmpval;
-    int c;
-
-    n = (wordsize + 7) / 8;
-    tmpval = (*val);
-    tmpval &= PNM_ONES(8 * n);
-    tmpval = tmpval << (8 * (4 - n));
-    while (--n >= 0) {
-        c = (tmpval >> 24) & 0xff;
-        if (jas_stream_putc(out, c) == EOF) {
-            return -1;
-        }
-        tmpval = (tmpval << 8) & 0xffffffff;
-    }
-    return 0;
-}
-
-/* Write a 16-bit unsigned integer to a stream. */
-static int pnm_putuint16(jas_stream_t *out, uint_fast16_t val)
-{
-    if (jas_stream_putc(out, (unsigned char)(val >> 8)) == EOF ||
-      jas_stream_putc(out, (unsigned char)(val & 0xff)) == EOF) {
-        return -1;
-    }
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.h b/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.h
deleted file mode 100644
index a2e8ab9..0000000
--- a/src/3rdparty/jasper/src/libjasper/pnm/pnm_enc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef PNM_ENC_H
-#define PNM_ENC_H
-
-typedef struct {
-    int numcmpts;
-    int cmpts[4];
-} pnm_enc_t;
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/ras/ras_cod.c b/src/3rdparty/jasper/src/libjasper/ras/ras_cod.c
deleted file mode 100644
index fd3c84e..0000000
--- a/src/3rdparty/jasper/src/libjasper/ras/ras_cod.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sun Rasterfile Library
- *
- * $Id$
- */
-
-/* Note: There is not currently any code common to both the encoder and
-  decoder. */
-
-/* Keep picky compilers happy. */
-int ras_dummy;
diff --git a/src/3rdparty/jasper/src/libjasper/ras/ras_cod.h b/src/3rdparty/jasper/src/libjasper/ras/ras_cod.h
deleted file mode 100644
index d310df8..0000000
--- a/src/3rdparty/jasper/src/libjasper/ras/ras_cod.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sun Rasterfile Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Sun Rasterfile
-\******************************************************************************/
-
-#ifndef	RAS_COD_H
-#define	RAS_COD_H
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include "jasper/jas_types.h"
-
-/******************************************************************************\
-* Constants.
-\******************************************************************************/
-
-#define	RAS_MAGIC	0x59a66a95
-#define	RAS_MAGICLEN	4
-
-#define	RAS_TYPE_OLD	0
-#define	RAS_TYPE_STD	1
-#define	RAS_TYPE_RLE	2
-
-#define	RAS_MT_NONE	0
-#define	RAS_MT_EQUALRGB	1
-#define	RAS_MT_RAW	2
-
-/******************************************************************************\
-* Types.
-\******************************************************************************/
-
-/* Sun Rasterfile header. */
-typedef struct {
-
-    int_fast32_t magic;
-    /* signature */
-
-    int_fast32_t width;
-    /* width of image (in pixels) */
-
-    int_fast32_t height;
-    /* height of image (in pixels) */
-
-    int_fast32_t depth;
-    /* number of bits per pixel */
-
-    int_fast32_t length;
-    /* length of image data (in bytes) */
-
-    int_fast32_t type;
-    /* format of image data */
-
-    int_fast32_t maptype;
-    /* colormap type */
-
-    int_fast32_t maplength;
-    /* length of colormap data (in bytes) */
-
-} ras_hdr_t;
-
-#define	RAS_CMAP_MAXSIZ	256
-
-/* Color map. */
-typedef struct {
-
-    int len;
-    /* The number of entries in the color map. */
-
-    int data[RAS_CMAP_MAXSIZ];
-    /* The color map data. */
-
-} ras_cmap_t;
-
-/******************************************************************************\
-* Macros.
-\******************************************************************************/
-
-#define RAS_GETBLUE(x)	(((x) >> 16) & 0xff)
-#define	RAS_GETGREEN(x)	(((x) >> 8) & 0xff)
-#define RAS_GETRED(x)	((x) & 0xff)
-
-#define RAS_BLUE(x)	(((x) & 0xff) << 16)
-#define RAS_GREEN(x)	(((x) & 0xff) << 8)
-#define	RAS_RED(x)	((x) & 0xff)
-
-#define RAS_ROWSIZE(hdr) \
-    ((((hdr)->width * (hdr)->depth + 15) / 16) * 2)
-#define RAS_ISRGB(hdr) \
-    ((hdr)->depth == 24 || (hdr)->depth == 32)
-
-#define	RAS_ONES(n) \
-    (((n) == 32) ? 0xffffffffUL : ((1UL << (n)) - 1))
-
-#endif
diff --git a/src/3rdparty/jasper/src/libjasper/ras/ras_dec.c b/src/3rdparty/jasper/src/libjasper/ras/ras_dec.c
deleted file mode 100644
index ebae2b6..0000000
--- a/src/3rdparty/jasper/src/libjasper/ras/ras_dec.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sun Rasterfile Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "jasper/jas_stream.h"
-#include "jasper/jas_image.h"
-#include "jasper/jas_debug.h"
-
-#include "ras_cod.h"
-
-/******************************************************************************\
-* Prototypes.
-\******************************************************************************/
-
-static int ras_gethdr(jas_stream_t *in, ras_hdr_t *hdr);
-static int ras_getint(jas_stream_t *in, int_fast32_t *val);
-
-static int ras_getdata(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap,
-  jas_image_t *image);
-static int ras_getdatastd(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap,
-  jas_image_t *image);
-static int ras_getcmap(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap);
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-jas_image_t *ras_decode(jas_stream_t *in, char *optstr)
-{
-    ras_hdr_t hdr;
-    ras_cmap_t cmap;
-    jas_image_t *image;
-    jas_image_cmptparm_t cmptparms[3];
-    jas_image_cmptparm_t *cmptparm;
-    int clrspc;
-    int numcmpts;
-    int i;
-
-    if (optstr) {
-        jas_eprintf("warning: ignoring RAS decoder options\n");
-    }
-
-    /* Read the header. */
-    if (ras_gethdr(in, &hdr)) {
-        return 0;
-    }
-
-    /* Does the header information look reasonably sane? */
-    if (hdr.magic != RAS_MAGIC || hdr.width <= 0 || hdr.height <= 0 ||
-      hdr.depth <= 0 || hdr.depth > 32) {
-        return 0;
-    }
-
-    /* In the case of the old format, do not rely on the length field
-    being properly specified.  Calculate the quantity from scratch. */
-    if (hdr.type == RAS_TYPE_OLD) {
-        hdr.length = RAS_ROWSIZE(&hdr) * hdr.height;
-    }
-
-    /* Calculate some quantities needed for creation of the image
-    object. */
-    if (RAS_ISRGB(&hdr)) {
-        clrspc = JAS_CLRSPC_SRGB;
-        numcmpts = 3;
-    } else {
-        clrspc = JAS_CLRSPC_SGRAY;
-        numcmpts = 1;
-    }
-    for (i = 0, cmptparm = cmptparms; i < numcmpts; ++i, ++cmptparm) {
-        cmptparm->tlx = 0;
-        cmptparm->tly = 0;
-        cmptparm->hstep = 1;
-        cmptparm->vstep = 1;
-        cmptparm->width = hdr.width;
-        cmptparm->height = hdr.height;
-        cmptparm->prec = RAS_ISRGB(&hdr) ? 8 : hdr.depth;
-        cmptparm->sgnd = false;
-    }
-    /* Create the image object. */
-    if (!(image = jas_image_create(numcmpts, cmptparms, JAS_CLRSPC_UNKNOWN))) {
-        return 0;
-    }
-
-    /* Read the color map (if there is one). */
-    if (ras_getcmap(in, &hdr, &cmap)) {
-        jas_image_destroy(image);
-        return 0;
-    }
-
-    /* Read the pixel data. */
-    if (ras_getdata(in, &hdr, &cmap, image)) {
-        jas_image_destroy(image);
-        return 0;
-    }
-
-    jas_image_setclrspc(image, clrspc);
-    if (clrspc == JAS_CLRSPC_SRGB) {
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R));
-        jas_image_setcmpttype(image, 1,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G));
-        jas_image_setcmpttype(image, 2,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B));
-    } else {
-        jas_image_setcmpttype(image, 0,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y));
-    }
-
-    return image;
-}
-
-int ras_validate(jas_stream_t *in)
-{
-    uchar buf[RAS_MAGICLEN];
-    int i;
-    int n;
-    uint_fast32_t magic;
-
-    assert(JAS_STREAM_MAXPUTBACK >= RAS_MAGICLEN);
-
-    /* Read the validation data (i.e., the data used for detecting
-      the format). */
-    if ((n = jas_stream_read(in, buf, RAS_MAGICLEN)) < 0) {
-        return -1;
-    }
-
-    /* Put the validation data back onto the stream, so that the
-      stream position will not be changed. */
-    for (i = n - 1; i >= 0; --i) {
-        if (jas_stream_ungetc(in, buf[i]) == EOF) {
-            return -1;
-        }
-    }
-
-    /* Did we read enough data? */
-    if (n < RAS_MAGICLEN) {
-        return -1;
-    }
-
-    magic = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-
-    /* Is the signature correct for the Sun Rasterfile format? */
-    if (magic != RAS_MAGIC) {
-        return -1;
-    }
-    return 0;
-}
-
-static int ras_getdata(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap,
-  jas_image_t *image)
-{
-    int ret;
-
-    switch (hdr->type) {
-    case RAS_TYPE_OLD:
-    case RAS_TYPE_STD:
-        ret = ras_getdatastd(in, hdr, cmap, image);
-        break;
-    case RAS_TYPE_RLE:
-        jas_eprintf("error: RLE encoding method not supported\n");
-        ret = -1;
-        break;
-    default:
-        jas_eprintf("error: encoding method not supported\n");
-        ret = -1;
-        break;
-    }
-    return ret;
-}
-
-static int ras_getdatastd(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap,
-  jas_image_t *image)
-{
-    int pad;
-    int nz;
-    int z;
-    int c;
-    int y;
-    int x;
-    int v;
-    int i;
-    jas_matrix_t *data[3];
-
-/* Note: This function does not properly handle images with a colormap. */
-    /* Avoid compiler warnings about unused parameters. */
-    cmap = 0;
-
-    for (i = 0; i < jas_image_numcmpts(image); ++i) {
-        data[i] = jas_matrix_create(1, jas_image_width(image));
-        assert(data[i]);
-    }
-
-    pad = RAS_ROWSIZE(hdr) - (hdr->width * hdr->depth + 7) / 8;
-
-    for (y = 0; y < hdr->height; y++) {
-        nz = 0;
-        z = 0;
-        for (x = 0; x < hdr->width; x++) {
-            while (nz < hdr->depth) {
-                if ((c = jas_stream_getc(in)) == EOF) {
-                    return -1;
-                }
-                z = (z << 8) | c;
-                nz += 8;
-            }
-
-            v = (z >> (nz - hdr->depth)) & RAS_ONES(hdr->depth);
-            z &= RAS_ONES(nz - hdr->depth);
-            nz -= hdr->depth;
-
-            if (jas_image_numcmpts(image) == 3) {
-                jas_matrix_setv(data[0], x, (RAS_GETRED(v)));
-                jas_matrix_setv(data[1], x, (RAS_GETGREEN(v)));
-                jas_matrix_setv(data[2], x, (RAS_GETBLUE(v)));
-            } else {
-                jas_matrix_setv(data[0], x, (v));
-            }
-        }
-        if (pad) {
-            if ((c = jas_stream_getc(in)) == EOF) {
-                return -1;
-            }
-        }
-        for (i = 0; i < jas_image_numcmpts(image); ++i) {
-            if (jas_image_writecmpt(image, i, 0, y, hdr->width, 1,
-              data[i])) {
-                return -1;
-            }
-        }
-    }
-
-    for (i = 0; i < jas_image_numcmpts(image); ++i) {
-        jas_matrix_destroy(data[i]);
-    }
-
-    return 0;
-}
-
-static int ras_getcmap(jas_stream_t *in, ras_hdr_t *hdr, ras_cmap_t *cmap)
-{
-    int i;
-    int j;
-    int x;
-    int c;
-    int numcolors;
-    int actualnumcolors;
-
-    switch (hdr->maptype) {
-    case RAS_MT_NONE:
-        break;
-    case RAS_MT_EQUALRGB:
-        {
-        jas_eprintf("warning: palettized images not fully supported\n");
-        numcolors = 1 << hdr->depth;
-        assert(numcolors <= RAS_CMAP_MAXSIZ);
-        actualnumcolors = hdr->maplength / 3;
-        for (i = 0; i < numcolors; i++) {
-            cmap->data[i] = 0;
-        }
-        if ((hdr->maplength % 3) || hdr->maplength < 0 ||
-          hdr->maplength > 3 * numcolors) {
-            return -1;
-        }
-        for (i = 0; i < 3; i++) {
-            for (j = 0; j < actualnumcolors; j++) {
-                if ((c = jas_stream_getc(in)) == EOF) {
-                    return -1;
-                }
-                x = 0;
-                switch (i) {
-                case 0:
-                    x = RAS_RED(c);
-                    break;
-                case 1:
-                    x = RAS_GREEN(c);
-                    break;
-                case 2:
-                    x = RAS_BLUE(c);
-                    break;
-                }
-                cmap->data[j] |= x;
-            }
-        }
-        }
-        break;
-    default:
-        return -1;
-        break;
-    }
-
-    return 0;
-}
-
-static int ras_gethdr(jas_stream_t *in, ras_hdr_t *hdr)
-{
-    if (ras_getint(in, &hdr->magic) || ras_getint(in, &hdr->width) ||
-      ras_getint(in, &hdr->height) || ras_getint(in, &hdr->depth) ||
-      ras_getint(in, &hdr->length) || ras_getint(in, &hdr->type) ||
-      ras_getint(in, &hdr->maptype) || ras_getint(in, &hdr->maplength)) {
-        return -1;
-    }
-
-    if (hdr->magic != RAS_MAGIC) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int ras_getint(jas_stream_t *in, int_fast32_t *val)
-{
-    int x;
-    int c;
-    int i;
-
-    x = 0;
-    for (i = 0; i < 4; i++) {
-        if ((c = jas_stream_getc(in)) == EOF) {
-            return -1;
-        }
-        x = (x << 8) | (c & 0xff);
-    }
-
-    *val = x;
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/ras/ras_enc.c b/src/3rdparty/jasper/src/libjasper/ras/ras_enc.c
deleted file mode 100644
index 38d229b..0000000
--- a/src/3rdparty/jasper/src/libjasper/ras/ras_enc.c
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 1999-2000 Image Power, Inc. and the University of
- *   British Columbia.
- * Copyright (c) 2001-2003 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-/*
- * Sun Rasterfile Library
- *
- * $Id$
- */
-
-/******************************************************************************\
-* Includes.
-\******************************************************************************/
-
-#include <assert.h>
-#include <stdlib.h>
-
-#include "jasper/jas_image.h"
-#include "jasper/jas_stream.h"
-#include "jasper/jas_debug.h"
-
-#include "ras_cod.h"
-#include "ras_enc.h"
-
-/******************************************************************************\
-* Prototypes.
-\******************************************************************************/
-
-static int ras_puthdr(jas_stream_t *out, ras_hdr_t *hdr);
-static int ras_putint(jas_stream_t *out, int val);
-
-static int ras_putdata(jas_stream_t *out, ras_hdr_t *hdr, jas_image_t *image, int numcmpts, int *cmpts);
-static int ras_putdatastd(jas_stream_t *out, ras_hdr_t *hdr, jas_image_t *image, int numcmpts, int *cmpts);
-
-/******************************************************************************\
-* Code.
-\******************************************************************************/
-
-int ras_encode(jas_image_t *image, jas_stream_t *out, char *optstr)
-{
-    int_fast32_t width;
-    int_fast32_t height;
-    int_fast32_t depth;
-    int cmptno;
-#if 0
-    uint_fast16_t numcmpts;
-#endif
-    int i;
-    ras_hdr_t hdr;
-    int rowsize;
-    ras_enc_t encbuf;
-    ras_enc_t *enc = &encbuf;
-
-    if (optstr) {
-        jas_eprintf("warning: ignoring RAS encoder options\n");
-    }
-
-    switch (jas_clrspc_fam(jas_image_clrspc(image))) {
-    case JAS_CLRSPC_FAM_RGB:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SRGB)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 3;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_R))) < 0 ||
-          (enc->cmpts[1] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_G))) < 0 ||
-          (enc->cmpts[2] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_RGB_B))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    case JAS_CLRSPC_FAM_GRAY:
-        if (jas_image_clrspc(image) != JAS_CLRSPC_SGRAY)
-            jas_eprintf("warning: inaccurate color\n");
-        enc->numcmpts = 1;
-        if ((enc->cmpts[0] = jas_image_getcmptbytype(image,
-          JAS_IMAGE_CT_COLOR(JAS_CLRSPC_CHANIND_GRAY_Y))) < 0) {
-            jas_eprintf("error: missing color component\n");
-            return -1;
-        }
-        break;
-    default:
-        jas_eprintf("error: unsupported color space\n");
-        return -1;
-        break;
-    }
-
-    width = jas_image_cmptwidth(image, enc->cmpts[0]);
-    height = jas_image_cmptheight(image, enc->cmpts[0]);
-    depth = jas_image_cmptprec(image, enc->cmpts[0]);
-
-    for (cmptno = 0; cmptno < enc->numcmpts; ++cmptno) {
-        if (jas_image_cmptwidth(image, enc->cmpts[cmptno]) != width ||
-          jas_image_cmptheight(image, enc->cmpts[cmptno]) != height ||
-          jas_image_cmptprec(image, enc->cmpts[cmptno]) != depth ||
-          jas_image_cmptsgnd(image, enc->cmpts[cmptno]) != false ||
-          jas_image_cmpttlx(image, enc->cmpts[cmptno]) != 0 ||
-          jas_image_cmpttly(image, enc->cmpts[cmptno]) != 0) {
-            jas_eprintf("The RAS format cannot be used to represent an image with this geometry.\n");
-            return -1;
-        }
-    }
-
-    /* Ensure that the image can be encoded in the desired format. */
-    if (enc->numcmpts == 3) {
-
-        /* All three components must have the same subsampling
-          factor and have a precision of eight bits. */
-        if (enc->numcmpts > 1) {
-            for (i = 0; i < enc->numcmpts; ++i) {
-                if (jas_image_cmptprec(image, enc->cmpts[i]) != 8) {
-                    return -1;
-                }
-            }
-        }
-    } else if (enc->numcmpts == 1) {
-        /* NOP */
-    } else {
-        return -1;
-    }
-
-    hdr.magic = RAS_MAGIC;
-    hdr.width = width;
-    hdr.height = height;
-    hdr.depth = (enc->numcmpts == 3) ? 24 : depth;
-
-    rowsize = RAS_ROWSIZE(&hdr);
-    hdr.length = rowsize * hdr.height;
-    hdr.type = RAS_TYPE_STD;
-
-    hdr.maptype = RAS_MT_NONE;
-    hdr.maplength = 0;
-
-    if (ras_puthdr(out, &hdr)) {
-        return -1;
-    }
-
-    if (ras_putdata(out, &hdr, image, enc->numcmpts, enc->cmpts)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int ras_putdata(jas_stream_t *out, ras_hdr_t *hdr, jas_image_t *image, int numcmpts, int *cmpts)
-{
-    int ret;
-
-    switch (hdr->type) {
-    case RAS_TYPE_STD:
-        ret = ras_putdatastd(out, hdr, image, numcmpts, cmpts);
-        break;
-    default:
-        ret = -1;
-        break;
-    }
-    return ret;
-}
-
-static int ras_putdatastd(jas_stream_t *out, ras_hdr_t *hdr, jas_image_t *image,  int numcmpts, int *cmpts)
-{
-    int rowsize;
-    int pad;
-    unsigned int z;
-    int nz;
-    int c;
-    int x;
-    int y;
-    int v;
-    jas_matrix_t *data[3];
-    int i;
-
-    for (i = 0; i < numcmpts; ++i) {
-        data[i] = jas_matrix_create(jas_image_height(image), jas_image_width(image));
-        assert(data[i]);
-    }
-
-    rowsize = RAS_ROWSIZE(hdr);
-    pad = rowsize - (hdr->width * hdr->depth + 7) / 8;
-
-    hdr->length = hdr->height * rowsize;
-
-    for (y = 0; y < hdr->height; y++) {
-        for (i = 0; i < numcmpts; ++i) {
-            jas_image_readcmpt(image, cmpts[i], 0, y, jas_image_width(image),
-              1, data[i]);
-        }
-        z = 0;
-        nz = 0;
-        for (x = 0; x < hdr->width; x++) {
-            z <<= hdr->depth;
-            if (RAS_ISRGB(hdr)) {
-                v = RAS_RED((jas_matrix_getv(data[0], x))) |
-                  RAS_GREEN((jas_matrix_getv(data[1], x))) |
-                  RAS_BLUE((jas_matrix_getv(data[2], x)));
-            } else {
-                v = (jas_matrix_getv(data[0], x));
-            }
-            z |= v & RAS_ONES(hdr->depth);
-            nz += hdr->depth;
-            while (nz >= 8) {
-                c = (z >> (nz - 8)) & 0xff;
-                if (jas_stream_putc(out, c) == EOF) {
-                    return -1;
-                }
-                nz -= 8;
-                z &= RAS_ONES(nz);
-            }
-        }
-        if (nz > 0) {
-            c = (z >> (8 - nz)) & RAS_ONES(nz);
-            if (jas_stream_putc(out, c) == EOF) {
-                return -1;
-            }
-        }
-        if (pad % 2) {
-            if (jas_stream_putc(out, 0) == EOF) {
-                return -1;
-            }
-        }
-    }
-
-    for (i = 0; i < numcmpts; ++i) {
-        jas_matrix_destroy(data[i]);
-    }
-
-    return 0;
-}
-
-static int ras_puthdr(jas_stream_t *out, ras_hdr_t *hdr)
-{
-    if (ras_putint(out, RAS_MAGIC) || ras_putint(out, hdr->width) ||
-      ras_putint(out, hdr->height) || ras_putint(out, hdr->depth) ||
-      ras_putint(out, hdr->length) || ras_putint(out, hdr->type) ||
-      ras_putint(out, hdr->maptype) || ras_putint(out, hdr->maplength)) {
-        return -1;
-    }
-
-    return 0;
-}
-
-static int ras_putint(jas_stream_t *out, int val)
-{
-    int x;
-    int i;
-    int c;
-
-    x = val;
-    for (i = 0; i < 4; i++) {
-        c = (x >> 24) & 0xff;
-        if (jas_stream_putc(out, c) == EOF) {
-            return -1;
-        }
-        x <<= 8;
-    }
-
-    return 0;
-}
diff --git a/src/3rdparty/jasper/src/libjasper/ras/ras_enc.h b/src/3rdparty/jasper/src/libjasper/ras/ras_enc.h
deleted file mode 100644
index 537bc99..0000000
--- a/src/3rdparty/jasper/src/libjasper/ras/ras_enc.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2002 Michael David Adams.
- * All rights reserved.
- */
-
-/* __START_OF_JASPER_LICENSE__
- *
- * JasPer License Version 2.0
- *
- * Copyright (c) 2001-2006 Michael David Adams
- * Copyright (c) 1999-2000 Image Power, Inc.
- * Copyright (c) 1999-2000 The University of British Columbia
- *
- * All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person (the
- * "User") obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, and/or sell copies of the Software, and to permit
- * persons to whom the Software is furnished to do so, subject to the
- * following conditions:
- *
- * 1.  The above copyright notices and this permission notice (which
- * includes the disclaimer below) shall be included in all copies or
- * substantial portions of the Software.
- *
- * 2.  The name of a copyright holder shall not be used to endorse or
- * promote products derived from the Software without specific prior
- * written permission.
- *
- * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS
- * LICENSE.  NO USE OF THE SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
- * THIS DISCLAIMER.  THE SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS
- * "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.  IN NO
- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  NO ASSURANCES ARE
- * PROVIDED BY THE COPYRIGHT HOLDERS THAT THE SOFTWARE DOES NOT INFRINGE
- * THE PATENT OR OTHER INTELLECTUAL PROPERTY RIGHTS OF ANY OTHER ENTITY.
- * EACH COPYRIGHT HOLDER DISCLAIMS ANY LIABILITY TO THE USER FOR CLAIMS
- * BROUGHT BY ANY OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL
- * PROPERTY RIGHTS OR OTHERWISE.  AS A CONDITION TO EXERCISING THE RIGHTS
- * GRANTED HEREUNDER, EACH USER HEREBY ASSUMES SOLE RESPONSIBILITY TO SECURE
- * ANY OTHER INTELLECTUAL PROPERTY RIGHTS NEEDED, IF ANY.  THE SOFTWARE
- * IS NOT FAULT-TOLERANT AND IS NOT INTENDED FOR USE IN MISSION-CRITICAL
- * SYSTEMS, SUCH AS THOSE USED IN THE OPERATION OF NUCLEAR FACILITIES,
- * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL
- * SYSTEMS, DIRECT LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH
- * THE FAILURE OF THE SOFTWARE OR SYSTEM COULD LEAD DIRECTLY TO DEATH,
- * PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE ("HIGH
- * RISK ACTIVITIES").  THE COPYRIGHT HOLDERS SPECIFICALLY DISCLAIM ANY
- * EXPRESS OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.
- *
- * __END_OF_JASPER_LICENSE__
- */
-
-#ifndef RAS_ENC_H
-#define RAS_ENC_H
-
-typedef struct {
-    int numcmpts;
-    int cmpts[4];
-} ras_enc_t;
-
-#endif
diff --git a/src/imageformats/doc/src/qtimageformats.qdoc b/src/imageformats/doc/src/qtimageformats.qdoc
index c7c4d21..48b76c8 100644
--- a/src/imageformats/doc/src/qtimageformats.qdoc
+++ b/src/imageformats/doc/src/qtimageformats.qdoc
@@ -53,7 +53,7 @@ libraries. If not found, it may fall back on using a bundled copy (in
 \table
 \header \li Format \li Description                      \li Support      \li 3rd Party Codec
 \row    \li ICNS   \li Apple Icon Image                 \li Read/write   \li No
-\row    \li JP2    \li Joint Photographic Experts Group 2000 \li Read/write   \li Yes (bundled, unmaintained)
+\row    \li JP2    \li Joint Photographic Experts Group 2000 \li Read/write   \li Yes (Not bundled)
 \row    \li MNG    \li Multiple-image Network Graphics  \li Read         \li Yes (Not bundled)
 \row    \li TGA    \li Truevision Graphics Adapter      \li Read         \li No
 \row    \li TIFF   \li Tagged Image File Format         \li Read/write   \li Yes (bundled)
diff --git a/src/plugins/imageformats/jp2/jp2.pro b/src/plugins/imageformats/jp2/jp2.pro
index 89b9c55..4caeff3 100644
--- a/src/plugins/imageformats/jp2/jp2.pro
+++ b/src/plugins/imageformats/jp2/jp2.pro
@@ -1,9 +1,13 @@
 TARGET  = qjp2
 
-include(qjp2handler.pri)
-SOURCES += main.cpp
+HEADERS += qjp2handler_p.h
+SOURCES += main.cpp \
+           qjp2handler.cpp
 OTHER_FILES += jp2.json
 
+msvc: LIBS += libjasper.lib
+else: LIBS += -ljasper
+
 PLUGIN_TYPE = imageformats
 PLUGIN_CLASS_NAME = QJp2Plugin
 load(qt_plugin)
diff --git a/src/plugins/imageformats/jp2/qjp2handler.pri b/src/plugins/imageformats/jp2/qjp2handler.pri
deleted file mode 100644
index 539daaa..0000000
--- a/src/plugins/imageformats/jp2/qjp2handler.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-# common to plugin and built-in forms
-INCLUDEPATH *= $$PWD
-HEADERS += $$PWD/qjp2handler_p.h
-SOURCES += $$PWD/qjp2handler.cpp
-config_jasper {
-    msvc: LIBS += libjasper.lib
-    else: LIBS += -ljasper
-} else {
-    include($$PWD/../../../3rdparty/jasper.pri)
-}