Fix PNG detection in CMake

Fix -revert in tests
Fix djpeg tests
2025-06-23 18:05:19 +01:00 · 2025-01-04 02:11:32 +00:00 · 2025-01-04 00:52:39 +00:00 · 2025-01-04 00:48:50 +00:00 · 2025-01-04 00:38:01 +00:00 · 2025-01-04 00:37:38 +00:00
500 changed files with 63974 additions and 21242 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,3 +2,4 @@
 /.gitattributes export-ignore
 /.github export-ignore
 *.ppm binary
 /ChangeLog.md conflict-marker-size=8
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,95 +0,0 @@
 Contributing to libjpeg-turbo
 =============================
 libjpeg-turbo is a stable and mature product with a worldwide reach, it is an
 ISO/ITU-T reference implementation of the JPEG standard, and its maintainer
 does not earn a salary for maintaining it.  Thus, not every code contribution
 can or will be accepted into the libjpeg-turbo code base.  In order to maximize
 the chances that a code contribution is acceptable, please adhere to the
 following guidelines:
 1. If the code contribution is a bug fix, then please ensure that enough
 information is provided so that the maintainer can readily reproduce and
 document the bug.  That information should include:
    - A clear and concise description of the bug
    - The steps and (if applicable) images necessary to reproduce the bug
    - The compilers, operating systems, and CPUs with which the bug was
      observed
    - The versions of libjpeg-turbo with which the bug was observed
    - If the bug is a regression, the specific commit that introduced the bug
      (use `git bisect` to determine this)
 2. If the code contribution will implement a major new feature, then please
 contact the project maintainer (through a
 [GitHub issue](https://github.com/libjpeg-turbo/libjpeg-turbo/issues/new),
 [direct e-mail](https://libjpeg-turbo.org/About/Contact), or the
 [libjpeg-turbo-devel mailing list](https://libjpeg-turbo.org/About/MailingLists))
 prior to implementing the feature.  In general, major new features that are
 potentially disruptive to the quality of libjpeg-turbo are unlikely to be
 accepted unless:
    - The new feature is within the existing scope of libjpeg-turbo.
    - The new feature has been thoroughly regression tested and benchmarked on
      all of the supported platforms that are potentially affected by it.
    - The new feature has been documented clearly and concisely in the change
      log and (if applicable) the libjpeg and TurboJPEG API documentation and
      man pages.
    - The code implementing the new feature is formatted consistently with the
      rest of the libjpeg-turbo code base (use
      [checkstyle](https://github.com/libjpeg-turbo/checkstyle) to validate
      this.)
    - The new feature does not introduce new members into the exposed libjpeg
      API structures (doing so would break backward ABI compatibility.)
    - The new feature does not alter existing libjpeg-turbo usage or
      development workflows.
    - The code implementing the new feature is elegant, easily maintainable,
      and causes the least possible amount of disruption to the libjpeg-turbo
      code base.
    - The new feature is based on the dev branch of the libjpeg-turbo
      repository.
    ... OR ...
    - Your organization is prepared to pay for the labor necessary to ensure
      all of the above.  Even the most well-written patches can still require
      a significant amount of labor to clean up, test, and integrate.  (See
      above RE: the maintainer not earning a salary.)
    Specific types of features that *will not* be accepted:
    - Features that extend the scope of libjpeg-turbo to support image formats
      other than DCT-based JPEG and JFIF
    - Features that extend the scope of libjpeg-turbo to support image
      processing algorithms that are not necessary for JPEG compression or
      decompression
    - Extensions to the JPEG format that have not been approved by the
      appropriate standards bodies
    - Non-trivial performance enhancements that have less than a 5% overall
      impact on performance
 3. If the code contribution is a build system enhancement, then please be
 prepared to justify the enhancement.  In general, build system enhancements
 are unlikely to be accepted unless:
    - The enhancement is potentially beneficial to a significant number of
      upstream libjpeg-turbo users/developers.  (If the enhancement is only
      beneficial to a downstream project, then it does not belong here.)
    - The enhancement has been tested with the following CMake versions:
        - The earliest version of CMake that libjpeg-turbo currently supports
          (refer to CMakeLists.txt)
        - The most recent major version of CMake
        - (if applicable) The earliest version of CMake with which the
          enhancement can be used
    - The enhancement has been tested on all of the major platforms (Mac,
      Linux, Windows/Visual C++, Windows/MinGW) that are potentially affected
      by it.
    - The enhancement does not introduce new build system requirements or CMake
      variables unless absolutely necessary.
    - The enhancement does not alter existing libjpeg-turbo development
      workflows.
    Specific types of build system enhancements that *will not* be accepted:
    - Enhancements that allow libjpeg-turbo to be built from a subdirectory
      of a downstream repository.  These enhancements are not maintainable in
      the upstream libjpeg-turbo build system.  Use the CMake
      `ExternalProject_Add()` function instead.
    - Enhancements that introduce new (non-CMake-based) build systems
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
 github: libjpeg-turbo
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -1,40 +0,0 @@
 ---
 name: Bug Report
 about: Inform the libjpeg-turbo maintainer about unexpected, reproducible behavior
 title: ''
 labels: bug
 assignees: dcommander
 ---
 **Have you searched the existing issues (both open and closed) in the libjpeg-turbo issue tracker to ensure that this bug report is not a duplicate?**
 **Does this bug report describe one of the [two known and unsolvable issues with the JPEG format](https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf)?**
 **Clear and concise description of the bug:**
 **Steps to reproduce the bug (using *only* libjpeg-turbo):**
 **Image(s) needed in order to reproduce the bug (if applicable):**
 **Expected behavior:**
 **Observed behavior:**
 **Platform(s) (compiler version, operating system version, CPU) on which the bug was observed:**
 **libjpeg-turbo release(s), commit(s), or branch(es) in which the bug was observed (always test the tip of the main branch or the latest [stable pre-release](https://libjpeg-turbo.org/DeveloperInfo/PreReleases) to verify that the bug hasn't already been fixed):**
 **If the bug is a regression, the specific commit that introduced the regression (use `git bisect` to determine this):**
 **Additional information:**
--- a/.github/ISSUE_TEMPLATE/feature-request.md
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -1,8 +0,0 @@
 ---
 name: Feature Request
 about: Suggest new libjpeg-turbo functionality
 title: ''
 labels: enhancement
 assignees: dcommander
 ---
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -0,0 +1,8 @@
 **Complete description of the bug fix or feature that this pull request implements**
 **Checklist before submitting the pull request, to maximize the chances that the pull request will be accepted**
 - [ ] Read CONTRIBUTING.md, a link to which appears under "Helpful resources" below.  That document discusses general guidelines for contributing to libjpeg-turbo, as well as the types of contributions that will not be accepted or are unlikely to be accepted.
 - [ ] Search the existing issues and pull requests (both open and closed) to ensure that a similar request has not already been submitted and rejected.
 - [ ] Discuss the proposed bug fix or feature in a GitHub issue, through direct e-mail with the project maintainer, or on the libjpeg-turbo-devel mailing list.
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,193 +0,0 @@
 name: Build
 on:
  push:
    branches:
      - '**'
    tags-ignore:
      - '**'
  pull_request:
  workflow_dispatch:
 jobs:
  linux:
    runs-on: ubuntu-latest
    steps:
      - name: Set global environment variables
        run: |
          echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV
      - name: Check out code
        uses: actions/checkout@v2
      - name: Set up build
        run: |
          mkdir -p $HOME/src/ljt.nightly
          docker pull dcommander/buildljt:$BRANCH
          git clone --depth=1 https://github.com/libjpeg-turbo/buildscripts.git -b $BRANCH $HOME/src/buildscripts
          mkdir $HOME/rpmkeys
          wget --no-check-certificate "http://www.libjpeg-turbo.org/key/LJTPR-GPG-KEY" -O $HOME/rpmkeys/LJTPR-GPG-KEY
      - name: Configure GPG signing
        if: ${{github.event_name != 'pull_request'}}
        run: |
          sudo apt install -y gnupg1
          printf "${{secrets.GPG_KEY}}" | base64 --decode | gpg1 --batch --import -
          chmod 600 $HOME/.gnupg/gpg.conf
          echo "GPG_KEY_NAME=\"${{secrets.GPG_KEY_NAME}}\"" >$HOME/src/buildscripts/gpgsign
          echo "GPG_KEY_ID=${{secrets.GPG_KEY_ID}}" >>$HOME/src/buildscripts/gpgsign
          echo "GPG_KEY_PASS=${{secrets.GPG_KEY_PASS}}" >>$HOME/src/buildscripts/gpgsign
      - name: Build
        run: |
          docker run -v $HOME/src/ljt.nightly:/root/src/ljt.nightly -v $HOME/src/buildscripts:/root/src/buildscripts -v $GITHUB_WORKSPACE:/root/src/libjpeg-turbo -v $HOME/.gnupg:/root/.gnupg -v $HOME/rpmkeys:/rpmkeys -t dcommander/buildljt:$BRANCH bash -c "rpm --import /rpmkeys/LJTPR-GPG-KEY && ~/src/buildscripts/buildljt -d /root/src/libjpeg-turbo -v"
          sudo chown -R runner:runner $HOME/src/ljt.nightly
          mv $HOME/src/ljt.nightly/latest/log-${{github.job}}.txt $HOME/src/ljt.nightly/latest/files/
      - name: Configure AWS
        if: ${{github.event_name != 'pull_request'}}
        uses: aws-actions/configure-aws-credentials@v1
        with:
          aws-access-key-id: ${{secrets.AWS_ACCESS_KEY_ID}}
          aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY}}
          aws-region: ${{secrets.AWS_REGION}}
      - name: Deploy
        if: ${{github.event_name != 'pull_request'}}
        run: |
          aws s3 sync --acl public-read --delete $HOME/src/ljt.nightly/latest/files/ s3://libjpeg-turbo-pr/${{env.BRANCH}}/${{github.job}}/
  macos:
    runs-on: macos-10.15
    steps:
      - name: Set global environment variables
        run: |
          echo "BRANCH=${GITHUB_BASE_REF:-${GITHUB_REF#refs/heads/}}" >$GITHUB_ENV
      - name: Check out code
        uses: actions/checkout@v2
      - name: Set up build
        run: |
          brew install yasm md5sha1sum
          mkdir -p $HOME/src/ljt.nightly
          git clone --depth=1 https://github.com/libjpeg-turbo/buildscripts.git -b $BRANCH $HOME/src/buildscripts
      - name: Configure GPG signing
        if: ${{github.event_name != 'pull_request'}}
        run: |
          printf "${{secrets.GPG_KEY}}" | base64 --decode | gpg --batch --import -
          echo "GPG_KEY_NAME=\"${{secrets.GPG_KEY_NAME}}\"" >$HOME/src/buildscripts/gpgsign
          echo "GPG_KEY_ID=${{secrets.GPG_KEY_ID}}" >>$HOME/src/buildscripts/gpgsign
          echo "GPG_KEY_PASS=${{secrets.GPG_KEY_PASS}}" >>$HOME/src/buildscripts/gpgsign
      - name: Build
        run: |
          $HOME/src/buildscripts/buildljt -d $GITHUB_WORKSPACE -v
          mv $HOME/src/ljt.nightly/latest/log-${{github.job}}.txt $HOME/src/ljt.nightly/latest/files/
      - name: Configure AWS
        if: ${{github.event_name != 'pull_request'}}
        uses: aws-actions/configure-aws-credentials@v1
        with:
          aws-access-key-id: ${{secrets.AWS_ACCESS_KEY_ID}}
          aws-secret-access-key: ${{secrets.AWS_SECRET_ACCESS_KEY}}
          aws-region: ${{secrets.AWS_REGION}}
      - name: Deploy
        if: ${{github.event_name != 'pull_request'}}
        run: |
          aws s3 sync --acl public-read --delete $HOME/src/ljt.nightly/latest/files/ s3://libjpeg-turbo-pr/${{env.BRANCH}}/${{github.job}}/
  linux-asan-ubsan:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v2
      - name: Set up build
        run: |
          sudo apt install -y nasm
      - name: Build
        env:
          ASAN_OPTIONS: "detect_leaks=1 symbolize=1"
          CTEST_OUTPUT_ON_FAILURE: 1
        run: |
          mkdir build
          pushd build
          cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O1 -g -fsanitize=address,undefined -fno-sanitize-recover=all -fno-omit-frame-pointer" -DENABLE_SHARED=0 ..
          export NUMCPUS=`grep -c '^processor' /proc/cpuinfo`
          make -j$NUMCPUS --load-average=$NUMCPUS
          make test
          JSIMD_FORCESSE2=1 make test
          cmake -DFLOATTEST=no-fp-contract ..
          JSIMD_FORCENONE=1 make test
          popd
  linux-12bit:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v2
      - name: Build
        env:
          CTEST_OUTPUT_ON_FAILURE: 1
        run: |
          mkdir build
          pushd build
          cmake -G"Unix Makefiles" -DWITH_12BIT=1 \
            -DCMAKE_C_FLAGS='--std=gnu90 -Wall -Werror -Wextra -Wpedantic -pedantic-errors -Wdouble-promotion -Wformat-overflow=2 -Wformat-security -Wformat-signedness -Wformat-truncation=2 -Wformat-y2k -Wmissing-include-dirs -Wshift-overflow=2 -Wswitch-bool -Wno-unused-parameter -Wuninitialized -Wstrict-overflow=2 -Wstringop-overflow=4 -Wstringop-truncation -Wduplicated-branches -Wduplicated-cond -Wdeclaration-after-statement -Wshadow -Wunsafe-loop-optimizations -Wundef -Wcast-align -Wno-clobbered -Wjump-misses-init -Wno-sign-compare -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wdisabled-optimization -Wno-overlength-strings' \
            ..
          export NUMCPUS=`grep -c '^processor' /proc/cpuinfo`
          make -j$NUMCPUS --load-average=$NUMCPUS
          make test
          popd
  linux-jpeg7-x32:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v2
      - name: Set up build
        run: |
          sudo apt update
          sudo apt -y --install-recommends install libc6-dev-x32 nasm
      - name: Build
        env:
          CTEST_OUTPUT_ON_FAILURE: 1
        run: |
          mkdir build
          pushd build
          cmake -G"Unix Makefiles" -DWITH_JPEG7=1 -DCMAKE_C_FLAGS=-mx32 \
            -DCMAKE_C_FLAGS='--std=gnu90 -Wall -Werror -Wextra -Wpedantic -pedantic-errors -Wdouble-promotion -Wformat-overflow=2 -Wformat-security -Wformat-signedness -Wformat-truncation=2 -Wformat-y2k -Wmissing-include-dirs -Wshift-overflow=2 -Wswitch-bool -Wno-unused-parameter -Wuninitialized -Wstrict-overflow=2 -Wstringop-overflow=4 -Wstringop-truncation -Wduplicated-branches -Wduplicated-cond -Wdeclaration-after-statement -Wshadow -Wunsafe-loop-optimizations -Wundef -Wcast-align -Wno-clobbered -Wjump-misses-init -Wno-sign-compare -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wdisabled-optimization -Wno-overlength-strings' \
            ..
          export NUMCPUS=`grep -c '^processor' /proc/cpuinfo`
          make -j$NUMCPUS --load-average=$NUMCPUS
          make test
          JSIMD_FORCESSE2=1 make test
          cmake -DFLOATTEST=no-fp-contract ..
          JSIMD_FORCENONE=1 make test
          popd
  linux-jpeg8:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v2
      - name: Set up build
        run: |
          sudo apt -y install nasm
      - name: Build
        env:
          CTEST_OUTPUT_ON_FAILURE: 1
        run: |
          mkdir build
          pushd build
          cmake -G"Unix Makefiles" -DWITH_JPEG8=1 \
            -DCMAKE_C_FLAGS='--std=gnu90 -Wall -Werror -Wextra -Wpedantic -pedantic-errors -Wdouble-promotion -Wformat-overflow=2 -Wformat-security -Wformat-signedness -Wformat-truncation=2 -Wformat-y2k -Wmissing-include-dirs -Wshift-overflow=2 -Wswitch-bool -Wno-unused-parameter -Wuninitialized -Wstrict-overflow=2 -Wstringop-overflow=4 -Wstringop-truncation -Wduplicated-branches -Wduplicated-cond -Wdeclaration-after-statement -Wshadow -Wunsafe-loop-optimizations -Wundef -Wcast-align -Wno-clobbered -Wjump-misses-init -Wno-sign-compare -Wlogical-op -Waggregate-return -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Wpacked -Wredundant-decls -Wnested-externs -Winline -Wno-long-long -Wdisabled-optimization -Wno-overlength-strings' \
            ..
          export NUMCPUS=`grep -c '^processor' /proc/cpuinfo`
          make -j$NUMCPUS --load-average=$NUMCPUS
          make test
          JSIMD_FORCESSE2=1 make test
          cmake -DFLOATTEST=no-fp-contract ..
          JSIMD_FORCENONE=1 make test
          popd
  linux-msan:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code
        uses: actions/checkout@v2
      - name: Build
        env:
          CTEST_OUTPUT_ON_FAILURE: 1
        run: |
          mkdir build
          pushd build
          cmake -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=clang -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3 -g -fsanitize=memory -fno-sanitize-recover=all -fPIE" -DWITH_SIMD=0 ..
          export NUMCPUS=`grep -c '^processor' /proc/cpuinfo`
          make -j$NUMCPUS --load-average=$NUMCPUS
          make test
          popd
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,48 @@
 .DS_Store
 Makefile.in
 Makefile
 /CMakeFiles
 /autom4te.cache
 /aclocal.m4
 /compile
 /configure
 /depcomp
 /install-sh
 /libtool
 /missing
 /stamp-h*
 /java/classnoinst.stamp
 /pkgscripts/
 /jconfig.h
 /jconfigint.h
 /config.guess
 /config.h
 /config.h.in
 /config.log
 /config.status
 /config.sub
 /ltmain.sh
 /ar-lib
 /libjpeg.map
 /.libs/
 /simd/.libs/
 /simd/jsimdcfg.inc
 *.o
 *.lo
 *.la
 /cjpeg
 /djpeg
 /jcstest
 /jpegtran
 /jpegyuv
 /md5/md5cmp
 /rdjpgcom
 /test_enc_*
 /tjbench
 /tjbenchtest
 /tjunittest
 /wrjpgcom
 /yuvjpeg
 test_yuv*.jpg
 CMakeCache.txt
 CTestTestfile.cmake
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -8,14 +8,16 @@ Build Requirements
 ### All Systems
- [CMake](http://www.cmake.org) v2.8.12 or later
+- [CMake](https://cmake.org) v2.8.12 or later
- [NASM](http://www.nasm.us) or [Yasm](http://yasm.tortall.net)
+- [NASM](https://nasm.us) or [Yasm](https://yasm.tortall.net)
  (if building x86 or x86-64 SIMD extensions)
  * If using NASM, 2.13 or later is required.
  * If using Yasm, 1.2.0 or later is required.
  * NASM 2.15 or later is required if building libjpeg-turbo with Intel
    Control-flow Enforcement Technology (CET) support.
  * If building on macOS, NASM or Yasm can be obtained from
-    [MacPorts](http://www.macports.org/) or [Homebrew](http://brew.sh/).
+    [MacPorts](https://macports.org) or [Homebrew](https://brew.sh).
     - NOTE: Currently, if it is desirable to hide the SIMD function symbols in
       Mac executables or shared libraries that statically link with
       libjpeg-turbo, then NASM 2.14 or later or Yasm must be used when
@@ -25,9 +27,9 @@ Build Requirements
    variable or the `ASM_NASM` environment variable.  On Windows, use forward
    slashes rather than backslashes in the path (for example,
    **c:/nasm/nasm.exe**).
-  * NASM and Yasm are located in the CRB (Code Ready Builder) repository on
+  * NASM and Yasm are located in the CRB (Code Ready Builder) or PowerTools
-    Red Hat Enterprise Linux 8 and in the PowerTools repository on RHEL
+    repository on Red Hat Enterprise Linux 8+ and derivatives, which is not
-    derivatives, which is not enabled by default.
+    enabled by default.
 ### Un*x Platforms (including Linux, Mac, FreeBSD, Solaris, and Cygwin)
@@ -37,7 +39,7 @@ Build Requirements
  required.  Most modern Linux distributions, as well as Solaris 10 and later,
  include JDK or OpenJDK.  For other systems, you can obtain the Oracle Java
  Development Kit from
-  <http://www.oracle.com/technetwork/java/javase/downloads>.
+  <https://oracle.com/java/technologies/downloads>.
  * If using JDK 11 or later, CMake 3.10.x or later must also be used.
@@ -62,19 +64,38 @@ Build Requirements
    cannot be used with earlier versions of Visual C++, and vice versa.
  * The libjpeg API DLL (**jpeg{version}.dll**) will depend on the C run-time
    DLLs corresponding to the version of Visual C++ that was used to build it.
 - Vcpkg
  You need to download and install libpng using the [vcpkg](https://github.com/Microsoft/vcpkg) dependency manager:
      git clone https://github.com/Microsoft/vcpkg.git
      cd vcpkg
      ./bootstrap-vcpkg.bat
      ./vcpkg integrate install
      ./vcpkg install libpng:x64-windows
      ./vcpkg install libpng:x64-windows-static
  Actually, you can just download and install MozJPEG using vcpkg dependency manager:
      ./vcpkg install mozjpeg
  The mozjpeg port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
   ... OR ...
 - MinGW
-  [MSYS2](http://msys2.github.io/) or [tdm-gcc](http://tdm-gcc.tdragon.net/)
+  [MSYS2](https://msys2.org) or [tdm-gcc](https://jmeubank.github.io/tdm-gcc)
  recommended if building on a Windows machine.  Both distributions install a
  Start Menu link that can be used to launch a command prompt with the
  appropriate compiler paths automatically set.
 - If building the TurboJPEG Java wrapper, JDK 1.5 or later is required.  This
  can be downloaded from
-  <http://www.oracle.com/technetwork/java/javase/downloads>.
+  <https://oracle.com/java/technologies/downloads>.
  * If using JDK 11 or later, CMake 3.10.x or later must also be used.
@@ -288,15 +309,6 @@ API/ABI-compatible with libjpeg v8.  See [README.md](README.md) for more
 information about libjpeg v7 and v8 emulation.
 ### In-Memory Source/Destination Managers
 When using libjpeg v6b or v7 API/ABI emulation, add `-DWITH_MEM_SRCDST=0` to
 the CMake command line to build a version of libjpeg-turbo that lacks the
 `jpeg_mem_src()` and `jpeg_mem_dest()` functions.  These functions were not
 part of the original libjpeg v6b and v7 APIs, so removing them ensures strict
 conformance with those APIs.  See [README.md](README.md) for more information.
 ### Arithmetic Coding Support
 Since the patent on arithmetic coding has expired, this functionality has been
@@ -372,9 +384,13 @@ located (usually **/usr/bin**.)  Next, execute the following commands:
    cd {build_directory}
    cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
      -DCMAKE_INSTALL_PREFIX={install_path} \
      [additional CMake flags] {source_directory}
    make
 *{install\_path}* is the path under which the libjpeg-turbo binaries should be
 installed.
 ### 64-bit MinGW Build on Un*x (including Mac and Cygwin)
@@ -391,9 +407,13 @@ located (usually **/usr/bin**.)  Next, execute the following commands:
    cd {build_directory}
    cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
      -DCMAKE_INSTALL_PREFIX={install_path} \
      [additional CMake flags] {source_directory}
    make
 *{install\_path}* is the path under which the libjpeg-turbo binaries should be
 installed.
 Building libjpeg-turbo for iOS
 ------------------------------
@@ -414,27 +434,27 @@ iPhone 5S/iPad Mini 2/iPad Air and newer.
    IOS_PLATFORMDIR=/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform
    IOS_SYSROOT=($IOS_PLATFORMDIR/Developer/SDKs/iPhoneOS*.sdk)
-    export CFLAGS="-Wall -arch arm64 -miphoneos-version-min=8.0 -funwind-tables"
+    export CFLAGS="-Wall -miphoneos-version-min=8.0 -funwind-tables"
    cd {build_directory}
-    cat <<EOF >toolchain.cmake
+    cmake -G"Unix Makefiles" \
-    set(CMAKE_SYSTEM_NAME Darwin)
+      -DCMAKE_C_COMPILER=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang \
-    set(CMAKE_SYSTEM_PROCESSOR aarch64)
+      -DCMAKE_OSX_ARCHITECTURES=arm64 \
    set(CMAKE_C_COMPILER /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang)
    EOF
    cmake -G"Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain.cmake \
      -DCMAKE_OSX_SYSROOT=${IOS_SYSROOT[0]} \
      [additional CMake flags] {source_directory}
    make
 Replace `iPhoneOS` with `iPhoneSimulator` and `-miphoneos-version-min` with
 `-miphonesimulator-version-min` to build libjpeg-turbo for the iOS simulator on
 Macs with Apple silicon CPUs.
 Building libjpeg-turbo for Android
 ----------------------------------
 Building libjpeg-turbo for Android platforms requires v13b or later of the
-[Android NDK](https://developer.android.com/tools/sdk/ndk).
+[Android NDK](https://developer.android.com/ndk).
 ### Armv7 (32-bit)
@@ -602,15 +622,6 @@ brackets, then its final value will depend on the final value of that other
 variable.  For instance, the default value of `CMAKE_INSTALL_MANDIR` is
 **\<CMAKE\_INSTALL\_DATAROOTDIR\>/man**.
 NOTE: If setting one of these directory variables to a relative path using the
 CMake command line, you must specify that the variable is of type `PATH`.
 For example:
    cmake -G"{generator type}" -DCMAKE_INSTALL_LIBDIR:PATH=lib {source_directory}
 Otherwise, CMake will assume that the path is relative to the build directory
 rather than the install directory.
 Creating Distribution Packages
 ==============================
@@ -647,18 +658,19 @@ are installed by default on OS X/macOS 10.7 and later.
 In order to create a Mac package/disk image that contains universal
 x86-64/Arm binaries, set the following CMake variable:
-* `ARMV8_BUILD`: Directory containing an Armv8 (64-bit) iOS or macOS build of
+* `SECONDARY_BUILD`: Directory containing a cross-compiled x86-64 or Armv8
-  libjpeg-turbo to include in the universal binaries
+  (64-bit) iOS or macOS build of libjpeg-turbo to include in the universal
  binaries
-You should first use CMake to configure an Armv8 sub-build of libjpeg-turbo
+You should first use CMake to configure the cross-compiled x86-64 or Armv8
-(see "Building libjpeg-turbo for iOS" above, if applicable) in a build
+secondary build of libjpeg-turbo (see "Building libjpeg-turbo for iOS" above,
-directory that matches the one specified in the aforementioned CMake variable.
+if applicable) in a build directory that matches the one specified in the
-Next, configure the primary (x86-64) build of libjpeg-turbo as an out-of-tree
+aforementioned CMake variable.  Next, configure the primary (native) build of
-build, specifying the aforementioned CMake variable, and build it.  Once the
+libjpeg-turbo as an out-of-tree build, specifying the aforementioned CMake
-primary build has been built, run `make dmg` from the build directory.  The
+variable, and build it.  Once the primary build has been built, run `make dmg`
-packaging system will build the sub-build, use lipo to combine it with the
+from the build directory.  The packaging system will build the secondary build,
-primary build into a single set of universal binaries, then package the
+use lipo to combine it with the primary build into a single set of universal
-universal binaries.
+binaries, then package the universal binaries.
 Windows
@@ -683,7 +695,7 @@ as the configuration you built (such as *{build_directory}*\Debug\ or
 *{build_directory}*\Release\).
 Building a Windows installer requires the
-[Nullsoft Install System](http://nsis.sourceforge.net/).  makensis.exe should
+[Nullsoft Install System](https://nsis.sourceforge.io).  makensis.exe should
 be in your `PATH`.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,15 @@
 # Community Participation Guidelines
 This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
 For more details, please read the
 [Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
 ## How to Report
 For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
 <!--
 ## Project Specific Etiquette
 In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
 Please update for your project.
 -->
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,7 +1,450 @@
 3.0.5
 =====
 ### Significant changes relative to 3.0.4:
 1. Fixed an issue in the TurboJPEG API whereby, when generating a
 12-bit-per-sample or 16-bit-per-sample lossless JPEG image, specifying a point
 transform value greater than 7 resulted in an error ("Parameter value out of
 range".)
 2. Fixed a regression introduced by 1.4 beta1[3] that prevented
 `jpeg_set_defaults()` from resetting the Huffman tables to default (baseline)
 values if Huffman table optimization or progressive mode was previously enabled
 in the same libjpeg instance.
 3. Fixed an issue whereby lossless JPEG compression could not be disabled if it
 was previously enabled in a libjpeg or TurboJPEG instance.
 `jpeg_set_defaults()` now disables lossless JPEG compression in a libjpeg
 instance, and setting `TJPARAM_LOSSLESS`/`TJ.PARAM_LOSSLESS` to `0` now
 disables lossless JPEG compression in a TurboJPEG instance.
 4. Hardened the libjpeg API against hypothetical calling applications that may
 erroneously change the value of the `data_precision` field in
 `jpeg_compress_struct` or `jpeg_decompress_struct` after calling
 `jpeg_start_compress()` or `jpeg_start_decompress()`.
 3.0.4
 =====
 ### Significant changes relative to 3.0.3:
 1. Fixed an issue whereby the CPU usage of the default marker processor in the
 decompressor grew exponentially with the number of markers.  This caused an
 unreasonable slow-down in `jpeg_read_header()` if an application called
 `jpeg_save_markers()` to save markers of a particular type and then attempted
 to decompress a JPEG image containing an excessive number of markers of that
 type.
 2. Hardened the default marker processor in the decompressor to guard against
 an issue (exposed by 3.0 beta2[6]) whereby attempting to decompress a
 specially-crafted malformed JPEG image (specifically an image with a complete
 12-bit-per-sample Start Of Frame segment followed by an incomplete
 8-bit-per-sample Start Of Frame segment) using buffered-image mode and input
 prefetching caused a segfault if the `fill_input_buffer()` method in the
 calling application's custom source manager incorrectly returned `FALSE` in
 response to a prematurely-terminated JPEG data stream.
 3. Fixed an issue in cjpeg whereby, when generating a 12-bit-per-sample or
 16-bit-per-sample lossless JPEG image, specifying a point transform value
 greater than 7 resulted in an error ("Invalid progressive/lossless parameters")
 unless the `-precision` option was specified before the `-lossless` option.
 4. Fixed a regression introduced by 3.0.3[3] that made it impossible for
 calling applications to generate 12-bit-per-sample arithmetic-coded lossy JPEG
 images using the TurboJPEG API.
 5. Fixed an error ("Destination buffer is not large enough") that occurred when
 attempting to generate a full-color lossless JPEG image using the TurboJPEG
 Java API's `byte[] TJCompressor.compress()` method if the value of
 `TJ.PARAM_SUBSAMP` was not `TJ.SAMP_444`.
 6. Fixed a segfault in djpeg that occurred if a negative width was specified
 with the `-crop` option.  Since the cropping region width was read into an
 unsigned 32-bit integer, a negative width was interpreted as a very large
 value.  With certain negative width and positive left boundary values, the
 bounds checks in djpeg and `jpeg_crop_scanline()` overflowed and did not detect
 the out-of-bounds width, which caused a buffer overrun in the upsampling or
 color conversion routine.  Both bounds checks now use 64-bit integers to guard
 against overflow, and djpeg now checks for negative numbers when it parses the
 crop specification from the command line.
 7. Fixed an issue whereby the TurboJPEG lossless transformation function and
 methods checked the specified cropping region against the source image
 dimensions and level of chrominance subsampling rather than the destination
 image dimensions and level of chrominance subsampling, which caused some
 cropping regions to be unduly rejected when performing 90-degree rotation,
 270-degree rotation, transposition, transverse transposition, or grayscale
 conversion.
 8. Fixed a regression, introduced by 3.0 beta2[4], that prevented the
 `tjTransform()` backward compatibility function from copying extra markers from
 the source image to the destination image.
 9. Fixed an issue whereby the TurboJPEG lossless transformation function and
 methods did not honor `TJXOPT_COPYNONE`/`TJTransform.OPT_COPYNONE` unless it
 was specified for all lossless transforms.
 3.0.3
 =====
 ### Significant changes relative to 3.0.2:
 1. Fixed an issue in the build system, introduced in 3.0.2, that caused all
 libjpeg-turbo components to depend on the Visual C++ run-time DLL when built
 with Visual C++ and CMake 3.15 or later, regardless of value of the
 `WITH_CRT_DLL` CMake variable.
 2. The x86-64 SIMD extensions now include support for Intel Control-flow
 Enforcement Technology (CET), which is enabled automatically if CET is enabled
 in the C compiler.
 3. Fixed a regression introduced by 3.0 beta2[6] that made it impossible for
 calling applications to supply custom Huffman tables when generating
 12-bit-per-component lossy JPEG images using the libjpeg API.
 4. Fixed a segfault that occurred when attempting to use the jpegtran `-drop`
 option with a specially-crafted malformed input image or drop image
 (specifically an image in which all of the scans contain fewer components than
 the number of components specified in the Start Of Frame segment.)
 3.0.2
 =====
 ### Significant changes relative to 3.0.1:
 1. Fixed a signed integer overflow in the `tj3CompressFromYUV8()`,
 `tj3DecodeYUV8()`, `tj3DecompressToYUV8()`, and `tj3EncodeYUV8()` functions,
 detected by the Clang and GCC undefined behavior sanitizers, that could be
 triggered by setting the `align` parameter to an unreasonably large value.
 This issue did not pose a security threat, but removing the warning made it
 easier to detect actual security issues, should they arise in the future.
 2. Introduced a new parameter (`TJPARAM_MAXMEMORY` in the TurboJPEG C API and
 `TJ.PARAM_MAXMEMORY` in the TurboJPEG Java API) and a corresponding TJBench
 option (`-maxmemory`) for specifying the maximum amount of memory (in
 megabytes) that will be allocated for intermediate buffers, which are used with
 progressive JPEG compression and decompression, Huffman table optimization,
 lossless JPEG compression, and lossless transformation.  The new parameter and
 option serve the same purpose as the `max_memory_to_use` field in the
 `jpeg_memory_mgr` struct in the libjpeg API, the `JPEGMEM` environment
 variable, and the cjpeg/djpeg/jpegtran `-maxmemory` option.
 3. Introduced a new parameter (`TJPARAM_MAXPIXELS` in the TurboJPEG C API and
 `TJ.PARAM_MAXPIXELS` in the TurboJPEG Java API) and a corresponding TJBench
 option (`-maxpixels`) for specifying the maximum number of pixels that the
 decompression, lossless transformation, and packed-pixel image loading
 functions/methods will process.
 4. Fixed an error ("Unsupported color conversion request") that occurred when
 attempting to decompress a 3-component lossless JPEG image without an Adobe
 APP14 marker.  The decompressor now assumes that a 3-component lossless JPEG
 image without an Adobe APP14 marker uses the RGB colorspace if its component
 IDs are 1, 2, and 3.
 3.0.1
 =====
 ### Significant changes relative to 3.0.0:
 1. The x86-64 SIMD functions now use a standard stack frame, prologue, and
 epilogue so that debuggers and profilers can reliably capture backtraces from
 within the functions.
 2. Fixed two minor issues in the interblock smoothing algorithm that caused
 mathematical (but not necessarily perceptible) edge block errors when
 decompressing progressive JPEG images exactly two DCT blocks in width or that
 use vertical chrominance subsampling.
 3. Fixed a regression introduced by 3.0 beta2[6] that, in rare cases, caused
 the C Huffman encoder (which is not used by default on x86 and Arm CPUs) to
 generate incorrect results if the Neon SIMD extensions were explicitly disabled
 at build time (by setting the `WITH_SIMD` CMake variable to `0`) in an AArch64
 build of libjpeg-turbo.
 3.0.0
 =====
 ### Significant changes relative to 3.0 beta2:
 1. The TurboJPEG API now supports 4:4:1 (transposed 4:1:1) chrominance
 subsampling, which allows losslessly transposed or rotated 4:1:1 JPEG images to
 be losslessly cropped, partially decompressed, or decompressed to planar YUV
 images.
 2. Fixed various segfaults and buffer overruns (CVE-2023-2804) that occurred
 when attempting to decompress various specially-crafted malformed
 12-bit-per-component and 16-bit-per-component lossless JPEG images using color
 quantization or merged chroma upsampling/color conversion.  The underlying
 cause of these issues was that the color quantization and merged chroma
 upsampling/color conversion algorithms were not designed with lossless
 decompression in mind.  Since libjpeg-turbo explicitly does not support color
 conversion when compressing or decompressing lossless JPEG images, merged
 chroma upsampling/color conversion never should have been enabled for such
 images.  Color quantization is a legacy feature that serves little or no
 purpose with lossless JPEG images, so it is also now disabled when
 decompressing such images.  (As a result, djpeg can no longer decompress a
 lossless JPEG image into a GIF image.)
 3. Fixed an oversight in 1.4 beta1[8] that caused various segfaults and buffer
 overruns when attempting to decompress various specially-crafted malformed
 12-bit-per-component JPEG images using djpeg with both color quantization and
 RGB565 color conversion enabled.
 4. Fixed an issue whereby `jpeg_crop_scanline()` sometimes miscalculated the
 downsampled width for components with 4x2 or 2x4 subsampling factors if
 decompression scaling was enabled.  This caused the components to be upsampled
 incompletely, which caused the color converter to read from uninitialized
 memory.  With 12-bit data precision, this caused a buffer overrun or underrun
 and subsequent segfault if the sample value read from uninitialized memory was
 outside of the valid sample range.
 5. Fixed a long-standing issue whereby the `tj3Transform()` function, when used
 with the `TJXOP_TRANSPOSE`, `TJXOP_TRANSVERSE`, `TJXOP_ROT90`, or
 `TJXOP_ROT270` transform operation and without automatic JPEG destination
 buffer (re)allocation or lossless cropping, computed the worst-case transformed
 JPEG image size based on the source image dimensions rather than the
 transformed image dimensions.  If a calling program allocated the JPEG
 destination buffer based on the transformed image dimensions, as the API
 documentation instructs, and attempted to transform a specially-crafted 4:2:2,
 4:4:0, 4:1:1, or 4:4:1 JPEG source image containing a large amount of metadata,
 the issue caused `tj3Transform()` to overflow the JPEG destination buffer
 rather than fail gracefully.  The issue could be worked around by setting
 `TJXOPT_COPYNONE`.  Note that, irrespective of this issue, `tj3Transform()`
 cannot reliably transform JPEG source images that contain a large amount of
 metadata unless automatic JPEG destination buffer (re)allocation is used or
 `TJXOPT_COPYNONE` is set.
 6. Fixed a regression introduced by 3.0 beta2[6] that prevented the djpeg
 `-map` option from working when decompressing 12-bit-per-component lossy JPEG
 images.
 7. Fixed an issue that caused the C Huffman encoder (which is not used by
 default on x86 and Arm CPUs) to read from uninitialized memory when attempting
 to transform a specially-crafted malformed arithmetic-coded JPEG source image
 into a baseline Huffman-coded JPEG destination image.
 2.1.91 (3.0 beta2)
 ==================
 ### Significant changes relative to 2.1.5.1:
 1. Significantly sped up the computation of optimal Huffman tables.  This
 speeds up the compression of tiny images by as much as 2x and provides a
 noticeable speedup for images as large as 256x256 when using optimal Huffman
 tables.
 2. All deprecated fields, constructors, and methods in the TurboJPEG Java API
 have been removed.
 3. Arithmetic entropy coding is now supported with 12-bit-per-component JPEG
 images.
 4. Overhauled the TurboJPEG API to address long-standing limitations and to
 make the API more extensible and intuitive:
     - All C function names are now prefixed with `tj3`, and all version
 suffixes have been removed from the function names.  Future API overhauls will
 increment the prefix to `tj4`, etc., thus retaining backward API/ABI
 compatibility without versioning each individual function.
     - Stateless boolean flags have been replaced with stateful integer API
 parameters, the values of which persist between function calls.  New
 functions/methods (`tj3Set()`/`TJCompressor.set()`/`TJDecompressor.set()` and
 `tj3Get()`/`TJCompressor.get()`/`TJDecompressor.get()`) can be used to set and
 query the value of a particular API parameter.
     - The JPEG quality and subsampling are now implemented using API
 parameters rather than stateless function arguments (C) or dedicated set/get
 methods (Java.)
     - `tj3DecompressHeader()` now stores all relevant information about the
 JPEG image, including the width, height, subsampling type, entropy coding
 algorithm, etc., in API parameters rather than returning that information
 through pointer arguments.
     - `TJFLAG_LIMITSCANS`/`TJ.FLAG_LIMITSCANS` has been reimplemented as an
 API parameter (`TJPARAM_SCANLIMIT`/`TJ.PARAM_SCANLIMIT`) that allows the number
 of scans to be specified.
     - Huffman table optimization can now be specified using a new API
 parameter (`TJPARAM_OPTIMIZE`/`TJ.PARAM_OPTIMIZE`), a new transform option
 (`TJXOPT_OPTIMIZE`/`TJTransform.OPT_OPTIMIZE`), and a new TJBench option
 (`-optimize`.)
     - Arithmetic entropy coding can now be specified or queried, using a new
 API parameter (`TJPARAM_ARITHMETIC`/`TJ.PARAM_ARITHMETIC`), a new transform
 option (`TJXOPT_ARITHMETIC`/`TJTransform.OPT_ARITHMETIC`), and a new TJBench
 option (`-arithmetic`.)
     - The restart marker interval can now be specified, using new API
 parameters (`TJPARAM_RESTARTROWS`/`TJ.PARAM_RESTARTROWS` and
 `TJPARAM_RESTARTBLOCKS`/`TJ.PARAM_RESTARTBLOCKS`) and a new TJBench option
 (`-restart`.)
     - Pixel density can now be specified or queried, using new API parameters
 (`TJPARAM_XDENSITY`/`TJ.PARAM_XDENSITY`,
 `TJPARAM_YDENSITY`/`TJ.PARAM_YDENSITY`, and
 `TJPARAM_DENSITYUNITS`/`TJ.PARAM_DENSITYUNITS`.)
     - The accurate DCT/IDCT algorithms are now the default for both
 compression and decompression, since the "fast" algorithms are considered to be
 a legacy feature.  (The "fast" algorithms do not pass the ISO compliance tests,
 and those algorithms are not any faster than the accurate algorithms on modern
 x86 CPUs.)
     - All C initialization functions have been combined into a single function
 (`tj3Init()`) that accepts an integer argument specifying the subsystems to
 initialize.
     - All C functions now use the `const` keyword for pointer arguments that
 point to unmodified buffers (and for both dimensions of pointer arguments that
 point to sets of unmodified buffers.)
     - All C functions now use `size_t` rather than `unsigned long` to
 represent buffer sizes, for compatibility with `malloc()` and to avoid
 disparities in the size of `unsigned long` between LP64 (Un*x) and LLP64
 (Windows) operating systems.
     - All C buffer size functions now return 0 if an error occurs, rather than
 trying to awkwardly return -1 in an unsigned data type (which could easily be
 misinterpreted as a very large value.)
     - Decompression scaling is now enabled explicitly, using a new
 function/method (`tj3SetScalingFactor()`/`TJDecompressor.setScalingFactor()`),
 rather than implicitly using awkward "desired width"/"desired height"
 arguments.
     - Partial image decompression has been implemented, using a new
 function/method (`tj3SetCroppingRegion()`/`TJDecompressor.setCroppingRegion()`)
 and a new TJBench option (`-crop`.)
     - The JPEG colorspace can now be specified explicitly when compressing,
 using a new API parameter (`TJPARAM_COLORSPACE`/`TJ.PARAM_COLORSPACE`.)  This
 allows JPEG images with the RGB and CMYK colorspaces to be created.
     - TJBench no longer generates error/difference images, since identical
 functionality is already available in ImageMagick.
     - JPEG images with unknown subsampling configurations can now be
 fully decompressed into packed-pixel images or losslessly transformed (with the
 exception of lossless cropping.)  They cannot currently be partially
 decompressed or decompressed into planar YUV images.
     - `tj3Destroy()` now silently accepts a NULL handle.
     - `tj3Alloc()` and `tj3Free()` now return/accept void pointers, as
 `malloc()` and `free()` do.
     - The C image I/O functions now accept a TurboJPEG instance handle, which
 is used to transmit/receive API parameter values and to receive error
 information.
 5. Added support for 8-bit-per-component, 12-bit-per-component, and
 16-bit-per-component lossless JPEG images.  A new libjpeg API function
 (`jpeg_enable_lossless()`), TurboJPEG API parameters
 (`TJPARAM_LOSSLESS`/`TJ.PARAM_LOSSLESS`,
 `TJPARAM_LOSSLESSPSV`/`TJ.PARAM_LOSSLESSPSV`, and
 `TJPARAM_LOSSLESSPT`/`TJ.PARAM_LOSSLESSPT`), and a cjpeg/TJBench option
 (`-lossless`) can be used to create a lossless JPEG image.  (Decompression of
 lossless JPEG images is handled automatically.)  Refer to
 [libjpeg.txt](libjpeg.txt), [usage.txt](usage.txt), and the TurboJPEG API
 documentation for more details.
 6. Added support for 12-bit-per-component (lossy and lossless) and
 16-bit-per-component (lossless) JPEG images to the libjpeg and TurboJPEG APIs:
     - The existing `data_precision` field in `jpeg_compress_struct` and
 `jpeg_decompress_struct` has been repurposed to enable the creation of
 12-bit-per-component and 16-bit-per-component JPEG images or to detect whether
 a 12-bit-per-component or 16-bit-per-component JPEG image is being
 decompressed.
     - New 12-bit-per-component and 16-bit-per-component versions of
 `jpeg_write_scanlines()` and `jpeg_read_scanlines()`, as well as new
 12-bit-per-component versions of `jpeg_write_raw_data()`,
 `jpeg_skip_scanlines()`, `jpeg_crop_scanline()`, and `jpeg_read_raw_data()`,
 provide interfaces for compressing from/decompressing to 12-bit-per-component
 and 16-bit-per-component packed-pixel and planar YUV image buffers.
     - New 12-bit-per-component and 16-bit-per-component compression,
 decompression, and image I/O functions/methods have been added to the TurboJPEG
 API, and a new API parameter (`TJPARAM_PRECISION`/`TJ.PARAM_PRECISION`) can be
 used to query the data precision of a JPEG image.  (YUV functions are currently
 limited to 8-bit data precision but can be expanded to accommodate 12-bit data
 precision in the future, if such is deemed beneficial.)
     - A new cjpeg and TJBench command-line argument (`-precision`) can be used
 to create a 12-bit-per-component or 16-bit-per-component JPEG image.
 (Decompression and transformation of 12-bit-per-component and
 16-bit-per-component JPEG images is handled automatically.)
    Refer to [libjpeg.txt](libjpeg.txt), [usage.txt](usage.txt), and the
 TurboJPEG API documentation for more details.
 2.1.5.1
 =======
 ### Significant changes relative to 2.1.5:
 1. The SIMD dispatchers in libjpeg-turbo 2.1.4 and prior stored the list of
 supported SIMD instruction sets in a global variable, which caused an innocuous
 race condition whereby the variable could have been initialized multiple times
 if `jpeg_start_*compress()` was called simultaneously in multiple threads.
 libjpeg-turbo 2.1.5 included an undocumented attempt to fix this race condition
 by making the SIMD support variable thread-local.  However, that caused another
 issue whereby, if `jpeg_start_*compress()` was called in one thread and
 `jpeg_read_*()` or `jpeg_write_*()` was called in a second thread, the SIMD
 support variable was never initialized in the second thread.  On x86 systems,
 this led the second thread to incorrectly assume that AVX2 instructions were
 always available, and when it attempted to use those instructions on older x86
 CPUs that do not support them, an illegal instruction error occurred.  The SIMD
 dispatchers now ensure that the SIMD support variable is initialized before
 dispatching based on its value.
 2.1.5
 =====
 ### Significant changes relative to 2.1.4:
 1. Fixed issues in the build system whereby, when using the Ninja Multi-Config
 CMake generator, a static build of libjpeg-turbo (a build in which
 `ENABLE_SHARED` is `0`) could not be installed, a Windows installer could not
 be built, and the Java regression tests failed.
 2. Fixed a regression introduced by 2.0 beta1[15] that caused a buffer overrun
 in the progressive Huffman encoder when attempting to transform a
 specially-crafted malformed 12-bit-per-component JPEG image into a progressive
 12-bit-per-component JPEG image using a 12-bit-per-component build of
 libjpeg-turbo (`-DWITH_12BIT=1`.)  Given that the buffer overrun was fully
 contained within the progressive Huffman encoder structure and did not cause a
 segfault or other user-visible errant behavior, given that the lossless
 transformer (unlike the decompressor) is not generally exposed to arbitrary
 data exploits, and given that 12-bit-per-component builds of libjpeg-turbo are
 uncommon, this issue did not likely pose a security risk.
 3. Fixed an issue whereby, when using a 12-bit-per-component build of
 libjpeg-turbo (`-DWITH_12BIT=1`), passing samples with values greater than 4095
 or less than 0 to `jpeg_write_scanlines()` caused a buffer overrun or underrun
 in the RGB-to-YCbCr color converter.
 4. Fixed a floating point exception that occurred when attempting to use the
 jpegtran `-drop` and `-trim` options to losslessly transform a
 specially-crafted malformed JPEG image.
 5. Fixed an issue in `tjBufSizeYUV2()` whereby it returned a bogus result,
 rather than throwing an error, if the `align` parameter was not a power of 2.
 Fixed a similar issue in `tjCompressFromYUV()` whereby it generated a corrupt
 JPEG image in certain cases, rather than throwing an error, if the `align`
 parameter was not a power of 2.
 6. Fixed an issue whereby `tjDecompressToYUV2()`, which is a wrapper for
 `tjDecompressToYUVPlanes()`, used the desired YUV image dimensions rather than
 the actual scaled image dimensions when computing the plane pointers and
 strides to pass to `tjDecompressToYUVPlanes()`.  This caused a buffer overrun
 and subsequent segfault if the desired image dimensions exceeded the scaled
 image dimensions.
 7. Fixed an issue whereby, when decompressing a 12-bit-per-component JPEG image
 (`-DWITH_12BIT=1`) using an alpha-enabled output color space such as
 `JCS_EXT_RGBA`, the alpha channel was set to 255 rather than 4095.
 8. Fixed an issue whereby the Java version of TJBench did not accept a range of
 quality values.
 9. Fixed an issue whereby, when `-progressive` was passed to TJBench, the JPEG
 input image was not transformed into a progressive JPEG image prior to
 decompression.
 2.1.4
 =====
-### Significant changes relative to 2.1.3
+### Significant changes relative to 2.1.3:
 1. Fixed a regression introduced in 2.1.3 that caused build failures with
 Visual Studio 2010.
@@ -36,7 +479,7 @@ virtual array access") under certain circumstances.
 2.1.3
 =====
-### Significant changes relative to 2.1.2
+### Significant changes relative to 2.1.2:
 1. Fixed a regression introduced by 2.0 beta1[7] whereby cjpeg compressed PGM
 input files into full-color JPEG images unless the `-grayscale` option was
@@ -60,7 +503,7 @@ be reproduced using the libjpeg API, not using djpeg.
 2.1.2
 =====
-### Significant changes relative to 2.1.1
+### Significant changes relative to 2.1.1:
 1. Fixed a regression introduced by 2.1 beta1[13] that caused the remaining
 GAS implementations of AArch64 (Arm 64-bit) Neon SIMD functions (which are used
@@ -71,9 +514,9 @@ prevented libjpeg-turbo from working properly with other linkers and also
 represented a potential security risk.
 2. Fixed an issue whereby the `tjTransform()` function incorrectly computed the
-MCU block size for 4:4:4 JPEG images with non-unary sampling factors and thus
+iMCU size for 4:4:4 JPEG images with non-unary sampling factors and thus unduly
-unduly rejected some cropping regions, even though those regions aligned with
+rejected some cropping regions, even though those regions aligned with 8x8 iMCU
-8x8 MCU block boundaries.
+boundaries.
 3. Fixed a regression introduced by 2.1 beta1[13] that caused the build system
 to enable the Arm Neon SIMD extensions when targetting Armv6 and other legacy
@@ -92,7 +535,7 @@ image contains incomplete or corrupt image data.
 2.1.1
 =====
-### Significant changes relative to 2.1.0
+### Significant changes relative to 2.1.0:
 1. Fixed a regression introduced in 2.1.0 that caused build failures with
 non-GCC-compatible compilers for Un*x/Arm platforms.
@@ -121,11 +564,11 @@ transform a specially-crafted malformed JPEG image.
 2.1.0
 =====
-### Significant changes relative to 2.1 beta1
+### Significant changes relative to 2.1 beta1:
-1. Fixed a regression introduced by 2.1 beta1[6(b)] whereby attempting to
+1. Fixed a regression (CVE-2021-29390) introduced by 2.1 beta1[6(b)] whereby
-decompress certain progressive JPEG images with one or more component planes of
+attempting to decompress certain progressive JPEG images with one or more
-width 8 or less caused a buffer overrun.
+component planes of width 8 or less caused a buffer overrun.
 2. Fixed a regression introduced by 2.1 beta1[6(b)] whereby attempting to
 decompress a specially-crafted malformed progressive JPEG image caused the
@@ -156,10 +599,10 @@ progressive JPEG format described in the report
 ["Two Issues with the JPEG Standard"](https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf).
 7. The PPM reader now throws an error, rather than segfaulting (due to a buffer
-overrun) or generating incorrect pixels, if an application attempts to use the
+overrun, CVE-2021-46822) or generating incorrect pixels, if an application
-`tjLoadImage()` function to load a 16-bit binary PPM file (a binary PPM file
+attempts to use the `tjLoadImage()` function to load a 16-bit binary PPM file
-with a maximum value greater than 255) into a grayscale image buffer or to load
+(a binary PPM file with a maximum value greater than 255) into a grayscale
-a 16-bit binary PGM file into an RGB image buffer.
+image buffer or to load a 16-bit binary PGM file into an RGB image buffer.
 8. Fixed an issue in the PPM reader that caused incorrect pixels to be
 generated when using the `tjLoadImage()` function to load a 16-bit binary PPM
@@ -325,11 +768,11 @@ methods in the TurboJPEG Java API.
 2. Fixed or worked around multiple issues with `jpeg_skip_scanlines()`:
-     - Fixed segfaults or "Corrupt JPEG data: premature end of data segment"
+     - Fixed segfaults (CVE-2020-35538) or "Corrupt JPEG data: premature end of
-errors in `jpeg_skip_scanlines()` that occurred when decompressing 4:2:2 or
+data segment" errors in `jpeg_skip_scanlines()` that occurred when
-4:2:0 JPEG images using merged (non-fancy) upsampling/color conversion (that
+decompressing 4:2:2 or 4:2:0 JPEG images using merged (non-fancy)
-is, when setting `cinfo.do_fancy_upsampling` to `FALSE`.)  2.0.0[6] was a
+upsampling/color conversion (that is, when setting `cinfo.do_fancy_upsampling`
-similar fix, but it did not cover all cases.
+to `FALSE`.)  2.0.0[6] was a similar fix, but it did not cover all cases.
     - `jpeg_skip_scanlines()` now throws an error if two-pass color
 quantization is enabled.  Two-pass color quantization never worked properly
 with `jpeg_skip_scanlines()`, and the issues could not readily be fixed.
@@ -655,16 +1098,15 @@ encounters a warning from the underlying libjpeg API (the default behavior is
 to allow the operation to complete unless a fatal error is encountered.)
 5. Introduced a new flag in the TurboJPEG C and Java APIs (`TJFLAG_PROGRESSIVE`
-and `TJ.FLAG_PROGRESSIVE`, respectively) that causes the library to use
+and `TJ.FLAG_PROGRESSIVE`, respectively) that causes compression and transform
-progressive entropy coding in JPEG images generated by compression and
+operations to generate progressive JPEG images.  Additionally, a new transform
-transform operations.  Additionally, a new transform option
+option (`TJXOPT_PROGRESSIVE` in the C API and `TJTransform.OPT_PROGRESSIVE` in
-(`TJXOPT_PROGRESSIVE` in the C API and `TJTransform.OPT_PROGRESSIVE` in the
+the Java API) has been introduced, allowing progressive JPEG images to be
-Java API) has been introduced, allowing progressive entropy coding to be
+generated by selected transforms in a multi-transform operation.
 enabled for selected transforms in a multi-transform operation.
 6. Introduced a new transform option in the TurboJPEG API (`TJXOPT_COPYNONE` in
 the C API and `TJTransform.OPT_COPYNONE` in the Java API) that allows the
-copying of markers (including EXIF and ICC profile data) to be disabled for a
+copying of markers (including Exif and ICC profile data) to be disabled for a
 particular transform.
 7. Added two functions to the TurboJPEG C API (`tjLoadImage()` and
@@ -795,13 +1237,13 @@ bug that has existed since the introduction of libjpeg v7/v8 API/ABI emulation
 in libjpeg-turbo v1.1.
 7. The lossless transform features in jpegtran and the TurboJPEG API will now
-always attempt to adjust the EXIF image width and height tags if the image size
+always attempt to adjust the Exif image width and height tags if the image size
 changed as a result of the transform.  This behavior has always existed when
 using libjpeg v8 API/ABI emulation.  It was supposed to be available with
 libjpeg v7 API/ABI emulation as well but did not work properly due to a bug.
 Furthermore, there was never any good reason not to enable it with libjpeg v6b
 API/ABI emulation, since the behavior is entirely internal.  Note that
-`-copy all` must be passed to jpegtran in order to transfer the EXIF tags from
+`-copy all` must be passed to jpegtran in order to transfer the Exif tags from
 the source image to the destination image.
 8. Fixed several memory leaks in the TurboJPEG API library that could occur
@@ -823,7 +1265,7 @@ for two reasons:  it allows testers to more easily work around the 2 GB limit
 in libFuzzer, and it allows developers of security-sensitive applications to
 more easily defend against one of the progressive JPEG exploits (LJT-01-004)
 identified in
-[this report](http://www.libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf).
+[this report](https://libjpeg-turbo.org/pmwiki/uploads/About/TwoIssueswiththeJPEGStandard.pdf).
 10. TJBench will now run each benchmark for 1 second prior to starting the
 timer, in order to improve the consistency of the results.  Furthermore, the
@@ -1364,7 +1806,7 @@ features (such as the colorspace extensions), but in general, it performs no
 faster than libjpeg v6b.
 14. Added ARM 64-bit SIMD acceleration for the YCC-to-RGB color conversion
-and IDCT algorithms (both are used during JPEG decompression.)  For unknown
+and IDCT algorithms (both are used during JPEG decompression.)  For
 reasons (probably related to clang), this code cannot currently be compiled for
 iOS.
@@ -1850,7 +2292,7 @@ and unit tests now work on those architectures.
 0.0.93
 ======
-### Significant changes since 0.0.91:
+### Significant changes relative to 0.0.91:
 1. 2982659: Fixed x86-64 build on FreeBSD systems
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,30 +1,33 @@
 libjpeg-turbo Licenses
 ======================
-libjpeg-turbo is covered by three compatible BSD-style open source licenses:
+libjpeg-turbo is covered by two compatible BSD-style open source licenses:
 - The IJG (Independent JPEG Group) License, which is listed in
  [README.ijg](README.ijg)
-  This license applies to the libjpeg API library and associated programs
+  This license applies to the libjpeg API library and associated programs,
-  (any code inherited from libjpeg, and any modifications to that code.)
+  including any code inherited from libjpeg and any modifications to that
  code.  Note that the libjpeg-turbo SIMD source code bears the
  [zlib License](https://opensource.org/licenses/Zlib), but in the context of
  the overall libjpeg API library, the terms of the zlib License are subsumed
  by the terms of the IJG License.
 - The Modified (3-clause) BSD License, which is listed below
-  This license covers the TurboJPEG API library and associated programs, as
+  This license applies to the TurboJPEG API library and associated programs, as
-  well as the build system.
+  well as the build system.  Note that the TurboJPEG API library wraps the
-
+  libjpeg API library, so in the context of the overall TurboJPEG API library,
- The [zlib License](https://opensource.org/licenses/Zlib)
+  both the terms of the IJG License and the terms of the Modified (3-clause)
-
+  BSD License apply.
  This license is a subset of the other two, and it covers the libjpeg-turbo
  SIMD extensions.
 Complying with the libjpeg-turbo Licenses
 =========================================
 This section provides a roll-up of the libjpeg-turbo licensing terms, to the
-best of our understanding.
+best of our understanding.  This is not a license in and of itself.  It is
 intended solely for clarification.
 1.  If you are distributing a modified version of the libjpeg-turbo source,
    then:
@@ -38,7 +41,7 @@ best of our understanding.
        - Clauses 1 and 3 of the zlib License
    2.  You must add your own copyright notice to the header of each source
-        file you modified, so others can tell that you modified that file (if
+        file you modified, so others can tell that you modified that file.  (If
        there is not an existing copyright header in that file, then you can
        simply add a notice stating that you modified the file.)
@@ -91,7 +94,7 @@ best of our understanding.
 The Modified (3-clause) BSD License
 ===================================
-Copyright (C)2009-2022 D. R. Commander.  All Rights Reserved.<br>
+Copyright (C)2009-2024 D. R. Commander.  All Rights Reserved.<br>
 Copyright (C)2015 Viktor Szathmáry.  All Rights Reserved.
 Redistribution and use in source and binary forms, with or without
@@ -119,8 +122,8 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-Why Three Licenses?
+Why Two Licenses?
-===================
+=================
 The zlib License could have been used instead of the Modified (3-clause) BSD
 License, and since the IJG License effectively subsumes the distribution
--- a/README-mozilla.txt
+++ b/README-mozilla.txt
@@ -0,0 +1,194 @@
 Mozilla JPEG Encoder Project
 ============================
 mozjpeg is a fork of libjpeg-turbo that aims to speed up load times of web
 pages by reducing the size (and, by extension, the transmission time) of JPEG
 files.  It accomplishes this by enabling optimized Huffman trees and
 progressive entropy coding by default in the JPEG compressor, as well as
 splitting the spectrum of DCT coefficients into separate scans and using
 Trellis quantisation.
 Although it is based on libjpeg-turbo, mozjpeg is not intended to be a
 general-purpose or high-performance JPEG library.  Its performance is highly
 "asymmetric".  That is, the JPEG files it generates require much more time to
 compress than to decompress.  When the default settings are used, mozjpeg is
 considerably slower than libjpeg-turbo or even libjpeg at compressing images.
 Thus, it is not generally suitable for real-time compression.  It is best used
 as part of a web encoding workflow.
 libjpeg API Extensibility Framework
 ===================================
 mozjpeg's implementation of the libjpeg API includes an extensibility framework
 that allows new features to be added without modifying the transparent libjpeg
 compress/decompress structures (which would break backward ABI compatibility.)
 Extension parameters are placed into the opaque jpeg_comp_master structure, and
 a set of accessor functions and globally unique tokens allows for
 getting/setting those parameters without directly accessing the structure.
 Currently, only the accessor functions necessary to support the mozjpeg
 extensions are implemented, but the framework can be easily extended in the
 future to accommodate additional simple parameter types, complex or
 multi-valued parameters, or decompressor extensions.
 The currently-implemented accessor functions are as follows:
 boolean jpeg_c_bool_param_supported (j_compress_ptr cinfo,
                                     J_BOOLEAN_PARAM param)
        Returns TRUE if the given boolean extension parameter is supported by
        this implementation of the libjpeg API, or FALSE otherwise.
 void jpeg_c_set_bool_param (j_compress_ptr cinfo,
                            J_BOOLEAN_PARAM param, boolean value);
        Set the given boolean extension parameter to the given value (TRUE or
        FALSE.)
 boolean jpeg_c_get_bool_param (j_compress_ptr cinfo, J_BOOLEAN_PARAM param)
        Get the value of the given boolean extension parameter (TRUE or FALSE.)
 boolean jpeg_c_float_param_supported (j_compress_ptr cinfo,
                                      J_FLOAT_PARAM param)
        Returns TRUE if the given floating point extension parameter is
        supported by this implementation of the libjpeg API, or FALSE
        otherwise.
 void jpeg_c_set_float_param (j_compress_ptr cinfo, J_FLOAT_PARAM param,
                             float value)
        Set the given floating point extension parameter to the given value.
 float jpeg_c_get_float_param (j_compress_ptr cinfo, J_FLOAT_PARAM param);
        Get the value of the given floating point extension parameter.
 boolean jpeg_c_int_param_supported (j_compress_ptr cinfo,
                                    J_INT_PARAM param)
        Returns TRUE if the given integer extension parameter is supported by
        this implementation of the libjpeg API, or FALSE otherwise.
 void jpeg_c_set_int_param (j_compress_ptr cinfo, J_INT_PARAM param,
                          int value)
        Set the given integer extension parameter to the given value.
 int jpeg_c_get_int_param (j_compress_ptr cinfo, J_INT_PARAM param)
        Get the value of the given integer extension parameter.
 Boolean Extension Parameters Supported by mozjpeg
 -------------------------------------------------
 * JBOOLEAN_OPTIMIZE_SCANS (default: TRUE)
  Specifies whether scan parameters should be optimized.  Parameter
  optimization is done as in jpgcrush. jpeg_simple_progression() should be called
  after setting JBOOLEAN_OPTIMIZE_SCANS.
  When disabling JBOOLEAN_OPTIMIZE_SCANS, cinfo.scan_info should additionally be
  set to NULL to disable use of the progressive coding mode, if so desired.
 * JBOOLEAN_TRELLIS_QUANT (default: TRUE)
  Specifies whether to apply trellis quantization.  For each 8x8 block, trellis
  quantization determines the best tradeoff between rate and distortion.
 * JBOOLEAN_TRELLIS_QUANT_DC (default: TRUE)
  Specifies whether to apply trellis quantization to DC coefficients.
 * JBOOLEAN_TRELLIS_EOB_OPT (default: FALSE)
  Specifies whether to optimize runs of zero blocks in trellis quantization.
  This is applicable only when JBOOLEAN_USE_SCANS_IN_TRELLIS is enabled.
 * JBOOLEAN_USE_LAMBDA_WEIGHT_TBL currently has no effect.
 * JBOOLEAN_USE_SCANS_IN_TRELLIS (default: FALSE)
  Specifies whether multiple scans should be considered during trellis
  quantization.
 * JBOOLEAN_TRELLIS_Q_OPT (default: FALSE)
  Specifies whether to optimize the quantization table after trellis
  quantization.  If enabled, then a revised quantization table is derived so
  as to minimize the reconstruction error of the quantized coefficients.
 * JBOOLEAN_OVERSHOOT_DERINGING (default: TRUE)
  Specifies whether overshooting is applied to samples with extreme values
  (for example, 0 and 255 for 8-bit samples).  Overshooting may reduce ringing
  artifacts from compression, in particular in areas where black text appears
  on a white background.
 Floating Point Extension Parameters Supported by mozjpeg
 --------------------------------------------------------
 * JFLOAT_LAMBDA_LOG_SCALE1 (default: 14.75)
  JFLOAT_LAMBDA_LOG_SCALE2 (default: 16.5)
  These parameters specify the lambda value used in trellis quantization.  The
  lambda value (Lagrange multiplier) in the
    R + lambda * D
  equation is derived from
    lambda = 2^s1 / ((2^s2 + n) * q^2),
  where s1 and s2 are the values of JFLOAT_LAMBDA_LOG_SCALE1 and
  JFLOAT_LAMBDA_LOG_SCALE2, n is the average of the squared unquantized AC
  coefficients within the current 8x8 block, and q is the quantization table
  entry associated with the current coefficient frequency.  If
  JFLOAT_LAMBDA_LOG_SCALE2 is 0, then an alternate form is used that does not
  rely on n:
    lambda = 2^(s1-12) / q^2.
 * JFLOAT_TRELLIS_DELTA_DC_WEIGHT (default: 0.0)
  This parameter controls how distortion is calculated in DC trellis quantization
  (enabled with JBOOLEAN_TRELLIS_QUANT_DC). It defines weighting between distortion
  of the DC coefficient and distortion of the vertical gradient of DC coefficients.
  The value of the parameter corresponds to the weight applied to the distortion
  of the vertical gradient.
 Integer Extension Parameters Supported by mozjpeg
 -------------------------------------------------
 * JINT_COMPRESS_PROFILE (default: JCP_MAX_COMPRESSION)
  Select a compression profile, which is a set of default parameters that will
  achieve a desired compression goal.  This parameter controls the behavior of
  the jpeg_set_defaults() function.  Thus, setting JINT_COMPRESS_PROFILE does
  not cause any other parameters to be modified until jpeg_set_defaults() is
  called.  The following compression profiles are supported:
  - JCP_MAX_COMPRESSION (default)
    Increase the compression ratio as much as possible, at the expense of
    increased encoding time.  This enables progressive entropy coding and all
    mozjpeg extensions.
  - JCP_FASTEST
    Use the libjpeg[-turbo] defaults (baseline entropy coding, no mozjpeg
    extensions enabled.)
 * JINT_TRELLIS_FREQ_SPLIT (default: 8)
  Specifies the position within the zigzag scan at which the split between
  scans is positioned in the context of trellis quantization.
  JBOOLEAN_USE_SCANS_IN_TRELLIS must be enabled for this parameter to have any
  effect.
 * JINT_TRELLIS_NUM_LOOPS (default: 1)
  Specifies the number of trellis quantization passes.  Huffman tables are
  updated between passes.
 * JINT_BASE_QUANT_TBL_IDX (default: 3)
  Specifies which quantization table set to use.  The following options are
  available:
  0 = Tables from JPEG Annex K
  1 = Flat table
  2 = Table tuned for MSSIM on Kodak image set
  3 = Table from http://www.imagemagick.org/discourse-server/viewtopic.php?f=22&t=20333&p=98008#p98008
  4 = Table tuned for PSNR-HVS-M on Kodak image set
  5 = Table from:  Relevance of Human Vision to JPEG-DCT Compression
      (1992) Klein, Silverstein and Carney
  6 = Table from:  DCTune Perceptual Optimization of Compressed Dental X-Rays
      (1997) Watson, Taylor, Borthwick
  7 = Table from:  A Visual Detection Model for DCT Coefficient Quantization
      (12/9/93) Ahumada, Watson, Peterson
  8 = Table from:  An Improved Detection Model for DCT Coefficient Quantization
      (1993) Peterson, Ahumada and Watson
 * JINT_DC_SCAN_OPT_MODE (default: 0)
  Specifies the DC scan optimization mode.  The following options are
  available:
  0 = One scan for all components
  1 = One scan per component
  2 = Optimize between one scan for all components and one scan for the first
      component plus one scan for the remaining components
--- a/README-turbo.txt
+++ b/README-turbo.txt
@@ -0,0 +1,372 @@
 Background
 ==========
 libjpeg-turbo is a JPEG image codec that uses SIMD instructions to accelerate
 baseline JPEG compression and decompression on x86, x86-64, Arm, PowerPC, and
 MIPS systems, as well as progressive JPEG compression on x86, x86-64, and Arm
 systems.  On such systems, libjpeg-turbo is generally 2-6x as fast as libjpeg,
 all else being equal.  On other types of systems, libjpeg-turbo can still
 outperform libjpeg by a significant amount, by virtue of its highly-optimized
 Huffman coding routines.  In many cases, the performance of libjpeg-turbo
 rivals that of proprietary high-speed JPEG codecs.
 libjpeg-turbo implements both the traditional libjpeg API as well as the less
 powerful but more straightforward TurboJPEG API.  libjpeg-turbo also features
 colorspace extensions that allow it to compress from/decompress to 32-bit and
 big-endian pixel buffers (RGBX, XBGR, etc.), as well as a full-featured Java
 interface.
 libjpeg-turbo was originally based on libjpeg/SIMD, an MMX-accelerated
 derivative of libjpeg v6b developed by Miyasaka Masaru.  The TigerVNC and
 VirtualGL projects made numerous enhancements to the codec in 2009, and in
 early 2010, libjpeg-turbo spun off into an independent project, with the goal
 of making high-speed JPEG compression/decompression technology available to a
 broader range of users and developers.  libjpeg-turbo is an ISO/IEC and ITU-T
 reference implementation of the JPEG standard.
 More information about libjpeg-turbo can be found at
 <https://libjpeg-turbo.org>.
 Funding
 =======
 libjpeg-turbo is an independent open source project, but we rely on patronage
 and funded development in order to maintain that independence.  The easiest way
 to ensure that libjpeg-turbo remains community-focused and free of any one
 organization's agenda is to
 [sponsor our project through GitHub](https://github.com/sponsors/libjpeg-turbo).
 All sponsorship money goes directly toward funding the labor necessary to
 maintain libjpeg-turbo, support the user community, and implement bug fixes and
 strategically important features.
 [![Sponsor libjpeg-turbo](https://img.shields.io/github/sponsors/libjpeg-turbo?label=Sponsor&logo=GitHub)](https://github.com/sponsors/libjpeg-turbo)
 License
 =======
 libjpeg-turbo is covered by three compatible BSD-style open source licenses.
 Refer to [LICENSE.md](LICENSE.md) for a roll-up of license terms.
 Building libjpeg-turbo
 ======================
 Refer to [BUILDING.md](BUILDING.md) for complete instructions.
 Using libjpeg-turbo
 ===================
 libjpeg-turbo includes two APIs that can be used to compress and decompress
 JPEG images:
 - **TurboJPEG API**<br>
  This API provides an easy-to-use interface for compressing and decompressing
  JPEG images in memory.  It also provides some functionality that would not be
  straightforward to achieve using the underlying libjpeg API, such as
  generating planar YUV images and performing multiple simultaneous lossless
  transforms on an image.  The Java interface for libjpeg-turbo is written on
  top of the TurboJPEG API.  The TurboJPEG API is recommended for first-time
  users of libjpeg-turbo.  Refer to [tjexample.c](tjexample.c) and
  [TJExample.java](java/TJExample.java) for examples of its usage and to
  <https://libjpeg-turbo.org/Documentation/Documentation> for API
  documentation.
 - **libjpeg API**<br>
  This is the de facto industry-standard API for compressing and decompressing
  JPEG images.  It is more difficult to use than the TurboJPEG API but also
  more powerful.  The libjpeg API implementation in libjpeg-turbo is both
  API/ABI-compatible and mathematically compatible with libjpeg v6b.  It can
  also optionally be configured to be API/ABI-compatible with libjpeg v7 and v8
  (see below.)  Refer to [cjpeg.c](cjpeg.c) and [djpeg.c](djpeg.c) for examples
  of its usage and to [libjpeg.txt](libjpeg.txt) for API documentation.
 There is no significant performance advantage to either API when both are used
 to perform similar operations.
 Colorspace Extensions
 ---------------------
 libjpeg-turbo includes extensions that allow JPEG images to be compressed
 directly from (and decompressed directly to) buffers that use BGR, BGRX,
 RGBX, XBGR, and XRGB pixel ordering.  This is implemented with ten new
 colorspace constants:
    JCS_EXT_RGB   /* red/green/blue */
    JCS_EXT_RGBX  /* red/green/blue/x */
    JCS_EXT_BGR   /* blue/green/red */
    JCS_EXT_BGRX  /* blue/green/red/x */
    JCS_EXT_XBGR  /* x/blue/green/red */
    JCS_EXT_XRGB  /* x/red/green/blue */
    JCS_EXT_RGBA  /* red/green/blue/alpha */
    JCS_EXT_BGRA  /* blue/green/red/alpha */
    JCS_EXT_ABGR  /* alpha/blue/green/red */
    JCS_EXT_ARGB  /* alpha/red/green/blue */
 Setting `cinfo.in_color_space` (compression) or `cinfo.out_color_space`
 (decompression) to one of these values will cause libjpeg-turbo to read the
 red, green, and blue values from (or write them to) the appropriate position in
 the pixel when compressing from/decompressing to an RGB buffer.
 Your application can check for the existence of these extensions at compile
 time with:
    #ifdef JCS_EXTENSIONS
 At run time, attempting to use these extensions with a libjpeg implementation
 that does not support them will result in a "Bogus input colorspace" error.
 Applications can trap this error in order to test whether run-time support is
 available for the colorspace extensions.
 When using the RGBX, BGRX, XBGR, and XRGB colorspaces during decompression, the
 X byte is undefined, and in order to ensure the best performance, libjpeg-turbo
 can set that byte to whatever value it wishes.  If an application expects the X
 byte to be used as an alpha channel, then it should specify `JCS_EXT_RGBA`,
 `JCS_EXT_BGRA`, `JCS_EXT_ABGR`, or `JCS_EXT_ARGB`.  When these colorspace
 constants are used, the X byte is guaranteed to be 0xFF, which is interpreted
 as opaque.
 Your application can check for the existence of the alpha channel colorspace
 extensions at compile time with:
    #ifdef JCS_ALPHA_EXTENSIONS
 [jcstest.c](jcstest.c), located in the libjpeg-turbo source tree, demonstrates
 how to check for the existence of the colorspace extensions at compile time and
 run time.
 libjpeg v7 and v8 API/ABI Emulation
 -----------------------------------
 With libjpeg v7 and v8, new features were added that necessitated extending the
 compression and decompression structures.  Unfortunately, due to the exposed
 nature of those structures, extending them also necessitated breaking backward
 ABI compatibility with previous libjpeg releases.  Thus, programs that were
 built to use libjpeg v7 or v8 did not work with libjpeg-turbo, since it is
 based on the libjpeg v6b code base.  Although libjpeg v7 and v8 are not
 as widely used as v6b, enough programs (including a few Linux distros) made
 the switch that there was a demand to emulate the libjpeg v7 and v8 ABIs
 in libjpeg-turbo.  It should be noted, however, that this feature was added
 primarily so that applications that had already been compiled to use libjpeg
 v7+ could take advantage of accelerated baseline JPEG encoding/decoding
 without recompiling.  libjpeg-turbo does not claim to support all of the
 libjpeg v7+ features, nor to produce identical output to libjpeg v7+ in all
 cases (see below.)
 By passing an argument of `-DWITH_JPEG7=1` or `-DWITH_JPEG8=1` to `cmake`, you
 can build a version of libjpeg-turbo that emulates the libjpeg v7 or v8 ABI, so
 that programs that are built against libjpeg v7 or v8 can be run with
 libjpeg-turbo.  The following section describes which libjpeg v7+ features are
 supported and which aren't.
 ### Support for libjpeg v7 and v8 Features
 #### Fully supported
 - **libjpeg API: IDCT scaling extensions in decompressor**<br>
  libjpeg-turbo supports IDCT scaling with scaling factors of 1/8, 1/4, 3/8,
  1/2, 5/8, 3/4, 7/8, 9/8, 5/4, 11/8, 3/2, 13/8, 7/4, 15/8, and 2/1 (only 1/4
  and 1/2 are SIMD-accelerated.)
 - **libjpeg API: Arithmetic coding**
 - **libjpeg API: In-memory source and destination managers**<br>
  See notes below.
 - **cjpeg: Separate quality settings for luminance and chrominance**<br>
  Note that the libpjeg v7+ API was extended to accommodate this feature only
  for convenience purposes.  It has always been possible to implement this
  feature with libjpeg v6b (see rdswitch.c for an example.)
 - **cjpeg: 32-bit BMP support**
 - **cjpeg: `-rgb` option**
 - **jpegtran: Lossless cropping**
 - **jpegtran: `-perfect` option**
 - **jpegtran: Forcing width/height when performing lossless crop**
 - **rdjpgcom: `-raw` option**
 - **rdjpgcom: Locale awareness**
 #### Not supported
 NOTE:  As of this writing, extensive research has been conducted into the
 usefulness of DCT scaling as a means of data reduction and SmartScale as a
 means of quality improvement.  Readers are invited to peruse the research at
 <https://libjpeg-turbo.org/About/SmartScale> and draw their own conclusions,
 but it is the general belief of our project that these features have not
 demonstrated sufficient usefulness to justify inclusion in libjpeg-turbo.
 - **libjpeg API: DCT scaling in compressor**<br>
  `cinfo.scale_num` and `cinfo.scale_denom` are silently ignored.
  There is no technical reason why DCT scaling could not be supported when
  emulating the libjpeg v7+ API/ABI, but without the SmartScale extension (see
  below), only scaling factors of 1/2, 8/15, 4/7, 8/13, 2/3, 8/11, 4/5, and
  8/9 would be available, which is of limited usefulness.
 - **libjpeg API: SmartScale**<br>
  `cinfo.block_size` is silently ignored.
  SmartScale is an extension to the JPEG format that allows for DCT block
  sizes other than 8x8.  Providing support for this new format would be
  feasible (particularly without full acceleration.)  However, until/unless
  the format becomes either an official industry standard or, at minimum, an
  accepted solution in the community, we are hesitant to implement it, as
  there is no sense of whether or how it might change in the future.  It is
  our belief that SmartScale has not demonstrated sufficient usefulness as a
  lossless format nor as a means of quality enhancement, and thus our primary
  interest in providing this feature would be as a means of supporting
  additional DCT scaling factors.
 - **libjpeg API: Fancy downsampling in compressor**<br>
  `cinfo.do_fancy_downsampling` is silently ignored.
  This requires the DCT scaling feature, which is not supported.
 - **jpegtran: Scaling**<br>
  This requires both the DCT scaling and SmartScale features, which are not
  supported.
 - **Lossless RGB JPEG files**<br>
  This requires the SmartScale feature, which is not supported.
 ### What About libjpeg v9?
 libjpeg v9 introduced yet another field to the JPEG compression structure
 (`color_transform`), thus making the ABI backward incompatible with that of
 libjpeg v8.  This new field was introduced solely for the purpose of supporting
 lossless SmartScale encoding.  Furthermore, there was actually no reason to
 extend the API in this manner, as the color transform could have just as easily
 been activated by way of a new JPEG colorspace constant, thus preserving
 backward ABI compatibility.
 Our research (see link above) has shown that lossless SmartScale does not
 generally accomplish anything that can't already be accomplished better with
 existing, standard lossless formats.  Therefore, at this time it is our belief
 that there is not sufficient technical justification for software projects to
 upgrade from libjpeg v8 to libjpeg v9, and thus there is not sufficient
 technical justification for us to emulate the libjpeg v9 ABI.
 In-Memory Source/Destination Managers
 -------------------------------------
 By default, libjpeg-turbo 1.3 and later includes the `jpeg_mem_src()` and
 `jpeg_mem_dest()` functions, even when not emulating the libjpeg v8 API/ABI.
 Previously, it was necessary to build libjpeg-turbo from source with libjpeg v8
 API/ABI emulation in order to use the in-memory source/destination managers,
 but several projects requested that those functions be included when emulating
 the libjpeg v6b API/ABI as well.  This allows the use of those functions by
 programs that need them, without breaking ABI compatibility for programs that
 don't, and it allows those functions to be provided in the "official"
 libjpeg-turbo binaries.
 Note that, on most Un*x systems, the dynamic linker will not look for a
 function in a library until that function is actually used.  Thus, if a program
 is built against libjpeg-turbo 1.3+ and uses `jpeg_mem_src()` or
 `jpeg_mem_dest()`, that program will not fail if run against an older version
 of libjpeg-turbo or against libjpeg v7- until the program actually tries to
 call `jpeg_mem_src()` or `jpeg_mem_dest()`.  Such is not the case on Windows.
 If a program is built against the libjpeg-turbo 1.3+ DLL and uses
 `jpeg_mem_src()` or `jpeg_mem_dest()`, then it must use the libjpeg-turbo 1.3+
 DLL at run time.
 Both cjpeg and djpeg have been extended to allow testing the in-memory
 source/destination manager functions.  See their respective man pages for more
 details.
 Mathematical Compatibility
 ==========================
 For the most part, libjpeg-turbo should produce identical output to libjpeg
 v6b.  There are two exceptions:
 1. When decompressing a JPEG image that uses 4:4:0 chrominance subsampling, the
 outputs of libjpeg v6b and libjpeg-turbo can differ because libjpeg-turbo
 implements a "fancy" (smooth) 4:4:0 upsampling algorithm and libjpeg did not.
 2. When using the floating point DCT/IDCT, the outputs of libjpeg v6b and
 libjpeg-turbo can differ for the following reasons:
    - The SSE/SSE2 floating point DCT implementation in libjpeg-turbo is ever
      so slightly more accurate than the implementation in libjpeg v6b, but not
      by any amount perceptible to human vision (generally in the range of 0.01
      to 0.08 dB gain in PNSR.)
    - When not using the SIMD extensions, libjpeg-turbo uses the more accurate
      (and slightly faster) floating point IDCT algorithm introduced in libjpeg
      v8a as opposed to the algorithm used in libjpeg v6b.  It should be noted,
      however, that this algorithm basically brings the accuracy of the
      floating point IDCT in line with the accuracy of the accurate integer
      IDCT.  The floating point DCT/IDCT algorithms are mainly a legacy
      feature, and they do not produce significantly more accuracy than the
      accurate integer algorithms.  (To put numbers on this, the typical
      difference in PNSR between the two algorithms is less than 0.10 dB,
      whereas changing the quality level by 1 in the upper range of the quality
      scale is typically more like a 1.0 dB difference.)
    - If the floating point algorithms in libjpeg-turbo are not implemented
      using SIMD instructions on a particular platform, then the accuracy of
      the floating point DCT/IDCT can depend on the compiler settings.
 While libjpeg-turbo does emulate the libjpeg v8 API/ABI, under the hood it is
 still using the same algorithms as libjpeg v6b, so there are several specific
 cases in which libjpeg-turbo cannot be expected to produce the same output as
 libjpeg v8:
 - When decompressing using scaling factors of 1/2 and 1/4, because libjpeg v8
  implements those scaling algorithms differently than libjpeg v6b does, and
  libjpeg-turbo's SIMD extensions are based on the libjpeg v6b behavior.
 - When using chrominance subsampling, because libjpeg v8 implements this
  with its DCT/IDCT scaling algorithms rather than with a separate
  downsampling/upsampling algorithm.  In our testing, the subsampled/upsampled
  output of libjpeg v8 is less accurate than that of libjpeg v6b for this
  reason.
 - When decompressing using a scaling factor > 1 and merged (AKA "non-fancy" or
  "non-smooth") chrominance upsampling, because libjpeg v8 does not support
  merged upsampling with scaling factors > 1.
 Performance Pitfalls
 ====================
 Restart Markers
 ---------------
 The optimized Huffman decoder in libjpeg-turbo does not handle restart markers
 in a way that makes the rest of the libjpeg infrastructure happy, so it is
 necessary to use the slow Huffman decoder when decompressing a JPEG image that
 has restart markers.  This can cause the decompression performance to drop by
 as much as 20%, but the performance will still be much greater than that of
 libjpeg.  Many consumer packages, such as Photoshop, use restart markers when
 generating JPEG images, so images generated by those programs will experience
 this issue.
 Fast Integer Forward DCT at High Quality Levels
 -----------------------------------------------
 The algorithm used by the SIMD-accelerated quantization function cannot produce
 correct results whenever the fast integer forward DCT is used along with a JPEG
 quality of 98-100.  Thus, libjpeg-turbo must use the non-SIMD quantization
 function in those cases.  This causes performance to drop by as much as 40%.
 It is therefore strongly advised that you use the accurate integer forward DCT
 whenever encoding images with a JPEG quality of 98 or higher.
 Memory Debugger Pitfalls
 ========================
 Valgrind and Memory Sanitizer (MSan) can generate false positives
 (specifically, incorrect reports of uninitialized memory accesses) when used
 with libjpeg-turbo's SIMD extensions.  It is generally recommended that the
 SIMD extensions be disabled, either by passing an argument of `-DWITH_SIMD=0`
 to `cmake` when configuring the build or by setting the environment variable
 `JSIMD_FORCENONE` to `1` at run time, when testing libjpeg-turbo with Valgrind,
 MSan, or other memory debuggers.
--- a/README.ijg
+++ b/README.ijg
@@ -43,7 +43,7 @@ User documentation:
  change.log        Version-to-version change highlights.
 Programmer and internal documentation:
  libjpeg.txt       How to use the JPEG library in your own programs.
-  example.txt       Sample code for calling the JPEG library.
+  example.c         Sample code for calling the JPEG library.
  structure.txt     Overview of the JPEG library's internal structure.
  coderules.txt     Coding style rules --- please read if you contribute code.
@@ -68,17 +68,17 @@ other abrupt features may not compress well with JPEG, and a higher JPEG
 quality may have to be used to avoid visible compression artifacts with such
 images.
-JPEG is lossy, meaning that the output pixels are not necessarily identical to
+JPEG is normally lossy, meaning that the output pixels are not necessarily
-the input pixels.  However, on photographic content and other "smooth" images,
+identical to the input pixels.  However, on photographic content and other
-very good compression ratios can be obtained with no visible compression
+"smooth" images, very good compression ratios can be obtained with no visible
-artifacts, and extremely high compression ratios are possible if you are
+compression artifacts, and extremely high compression ratios are possible if
-willing to sacrifice image quality (by reducing the "quality" setting in the
+you are willing to sacrifice image quality (by reducing the "quality" setting
-compressor.)
+in the compressor.)
-This software implements JPEG baseline, extended-sequential, and progressive
+This software implements JPEG baseline, extended-sequential, progressive, and
-compression processes.  Provision is made for supporting all variants of these
+lossless compression processes.  Provision is made for supporting all variants
-processes, although some uncommon parameter settings aren't implemented yet.
+of these processes, although some uncommon parameter settings aren't
-We have made no provision for supporting the hierarchical or lossless
+implemented yet.  We have made no provision for supporting the hierarchical
 processes defined in the standard.
 We provide a set of library routines for reading and writing JPEG image files,
@@ -89,9 +89,9 @@ The library is intended to be reused in other applications.
 In order to support file conversion and viewing software, we have included
 considerable functionality beyond the bare JPEG coding/decoding capability;
 for example, the color quantization modules are not strictly part of JPEG
-decoding, but they are essential for output to colormapped file formats or
+decoding, but they are essential for output to colormapped file formats.  These
-colormapped displays.  These extra functions can be compiled out of the
+extra functions can be compiled out of the library if not required for a
-library if not required for a particular application.
+particular application.
 We have also included "jpegtran", a utility for lossless transcoding between
 different JPEG processes, and "rdjpgcom" and "wrjpgcom", two simple
@@ -241,7 +241,7 @@ This software implements ITU T.81 | ISO/IEC 10918 with some extensions from
 ITU T.871 | ISO/IEC 10918-5 (JPEG File Interchange Format-- see REFERENCES).
 Informally, the term "JPEG image" or "JPEG file" most often refers to JFIF or
 a subset thereof, but there are other formats containing the name "JPEG" that
-are incompatible with the DCT-based JPEG standard or with JFIF (for instance,
+are incompatible with the original JPEG standard or with JFIF (for instance,
 JPEG 2000 and JPEG XR).  This software therefore does not support these
 formats.  Indeed, one of the original reasons for developing this free software
 was to help force convergence on a common, interoperable format standard for
--- a/README.md
+++ b/README.md
@@ -1,357 +1,29 @@
-Background
+Mozilla JPEG Encoder Project [![Build Status](https://ci.appveyor.com/api/projects/status/github/mozilla/mozjpeg?branch=master&svg=true)](https://ci.appveyor.com/project/kornel/mozjpeg-4ekrx)
-==========
+============================
-libjpeg-turbo is a JPEG image codec that uses SIMD instructions to accelerate
+MozJPEG improves JPEG compression efficiency achieving higher visual quality and smaller file sizes at the same time. It is compatible with the JPEG standard, and the vast majority of the world's deployed JPEG decoders.
 baseline JPEG compression and decompression on x86, x86-64, Arm, PowerPC, and
 MIPS systems, as well as progressive JPEG compression on x86, x86-64, and Arm
 systems.  On such systems, libjpeg-turbo is generally 2-6x as fast as libjpeg,
 all else being equal.  On other types of systems, libjpeg-turbo can still
 outperform libjpeg by a significant amount, by virtue of its highly-optimized
 Huffman coding routines.  In many cases, the performance of libjpeg-turbo
 rivals that of proprietary high-speed JPEG codecs.
-libjpeg-turbo implements both the traditional libjpeg API as well as the less
+MozJPEG is a patch for [libjpeg-turbo](https://github.com/libjpeg-turbo/libjpeg-turbo). **Please send pull requests to libjpeg-turbo** if the changes aren't specific to newly-added MozJPEG-only compression code. This project aims to keep differences with libjpeg-turbo minimal, so whenever possible, improvements and bug fixes should go there first.
 powerful but more straightforward TurboJPEG API.  libjpeg-turbo also features
 colorspace extensions that allow it to compress from/decompress to 32-bit and
 big-endian pixel buffers (RGBX, XBGR, etc.), as well as a full-featured Java
 interface.
-libjpeg-turbo was originally based on libjpeg/SIMD, an MMX-accelerated
+MozJPEG is compatible with the libjpeg API and ABI. It is intended to be a drop-in replacement for libjpeg. MozJPEG is a strict superset of libjpeg-turbo's functionality. All MozJPEG's improvements can be disabled at run time, and in that case it behaves exactly like libjpeg-turbo.
 derivative of libjpeg v6b developed by Miyasaka Masaru.  The TigerVNC and
 VirtualGL projects made numerous enhancements to the codec in 2009, and in
 early 2010, libjpeg-turbo spun off into an independent project, with the goal
 of making high-speed JPEG compression/decompression technology available to a
 broader range of users and developers.
 MozJPEG is meant to be used as a library in graphics programs and image processing tools. We include a demo `cjpeg` command-line tool, but it's not intended for serious use. We encourage authors of graphics programs to use libjpeg's [C API](libjpeg.txt) and link with MozJPEG library instead.
-License
+## Features
 =======
-libjpeg-turbo is covered by three compatible BSD-style open source licenses.
+* Progressive encoding with "jpegrescan" optimization. It can be applied to any JPEG file (with `jpegtran`) to losslessly reduce file size.
-Refer to [LICENSE.md](LICENSE.md) for a roll-up of license terms.
+* Trellis quantization. When converting other formats to JPEG it maximizes quality/filesize ratio.
 * Comes with new quantization table presets, e.g. tuned for high-resolution displays.
 * Fully compatible with all web browsers.
 * Can be seamlessly integrated into any program that uses the industry-standard libjpeg API. There's no need to write any MozJPEG-specific integration code.
 ## Releases
-Building libjpeg-turbo
+* [Latest release](https://github.com/mozilla/mozjpeg/releases/latest)
-======================
+* [Overview of 3.0 features](https://calendar.perfplanet.com/2014/mozjpeg-3-0/)
 * [Version 2.0 Announcement](https://blog.mozilla.org/research/2014/07/15/mozilla-advances-jpeg-encoding-with-mozjpeg-2-0/)
 * [Version 1.0 Announcement](https://blog.mozilla.org/research/2014/03/05/introducing-the-mozjpeg-project/)
-Refer to [BUILDING.md](BUILDING.md) for complete instructions.
+## Compiling
-
+See [BUILDING](BUILDING.md). MozJPEG is built exactly the same way as libjpeg-turbo, so if you need additional help please consult [libjpeg-turbo documentation](https://libjpeg-turbo.org/).
 Using libjpeg-turbo
 ===================
 libjpeg-turbo includes two APIs that can be used to compress and decompress
 JPEG images:
 - **TurboJPEG API**<br>
  This API provides an easy-to-use interface for compressing and decompressing
  JPEG images in memory.  It also provides some functionality that would not be
  straightforward to achieve using the underlying libjpeg API, such as
  generating planar YUV images and performing multiple simultaneous lossless
  transforms on an image.  The Java interface for libjpeg-turbo is written on
  top of the TurboJPEG API.  The TurboJPEG API is recommended for first-time
  users of libjpeg-turbo.  Refer to [tjexample.c](tjexample.c) and
  [TJExample.java](java/TJExample.java) for examples of its usage and to
  <http://libjpeg-turbo.org/Documentation/Documentation> for API documentation.
 - **libjpeg API**<br>
  This is the de facto industry-standard API for compressing and decompressing
  JPEG images.  It is more difficult to use than the TurboJPEG API but also
  more powerful.  The libjpeg API implementation in libjpeg-turbo is both
  API/ABI-compatible and mathematically compatible with libjpeg v6b.  It can
  also optionally be configured to be API/ABI-compatible with libjpeg v7 and v8
  (see below.)  Refer to [cjpeg.c](cjpeg.c) and [djpeg.c](djpeg.c) for examples
  of its usage and to [libjpeg.txt](libjpeg.txt) for API documentation.
 There is no significant performance advantage to either API when both are used
 to perform similar operations.
 Colorspace Extensions
 ---------------------
 libjpeg-turbo includes extensions that allow JPEG images to be compressed
 directly from (and decompressed directly to) buffers that use BGR, BGRX,
 RGBX, XBGR, and XRGB pixel ordering.  This is implemented with ten new
 colorspace constants:
    JCS_EXT_RGB   /* red/green/blue */
    JCS_EXT_RGBX  /* red/green/blue/x */
    JCS_EXT_BGR   /* blue/green/red */
    JCS_EXT_BGRX  /* blue/green/red/x */
    JCS_EXT_XBGR  /* x/blue/green/red */
    JCS_EXT_XRGB  /* x/red/green/blue */
    JCS_EXT_RGBA  /* red/green/blue/alpha */
    JCS_EXT_BGRA  /* blue/green/red/alpha */
    JCS_EXT_ABGR  /* alpha/blue/green/red */
    JCS_EXT_ARGB  /* alpha/red/green/blue */
 Setting `cinfo.in_color_space` (compression) or `cinfo.out_color_space`
 (decompression) to one of these values will cause libjpeg-turbo to read the
 red, green, and blue values from (or write them to) the appropriate position in
 the pixel when compressing from/decompressing to an RGB buffer.
 Your application can check for the existence of these extensions at compile
 time with:
    #ifdef JCS_EXTENSIONS
 At run time, attempting to use these extensions with a libjpeg implementation
 that does not support them will result in a "Bogus input colorspace" error.
 Applications can trap this error in order to test whether run-time support is
 available for the colorspace extensions.
 When using the RGBX, BGRX, XBGR, and XRGB colorspaces during decompression, the
 X byte is undefined, and in order to ensure the best performance, libjpeg-turbo
 can set that byte to whatever value it wishes.  If an application expects the X
 byte to be used as an alpha channel, then it should specify `JCS_EXT_RGBA`,
 `JCS_EXT_BGRA`, `JCS_EXT_ABGR`, or `JCS_EXT_ARGB`.  When these colorspace
 constants are used, the X byte is guaranteed to be 0xFF, which is interpreted
 as opaque.
 Your application can check for the existence of the alpha channel colorspace
 extensions at compile time with:
    #ifdef JCS_ALPHA_EXTENSIONS
 [jcstest.c](jcstest.c), located in the libjpeg-turbo source tree, demonstrates
 how to check for the existence of the colorspace extensions at compile time and
 run time.
 libjpeg v7 and v8 API/ABI Emulation
 -----------------------------------
 With libjpeg v7 and v8, new features were added that necessitated extending the
 compression and decompression structures.  Unfortunately, due to the exposed
 nature of those structures, extending them also necessitated breaking backward
 ABI compatibility with previous libjpeg releases.  Thus, programs that were
 built to use libjpeg v7 or v8 did not work with libjpeg-turbo, since it is
 based on the libjpeg v6b code base.  Although libjpeg v7 and v8 are not
 as widely used as v6b, enough programs (including a few Linux distros) made
 the switch that there was a demand to emulate the libjpeg v7 and v8 ABIs
 in libjpeg-turbo.  It should be noted, however, that this feature was added
 primarily so that applications that had already been compiled to use libjpeg
 v7+ could take advantage of accelerated baseline JPEG encoding/decoding
 without recompiling.  libjpeg-turbo does not claim to support all of the
 libjpeg v7+ features, nor to produce identical output to libjpeg v7+ in all
 cases (see below.)
 By passing an argument of `-DWITH_JPEG7=1` or `-DWITH_JPEG8=1` to `cmake`, you
 can build a version of libjpeg-turbo that emulates the libjpeg v7 or v8 ABI, so
 that programs that are built against libjpeg v7 or v8 can be run with
 libjpeg-turbo.  The following section describes which libjpeg v7+ features are
 supported and which aren't.
 ### Support for libjpeg v7 and v8 Features
 #### Fully supported
 - **libjpeg API: IDCT scaling extensions in decompressor**<br>
  libjpeg-turbo supports IDCT scaling with scaling factors of 1/8, 1/4, 3/8,
  1/2, 5/8, 3/4, 7/8, 9/8, 5/4, 11/8, 3/2, 13/8, 7/4, 15/8, and 2/1 (only 1/4
  and 1/2 are SIMD-accelerated.)
 - **libjpeg API: Arithmetic coding**
 - **libjpeg API: In-memory source and destination managers**<br>
  See notes below.
 - **cjpeg: Separate quality settings for luminance and chrominance**<br>
  Note that the libpjeg v7+ API was extended to accommodate this feature only
  for convenience purposes.  It has always been possible to implement this
  feature with libjpeg v6b (see rdswitch.c for an example.)
 - **cjpeg: 32-bit BMP support**
 - **cjpeg: `-rgb` option**
 - **jpegtran: Lossless cropping**
 - **jpegtran: `-perfect` option**
 - **jpegtran: Forcing width/height when performing lossless crop**
 - **rdjpgcom: `-raw` option**
 - **rdjpgcom: Locale awareness**
 #### Not supported
 NOTE:  As of this writing, extensive research has been conducted into the
 usefulness of DCT scaling as a means of data reduction and SmartScale as a
 means of quality improvement.  Readers are invited to peruse the research at
 <http://www.libjpeg-turbo.org/About/SmartScale> and draw their own conclusions,
 but it is the general belief of our project that these features have not
 demonstrated sufficient usefulness to justify inclusion in libjpeg-turbo.
 - **libjpeg API: DCT scaling in compressor**<br>
  `cinfo.scale_num` and `cinfo.scale_denom` are silently ignored.
  There is no technical reason why DCT scaling could not be supported when
  emulating the libjpeg v7+ API/ABI, but without the SmartScale extension (see
  below), only scaling factors of 1/2, 8/15, 4/7, 8/13, 2/3, 8/11, 4/5, and
  8/9 would be available, which is of limited usefulness.
 - **libjpeg API: SmartScale**<br>
  `cinfo.block_size` is silently ignored.
  SmartScale is an extension to the JPEG format that allows for DCT block
  sizes other than 8x8.  Providing support for this new format would be
  feasible (particularly without full acceleration.)  However, until/unless
  the format becomes either an official industry standard or, at minimum, an
  accepted solution in the community, we are hesitant to implement it, as
  there is no sense of whether or how it might change in the future.  It is
  our belief that SmartScale has not demonstrated sufficient usefulness as a
  lossless format nor as a means of quality enhancement, and thus our primary
  interest in providing this feature would be as a means of supporting
  additional DCT scaling factors.
 - **libjpeg API: Fancy downsampling in compressor**<br>
  `cinfo.do_fancy_downsampling` is silently ignored.
  This requires the DCT scaling feature, which is not supported.
 - **jpegtran: Scaling**<br>
  This requires both the DCT scaling and SmartScale features, which are not
  supported.
 - **Lossless RGB JPEG files**<br>
  This requires the SmartScale feature, which is not supported.
 ### What About libjpeg v9?
 libjpeg v9 introduced yet another field to the JPEG compression structure
 (`color_transform`), thus making the ABI backward incompatible with that of
 libjpeg v8.  This new field was introduced solely for the purpose of supporting
 lossless SmartScale encoding.  Furthermore, there was actually no reason to
 extend the API in this manner, as the color transform could have just as easily
 been activated by way of a new JPEG colorspace constant, thus preserving
 backward ABI compatibility.
 Our research (see link above) has shown that lossless SmartScale does not
 generally accomplish anything that can't already be accomplished better with
 existing, standard lossless formats.  Therefore, at this time it is our belief
 that there is not sufficient technical justification for software projects to
 upgrade from libjpeg v8 to libjpeg v9, and thus there is not sufficient
 technical justification for us to emulate the libjpeg v9 ABI.
 In-Memory Source/Destination Managers
 -------------------------------------
 By default, libjpeg-turbo 1.3 and later includes the `jpeg_mem_src()` and
 `jpeg_mem_dest()` functions, even when not emulating the libjpeg v8 API/ABI.
 Previously, it was necessary to build libjpeg-turbo from source with libjpeg v8
 API/ABI emulation in order to use the in-memory source/destination managers,
 but several projects requested that those functions be included when emulating
 the libjpeg v6b API/ABI as well.  This allows the use of those functions by
 programs that need them, without breaking ABI compatibility for programs that
 don't, and it allows those functions to be provided in the "official"
 libjpeg-turbo binaries.
 Those who are concerned about maintaining strict conformance with the libjpeg
 v6b or v7 API can pass an argument of `-DWITH_MEM_SRCDST=0` to `cmake` prior to
 building libjpeg-turbo.  This will restore the pre-1.3 behavior, in which
 `jpeg_mem_src()` and `jpeg_mem_dest()` are only included when emulating the
 libjpeg v8 API/ABI.
 On Un*x systems, including the in-memory source/destination managers changes
 the dynamic library version from 62.2.0 to 62.3.0 if using libjpeg v6b API/ABI
 emulation and from 7.2.0 to 7.3.0 if using libjpeg v7 API/ABI emulation.
 Note that, on most Un*x systems, the dynamic linker will not look for a
 function in a library until that function is actually used.  Thus, if a program
 is built against libjpeg-turbo 1.3+ and uses `jpeg_mem_src()` or
 `jpeg_mem_dest()`, that program will not fail if run against an older version
 of libjpeg-turbo or against libjpeg v7- until the program actually tries to
 call `jpeg_mem_src()` or `jpeg_mem_dest()`.  Such is not the case on Windows.
 If a program is built against the libjpeg-turbo 1.3+ DLL and uses
 `jpeg_mem_src()` or `jpeg_mem_dest()`, then it must use the libjpeg-turbo 1.3+
 DLL at run time.
 Both cjpeg and djpeg have been extended to allow testing the in-memory
 source/destination manager functions.  See their respective man pages for more
 details.
 Mathematical Compatibility
 ==========================
 For the most part, libjpeg-turbo should produce identical output to libjpeg
 v6b.  The one exception to this is when using the floating point DCT/IDCT, in
 which case the outputs of libjpeg v6b and libjpeg-turbo can differ for the
 following reasons:
 - The SSE/SSE2 floating point DCT implementation in libjpeg-turbo is ever so
  slightly more accurate than the implementation in libjpeg v6b, but not by
  any amount perceptible to human vision (generally in the range of 0.01 to
  0.08 dB gain in PNSR.)
 - When not using the SIMD extensions, libjpeg-turbo uses the more accurate
  (and slightly faster) floating point IDCT algorithm introduced in libjpeg
  v8a as opposed to the algorithm used in libjpeg v6b.  It should be noted,
  however, that this algorithm basically brings the accuracy of the floating
  point IDCT in line with the accuracy of the accurate integer IDCT.  The
  floating point DCT/IDCT algorithms are mainly a legacy feature, and they do
  not produce significantly more accuracy than the accurate integer algorithms
  (to put numbers on this, the typical difference in PNSR between the two
  algorithms is less than 0.10 dB, whereas changing the quality level by 1 in
  the upper range of the quality scale is typically more like a 1.0 dB
  difference.)
 - If the floating point algorithms in libjpeg-turbo are not implemented using
  SIMD instructions on a particular platform, then the accuracy of the
  floating point DCT/IDCT can depend on the compiler settings.
 While libjpeg-turbo does emulate the libjpeg v8 API/ABI, under the hood it is
 still using the same algorithms as libjpeg v6b, so there are several specific
 cases in which libjpeg-turbo cannot be expected to produce the same output as
 libjpeg v8:
 - When decompressing using scaling factors of 1/2 and 1/4, because libjpeg v8
  implements those scaling algorithms differently than libjpeg v6b does, and
  libjpeg-turbo's SIMD extensions are based on the libjpeg v6b behavior.
 - When using chrominance subsampling, because libjpeg v8 implements this
  with its DCT/IDCT scaling algorithms rather than with a separate
  downsampling/upsampling algorithm.  In our testing, the subsampled/upsampled
  output of libjpeg v8 is less accurate than that of libjpeg v6b for this
  reason.
 - When decompressing using a scaling factor > 1 and merged (AKA "non-fancy" or
  "non-smooth") chrominance upsampling, because libjpeg v8 does not support
  merged upsampling with scaling factors > 1.
 Performance Pitfalls
 ====================
 Restart Markers
 ---------------
 The optimized Huffman decoder in libjpeg-turbo does not handle restart markers
 in a way that makes the rest of the libjpeg infrastructure happy, so it is
 necessary to use the slow Huffman decoder when decompressing a JPEG image that
 has restart markers.  This can cause the decompression performance to drop by
 as much as 20%, but the performance will still be much greater than that of
 libjpeg.  Many consumer packages, such as Photoshop, use restart markers when
 generating JPEG images, so images generated by those programs will experience
 this issue.
 Fast Integer Forward DCT at High Quality Levels
 -----------------------------------------------
 The algorithm used by the SIMD-accelerated quantization function cannot produce
 correct results whenever the fast integer forward DCT is used along with a JPEG
 quality of 98-100.  Thus, libjpeg-turbo must use the non-SIMD quantization
 function in those cases.  This causes performance to drop by as much as 40%.
 It is therefore strongly advised that you use the accurate integer forward DCT
 whenever encoding images with a JPEG quality of 98 or higher.
 Memory Debugger Pitfalls
 ========================
 Valgrind and Memory Sanitizer (MSan) can generate false positives
 (specifically, incorrect reports of uninitialized memory accesses) when used
 with libjpeg-turbo's SIMD extensions.  It is generally recommended that the
 SIMD extensions be disabled, either by passing an argument of `-DWITH_SIMD=0`
 to `cmake` when configuring the build or by setting the environment variable
 `JSIMD_FORCENONE` to `1` at run time, when testing libjpeg-turbo with Valgrind,
 MSan, or other memory debuggers.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,99 +1,62 @@
 image: Visual Studio 2019
 configuration: Release
 platform:
  - Win32
  - x64
 install:
-  - cmd: >-
+  - if %PLATFORM% == Win32 (set ARCH=x86)
-      if not exist c:\installers mkdir c:\installers
+  - if %PLATFORM% == x64 (set ARCH=x64)
  ## Set up nasm
  - choco install nasm
  - set PATH=%PATH%;C:\Program Files\NASM
  ## Set up libpng
  - cd C:\Tools\vcpkg
  - vcpkg install libpng:%ARCH%-windows
  - vcpkg install libpng:%ARCH%-windows-static
-      mkdir c:\temp
+before_build:
-
+  - cd %APPVEYOR_BUILD_FOLDER%
-      if not exist c:\installers\nasm-2.10.01-win32.zip curl -fSL -o c:\installers\nasm-2.10.01-win32.zip http://www.nasm.us/pub/nasm/releasebuilds/2.10.01/win32/nasm-2.10.01-win32.zip
+  - nasm -v
-
+  - cmake --version
-      7z x c:\installers\nasm-2.10.01-win32.zip -oc:\ > c:\installers\nasm.install.log
+  - git describe --always --tags --dirty
-
+  - FOR /F %%a in ('git describe --always --tags --dirty') do set GIT_VERSION=%%a
      if not exist c:\installers\i686-6.4.0-release-posix-dwarf-rt_v5-rev0.7z curl -fSL -o c:\installers\i686-6.4.0-release-posix-dwarf-rt_v5-rev0.7z "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win32/Personal Builds/mingw-builds/6.4.0/threads-posix/dwarf/i686-6.4.0-release-posix-dwarf-rt_v5-rev0.7z"
      md "c:\Program Files (x86)\mingw-w64\i686-6.4.0-posix-dwarf-rt_v5-rev0"
      7z x c:\installers\i686-6.4.0-release-posix-dwarf-rt_v5-rev0.7z -o"c:\Program Files (x86)\mingw-w64\i686-6.4.0-posix-dwarf-rt_v5-rev0" > c:\installers\mingw32.install.log
      if not exist c:\installers\x86_64-6.4.0-release-posix-seh-rt_v5-rev0.7z curl -fSL -o c:\installers\x86_64-6.4.0-release-posix-seh-rt_v5-rev0.7z "https://sourceforge.net/projects/mingw-w64/files/Toolchains targetting Win64/Personal Builds/mingw-builds/6.4.0/threads-posix/seh/x86_64-6.4.0-release-posix-seh-rt_v5-rev0.7z"
      md "c:\Program Files\mingw-w64\x86_64-6.4.0-posix-seh-rt_v5-rev0"
      7z x c:\installers\x86_64-6.4.0-release-posix-seh-rt_v5-rev0.7z -o"c:\Program Files\mingw-w64\x86_64-6.4.0-posix-seh-rt_v5-rev0" > c:\installers\mingw64.install.log
      set PATH=c:\nasm-2.10.01;c:\Program Files (x86)\NSIS;c:\msys64\usr\bin;%PATH%
      "c:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin\amd64\vcvars64.bat"
      set INCLUDE
      set LIB
      set PATH
      set MSYSTEM=MINGW32
      mklink /d "%ProgramData%\Oracle\Java32" "c:\Program Files (x86)\Java\jdk1.6.0"
      git clone --depth=1 https://github.com/libjpeg-turbo/buildscripts.git -b %APPVEYOR_REPO_BRANCH% c:/buildscripts
 cache:
  - c:\installers\nasm-2.10.01-win32.zip -> appveyor.yml
  - c:\installers\i686-6.4.0-release-posix-dwarf-rt_v5-rev0.7z -> appveyor.yml
  - c:\installers\x86_64-6.4.0-release-posix-seh-rt_v5-rev0.7z -> appveyor.yml
 build_script:
-  - cmd: >-
+  ## Build shared
-      for /f %%i in ('"cygpath %CD%"') do set MINGWPATH=%%i
+  - cmake -B shared -A %PLATFORM%
          -DENABLE_SHARED=1 -DENABLE_STATIC=0
          -DREQUIRE_SIMD=1
          -DCMAKE_TOOLCHAIN_FILE=C:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
-      bash c:/buildscripts/buildljt -d %MINGWPATH% -b /c/ljt.nightly -v
+  - cmake --build shared --config Release
-      cmake --build . --target clean
+  ## Build static
  - cmake -B static -A %PLATFORM%
          -DENABLE_SHARED=0 -DENABLE_STATIC=1
          -DREQUIRE_SIMD=1
          -DCMAKE_TOOLCHAIN_FILE=C:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake
          -DVCPKG_TARGET_TRIPLET=%ARCH%-windows-static
-      md win64
+  - cmake --build static --config Release
-      cd win64
+after_build:
-
+  - 7z a mozjpeg-%GIT_VERSION%-win-%ARCH%.zip shared/Release static/Release
      bash c:/buildscripts/setupscripts/win64 -DCMAKE_C_FLAGS='-DWIN32 -D_WINDOWS -W4 -wd4100 -wd4127 -wd4245 -wd4324 -wd4701 -wd4702 -wd4706 -WX'
      cd ..
      ninja
      move c:\ljt.nightly\files\*.tar.gz .
      move c:\ljt.nightly\files\*.exe .
      move c:\ljt.nightly\files\*.html .
      move c:\ljt.nightly\log-windows.txt .
 artifacts:
-  - path: '*.tar.gz'
+  - path: '*.zip'
    name: Source tarball
-  - path: '*-gcc*.exe'
+cache:
-    name: SDK for MinGW
+  - C:\ProgramData\chocolatey\bin
-
+  - C:\ProgramData\chocolatey\lib
-  - path: '*-vc*.exe'
+  - C:\Program Files\NASM
-    name: SDK for Visual C++
+  - C:\tools\vcpkg\installed
  - path: 'log-windows.txt'
    name: Build log
  - path: 'index.html'
    name: MD5 checksums
 test: off
 deploy:
-  provider: S3
+  description: 'Automated build using Appveyor'
-  access_key_id:
+  provider: GitHub
-    secure: Z74OYogQ6bNV/I+6b5ZEXig74+6MW2WLER0v/bPM/uk=
+  auth_token:
-  secret_access_key:
+    secure: 2Jj47Q5HnaPob9U4yX2t4q4TYTw4JWU6cS56mM12aoRLgfYkZ4gRZPySIzfmTPqC
-    secure: cyGZhHVCFwZ9jgf5lXoW69mVtECmqwx3eLo61ha8ueWbMYlHho7lwDXwVvxOFiCa
+  artifact: /.*\.zip/
-  bucket: libjpeg-turbo-pr
+  on:
-  region:
+    APPVEYOR_REPO_TAG: true        # deploy on tag push only
    secure: qSElYBgBRcEUf88M6Osthw==
  folder: $(APPVEYOR_REPO_BRANCH)/windows
  set_public: true
  remove_files: true
--- a/cderror.h
+++ b/cderror.h
@@ -5,7 +5,7 @@
 * Copyright (C) 1994-1997, Thomas G. Lane.
 * Modified 2009-2017 by Guido Vollbeding.
 * libjpeg-turbo Modifications:
- * Copyright (C) 2021, D. R. Commander.
+ * Copyright (C) 2021, 2024, D. R. Commander.
 * For conditions of distribution and use, see the accompanying README.ijg
 * file.
 *
@@ -42,7 +42,6 @@ typedef enum {
 JMESSAGE(JMSG_FIRSTADDONCODE = 1000, NULL) /* Must be first entry! */
 #ifdef BMP_SUPPORTED
 JMESSAGE(JERR_BMP_BADCMAP, "Unsupported BMP colormap format")
 JMESSAGE(JERR_BMP_BADDEPTH, "Only 8-, 24-, and 32-bit BMP files are supported")
 JMESSAGE(JERR_BMP_BADHEADER, "Invalid BMP file: bad header length")
@@ -56,9 +55,7 @@ JMESSAGE(JTRC_BMP, "%ux%u %d-bit BMP image")
 JMESSAGE(JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image")
 JMESSAGE(JTRC_BMP_OS2, "%ux%u %d-bit OS2 BMP image")
 JMESSAGE(JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image")
 #endif /* BMP_SUPPORTED */
 #ifdef GIF_SUPPORTED
 JMESSAGE(JERR_GIF_BUG, "GIF output got confused")
 JMESSAGE(JERR_GIF_CODESIZE, "Bogus GIF codesize %d")
 JMESSAGE(JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB")
@@ -74,43 +71,42 @@ JMESSAGE(JWRN_GIF_BADDATA, "Corrupt data in GIF file")
 JMESSAGE(JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring")
 JMESSAGE(JWRN_GIF_ENDCODE, "Premature end of GIF image")
 JMESSAGE(JWRN_GIF_NOMOREDATA, "Ran out of GIF bits")
 #endif /* GIF_SUPPORTED */
 #ifdef PPM_SUPPORTED
 JMESSAGE(JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB")
 JMESSAGE(JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file")
 JMESSAGE(JERR_PPM_NOT, "Not a PPM/PGM file")
 JMESSAGE(JERR_PPM_OUTOFRANGE, "Numeric value out of range in PPM file")
-JMESSAGE(JTRC_PGM, "%ux%u PGM image")
+JMESSAGE(JTRC_PGM, "%ux%u PGM image (maximum color value = %u)")
-JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image")
+JMESSAGE(JTRC_PGM_TEXT, "%ux%u text PGM image (maximum color value = %u)")
-JMESSAGE(JTRC_PPM, "%ux%u PPM image")
+JMESSAGE(JTRC_PPM, "%ux%u PPM image (maximum color value = %u)")
-JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image")
+JMESSAGE(JTRC_PPM_TEXT, "%ux%u text PPM image (maximum color value = %u)")
 #endif /* PPM_SUPPORTED */
 #ifdef TARGA_SUPPORTED
 JMESSAGE(JERR_TGA_BADCMAP, "Unsupported Targa colormap format")
 JMESSAGE(JERR_TGA_BADPARMS, "Invalid or unsupported Targa file")
 JMESSAGE(JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB")
 JMESSAGE(JTRC_TGA, "%ux%u RGB Targa image")
 JMESSAGE(JTRC_TGA_GRAY, "%ux%u grayscale Targa image")
 JMESSAGE(JTRC_TGA_MAPPED, "%ux%u colormapped Targa image")
 #else
 JMESSAGE(JERR_TGA_NOTCOMP, "Targa support was not compiled")
 #endif /* TARGA_SUPPORTED */
 JMESSAGE(JERR_BAD_CMAP_FILE,
         "Color map file is invalid or of unsupported format")
 JMESSAGE(JERR_TOO_MANY_COLORS,
         "Output file format cannot handle %d colormap entries")
 JMESSAGE(JERR_UNGETC_FAILED, "ungetc failed")
-#ifdef TARGA_SUPPORTED
+#ifdef PNG_SUPPORTED
 JMESSAGE(JERR_UNKNOWN_FORMAT,
-         "Unrecognized input file format --- perhaps you need -targa")
+         "MozJPEG can't read the image (JPEG, PNG and old BMP and Targa are supported)")
 #else
-JMESSAGE(JERR_UNKNOWN_FORMAT, "Unrecognized input file format")
+JMESSAGE(JERR_UNKNOWN_FORMAT, "MozJPEG can't read the image (PNG support is disabled in this build)")
 #endif
 JMESSAGE(JERR_UNSUPPORTED_FORMAT, "Unsupported output file format")
 #ifdef PNG_SUPPORTED
 JMESSAGE(JERR_PNG_ERROR, "Unable to read PNG file: %s")
 JMESSAGE(JERR_PNG_PROFILETOOLARGE, "Embedded profile was too large for this tool - dropped.")
 #endif
 #ifdef JMAKE_ENUM_LIST
  JMSG_LASTADDONCODE
--- a/cdjpeg.h
+++ b/cdjpeg.h
@@ -5,7 +5,8 @@
 * Copyright (C) 1994-1997, Thomas G. Lane.
 * Modified 2019 by Guido Vollbeding.
 * libjpeg-turbo Modifications:
- * Copyright (C) 2017, 2019, 2021, D. R. Commander.
+ * Copyright (C) 2017, 2019, 2021-2022, D. R. Commander.
 * Copyright (C) 2014, Mozilla Corporation.
 * For conditions of distribution and use, see the accompanying README.ijg
 * file.
 *
@@ -20,6 +21,7 @@
 #include "jerror.h"             /* get library error codes too */
 #include "cderror.h"            /* get application-specific error codes */
 #define JPEG_RAW_READER 0
 /*
 * Object interface for cjpeg's source file decoding modules
@@ -35,10 +37,18 @@ struct cjpeg_source_struct {
  FILE *input_file;
  JSAMPARRAY buffer;
-  JDIMENSION buffer_height;
+  J12SAMPARRAY buffer12;
-#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
+#ifdef C_LOSSLESS_SUPPORTED
-  JDIMENSION max_pixels;
+  J16SAMPARRAY buffer16;
 #endif
  JDIMENSION buffer_height;
  JDIMENSION max_pixels;
 #if JPEG_RAW_READER
  // For reading JPEG
  JSAMPARRAY plane_pointer[4];
 #endif
  jpeg_saved_marker_ptr marker_list;
 };
@@ -75,6 +85,10 @@ struct djpeg_dest_struct {
   * height is buffer_height.
   */
  JSAMPARRAY buffer;
  J12SAMPARRAY buffer12;
 #ifdef D_LOSSLESS_SUPPORTED
  J16SAMPARRAY buffer16;
 #endif
  JDIMENSION buffer_height;
 };
@@ -103,14 +117,30 @@ typedef struct cdjpeg_progress_mgr *cd_progress_ptr;
 /* Module selection routines for I/O modules. */
 EXTERN(cjpeg_source_ptr) jinit_read_jpeg (j_compress_ptr cinfo);
 EXTERN(cjpeg_source_ptr) jinit_read_png (j_compress_ptr cinfo);
 EXTERN(cjpeg_source_ptr) jinit_read_bmp(j_compress_ptr cinfo,
                                        boolean use_inversion_array);
 EXTERN(djpeg_dest_ptr) jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2,
                                       boolean use_inversion_array);
 EXTERN(cjpeg_source_ptr) jinit_read_gif(j_compress_ptr cinfo);
 EXTERN(cjpeg_source_ptr) j12init_read_gif(j_compress_ptr cinfo);
 #ifdef C_LOSSLESS_SUPPORTED
 EXTERN(cjpeg_source_ptr) j16init_read_gif(j_compress_ptr cinfo);
 #endif
 EXTERN(djpeg_dest_ptr) jinit_write_gif(j_decompress_ptr cinfo, boolean is_lzw);
 EXTERN(djpeg_dest_ptr) j12init_write_gif(j_decompress_ptr cinfo,
                                         boolean is_lzw);
 EXTERN(cjpeg_source_ptr) jinit_read_ppm(j_compress_ptr cinfo);
 EXTERN(cjpeg_source_ptr) j12init_read_ppm(j_compress_ptr cinfo);
 #ifdef C_LOSSLESS_SUPPORTED
 EXTERN(cjpeg_source_ptr) j16init_read_ppm(j_compress_ptr cinfo);
 #endif
 EXTERN(djpeg_dest_ptr) jinit_write_ppm(j_decompress_ptr cinfo);
 EXTERN(djpeg_dest_ptr) j12init_write_ppm(j_decompress_ptr cinfo);
 #ifdef D_LOSSLESS_SUPPORTED
 EXTERN(djpeg_dest_ptr) j16init_write_ppm(j_decompress_ptr cinfo);
 #endif
 EXTERN(cjpeg_source_ptr) jinit_read_targa(j_compress_ptr cinfo);
 EXTERN(djpeg_dest_ptr) jinit_write_targa(j_decompress_ptr cinfo);
@@ -127,6 +157,7 @@ EXTERN(boolean) set_sample_factors(j_compress_ptr cinfo, char *arg);
 /* djpeg support routines (in rdcolmap.c) */
 EXTERN(void) read_color_map(j_decompress_ptr cinfo, FILE *infile);
 EXTERN(void) read_color_map_12(j_decompress_ptr cinfo, FILE *infile);
 /* common support routines (in cdjpeg.c) */
@@ -156,6 +187,3 @@ EXTERN(FILE *) write_stdout(void);
 #ifndef EXIT_WARNING
 #define EXIT_WARNING  2
 #endif
 #define IsExtRGB(cs) \
  (cs == JCS_RGB || (cs >= JCS_EXT_RGB && cs <= JCS_EXT_ARGB))
--- a/cjpeg.1
+++ b/cjpeg.1
@@ -1,4 +1,4 @@
-.TH CJPEG 1 "30 November 2021"
+.TH CJPEG 1 "30 August 2024"
 .SH NAME
 cjpeg \- compress an image file to a JPEG file
 .SH SYNOPSIS
@@ -16,7 +16,8 @@ cjpeg \- compress an image file to a JPEG file
 compresses the named image file, or the standard input if no file is
 named, and produces a JPEG/JFIF file on the standard output.
 The currently supported input file formats are: PPM (PBMPLUS color
-format), PGM (PBMPLUS grayscale format), BMP, GIF, and Targa.
+format), PGM (PBMPLUS grayscale format), BMP, GIF [legacy feature], and Targa
 [legacy feature].
 .SH OPTIONS
 All switch names may be abbreviated; for example,
 .B \-grayscale
@@ -29,7 +30,7 @@ Upper and lower case are equivalent (thus
 .B \-BMP
 is the same as
 .BR \-bmp ).
-British spellings are also accepted (e.g.,
+British spellings are also accepted (e.g.
 .BR \-greyscale ),
 though for brevity these are not mentioned below.
 .PP
@@ -40,13 +41,12 @@ Scale quantization tables to adjust image quality.  Quality is 0 (worst) to
 100 (best); default is 75.  (See below for more info.)
 .TP
 .B \-grayscale
-Create monochrome JPEG file from color input.  By saying
+Create monochrome JPEG file from color input.  By specifying
 .BR \-grayscale,
 you'll get a smaller JPEG file that takes less time to process.
 .TP
 .B \-rgb
-Create RGB JPEG file.
+Create RGB JPEG file.  Using this switch suppresses the conversion from RGB
 Using this switch suppresses the conversion from RGB
 colorspace input to the default YCbCr JPEG colorspace.
 .TP
 .B \-optimize
@@ -60,18 +60,22 @@ decompression are unaffected by
 .BR \-optimize .
 .TP
 .B \-progressive
-Create progressive JPEG file (see below).
+Create progressive JPEG file (see below).  Implies
 .B \-optimize
 unless
 .B \-arithmetic
 is also specified.
 .TP
 .B \-targa
-Input file is Targa format.  Targa files that contain an "identification"
+Input file is Targa format [legacy feature].  Targa files that contain an
-field will not be automatically recognized by
+"identification" field will not be automatically recognized by
-.BR cjpeg ;
+.BR cjpeg .
-for such files you must specify
+For such files, you must specify
 .B \-targa
 to make
 .B cjpeg
-treat the input as Targa format.
+treat the input as Targa format.  For most Targa files, you won't need this
-For most Targa files, you won't need this switch.
+switch.
 .PP
 The
 .B \-quality
@@ -149,11 +153,82 @@ about the same --- often a little smaller.
 .PP
 Switches for advanced users:
 .TP
 .BI \-precision " N"
 Create JPEG file with N-bit data precision.  N is 8, 12, or 16; default is 8.
 If N is 16, then
 .B -lossless
 must also be specified.  Note that only the PBMPLUS input file format supports
 data precisions other than 8.  (For historical reasons,
 .B cjpeg
 allows GIF input files to be converted into 12-bit-per-sample JPEG files, but
 this is not a useful conversion.)  Note also that PBMPLUS input files are
 silently scaled to the target data precision, even if it is lower than the
 precision of the input file.  Passing an argument of
 .B \-verbose
 to
 .B cjpeg
 will cause it to print information about the precision of the input file.
 .B Caution:
 12-bit and 16-bit data precision is not yet widely implemented, so many
 decoders will be unable to handle a 12-bit-per-sample or 16-bit-per-sample JPEG
 file at all.
 .IP
 .B \-precision\ 12
 implies
 .B \-optimize
 unless
 .B \-arithmetic
 is also specified.
 .TP
 .BI \-lossless " psv[,Pt]"
 Create a lossless JPEG file using the specified predictor selection value
 (1 through 7) and optional point transform (0 through
 .nh
 .I precision
 .hy
 - 1, where
 .nh
 .I precision
 .hy
 is the JPEG data precision in bits).  A point transform value of 0 (the
 default) is necessary in order to create a fully lossless JPEG file.  (A
 non-zero point transform value right-shifts the input samples by the specified
 number of bits, which is effectively a form of lossy color quantization.)
 .B Caution:
 lossless JPEG is not yet widely implemented, so many decoders will be unable to
 handle a lossless JPEG file at all.  In most cases, compressing and
 decompressing a lossless JPEG file is considerably slower than compressing and
 decompressing a lossy JPEG file, and lossless JPEG files are much larger than
 lossy JPEG files.  Also note that the following features will be unavailable
 when compressing or decompressing a lossless JPEG file:
 .IP
 - Quality/quantization table selection
 .IP
 - Color space conversion (the JPEG image will use the same color space as the
 input image)
 .IP
 - Color quantization
 .IP
 - DCT/IDCT algorithm selection
 .IP
 - Smoothing
 .IP
 - Downsampling/upsampling
 .IP
 - IDCT scaling
 .IP
 - Partial image decompression
 .IP
 - Transformations using
 .B jpegtran
 .IP
 Any switches used to enable or configure those features will be ignored.
 .TP
 .B \-arithmetic
 Use arithmetic coding.
 .B Caution:
-arithmetic coded JPEG is not yet widely implemented, so many decoders will be
+arithmetic-coded JPEG is not yet widely implemented, so many decoders will be
-unable to view an arithmetic coded JPEG file at all.
+unable to handle an arithmetic-coded JPEG file at all.
 .TP
 .B \-dct int
 Use accurate integer DCT method (default).
@@ -195,8 +270,18 @@ machines.
 Embed ICC color management profile contained in the specified file.
 .TP
 .BI \-restart " N"
-Emit a JPEG restart marker every N MCU rows, or every N MCU blocks if "B" is
+Emit a JPEG restart marker every N MCU rows, or every N MCUs if "B" is attached
-attached to the number.
+to the number.
 .IP
 In typical JPEG images, an MCU (Minimum Coded Unit) is the minimum set of
 interleaved "data units" (8x8 DCT blocks if the image is lossy or samples if
 the image is lossless) necessary to represent at least one data unit per
 component.  (For example, an MCU in an interleaved lossy JPEG image that uses
 4:2:2 subsampling consists of two luminance blocks followed by one block for
 each chrominance component.)  In single-component or non-interleaved JPEG
 images, an MCU is the same as a data unit.  An MCU row is a row of MCUs
 spanning the entire width of the image.
 .IP
 .B \-restart 0
 (the default) means no restart markers.
 .TP
@@ -296,10 +381,10 @@ This example compresses the PPM file foo.ppm with a quality factor of
 .I foo.jpg
 .SH HINTS
 Color GIF files are not the ideal input for JPEG; JPEG is really intended for
-compressing full-color (24-bit) images.  In particular, don't try to convert
+compressing full-color (24-bit through 48-bit) images.  In particular, don't
-cartoons, line drawings, and other images that have only a few distinct
+try to convert cartoons, line drawings, and other images that have only a few
-colors.  GIF works great on these, JPEG does not.  If you want to convert a
+distinct colors.  GIF works great on these; JPEG does not.  If you want to
-GIF to JPEG, you should experiment with
+convert a GIF to JPEG, you should experiment with
 .BR cjpeg 's
 .B \-quality
 and
@@ -354,8 +439,3 @@ relevant to libjpeg-turbo, to wordsmith certain sections, and to describe
 features not present in libjpeg.
 .SH ISSUES
 Not all variants of BMP and Targa file formats are supported.
 .PP
 The
 .B \-targa
 switch is not a bug, it's a feature.  (It would be a bug if the Targa format
 designers had not been clueless.)
--- a/cjpeg.c
+++ b/cjpeg.c
@@ -4,8 +4,11 @@
 * This file was part of the Independent JPEG Group's software:
 * Copyright (C) 1991-1998, Thomas G. Lane.
 * Modified 2003-2011 by Guido Vollbeding.
 * Lossless JPEG Modifications:
 * Copyright (C) 1999, Ken Murchison.
 * libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2013-2014, 2017, 2019-2022, D. R. Commander.
+ * Copyright (C) 2010, 2013-2014, 2017, 2019-2022, 2024, D. R. Commander.
 * Copyright (C) 2014, Mozilla Corporation.
 * For conditions of distribution and use, see the accompanying README.ijg
 * file.
 *
@@ -76,7 +79,8 @@ static const char * const cdjpeg_message_table[] = {
 */
 static boolean is_targa;        /* records user -targa switch */
-
+static boolean is_jpeg;
 static boolean copy_markers;
 LOCAL(cjpeg_source_ptr)
 select_file_type(j_compress_ptr cinfo, FILE *infile)
@@ -103,16 +107,45 @@ select_file_type(j_compress_ptr cinfo, FILE *infile)
 #endif
 #ifdef GIF_SUPPORTED
  case 'G':
-    return jinit_read_gif(cinfo);
+    if (cinfo->data_precision == 16) {
 #ifdef C_LOSSLESS_SUPPORTED
      return j16init_read_gif(cinfo);
 #else
      ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
      break;
 #endif
    } else if (cinfo->data_precision == 12)
      return j12init_read_gif(cinfo);
    else
      return jinit_read_gif(cinfo);
 #endif
 #ifdef PPM_SUPPORTED
  case 'P':
-    return jinit_read_ppm(cinfo);
+    if (cinfo->data_precision == 16) {
 #ifdef C_LOSSLESS_SUPPORTED
      return j16init_read_ppm(cinfo);
 #else
      ERREXIT1(cinfo, JERR_BAD_PRECISION, cinfo->data_precision);
      break;
 #endif
    } else if (cinfo->data_precision == 12)
      return j12init_read_ppm(cinfo);
    else
      return jinit_read_ppm(cinfo);
 #endif
 #ifdef PNG_SUPPORTED
  case 0x89:
    copy_markers = TRUE;
    return jinit_read_png(cinfo);
 #endif
 #ifdef TARGA_SUPPORTED
  case 0x00:
    return jinit_read_targa(cinfo);
 #endif
  case 0xff:
    is_jpeg = TRUE;
    copy_markers = TRUE;
    return jinit_read_jpeg(cinfo);
  default:
    ERREXIT(cinfo, JERR_UNKNOWN_FORMAT);
    break;
@@ -134,9 +167,9 @@ select_file_type(j_compress_ptr cinfo, FILE *infile)
 static const char *progname;    /* program name for error messages */
 static char *icc_filename;      /* for -icc switch */
 static char *outfilename;       /* for -outfile switch */
-boolean memdst;                 /* for -memdst switch */
+static boolean memdst;          /* for -memdst switch */
-boolean report;                 /* for -report switch */
+static boolean report;          /* for -report switch */
-boolean strict;                 /* for -strict switch */
+static boolean strict;          /* for -strict switch */
 #ifdef CJPEG_FUZZER
@@ -200,10 +233,37 @@ usage(void)
 #ifdef C_PROGRESSIVE_SUPPORTED
  fprintf(stderr, "  -progressive   Create progressive JPEG file\n");
 #endif
  fprintf(stderr, "  -baseline      Create baseline JPEG file (disable progressive coding)\n");
 #ifdef TARGA_SUPPORTED
  fprintf(stderr, "  -targa         Input file is Targa format (usually not needed)\n");
 #endif
  fprintf(stderr, "  -revert        Revert to standard defaults (instead of mozjpeg defaults)\n");
  fprintf(stderr, "  -fastcrush     Disable progressive scan optimization\n");
  fprintf(stderr, "  -dc-scan-opt   DC scan optimization mode\n");
  fprintf(stderr, "                 - 0 One scan for all components\n");
  fprintf(stderr, "                 - 1 One scan per component (default)\n");
  fprintf(stderr, "                 - 2 Optimize between one scan for all components and one scan for 1st component\n");
  fprintf(stderr, "                     plus one scan for remaining components\n");
  fprintf(stderr, "  -notrellis     Disable trellis optimization\n");
  fprintf(stderr, "  -trellis-dc    Enable trellis optimization of DC coefficients (default)\n");
  fprintf(stderr, "  -notrellis-dc  Disable trellis optimization of DC coefficients\n");
  fprintf(stderr, "  -tune-psnr     Tune trellis optimization for PSNR\n");
  fprintf(stderr, "  -tune-hvs-psnr Tune trellis optimization for PSNR-HVS (default)\n");
  fprintf(stderr, "  -tune-ssim     Tune trellis optimization for SSIM\n");
  fprintf(stderr, "  -tune-ms-ssim  Tune trellis optimization for MS-SSIM\n");
  fprintf(stderr, "Switches for advanced users:\n");
  fprintf(stderr, "  -noovershoot   Disable black-on-white deringing via overshoot\n");
  fprintf(stderr, "  -nojfif        Do not write JFIF (reduces size by 18 bytes but breaks standards; no known problems in Web browsers)\n");
  fprintf(stderr, "  -precision N   Create JPEG file with N-bit data precision\n");
 #ifdef C_LOSSLESS_SUPPORTED
  fprintf(stderr, "                 (N is 8, 12, or 16; default is 8; if N is 16, then -lossless\n");
  fprintf(stderr, "                 must also be specified)\n");
 #else
  fprintf(stderr, "                 (N is 8 or 12; default is 8)\n");
 #endif
 #ifdef C_LOSSLESS_SUPPORTED
  fprintf(stderr, "  -lossless psv[,Pt]  Create lossless JPEG file\n");
 #endif
 #ifdef C_ARITH_CODING_SUPPORTED
  fprintf(stderr, "  -arithmetic    Use arithmetic coding\n");
 #endif
@@ -219,6 +279,17 @@ usage(void)
  fprintf(stderr, "  -dct float     Use floating-point DCT method [legacy feature]%s\n",
          (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
 #endif
  fprintf(stderr, "  -quant-baseline Use 8-bit quantization table entries for baseline JPEG compatibility\n");
  fprintf(stderr, "  -quant-table N Use predefined quantization table N:\n");
  fprintf(stderr, "                 - 0 JPEG Annex K\n");
  fprintf(stderr, "                 - 1 Flat\n");
  fprintf(stderr, "                 - 2 Tuned for MS-SSIM on Kodak image set\n");
  fprintf(stderr, "                 - 3 ImageMagick table by N. Robidoux (default)\n");
  fprintf(stderr, "                 - 4 Tuned for PSNR-HVS on Kodak image set\n");
  fprintf(stderr, "                 - 5 Table from paper by Klein, Silverstein and Carney\n");
  fprintf(stderr, "                 - 6 Table from paper by Watson, Taylor and Borthwick\n");
  fprintf(stderr, "                 - 7 Table from paper by Ahumada, Watson, Peterson\n");
  fprintf(stderr, "                 - 8 Table from paper by Peterson, Ahumada and Watson\n");
  fprintf(stderr, "  -icc FILE      Embed ICC profile contained in FILE\n");
  fprintf(stderr, "  -restart N     Set restart interval in rows, or in blocks with B\n");
 #ifdef INPUT_SMOOTHING_SUPPORTED
@@ -226,15 +297,12 @@ usage(void)
 #endif
  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
  fprintf(stderr, "  -outfile name  Specify name for output file\n");
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  fprintf(stderr, "  -memdst        Compress to memory instead of file (useful for benchmarking)\n");
 #endif
  fprintf(stderr, "  -report        Report compression progress\n");
  fprintf(stderr, "  -strict        Treat all warnings as fatal\n");
  fprintf(stderr, "  -verbose  or  -debug   Emit debug output\n");
  fprintf(stderr, "  -version       Print version information and exit\n");
  fprintf(stderr, "Switches for wizards:\n");
  fprintf(stderr, "  -baseline      Force baseline quantization tables\n");
  fprintf(stderr, "  -qtables FILE  Use quantization tables given in FILE\n");
  fprintf(stderr, "  -qslots N[,...]    Set component quantization tables\n");
  fprintf(stderr, "  -sample HxV[,...]  Set component sampling factors\n");
@@ -259,6 +327,9 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
 {
  int argn;
  char *arg;
 #ifdef C_LOSSLESS_SUPPORTED
  int psv = 0, pt = 0;
 #endif
  boolean force_baseline;
  boolean simple_progressive;
  char *qualityarg = NULL;      /* saves -quality parm if any */
@@ -270,7 +341,11 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
  /* Set up default JPEG parameters. */
  force_baseline = FALSE;       /* by default, allow 16-bit quantizers */
 #ifdef C_PROGRESSIVE_SUPPORTED
  simple_progressive = cinfo->num_scans == 0 ? FALSE : TRUE;
 #else
  simple_progressive = FALSE;
 #endif
  is_targa = FALSE;
  icc_filename = NULL;
  outfilename = NULL;
@@ -297,6 +372,9 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
      /* Use arithmetic coding. */
 #ifdef C_ARITH_CODING_SUPPORTED
      cinfo->arith_code = TRUE;
      /* No table optimization required for AC */
      cinfo->optimize_coding = FALSE;
 #else
      fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
              progname);
@@ -306,19 +384,27 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "baseline", 1)) {
      /* Force baseline-compatible output (8-bit quantizer values). */
      force_baseline = TRUE;
      /* Disable multiple scans */
      simple_progressive = FALSE;
      cinfo->num_scans = 0;
      cinfo->scan_info = NULL;
    } else if (keymatch(arg, "dct", 2)) {
      /* Select DCT algorithm. */
-      if (++argn >= argc)       /* advance to next argument */
+      if (++argn >= argc) {      /* advance to next argument */
        fprintf(stderr, "%s: missing argument for dct\n", progname);
        usage();
      }
      if (keymatch(argv[argn], "int", 1)) {
        cinfo->dct_method = JDCT_ISLOW;
      } else if (keymatch(argv[argn], "fast", 2)) {
        cinfo->dct_method = JDCT_IFAST;
      } else if (keymatch(argv[argn], "float", 2)) {
        cinfo->dct_method = JDCT_FLOAT;
-      } else
+      } else {
        fprintf(stderr, "%s: invalid argument for dct\n", progname);
        usage();
      }
    } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) {
      /* Enable debug printouts. */
@@ -328,7 +414,8 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
      if (!printed_version) {
        fprintf(stderr, "%s version %s (build %s)\n",
                PACKAGE_NAME, VERSION, BUILD);
-        fprintf(stderr, "%s\n\n", JCOPYRIGHT);
+        fprintf(stderr, JCOPYRIGHT1);
        fprintf(stderr, JCOPYRIGHT2 "\n");
        fprintf(stderr, "Emulating The Independent JPEG Group's software, version %s\n\n",
                JVERSION);
        printed_version = TRUE;
@@ -340,8 +427,10 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
              PACKAGE_NAME, VERSION, BUILD);
      exit(EXIT_SUCCESS);
-    } else if (keymatch(arg, "grayscale", 2) ||
+    } else if (keymatch(arg, "fastcrush", 4)) {
-               keymatch(arg, "greyscale", 2)) {
+      jpeg_c_set_bool_param(cinfo, JBOOLEAN_OPTIMIZE_SCANS, FALSE);
    } else if (keymatch(arg, "grayscale", 2) || keymatch(arg, "greyscale",2)) {
      /* Force a monochrome JPEG file to be generated. */
      jpeg_set_colorspace(cinfo, JCS_GRAYSCALE);
@@ -349,12 +438,46 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
      /* Force an RGB JPEG file to be generated. */
      jpeg_set_colorspace(cinfo, JCS_RGB);
    } else if (keymatch(arg, "lambda1", 7)) {
      if (++argn >= argc)       /* advance to next argument */
        usage();
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE1,
                             atof(argv[argn]));
    } else if (keymatch(arg, "lambda2", 7)) {
      if (++argn >= argc)       /* advance to next argument */
        usage();
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE2,
                             atof(argv[argn]));
    } else if (keymatch(arg, "icc", 1)) {
      /* Set ICC filename. */
      if (++argn >= argc)       /* advance to next argument */
        usage();
      icc_filename = argv[argn];
    } else if (keymatch(arg, "lossless", 1)) {
      /* Enable lossless mode. */
 #ifdef C_LOSSLESS_SUPPORTED
      char ch = ',', *ptr;
      if (++argn >= argc)       /* advance to next argument */
        usage();
      if (sscanf(argv[argn], "%d%c", &psv, &ch) < 1 || ch != ',')
        usage();
      ptr = argv[argn];
      while (*ptr && *ptr++ != ','); /* advance to next segment of arg
                                        string */
      if (*ptr)
        sscanf(ptr, "%d", &pt);
      /* We must postpone execution until data_precision is known. */
 #else
      fprintf(stderr, "%s: sorry, lossless output was not compiled\n",
              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "maxmemory", 3)) {
      /* Maximum memory in Kb (or Mb with 'm'). */
      long lval;
@@ -368,6 +491,13 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
        lval *= 1000L;
      cinfo->mem->max_memory_to_use = lval * 1000L;
    } else if (keymatch(arg, "dc-scan-opt", 3)) {
      if (++argn >= argc) {      /* advance to next argument */
        fprintf(stderr, "%s: missing argument for dc-scan-opt\n", progname);
        usage();
      }
      jpeg_c_set_int_param(cinfo, JINT_DC_SCAN_OPT_MODE, atoi(argv[argn]));
    } else if (keymatch(arg, "optimize", 1) || keymatch(arg, "optimise", 1)) {
      /* Enable entropy parm optimization. */
 #ifdef ENTROPY_OPT_SUPPORTED
@@ -380,9 +510,27 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "outfile", 4)) {
      /* Set output file name. */
      if (++argn >= argc) {      /* advance to next argument */
        fprintf(stderr, "%s: missing argument for outfile\n", progname);
        usage();
      }
      outfilename = argv[argn]; /* save it away for later use */
    } else if (keymatch(arg, "precision", 3)) {
      /* Set data precision. */
      int val;
      if (++argn >= argc)       /* advance to next argument */
        usage();
-      outfilename = argv[argn]; /* save it away for later use */
+      if (sscanf(argv[argn], "%d", &val) != 1)
        usage();
 #ifdef C_LOSSLESS_SUPPORTED
      if (val != 8 && val != 12 && val != 16)
 #else
      if (val != 8 && val != 12)
 #endif
        usage();
      cinfo->data_precision = val;
    } else if (keymatch(arg, "progressive", 1)) {
      /* Select simple progressive mode. */
@@ -397,18 +545,14 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "memdst", 2)) {
      /* Use in-memory destination manager */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
      memdst = TRUE;
 #else
      fprintf(stderr, "%s: sorry, in-memory destination manager was not compiled in\n",
              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "quality", 1)) {
      /* Quality ratings (quantization table scaling factors). */
-      if (++argn >= argc)       /* advance to next argument */
+      if (++argn >= argc) {      /* advance to next argument */
        fprintf(stderr, "%s: missing argument for quality\n", progname);
        usage();
      }
      qualityarg = argv[argn];
    } else if (keymatch(arg, "qslots", 2)) {
@@ -430,6 +574,21 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "report", 3)) {
      report = TRUE;
    } else if (keymatch(arg, "quant-table", 7)) {
      int val;
      if (++argn >= argc)       /* advance to next argument */
        usage();
      val = atoi(argv[argn]);
      jpeg_c_set_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX, val);
      if (jpeg_c_get_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX) != val) {
        fprintf(stderr, "%s: %d is invalid argument for quant-table\n", progname, val);
        usage();
      }
      jpeg_set_quality(cinfo, 75, TRUE);
    } else if (keymatch(arg, "quant-baseline", 7)) {
      /* Force quantization table to meet baseline requirements */
      force_baseline = TRUE;
    } else if (keymatch(arg, "restart", 1)) {
      /* Restart interval in MCU rows (or in MCUs with 'b'). */
@@ -450,6 +609,11 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
        /* restart_interval will be computed during startup */
      }
    } else if (keymatch(arg, "revert", 3)) {
      /* revert to old JPEG default */
      jpeg_c_set_int_param(cinfo, JINT_COMPRESS_PROFILE, JCP_FASTEST);
      jpeg_set_defaults(cinfo);
    } else if (keymatch(arg, "sample", 2)) {
      /* Set sampling factors. */
      if (++argn >= argc)       /* advance to next argument */
@@ -460,7 +624,7 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
       * default sampling factors.
       */
-    } else if (keymatch(arg, "scans", 4)) {
+    } else if (keymatch(arg, "scans", 2)) {
      /* Set scan script. */
 #ifdef C_MULTISCAN_FILES_SUPPORTED
      if (++argn >= argc)       /* advance to next argument */
@@ -492,7 +656,60 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
      /* Input file is Targa format. */
      is_targa = TRUE;
    } else if (keymatch(arg, "notrellis-dc", 11)) {
      /* disable trellis quantization */
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_TRELLIS_QUANT_DC, FALSE);
    } else if (keymatch(arg, "notrellis", 1)) {
      /* disable trellis quantization */
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_TRELLIS_QUANT, FALSE);
    } else if (keymatch(arg, "trellis-dc-ver-weight", 12)) {
      if (++argn >= argc) {      /* advance to next argument */
        fprintf(stderr, "%s: missing argument for trellis-dc-ver-weight\n", progname);
        usage();
      }
      jpeg_c_set_float_param(cinfo, JFLOAT_TRELLIS_DELTA_DC_WEIGHT, atof(argv[argn]));
    } else if (keymatch(arg, "trellis-dc", 9)) {
      /* enable DC trellis quantization */
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_TRELLIS_QUANT_DC, TRUE);
    } else if (keymatch(arg, "tune-psnr", 6)) {
      jpeg_c_set_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX, 1);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE1, 9.0);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE2, 0.0);
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_USE_LAMBDA_WEIGHT_TBL, FALSE);
      jpeg_set_quality(cinfo, 75, TRUE);
    } else if (keymatch(arg, "tune-ssim", 6)) {
      jpeg_c_set_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX, 1);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE1, 11.5);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE2, 12.75);
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_USE_LAMBDA_WEIGHT_TBL, FALSE);
      jpeg_set_quality(cinfo, 75, TRUE);
    } else if (keymatch(arg, "tune-ms-ssim", 6)) {
      jpeg_c_set_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX, 3);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE1, 12.0);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE2, 13.0);
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_USE_LAMBDA_WEIGHT_TBL, TRUE);
      jpeg_set_quality(cinfo, 75, TRUE);
    } else if (keymatch(arg, "tune-hvs-psnr", 6)) {
      jpeg_c_set_int_param(cinfo, JINT_BASE_QUANT_TBL_IDX, 3);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE1, 14.75);
      jpeg_c_set_float_param(cinfo, JFLOAT_LAMBDA_LOG_SCALE2, 16.5);
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_USE_LAMBDA_WEIGHT_TBL, TRUE);
      jpeg_set_quality(cinfo, 75, TRUE);
    } else if (keymatch(arg, "noovershoot", 11)) {
      jpeg_c_set_bool_param(cinfo, JBOOLEAN_OVERSHOOT_DERINGING, FALSE);
 	} else if (keymatch(arg, "nojfif", 6)) {
      cinfo->write_JFIF_header = 0;
    } else {
      fprintf(stderr, "%s: unknown option '%s'\n", progname, arg);
      usage();                  /* bogus switch */
    }
  }
@@ -504,26 +721,39 @@ parse_switches(j_compress_ptr cinfo, int argc, char **argv,
    /* Set quantization tables for selected quality. */
    /* Some or all may be overridden if -qtables is present. */
    if (qualityarg != NULL)     /* process -quality if it was present */
-      if (!set_quality_ratings(cinfo, qualityarg, force_baseline))
+      if (! set_quality_ratings(cinfo, qualityarg, force_baseline)) {
        fprintf(stderr, "%s: can't set quality ratings\n", progname);
        usage();
      }
    if (qtablefile != NULL)     /* process -qtables if it was present */
-      if (!read_quant_tables(cinfo, qtablefile, force_baseline))
+      if (! read_quant_tables(cinfo, qtablefile, force_baseline)) {
        fprintf(stderr, "%s: can't read qtable file\n", progname);
        usage();
      }
    if (qslotsarg != NULL)      /* process -qslots if it was present */
      if (!set_quant_slots(cinfo, qslotsarg))
        usage();
    /* set_quality_ratings sets default subsampling, so the explicit
       subsampling must be set after it */
    if (samplearg != NULL)      /* process -sample if it was present */
-      if (!set_sample_factors(cinfo, samplearg))
+      if (! set_sample_factors(cinfo, samplearg)) {
        fprintf(stderr, "%s: can't set sample factors\n", progname);
        usage();
      }
 #ifdef C_PROGRESSIVE_SUPPORTED
    if (simple_progressive)     /* process -progressive; -scans can override */
      jpeg_simple_progression(cinfo);
 #endif
 #ifdef C_LOSSLESS_SUPPORTED
    if (psv != 0)               /* process -lossless */
      jpeg_enable_lossless(cinfo, psv, pt);
 #endif
 #ifdef C_MULTISCAN_FILES_SUPPORTED
    if (scansarg != NULL)       /* process -scans if it was present */
      if (!read_scan_script(cinfo, scansarg))
@@ -704,17 +934,18 @@ main(int argc, char **argv)
  (*src_mgr->start_input) (&cinfo, src_mgr);
  /* Now that we know input colorspace, fix colorspace-dependent defaults */
 #if JPEG_RAW_READER
  if (!is_jpeg)
 #endif
  jpeg_default_colorspace(&cinfo);
  /* Adjust default compression parameters by re-parsing the options */
  file_index = parse_switches(&cinfo, argc, argv, 0, TRUE);
  /* Specify data destination for compression */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  if (memdst)
    jpeg_mem_dest(&cinfo, &outbuffer, &outsize);
  else
 #endif
    jpeg_stdio_dest(&cinfo, output_file);
 #ifdef CJPEG_FUZZER
@@ -725,13 +956,66 @@ main(int argc, char **argv)
  /* Start compressor */
  jpeg_start_compress(&cinfo, TRUE);
  /* Copy metadata */
  if (copy_markers) {
    jpeg_saved_marker_ptr marker;
    /* In the current implementation, we don't actually need to examine the
     * option flag here; we just copy everything that got saved.
     * But to avoid confusion, we do not output JFIF and Adobe APP14 markers
     * if the encoder library already wrote one.
     */
    for (marker = src_mgr->marker_list; marker != NULL; marker = marker->next) {
      if (cinfo.write_JFIF_header &&
          marker->marker == JPEG_APP0 &&
          marker->data_length >= 5 &&
          GETJOCTET(marker->data[0]) == 0x4A &&
          GETJOCTET(marker->data[1]) == 0x46 &&
          GETJOCTET(marker->data[2]) == 0x49 &&
          GETJOCTET(marker->data[3]) == 0x46 &&
          GETJOCTET(marker->data[4]) == 0)
        continue;                       /* reject duplicate JFIF */
      if (cinfo.write_Adobe_marker &&
          marker->marker == JPEG_APP0+14 &&
          marker->data_length >= 5 &&
          GETJOCTET(marker->data[0]) == 0x41 &&
          GETJOCTET(marker->data[1]) == 0x64 &&
          GETJOCTET(marker->data[2]) == 0x6F &&
          GETJOCTET(marker->data[3]) == 0x62 &&
          GETJOCTET(marker->data[4]) == 0x65)
        continue;                       /* reject duplicate Adobe */
      jpeg_write_marker(&cinfo, marker->marker, marker->data,
                        marker->data_length);
    }
  }
  if (icc_profile != NULL)
    jpeg_write_icc_profile(&cinfo, icc_profile, (unsigned int)icc_len);
  /* Process data */
  if (cinfo.data_precision == 16) {
 #ifdef C_LOSSLESS_SUPPORTED
    while (cinfo.next_scanline < cinfo.image_height) {
      num_scanlines = (*src_mgr->get_pixel_rows) (&cinfo, src_mgr);
      (void)jpeg16_write_scanlines(&cinfo, src_mgr->buffer16, num_scanlines);
    }
 #else
    ERREXIT1(&cinfo, JERR_BAD_PRECISION, cinfo.data_precision);
 #endif
  } else if (cinfo.data_precision == 12) {
    while (cinfo.next_scanline < cinfo.image_height) {
      num_scanlines = (*src_mgr->get_pixel_rows) (&cinfo, src_mgr);
      (void)jpeg12_write_scanlines(&cinfo, src_mgr->buffer12, num_scanlines);
    }
  } else {
  while (cinfo.next_scanline < cinfo.image_height) {
    num_scanlines = (*src_mgr->get_pixel_rows) (&cinfo, src_mgr);
-    (void)jpeg_write_scanlines(&cinfo, src_mgr->buffer, num_scanlines);
+#if JPEG_RAW_READER
    if (is_jpeg)
      (void) jpeg_write_raw_data(&cinfo, src_mgr->plane_pointer, num_scanlines);
    else
 #endif
      (void)jpeg_write_scanlines(&cinfo, src_mgr->buffer, num_scanlines);
    }
  }
  /* Finish compression and release memory */
--- a/cmakescripts/BuildPackages.cmake
+++ b/cmakescripts/BuildPackages.cmake
@@ -66,7 +66,7 @@ endif() # Linux
 if(WIN32)
-if(MSVC)
+if(MSVC_LIKE)
  set(INST_PLATFORM "Visual C++")
  set(INST_ID vc)
  set(INST_NAME ${CMAKE_PROJECT_NAME}-${VERSION}-${INST_ID})
@@ -90,7 +90,7 @@ if(WITH_JAVA)
  set(INST_DEFS ${INST_DEFS} -DJAVA)
 endif()
-if(MSVC_IDE)
+if(GENERATOR_IS_MULTI_CONFIG)
  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=${CMAKE_CFG_INTDIR}\\")
 else()
  set(INST_DEFS ${INST_DEFS} "-DBUILDDIR=")
@@ -127,8 +127,8 @@ endif() # WIN32
 if(APPLE)
-set(ARMV8_BUILD "" CACHE PATH
+set(SECONDARY_BUILD "" CACHE PATH
-  "Directory containing Armv8 iOS or macOS build to include in universal binaries")
+  "Directory containing cross-compiled x86-64 or Armv8 (64-bit) iOS or macOS build to include in universal binaries")
 set(MACOS_APP_CERT_NAME "" CACHE STRING
  "Name of the Developer ID Application certificate (in the macOS keychain) that should be used to sign the libjpeg-turbo DMG.  Leave this blank to generate an unsigned DMG.")
--- a/cmakescripts/GNUInstallDirs.cmake
+++ b/cmakescripts/GNUInstallDirs.cmake
@@ -118,9 +118,10 @@
 #   absolute paths where necessary, using the same logic.
 #=============================================================================
 # Copyright 2018 Tobias C. Berner
 # Copyright 2018 Matthias Räncker
-# Copyright 2016, 2019 D. R. Commander
+# Copyright 2016, 2019, 2024 D. R. Commander
-# Copyright 2016 Dmitry Marakasov
+# Copyright 2016, 2021 Dmitry Marakasov
 # Copyright 2016 Roger Leigh
 # Copyright 2015 Alex Turbov
 # Copyright 2014 Rolf Eike Beer
@@ -181,6 +182,10 @@ macro(GNUInstallDirs_set_install_dir var docstring)
    set(_GNUInstallDirs_CMAKE_INSTALL_FORCE_${var} "FORCE")
  endif()
  if(DEFINED CMAKE_INSTALL_${var} AND NOT CMAKE_INSTALL_${var} MATCHES "^/")
    set_property(CACHE CMAKE_INSTALL_${var} PROPERTY TYPE PATH)
  endif()
  set(CMAKE_INSTALL_${var} "${CMAKE_INSTALL_DEFAULT_${var}}" CACHE PATH
    "${docstring} (Default: ${CMAKE_INSTALL_DEFAULT_${var}})"
    ${_GNUInstallDirs_CMAKE_INSTALL_FORCE_${var}})
@@ -300,7 +305,7 @@ GNUInstallDirs_set_install_dir(DATADIR
  "The directory under which read-only architecture-independent data files should be installed")
 if(NOT DEFINED CMAKE_INSTALL_DEFAULT_INFODIR)
-  if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+  if(CMAKE_SYSTEM_NAME MATCHES "^(([^kF].*)?BSD|DragonFly)$")
    set(CMAKE_INSTALL_DEFAULT_INFODIR "info")
  else()
    set(CMAKE_INSTALL_DEFAULT_INFODIR "<CMAKE_INSTALL_DATAROOTDIR>/info")
@@ -310,7 +315,7 @@ GNUInstallDirs_set_install_dir(INFODIR
  "The directory into which info documentation files should be installed")
 if(NOT DEFINED CMAKE_INSTALL_DEFAULT_MANDIR)
-  if(CMAKE_SYSTEM_NAME MATCHES "^(.*BSD|DragonFly)$")
+  if(CMAKE_SYSTEM_NAME MATCHES "^(([^k].*)?BSD|DragonFly)$" AND NOT CMAKE_SYSTEM_NAME MATCHES "^(FreeBSD)$")
    set(CMAKE_INSTALL_DEFAULT_MANDIR "man")
  else()
    set(CMAKE_INSTALL_DEFAULT_MANDIR "<CMAKE_INSTALL_DATAROOTDIR>/man")
--- a/cmakescripts/PackageInfo.cmake
+++ b/cmakescripts/PackageInfo.cmake
@@ -5,8 +5,8 @@ set(PKGNAME ${CMAKE_PROJECT_NAME} CACHE STRING
  "Distribution package name (default: ${CMAKE_PROJECT_NAME})")
 set(PKGVENDOR "The ${CMAKE_PROJECT_NAME} Project" CACHE STRING
  "Vendor name to be included in distribution package descriptions (default: The ${CMAKE_PROJECT_NAME} Project)")
-set(PKGURL "http://www.${CMAKE_PROJECT_NAME}.org" CACHE STRING
+set(PKGURL "https://${CMAKE_PROJECT_NAME}.org" CACHE STRING
-  "URL of project web site to be included in distribution package descriptions (default: http://www.${CMAKE_PROJECT_NAME}.org)")
+  "URL of project web site to be included in distribution package descriptions (default: https://${CMAKE_PROJECT_NAME}.org)")
 set(PKGEMAIL "information@${CMAKE_PROJECT_NAME}.org" CACHE STRING
  "E-mail of project maintainer to be included in distribution package descriptions (default: information@${CMAKE_PROJECT_NAME}.org")
 set(PKGID "com.${CMAKE_PROJECT_NAME}.${PKGNAME}" CACHE STRING
--- a/cmakescripts/testclean.cmake
+++ b/cmakescripts/testclean.cmake
@@ -30,6 +30,15 @@ file(GLOB FILES
  *_411_*.ppm
  *_411_*.jpg
  *_411.yuv
  *_441_*.bmp
  *_441_*.png
  *_441_*.ppm
  *_441_*.jpg
  *_441.yuv
  *_LOSSL*S_*.bmp
  *_LOSSL*S_*.ppm
  *_LOSSL*S_*.jpg
  croptest.log
  tjbenchtest*.log
  tjexampletest*.log)
--- a/cmakescripts/tjbenchtest.cmake
+++ b/cmakescripts/tjbenchtest.cmake
@@ -0,0 +1,77 @@
 if(NOT DEFINED PRECISION)
  message(FATAL_ERROR "PRECISION must be specified")
 endif()
 if(NOT DEFINED WITH_JAVA)
  message(FATAL_ERROR "WITH_JAVA must be specified")
 endif()
 macro(check_error program)
  if(NOT RESULT EQUAL 0)
    message(FATAL_ERROR "${program} failed.")
  endif()
 endmacro()
 macro(run_test PROG ARGS)
  string(REPLACE ";" " " SPACED_ARGS "${ARGS}")
  message(STATUS "${PROG} ${SPACED_ARGS}")
  execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${PROG} ${ARGS}
    RESULT_VARIABLE RESULT)
  check_error("${PROG} ${SPACED_ARGS}")
 endmacro()
 if(NOT PRECISION EQUAL 16)
  run_test(tjbenchtest "-precision;${PRECISION}")
  run_test(tjbenchtest "-precision;${PRECISION};-alloc")
 endif()
 if(PRECISION EQUAL 8)
  run_test(tjbenchtest "-precision;${PRECISION};-yuv")
  run_test(tjbenchtest "-precision;${PRECISION};-yuv;-alloc")
  run_test(tjbenchtest "-precision;${PRECISION};-optimize")
  run_test(tjbenchtest "-precision;${PRECISION};-optimize;-yuv")
 endif()
 if(NOT PRECISION EQUAL 16)
  run_test(tjbenchtest "-precision;${PRECISION};-progressive")
 endif()
 if(PRECISION EQUAL 8)
  run_test(tjbenchtest "-precision;${PRECISION};-progressive;-yuv")
 endif()
 if(NOT PRECISION EQUAL 16)
  run_test(tjbenchtest "-precision;${PRECISION};-arithmetic")
  run_test(tjbenchtest "-precision;${PRECISION};-progressive;-arithmetic")
 endif()
 if(PRECISION EQUAL 8)
  run_test(tjbenchtest "-precision;${PRECISION};-arithmetic;-yuv")
 endif()
 run_test(tjbenchtest "-precision;${PRECISION};-lossless")
 run_test(tjbenchtest "-precision;${PRECISION};-lossless;-alloc")
 if(PRECISION EQUAL 8)
  run_test(tjexampletest "")
 endif()
 if(WITH_JAVA)
  if(NOT PRECISION EQUAL 16)
    run_test(tjbenchtest "-java;-precision;${PRECISION}")
  endif()
  if(PRECISION EQUAL 8)
    run_test(tjbenchtest "-java;-precision;${PRECISION};-yuv")
    run_test(tjbenchtest "-java;-precision;${PRECISION};-optimize")
    run_test(tjbenchtest "-java;-precision;${PRECISION};-optimize;-yuv")
  endif()
  if(NOT PRECISION EQUAL 16)
    run_test(tjbenchtest "-java;-precision;${PRECISION};-progressive")
  endif()
  if(PRECISION EQUAL 8)
    run_test(tjbenchtest "-java;-precision;${PRECISION};-progressive;-yuv")
  endif()
  if(NOT PRECISION EQUAL 16)
    run_test(tjbenchtest "-java;-precision;${PRECISION};-arithmetic")
    run_test(tjbenchtest "-java;-precision;${PRECISION};-progressive;-arithmetic")
  endif()
  if(PRECISION EQUAL 8)
    run_test(tjbenchtest "-java;-precision;${PRECISION};-arithmetic;-yuv")
  endif()
  run_test(tjbenchtest "-java;-precision;${PRECISION};-lossless")
  if(PRECISION EQUAL 8)
    run_test(tjexampletest "-java")
  endif()
 endif()
--- a/cmyk.h
+++ b/cmyk.h
@@ -1,7 +1,7 @@
 /*
 * cmyk.h
 *
- * Copyright (C) 2017-2018, D. R. Commander.
+ * Copyright (C) 2017-2018, 2022, D. R. Commander.
 * For conditions of distribution and use, see the accompanying README.ijg
 * file.
 *
@@ -17,19 +17,19 @@
 #include <jinclude.h>
 #define JPEG_INTERNALS
 #include <jpeglib.h>
-#include "jconfigint.h"
+#include "jsamplecomp.h"
 /* Fully reversible */
 INLINE
 LOCAL(void)
-rgb_to_cmyk(JSAMPLE r, JSAMPLE g, JSAMPLE b, JSAMPLE *c, JSAMPLE *m,
+rgb_to_cmyk(_JSAMPLE r, _JSAMPLE g, _JSAMPLE b,
-            JSAMPLE *y, JSAMPLE *k)
+            _JSAMPLE *c, _JSAMPLE *m, _JSAMPLE *y, _JSAMPLE *k)
 {
-  double ctmp = 1.0 - ((double)r / 255.0);
+  double ctmp = 1.0 - ((double)r / (double)_MAXJSAMPLE);
-  double mtmp = 1.0 - ((double)g / 255.0);
+  double mtmp = 1.0 - ((double)g / (double)_MAXJSAMPLE);
-  double ytmp = 1.0 - ((double)b / 255.0);
+  double ytmp = 1.0 - ((double)b / (double)_MAXJSAMPLE);
  double ktmp = MIN(MIN(ctmp, mtmp), ytmp);
  if (ktmp == 1.0) ctmp = mtmp = ytmp = 0.0;
@@ -38,10 +38,10 @@ rgb_to_cmyk(JSAMPLE r, JSAMPLE g, JSAMPLE b, JSAMPLE *c, JSAMPLE *m,
    mtmp = (mtmp - ktmp) / (1.0 - ktmp);
    ytmp = (ytmp - ktmp) / (1.0 - ktmp);
  }
-  *c = (JSAMPLE)(255.0 - ctmp * 255.0 + 0.5);
+  *c = (_JSAMPLE)((double)_MAXJSAMPLE - ctmp * (double)_MAXJSAMPLE + 0.5);
-  *m = (JSAMPLE)(255.0 - mtmp * 255.0 + 0.5);
+  *m = (_JSAMPLE)((double)_MAXJSAMPLE - mtmp * (double)_MAXJSAMPLE + 0.5);
-  *y = (JSAMPLE)(255.0 - ytmp * 255.0 + 0.5);
+  *y = (_JSAMPLE)((double)_MAXJSAMPLE - ytmp * (double)_MAXJSAMPLE + 0.5);
-  *k = (JSAMPLE)(255.0 - ktmp * 255.0 + 0.5);
+  *k = (_JSAMPLE)((double)_MAXJSAMPLE - ktmp * (double)_MAXJSAMPLE + 0.5);
 }
@@ -49,12 +49,12 @@ rgb_to_cmyk(JSAMPLE r, JSAMPLE g, JSAMPLE b, JSAMPLE *c, JSAMPLE *m,
 INLINE
 LOCAL(void)
-cmyk_to_rgb(JSAMPLE c, JSAMPLE m, JSAMPLE y, JSAMPLE k, JSAMPLE *r, JSAMPLE *g,
+cmyk_to_rgb(_JSAMPLE c, _JSAMPLE m, _JSAMPLE y, _JSAMPLE k,
-            JSAMPLE *b)
+            _JSAMPLE *r, _JSAMPLE *g, _JSAMPLE *b)
 {
-  *r = (JSAMPLE)((double)c * (double)k / 255.0 + 0.5);
+  *r = (_JSAMPLE)((double)c * (double)k / (double)_MAXJSAMPLE + 0.5);
-  *g = (JSAMPLE)((double)m * (double)k / 255.0 + 0.5);
+  *g = (_JSAMPLE)((double)m * (double)k / (double)_MAXJSAMPLE + 0.5);
-  *b = (JSAMPLE)((double)y * (double)k / 255.0 + 0.5);
+  *b = (_JSAMPLE)((double)y * (double)k / (double)_MAXJSAMPLE + 0.5);
 }
--- a/djpeg.1
+++ b/djpeg.1
@@ -1,4 +1,4 @@
-.TH DJPEG 1 "4 November 2020"
+.TH DJPEG 1 "17 June 2024"
 .SH NAME
 djpeg \- decompress a JPEG file to an image file
 .SH SYNOPSIS
@@ -28,47 +28,46 @@ Upper and lower case are equivalent (thus
 .B \-BMP
 is the same as
 .BR \-bmp ).
-British spellings are also accepted (e.g.,
+British spellings are also accepted (e.g.
 .BR \-greyscale ),
 though for brevity these are not mentioned below.
 .PP
 The basic switches are:
 .TP
 .BI \-colors " N"
-Reduce image to at most N colors.  This reduces the number of colors used in
+Reduce image to at most N colors [legacy feature].  This reduces the number of
-the output image, so that it can be displayed on a colormapped display or
+colors used in the output image so that it can be stored in a colormapped file
-stored in a colormapped file format.  For example, if you have an 8-bit
+format.  This feature cannot be used when decompressing lossless JPEG images.
 display, you'd need to reduce to 256 or fewer colors.
 .TP
 .BI \-quantize " N"
 Same as
 .BR \-colors .
 .B \-colors
-is the recommended name,
+is the recommended name.
 .B \-quantize
-is provided only for backwards compatibility.
+is provided only for backward compatibility.
 .TP
 .B \-fast
-Select recommended processing options for fast, low quality output.  (The
+Select recommended processing options for low-quality output [legacy feature].
-default options are chosen for highest quality output.)  Currently, this is
+(The default options are chosen for highest-quality output.)  Currently, this
-equivalent to \fB\-dct fast \-nosmooth \-onepass \-dither ordered\fR.
+is equivalent to \fB\-dct fast \-nosmooth \-onepass \-dither ordered\fR.  On
 modern CPUs, these settings have little or no performance benefit and are
 retained solely for backward compatibility.
 .TP
 .B \-grayscale
-Force grayscale output even if JPEG file is color.  Useful for viewing on
+Force grayscale output even if JPEG file is full-color.  This feature cannot be
-monochrome displays; also,
+used when decompressing full-color lossless JPEG images.
 .B djpeg
 runs noticeably faster in this mode.
 .TP
 .B \-rgb
-Force RGB output even if JPEG file is grayscale.
+Force RGB output even if JPEG file is grayscale.  This feature cannot be used
 when decompressing grayscale lossless JPEG images.
 .TP
 .BI \-scale " M/N"
 Scale the output image by a factor M/N.  Currently the scale factor must be
 M/8, where M is an integer between 1 and 16 inclusive, or any reduced fraction
 thereof (such as 1/2, 3/4, etc.)  Scaling is handy if the image is larger than
-your screen; also,
+your screen.  This feature cannot be used when decompressing lossless JPEG
-.B djpeg
+images.
 runs much faster when scaling down the output.
 .TP
 .B \-bmp
 Select BMP output format (Windows flavor).  8-bit colormapped format is
@@ -77,32 +76,36 @@ emitted if
 or
 .B \-grayscale
 is specified, or if the JPEG file is grayscale; otherwise, 24-bit full-color
-format is emitted.
+format is emitted.  This format can only be used when decompressing
 8-bit-per-sample JPEG images.
 .TP
 .B \-gif
-Select GIF output format (LZW-compressed).  Since GIF does not support more
+Select GIF output format (LZW-compressed) [legacy feature].  Since GIF does not
-than 256 colors,
+support more than 256 colors,
 .B \-colors 256
 is assumed (unless you specify a smaller number of colors).  If you specify
 .BR \-fast,
-the default number of colors is 216.
+the default number of colors is 216.  This format can only be used when
 decompressing 8-bit-per-sample or 12-bit-per-sample lossy JPEG images.
 .TP
 .B \-gif0
-Select GIF output format (uncompressed).  Since GIF does not support more than
+Select GIF output format (uncompressed) [legacy feature].  Since GIF does not
-256 colors,
+support more than 256 colors,
 .B \-colors 256
 is assumed (unless you specify a smaller number of colors).  If you specify
 .BR \-fast,
-the default number of colors is 216.
+the default number of colors is 216.  This format can only be used when
 decompressing 8-bit-per-sample or 12-bit-per-sample lossy JPEG images.
 .TP
 .B \-os2
-Select BMP output format (OS/2 1.x flavor).  8-bit colormapped format is
+Select BMP output format (OS/2 1.x flavor) [legacy feature].  8-bit colormapped
-emitted if
+format is emitted if
 .B \-colors
 or
 .B \-grayscale
 is specified, or if the JPEG file is grayscale; otherwise, 24-bit full-color
-format is emitted.
+format is emitted.  This format can only be used when decompressing
 8-bit-per-sample JPEG images.
 .TP
 .B \-pnm
 Select PBMPLUS (PPM/PGM) output format (this is the default format).
@@ -111,12 +114,13 @@ PGM is emitted if the JPEG file is grayscale or if
 is specified; otherwise PPM is emitted.
 .TP
 .B \-targa
-Select Targa output format.  Grayscale format is emitted if the JPEG file is
+Select Targa output format [legacy feature].  Grayscale format is emitted if
-grayscale or if
+the JPEG file is grayscale or if
 .B \-grayscale
 is specified; otherwise, colormapped format is emitted if
 .B \-colors
-is specified; otherwise, 24-bit full-color format is emitted.
+is specified; otherwise, 24-bit full-color format is emitted.  This format can
 only be used when decompressing 8-bit-per-sample JPEG images.
 .PP
 Switches for advanced users:
 .TP
@@ -157,18 +161,18 @@ behavior, whereas the integer methods should give the same results on all
 machines.
 .TP
 .B \-dither fs
-Use Floyd-Steinberg dithering in color quantization.
+Use Floyd-Steinberg dithering when quantizing colors [legacy feature].
 .TP
 .B \-dither ordered
-Use ordered dithering in color quantization.
+Use ordered dithering when quantizing colors [legacy feature].
 .TP
 .B \-dither none
-Do not use dithering in color quantization.
+Do not use dithering when quantizing colors [legacy feature].  By default,
-By default, Floyd-Steinberg dithering is applied when quantizing colors; this
+Floyd-Steinberg dithering is applied when quantizing colors.  This is slower
-is slow but usually produces the best results.  Ordered dither is a compromise
+but usually produces the best results.  Ordered dithering is a compromise
-between speed and quality; no dithering is fast but usually looks awful.  Note
+between speed and quality.  No dithering is faster but usually looks awful.
-that these switches have no effect unless color quantization is being done.
+Note that these switches have no effect unless color quantization is being
-Ordered dither is only available in
+done.  Ordered dithering is only available in
 .B \-onepass
 mode.
 .TP
@@ -176,9 +180,9 @@ mode.
 Extract ICC color management profile to the specified file.
 .TP
 .BI \-map " file"
-Quantize to the colors used in the specified image file.  This is useful for
+Quantize to the colors used in the specified image file [legacy feature].  This
-producing multiple files with identical color maps, or for forcing a
+is useful for producing multiple files with identical color maps, or for
-predefined set of colors to be used.  The
+forcing a predefined set of colors to be used.  The
 .I file
 must be a GIF or PPM file. This option overrides
 .B \-colors
@@ -189,14 +193,14 @@ and
 Use a faster, lower-quality upsampling routine.
 .TP
 .B \-onepass
-Use one-pass instead of two-pass color quantization.  The one-pass method is
+Use one-pass instead of two-pass color quantization [legacy feature].  The
-faster and needs less memory, but it produces a lower-quality image.
+one-pass method needs less memory, but it produces a lower-quality image.
 .B \-onepass
-is ignored unless you also say
+is ignored unless you also specify
 .B \-colors
 .IR N .
-Also, the one-pass method is always used for grayscale output (the two-pass
+Also, the one-pass method is always used for grayscale output.  (The two-pass
-method is no improvement then).
+method has no improvement in that case.)
 .TP
 .BI \-maxmemory " N"
 Set limit for amount of memory to use in processing large images.  Value is
@@ -260,36 +264,13 @@ Same as
 Print version information and exit.
 .SH EXAMPLES
 .LP
-This example decompresses the JPEG file foo.jpg, quantizes it to
+This example decompresses the JPEG file foo.jpg and saves the output in 8-bit
-256 colors, and saves the output in 8-bit BMP format in foo.bmp:
+BMP format in foo.bmp:
 .IP
-.B djpeg \-colors 256 \-bmp
+.B djpeg \-bmp
 .I foo.jpg
 .B >
 .I foo.bmp
 .SH HINTS
 To get a quick preview of an image, use the
 .B \-grayscale
 and/or
 .B \-scale
 switches.
 .B \-grayscale \-scale 1/8
 is the fastest case.
 .PP
 Several options are available that trade off image quality to gain speed.
 .B \-fast
 turns on the recommended settings.
 .PP
 .B \-dct fast
 and/or
 .B \-nosmooth
 gain speed at a small sacrifice in quality.
 When producing a color-quantized image,
 .B \-onepass \-dither ordered
 is fast but much lower quality than the default behavior.
 .B \-dither none
 may give acceptable results in two-pass mode, but is seldom tolerable in
 one-pass mode.
 .SH ENVIRONMENT
 .TP
 .B JPEGMEM
--- a/djpeg.c
+++ b/djpeg.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1991-1997, Thomas G. Lane.
 * Modified 2013-2019 by Guido Vollbeding.
 * libjpeg-turbo Modifications:
- * Copyright (C) 2010-2011, 2013-2017, 2019-2020, 2022, D. R. Commander.
+ * Copyright (C) 2010-2011, 2013-2017, 2019-2020, 2022-2024, D. R. Commander.
 * Copyright (C) 2015, Google, Inc.
 * For conditions of distribution and use, see the accompanying README.ijg
 * file.
@@ -84,14 +84,14 @@ static IMAGE_FORMATS requested_fmt;
 static const char *progname;    /* program name for error messages */
 static char *icc_filename;      /* for -icc switch */
-JDIMENSION max_scans;           /* for -maxscans switch */
+static JDIMENSION max_scans;    /* for -maxscans switch */
 static char *outfilename;       /* for -outfile switch */
-boolean memsrc;                 /* for -memsrc switch */
+static boolean memsrc;          /* for -memsrc switch */
-boolean report;                 /* for -report switch */
+static boolean report;          /* for -report switch */
-boolean skip, crop;
+static boolean skip, crop;
-JDIMENSION skip_start, skip_end;
+static JDIMENSION skip_start, skip_end;
-JDIMENSION crop_x, crop_y, crop_width, crop_height;
+static JDIMENSION crop_x, crop_y, crop_width, crop_height;
-boolean strict;                 /* for -strict switch */
+static boolean strict;          /* for -strict switch */
 #define INPUT_BUF_SIZE  4096
@@ -107,8 +107,8 @@ usage(void)
 #endif
  fprintf(stderr, "Switches (names may be abbreviated):\n");
-  fprintf(stderr, "  -colors N      Reduce image to no more than N colors\n");
+  fprintf(stderr, "  -colors N      Reduce image to no more than N colors [legacy feature]\n");
-  fprintf(stderr, "  -fast          Fast, low-quality processing\n");
+  fprintf(stderr, "  -fast          Low-quality processing [legacy feature]\n");
  fprintf(stderr, "  -grayscale     Force grayscale output\n");
  fprintf(stderr, "  -rgb           Force RGB output\n");
  fprintf(stderr, "  -rgb565        Force RGB565 output\n");
@@ -120,13 +120,13 @@ usage(void)
          (DEFAULT_FMT == FMT_BMP ? " (default)" : ""));
 #endif
 #ifdef GIF_SUPPORTED
-  fprintf(stderr, "  -gif           Select GIF output format (LZW-compressed)%s\n",
+  fprintf(stderr, "  -gif           Select GIF output format (LZW-compressed)%s [legacy feature]\n",
          (DEFAULT_FMT == FMT_GIF ? " (default)" : ""));
-  fprintf(stderr, "  -gif0          Select GIF output format (uncompressed)%s\n",
+  fprintf(stderr, "  -gif0          Select GIF output format (uncompressed)%s [legacy feature]\n",
          (DEFAULT_FMT == FMT_GIF0 ? " (default)" : ""));
 #endif
 #ifdef BMP_SUPPORTED
-  fprintf(stderr, "  -os2           Select BMP output format (OS/2 style)%s\n",
+  fprintf(stderr, "  -os2           Select BMP output format (OS/2 style)%s [legacy feature]\n",
          (DEFAULT_FMT == FMT_OS2 ? " (default)" : ""));
 #endif
 #ifdef PPM_SUPPORTED
@@ -134,7 +134,7 @@ usage(void)
          (DEFAULT_FMT == FMT_PPM ? " (default)" : ""));
 #endif
 #ifdef TARGA_SUPPORTED
-  fprintf(stderr, "  -targa         Select Targa output format%s\n",
+  fprintf(stderr, "  -targa         Select Targa output format%s [legacy feature]\n",
          (DEFAULT_FMT == FMT_TARGA ? " (default)" : ""));
 #endif
  fprintf(stderr, "Switches for advanced users:\n");
@@ -150,23 +150,23 @@ usage(void)
  fprintf(stderr, "  -dct float     Use floating-point DCT method [legacy feature]%s\n",
          (JDCT_DEFAULT == JDCT_FLOAT ? " (default)" : ""));
 #endif
-  fprintf(stderr, "  -dither fs     Use F-S dithering (default)\n");
+  fprintf(stderr, "  -dither fs     Use Floyd-Steinberg dithering when quantizing colors (default)\n");
-  fprintf(stderr, "  -dither none   Don't use dithering in quantization\n");
+  fprintf(stderr, "                 [legacy feature]\n");
-  fprintf(stderr, "  -dither ordered  Use ordered dither (medium speed, quality)\n");
+  fprintf(stderr, "  -dither none   Don't use dithering when quantizing colors [legacy feature]\n");
  fprintf(stderr, "  -dither ordered  Use ordered dithering when quantizing colors\n");
  fprintf(stderr, "                   [legacy feature]\n");
  fprintf(stderr, "  -icc FILE      Extract ICC profile to FILE\n");
 #ifdef QUANT_2PASS_SUPPORTED
-  fprintf(stderr, "  -map FILE      Map to colors used in named image file\n");
+  fprintf(stderr, "  -map FILE      Quantize to colors used in named image file [legacy feature]\n");
 #endif
-  fprintf(stderr, "  -nosmooth      Don't use high-quality upsampling\n");
+  fprintf(stderr, "  -nosmooth      Use faster, lower-quality upsampling\n");
 #ifdef QUANT_1PASS_SUPPORTED
-  fprintf(stderr, "  -onepass       Use 1-pass quantization (fast, low quality)\n");
+  fprintf(stderr, "  -onepass       Use 1-pass color quantization (low quality) [legacy feature]\n");
 #endif
  fprintf(stderr, "  -maxmemory N   Maximum memory to use (in kbytes)\n");
  fprintf(stderr, "  -maxscans N    Maximum number of scans to allow in input file\n");
  fprintf(stderr, "  -outfile name  Specify name for output file\n");
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  fprintf(stderr, "  -memsrc        Load input file into memory before decompressing\n");
 #endif
  fprintf(stderr, "  -report        Report decompression progress\n");
  fprintf(stderr, "  -skip Y0,Y1    Decompress all rows except those between Y0 and Y1 (inclusive)\n");
  fprintf(stderr, "  -crop WxH+X+Y  Decompress only a rectangular subregion of the image\n");
@@ -269,7 +269,8 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
      if (!printed_version) {
        fprintf(stderr, "%s version %s (build %s)\n",
                PACKAGE_NAME, VERSION, BUILD);
-        fprintf(stderr, "%s\n\n", JCOPYRIGHT);
+        fprintf(stderr, JCOPYRIGHT1);
        fprintf(stderr, JCOPYRIGHT2 "\n");
        fprintf(stderr, "Emulating The Independent JPEG Group's software, version %s\n\n",
                JVERSION);
        printed_version = TRUE;
@@ -316,7 +317,9 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
      if (++argn >= argc)       /* advance to next argument */
        usage();
      icc_filename = argv[argn];
 #ifdef SAVE_MARKERS_SUPPORTED
      jpeg_save_markers(cinfo, JPEG_APP0 + 2, 0xFFFF);
 #endif
    } else if (keymatch(arg, "map", 3)) {
      /* Quantize to a color map taken from an input file. */
@@ -330,7 +333,10 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
          fprintf(stderr, "%s: can't open %s\n", progname, argv[argn]);
          exit(EXIT_FAILURE);
        }
-        read_color_map(cinfo, mapfile);
+        if (cinfo->data_precision == 12)
          read_color_map_12(cinfo, mapfile);
        else
          read_color_map(cinfo, mapfile);
        fclose(mapfile);
        cinfo->quantize_colors = TRUE;
 #else
@@ -377,13 +383,7 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "memsrc", 2)) {
      /* Use in-memory source manager */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
      memsrc = TRUE;
 #else
      fprintf(stderr, "%s: sorry, in-memory source manager was not compiled in\n",
              progname);
      exit(EXIT_FAILURE);
 #endif
    } else if (keymatch(arg, "pnm", 1) || keymatch(arg, "ppm", 1)) {
      /* PPM/PGM output format. */
@@ -392,7 +392,7 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
    } else if (keymatch(arg, "report", 2)) {
      report = TRUE;
-    } else if (keymatch(arg, "scale", 2)) {
+    } else if (keymatch(arg, "scale", 1)) {
      /* Scale the output image by a fraction M/N. */
      if (++argn >= argc)       /* advance to next argument */
        usage();
@@ -401,22 +401,31 @@ parse_switches(j_decompress_ptr cinfo, int argc, char **argv,
        usage();
    } else if (keymatch(arg, "skip", 2)) {
      int temp_start = -1, temp_end = -1;
      if (++argn >= argc)
        usage();
-      if (sscanf(argv[argn], "%u,%u", &skip_start, &skip_end) != 2 ||
+      if (sscanf(argv[argn], "%d,%d", &temp_start, &temp_end) != 2 ||
-          skip_start > skip_end)
+          temp_start < 0 || temp_end < 0 || temp_start > temp_end)
        usage();
      skip = TRUE;
      skip_start = temp_start;
      skip_end = temp_end;
    } else if (keymatch(arg, "crop", 2)) {
      int temp_width = -1, temp_height = -1, temp_x = -1, temp_y = -1;
      char c;
      if (++argn >= argc)
        usage();
-      if (sscanf(argv[argn], "%u%c%u+%u+%u", &crop_width, &c, &crop_height,
+      if (sscanf(argv[argn], "%d%c%d+%d+%d", &temp_width, &c, &temp_height,
-                 &crop_x, &crop_y) != 5 ||
+                 &temp_x, &temp_y) != 5 ||
-          (c != 'X' && c != 'x') || crop_width < 1 || crop_height < 1)
+          (c != 'X' && c != 'x') || temp_width < 1 || temp_height < 1 ||
          temp_x < 0 || temp_y < 0)
        usage();
      crop = TRUE;
      crop_width = temp_width;
      crop_height = temp_height;
      crop_x = temp_x;
      crop_y = temp_y;
    } else if (keymatch(arg, "strict", 2)) {
      strict = TRUE;
@@ -535,9 +544,7 @@ main(int argc, char **argv)
  FILE *input_file;
  FILE *output_file;
  unsigned char *inbuffer = NULL;
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  unsigned long insize = 0;
 #endif
  JDIMENSION num_scanlines;
  progname = argv[0];
@@ -627,7 +634,6 @@ main(int argc, char **argv)
  }
  /* Specify data source for decompression */
 #if JPEG_LIB_VERSION >= 80 || defined(MEM_SRCDST_SUPPORTED)
  if (memsrc) {
    size_t nbytes;
    do {
@@ -649,7 +655,6 @@ main(int argc, char **argv)
    fprintf(stderr, "Compressed size:  %lu bytes\n", insize);
    jpeg_mem_src(&cinfo, inbuffer, insize);
  } else
 #endif
    jpeg_stdio_src(&cinfo, input_file);
  /* Read file header, set default decompression parameters */
@@ -672,7 +677,12 @@ main(int argc, char **argv)
 #endif
 #ifdef GIF_SUPPORTED
  case FMT_GIF:
-    dest_mgr = jinit_write_gif(&cinfo, TRUE);
+    if (cinfo.data_precision == 16)
      ERREXIT1(&cinfo, JERR_BAD_PRECISION, cinfo.data_precision);
    else if (cinfo.data_precision == 12)
      dest_mgr = j12init_write_gif(&cinfo, TRUE);
    else
      dest_mgr = jinit_write_gif(&cinfo, TRUE);
    break;
  case FMT_GIF0:
    dest_mgr = jinit_write_gif(&cinfo, FALSE);
@@ -680,7 +690,16 @@ main(int argc, char **argv)
 #endif
 #ifdef PPM_SUPPORTED
  case FMT_PPM:
-    dest_mgr = jinit_write_ppm(&cinfo);
+    if (cinfo.data_precision == 16)
 #ifdef D_LOSSLESS_SUPPORTED
      dest_mgr = j16init_write_ppm(&cinfo);
 #else
      ERREXIT1(&cinfo, JERR_BAD_PRECISION, cinfo.data_precision);
 #endif
    else if (cinfo.data_precision == 12)
      dest_mgr = j12init_write_ppm(&cinfo);
    else
      dest_mgr = jinit_write_ppm(&cinfo);
    break;
 #endif
 #ifdef TARGA_SUPPORTED
@@ -719,22 +738,44 @@ main(int argc, char **argv)
    (*dest_mgr->start_output) (&cinfo, dest_mgr);
    cinfo.output_height = tmp;
-    /* Process data */
+    if (cinfo.data_precision == 16)
-    while (cinfo.output_scanline < skip_start) {
+      ERREXIT(&cinfo, JERR_NOTIMPL);
-      num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
+    else if (cinfo.data_precision == 12) {
-                                          dest_mgr->buffer_height);
+      /* Process data */
-      (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
+      while (cinfo.output_scanline < skip_start) {
-    }
+        num_scanlines = jpeg12_read_scanlines(&cinfo, dest_mgr->buffer12,
-    if ((tmp = jpeg_skip_scanlines(&cinfo, skip_end - skip_start + 1)) !=
+                                              dest_mgr->buffer_height);
-        skip_end - skip_start + 1) {
+        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
-      fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
+      }
-              progname, tmp, skip_end - skip_start + 1);
+      if ((tmp = jpeg12_skip_scanlines(&cinfo, skip_end - skip_start + 1)) !=
-      exit(EXIT_FAILURE);
+          skip_end - skip_start + 1) {
-    }
+        fprintf(stderr, "%s: jpeg12_skip_scanlines() returned %u rather than %u\n",
-    while (cinfo.output_scanline < cinfo.output_height) {
+                progname, tmp, skip_end - skip_start + 1);
-      num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
+        exit(EXIT_FAILURE);
-                                          dest_mgr->buffer_height);
+      }
-      (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
+      while (cinfo.output_scanline < cinfo.output_height) {
        num_scanlines = jpeg12_read_scanlines(&cinfo, dest_mgr->buffer12,
                                              dest_mgr->buffer_height);
        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
      }
    } else {
      /* Process data */
      while (cinfo.output_scanline < skip_start) {
        num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
                                            dest_mgr->buffer_height);
        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
      }
      if ((tmp = jpeg_skip_scanlines(&cinfo, skip_end - skip_start + 1)) !=
          skip_end - skip_start + 1) {
        fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
                progname, tmp, skip_end - skip_start + 1);
        exit(EXIT_FAILURE);
      }
      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);
      }
    }
  /* Decompress a subregion */
@@ -744,14 +785,19 @@ main(int argc, char **argv)
    /* Check for valid crop dimensions.  We cannot check these values until
     * after jpeg_start_decompress() is called.
     */
-    if (crop_x + crop_width > cinfo.output_width ||
+    if ((unsigned long long)crop_x + crop_width > cinfo.output_width ||
-        crop_y + crop_height > cinfo.output_height) {
+        (unsigned long long)crop_y + crop_height > cinfo.output_height) {
      fprintf(stderr, "%s: crop dimensions exceed image dimensions %u x %u\n",
              progname, cinfo.output_width, cinfo.output_height);
      exit(EXIT_FAILURE);
    }
-    jpeg_crop_scanline(&cinfo, &crop_x, &crop_width);
+    if (cinfo.data_precision == 16)
      ERREXIT(&cinfo, JERR_NOTIMPL);
    else if (cinfo.data_precision == 12)
      jpeg12_crop_scanline(&cinfo, &crop_x, &crop_width);
    else
      jpeg_crop_scanline(&cinfo, &crop_x, &crop_width);
    if (dest_mgr->calc_buffer_dimensions)
      (*dest_mgr->calc_buffer_dimensions) (&cinfo, dest_mgr);
    else
@@ -765,24 +811,48 @@ main(int argc, char **argv)
    (*dest_mgr->start_output) (&cinfo, dest_mgr);
    cinfo.output_height = tmp;
-    /* Process data */
+    if (cinfo.data_precision == 16)
-    if ((tmp = jpeg_skip_scanlines(&cinfo, crop_y)) != crop_y) {
+      ERREXIT(&cinfo, JERR_NOTIMPL);
-      fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
+    else if (cinfo.data_precision == 12) {
-              progname, tmp, crop_y);
+      /* Process data */
-      exit(EXIT_FAILURE);
+      if ((tmp = jpeg12_skip_scanlines(&cinfo, crop_y)) != crop_y) {
-    }
+        fprintf(stderr, "%s: jpeg12_skip_scanlines() returned %u rather than %u\n",
-    while (cinfo.output_scanline < crop_y + crop_height) {
+                progname, tmp, crop_y);
-      num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
+        exit(EXIT_FAILURE);
-                                          dest_mgr->buffer_height);
+      }
-      (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
+      while (cinfo.output_scanline < crop_y + crop_height) {
-    }
+        num_scanlines = jpeg12_read_scanlines(&cinfo, dest_mgr->buffer12,
-    if ((tmp =
+                                              dest_mgr->buffer_height);
-         jpeg_skip_scanlines(&cinfo,
+        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
-                             cinfo.output_height - crop_y - crop_height)) !=
+      }
-        cinfo.output_height - crop_y - crop_height) {
+      if ((tmp =
-      fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
+           jpeg12_skip_scanlines(&cinfo, cinfo.output_height - crop_y -
-              progname, tmp, cinfo.output_height - crop_y - crop_height);
+                                         crop_height)) !=
-      exit(EXIT_FAILURE);
+          cinfo.output_height - crop_y - crop_height) {
        fprintf(stderr, "%s: jpeg12_skip_scanlines() returned %u rather than %u\n",
                progname, tmp, cinfo.output_height - crop_y - crop_height);
        exit(EXIT_FAILURE);
      }
    } else {
      /* Process data */
      if ((tmp = jpeg_skip_scanlines(&cinfo, crop_y)) != crop_y) {
        fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
                progname, tmp, crop_y);
        exit(EXIT_FAILURE);
      }
      while (cinfo.output_scanline < crop_y + crop_height) {
        num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
                                            dest_mgr->buffer_height);
        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
      }
      if ((tmp =
           jpeg_skip_scanlines(&cinfo,
                               cinfo.output_height - crop_y - crop_height)) !=
          cinfo.output_height - crop_y - crop_height) {
        fprintf(stderr, "%s: jpeg_skip_scanlines() returned %u rather than %u\n",
                progname, tmp, cinfo.output_height - crop_y - crop_height);
        exit(EXIT_FAILURE);
      }
    }
  /* Normal full-image decompress */
@@ -790,11 +860,31 @@ main(int argc, char **argv)
    /* Write output file header */
    (*dest_mgr->start_output) (&cinfo, dest_mgr);
-    /* Process data */
+    if (cinfo.data_precision == 16) {
-    while (cinfo.output_scanline < cinfo.output_height) {
+#ifdef D_LOSSLESS_SUPPORTED
-      num_scanlines = jpeg_read_scanlines(&cinfo, dest_mgr->buffer,
+      /* Process data */
-                                          dest_mgr->buffer_height);
+      while (cinfo.output_scanline < cinfo.output_height) {
-      (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
+        num_scanlines = jpeg16_read_scanlines(&cinfo, dest_mgr->buffer16,
                                              dest_mgr->buffer_height);
        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
      }
 #else
      ERREXIT1(&cinfo, JERR_BAD_PRECISION, cinfo.data_precision);
 #endif
    } else if (cinfo.data_precision == 12) {
      /* Process data */
      while (cinfo.output_scanline < cinfo.output_height) {
        num_scanlines = jpeg12_read_scanlines(&cinfo, dest_mgr->buffer12,
                                              dest_mgr->buffer_height);
        (*dest_mgr->put_pixel_rows) (&cinfo, dest_mgr, num_scanlines);
      }
    } else {
      /* Process data */
      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);
      }
    }
  }
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.8.20"/>
+<meta name="generator" content="Doxygen 1.9.8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>TurboJPEG: Data Structures</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -20,10 +20,9 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
-  <td id="projectalign" style="padding-left: 0.5em;">
+  <td id="projectalign">
-   <div id="projectname">TurboJPEG
+   <div id="projectname">TurboJPEG<span id="projectnumber">&#160;3.0.1</span>
   &#160;<span id="projectnumber">2.1.4</span>
   </div>
  </td>
 </tr>
@@ -31,21 +30,22 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.20 -->
+<!-- Generated by Doxygen 1.9.8 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
+var searchBox = new SearchBox("searchBox", "search/",'.html');
 /* @license-end */
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
  initMenu('',true,false,'search.php','Search');
  $(document).ready(function() { init_search(); });
 });
-/* @license-end */</script>
+/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
 <!-- window showing the filter options -->
@@ -57,27 +57,33 @@ $(function() {
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<div id="MSearchResults">
-        name="MSearchResults" id="MSearchResults">
+<div class="SRPage">
-</iframe>
+<div id="SRIndex">
 <div id="SRResults"></div>
 <div class="SRStatus" id="Loading">Loading...</div>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </div>
 </div>
 </div>
 <div class="header">
-  <div class="headertitle">
+  <div class="headertitle"><div class="title">Data Structures</div></div>
 <div class="title">Data Structures</div>  </div>
 </div><!--header-->
 <div class="contents">
 <div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
 <table class="directory">
 <tr id="row_0_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structtjregion.html" target="_self">tjregion</a></td><td class="desc">Cropping region </td></tr>
-<tr id="row_1_"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structtjscalingfactor.html" target="_self">tjscalingfactor</a></td><td class="desc">Scaling factor </td></tr>
+<tr id="row_1_" class="odd"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structtjscalingfactor.html" target="_self">tjscalingfactor</a></td><td class="desc">Scaling factor </td></tr>
 <tr id="row_2_" class="even"><td class="entry"><span style="width:16px;display:inline-block;">&#160;</span><span class="icona"><span class="icon">C</span></span><a class="el" href="structtjtransform.html" target="_self">tjtransform</a></td><td class="desc">Lossless transform </td></tr>
 </table>
 </div><!-- directory -->
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
+Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.8
 </small></address>
 </body>
 </html>
--- a/doc/html/bc_sd.png
+++ b/doc/html/bc_sd.png
--- a/doc/html/bdwn.png
+++ b/doc/html/bdwn.png
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.8.20"/>
+<meta name="generator" content="Doxygen 1.9.8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>TurboJPEG: Data Structure Index</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -20,10 +20,9 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
-  <td id="projectalign" style="padding-left: 0.5em;">
+  <td id="projectalign">
-   <div id="projectname">TurboJPEG
+   <div id="projectname">TurboJPEG<span id="projectnumber">&#160;3.0.1</span>
   &#160;<span id="projectnumber">2.1.4</span>
   </div>
  </td>
 </tr>
@@ -31,21 +30,22 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.20 -->
+<!-- Generated by Doxygen 1.9.8 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
+var searchBox = new SearchBox("searchBox", "search/",'.html');
 /* @license-end */
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
  initMenu('',true,false,'search.php','Search');
  $(document).ready(function() { init_search(); });
 });
-/* @license-end */</script>
+/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
 <!-- window showing the filter options -->
@@ -57,33 +57,32 @@ $(function() {
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<div id="MSearchResults">
-        name="MSearchResults" id="MSearchResults">
+<div class="SRPage">
-</iframe>
+<div id="SRIndex">
 <div id="SRResults"></div>
 <div class="SRStatus" id="Loading">Loading...</div>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </div>
 </div>
 </div>
 <div class="header">
-  <div class="headertitle">
+  <div class="headertitle"><div class="title">Data Structure Index</div></div>
 <div class="title">Data Structure Index</div>  </div>
 </div><!--header-->
 <div class="contents">
-<div class="qindex"><a class="qindex" href="#letter_t">t</a></div>
+<div class="qindex"><a class="qindex" href="#letter_T">T</a></div>
-<table class="classindex">
+<div class="classindex">
-<tr><td rowspan="2" valign="bottom"><a name="letter_t"></a><table border="0" cellspacing="0" cellpadding="0"><tr><td><div class="ah">&#160;&#160;t&#160;&#160;</div></td></tr></table>
+<dl class="classindex even">
-</td>
+<dt class="alphachar"><a id="letter_T" name="letter_T">T</a></dt>
-<td valign="top"><a class="el" href="structtjscalingfactor.html">tjscalingfactor</a>&#160;&#160;&#160;</td>
+<dd><a class="el" href="structtjregion.html">tjregion</a></dd><dd><a class="el" href="structtjscalingfactor.html">tjscalingfactor</a></dd><dd><a class="el" href="structtjtransform.html">tjtransform</a></dd></dl>
-<td valign="top"><a class="el" href="structtjtransform.html">tjtransform</a>&#160;&#160;&#160;</td>
+</div>
 <td></td></tr>
 <tr><td></td><td></td><td></td></tr>
 <tr><td valign="top"><a class="el" href="structtjregion.html">tjregion</a>&#160;&#160;&#160;</td>
 <td></td><td></td><td></td></tr>
 <tr><td></td><td></td><td></td><td></td></tr>
 </table>
 <div class="qindex"><a class="qindex" href="#letter_t">t</a></div>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
+Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.8
 </small></address>
 </body>
 </html>
--- a/doc/html/doc.png
+++ b/doc/html/doc.png
--- a/doc/html/doc.svg
+++ b/doc/html/doc.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 80 60" id="doc" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#4665A2">
 <path d="m 14,-1.1445312 c -2.824372,0 -5.1445313,2.320159 -5.1445312,5.1445312 v 72 c 0,2.824372 2.3201592,5.144531 5.1445312,5.144531 h 52 c 2.824372,0 5.144531,-2.320159 5.144531,-5.144531 V 23.699219 a 1.1447968,1.1447968 0 0 0 -0.01563,-0.1875 C 70.977847,22.605363 70.406495,21.99048 70.007812,21.591797 L 48.208984,-0.20898438 C 47.606104,-0.81186474 46.804652,-1.1445313 46,-1.1445312 Z m 1.144531,6.2890624 H 42.855469 V 24 c 0,1.724372 1.420159,3.144531 3.144531,3.144531 H 64.855469 V 74.855469 H 15.144531 Z m 34,4.4179688 L 60.4375,20.855469 H 49.144531 Z"/>
 </g>
 <g style="fill:#D8DFEE;stroke-width:0">
 <path d="M 3.0307167,13.993174 V 7.0307167 h 2.7576792 2.7576792 v 1.8826151 c 0,1.2578262 0.0099,1.9287572 0.029818,2.0216512 0.03884,0.181105 0.168631,0.348218 0.33827,0.43554 l 0.1355017,0.06975 1.9598092,0.0079 1.959809,0.0078 v 4.749829 4.749829 H 8 3.0307167 Z" transform="matrix(5,0,0,5,0,-30)" />
 <path d="M 9.8293515,9.0581469 V 7.9456453 l 1.1058025,1.1055492 c 0.608191,0.6080521 1.105802,1.1086775 1.105802,1.1125015 0,0.0038 -0.497611,0.007 -1.105802,0.007 H 9.8293515 Z" transform="matrix(5,0,0,5,0,-30)" />
 </g>
 </svg>
--- a/doc/html/docd.svg
+++ b/doc/html/docd.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 80 60" id="doc" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#C4CFE5">
 <path d="m 14,-1.1445312 c -2.824372,0 -5.1445313,2.320159 -5.1445312,5.1445312 v 72 c 0,2.824372 2.3201592,5.144531 5.1445312,5.144531 h 52 c 2.824372,0 5.144531,-2.320159 5.144531,-5.144531 V 23.699219 a 1.1447968,1.1447968 0 0 0 -0.01563,-0.1875 C 70.977847,22.605363 70.406495,21.99048 70.007812,21.591797 L 48.208984,-0.20898438 C 47.606104,-0.81186474 46.804652,-1.1445313 46,-1.1445312 Z m 1.144531,6.2890624 H 42.855469 V 24 c 0,1.724372 1.420159,3.144531 3.144531,3.144531 H 64.855469 V 74.855469 H 15.144531 Z m 34,4.4179688 L 60.4375,20.855469 H 49.144531 Z"/>
 </g>
 <g style="fill:#4665A2;stroke-width:0">
 <path d="M 3.0307167,13.993174 V 7.0307167 h 2.7576792 2.7576792 v 1.8826151 c 0,1.2578262 0.0099,1.9287572 0.029818,2.0216512 0.03884,0.181105 0.168631,0.348218 0.33827,0.43554 l 0.1355017,0.06975 1.9598092,0.0079 1.959809,0.0078 v 4.749829 4.749829 H 8 3.0307167 Z" transform="matrix(5,0,0,5,0,-30)" />
 <path d="M 9.8293515,9.0581469 V 7.9456453 l 1.1058025,1.1055492 c 0.608191,0.6080521 1.105802,1.1086775 1.105802,1.1125015 0,0.0038 -0.497611,0.007 -1.105802,0.007 H 9.8293515 Z" transform="matrix(5,0,0,5,0,-30)" />
 </g>
 </svg>
--- a/doc/html/doxygen-extra.css
+++ b/doc/html/doxygen-extra.css
@@ -1,3 +1,7 @@
 code {
 	color: #4665A2;
 }
 th.markdownTableHeadNone {
 	color: black;
 }
--- a/doc/html/doxygen.css
+++ b/doc/html/doxygen.css
--- a/doc/html/doxygen.svg
+++ b/doc/html/doxygen.svg
--- a/doc/html/dynsections.js
+++ b/doc/html/dynsections.js
@@ -47,6 +47,8 @@ function updateStripes()
 {
  $('table.directory tr').
       removeClass('even').filter(':visible:even').addClass('even');
  $('table.directory tr').
       removeClass('odd').filter(':visible:odd').addClass('odd');
 }
 function toggleLevel(level)
@@ -118,4 +120,73 @@ function toggleInherit(id)
    $(img).attr('src',src.substring(0,src.length-10)+'open.png');
  }
 }
 var opened=true;
 // in case HTML_COLORSTYLE is LIGHT or DARK the vars will be replaced, so we write them out explicitly and use double quotes
 var plusImg  = [ "var(--fold-plus-image)",  "var(--fold-plus-image-relpath)" ];
 var minusImg = [ "var(--fold-minus-image)", "var(--fold-minus-image-relpath)" ];
 // toggle all folding blocks
 function codefold_toggle_all(relPath) {
 if (opened) {
   $('#fold_all').css('background-image',plusImg[relPath]);
   $('div[id^=foldopen]').hide();
   $('div[id^=foldclosed]').show();
 } else {
   $('#fold_all').css('background-image',minusImg[relPath]);
   $('div[id^=foldopen]').show();
   $('div[id^=foldclosed]').hide();
 }
 opened=!opened;
 }
 // toggle single folding block
 function codefold_toggle(id) {
  $('#foldopen'+id).toggle();
  $('#foldclosed'+id).toggle();
 }
 function init_codefold(relPath) {
  $('span[class=lineno]').css(
    {'padding-right':'4px',
     'margin-right':'2px',
     'display':'inline-block',
     'width':'54px',
     'background':'linear-gradient(var(--fold-line-color),var(--fold-line-color)) no-repeat 46px/2px 100%'
    });
  // add global toggle to first line
  $('span[class=lineno]:first').append('<span class="fold" id="fold_all" '+
                                             'onclick="javascript:codefold_toggle_all('+relPath+');" '+
                                             'style="background-image:'+minusImg[relPath]+';"></span>');
  // add vertical lines to other rows
  $('span[class=lineno]').not(':eq(0)').append('<span class="fold"></span>');
  // add toggle controls to lines with fold divs
  $('div[class=foldopen]').each(function() {
    // extract specific id to use
    var id    = $(this).attr('id').replace('foldopen','');
    // extract start and end foldable fragment attributes
    var start = $(this).attr('data-start');
    var end   = $(this).attr('data-end');
    // replace normal fold span with controls for the first line of a foldable fragment
    $(this).find('span[class=fold]:first').replaceWith('<span class="fold" '+
                                                       'onclick="javascript:codefold_toggle(\''+id+'\');" '+
                                                       'style="background-image:'+minusImg[relPath]+';"></span>');
    // append div for folded (closed) representation
    $(this).after('<div id="foldclosed'+id+'" class="foldclosed" style="display:none;"></div>');
    // extract the first line from the "open" section to represent closed content
    var line = $(this).children().first().clone();
    // remove any glow that might still be active on the original line
    $(line).removeClass('glow');
    if (start) {
      // if line already ends with a start marker (e.g. trailing {), remove it
      $(line).html($(line).html().replace(new RegExp('\\s*'+start+'\\s*$','g'),''));
    }
    // replace minus with plus symbol
    $(line).find('span[class=fold]').css('background-image',plusImg[relPath]);
    // append ellipsis
    $(line).append(' '+start+'<a href="javascript:codefold_toggle(\''+id+'\')">&#8230;</a>'+end);
    // insert constructed line into closed div
    $('#foldclosed'+id).html(line);
  });
 }
 /* @license-end */
--- a/doc/html/folderclosed.png
+++ b/doc/html/folderclosed.png
--- a/doc/html/folderclosed.svg
+++ b/doc/html/folderclosed.svg
@@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#4665A2;">
 <path d="M1,5.998l-0,16.002c-0,1.326 0.527,2.598 1.464,3.536c0.938,0.937 2.21,1.464 3.536,1.464c5.322,0 14.678,-0 20,0c1.326,0 2.598,-0.527 3.536,-1.464c0.937,-0.938 1.464,-2.21 1.464,-3.536c0,-3.486 0,-8.514 0,-12c0,-1.326 -0.527,-2.598 -1.464,-3.536c-0.938,-0.937 -2.21,-1.464 -3.536,-1.464c-0,0 -10.586,0 -10.586,0c0,-0 -3.707,-3.707 -3.707,-3.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293l-5.002,0c-2.76,0 -4.998,2.238 -4.998,4.998Zm2,-0l-0,16.002c-0,0.796 0.316,1.559 0.879,2.121c0.562,0.563 1.325,0.879 2.121,0.879l20,0c0.796,0 1.559,-0.316 2.121,-0.879c0.563,-0.562 0.879,-1.325 0.879,-2.121c0,-3.486 0,-8.514 0,-12c0,-0.796 -0.316,-1.559 -0.879,-2.121c-0.562,-0.563 -1.325,-0.879 -2.121,-0.879c-7.738,0 -11,0 -11,0c-0.265,0 -0.52,-0.105 -0.707,-0.293c-0,0 -3.707,-3.707 -3.707,-3.707c-0,0 -4.588,0 -4.588,0c-1.656,0 -2.998,1.342 -2.998,2.998Z"/>
 </g>
 <g style="fill:#D8DFEE;stroke-width:0;">
 <path d="M 5.6063709,24.951908 C 4.3924646,24.775461 3.4197129,23.899792 3.1031586,22.698521 L 3.0216155,22.389078 V 13.997725 5.6063709 L 3.1037477,5.2982247 C 3.3956682,4.2029881 4.1802788,3.412126 5.2787258,3.105917 5.5646428,3.0262132 5.6154982,3.0244963 8.0611641,3.0119829 l 2.4911989,-0.012746 1.932009,1.9300342 c 1.344142,1.3427669 1.976319,1.9498819 2.07763,1.9952626 0.137456,0.061571 0.474218,0.066269 6.006826,0.083795 l 5.861206,0.018568 0.29124,0.081916 c 1.094895,0.3079569 1.890116,1.109428 2.175567,2.192667 l 0.08154,0.3094425 V 16 22.389078 l -0.08154,0.309443 c -0.28446,1.079482 -1.086411,1.888085 -2.175567,2.193614 l -0.29124,0.0817 -10.302616,0.0049 c -5.700217,0.0027 -10.4001945,-0.0093 -10.5210471,-0.02684 z"/>
 </g>
 </svg>
--- a/doc/html/folderclosedd.svg
+++ b/doc/html/folderclosedd.svg
@@ -0,0 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#C4CFE5;">
 <path d="M1,5.998l-0,16.002c-0,1.326 0.527,2.598 1.464,3.536c0.938,0.937 2.21,1.464 3.536,1.464c5.322,0 14.678,-0 20,0c1.326,0 2.598,-0.527 3.536,-1.464c0.937,-0.938 1.464,-2.21 1.464,-3.536c0,-3.486 0,-8.514 0,-12c0,-1.326 -0.527,-2.598 -1.464,-3.536c-0.938,-0.937 -2.21,-1.464 -3.536,-1.464c-0,0 -10.586,0 -10.586,0c0,-0 -3.707,-3.707 -3.707,-3.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293l-5.002,0c-2.76,0 -4.998,2.238 -4.998,4.998Zm2,-0l-0,16.002c-0,0.796 0.316,1.559 0.879,2.121c0.562,0.563 1.325,0.879 2.121,0.879l20,0c0.796,0 1.559,-0.316 2.121,-0.879c0.563,-0.562 0.879,-1.325 0.879,-2.121c0,-3.486 0,-8.514 0,-12c0,-0.796 -0.316,-1.559 -0.879,-2.121c-0.562,-0.563 -1.325,-0.879 -2.121,-0.879c-7.738,0 -11,0 -11,0c-0.265,0 -0.52,-0.105 -0.707,-0.293c-0,0 -3.707,-3.707 -3.707,-3.707c-0,0 -4.588,0 -4.588,0c-1.656,0 -2.998,1.342 -2.998,2.998Z"/>
 </g>
 <g style="fill:#4665A2;stroke-width:0;">
 <path d="M 5.6063709,24.951908 C 4.3924646,24.775461 3.4197129,23.899792 3.1031586,22.698521 L 3.0216155,22.389078 V 13.997725 5.6063709 L 3.1037477,5.2982247 C 3.3956682,4.2029881 4.1802788,3.412126 5.2787258,3.105917 5.5646428,3.0262132 5.6154982,3.0244963 8.0611641,3.0119829 l 2.4911989,-0.012746 1.932009,1.9300342 c 1.344142,1.3427669 1.976319,1.9498819 2.07763,1.9952626 0.137456,0.061571 0.474218,0.066269 6.006826,0.083795 l 5.861206,0.018568 0.29124,0.081916 c 1.094895,0.3079569 1.890116,1.109428 2.175567,2.192667 l 0.08154,0.3094425 V 16 22.389078 l -0.08154,0.309443 c -0.28446,1.079482 -1.086411,1.888085 -2.175567,2.193614 l -0.29124,0.0817 -10.302616,0.0049 c -5.700217,0.0027 -10.4001945,-0.0093 -10.5210471,-0.02684 z"/>
 </g>
 </svg>
--- a/doc/html/folderopen.png
+++ b/doc/html/folderopen.png
--- a/doc/html/folderopen.svg
+++ b/doc/html/folderopen.svg
@@ -0,0 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#4665A2;">
 <path
   d="M1,5.998l0,16.002c-0,1.326 0.527,2.598 1.464,3.536c0.938,0.937 2.21,1.464 3.536,1.464c5.322,0 14.678,-0 20,0c1.326,0 2.598,-0.527 3.536,-1.464c0.937,-0.938 1.464,-2.21 1.464,-3.536c0,-3.486 0,-8.514 0,-12c0,-1.326 -0.527,-2.598 -1.464,-3.536c-0.938,-0.937 -2.21,-1.464 -3.536,-1.464c-0,0 -10.586,0 -10.586,0c0,-0 -3.707,-3.707 -3.707,-3.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293l-5.002,0c-2.76,0 -4.998,2.238 -4.998,4.998Zm28,14.415l-3.456,-5.925c-0.538,-0.921 -1.524,-1.488 -2.591,-1.488c-0,0 -12.905,0 -12.906,0c-1.067,0 -2.053,0.567 -2.591,1.488l-4.453,7.635c0.03,0.751 0.342,1.465 0.876,1.998c0.562,0.563 1.325,0.879 2.121,0.879l20,0c0.796,0 1.559,-0.316 2.121,-0.879c0.563,-0.562 0.879,-1.325 0.879,-2.121l0,-1.587Zm0,-3.969l0,-6.444c0,-0.796 -0.316,-1.559 -0.879,-2.121c-0.562,-0.563 -1.325,-0.879 -2.121,-0.879c-7.738,0 -11,0 -11,0c-0.265,0 -0.52,-0.105 -0.707,-0.293c-0,0 -3.707,-3.707 -3.707,-3.707c-0,0 -4.588,0 -4.588,0c-1.656,0 -2.998,1.342 -2.998,2.998l0,12.16l2.729,-4.677c0.896,-1.536 2.54,-2.481 4.318,-2.481c3.354,0 9.552,0 12.906,0c1.778,0 3.422,0.945 4.318,2.481l1.729,2.963Z"
   id="path2" />
 </g>
 <g style="fill:#D8DFEE;stroke-width:0;">
 <path
   d="M 5.3879408,24.913408 C 4.1598821,24.650818 3.1571088,23.558656 3.053503,22.370876 L 3.0312746,22.116041 5.2606813,18.293515 C 6.486855,16.191126 7.5598351,14.372696 7.6450818,14.25256 8.0043056,13.746312 8.5423079,13.363007 9.2104664,13.137285 l 0.2548351,-0.08609 6.9294785,-0.0097 c 6.805096,-0.0095 6.934944,-0.0084 7.234011,0.06267 0.695577,0.165199 1.290483,0.557253 1.714887,1.130141 0.08158,0.110125 0.938747,1.556711 1.90481,3.214634 l 1.756479,3.014406 -0.0186,0.971942 c -0.01387,0.724723 -0.03365,1.032131 -0.07778,1.208575 -0.242792,0.970733 -0.88732,1.735415 -1.772382,2.102793 -0.58835,0.244217 0.247209,0.227436 -11.161974,0.224159 -9.0281537,-0.0026 -10.3636023,-0.0098 -10.5862902,-0.05746 z"
   id="path199" /><path
   d="M 3.0126385,11.849829 3.0235061,5.5881684 3.1020974,5.2969283 C 3.3478146,4.3863605 3.93576,3.6757372 4.756668,3.2971229 5.3293315,3.0330025 5.1813272,3.0450949 8.0130385,3.0310668 l 2.5522875,-0.012644 1.918693,1.9107086 c 1.404146,1.3983023 1.964459,1.9332518 2.089351,1.9947704 l 0.170657,0.084062 5.897611,0.019367 c 5.553257,0.018236 5.910365,0.023213 6.116041,0.085231 1.102257,0.3323708 1.857042,1.1184422 2.154229,2.2435244 0.05645,0.2137228 0.06373,0.5643981 0.07519,3.6220748 0.0076,2.032169 -5.42e-4,3.370979 -0.02041,3.349261 -0.0182,-0.0199 -0.414296,-0.691472 -0.880217,-1.492382 -0.46592,-0.80091 -0.93093,-1.577954 -1.033354,-1.726764 -0.735716,-1.0689 -1.983568,-1.844244 -3.315972,-2.060353 -0.280375,-0.04548 -1.345158,-0.05334 -7.238708,-0.05347 -4.713933,-1.09e-4 -6.9931825,0.01221 -7.1717862,0.03874 -1.3002273,0.193134 -2.4770512,0.889916 -3.283628,1.944192 -0.1076466,0.140705 -0.8359664,1.353438 -1.6184885,2.694963 L 3.0017709,18.11149 Z"
   id="path201" />
 </g>
 </svg>
--- a/doc/html/folderopend.svg
+++ b/doc/html/folderopend.svg
@@ -0,0 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg version="1.1" width="16" height="24" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve">
 <g style="fill:#C4CFE5;">
 <path d="M1,5.998l0,16.002c-0,1.326 0.527,2.598 1.464,3.536c0.938,0.937 2.21,1.464 3.536,1.464c5.322,0 14.678,-0 20,0c1.326,0 2.598,-0.527 3.536,-1.464c0.937,-0.938 1.464,-2.21 1.464,-3.536c0,-3.486 0,-8.514 0,-12c0,-1.326 -0.527,-2.598 -1.464,-3.536c-0.938,-0.937 -2.21,-1.464 -3.536,-1.464c-0,0 -10.586,0 -10.586,0c0,-0 -3.707,-3.707 -3.707,-3.707c-0.187,-0.188 -0.442,-0.293 -0.707,-0.293l-5.002,0c-2.76,0 -4.998,2.238 -4.998,4.998Zm28,14.415l-3.456,-5.925c-0.538,-0.921 -1.524,-1.488 -2.591,-1.488c-0,0 -12.905,0 -12.906,0c-1.067,0 -2.053,0.567 -2.591,1.488l-4.453,7.635c0.03,0.751 0.342,1.465 0.876,1.998c0.562,0.563 1.325,0.879 2.121,0.879l20,0c0.796,0 1.559,-0.316 2.121,-0.879c0.563,-0.562 0.879,-1.325 0.879,-2.121l0,-1.587Zm0,-3.969l0,-6.444c0,-0.796 -0.316,-1.559 -0.879,-2.121c-0.562,-0.563 -1.325,-0.879 -2.121,-0.879c-7.738,0 -11,0 -11,0c-0.265,0 -0.52,-0.105 -0.707,-0.293c-0,0 -3.707,-3.707 -3.707,-3.707c-0,0 -4.588,0 -4.588,0c-1.656,0 -2.998,1.342 -2.998,2.998l0,12.16l2.729,-4.677c0.896,-1.536 2.54,-2.481 4.318,-2.481c3.354,0 9.552,0 12.906,0c1.778,0 3.422,0.945 4.318,2.481l1.729,2.963Z"/>
 </g>
 <g style="fill:#4665A2;stroke-width:0;">
 <path d="M 5.3879408,24.913408 C 4.1598821,24.650818 3.1571088,23.558656 3.053503,22.370876 L 3.0312746,22.116041 5.2606813,18.293515 C 6.486855,16.191126 7.5598351,14.372696 7.6450818,14.25256 8.0043056,13.746312 8.5423079,13.363007 9.2104664,13.137285 l 0.2548351,-0.08609 6.9294785,-0.0097 c 6.805096,-0.0095 6.934944,-0.0084 7.234011,0.06267 0.695577,0.165199 1.290483,0.557253 1.714887,1.130141 0.08158,0.110125 0.938747,1.556711 1.90481,3.214634 l 1.756479,3.014406 -0.0186,0.971942 c -0.01387,0.724723 -0.03365,1.032131 -0.07778,1.208575 -0.242792,0.970733 -0.88732,1.735415 -1.772382,2.102793 -0.58835,0.244217 0.247209,0.227436 -11.161974,0.224159 -9.0281537,-0.0026 -10.3636023,-0.0098 -10.5862902,-0.05746 z" />
 <path d="M 3.0126385,11.849829 3.0235061,5.5881684 3.1020974,5.2969283 C 3.3478146,4.3863605 3.93576,3.6757372 4.756668,3.2971229 5.3293315,3.0330025 5.1813272,3.0450949 8.0130385,3.0310668 l 2.5522875,-0.012644 1.918693,1.9107086 c 1.404146,1.3983023 1.964459,1.9332518 2.089351,1.9947704 l 0.170657,0.084062 5.897611,0.019367 c 5.553257,0.018236 5.910365,0.023213 6.116041,0.085231 1.102257,0.3323708 1.857042,1.1184422 2.154229,2.2435244 0.05645,0.2137228 0.06373,0.5643981 0.07519,3.6220748 0.0076,2.032169 -5.42e-4,3.370979 -0.02041,3.349261 -0.0182,-0.0199 -0.414296,-0.691472 -0.880217,-1.492382 -0.46592,-0.80091 -0.93093,-1.577954 -1.033354,-1.726764 -0.735716,-1.0689 -1.983568,-1.844244 -3.315972,-2.060353 -0.280375,-0.04548 -1.345158,-0.05334 -7.238708,-0.05347 -4.713933,-1.09e-4 -6.9931825,0.01221 -7.1717862,0.03874 -1.3002273,0.193134 -2.4770512,0.889916 -3.283628,1.944192 -0.1076466,0.140705 -0.8359664,1.353438 -1.6184885,2.694963 L 3.0017709,18.11149 Z" />
 </g>
 </svg>
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.8.20"/>
+<meta name="generator" content="Doxygen 1.9.8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>TurboJPEG: Data Fields</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -20,10 +20,9 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
-  <td id="projectalign" style="padding-left: 0.5em;">
+  <td id="projectalign">
-   <div id="projectname">TurboJPEG
+   <div id="projectname">TurboJPEG<span id="projectnumber">&#160;3.0.1</span>
   &#160;<span id="projectnumber">2.1.4</span>
   </div>
  </td>
 </tr>
@@ -31,21 +30,22 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.20 -->
+<!-- Generated by Doxygen 1.9.8 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
+var searchBox = new SearchBox("searchBox", "search/",'.html');
 /* @license-end */
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
  initMenu('',true,false,'search.php','Search');
  $(document).ready(function() { init_search(); });
 });
-/* @license-end */</script>
+/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
 <!-- window showing the filter options -->
@@ -57,51 +57,36 @@ $(function() {
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<div id="MSearchResults">
-        name="MSearchResults" id="MSearchResults">
+<div class="SRPage">
-</iframe>
+<div id="SRIndex">
 <div id="SRResults"></div>
 <div class="SRStatus" id="Loading">Loading...</div>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </div>
 </div>
 </div>
 <div class="contents">
 <div class="textblock">Here is a list of all documented struct and union fields with links to the struct/union documentation for each field:</div><ul>
-<li>customFilter
+<li>customFilter&#160;:&#160;<a class="el" href="structtjtransform.html#a0dc7697d59a7abe48afc629e96cbc1d2">tjtransform</a></li>
-: <a class="el" href="structtjtransform.html#afd7fc262df33f741e120ef4183202ef5">tjtransform</a>
+<li>data&#160;:&#160;<a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a></li>
-</li>
+<li>denom&#160;:&#160;<a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a></li>
-<li>data
+<li>h&#160;:&#160;<a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a></li>
-: <a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a>
+<li>num&#160;:&#160;<a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a></li>
-</li>
+<li>op&#160;:&#160;<a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a></li>
-<li>denom
+<li>options&#160;:&#160;<a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a></li>
-: <a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a>
+<li>r&#160;:&#160;<a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a></li>
-</li>
+<li>w&#160;:&#160;<a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a></li>
-<li>h
+<li>x&#160;:&#160;<a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a></li>
-: <a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a>
+<li>y&#160;:&#160;<a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a></li>
 </li>
 <li>num
 : <a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a>
 </li>
 <li>op
 : <a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a>
 </li>
 <li>options
 : <a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a>
 </li>
 <li>r
 : <a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a>
 </li>
 <li>w
 : <a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a>
 </li>
 <li>x
 : <a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a>
 </li>
 <li>y
 : <a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
+Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.8
 </small></address>
 </body>
 </html>
--- a/doc/html/functions_vars.html
+++ b/doc/html/functions_vars.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.8.20"/>
+<meta name="generator" content="Doxygen 1.9.8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>TurboJPEG: Data Fields - Variables</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -20,10 +20,9 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
-  <td id="projectalign" style="padding-left: 0.5em;">
+  <td id="projectalign">
-   <div id="projectname">TurboJPEG
+   <div id="projectname">TurboJPEG<span id="projectnumber">&#160;3.0.1</span>
   &#160;<span id="projectnumber">2.1.4</span>
   </div>
  </td>
 </tr>
@@ -31,21 +30,22 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.20 -->
+<!-- Generated by Doxygen 1.9.8 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
+var searchBox = new SearchBox("searchBox", "search/",'.html');
 /* @license-end */
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
  initMenu('',true,false,'search.php','Search');
  $(document).ready(function() { init_search(); });
 });
-/* @license-end */</script>
+/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
 <!-- window showing the filter options -->
@@ -57,51 +57,36 @@ $(function() {
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<div id="MSearchResults">
-        name="MSearchResults" id="MSearchResults">
+<div class="SRPage">
-</iframe>
+<div id="SRIndex">
 <div id="SRResults"></div>
 <div class="SRStatus" id="Loading">Loading...</div>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </div>
 </div>
 </div>
 <div class="contents">
-&#160;<ul>
+<div class="textblock">Here is a list of all documented variables with links to the struct/union documentation for each field:</div><ul>
-<li>customFilter
+<li>customFilter&#160;:&#160;<a class="el" href="structtjtransform.html#a0dc7697d59a7abe48afc629e96cbc1d2">tjtransform</a></li>
-: <a class="el" href="structtjtransform.html#afd7fc262df33f741e120ef4183202ef5">tjtransform</a>
+<li>data&#160;:&#160;<a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a></li>
-</li>
+<li>denom&#160;:&#160;<a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a></li>
-<li>data
+<li>h&#160;:&#160;<a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a></li>
-: <a class="el" href="structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3">tjtransform</a>
+<li>num&#160;:&#160;<a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a></li>
-</li>
+<li>op&#160;:&#160;<a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a></li>
-<li>denom
+<li>options&#160;:&#160;<a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a></li>
-: <a class="el" href="structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3">tjscalingfactor</a>
+<li>r&#160;:&#160;<a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a></li>
-</li>
+<li>w&#160;:&#160;<a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a></li>
-<li>h
+<li>x&#160;:&#160;<a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a></li>
-: <a class="el" href="structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115">tjregion</a>
+<li>y&#160;:&#160;<a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a></li>
 </li>
 <li>num
 : <a class="el" href="structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec">tjscalingfactor</a>
 </li>
 <li>op
 : <a class="el" href="structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498">tjtransform</a>
 </li>
 <li>options
 : <a class="el" href="structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6">tjtransform</a>
 </li>
 <li>r
 : <a class="el" href="structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf">tjtransform</a>
 </li>
 <li>w
 : <a class="el" href="structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42">tjregion</a>
 </li>
 <li>x
 : <a class="el" href="structtjregion.html#a4b6a37a93997091b26a75831fa291ad9">tjregion</a>
 </li>
 <li>y
 : <a class="el" href="structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2">tjregion</a>
 </li>
 </ul>
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
+Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.8
 </small></address>
 </body>
 </html>
--- a/doc/html/group___turbo_j_p_e_g.html
+++ b/doc/html/group___turbo_j_p_e_g.html
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
-<meta name="generator" content="Doxygen 1.8.20"/>
+<meta name="generator" content="Doxygen 1.9.8"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <title>TurboJPEG: Main Page</title>
 <link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -20,10 +20,9 @@
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
 <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
-  <td id="projectalign" style="padding-left: 0.5em;">
+  <td id="projectalign">
-   <div id="projectname">TurboJPEG
+   <div id="projectname">TurboJPEG<span id="projectnumber">&#160;3.0.1</span>
   &#160;<span id="projectnumber">2.1.4</span>
   </div>
  </td>
 </tr>
@@ -31,21 +30,22 @@
 </table>
 </div>
 <!-- end header part -->
-<!-- Generated by Doxygen 1.8.20 -->
+<!-- Generated by Doxygen 1.9.8 -->
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
-var searchBox = new SearchBox("searchBox", "search",false,'Search');
+var searchBox = new SearchBox("searchBox", "search/",'.html');
 /* @license-end */
 </script>
 <script type="text/javascript" src="menudata.js"></script>
 <script type="text/javascript" src="menu.js"></script>
 <script type="text/javascript">
-/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
+/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
 $(function() {
  initMenu('',true,false,'search.php','Search');
  $(document).ready(function() { init_search(); });
 });
-/* @license-end */</script>
+/* @license-end */
 </script>
 <div id="main-nav"></div>
 </div><!-- top -->
 <!-- window showing the filter options -->
@@ -57,20 +57,26 @@ $(function() {
 <!-- iframe showing the search results (closed by default) -->
 <div id="MSearchResultsWindow">
-<iframe src="javascript:void(0)" frameborder="0" 
+<div id="MSearchResults">
-        name="MSearchResults" id="MSearchResults">
+<div class="SRPage">
-</iframe>
+<div id="SRIndex">
 <div id="SRResults"></div>
 <div class="SRStatus" id="Loading">Loading...</div>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </div>
 </div>
 </div>
 <div class="header">
-  <div class="headertitle">
+  <div class="headertitle"><div class="title">TurboJPEG Documentation</div></div>
 <div class="title">TurboJPEG Documentation</div>  </div>
 </div><!--header-->
 <div class="contents">
 </div><!-- contents -->
 <!-- start footer part -->
 <hr class="footer"/><address class="footer"><small>
-Generated by&#160;<a href="http://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.8.20
+Generated by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.8
 </small></address>
 </body>
 </html>
--- a/doc/html/jquery.js
+++ b/doc/html/jquery.js
--- a/doc/html/menu.js
+++ b/doc/html/menu.js
@@ -28,7 +28,15 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
    if ('children' in data) {
      result+='<ul>';
      for (var i in data.children) {
-        result+='<li><a href="'+relPath+data.children[i].url+'">'+
+        var url;
        var link;
        link = data.children[i].url;
        if (link.substring(0,1)=='^') {
          url = link.substring(1);
        } else {
          url = relPath+link;
        }
        result+='<li><a href="'+url+'">'+
                                data.children[i].text+'</a>'+
                                makeTree(data.children[i],relPath)+'</li>';
      }
@@ -36,16 +44,93 @@ function initMenu(relPath,searchEnabled,serverSide,searchPage,search) {
    }
    return result;
  }
-
+  var searchBoxHtml;
  $('#main-nav').append(makeTree(menudata,relPath));
  $('#main-nav').children(':first').addClass('sm sm-dox').attr('id','main-menu');
  if (searchEnabled) {
    if (serverSide) {
-      $('#main-menu').append('<li style="float:right"><div id="MSearchBox" class="MSearchBoxInactive"><div class="left"><form id="FSearchBox" action="'+relPath+searchPage+'" method="get"><img id="MSearchSelect" src="'+relPath+'search/mag.svg" alt=""/><input type="text" id="MSearchField" name="query" value="'+search+'" size="20" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" onblur="searchBox.OnSearchFieldFocus(false)"></form></div><div class="right"></div></div></li>');
+      searchBoxHtml='<div id="MSearchBox" class="MSearchBoxInactive">'+
                 '<div class="left">'+
                  '<form id="FSearchBox" action="'+relPath+searchPage+
                    '" method="get"><span id="MSearchSelectExt">&#160;</span>'+
                  '<input type="text" id="MSearchField" name="query" value="" placeholder="'+search+
                    '" size="20" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)"'+
                    ' onblur="searchBox.OnSearchFieldFocus(false)"/>'+
                  '</form>'+
                 '</div>'+
                 '<div class="right"></div>'+
                '</div>';
    } else {
-      $('#main-menu').append('<li style="float:right"><div id="MSearchBox" class="MSearchBoxInactive"><span class="left"><img id="MSearchSelect" src="'+relPath+'search/mag_sel.svg" onmouseover="return searchBox.OnSearchSelectShow()" onmouseout="return searchBox.OnSearchSelectHide()" alt=""/><input type="text" id="MSearchField" value="'+search+'" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" onblur="searchBox.OnSearchFieldFocus(false)" onkeyup="searchBox.OnSearchFieldChange(event)"/></span><span class="right"><a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="'+relPath+'search/close.svg" alt=""/></a></span></div></li>');
+      searchBoxHtml='<div id="MSearchBox" class="MSearchBoxInactive">'+
                 '<span class="left">'+
                  '<span id="MSearchSelect" onmouseover="return searchBox.OnSearchSelectShow()"'+
                     ' onmouseout="return searchBox.OnSearchSelectHide()">&#160;</span>'+
                  '<input type="text" id="MSearchField" value="" placeholder="'+search+
                    '" accesskey="S" onfocus="searchBox.OnSearchFieldFocus(true)" '+
                    'onblur="searchBox.OnSearchFieldFocus(false)" '+
                    'onkeyup="searchBox.OnSearchFieldChange(event)"/>'+
                 '</span>'+
                 '<span class="right"><a id="MSearchClose" '+
                  'href="javascript:searchBox.CloseResultsWindow()">'+
                  '<img id="MSearchCloseImg" border="0" src="'+relPath+
                  'search/close.svg" alt=""/></a>'+
                 '</span>'+
                '</div>';
    }
  }
  $('#main-nav').before('<div class="sm sm-dox"><input id="main-menu-state" type="checkbox"/>'+
                        '<label class="main-menu-btn" for="main-menu-state">'+
                        '<span class="main-menu-btn-icon"></span> '+
                        'Toggle main menu visibility</label>'+
                        '<span id="searchBoxPos1" style="position:absolute;right:8px;top:8px;height:36px;"></span>'+
                        '</div>');
  $('#main-nav').append(makeTree(menudata,relPath));
  $('#main-nav').children(':first').addClass('sm sm-dox').attr('id','main-menu');
  if (searchBoxHtml) {
    $('#main-menu').append('<li id="searchBoxPos2" style="float:right"></li>');
  }
  var $mainMenuState = $('#main-menu-state');
  var prevWidth = 0;
  if ($mainMenuState.length) {
    function initResizableIfExists() {
      if (typeof initResizable==='function') initResizable();
    }
    // animate mobile menu
    $mainMenuState.change(function(e) {
      var $menu = $('#main-menu');
      var options = { duration: 250, step: initResizableIfExists };
      if (this.checked) {
        options['complete'] = function() { $menu.css('display', 'block') };
        $menu.hide().slideDown(options);
      } else {
        options['complete'] = function() { $menu.css('display', 'none') };
        $menu.show().slideUp(options);
      }
    });
    // set default menu visibility
    function resetState() {
      var $menu = $('#main-menu');
      var $mainMenuState = $('#main-menu-state');
      var newWidth = $(window).outerWidth();
      if (newWidth!=prevWidth) {
        if ($(window).outerWidth()<768) {
          $mainMenuState.prop('checked',false); $menu.hide();
          $('#searchBoxPos1').html(searchBoxHtml);
          $('#searchBoxPos2').hide();
        } else {
          $menu.show();
          $('#searchBoxPos1').empty();
          $('#searchBoxPos2').html(searchBoxHtml);
          $('#searchBoxPos2').show();
        }
        if (typeof searchBox!=='undefined') {
          searchBox.CloseResultsWindow();
        }
        prevWidth = newWidth;
      }
    }
    $(window).ready(function() { resetState(); initResizableIfExists(); });
    $(window).resize(resetState);
  }
  $('#main-menu').smartmenus();
 }
 /* @license-end */
--- a/doc/html/menudata.js
+++ b/doc/html/menudata.js
@@ -24,7 +24,7 @@
 */
 var menudata={children:[
 {text:"Main Page",url:"index.html"},
-{text:"Modules",url:"modules.html"},
+{text:"Topics",url:"topics.html"},
 {text:"Data Structures",url:"annotated.html",children:[
 {text:"Data Structures",url:"annotated.html"},
 {text:"Data Structure Index",url:"classes.html"},
--- a/doc/html/minus.svg
+++ b/doc/html/minus.svg
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="12px" height="12px" viewBox="0 0 105.83333 105.83333" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
    <rect style="fill:#808080;stroke-width:0" width="105.83333" height="105.83334" x="4.2409692e-08" y="-1.2701158e-06" ry="0" />
    <rect style="fill:#fcfcfc;stroke-width:0" width="79.375" height="79.375" x="13.229166" y="13.229166" />
    <rect style="fill:#808080;stroke-width:0" width="52.916668" height="15.874998" x="26.458332" y="44.979168" />
  </g>
 </svg>
--- a/doc/html/minusd.svg
+++ b/doc/html/minusd.svg
@@ -0,0 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="12px" height="12px" viewBox="0 0 105.83333 105.83333" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
    <rect style="fill:#808080;stroke-width:0" width="105.83333" height="105.83334" x="4.2409692e-08" y="-1.2701158e-06" ry="0" />
    <rect style="fill:#000000;stroke-width:0" width="79.375" height="79.375" x="13.229166" y="13.229166" />
    <rect style="fill:#808080;stroke-width:0" width="52.916668" height="15.874998" x="26.458332" y="44.979168" />
  </g>
 </svg>
--- a/doc/html/nav_fd.png
+++ b/doc/html/nav_fd.png
--- a/doc/html/nav_hd.png
+++ b/doc/html/nav_hd.png
--- a/doc/html/plus.svg
+++ b/doc/html/plus.svg
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="12px" height="12px" viewBox="0 0 105.83333 105.83333" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
    <rect style="fill:#808080;stroke-width:0" width="105.83333" height="105.83334" x="4.2409692e-08" y="-1.2701158e-06" ry="0" />
    <rect style="fill:#fcfcfc;stroke-width:0" width="79.375" height="79.375" x="13.229166" y="13.229166" />
    <rect style="fill:#808080;stroke-width:0" width="52.916668" height="15.874998" x="26.458332" y="44.979168" />
    <rect style="fill:#808080;stroke-width:0" width="15.874998" height="52.916668" x="44.979168" y="26.458332" />
  </g>
 </svg>
--- a/doc/html/plusd.svg
+++ b/doc/html/plusd.svg
@@ -0,0 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="12px" height="12px" viewBox="0 0 105.83333 105.83333" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
  <g>
    <rect style="fill:#808080;stroke-width:0" width="105.83333" height="105.83334" x="4.2409692e-08" y="-1.2701158e-06" ry="0" />
    <rect style="fill:#000000;stroke-width:0" width="79.375" height="79.375" x="13.229166" y="13.229166" />
    <rect style="fill:#808080;stroke-width:0" width="52.916668" height="15.874998" x="26.458332" y="44.979168" />
    <rect style="fill:#808080;stroke-width:0" width="15.874998" height="52.916668" x="44.979168" y="26.458332" />
  </g>
 </svg>
--- a/doc/html/search/all_0.html
+++ b/doc/html/search/all_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_0.js
+++ b/doc/html/search/all_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['customfilter_0',['customFilter',['../structtjtransform.html#afd7fc262df33f741e120ef4183202ef5',1,'tjtransform']]]
+  ['customfilter_0',['customFilter',['../structtjtransform.html#a0dc7697d59a7abe48afc629e96cbc1d2',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_1.html
+++ b/doc/html/search/all_1.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_1.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_1.js
+++ b/doc/html/search/all_1.js
@@ -1,5 +1,5 @@
 var searchData=
 [
-  ['data_1',['data',['../structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3',1,'tjtransform']]],
+  ['data_0',['data',['../structtjtransform.html#a688fe8f1a8ecc12a538d9e561cf338e3',1,'tjtransform']]],
-  ['denom_2',['denom',['../structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3',1,'tjscalingfactor']]]
+  ['denom_1',['denom',['../structtjscalingfactor.html#aefbcdf3e9e62274b2d312c695f133ce3',1,'tjscalingfactor']]]
 ];
--- a/doc/html/search/all_2.html
+++ b/doc/html/search/all_2.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_2.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_2.js
+++ b/doc/html/search/all_2.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['h_3',['h',['../structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115',1,'tjregion']]]
+  ['format_20notes_0',['YUV Image Format Notes',['../group___turbo_j_p_e_g.html#autotoc_md0',1,'']]]
 ];
--- a/doc/html/search/all_3.html
+++ b/doc/html/search/all_3.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_3.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_3.js
+++ b/doc/html/search/all_3.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['num_4',['num',['../structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec',1,'tjscalingfactor']]]
+  ['h_0',['h',['../structtjregion.html#aecefc45a26f4d8b60dd4d825c1710115',1,'tjregion']]]
 ];
--- a/doc/html/search/all_4.html
+++ b/doc/html/search/all_4.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_4.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_4.js
+++ b/doc/html/search/all_4.js
@@ -1,5 +1,4 @@
 var searchData=
 [
-  ['op_5',['op',['../structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498',1,'tjtransform']]],
+  ['image_20format_20notes_0',['YUV Image Format Notes',['../group___turbo_j_p_e_g.html#autotoc_md0',1,'']]]
  ['options_6',['options',['../structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_5.html
+++ b/doc/html/search/all_5.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_5.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_5.js
+++ b/doc/html/search/all_5.js
@@ -1,4 +1,5 @@
 var searchData=
 [
-  ['r_7',['r',['../structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf',1,'tjtransform']]]
+  ['notes_0',['YUV Image Format Notes',['../group___turbo_j_p_e_g.html#autotoc_md0',1,'']]],
  ['num_1',['num',['../structtjscalingfactor.html#a9b011e57f981ee23083e2c1aa5e640ec',1,'tjscalingfactor']]]
 ];
--- a/doc/html/search/all_6.html
+++ b/doc/html/search/all_6.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_6.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_6.js
+++ b/doc/html/search/all_6.js
@@ -1,103 +1,5 @@
 var searchData=
 [
-  ['tj_5fnumcs_8',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]],
+  ['op_0',['op',['../structtjtransform.html#a2525aab4ba6978a1c273f74fef50e498',1,'tjtransform']]],
-  ['tj_5fnumerr_9',['TJ_NUMERR',['../group___turbo_j_p_e_g.html#ga79bde1b4a3e2351e00887e47781b966e',1,'turbojpeg.h']]],
+  ['options_1',['options',['../structtjtransform.html#ac0e74655baa4402209a21e1ae481c8f6',1,'tjtransform']]]
  ['tj_5fnumpf_10',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]],
  ['tj_5fnumsamp_11',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]],
  ['tj_5fnumxop_12',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]],
  ['tjalloc_13',['tjAlloc',['../group___turbo_j_p_e_g.html#gaec627dd4c5f30b7a775a7aea3bec5d83',1,'turbojpeg.h']]],
  ['tjalphaoffset_14',['tjAlphaOffset',['../group___turbo_j_p_e_g.html#ga5af0ab065feefd526debf1e20c43e837',1,'turbojpeg.h']]],
  ['tjblueoffset_15',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]],
  ['tjbufsize_16',['tjBufSize',['../group___turbo_j_p_e_g.html#ga67ac12fee79073242cb216e07c9f1f90',1,'turbojpeg.h']]],
  ['tjbufsizeyuv2_17',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#ga2be2b9969d4df9ecce9b05deed273194',1,'turbojpeg.h']]],
  ['tjcompress2_18',['tjCompress2',['../group___turbo_j_p_e_g.html#gafbdce0112fd78fd38efae841443a9bcf',1,'turbojpeg.h']]],
  ['tjcompressfromyuv_19',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga7622a459b79aa1007e005b58783f875b',1,'turbojpeg.h']]],
  ['tjcompressfromyuvplanes_20',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga29ec5dfbd2d84b8724e951d6fa0d5d9e',1,'turbojpeg.h']]],
  ['tjcs_21',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
  ['tjcs_5fcmyk_22',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
  ['tjcs_5fgray_23',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
  ['tjcs_5frgb_24',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
  ['tjcs_5fycbcr_25',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
  ['tjcs_5fycck_26',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
  ['tjdecodeyuv_27',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga70abbf38f77a26fd6da8813bef96f695',1,'turbojpeg.h']]],
  ['tjdecodeyuvplanes_28',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga10e837c07fa9d25770565b237d3898d9',1,'turbojpeg.h']]],
  ['tjdecompress2_29',['tjDecompress2',['../group___turbo_j_p_e_g.html#gae9eccef8b682a48f43a9117c231ed013',1,'turbojpeg.h']]],
  ['tjdecompressheader3_30',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga0595681096bba7199cc6f3533cb25f77',1,'turbojpeg.h']]],
  ['tjdecompresstoyuv2_31',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga04d1e839ff9a0860dd1475cff78d3364',1,'turbojpeg.h']]],
  ['tjdecompresstoyuvplanes_32',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#gaa59f901a5258ada5bd0185ad59368540',1,'turbojpeg.h']]],
  ['tjdestroy_33',['tjDestroy',['../group___turbo_j_p_e_g.html#ga75f355fa27225ba1a4ee392c852394d2',1,'turbojpeg.h']]],
  ['tjencodeyuv3_34',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gac519b922cdf446e97d0cdcba513636bf',1,'turbojpeg.h']]],
  ['tjencodeyuvplanes_35',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gae2d04c72457fe7f4d60cf78ab1b1feb1',1,'turbojpeg.h']]],
  ['tjerr_36',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
  ['tjerr_5ffatal_37',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
  ['tjerr_5fwarning_38',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
  ['tjflag_5faccuratedct_39',['TJFLAG_ACCURATEDCT',['../group___turbo_j_p_e_g.html#gacb233cfd722d66d1ccbf48a7de81f0e0',1,'turbojpeg.h']]],
  ['tjflag_5fbottomup_40',['TJFLAG_BOTTOMUP',['../group___turbo_j_p_e_g.html#ga72ecf4ebe6eb702d3c6f5ca27455e1ec',1,'turbojpeg.h']]],
  ['tjflag_5ffastdct_41',['TJFLAG_FASTDCT',['../group___turbo_j_p_e_g.html#gaabce235db80d3f698b27f36cbd453da2',1,'turbojpeg.h']]],
  ['tjflag_5ffastupsample_42',['TJFLAG_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ga4ee4506c81177a06f77e2504a22efd2d',1,'turbojpeg.h']]],
  ['tjflag_5flimitscans_43',['TJFLAG_LIMITSCANS',['../group___turbo_j_p_e_g.html#ga163e6482dc5096831feef9c79ff3f805',1,'turbojpeg.h']]],
  ['tjflag_5fnorealloc_44',['TJFLAG_NOREALLOC',['../group___turbo_j_p_e_g.html#ga8808d403c68b62aaa58a4c1e58e98963',1,'turbojpeg.h']]],
  ['tjflag_5fprogressive_45',['TJFLAG_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ga43b426750b46190a25d34a67ef76df1b',1,'turbojpeg.h']]],
  ['tjflag_5fstoponwarning_46',['TJFLAG_STOPONWARNING',['../group___turbo_j_p_e_g.html#ga519cfa4ef6c18d9e5b455fdf59306a3a',1,'turbojpeg.h']]],
  ['tjfree_47',['tjFree',['../group___turbo_j_p_e_g.html#gaea863d2da0cdb609563aabdf9196514b',1,'turbojpeg.h']]],
  ['tjgeterrorcode_48',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga414feeffbf860ebd31c745df203de410',1,'turbojpeg.h']]],
  ['tjgeterrorstr2_49',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga1ead8574f9f39fbafc6b497124e7aafa',1,'turbojpeg.h']]],
  ['tjgetscalingfactors_50',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#gac3854476006b10787bd128f7ede48057',1,'turbojpeg.h']]],
  ['tjgreenoffset_51',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]],
  ['tjhandle_52',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
  ['tjinitcompress_53',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga9d63a05fc6d813f4aae06107041a37e8',1,'turbojpeg.h']]],
  ['tjinitdecompress_54',['tjInitDecompress',['../group___turbo_j_p_e_g.html#ga52300eac3f3d9ef4bab303bc244f62d3',1,'turbojpeg.h']]],
  ['tjinittransform_55',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga928beff6ac248ceadf01089fc6b41957',1,'turbojpeg.h']]],
  ['tjloadimage_56',['tjLoadImage',['../group___turbo_j_p_e_g.html#gaffbd83c375e79f5db4b5c5d8ad4466e7',1,'turbojpeg.h']]],
  ['tjmcuheight_57',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]],
  ['tjmcuwidth_58',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]],
  ['tjpad_59',['TJPAD',['../group___turbo_j_p_e_g.html#ga0aba955473315e405295d978f0c16511',1,'turbojpeg.h']]],
  ['tjpf_60',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
  ['tjpf_5fabgr_61',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
  ['tjpf_5fargb_62',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
  ['tjpf_5fbgr_63',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
  ['tjpf_5fbgra_64',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
  ['tjpf_5fbgrx_65',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
  ['tjpf_5fcmyk_66',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
  ['tjpf_5fgray_67',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
  ['tjpf_5frgb_68',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
  ['tjpf_5frgba_69',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
  ['tjpf_5frgbx_70',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
  ['tjpf_5funknown_71',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
  ['tjpf_5fxbgr_72',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
  ['tjpf_5fxrgb_73',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
  ['tjpixelsize_74',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]],
  ['tjplaneheight_75',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]],
  ['tjplanesizeyuv_76',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#gab4ab7b24f6e797d79abaaa670373961d',1,'turbojpeg.h']]],
  ['tjplanewidth_77',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]],
  ['tjredoffset_78',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]],
  ['tjregion_79',['tjregion',['../structtjregion.html',1,'']]],
  ['tjsamp_80',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
  ['tjsamp_5f411_81',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
  ['tjsamp_5f420_82',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
  ['tjsamp_5f422_83',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
  ['tjsamp_5f440_84',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
  ['tjsamp_5f444_85',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
  ['tjsamp_5fgray_86',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
  ['tjsaveimage_87',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga6f445b22d8933ae4815b3370a538d879',1,'turbojpeg.h']]],
  ['tjscaled_88',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]],
  ['tjscalingfactor_89',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
  ['tjtransform_90',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#ga504805ec0161f1b505397ca0118bf8fd',1,'tjtransform():&#160;turbojpeg.h'],['../group___turbo_j_p_e_g.html#ga9cb8abf4cc91881e04a0329b2270be25',1,'tjTransform(tjhandle handle, const unsigned char *jpegBuf, unsigned long jpegSize, int n, unsigned char **dstBufs, unsigned long *dstSizes, tjtransform *transforms, int flags):&#160;turbojpeg.h']]],
  ['tjxop_91',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]],
  ['tjxop_5fhflip_92',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
  ['tjxop_5fnone_93',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
  ['tjxop_5frot180_94',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
  ['tjxop_5frot270_95',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
  ['tjxop_5frot90_96',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
  ['tjxop_5ftranspose_97',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
  ['tjxop_5ftransverse_98',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
  ['tjxop_5fvflip_99',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]],
  ['tjxopt_5fcopynone_100',['TJXOPT_COPYNONE',['../group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8',1,'turbojpeg.h']]],
  ['tjxopt_5fcrop_101',['TJXOPT_CROP',['../group___turbo_j_p_e_g.html#ga9c771a757fc1294add611906b89ab2d2',1,'turbojpeg.h']]],
  ['tjxopt_5fgray_102',['TJXOPT_GRAY',['../group___turbo_j_p_e_g.html#ga3acee7b48ade1b99e5588736007c2589',1,'turbojpeg.h']]],
  ['tjxopt_5fnooutput_103',['TJXOPT_NOOUTPUT',['../group___turbo_j_p_e_g.html#gafbf992bbf6e006705886333703ffab31',1,'turbojpeg.h']]],
  ['tjxopt_5fperfect_104',['TJXOPT_PERFECT',['../group___turbo_j_p_e_g.html#ga50e03cb5ed115330e212417429600b00',1,'turbojpeg.h']]],
  ['tjxopt_5fprogressive_105',['TJXOPT_PROGRESSIVE',['../group___turbo_j_p_e_g.html#gad2371c80674584ecc1a7d75e564cf026',1,'turbojpeg.h']]],
  ['tjxopt_5ftrim_106',['TJXOPT_TRIM',['../group___turbo_j_p_e_g.html#ga319826b7eb1583c0595bbe7b95428709',1,'turbojpeg.h']]],
  ['turbojpeg_107',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/html/search/all_7.html
+++ b/doc/html/search/all_7.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_7.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_7.js
+++ b/doc/html/search/all_7.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['w_108',['w',['../structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42',1,'tjregion']]]
+  ['r_0',['r',['../structtjtransform.html#ac324e5e442abec8a961e5bf219db12cf',1,'tjtransform']]]
 ];
--- a/doc/html/search/all_8.html
+++ b/doc/html/search/all_8.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_8.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_8.js
+++ b/doc/html/search/all_8.js
@@ -1,4 +1,142 @@
 var searchData=
 [
-  ['x_109',['x',['../structtjregion.html#a4b6a37a93997091b26a75831fa291ad9',1,'tjregion']]]
+  ['tj3alloc_0',['tj3Alloc',['../group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57',1,'turbojpeg.h']]],
  ['tj3compress12_1',['tj3Compress12',['../group___turbo_j_p_e_g.html#ga9a1968c384ec7abb6122830253ebf570',1,'turbojpeg.h']]],
  ['tj3compress16_2',['tj3Compress16',['../group___turbo_j_p_e_g.html#ga77901b71d0471784f318ada31ff4e7bd',1,'turbojpeg.h']]],
  ['tj3compress8_3',['tj3Compress8',['../group___turbo_j_p_e_g.html#ga2cc418a2dab709ad7f30f5b25905f138',1,'turbojpeg.h']]],
  ['tj3compressfromyuv8_4',['tj3CompressFromYUV8',['../group___turbo_j_p_e_g.html#ga041c870d9c669eb3f385c78f4346c43f',1,'turbojpeg.h']]],
  ['tj3compressfromyuvplanes8_5',['tj3CompressFromYUVPlanes8',['../group___turbo_j_p_e_g.html#gac9f5ace3e73805b476c95dda9f8d0cd0',1,'turbojpeg.h']]],
  ['tj3decodeyuv8_6',['tj3DecodeYUV8',['../group___turbo_j_p_e_g.html#gaa1eb574f38b1c1de43a6c7aafcf68d8c',1,'turbojpeg.h']]],
  ['tj3decodeyuvplanes8_7',['tj3DecodeYUVPlanes8',['../group___turbo_j_p_e_g.html#gad366f1915f82c1ad4e7e37ebe073ca89',1,'turbojpeg.h']]],
  ['tj3decompress12_8',['tj3Decompress12',['../group___turbo_j_p_e_g.html#ga39b848f01781ad74a5b3941c012b6199',1,'turbojpeg.h']]],
  ['tj3decompress16_9',['tj3Decompress16',['../group___turbo_j_p_e_g.html#gaa074e63f9beb0b3ff42b833a4049df6e',1,'turbojpeg.h']]],
  ['tj3decompress8_10',['tj3Decompress8',['../group___turbo_j_p_e_g.html#ga1169c7c1a26ec18c9e6122cb8ae64013',1,'turbojpeg.h']]],
  ['tj3decompressheader_11',['tj3DecompressHeader',['../group___turbo_j_p_e_g.html#ga96d2c4b3432f9d88ad14758ae240b8d1',1,'turbojpeg.h']]],
  ['tj3decompresstoyuv8_12',['tj3DecompressToYUV8',['../group___turbo_j_p_e_g.html#ga1e6bf6a19fec3f9fa7534348879d8320',1,'turbojpeg.h']]],
  ['tj3decompresstoyuvplanes8_13',['tj3DecompressToYUVPlanes8',['../group___turbo_j_p_e_g.html#ga934373482dbbf257f2280505b6ff4fb5',1,'turbojpeg.h']]],
  ['tj3destroy_14',['tj3Destroy',['../group___turbo_j_p_e_g.html#ga53fbadf4560e95a65b8f5ab81703fe82',1,'turbojpeg.h']]],
  ['tj3encodeyuv8_15',['tj3EncodeYUV8',['../group___turbo_j_p_e_g.html#ga2a8d50f130bde10f0a04030f8cc59936',1,'turbojpeg.h']]],
  ['tj3encodeyuvplanes8_16',['tj3EncodeYUVPlanes8',['../group___turbo_j_p_e_g.html#gae2e9df38790e9bddc249d04cb158a4cf',1,'turbojpeg.h']]],
  ['tj3free_17',['tj3Free',['../group___turbo_j_p_e_g.html#gaddb84fb6c81769e9faa0f5a63b296606',1,'turbojpeg.h']]],
  ['tj3get_18',['tj3Get',['../group___turbo_j_p_e_g.html#ga34af9ba3183bdf0ec7c8f47bb9a4c84f',1,'turbojpeg.h']]],
  ['tj3geterrorcode_19',['tj3GetErrorCode',['../group___turbo_j_p_e_g.html#gab8c8279f1415fe425ff30dbbc56013bd',1,'turbojpeg.h']]],
  ['tj3geterrorstr_20',['tj3GetErrorStr',['../group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29',1,'turbojpeg.h']]],
  ['tj3getscalingfactors_21',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
  ['tj3init_22',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
  ['tj3jpegbufsize_23',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
  ['tj3loadimage12_24',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
  ['tj3loadimage16_25',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
  ['tj3loadimage8_26',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
  ['tj3saveimage12_27',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
  ['tj3saveimage16_28',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
  ['tj3saveimage8_29',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
  ['tj3set_30',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
  ['tj3setcroppingregion_31',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
  ['tj3setscalingfactor_32',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
  ['tj3transform_33',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
  ['tj3yuvbufsize_34',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
  ['tj3yuvplaneheight_35',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
  ['tj3yuvplanesize_36',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
  ['tj3yuvplanewidth_37',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]],
  ['tj_5fnumcs_38',['TJ_NUMCS',['../group___turbo_j_p_e_g.html#ga39f57a6fb02d9cf32e7b6890099b5a71',1,'turbojpeg.h']]],
  ['tj_5fnumerr_39',['TJ_NUMERR',['../group___turbo_j_p_e_g.html#ga79bde1b4a3e2351e00887e47781b966e',1,'turbojpeg.h']]],
  ['tj_5fnuminit_40',['TJ_NUMINIT',['../group___turbo_j_p_e_g.html#ga5e0e8c784295c636f0bf8dab93c4bddf',1,'turbojpeg.h']]],
  ['tj_5fnumpf_41',['TJ_NUMPF',['../group___turbo_j_p_e_g.html#ga7010a4402f54a45ba822ad8675a4655e',1,'turbojpeg.h']]],
  ['tj_5fnumsamp_42',['TJ_NUMSAMP',['../group___turbo_j_p_e_g.html#ga5ef3d169162ce77ce348e292a0b7477c',1,'turbojpeg.h']]],
  ['tj_5fnumxop_43',['TJ_NUMXOP',['../group___turbo_j_p_e_g.html#ga0f6dbd18adf38b7d46ac547f0f4d562c',1,'turbojpeg.h']]],
  ['tjalphaoffset_44',['tjAlphaOffset',['../group___turbo_j_p_e_g.html#ga5af0ab065feefd526debf1e20c43e837',1,'turbojpeg.h']]],
  ['tjblueoffset_45',['tjBlueOffset',['../group___turbo_j_p_e_g.html#ga84e2e35d3f08025f976ec1ec53693dea',1,'turbojpeg.h']]],
  ['tjcs_46',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
  ['tjcs_5fcmyk_47',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
  ['tjcs_5fgray_48',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
  ['tjcs_5frgb_49',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
  ['tjcs_5fycbcr_50',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
  ['tjcs_5fycck_51',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
  ['tjerr_52',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
  ['tjerr_5ffatal_53',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
  ['tjerr_5fwarning_54',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
  ['tjgreenoffset_55',['tjGreenOffset',['../group___turbo_j_p_e_g.html#ga82d6e35da441112a411da41923c0ba2f',1,'turbojpeg.h']]],
  ['tjhandle_56',['tjhandle',['../group___turbo_j_p_e_g.html#ga758d2634ecb4949de7815cba621f5763',1,'turbojpeg.h']]],
  ['tjinit_57',['TJINIT',['../group___turbo_j_p_e_g.html#ga3850bbee1313e752e667b4eb08b1e086',1,'turbojpeg.h']]],
  ['tjinit_5fcompress_58',['TJINIT_COMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086aa45ac279e3dc6ffabc4b0f45864da796',1,'turbojpeg.h']]],
  ['tjinit_5fdecompress_59',['TJINIT_DECOMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a4b8ca1ef700699b71350700bf95c2167',1,'turbojpeg.h']]],
  ['tjinit_5ftransform_60',['TJINIT_TRANSFORM',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a8d58a2a4c45b3e0cd349746544a6e0c2',1,'turbojpeg.h']]],
  ['tjmcuheight_61',['tjMCUHeight',['../group___turbo_j_p_e_g.html#gabd247bb9fecb393eca57366feb8327bf',1,'turbojpeg.h']]],
  ['tjmcuwidth_62',['tjMCUWidth',['../group___turbo_j_p_e_g.html#ga9e61e7cd47a15a173283ba94e781308c',1,'turbojpeg.h']]],
  ['tjparam_63',['TJPARAM',['../group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82',1,'turbojpeg.h']]],
  ['tjparam_5farithmetic_64',['TJPARAM_ARITHMETIC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1c756757384308145602c040524aebf7',1,'turbojpeg.h']]],
  ['tjparam_5fbottomup_65',['TJPARAM_BOTTOMUP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a924657172695ed6cb0b128219546fcce',1,'turbojpeg.h']]],
  ['tjparam_5fcolorspace_66',['TJPARAM_COLORSPACE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a46a10d46309514907d0c39fcd86c324c',1,'turbojpeg.h']]],
  ['tjparam_5fdensityunits_67',['TJPARAM_DENSITYUNITS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4c045981bd8a303521a401dbbe1df208',1,'turbojpeg.h']]],
  ['tjparam_5ffastdct_68',['TJPARAM_FASTDCT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a6914692ac6ec5567787d592b7563f627',1,'turbojpeg.h']]],
  ['tjparam_5ffastupsample_69',['TJPARAM_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0e051ac106f7b7402b690a5daf4869c0',1,'turbojpeg.h']]],
  ['tjparam_5fjpegheight_70',['TJPARAM_JPEGHEIGHT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f76673be73f2b659440a9572a65a95f',1,'turbojpeg.h']]],
  ['tjparam_5fjpegwidth_71',['TJPARAM_JPEGWIDTH',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a02ab77fb294a0c9061a78cd424c82dd8',1,'turbojpeg.h']]],
  ['tjparam_5flossless_72',['TJPARAM_LOSSLESS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a249f35f0770792b19f995e603bb17c6f',1,'turbojpeg.h']]],
  ['tjparam_5flosslesspsv_73',['TJPARAM_LOSSLESSPSV',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abcc997d40e5bec84817c12b76ef84159',1,'turbojpeg.h']]],
  ['tjparam_5flosslesspt_74',['TJPARAM_LOSSLESSPT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4a6c6f25764ecaf4231a36bff844e46a',1,'turbojpeg.h']]],
  ['tjparam_5fmaxmemory_75',['TJPARAM_MAXMEMORY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0de0a8281da45d1fc984edc8918f7dd2',1,'turbojpeg.h']]],
  ['tjparam_5fmaxpixels_76',['TJPARAM_MAXPIXELS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac4e95dd2ecd766854feee579406eae68',1,'turbojpeg.h']]],
  ['tjparam_5fnorealloc_77',['TJPARAM_NOREALLOC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b',1,'turbojpeg.h']]],
  ['tjparam_5foptimize_78',['TJPARAM_OPTIMIZE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f0af9afc0b36443751f9ee82b760aa6',1,'turbojpeg.h']]],
  ['tjparam_5fprecision_79',['TJPARAM_PRECISION',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a781db82741934e8cd008d308597c59d8',1,'turbojpeg.h']]],
  ['tjparam_5fprogressive_80',['TJPARAM_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1716f242b3859905b4a317dae8cfb75f',1,'turbojpeg.h']]],
  ['tjparam_5fquality_81',['TJPARAM_QUALITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0467e8792621f2d817dc2af563d3186c',1,'turbojpeg.h']]],
  ['tjparam_5frestartblocks_82',['TJPARAM_RESTARTBLOCKS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a343c72883b7160f23f3ef46fc548a0ec',1,'turbojpeg.h']]],
  ['tjparam_5frestartrows_83',['TJPARAM_RESTARTROWS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a714367585952fe5c863f0dba5bd37e5c',1,'turbojpeg.h']]],
  ['tjparam_5fscanlimit_84',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
  ['tjparam_5fstoponwarning_85',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
  ['tjparam_5fsubsamp_86',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
  ['tjparam_5fxdensity_87',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
  ['tjparam_5fydensity_88',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
  ['tjpf_89',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
  ['tjpf_5fabgr_90',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
  ['tjpf_5fargb_91',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
  ['tjpf_5fbgr_92',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
  ['tjpf_5fbgra_93',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
  ['tjpf_5fbgrx_94',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
  ['tjpf_5fcmyk_95',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
  ['tjpf_5fgray_96',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
  ['tjpf_5frgb_97',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
  ['tjpf_5frgba_98',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
  ['tjpf_5frgbx_99',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
  ['tjpf_5funknown_100',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
  ['tjpf_5fxbgr_101',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
  ['tjpf_5fxrgb_102',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
  ['tjpixelsize_103',['tjPixelSize',['../group___turbo_j_p_e_g.html#gad77cf8fe5b2bfd3cb3f53098146abb4c',1,'turbojpeg.h']]],
  ['tjredoffset_104',['tjRedOffset',['../group___turbo_j_p_e_g.html#gadd9b446742ac8a3923f7992c7988fea8',1,'turbojpeg.h']]],
  ['tjregion_105',['tjregion',['../structtjregion.html',1,'']]],
  ['tjsamp_106',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
  ['tjsamp_5f411_107',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
  ['tjsamp_5f420_108',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
  ['tjsamp_5f422_109',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
  ['tjsamp_5f440_110',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
  ['tjsamp_5f441_111',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
  ['tjsamp_5f444_112',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
  ['tjsamp_5fgray_113',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
  ['tjsamp_5funknown_114',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
  ['tjscaled_115',['TJSCALED',['../group___turbo_j_p_e_g.html#ga84878bb65404204743aa18cac02781df',1,'turbojpeg.h']]],
  ['tjscalingfactor_116',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
  ['tjtransform_117',['tjtransform',['../structtjtransform.html',1,'tjtransform'],['../group___turbo_j_p_e_g.html#ga504805ec0161f1b505397ca0118bf8fd',1,'tjtransform:&#160;turbojpeg.h']]],
  ['tjuncropped_118',['TJUNCROPPED',['../group___turbo_j_p_e_g.html#ga6f192ad58a5a5802e145149d83c643bf',1,'turbojpeg.h']]],
  ['tjunscaled_119',['TJUNSCALED',['../group___turbo_j_p_e_g.html#ga7880644a0849161ad20933536169ee19',1,'turbojpeg.h']]],
  ['tjxop_120',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]],
  ['tjxop_5fhflip_121',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
  ['tjxop_5fnone_122',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
  ['tjxop_5frot180_123',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
  ['tjxop_5frot270_124',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
  ['tjxop_5frot90_125',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
  ['tjxop_5ftranspose_126',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
  ['tjxop_5ftransverse_127',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
  ['tjxop_5fvflip_128',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]],
  ['tjxopt_5farithmetic_129',['TJXOPT_ARITHMETIC',['../group___turbo_j_p_e_g.html#gaecaaa3b7e2af812592c015d83207f010',1,'turbojpeg.h']]],
  ['tjxopt_5fcopynone_130',['TJXOPT_COPYNONE',['../group___turbo_j_p_e_g.html#ga153b468cfb905d0de61706c838986fe8',1,'turbojpeg.h']]],
  ['tjxopt_5fcrop_131',['TJXOPT_CROP',['../group___turbo_j_p_e_g.html#ga9c771a757fc1294add611906b89ab2d2',1,'turbojpeg.h']]],
  ['tjxopt_5fgray_132',['TJXOPT_GRAY',['../group___turbo_j_p_e_g.html#ga3acee7b48ade1b99e5588736007c2589',1,'turbojpeg.h']]],
  ['tjxopt_5fnooutput_133',['TJXOPT_NOOUTPUT',['../group___turbo_j_p_e_g.html#gafbf992bbf6e006705886333703ffab31',1,'turbojpeg.h']]],
  ['tjxopt_5foptimize_134',['TJXOPT_OPTIMIZE',['../group___turbo_j_p_e_g.html#ga6bedf37aa9e1122f3ec9f7302ca59117',1,'turbojpeg.h']]],
  ['tjxopt_5fperfect_135',['TJXOPT_PERFECT',['../group___turbo_j_p_e_g.html#ga50e03cb5ed115330e212417429600b00',1,'turbojpeg.h']]],
  ['tjxopt_5fprogressive_136',['TJXOPT_PROGRESSIVE',['../group___turbo_j_p_e_g.html#gad2371c80674584ecc1a7d75e564cf026',1,'turbojpeg.h']]],
  ['tjxopt_5ftrim_137',['TJXOPT_TRIM',['../group___turbo_j_p_e_g.html#ga319826b7eb1583c0595bbe7b95428709',1,'turbojpeg.h']]],
  ['turbojpeg_138',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/html/search/all_9.html
+++ b/doc/html/search/all_9.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="all_9.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/all_9.js
+++ b/doc/html/search/all_9.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['y_110',['y',['../structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2',1,'tjregion']]]
+  ['w_0',['w',['../structtjregion.html#ab6eb73ceef584fc23c8c8097926dce42',1,'tjregion']]]
 ];
--- a/doc/html/search/all_a.js
+++ b/doc/html/search/all_a.js
@@ -0,0 +1,4 @@
 var searchData=
 [
  ['x_0',['x',['../structtjregion.html#a4b6a37a93997091b26a75831fa291ad9',1,'tjregion']]]
 ];
--- a/doc/html/search/all_b.js
+++ b/doc/html/search/all_b.js
@@ -0,0 +1,5 @@
 var searchData=
 [
  ['y_0',['y',['../structtjregion.html#a7b3e0c24cfe87acc80e334cafdcf22c2',1,'tjregion']]],
  ['yuv_20image_20format_20notes_1',['YUV Image Format Notes',['../group___turbo_j_p_e_g.html#autotoc_md0',1,'']]]
 ];
--- a/doc/html/search/classes_0.html
+++ b/doc/html/search/classes_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="classes_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/classes_0.js
+++ b/doc/html/search/classes_0.js
@@ -1,6 +1,6 @@
 var searchData=
 [
-  ['tjregion_111',['tjregion',['../structtjregion.html',1,'']]],
+  ['tjregion_0',['tjregion',['../structtjregion.html',1,'']]],
-  ['tjscalingfactor_112',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
+  ['tjscalingfactor_1',['tjscalingfactor',['../structtjscalingfactor.html',1,'']]],
-  ['tjtransform_113',['tjtransform',['../structtjtransform.html',1,'']]]
+  ['tjtransform_2',['tjtransform',['../structtjtransform.html',1,'']]]
 ];
--- a/doc/html/search/close.svg
+++ b/doc/html/search/close.svg
@@ -1,27 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   viewBox="0 0 11 11"
   height="11"
   width="11"
   id="svg2"
   version="1.1">
  <metadata
     id="metadata8">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs6" />
  <path
--- a/doc/html/search/enums_0.html
+++ b/doc/html/search/enums_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enums_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/enums_0.js
+++ b/doc/html/search/enums_0.js
@@ -1,8 +1,10 @@
 var searchData=
 [
-  ['tjcs_162',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
+  ['tjcs_0',['TJCS',['../group___turbo_j_p_e_g.html#ga4f83ad3368e0e29d1957be0efa7c3720',1,'turbojpeg.h']]],
-  ['tjerr_163',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
+  ['tjerr_1',['TJERR',['../group___turbo_j_p_e_g.html#gafbc17cfa57d0d5d11fea35ac025950fe',1,'turbojpeg.h']]],
-  ['tjpf_164',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
+  ['tjinit_2',['TJINIT',['../group___turbo_j_p_e_g.html#ga3850bbee1313e752e667b4eb08b1e086',1,'turbojpeg.h']]],
-  ['tjsamp_165',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
+  ['tjparam_3',['TJPARAM',['../group___turbo_j_p_e_g.html#gaa0f6be63ba78278299c9f5c12031fe82',1,'turbojpeg.h']]],
-  ['tjxop_166',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]]
+  ['tjpf_4',['TJPF',['../group___turbo_j_p_e_g.html#gac916144e26c3817ac514e64ae5d12e2a',1,'turbojpeg.h']]],
  ['tjsamp_5',['TJSAMP',['../group___turbo_j_p_e_g.html#ga1d047060ea80bb9820d540bb928e9074',1,'turbojpeg.h']]],
  ['tjxop_6',['TJXOP',['../group___turbo_j_p_e_g.html#ga2de531af4e7e6c4f124908376b354866',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/enumvalues_0.html
+++ b/doc/html/search/enumvalues_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="enumvalues_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/enumvalues_0.js
+++ b/doc/html/search/enumvalues_0.js
@@ -1,37 +1,67 @@
 var searchData=
 [
-  ['tjcs_5fcmyk_167',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
+  ['tjcs_5fcmyk_0',['TJCS_CMYK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a6c8b636152ac8195b869587db315ee53',1,'turbojpeg.h']]],
-  ['tjcs_5fgray_168',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
+  ['tjcs_5fgray_1',['TJCS_GRAY',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720ab3e7d6a87f695e45b81c1b5262b5a50a',1,'turbojpeg.h']]],
-  ['tjcs_5frgb_169',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
+  ['tjcs_5frgb_2',['TJCS_RGB',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a677cb7ccb85c4038ac41964a2e09e555',1,'turbojpeg.h']]],
-  ['tjcs_5fycbcr_170',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
+  ['tjcs_5fycbcr_3',['TJCS_YCbCr',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a7389b8f65bb387ffedce3efd0d78ec75',1,'turbojpeg.h']]],
-  ['tjcs_5fycck_171',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
+  ['tjcs_5fycck_4',['TJCS_YCCK',['../group___turbo_j_p_e_g.html#gga4f83ad3368e0e29d1957be0efa7c3720a53839e0fe867b76b58d16b0a1a7c598e',1,'turbojpeg.h']]],
-  ['tjerr_5ffatal_172',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
+  ['tjerr_5ffatal_5',['TJERR_FATAL',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950feafc9cceeada13122b09e4851e3788039a',1,'turbojpeg.h']]],
-  ['tjerr_5fwarning_173',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
+  ['tjerr_5fwarning_6',['TJERR_WARNING',['../group___turbo_j_p_e_g.html#ggafbc17cfa57d0d5d11fea35ac025950fea342dd6e2aedb47bb257b4e7568329b59',1,'turbojpeg.h']]],
-  ['tjpf_5fabgr_174',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
+  ['tjinit_5fcompress_7',['TJINIT_COMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086aa45ac279e3dc6ffabc4b0f45864da796',1,'turbojpeg.h']]],
-  ['tjpf_5fargb_175',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
+  ['tjinit_5fdecompress_8',['TJINIT_DECOMPRESS',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a4b8ca1ef700699b71350700bf95c2167',1,'turbojpeg.h']]],
-  ['tjpf_5fbgr_176',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
+  ['tjinit_5ftransform_9',['TJINIT_TRANSFORM',['../group___turbo_j_p_e_g.html#gga3850bbee1313e752e667b4eb08b1e086a8d58a2a4c45b3e0cd349746544a6e0c2',1,'turbojpeg.h']]],
-  ['tjpf_5fbgra_177',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
+  ['tjparam_5farithmetic_10',['TJPARAM_ARITHMETIC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1c756757384308145602c040524aebf7',1,'turbojpeg.h']]],
-  ['tjpf_5fbgrx_178',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
+  ['tjparam_5fbottomup_11',['TJPARAM_BOTTOMUP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a924657172695ed6cb0b128219546fcce',1,'turbojpeg.h']]],
-  ['tjpf_5fcmyk_179',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
+  ['tjparam_5fcolorspace_12',['TJPARAM_COLORSPACE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a46a10d46309514907d0c39fcd86c324c',1,'turbojpeg.h']]],
-  ['tjpf_5fgray_180',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
+  ['tjparam_5fdensityunits_13',['TJPARAM_DENSITYUNITS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4c045981bd8a303521a401dbbe1df208',1,'turbojpeg.h']]],
-  ['tjpf_5frgb_181',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
+  ['tjparam_5ffastdct_14',['TJPARAM_FASTDCT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a6914692ac6ec5567787d592b7563f627',1,'turbojpeg.h']]],
-  ['tjpf_5frgba_182',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
+  ['tjparam_5ffastupsample_15',['TJPARAM_FASTUPSAMPLE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0e051ac106f7b7402b690a5daf4869c0',1,'turbojpeg.h']]],
-  ['tjpf_5frgbx_183',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
+  ['tjparam_5fjpegheight_16',['TJPARAM_JPEGHEIGHT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f76673be73f2b659440a9572a65a95f',1,'turbojpeg.h']]],
-  ['tjpf_5funknown_184',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
+  ['tjparam_5fjpegwidth_17',['TJPARAM_JPEGWIDTH',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a02ab77fb294a0c9061a78cd424c82dd8',1,'turbojpeg.h']]],
-  ['tjpf_5fxbgr_185',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
+  ['tjparam_5flossless_18',['TJPARAM_LOSSLESS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a249f35f0770792b19f995e603bb17c6f',1,'turbojpeg.h']]],
-  ['tjpf_5fxrgb_186',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
+  ['tjparam_5flosslesspsv_19',['TJPARAM_LOSSLESSPSV',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abcc997d40e5bec84817c12b76ef84159',1,'turbojpeg.h']]],
-  ['tjsamp_5f411_187',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
+  ['tjparam_5flosslesspt_20',['TJPARAM_LOSSLESSPT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4a6c6f25764ecaf4231a36bff844e46a',1,'turbojpeg.h']]],
-  ['tjsamp_5f420_188',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
+  ['tjparam_5fmaxmemory_21',['TJPARAM_MAXMEMORY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0de0a8281da45d1fc984edc8918f7dd2',1,'turbojpeg.h']]],
-  ['tjsamp_5f422_189',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
+  ['tjparam_5fmaxpixels_22',['TJPARAM_MAXPIXELS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac4e95dd2ecd766854feee579406eae68',1,'turbojpeg.h']]],
-  ['tjsamp_5f440_190',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
+  ['tjparam_5fnorealloc_23',['TJPARAM_NOREALLOC',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ae64ffb358bc7b194fd48e0f27750b29b',1,'turbojpeg.h']]],
-  ['tjsamp_5f444_191',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
+  ['tjparam_5foptimize_24',['TJPARAM_OPTIMIZE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a8f0af9afc0b36443751f9ee82b760aa6',1,'turbojpeg.h']]],
-  ['tjsamp_5fgray_192',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
+  ['tjparam_5fprecision_25',['TJPARAM_PRECISION',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a781db82741934e8cd008d308597c59d8',1,'turbojpeg.h']]],
-  ['tjxop_5fhflip_193',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
+  ['tjparam_5fprogressive_26',['TJPARAM_PROGRESSIVE',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a1716f242b3859905b4a317dae8cfb75f',1,'turbojpeg.h']]],
-  ['tjxop_5fnone_194',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
+  ['tjparam_5fquality_27',['TJPARAM_QUALITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a0467e8792621f2d817dc2af563d3186c',1,'turbojpeg.h']]],
-  ['tjxop_5frot180_195',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
+  ['tjparam_5frestartblocks_28',['TJPARAM_RESTARTBLOCKS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a343c72883b7160f23f3ef46fc548a0ec',1,'turbojpeg.h']]],
-  ['tjxop_5frot270_196',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
+  ['tjparam_5frestartrows_29',['TJPARAM_RESTARTROWS',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a714367585952fe5c863f0dba5bd37e5c',1,'turbojpeg.h']]],
-  ['tjxop_5frot90_197',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
+  ['tjparam_5fscanlimit_30',['TJPARAM_SCANLIMIT',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82ac478910e20ecf61b914f9824d80f8167',1,'turbojpeg.h']]],
-  ['tjxop_5ftranspose_198',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
+  ['tjparam_5fstoponwarning_31',['TJPARAM_STOPONWARNING',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a555e2212079fa49b30bcd2879c6c8ddb',1,'turbojpeg.h']]],
-  ['tjxop_5ftransverse_199',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
+  ['tjparam_5fsubsamp_32',['TJPARAM_SUBSAMP',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a2a3494a8215d3de4fdbaeb2ba6f6b03a',1,'turbojpeg.h']]],
-  ['tjxop_5fvflip_200',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]]
+  ['tjparam_5fxdensity_33',['TJPARAM_XDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82a4de5c9d7cab5be806143a43c3b0e0877',1,'turbojpeg.h']]],
  ['tjparam_5fydensity_34',['TJPARAM_YDENSITY',['../group___turbo_j_p_e_g.html#ggaa0f6be63ba78278299c9f5c12031fe82abda48f2df7eb9b88e2b7621efb017eba',1,'turbojpeg.h']]],
  ['tjpf_5fabgr_35',['TJPF_ABGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa1ba1a7f1631dbeaa49a0a85fc4a40081',1,'turbojpeg.h']]],
  ['tjpf_5fargb_36',['TJPF_ARGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aae8f846ed9d9de99b6e1dfe448848765c',1,'turbojpeg.h']]],
  ['tjpf_5fbgr_37',['TJPF_BGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aab10624437fb8ef495a0b153e65749839',1,'turbojpeg.h']]],
  ['tjpf_5fbgra_38',['TJPF_BGRA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aac037ff1845cf9b74bb81a3659c2b9fb4',1,'turbojpeg.h']]],
  ['tjpf_5fbgrx_39',['TJPF_BGRX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa2a1fbf569ca79897eae886e3376ca4c8',1,'turbojpeg.h']]],
  ['tjpf_5fcmyk_40',['TJPF_CMYK',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7f5100ec44c91994e243f1cf55553f8b',1,'turbojpeg.h']]],
  ['tjpf_5fgray_41',['TJPF_GRAY',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa5431b54b015337705f13118073711a1a',1,'turbojpeg.h']]],
  ['tjpf_5frgb_42',['TJPF_RGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa7ce93230bff449518ce387c17e6ed37c',1,'turbojpeg.h']]],
  ['tjpf_5frgba_43',['TJPF_RGBA',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa88d2e88fab67f6503cf972e14851cc12',1,'turbojpeg.h']]],
  ['tjpf_5frgbx_44',['TJPF_RGBX',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa83973bebb7e2dc6fa8bae89ff3f42e01',1,'turbojpeg.h']]],
  ['tjpf_5funknown_45',['TJPF_UNKNOWN',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aa84c1a6cead7952998e2fb895844a21ed',1,'turbojpeg.h']]],
  ['tjpf_5fxbgr_46',['TJPF_XBGR',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aaf6603b27147de47e212e75dac027b2af',1,'turbojpeg.h']]],
  ['tjpf_5fxrgb_47',['TJPF_XRGB',['../group___turbo_j_p_e_g.html#ggac916144e26c3817ac514e64ae5d12e2aadae996905efcfa3b42a0bb3bea7f9d84',1,'turbojpeg.h']]],
  ['tjsamp_5f411_48',['TJSAMP_411',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a28ec62575e5ea295c3fde3001dc628e2',1,'turbojpeg.h']]],
  ['tjsamp_5f420_49',['TJSAMP_420',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a63085dbf683cfe39e513cdb6343e3737',1,'turbojpeg.h']]],
  ['tjsamp_5f422_50',['TJSAMP_422',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a136130902cc578f11f32429b59368404',1,'turbojpeg.h']]],
  ['tjsamp_5f440_51',['TJSAMP_440',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074accf740e6f3aa6ba20ba922cad13cb974',1,'turbojpeg.h']]],
  ['tjsamp_5f441_52',['TJSAMP_441',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3351696e1dd34a083a35b6be8b90122d',1,'turbojpeg.h']]],
  ['tjsamp_5f444_53',['TJSAMP_444',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074afb8da4f44197837bdec0a4f593dacae3',1,'turbojpeg.h']]],
  ['tjsamp_5fgray_54',['TJSAMP_GRAY',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074a3f1c9504842ddc7a48d0f690754b6248',1,'turbojpeg.h']]],
  ['tjsamp_5funknown_55',['TJSAMP_UNKNOWN',['../group___turbo_j_p_e_g.html#gga1d047060ea80bb9820d540bb928e9074ac124fa8f6cb41147e3d670dfbdfb7173',1,'turbojpeg.h']]],
  ['tjxop_5fhflip_56',['TJXOP_HFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aa0df69776caa30f0fa28e26332d311ce',1,'turbojpeg.h']]],
  ['tjxop_5fnone_57',['TJXOP_NONE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866aad88c0366cd3f7d0eac9d7a3fa1c2c27',1,'turbojpeg.h']]],
  ['tjxop_5frot180_58',['TJXOP_ROT180',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a140952eb8dd0300accfcc22726d69692',1,'turbojpeg.h']]],
  ['tjxop_5frot270_59',['TJXOP_ROT270',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a3064ee5dfb7f032df332818587567a08',1,'turbojpeg.h']]],
  ['tjxop_5frot90_60',['TJXOP_ROT90',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a43b2bbb23bc4bd548422d43fbe9af128',1,'turbojpeg.h']]],
  ['tjxop_5ftranspose_61',['TJXOP_TRANSPOSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a31060aed199f886afdd417f80499c32d',1,'turbojpeg.h']]],
  ['tjxop_5ftransverse_62',['TJXOP_TRANSVERSE',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866af3b14d488aea6ece9e5b3df73a74d6a4',1,'turbojpeg.h']]],
  ['tjxop_5fvflip_63',['TJXOP_VFLIP',['../group___turbo_j_p_e_g.html#gga2de531af4e7e6c4f124908376b354866a324eddfbec53b7e691f61e56929d0d5d',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/functions_0.html
+++ b/doc/html/search/functions_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="functions_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/functions_0.js
+++ b/doc/html/search/functions_0.js
@@ -1,31 +1,41 @@
 var searchData=
 [
-  ['tjalloc_114',['tjAlloc',['../group___turbo_j_p_e_g.html#gaec627dd4c5f30b7a775a7aea3bec5d83',1,'turbojpeg.h']]],
+  ['tj3alloc_0',['tj3Alloc',['../group___turbo_j_p_e_g.html#ga1a2c96d8b47530b6e6050ba6f10b7c57',1,'turbojpeg.h']]],
-  ['tjbufsize_115',['tjBufSize',['../group___turbo_j_p_e_g.html#ga67ac12fee79073242cb216e07c9f1f90',1,'turbojpeg.h']]],
+  ['tj3compress12_1',['tj3Compress12',['../group___turbo_j_p_e_g.html#ga9a1968c384ec7abb6122830253ebf570',1,'turbojpeg.h']]],
-  ['tjbufsizeyuv2_116',['tjBufSizeYUV2',['../group___turbo_j_p_e_g.html#ga2be2b9969d4df9ecce9b05deed273194',1,'turbojpeg.h']]],
+  ['tj3compress16_2',['tj3Compress16',['../group___turbo_j_p_e_g.html#ga77901b71d0471784f318ada31ff4e7bd',1,'turbojpeg.h']]],
-  ['tjcompress2_117',['tjCompress2',['../group___turbo_j_p_e_g.html#gafbdce0112fd78fd38efae841443a9bcf',1,'turbojpeg.h']]],
+  ['tj3compress8_3',['tj3Compress8',['../group___turbo_j_p_e_g.html#ga2cc418a2dab709ad7f30f5b25905f138',1,'turbojpeg.h']]],
-  ['tjcompressfromyuv_118',['tjCompressFromYUV',['../group___turbo_j_p_e_g.html#ga7622a459b79aa1007e005b58783f875b',1,'turbojpeg.h']]],
+  ['tj3compressfromyuv8_4',['tj3CompressFromYUV8',['../group___turbo_j_p_e_g.html#ga041c870d9c669eb3f385c78f4346c43f',1,'turbojpeg.h']]],
-  ['tjcompressfromyuvplanes_119',['tjCompressFromYUVPlanes',['../group___turbo_j_p_e_g.html#ga29ec5dfbd2d84b8724e951d6fa0d5d9e',1,'turbojpeg.h']]],
+  ['tj3compressfromyuvplanes8_5',['tj3CompressFromYUVPlanes8',['../group___turbo_j_p_e_g.html#gac9f5ace3e73805b476c95dda9f8d0cd0',1,'turbojpeg.h']]],
-  ['tjdecodeyuv_120',['tjDecodeYUV',['../group___turbo_j_p_e_g.html#ga70abbf38f77a26fd6da8813bef96f695',1,'turbojpeg.h']]],
+  ['tj3decodeyuv8_6',['tj3DecodeYUV8',['../group___turbo_j_p_e_g.html#gaa1eb574f38b1c1de43a6c7aafcf68d8c',1,'turbojpeg.h']]],
-  ['tjdecodeyuvplanes_121',['tjDecodeYUVPlanes',['../group___turbo_j_p_e_g.html#ga10e837c07fa9d25770565b237d3898d9',1,'turbojpeg.h']]],
+  ['tj3decodeyuvplanes8_7',['tj3DecodeYUVPlanes8',['../group___turbo_j_p_e_g.html#gad366f1915f82c1ad4e7e37ebe073ca89',1,'turbojpeg.h']]],
-  ['tjdecompress2_122',['tjDecompress2',['../group___turbo_j_p_e_g.html#gae9eccef8b682a48f43a9117c231ed013',1,'turbojpeg.h']]],
+  ['tj3decompress12_8',['tj3Decompress12',['../group___turbo_j_p_e_g.html#ga39b848f01781ad74a5b3941c012b6199',1,'turbojpeg.h']]],
-  ['tjdecompressheader3_123',['tjDecompressHeader3',['../group___turbo_j_p_e_g.html#ga0595681096bba7199cc6f3533cb25f77',1,'turbojpeg.h']]],
+  ['tj3decompress16_9',['tj3Decompress16',['../group___turbo_j_p_e_g.html#gaa074e63f9beb0b3ff42b833a4049df6e',1,'turbojpeg.h']]],
-  ['tjdecompresstoyuv2_124',['tjDecompressToYUV2',['../group___turbo_j_p_e_g.html#ga04d1e839ff9a0860dd1475cff78d3364',1,'turbojpeg.h']]],
+  ['tj3decompress8_10',['tj3Decompress8',['../group___turbo_j_p_e_g.html#ga1169c7c1a26ec18c9e6122cb8ae64013',1,'turbojpeg.h']]],
-  ['tjdecompresstoyuvplanes_125',['tjDecompressToYUVPlanes',['../group___turbo_j_p_e_g.html#gaa59f901a5258ada5bd0185ad59368540',1,'turbojpeg.h']]],
+  ['tj3decompressheader_11',['tj3DecompressHeader',['../group___turbo_j_p_e_g.html#ga96d2c4b3432f9d88ad14758ae240b8d1',1,'turbojpeg.h']]],
-  ['tjdestroy_126',['tjDestroy',['../group___turbo_j_p_e_g.html#ga75f355fa27225ba1a4ee392c852394d2',1,'turbojpeg.h']]],
+  ['tj3decompresstoyuv8_12',['tj3DecompressToYUV8',['../group___turbo_j_p_e_g.html#ga1e6bf6a19fec3f9fa7534348879d8320',1,'turbojpeg.h']]],
-  ['tjencodeyuv3_127',['tjEncodeYUV3',['../group___turbo_j_p_e_g.html#gac519b922cdf446e97d0cdcba513636bf',1,'turbojpeg.h']]],
+  ['tj3decompresstoyuvplanes8_13',['tj3DecompressToYUVPlanes8',['../group___turbo_j_p_e_g.html#ga934373482dbbf257f2280505b6ff4fb5',1,'turbojpeg.h']]],
-  ['tjencodeyuvplanes_128',['tjEncodeYUVPlanes',['../group___turbo_j_p_e_g.html#gae2d04c72457fe7f4d60cf78ab1b1feb1',1,'turbojpeg.h']]],
+  ['tj3destroy_14',['tj3Destroy',['../group___turbo_j_p_e_g.html#ga53fbadf4560e95a65b8f5ab81703fe82',1,'turbojpeg.h']]],
-  ['tjfree_129',['tjFree',['../group___turbo_j_p_e_g.html#gaea863d2da0cdb609563aabdf9196514b',1,'turbojpeg.h']]],
+  ['tj3encodeyuv8_15',['tj3EncodeYUV8',['../group___turbo_j_p_e_g.html#ga2a8d50f130bde10f0a04030f8cc59936',1,'turbojpeg.h']]],
-  ['tjgeterrorcode_130',['tjGetErrorCode',['../group___turbo_j_p_e_g.html#ga414feeffbf860ebd31c745df203de410',1,'turbojpeg.h']]],
+  ['tj3encodeyuvplanes8_16',['tj3EncodeYUVPlanes8',['../group___turbo_j_p_e_g.html#gae2e9df38790e9bddc249d04cb158a4cf',1,'turbojpeg.h']]],
-  ['tjgeterrorstr2_131',['tjGetErrorStr2',['../group___turbo_j_p_e_g.html#ga1ead8574f9f39fbafc6b497124e7aafa',1,'turbojpeg.h']]],
+  ['tj3free_17',['tj3Free',['../group___turbo_j_p_e_g.html#gaddb84fb6c81769e9faa0f5a63b296606',1,'turbojpeg.h']]],
-  ['tjgetscalingfactors_132',['tjGetScalingFactors',['../group___turbo_j_p_e_g.html#gac3854476006b10787bd128f7ede48057',1,'turbojpeg.h']]],
+  ['tj3get_18',['tj3Get',['../group___turbo_j_p_e_g.html#ga34af9ba3183bdf0ec7c8f47bb9a4c84f',1,'turbojpeg.h']]],
-  ['tjinitcompress_133',['tjInitCompress',['../group___turbo_j_p_e_g.html#ga9d63a05fc6d813f4aae06107041a37e8',1,'turbojpeg.h']]],
+  ['tj3geterrorcode_19',['tj3GetErrorCode',['../group___turbo_j_p_e_g.html#gab8c8279f1415fe425ff30dbbc56013bd',1,'turbojpeg.h']]],
-  ['tjinitdecompress_134',['tjInitDecompress',['../group___turbo_j_p_e_g.html#ga52300eac3f3d9ef4bab303bc244f62d3',1,'turbojpeg.h']]],
+  ['tj3geterrorstr_20',['tj3GetErrorStr',['../group___turbo_j_p_e_g.html#ga5a23ad0776c5333cda0d7c6d826e9d29',1,'turbojpeg.h']]],
-  ['tjinittransform_135',['tjInitTransform',['../group___turbo_j_p_e_g.html#ga928beff6ac248ceadf01089fc6b41957',1,'turbojpeg.h']]],
+  ['tj3getscalingfactors_21',['tj3GetScalingFactors',['../group___turbo_j_p_e_g.html#gaf9253e0c2e9f464142d389673da085fa',1,'turbojpeg.h']]],
-  ['tjloadimage_136',['tjLoadImage',['../group___turbo_j_p_e_g.html#gaffbd83c375e79f5db4b5c5d8ad4466e7',1,'turbojpeg.h']]],
+  ['tj3init_22',['tj3Init',['../group___turbo_j_p_e_g.html#ga69c09d39f97ec30250ad3605ace7e5df',1,'turbojpeg.h']]],
-  ['tjplaneheight_137',['tjPlaneHeight',['../group___turbo_j_p_e_g.html#ga1a209696c6a80748f20e134b3c64789f',1,'turbojpeg.h']]],
+  ['tj3jpegbufsize_23',['tj3JPEGBufSize',['../group___turbo_j_p_e_g.html#gac6285e58e35a35d871d7162ec5a929c4',1,'turbojpeg.h']]],
-  ['tjplanesizeyuv_138',['tjPlaneSizeYUV',['../group___turbo_j_p_e_g.html#gab4ab7b24f6e797d79abaaa670373961d',1,'turbojpeg.h']]],
+  ['tj3loadimage12_24',['tj3LoadImage12',['../group___turbo_j_p_e_g.html#gaa1d3772cfdb53afa21aae3c606238d44',1,'turbojpeg.h']]],
-  ['tjplanewidth_139',['tjPlaneWidth',['../group___turbo_j_p_e_g.html#ga63fb66bb1e36c74008c4634360becbb1',1,'turbojpeg.h']]],
+  ['tj3loadimage16_25',['tj3LoadImage16',['../group___turbo_j_p_e_g.html#gace4240b665dc47742cbb3b76b03dfd69',1,'turbojpeg.h']]],
-  ['tjsaveimage_140',['tjSaveImage',['../group___turbo_j_p_e_g.html#ga6f445b22d8933ae4815b3370a538d879',1,'turbojpeg.h']]],
+  ['tj3loadimage8_26',['tj3LoadImage8',['../group___turbo_j_p_e_g.html#ga884023536e70985616126a073f662001',1,'turbojpeg.h']]],
-  ['tjtransform_141',['tjTransform',['../group___turbo_j_p_e_g.html#ga9cb8abf4cc91881e04a0329b2270be25',1,'turbojpeg.h']]]
+  ['tj3saveimage12_27',['tj3SaveImage12',['../group___turbo_j_p_e_g.html#ga7c64b5106d04267a46aad85f9714ad90',1,'turbojpeg.h']]],
  ['tj3saveimage16_28',['tj3SaveImage16',['../group___turbo_j_p_e_g.html#ga0fd87851f4266aca24bf4594dd0c0e71',1,'turbojpeg.h']]],
  ['tj3saveimage8_29',['tj3SaveImage8',['../group___turbo_j_p_e_g.html#gaa4ec838988e469cc15618e4690cc8722',1,'turbojpeg.h']]],
  ['tj3set_30',['tj3Set',['../group___turbo_j_p_e_g.html#gaddf92640bfee3e8622218c713e77e7db',1,'turbojpeg.h']]],
  ['tj3setcroppingregion_31',['tj3SetCroppingRegion',['../group___turbo_j_p_e_g.html#gaa49c7bd4c9431667a043cfc93388ba1c',1,'turbojpeg.h']]],
  ['tj3setscalingfactor_32',['tj3SetScalingFactor',['../group___turbo_j_p_e_g.html#ga89da17ee1e43ff423382cbc145803c75',1,'turbojpeg.h']]],
  ['tj3transform_33',['tj3Transform',['../group___turbo_j_p_e_g.html#gaff23ba1dcabed456794b844791613920',1,'turbojpeg.h']]],
  ['tj3yuvbufsize_34',['tj3YUVBufSize',['../group___turbo_j_p_e_g.html#gaaebaa16973a0f550a66eca5765ed0546',1,'turbojpeg.h']]],
  ['tj3yuvplaneheight_35',['tj3YUVPlaneHeight',['../group___turbo_j_p_e_g.html#ga969767ec8180cc3edd99cf507f87299b',1,'turbojpeg.h']]],
  ['tj3yuvplanesize_36',['tj3YUVPlaneSize',['../group___turbo_j_p_e_g.html#gacc19d265edce76b46146f59579f9438d',1,'turbojpeg.h']]],
  ['tj3yuvplanewidth_37',['tj3YUVPlaneWidth',['../group___turbo_j_p_e_g.html#gac99d1933ede1d59fcada9a826e88eb2d',1,'turbojpeg.h']]]
 ];
--- a/doc/html/search/groups_0.html
+++ b/doc/html/search/groups_0.html
@@ -1,36 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <meta name="generator" content="Doxygen 1.8.20"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="groups_0.js"></script>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="Loading">Loading...</div>
 <div id="SRResults"></div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 createResults();
 /* @license-end */
 --></script>
 <div class="SRStatus" id="Searching">Searching...</div>
 <div class="SRStatus" id="NoMatches">No Matches</div>
 <script type="text/javascript"><!--
 /* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
 document.getElementById("Loading").style.display="none";
 document.getElementById("NoMatches").style.display="none";
 var searchResults = new SearchResults("searchResults");
 searchResults.Search();
 window.addEventListener("message", function(event) {
  if (event.data == "take_focus") {
    var elem = searchResults.NavNext(0);
    if (elem) elem.focus();
  }
 });
 /* @license-end */
 --></script>
 </div>
 </body>
 </html>
--- a/doc/html/search/groups_0.js
+++ b/doc/html/search/groups_0.js
@@ -1,4 +1,4 @@
 var searchData=
 [
-  ['turbojpeg_201',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
+  ['turbojpeg_0',['TurboJPEG',['../group___turbo_j_p_e_g.html',1,'']]]
 ];
--- a/doc/html/search/mag.svg
+++ b/doc/html/search/mag.svg
@@ -0,0 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   viewBox="0 0 20 19"
   height="19"
   width="20"
   id="svg2"
   version="1.1">
  <defs
     id="defs6" />
  <circle
     r="3.5"
     cy="8.5"
     cx="5.5"
     id="path4611"
     style="fill:#000000;fill-opacity:0;stroke:#656565;stroke-width:1.4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
  <path
     id="path4630"
     d="m 8.1085854,11.109059 2.7823556,2.782356"
     style="fill:none;stroke:#656565;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
--- a/doc/html/search/mag_d.svg
+++ b/doc/html/search/mag_d.svg
@@ -0,0 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
   xmlns="http://www.w3.org/2000/svg"
   xmlns:xlink="http://www.w3.org/1999/xlink"
   viewBox="0 0 20 19"
   height="19"
   width="20"
   id="svg2"
   version="1.1">
  <defs
     id="defs6" />
  <circle
     r="3.5"
     cy="8.5"
     cx="5.5"
     id="path4611"
     style="fill:#000000;fill-opacity:0;stroke:#C5C5C5;stroke-width:1.4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
  <path
     id="path4630"
     d="m 8.1085854,11.109059 2.7823556,2.782356"
     style="fill:none;stroke:#C5C5C5;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
 </svg>
--- a/doc/html/search/mag_sel.svg
+++ b/doc/html/search/mag_sel.svg
@@ -1,59 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
-
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="svg2"
   width="20"
   height="19"
   viewBox="0 0 20 19"
-   sodipodi:docname="mag_sel.svg"
+  >
   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)">
  <metadata
     id="metadata8">
    <rdf:RDF>
      <cc:Work
         rdf:about="">
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <defs
     id="defs6" />
  <sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1"
     objecttolerance="10"
     gridtolerance="10"
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1920"
     inkscape:window-height="2096"
     id="namedview4"
     showgrid="false"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
     fit-margin-bottom="0"
     inkscape:zoom="32"
     inkscape:cx="5.9792688"
     inkscape:cy="1.1436277"
     inkscape:window-x="1920"
     inkscape:window-y="27"
     inkscape:window-maximized="0"
     inkscape:current-layer="svg2" />
  <circle
     style="fill:#000000;fill-opacity:0;stroke:#656565;stroke-width:1.4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
     id="path4611"
@@ -64,11 +22,10 @@
     style="fill:#656565;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     d="M 11,7 13.5,10 16,7 Z"
     id="path4609"
-     inkscape:connector-curvature="0"
+     />
     sodipodi:nodetypes="cccc" />
  <path
     style="fill:none;stroke:#656565;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     d="m 8.1085854,11.109059 2.7823556,2.782356"
     id="path4630"
-     inkscape:connector-curvature="0" />
+     />
 </svg>
--- a/doc/html/search/mag_seld.svg
+++ b/doc/html/search/mag_seld.svg
@@ -0,0 +1,31 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
 "https://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg
   xmlns="http://www.w3.org/2000/svg"
   version="1.1"
   id="svg2"
   width="20"
   height="19"
   viewBox="0 0 20 19"
  >
  <defs
     id="defs6" />
  <circle
     style="fill:#000000;fill-opacity:0;stroke:#c5C5C5;stroke-width:1.4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
     id="path4611"
     cx="5.5"
     cy="8.5"
     r="3.5" />
  <path
     style="fill:#c5C5C5;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
     d="M 11,7 13.5,10 16,7 Z"
     id="path4609"
     />
  <path
     style="fill:none;stroke:#c5C5C5;stroke-width:1.4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
     d="m 8.1085854,11.109059 2.7823556,2.782356"
     id="path4630"
     />
 </svg>
--- a/doc/html/search/nomatches.html
+++ b/doc/html/search/nomatches.html
@@ -1,12 +0,0 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html><head><title></title>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
 <link rel="stylesheet" type="text/css" href="search.css"/>
 <script type="text/javascript" src="search.js"></script>
 </head>
 <body class="SRPage">
 <div id="SRIndex">
 <div class="SRStatus" id="NoMatches">No Matches</div>
 </div>
 </body>
 </html>
--- a/doc/html/search/search.css
+++ b/doc/html/search/search.css
@@ -1,10 +1,33 @@
-/*---------------- Search Box */
+/*---------------- Search Box positioning */
 #main-menu > li:last-child {
    /* This <li> object is the parent of the search bar */
    display: flex;
    justify-content: center;
    align-items: center;
    height: 36px;
    margin-right: 1em;
 }
 /*---------------- Search box styling */
 .SRPage * {
    font-weight: normal;
    line-height: normal;
 }
 dark-mode-toggle {
    margin-left: 5px;
    display: flex;
    float: right;
 }
 #MSearchBox {
    display: inline-block;
    white-space : nowrap;
-    background: white;
+    background: var(--search-background-color);
    border-radius: 0.65em;
-    box-shadow: inset 0.5px 0.5px 3px 0px #555;
+    box-shadow: var(--search-box-shadow);
    z-index: 102;
 }
@@ -17,28 +40,47 @@
 #MSearchSelect {
    display: inline-block;
    vertical-align: middle;
-    height: 1.4em;
+    width: 20px;
-    padding: 0 0 0 0.3em;
+    height: 19px;
-    margin: 0;
+    background-image: var(--search-magnification-select-image);
    margin: 0 0 0 0.3em;
    padding: 0;
 }
 #MSearchSelectExt {
    display: inline-block;
    vertical-align: middle;
    width: 10px;
    height: 19px;
    background-image: var(--search-magnification-image);
    margin: 0 0 0 0.5em;
    padding: 0;
 }
 #MSearchField {
    display: inline-block;
    vertical-align: middle;
    width: 7.5em;
-    height: 1.1em;
+    height: 19px;
    margin: 0 0.15em;
    padding: 0;
    line-height: 1em;
    border:none;
-    color: #909090;
+    color: var(--search-foreground-color);
    outline: none;
-    font-family: Arial, Verdana, sans-serif;
+    font-family: var(--font-family-search);
    -webkit-border-radius: 0px;
    border-radius: 0px;
    background: none;
 }
@media(hover: none) {
    /* to avoid zooming on iOS */
    #MSearchField {
        font-size: 16px;
    }
 }
 #MSearchBox .right {
    display: inline-block;
@@ -59,23 +101,15 @@
 }
 #MSearchCloseImg {
    height: 1.4em;
    padding: 0.3em;
    margin: 0;
 }
 .MSearchBoxActive #MSearchField {
-    color: #000000;
+    color: var(--search-active-color);
 }
-#main-menu > li:last-child {
+
    /* This <li> object is the parent of the search bar */
    display: flex;
    justify-content: center;
    align-items: center;
    height: 36px;
    margin-right: 1em;
 }
 /*---------------- Search filter selection */
@@ -83,8 +117,8 @@
    display: none;
    position: absolute;
    left: 0; top: 0;
-    border: 1px solid #90A5CE;
+    border: 1px solid var(--search-filter-border-color);
-    background-color: #F9FAFC;
+    background-color: var(--search-filter-background-color);
    z-index: 10001;
    padding-top: 4px;
    padding-bottom: 4px;
@@ -97,7 +131,7 @@
 }
 .SelectItem {
-    font: 8pt Arial, Verdana, sans-serif;
+    font: 8pt var(--font-family-search);
    padding-left:  2px;
    padding-right: 12px;
    border: 0px;
@@ -105,7 +139,7 @@
 span.SelectionMark {
    margin-right: 4px;
-    font-family: monospace;
+    font-family: var(--font-family-monospace);
    outline-style: none;
    text-decoration: none;
 }
@@ -113,7 +147,7 @@ span.SelectionMark {
 a.SelectItem {
    display: block;
    outline-style: none;
-    color: #000000; 
+    color: var(--search-filter-foreground-color);
    text-decoration: none;
    padding-left:   6px;
    padding-right: 12px;
@@ -121,14 +155,14 @@ a.SelectItem {
 a.SelectItem:focus,
 a.SelectItem:active {
-    color: #000000; 
+    color: var(--search-filter-foreground-color);
    outline-style: none;
    text-decoration: none;
 }
 a.SelectItem:hover {
-    color: #FFFFFF;
+    color: var(--search-filter-highlight-text-color);
-    background-color: #3D578C;
+    background-color: var(--search-filter-highlight-bg-color);
    outline-style: none;
    text-decoration: none;
    cursor: pointer;
@@ -138,7 +172,7 @@ a.SelectItem:hover {
 /*---------------- Search results window */
 iframe#MSearchResults {
-    width: 60ex;
+    /*width: 60ex;*/
    height: 15em;
 }
@@ -146,9 +180,12 @@ iframe#MSearchResults {
    display: none;
    position: absolute;
    left: 0; top: 0;
-    border: 1px solid #000;
+    border: 1px solid var(--search-results-border-color);
-    background-color: #EEF1F7;
+    background-color: var(--search-results-background-color);
    z-index:10000;
    width: 300px;
    height: 400px;
    overflow: auto;
 }
 /* ----------------------------------- */
@@ -156,7 +193,6 @@ iframe#MSearchResults {
 #SRIndex {
    clear:both; 
    padding-bottom: 15px;
 }
 .SREntry {
@@ -169,8 +205,9 @@ iframe#MSearchResults {
    padding: 1px 5px;
 }
-body.SRPage {
+div.SRPage {
    margin: 5px 2px;
    background-color: var(--search-results-background-color);
 }
 .SRChildren {
@@ -182,17 +219,18 @@ body.SRPage {
 }
 .SRSymbol {
-    font-weight: bold; 
+    font-weight: bold;
-    color: #425E97;
+    color: var(--search-results-foreground-color);
-    font-family: Arial, Verdana, sans-serif;
+    font-family: var(--font-family-search);
    text-decoration: none;
    outline: none;
 }
 a.SRScope {
    display: block;
-    color: #425E97; 
+    color: var(--search-results-foreground-color);
-    font-family: Arial, Verdana, sans-serif;
+    font-family: var(--font-family-search);
    font-size: 8pt;
    text-decoration: none;
    outline: none;
 }
@@ -204,33 +242,31 @@ a.SRScope:focus, a.SRScope:active {
 span.SRScope {
    padding-left: 4px;
    font-family: var(--font-family-search);
 }
 .SRPage .SRStatus {
    padding: 2px 5px;
    font-size: 8pt;
    font-style: italic;
    font-family: var(--font-family-search);
 }
 .SRResult {
    display: none;
 }
-DIV.searchresults {
+div.searchresults {
    margin-left: 10px;
    margin-right: 10px;
 }
 /*---------------- External search page results */
 .searchresult {
    background-color: #F0F3F8;
 }
 .pages b {
   color: white;
   padding: 5px 5px 3px 5px;
-   background-image: url("../tab_a.png");
+   background-image: var(--nav-gradient-active-image-parent);
   background-repeat: repeat-x;
   text-shadow: 0 1px 1px #000000;
 }
--- a/doc/html/search/search.js
+++ b/doc/html/search/search.js
@@ -73,6 +73,8 @@ function getYPos(item)
  return y;
 }
 var searchResults = new SearchResults("searchResults");
 /* A class handling everything associated with the search panel.
   Parameters:
@@ -80,9 +82,10 @@ function getYPos(item)
          storing this instance.  Is needed to be able to set timeouts.
   resultPath - path to use for external files
 */
-function SearchBox(name, resultsPath, inFrame, label)
+function SearchBox(name, resultsPath, extension)
 {
  if (!name || !resultsPath) {  alert("Missing parameters to SearchBox."); }
  if (!extension || extension == "") { extension = ".html"; }
  // ---------- Instance variables
  this.name                  = name;
@@ -95,8 +98,7 @@ function SearchBox(name, resultsPath, inFrame, label)
  this.hideTimeout           = 0;
  this.searchIndex           = 0;
  this.searchActive          = false;
-  this.insideFrame           = inFrame;
+  this.extension             = extension;
  this.searchLabel           = label;
  // ----------- DOM Elements
@@ -134,30 +136,14 @@ function SearchBox(name, resultsPath, inFrame, label)
    var searchSelectWindow = this.DOMSearchSelectWindow();
    var searchField        = this.DOMSearchSelect();
-    if (this.insideFrame)
+    var left = getXPos(searchField);
-    {
+    var top  = getYPos(searchField);
-      var left = getXPos(searchField);
+    top += searchField.offsetHeight;
      var top  = getYPos(searchField);
      left += searchField.offsetWidth + 6;
      top += searchField.offsetHeight;
-      // show search selection popup
+    // show search selection popup
-      searchSelectWindow.style.display='block';
+    searchSelectWindow.style.display='block';
-      left -= searchSelectWindow.offsetWidth;
+    searchSelectWindow.style.left =  left + 'px';
-      searchSelectWindow.style.left =  left + 'px';
+    searchSelectWindow.style.top  =  top  + 'px';
      searchSelectWindow.style.top  =  top  + 'px';
    }
    else
    {
      var left = getXPos(searchField);
      var top  = getYPos(searchField);
      top += searchField.offsetHeight;
      // show search selection popup
      searchSelectWindow.style.display='block';
      searchSelectWindow.style.left =  left + 'px';
      searchSelectWindow.style.top  =  top  + 'px';
    }
    // stop selection hide timer
    if (this.hideTimeout)
@@ -170,7 +156,7 @@ function SearchBox(name, resultsPath, inFrame, label)
  this.OnSearchSelectHide = function()
  {
-    this.hideTimeout = setTimeout(this.name +".CloseSelectionWindow()",
+    this.hideTimeout = setTimeout(this.CloseSelectionWindow.bind(this),
                                  this.closeSelectionTimeout);
  }
@@ -203,11 +189,13 @@ function SearchBox(name, resultsPath, inFrame, label)
      }
      else
      {
-        window.frames.MSearchResults.postMessage("take_focus", "*");
+        var elem = searchResults.NavNext(0);
        if (elem) elem.focus();
      }
    }
    else if (e.keyCode==27) // Escape out of the search field
    {
      e.stopPropagation();
      this.DOMSearchField().blur();
      this.DOMPopupSearchResultsWindow().style.display = 'none';
      this.DOMSearchClose().style.display = 'none';
@@ -224,7 +212,7 @@ function SearchBox(name, resultsPath, inFrame, label)
      if (searchValue != "") // non-empty search
      {
        // set timer for search update
-        this.keyTimeout = setTimeout(this.name + '.Search()',
+        this.keyTimeout = setTimeout(this.Search.bind(this),
                                     this.keyTimeoutLength);
      }
      else // empty search field
@@ -302,6 +290,7 @@ function SearchBox(name, resultsPath, inFrame, label)
    }
    else if (e.keyCode==13 || e.keyCode==27)
    {
      e.stopPropagation();
      this.OnSelectItem(this.searchIndex);
      this.CloseSelectionWindow();
      this.DOMSearchField().focus();
@@ -339,55 +328,70 @@ function SearchBox(name, resultsPath, inFrame, label)
      idxChar = searchValue.substr(0, 2);
    }
-    var resultsPage;
+    var jsFile;
    var resultsPageWithSearch;
    var hasResultsPage;
    var idx = indexSectionsWithContent[this.searchIndex].indexOf(idxChar);
    if (idx!=-1)
    {
       var hexCode=idx.toString(16);
-       resultsPage = this.resultsPath + '/' + indexSectionNames[this.searchIndex] + '_' + hexCode + '.html';
+       jsFile = this.resultsPath + indexSectionNames[this.searchIndex] + '_' + hexCode + '.js';
-       resultsPageWithSearch = resultsPage+'?'+escape(searchValue);
+    }
-       hasResultsPage = true;
+
-    }
+    var loadJS = function(url, impl, loc){
-    else // nothing available for this search term
+      var scriptTag = document.createElement('script');
-    {
+      scriptTag.src = url;
-       resultsPage = this.resultsPath + '/nomatches.html';
+      scriptTag.onload = impl;
-       resultsPageWithSearch = resultsPage;
+      scriptTag.onreadystatechange = impl;
-       hasResultsPage = false;
+      loc.appendChild(scriptTag);
    }
    window.frames.MSearchResults.location = resultsPageWithSearch;
    var domPopupSearchResultsWindow = this.DOMPopupSearchResultsWindow();
    var domSearchBox = this.DOMSearchBox();
    var domPopupSearchResults = this.DOMPopupSearchResults();
    var domSearchClose = this.DOMSearchClose();
    var resultsPath = this.resultsPath;
-    if (domPopupSearchResultsWindow.style.display!='block')
+    var handleResults = function() {
-    {
+      document.getElementById("Loading").style.display="none";
-       var domSearchBox = this.DOMSearchBox();
+      if (typeof searchData !== 'undefined') {
-       this.DOMSearchClose().style.display = 'inline-block';
+        createResults(resultsPath);
-       if (this.insideFrame)
+        document.getElementById("NoMatches").style.display="none";
-       {
+      }
-         var domPopupSearchResults = this.DOMPopupSearchResults();
+ 
-         domPopupSearchResultsWindow.style.position = 'relative';
+      if (idx!=-1) {
-         domPopupSearchResultsWindow.style.display  = 'block';
+        searchResults.Search(searchValue);
-         var width = document.body.clientWidth - 8; // the -8 is for IE :-(
+      } else { // no file with search results => force empty search results
-         domPopupSearchResultsWindow.style.width    = width + 'px';
+        searchResults.Search('====');
-         domPopupSearchResults.style.width          = width + 'px';
+      }
-       }
+
-       else
+      if (domPopupSearchResultsWindow.style.display!='block')
-       {
+      {
-         var domPopupSearchResults = this.DOMPopupSearchResults();
+        domSearchClose.style.display = 'inline-block';
-         var left = getXPos(domSearchBox) + 150; // domSearchBox.offsetWidth;
+        var left = getXPos(domSearchBox) + 150;
-         var top  = getYPos(domSearchBox) + 20;  // domSearchBox.offsetHeight + 1;
+        var top  = getYPos(domSearchBox) + 20;
-         domPopupSearchResultsWindow.style.display = 'block';
+        domPopupSearchResultsWindow.style.display = 'block';
-         left -= domPopupSearchResults.offsetWidth;
+        left -= domPopupSearchResults.offsetWidth;
-         domPopupSearchResultsWindow.style.top     = top  + 'px';
+        var maxWidth  = document.body.clientWidth;
-         domPopupSearchResultsWindow.style.left    = left + 'px';
+        var maxHeight = document.body.clientHeight;
-       }
+        var width = 300;
        if (left<10) left=10;
        if (width+left+8>maxWidth) width=maxWidth-left-8;
        var height = 400;
        if (height+top+8>maxHeight) height=maxHeight-top-8;
        domPopupSearchResultsWindow.style.top     = top  + 'px';
        domPopupSearchResultsWindow.style.left    = left + 'px';
        domPopupSearchResultsWindow.style.width   = width + 'px';
        domPopupSearchResultsWindow.style.height  = height + 'px';
      }
    }
    if (jsFile) {
      loadJS(jsFile, handleResults, this.DOMPopupSearchResultsWindow());
    } else {
      handleResults();
    }
    this.lastSearchValue = searchValue;
    this.lastResultsPage = resultsPage;
  }
  // -------- Activation Functions
@@ -401,22 +405,15 @@ function SearchBox(name, resultsPath, inFrame, label)
       )
    {
      this.DOMSearchBox().className = 'MSearchBoxActive';
-
+      this.searchActive = true;
      var searchField = this.DOMSearchField();
      if (searchField.value == this.searchLabel) // clear "Search" term upon entry
      {
        searchField.value = '';
        this.searchActive = true;
      }
    }
    else if (!isActive) // directly remove the panel
    {
      this.DOMSearchBox().className = 'MSearchBoxInactive';
      this.DOMSearchField().value   = this.searchLabel;
      this.searchActive             = false;
      this.lastSearchValue          = ''
      this.lastResultsPage          = '';
      this.DOMSearchField().value   = '';
    }
  }
 }
@@ -439,12 +436,12 @@ function SearchResults(name)
      while (element && element!=parentElement)
      {
-        if (element.nodeName == 'DIV' && element.className == 'SRChildren')
+        if (element.nodeName.toLowerCase() == 'div' && element.className == 'SRChildren')
        {
          return element;
        }
-        if (element.nodeName == 'DIV' && element.hasChildNodes())
+        if (element.nodeName.toLowerCase() == 'div' && element.hasChildNodes())
        {
           element = element.firstChild;
        }
@@ -645,7 +642,7 @@ function SearchResults(name)
        }
        else // return focus to search field
        {
-           parent.document.getElementById("MSearchField").focus();
+           document.getElementById("MSearchField").focus();
        }
      }
      else if (this.lastKey==40) // Down
@@ -675,8 +672,9 @@ function SearchResults(name)
      }
      else if (this.lastKey==27) // Escape
      {
-        parent.searchBox.CloseResultsWindow();
+        e.stopPropagation();
-        parent.document.getElementById("MSearchField").focus();
+        searchBox.CloseResultsWindow();
        document.getElementById("MSearchField").focus();
      }
      else if (this.lastKey==13) // Enter
      {
@@ -718,8 +716,9 @@ function SearchResults(name)
      }
      else if (this.lastKey==27) // Escape
      {
-        parent.searchBox.CloseResultsWindow();
+        e.stopPropagation();
-        parent.document.getElementById("MSearchField").focus();
+        searchBox.CloseResultsWindow();
        document.getElementById("MSearchField").focus();
      }
      else if (this.lastKey==13) // Enter
      {
@@ -742,9 +741,10 @@ function setClassAttr(elem,attr)
  elem.setAttribute('className',attr);
 }
-function createResults()
+function createResults(resultsPath)
 {
  var results = document.getElementById("SRResults");
  results.innerHTML = '';
  for (var e=0; e<searchData.length; e++)
  {
    var id = searchData[e][0];
@@ -761,11 +761,16 @@ function createResults()
    srEntry.appendChild(srLink);
    if (searchData[e][1].length==2) // single result
    {
-      srLink.setAttribute('href',searchData[e][1][1][0]);
+      srLink.setAttribute('href',resultsPath+searchData[e][1][1][0]);
      srLink.setAttribute('onclick','searchBox.CloseResultsWindow()');
      if (searchData[e][1][1][1])
      {
       srLink.setAttribute('target','_parent');
      }
      else
      {
       srLink.setAttribute('target','_blank');
      }
      var srScope = document.createElement('span');
      setClassAttr(srScope,'SRScope');
      srScope.innerHTML = searchData[e][1][1][2];
@@ -782,11 +787,16 @@ function createResults()
        srChild.setAttribute('id','Item'+e+'_c'+c);
        setKeyActions(srChild,'return searchResults.NavChild(event,'+e+','+c+')');
        setClassAttr(srChild,'SRScope');
-        srChild.setAttribute('href',searchData[e][1][c+1][0]);
+        srChild.setAttribute('href',resultsPath+searchData[e][1][c+1][0]);
        srChild.setAttribute('onclick','searchBox.CloseResultsWindow()');
        if (searchData[e][1][c+1][1])
        {
         srChild.setAttribute('target','_parent');
        }
        else
        {
         srChild.setAttribute('target','_blank');
        }
        srChild.innerHTML = searchData[e][1][c+1][2];
        srChildren.appendChild(srChild);
      }
@@ -800,6 +810,7 @@ function createResults()
 function init_search()
 {
  var results = document.getElementById("MSearchSelectWindow");
  results.tabIndex=0;
  for (var key in indexSectionLabels)
  {
    var link = document.createElement('a');
@@ -810,5 +821,20 @@ function init_search()
    results.appendChild(link);
  }
  searchBox.OnSelectItem(0);
  var input = document.getElementById("MSearchSelect");
  var searchSelectWindow = document.getElementById("MSearchSelectWindow");
  input.tabIndex=0;
  input.addEventListener("keydown", function(event) {
    if (event.keyCode==13 || event.keyCode==40) {
      event.preventDefault();
      if (searchSelectWindow.style.display == 'block') {
        searchBox.CloseSelectionWindow();
      } else {
        searchBox.OnSearchSelectShow();
        searchBox.DOMSearchSelectWindow().focus();
      }
    }
  });
 }
 /* @license-end */
--- a/Show More
+++ b/Show More