Merge pull request #939 from coadkins/coadkins-patch-1

Add PNG File subsection to Pico Graphics documentation

.github/workflows/cmake.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Compiler Cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: /home/runner/.ccache
         key: ccache-cmake-${{github.ref}}-${{matrix.board}}-${{github.sha}}
@@ -34,13 +34,13 @@ jobs:
           ccache-cmake-${{github.ref}}
           ccache-cmake
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
     # Check out the Pico SDK
     - name: Checkout Pico SDK
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: raspberrypi/pico-sdk
         path: pico-sdk
@@ -48,7 +48,7 @@ jobs:
 
     # Check out the Pico Extras
     - name: Checkout Pico Extras
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: raspberrypi/pico-extras
         path: pico-extras

.github/workflows/micropython.yml

@@ -7,72 +7,21 @@ on:
     types: [created]
 
 env:
-  MICROPYTHON_VERSION: 856e08b1931b88271816a2f60648f6ff332235b2
-  WORKFLOW_VERSION: v1
+  MICROPYTHON_VERSION: v1.22.2
 
 jobs:
-  deps:
-    runs-on: ubuntu-20.04
-    name: Dependencies
-    steps:
-    - name: Workspace Cache
-      id: cache
-      uses: actions/cache@v3
-      with:
-        path: ${{runner.workspace}}
-        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
-        restore-keys: |
-          workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
-
-    # Check out MicroPython
-    - name: Checkout MicroPython
-      if: steps.cache.outputs.cache-hit != 'true'
-      uses: actions/checkout@v3
-      with:
-        repository: micropython/micropython
-        ref: ${{env.MICROPYTHON_VERSION}}
-        submodules: false  # MicroPython submodules are hideously broken
-        path: micropython
-
-    # Check out MicroPython Libs
-    - name: Checkout MicroPython Libs
-      if: steps.cache.outputs.cache-hit != 'true'
-      uses: actions/checkout@v3
-      with:
-        repository: micropython/micropython-lib
-        path: micropython-lib
-
-    - name: Fetch Pico submodules
-      if: steps.cache.outputs.cache-hit != 'true'
-      shell: bash
-      working-directory: micropython/ports/rp2
-      run: |
-        git submodule update --init ../../lib/pico-sdk
-        git submodule update --init ../../lib/cyw43-driver
-        git submodule update --init ../../lib/lwip
-        git submodule update --init ../../lib/mbedtls
-        git submodule update --init ../../lib/micropython-lib
-        git submodule update --init ../../lib/tinyusb
-        git submodule update --init ../../lib/btstack
-
-    - name: Build mpy-cross
-      if: steps.cache.outputs.cache-hit != 'true'
-      shell: bash
-      working-directory: micropython/mpy-cross
-      run: make
-
   build:
-    needs: deps
-    name: ${{matrix.name}} (${{matrix.board}})
+    name: ${{ matrix.name }} (${{ matrix.board }})
     runs-on: ubuntu-20.04
+    continue-on-error: true
     strategy:
       matrix:
         include:
         - name: pico
-          board: PICO
+          board: RPI_PICO
         - name: picow
-          board: PICO_W
-        - name: tiny2040
+          board: RPI_PICO_W
+        - name: tiny2040_8mb
           board: PIMORONI_TINY2040
         - name: picolipo_4mb
           board: PIMORONI_PICOLIPO_4MB
@@ -82,102 +31,111 @@ jobs:
           board: PIMORONI_TUFTY2040
         - name: enviro
           board: PICO_W_ENVIRO
-          patch: true
         - name: galactic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: cosmic_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: stellar_unicorn
-          board: PICO_W
+          board: RPI_PICO_W
         - name: inky_frame
           board: PICO_W_INKY
-          patch: true
 
     env:
       # MicroPython version will be contained in github.event.release.tag_name for releases
-      RELEASE_FILE: pimoroni-${{matrix.name}}-${{github.event.release.tag_name || github.sha}}-micropython
-      MICROPY_BOARD_DIR: "$GITHUB_WORKSPACE/pimoroni-pico-${{ github.sha }}/micropython/board/${{ matrix.BOARD }}"
-      USER_C_MODULES: "$GITHUB_WORKSPACE/pimoroni-pico-${{ github.sha }}/micropython/modules/micropython-${{matrix.name}}.cmake"
+      RELEASE_FILE: pimoroni-${{ matrix.name }}-${{ github.event.release.tag_name || github.sha }}-micropython
+      PIMORONI_PICO_DIR: "${{ github.workspace }}/pimoroni-pico-${{ github.sha }}"
+      MICROPY_BOARD_DIR: "${{ github.workspace }}/pimoroni-pico-${{ github.sha }}/micropython/board/${{ matrix.BOARD }}"
+      USER_C_MODULES: "${{ github.workspace }}/pimoroni-pico-${{ github.sha }}/micropython/modules/micropython-${{ matrix.name }}.cmake"
+      TAG_OR_SHA: ${{ github.event.release.tag_name || github.sha }}
+      MICROPY_BOARD: ${{ matrix.board }}
+      BOARD_NAME: ${{ matrix.name }}
+      BUILD_TOOLS: pimoroni-pico-${{ github.sha }}/ci/micropython.sh
 
     steps:
     - name: Compiler Cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: /home/runner/.ccache
-        key: ccache-micropython-${{matrix.name}}-${{github.ref}}-${{github.sha}}
+        key: ccache-micropython-${{ matrix.name }}-${{ github.ref }}-${{ github.sha }}
         restore-keys: |
-          ccache-micropython-${{matrix.name}}-${{github.ref}}
-          ccache-micropython-${{matrix.name}}-
-  
-    - name: Workspace Cache
-      uses: actions/cache@v3
-      with:
-        path: ${{runner.workspace}}
-        key: workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
-        restore-keys: |
-          workspace-micropython-${{env.MICROPYTHON_VERSION}}-${{env.WORKFLOW_VERSION}}
+          ccache-micropython-${{ matrix.name }}-${{ github.ref }}
+          ccache-micropython-${{ matrix.name }}-
 
-    - name: Install Compiler & CCache
-      if: runner.os == 'Linux'
-      run: |
-        sudo apt update && sudo apt install ccache gcc-arm-none-eabi
-  
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         submodules: true
         path: pimoroni-pico-${{ github.sha }}
 
-    - name: Set MicroPython Version Env Vars
-      shell: bash
+    - name: Install Arm GNU Toolchain (arm-none-eabi-gcc)
+      uses: carlosperate/arm-none-eabi-gcc-action@v1
+      with:
+        release: '9-2020-q2'
+
+    - name: Install CCache
       run: |
-        echo "MICROPY_GIT_TAG=$MICROPYTHON_VERSION, ${{matrix.name}} ${{github.event.release.tag_name || github.sha}}" >> $GITHUB_ENV
-        echo "MICROPY_GIT_HASH=$MICROPYTHON_VERSION-${{github.event.release.tag_name || github.sha}}" >> $GITHUB_ENV
+        source $BUILD_TOOLS
+        apt_install_build_deps
+      
+    - name: Checkout MicroPython & Submodules
+      run: |
+        source $BUILD_TOOLS
+        micropython_clone
+
+    - name: "Py_Decl: Checkout py_decl"
+      uses: actions/checkout@v4
+      with:
+        repository: gadgetoid/py_decl
+        ref: v0.0.1
+        path: py_decl
+
+    - name: Build MPY Cross
+      run: |
+        source $BUILD_TOOLS
+        micropython_build_mpy_cross
 
     - name: "HACK: CMakeLists.txt Disable C++ Exceptions Patch"
       shell: bash
-      working-directory: micropython
-      run: git apply $GITHUB_WORKSPACE/pimoroni-pico-${{ github.sha }}/micropython/micropython_nano_specs.patch
+      run: |
+        source $BUILD_TOOLS
+        hack_patch_micropython_disable_exceptions
 
     - name: "HACK: Pico SDK Patch"
-      if: matrix.patch == true
       shell: bash
-      working-directory: micropython
       run: |
-        $GITHUB_WORKSPACE/pimoroni-pico-${{ github.sha }}/micropython/board/pico-sdk-patch.sh ${{matrix.board}}
+        source $BUILD_TOOLS
+        hack_patch_pico_sdk
 
     - name: Configure MicroPython
       shell: bash
-      working-directory: micropython/ports/rp2
       run: |
-        cmake -S . -B build-${{matrix.name}} -DPICO_BUILD_DOCS=0 -DUSER_C_MODULES=${{env.USER_C_MODULES}} -DMICROPY_BOARD_DIR=${{env.MICROPY_BOARD_DIR}} -DMICROPY_BOARD=${{matrix.board}} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+        source $BUILD_TOOLS
+        micropython_version
+        cmake_configure
 
-    - name: Build MicroPython  # Multiple simultaneous jobs trigger https://github.com/pimoroni/pimoroni-pico/issues/761
+    - name: Build MicroPython
       shell: bash
-      working-directory: micropython/ports/rp2
       run: |
-        ccache --zero-stats || true
-        cmake --build build-${{matrix.name}} -j 1
-        ccache --show-stats || true
+        source $BUILD_TOOLS
+        cmake_build
 
-    - name: Rename .uf2 for artifact
+    - name: "Py_Decl: Verify UF2"
       shell: bash
-      working-directory: micropython/ports/rp2/build-${{matrix.name}}
       run: |
-        cp firmware.uf2 $RELEASE_FILE.uf2
+        python3 py_decl/py_decl.py --to-json --verify build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2
 
     - name: Store .uf2 as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: ${{env.RELEASE_FILE}}.uf2
-        path: micropython/ports/rp2/build-${{matrix.name}}/${{env.RELEASE_FILE}}.uf2
+        name: ${{ env.RELEASE_FILE }}.uf2
+        path: build-${{ matrix.name }}/${{ env.RELEASE_FILE }}.uf2
 
     - name: Upload .uf2
       if: github.event_name == 'release'
       uses: actions/upload-release-asset@v1
       env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
-        asset_path: micropython/ports/rp2/build-${{matrix.name}}/firmware.uf2
-        upload_url: ${{github.event.release.upload_url}}
-        asset_name: ${{env.RELEASE_FILE}}.uf2
+        asset_path: build-${{ matrix.name }}/firmware.uf2
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_name: ${{ env.RELEASE_FILE }}.uf2
         asset_content_type: application/octet-stream

.github/workflows/python.yml

@@ -9,7 +9,7 @@ jobs:
     name: Python Linting
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Install Python Deps
       run: python3 -m pip install flake8

CMakeLists.txt

@@ -10,6 +10,8 @@ set(CMAKE_CXX_STANDARD 17)
 # Initialize the SDK
 pico_sdk_init()
 
+pico_find_compiler(PICO_COMPILER_LD ${PICO_GCC_TRIPLE}-ld)
+
 function(add_resource target file)
   get_filename_component(NAME ${ARGV1} NAME_WE)
   set(FILENAME ${ARGV1})
@@ -21,7 +23,7 @@ function(add_resource target file)
             ${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}
             ${CMAKE_CURRENT_BINARY_DIR}
 
-    COMMAND arm-none-eabi-ld -r -b binary -o ${NAME}.o ${FILENAME}
+    COMMAND ${PICO_COMPILER_LD} -r -b binary -o ${NAME}.o ${FILENAME}
     DEPENDS ${FILENAME}
   )
 

README.md

@@ -44,6 +44,10 @@ You can find MicroPython examples for supported sensors, packs and bases in the
 
 * [MicroPython Examples](micropython/examples)
 
+You can also install MicroPython stubs into Visual Studio Code to give you auto-complete, see:
+
+* [MicroPython Stubs](https://github.com/pimoroni/pimoroni-pico-stubs)
+
 # C/C++
 
 Advanced users that want to unleash the full power of Pico can use our C++ libraries. If you know what you're doing and want to build your own Pimoroni Pico project then start with the [Pimoroni Pico SDK Boilerplate](https://github.com/pimoroni/pico-boilerplate).

ci/micropython.sh

@@ -0,0 +1,75 @@
+export TERM=${TERM:="xterm-256color"}
+
+function log_success {
+	echo -e "$(tput setaf 2)$1$(tput sgr0)"
+}
+
+function log_inform {
+	echo -e "$(tput setaf 6)$1$(tput sgr0)"
+}
+
+function log_warning {
+	echo -e "$(tput setaf 1)$1$(tput sgr0)"
+}
+
+function micropython_clone {
+    log_inform "Using MicroPython $MICROPYTHON_VERSION"
+    git clone https://github.com/micropython/micropython --depth=1 --branch=$MICROPYTHON_VERSION
+    cd micropython
+    git submodule update --init lib/pico-sdk
+    git submodule update --init lib/cyw43-driver
+    git submodule update --init lib/lwip
+    git submodule update --init lib/mbedtls
+    git submodule update --init lib/micropython-lib
+    git submodule update --init lib/tinyusb
+    git submodule update --init lib/btstack
+    cd ../
+}
+
+function micropython_build_mpy_cross {
+    cd micropython/mpy-cross
+    ccache --zero-stats || true
+    CROSS_COMPILE="ccache " make
+    ccache --show-stats || true
+    cd ../../
+}
+
+function apt_install_build_deps {
+    sudo apt update && sudo apt install ccache
+}
+
+function micropython_version {
+    echo "MICROPY_GIT_TAG=$MICROPYTHON_VERSION, $BOARD_NAME $TAG_OR_SHA" >> $GITHUB_ENV
+    echo "MICROPY_GIT_HASH=$MICROPYTHON_VERSION-$TAG_OR_SHA" >> $GITHUB_ENV
+}
+
+function hack_patch_micropython_disable_exceptions {
+    cd micropython
+    git apply $PIMORONI_PICO_DIR/micropython/micropython_nano_specs.patch
+    cd ../
+}
+
+function hack_patch_pico_sdk {
+    # pico-sdk-patch.sh will apply the patch if it exists
+    cd micropython
+    $PIMORONI_PICO_DIR/micropython/board/pico-sdk-patch.sh $MICROPY_BOARD
+    cd ../
+}
+
+function cmake_configure {
+    cmake -S micropython/ports/rp2 -B build-$BOARD_NAME \
+    -DPICO_BUILD_DOCS=0 \
+    -DUSER_C_MODULES=$USER_C_MODULES \
+    -DMICROPY_BOARD_DIR=$MICROPY_BOARD_DIR \
+    -DMICROPY_BOARD=$MICROPY_BOARD \
+    -DCMAKE_C_COMPILER_LAUNCHER=ccache \
+    -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
+}
+
+function cmake_build {
+    ccache --zero-stats || true
+    cmake --build build-$BOARD_NAME -j 2
+    ccache --show-stats || true
+    cd build-$BOARD_NAME
+    cp firmware.uf2 $RELEASE_FILE.uf2
+}

drivers/CMakeLists.txt

@@ -41,6 +41,6 @@ add_subdirectory(pms5003)
 add_subdirectory(sh1107)
 add_subdirectory(st7567)
 add_subdirectory(psram_display)
-add_subdirectory(inky73)
 add_subdirectory(shiftregister)
-add_subdirectory(mlx90640)
+add_subdirectory(inky73)
+add_subdirectory(mlx90640)

drivers/encoder/encoder.cpp

@@ -4,7 +4,10 @@
 #include "hardware/irq.h"
 #include "hardware/clocks.h"
 #include "encoder.hpp"
+
+#ifndef NO_QSTR
 #include "encoder.pio.h"
+#endif
 
 #define LAST_STATE(state)  ((state) & 0b0011)
 #define CURR_STATE(state)  (((state) & 0b1100) >> 2)

drivers/hub75/hub75.cpp

@@ -113,12 +113,6 @@ void Hub75::FM6126A_setup() {
 
 void Hub75::start(irq_handler_t handler) {
     if(handler) {
-        dma_channel = 0;
-
-        // Try as I might, I can't seem to coax MicroPython into leaving PIO in a known state upon soft reset
-        // check for claimed PIO and prepare a clean slate.
-        stop(handler);
-
         if (panel_type == PANEL_FM6126A) {
             FM6126A_setup();
         }
@@ -139,7 +133,7 @@ void Hub75::start(irq_handler_t handler) {
         // Prevent flicker in Python caused by the smaller dataset just blasting through the PIO too quickly
         pio_sm_set_clkdiv(pio, sm_data, width <= 32 ? 2.0f : 1.0f);
 
-        dma_channel_claim(dma_channel);
+        dma_channel = dma_claim_unused_channel(true);
         dma_channel_config config = dma_channel_get_default_config(dma_channel);
         channel_config_set_transfer_data_size(&config, DMA_SIZE_32);
         channel_config_set_bswap(&config, false);
@@ -148,15 +142,13 @@ void Hub75::start(irq_handler_t handler) {
 
 
         // Same handler for both DMA channels
-        irq_set_exclusive_handler(DMA_IRQ_0, handler);
-        irq_set_exclusive_handler(DMA_IRQ_1, handler);
+        irq_add_shared_handler(DMA_IRQ_0, handler, PICO_SHARED_IRQ_HANDLER_DEFAULT_ORDER_PRIORITY);
 
         dma_channel_set_irq0_enabled(dma_channel, true);
 
         irq_set_enabled(pio_get_dreq(pio, sm_data, true), true);
         irq_set_enabled(DMA_IRQ_0, true);
 
-
         row = 0;
         bit = 0;
 
@@ -169,10 +161,9 @@ void Hub75::start(irq_handler_t handler) {
 void Hub75::stop(irq_handler_t handler) {
 
     irq_set_enabled(DMA_IRQ_0, false);
-    irq_set_enabled(DMA_IRQ_1, false);
     irq_set_enabled(pio_get_dreq(pio, sm_data, true), false);
 
-    if(dma_channel_is_claimed(dma_channel)) {
+    if(dma_channel != -1 &&  dma_channel_is_claimed(dma_channel)) {
         dma_channel_set_irq0_enabled(dma_channel, false);
         irq_remove_handler(DMA_IRQ_0, handler);
         //dma_channel_wait_for_finish_blocking(dma_channel);
@@ -184,17 +175,21 @@ void Hub75::stop(irq_handler_t handler) {
     if(pio_sm_is_claimed(pio, sm_data)) {
         pio_sm_set_enabled(pio, sm_data, false);
         pio_sm_drain_tx_fifo(pio, sm_data);
+        pio_remove_program(pio, &hub75_data_rgb888_program, data_prog_offs);
         pio_sm_unclaim(pio, sm_data);
     }
 
     if(pio_sm_is_claimed(pio, sm_row)) {
         pio_sm_set_enabled(pio, sm_row, false);
         pio_sm_drain_tx_fifo(pio, sm_row);
+        if (inverted_stb) {
+            pio_remove_program(pio, &hub75_row_inverted_program, row_prog_offs);
+        } else {
+            pio_remove_program(pio, &hub75_row_program, row_prog_offs);
+        }
         pio_sm_unclaim(pio, sm_row);
     }
 
-    pio_clear_instruction_memory(pio);
-
     // Make sure the GPIO is in a known good state
     // since we don't know what the PIO might have done with it
     gpio_put_masked(0b111111 << pin_r0, 0);

drivers/hub75/hub75.hpp

@@ -5,7 +5,10 @@
 #include "hardware/dma.h"
 #include "hardware/irq.h"
 #include "libraries/pico_graphics/pico_graphics.hpp"
+
+#ifndef NO_QSTR
 #include "hub75.pio.h"
+#endif
 
 namespace pimoroni {
 const uint DATA_BASE_PIN = 0;
@@ -70,7 +73,7 @@ class Hub75 {
     Pixel background = 0;
 
     // DMA & PIO
-    uint dma_channel = 0;
+    int dma_channel = -1;
     uint bit = 0;
     uint row = 0;
 

drivers/hub75_legacy/hub75.hpp

@@ -4,7 +4,10 @@
 #include "hardware/pio.h"
 #include "hardware/dma.h"
 #include "hardware/irq.h"
+
+#ifndef NO_QSTR
 #include "hub75.pio.h"
+#endif
 
 const uint DATA_BASE_PIN = 0;
 const uint DATA_N_PINS = 6;

drivers/inky73/inky73.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET shiftregister)
+  include(${CMAKE_CURRENT_LIST_DIR}/../shiftregister/shiftregister.cmake)
+endif()
+
 set(DRIVER_NAME inky73)
 add_library(${DRIVER_NAME} INTERFACE)
 

drivers/inky73/inky73.cpp

@@ -47,8 +47,9 @@ namespace pimoroni {
     return !(sr.read() & 128);
   }
   
-  void Inky73::busy_wait() {
-    while(is_busy()) {
+  void Inky73::busy_wait(uint timeout_ms) {
+    absolute_time_t timeout = make_timeout_time_ms(timeout_ms);
+    while(is_busy() && !time_reached(timeout)) {
       tight_loop_contents();
     }
   }

drivers/inky73/inky73.hpp

@@ -70,7 +70,7 @@ namespace pimoroni {
     // Methods
     //--------------------------------------------------
   public:
-    void busy_wait();
+    void busy_wait(uint timeout_ms=45000);
     void reset();
     void power_off();
   

drivers/motor/motor.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pwm)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm.cmake)
+endif()
+
 set(DRIVER_NAME motor)
 add_library(${DRIVER_NAME} INTERFACE)
 

drivers/motor/motor_cluster.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pwm_cluster)
+    include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm_cluster.cmake)
+endif()
+
 set(DRIVER_NAME motor_cluster)
 add_library(${DRIVER_NAME} INTERFACE)
 

drivers/plasma/apa102.hpp

@@ -14,7 +14,9 @@ found here: https://github.com/raspberrypi/pico-examples/tree/master/pio/apa102
 #include <math.h>
 #include <cstdint>
 
+#ifndef NO_QSTR
 #include "apa102.pio.h"
+#endif
 
 #include "pico/stdlib.h"
 #include "hardware/pio.h"

drivers/plasma/ws2812.hpp

@@ -14,7 +14,9 @@ found here: https://github.com/raspberrypi/pico-examples/tree/master/pio/ws2812
 #include <math.h>
 #include <cstdint>
 
+#ifndef NO_QSTR
 #include "ws2812.pio.h"
+#endif
 
 #include "pico/stdlib.h"
 #include "hardware/pio.h"

drivers/pwm/pwm_cluster.cpp

@@ -1,7 +1,10 @@
 #include "pwm_cluster.hpp"
 #include "hardware/gpio.h"
 #include "hardware/clocks.h"
+
+#ifndef NO_QSTR
 #include "pwm_cluster.pio.h"
+#endif
 
 // Uncomment the below line to enable debugging
 //#define DEBUG_MULTI_PWM

drivers/rgbled/rgbled.cmake

@@ -7,4 +7,4 @@ target_sources(rgbled INTERFACE
 target_include_directories(rgbled INTERFACE ${CMAKE_CURRENT_LIST_DIR})
 
 # Pull in pico libraries that we need
-target_link_libraries(rgbled INTERFACE pico_stdlib hardware_pwm)
+target_link_libraries(rgbled INTERFACE pico_stdlib hardware_pwm)

drivers/sdcard/pio_spi.h

@@ -7,7 +7,9 @@
 #define _PIO_SPI_H
 
 #include "hardware/pio.h"
+#ifndef NO_QSTR
 #include "spi.pio.h"
+#endif
 
 typedef struct pio_spi_inst {
     PIO pio;

drivers/servo/servo.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pwm)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm.cmake)
+endif()
+
 set(DRIVER_NAME servo)
 add_library(${DRIVER_NAME} INTERFACE)
 

drivers/servo/servo_cluster.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pwm_cluster)
+    include(${CMAKE_CURRENT_LIST_DIR}/../pwm/pwm_cluster.cmake)
+endif()
+
 set(DRIVER_NAME servo_cluster)
 add_library(${DRIVER_NAME} INTERFACE)
 

drivers/st7789/st7789.cpp

@@ -89,7 +89,6 @@ namespace pimoroni {
     if(width == 320 && height == 240) {
       command(reg::GCTRL, 1, "\x35");
       command(reg::VCOMS, 1, "\x1f");
-      command(0xd6, 1, "\xa1"); // ???
       command(reg::GMCTRP1, 14, "\xD0\x08\x11\x08\x0C\x15\x39\x33\x50\x36\x13\x14\x29\x2D");
       command(reg::GMCTRN1, 14, "\xD0\x08\x10\x08\x06\x06\x39\x44\x51\x0B\x16\x14\x2F\x31");
     }
@@ -134,8 +133,6 @@ namespace pimoroni {
 
   void ST7789::configure_display(Rotation rotate) {
 
-    bool rotate180 = rotate == ROTATE_180 || rotate == ROTATE_90;
-
     if(rotate == ROTATE_90 || rotate == ROTATE_270) {
       std::swap(width, height);
     }
@@ -186,20 +183,30 @@ namespace pimoroni {
     // Pico Display
     if(width == 240 && height == 135) {
       caset[0] = 40;   // 240 cols
-      caset[1] = 279;
-      raset[0] = 53;   // 135 rows
-      raset[1] = 187;
-      madctl = rotate180 ? MADCTL::ROW_ORDER : MADCTL::COL_ORDER;
+      caset[1] = 40 + width - 1;
+      raset[0] = 52;   // 135 rows
+      raset[1] = 52 + height - 1;
+      if (rotate == ROTATE_0) {
+        raset[0] += 1;
+        raset[1] += 1;
+      }
+      madctl = rotate == ROTATE_180 ? MADCTL::ROW_ORDER : MADCTL::COL_ORDER;
       madctl |= MADCTL::SWAP_XY | MADCTL::SCAN_ORDER;
     }
 
     // Pico Display at 90 degree rotation
     if(width == 135 && height == 240) {
       caset[0] = 52;   // 135 cols
-      caset[1] = 186;
+      caset[1] = 52 + width - 1;
       raset[0] = 40;   // 240 rows
-      raset[1] = 279;
-      madctl = rotate180 ? (MADCTL::COL_ORDER | MADCTL::ROW_ORDER) : 0;
+      raset[1] = 40 + height - 1;
+      madctl = 0;
+      if (rotate == ROTATE_90) {
+        caset[0] += 1;
+        caset[1] += 1;
+        madctl = MADCTL::COL_ORDER | MADCTL::ROW_ORDER;
+      }
+      madctl = rotate == ROTATE_90 ? (MADCTL::COL_ORDER | MADCTL::ROW_ORDER) : 0;
     }
 
     // Pico Display 2.0
@@ -208,7 +215,7 @@ namespace pimoroni {
       caset[1] = 319;
       raset[0] = 0;
       raset[1] = 239;
-      madctl = rotate180 ? MADCTL::ROW_ORDER : MADCTL::COL_ORDER;
+      madctl = (rotate == ROTATE_180 || rotate == ROTATE_90) ? MADCTL::ROW_ORDER : MADCTL::COL_ORDER;
       madctl |= MADCTL::SWAP_XY | MADCTL::SCAN_ORDER;
     }
 
@@ -218,7 +225,7 @@ namespace pimoroni {
       caset[1] = 239;
       raset[0] = 0;
       raset[1] = 319;
-      madctl = rotate180 ? (MADCTL::COL_ORDER | MADCTL::ROW_ORDER) : 0;
+      madctl = (rotate == ROTATE_180 || rotate == ROTATE_90) ? (MADCTL::COL_ORDER | MADCTL::ROW_ORDER) : 0;
     }
 
     // Byte swap the 16bit rows/cols values

drivers/st7789/st7789.hpp

@@ -11,7 +11,9 @@
 #include "libraries/pico_graphics/pico_graphics.hpp"
 
 
+#ifndef NO_QSTR
 #include "st7789_parallel.pio.h"
+#endif
 
 #include <algorithm>
 

examples/pico_explorer_encoder/pico_explorer_encoder.cpp

@@ -3,7 +3,11 @@
 #include "pico_explorer.hpp"
 #include "pico/stdlib.h"
 #include "encoder.hpp"
+
+#ifndef NO_QSTR
 #include "quadrature_out.pio.h"
+#endif
+
 #include "drivers/st7789/st7789.hpp"
 #include "libraries/pico_graphics/pico_graphics.hpp"
 #include "button.hpp"

examples/plasma_stick/plasma_stick_rainbows.cpp

@@ -34,10 +34,15 @@ int main() {
   while(true) {
 
     offset += float(SPEED) / 2000.0f;
+    if (offset > 1.0) {
+      offset -= 1.0;
+    }
 
     for(auto i = 0u; i < NUM_LEDS; ++i) {
       float hue = float(i) / NUM_LEDS;
-      led_strip.set_hsv(i, hue + offset, 1.0f, 1.0f);
+      hue += offset;
+      hue -= floor(hue);
+      led_strip.set_hsv(i, hue, 1.0f, 1.0f);
     }
 
     sleep_ms(1000 / UPDATES);

libraries/CMakeLists.txt

@@ -36,6 +36,7 @@ add_subdirectory(motor2040)
 add_subdirectory(inventor2040w)
 add_subdirectory(adcfft)
 add_subdirectory(jpegdec)
+add_subdirectory(pngdec)
 add_subdirectory(inky_frame)
 add_subdirectory(inky_frame_7)
 add_subdirectory(galactic_unicorn)

libraries/automation2040w/automation.cmake

@@ -1,12 +1,14 @@
-add_library(automation INTERFACE)
-
-target_sources(automation INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/automation.cpp
-)
-
-target_include_directories(automation INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-#include(${PIMORONI_PICO_PATH}/drivers/analog/analog.cmake)
-
-# Pull in pico libraries that we need
-target_link_libraries(automation INTERFACE pico_stdlib hardware_pwm hardware_i2c pimoroni_i2c analog)
+if(NOT TARGET analog)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/analog/analog.cmake)
+endif()
+
+add_library(automation INTERFACE)
+
+target_sources(automation INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/automation.cpp
+)
+
+target_include_directories(automation INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(automation INTERFACE pico_stdlib hardware_pwm hardware_i2c pimoroni_i2c analog)

libraries/badger2040/badger2040.cmake

@@ -1,11 +1,23 @@
-set(LIB_NAME badger2040)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE bitmap_fonts hershey_fonts pico_stdlib hardware_pwm uc8151_legacy)
+if(NOT TARGET uc8151_legacy)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/uc8151_legacy/uc8151_legacy.cmake)
+endif()
+
+if(NOT TARGET bitmap_fonts)
+  include(${CMAKE_CURRENT_LIST_DIR}/../bitmap_fonts/bitmap_fonts.cmake)
+endif()
+
+if(NOT TARGET hershey_fonts)
+  include(${CMAKE_CURRENT_LIST_DIR}/../hershey_fonts/hershey_fonts.cmake)
+endif()
+
+set(LIB_NAME badger2040)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE bitmap_fonts hershey_fonts uc8151_legacy pico_stdlib hardware_pwm)

libraries/bitmap_fonts/bitmap_fonts.cpp

@@ -42,7 +42,7 @@ namespace bitmap {
     return text_width;
   }
 
-  void character(const font_t *font, rect_func rectangle, const char c, const int32_t x, const int32_t y, const uint8_t scale, unicode_sorta::codepage_t codepage) {
+  void character(const font_t *font, rect_func rectangle, const char c, const int32_t x, const int32_t y, const uint8_t scale, int32_t rotation, unicode_sorta::codepage_t codepage) {
     if(c < 32 || c > 127 + 64) { // + 64 char remappings defined in unicode_sorta.hpp
       return;
     }
@@ -89,7 +89,8 @@ namespace bitmap {
     uint8_t accent_offset = char_index < 65 ? offset_upper : offset_lower;
 
     // Offset our y position to account for our column canvas being 32 pixels
-    int y_offset = y - (8 * scale);
+    // this gives us 8 "pixels" of headroom above the letters for diacritic marks
+    int font_offset = (8 * scale);
 
     // Iterate through each horizontal column of font (and accent) data
     for(uint8_t cx = 0; cx < font->widths[char_index]; cx++) {
@@ -98,6 +99,8 @@ namespace bitmap {
       // We shift the char down 8 pixels to make room for an accent above.
       uint32_t data = *d << 8;
 
+      int32_t o_x = cx * scale;
+
       // For fonts that are taller than 8 pixels (up to 16) they need two bytes
       if(two_bytes_per_column) {
         d++;
@@ -113,7 +116,28 @@ namespace bitmap {
       // Draw the 32 pixel column
       for(uint8_t cy = 0; cy < 32; cy++) {
         if((1U << cy) & data) {
-          rectangle(x + (cx * scale), y_offset + (cy * scale), scale, scale);
+          int32_t o_y = cy * scale;
+          int32_t px = 0;
+          int32_t py = 0;
+          switch (rotation) {
+            case 0:
+              px = x + o_x;
+              py = y - font_offset + o_y;
+              break;
+            case 90:
+              px = x + font_offset - o_y;
+              py = y + o_x;
+              break;
+            case 180:
+              px = x - o_x;
+              py = y + font_offset - o_y;
+              break;
+            case 270:
+              px = x - font_offset + o_y;
+              py = y - o_x;
+              break;
+          }
+          rectangle(px, py, scale, scale);
         }
       }
 
@@ -123,10 +147,14 @@ namespace bitmap {
     }
   }
 
-  void text(const font_t *font, rect_func rectangle, const std::string_view &t, const int32_t x, const int32_t y, const int32_t wrap, const uint8_t scale, const uint8_t letter_spacing, bool fixed_width) {
-    uint32_t co = 0, lo = 0; // character and line (if wrapping) offset
+  void text(const font_t *font, rect_func rectangle, const std::string_view &t, const int32_t x, const int32_t y, const int32_t wrap, const uint8_t scale, const uint8_t letter_spacing, bool fixed_width, int32_t rotation) {
+    uint32_t char_offset = 0;
+    uint32_t line_offset = 0; // line (if wrapping) offset
     unicode_sorta::codepage_t codepage = unicode_sorta::PAGE_195;
 
+    int32_t space_width = measure_character(font, ' ', scale, codepage, fixed_width);
+    space_width += letter_spacing * scale;
+
     size_t i = 0;
     while(i < t.length()) {
       // find length of current word
@@ -153,37 +181,52 @@ namespace bitmap {
           continue;
         }
         word_width += measure_character(font, t[j], scale, codepage, fixed_width);
+        word_width += letter_spacing * scale;
         codepage = unicode_sorta::PAGE_195;
       }
 
       // if this word would exceed the wrap limit then
       // move to the next line
-      if(co != 0 && co + word_width > (uint32_t)wrap) {
-        co = 0;
-        lo += (font->height + 1) * scale;
+      if(char_offset != 0 && char_offset + word_width > (uint32_t)wrap) {
+        char_offset = 0;
+        line_offset += (font->height + 1) * scale;
       }
 
       // draw word
-      for(size_t j = i; j < next_break; j++) {
+      for(size_t j = i; j < std::min(next_break + 1, t.length()); j++) {
         if (t[j] == unicode_sorta::PAGE_194_START) {
           codepage = unicode_sorta::PAGE_194;
           continue;
         } else if (t[j] == unicode_sorta::PAGE_195_START) {
           continue;
         }
-        if (t[j] == '\n') {
-          lo += (font->height + 1) * scale;
-          co = 0;
+        if (t[j] == '\n') { // Linebreak
+          line_offset += (font->height + 1) * scale;
+          char_offset = 0;
+        } else if (t[j] == ' ') { // Space
+          char_offset += space_width;
         } else {
-          character(font, rectangle, t[j], x + co, y + lo, scale, codepage);
-          co += measure_character(font, t[j], scale, codepage, fixed_width);
-          co += letter_spacing * scale;
+          switch(rotation) {
+            case 0:
+              character(font, rectangle, t[j], x + char_offset, y + line_offset, scale, rotation, codepage);
+              break;
+            case 90:
+              character(font, rectangle, t[j], x - line_offset, y + char_offset, scale, rotation, codepage);
+              break;
+            case 180:
+              character(font, rectangle, t[j], x - char_offset, y - line_offset, scale, rotation, codepage);
+              break;
+            case 270:
+              character(font, rectangle, t[j], x + line_offset, y - char_offset, scale, rotation, codepage);
+              break;
+          }
+          char_offset += measure_character(font, t[j], scale, codepage, fixed_width);
+          char_offset += letter_spacing * scale;
         }
         codepage = unicode_sorta::PAGE_195;
       }
 
-      // move character offset to end of word and add a space
-      co += font->widths[0] * scale;
+      // move character offset
       i = next_break += 1;
     }
   }

libraries/bitmap_fonts/bitmap_fonts.hpp

@@ -22,6 +22,6 @@ namespace bitmap {
   int32_t measure_character(const font_t *font, const char c, const uint8_t scale, unicode_sorta::codepage_t codepage = unicode_sorta::PAGE_195, bool fixed_width = false);
   int32_t measure_text(const font_t *font, const std::string_view &t, const uint8_t scale = 2, const uint8_t letter_spacing = 1, bool fixed_width = false);
 
-  void character(const font_t *font, rect_func rectangle, const char c, const int32_t x, const int32_t y, const uint8_t scale = 2, unicode_sorta::codepage_t codepage = unicode_sorta::PAGE_195);
-  void text(const font_t *font, rect_func rectangle, const std::string_view &t, const int32_t x, const int32_t y, const int32_t wrap, const uint8_t scale = 2, const uint8_t letter_spacing = 1, bool fixed_width = false);
+  void character(const font_t *font, rect_func rectangle, const char c, const int32_t x, const int32_t y, const uint8_t scale = 2, int32_t rotation = 0, unicode_sorta::codepage_t codepage = unicode_sorta::PAGE_195);
+  void text(const font_t *font, rect_func rectangle, const std::string_view &t, const int32_t x, const int32_t y, const int32_t wrap, const uint8_t scale = 2, const uint8_t letter_spacing = 1, bool fixed_width = false, int32_t rotation = 0);
 }

libraries/breakout_as7262/breakout_as7262.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET as7262)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/as7262/as7262.cmake)
+endif()
+
 set(LIB_NAME breakout_as7262)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_bh1745/breakout_bh1745.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET bh1745)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/bh1745/bh1745.cmake)
+endif()
+
 set(LIB_NAME breakout_bh1745)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_dotmatrix/breakout_dotmatrix.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ltp305)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ltp305/ltp305.cmake)
+endif()
+
 set(LIB_NAME breakout_dotmatrix)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_encoder/breakout_encoder.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_encoder)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_encoder_wheel/breakout_encoder_wheel.cmake

@@ -1,3 +1,11 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_encoder_wheel)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_ioexpander/breakout_ioexpander.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_ioexpander)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_ltr559/breakout_ltr559.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ltr559)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ltr559/ltr559.cmake)
+endif()
+
 set(LIB_NAME breakout_ltr559)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_matrix11x7/breakout_matrix11x7.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_matrix11x7)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_mics6814/breakout_mics6814.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_mics6814)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_msa301/breakout_msa301.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET msa301)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/msa301/msa301.cmake)
+endif()
+
 set(LIB_NAME breakout_msa301)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_paa5100/breakout_paa5100.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pmw3901)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pmw3901/pmw3901.cmake)
+endif()
+
 set(LIB_NAME breakout_paa5100)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_pmw3901/breakout_pmw3901.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pmw3901)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pmw3901/pmw3901.cmake)
+endif()
+
 set(LIB_NAME breakout_pmw3901)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_potentiometer/breakout_potentiometer.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET ioexpander)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/ioexpander/ioexpander.cmake)
+endif()
+
 set(LIB_NAME breakout_potentiometer)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_rgbmatrix5x5/breakout_rgbmatrix5x5.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET is31fl3731)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/is31fl3731/is31fl3731.cmake)
+endif()
+
 set(LIB_NAME breakout_rgbmatrix5x5)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_rtc/breakout_rtc.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET rv3028)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/rv3028/rv3028.cmake)
+endif()
+
 set(LIB_NAME breakout_rtc)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_sgp30/breakout_sgp30.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET sgp30)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sgp30/sgp30.cmake)
+endif()
+
 set(LIB_NAME breakout_sgp30)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/breakout_trackball/breakout_trackball.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET trackball)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/trackball/trackball.cmake)
+endif()
+
 set(LIB_NAME breakout_trackball)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/cosmic_unicorn/cosmic_unicorn.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(cosmic_unicorn INTERFACE)
 
 pico_generate_pio_header(cosmic_unicorn ${CMAKE_CURRENT_LIST_DIR}/cosmic_unicorn.pio)

libraries/cosmic_unicorn/cosmic_unicorn.cpp

@@ -6,8 +6,10 @@
 #include "hardware/clocks.h"
 
 
+#ifndef NO_QSTR
 #include "cosmic_unicorn.pio.h"
 #include "audio_i2s.pio.h"
+#endif
 
 #include "cosmic_unicorn.hpp"
 
@@ -492,11 +494,14 @@ namespace pimoroni {
   void CosmicUnicorn::set_brightness(float value) {
     value = value < 0.0f ? 0.0f : value;
     value = value > 1.0f ? 1.0f : value;
+    // Max brightness is - in fact - 256 since it's applied with:
+    // result = (channel * brightness) >> 8
+    // eg: (255 * 256) >> 8 == 255
     this->brightness = floor(value * 256.0f);
   }
 
   float CosmicUnicorn::get_brightness() {
-    return this->brightness / 255.0f;
+    return this->brightness / 256.0f;
   }
 
   void CosmicUnicorn::adjust_brightness(float delta) {

libraries/galactic_unicorn/galactic_unicorn.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(galactic_unicorn INTERFACE)
 
 pico_generate_pio_header(galactic_unicorn ${CMAKE_CURRENT_LIST_DIR}/galactic_unicorn.pio)

libraries/galactic_unicorn/galactic_unicorn.cpp

@@ -6,8 +6,10 @@
 #include "hardware/clocks.h"
 
 
+#ifndef NO_QSTR
 #include "galactic_unicorn.pio.h"
 #include "audio_i2s.pio.h"
+#endif
 
 #include "galactic_unicorn.hpp"
 
@@ -486,11 +488,14 @@ namespace pimoroni {
   void GalacticUnicorn::set_brightness(float value) {
     value = value < 0.0f ? 0.0f : value;
     value = value > 1.0f ? 1.0f : value;
+    // Max brightness is - in fact - 256 since it's applied with:
+    // result = (channel * brightness) >> 8
+    // eg: (255 * 256) >> 8 == 255
     this->brightness = floor(value * 256.0f);
   }
 
   float GalacticUnicorn::get_brightness() {
-    return this->brightness / 255.0f;
+    return this->brightness / 256.0f;
   }
 
   void GalacticUnicorn::adjust_brightness(float delta) {

libraries/gfx_pack/gfx_pack.cmake

@@ -1,3 +1,19 @@
+if(NOT TARGET st7567)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/st7567/st7567.cmake)
+endif()
+
+if(NOT TARGET button)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/button/button.cmake)
+endif()
+
+if(NOT TARGET rgbled)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/rgbled/rgbled.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 set(LIB_NAME gfx_pack)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/inky_frame/inky_frame.cmake

@@ -1,11 +1,35 @@
-set(LIB_NAME inky_frame)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a uc8159 jpegdec)
+if(NOT TARGET sdcard)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sdcard/sdcard.cmake)
+endif()
+
+if(NOT TARGET fatfs)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/fatfs/fatfs.cmake)
+endif()
+
+if(NOT TARGET pcf85063a)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pcf85063a/pcf85063a.cmake)
+endif()
+
+if(NOT TARGET uc8159)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/uc8159/uc8159.cmake)
+endif()
+
+if(NOT TARGET jpegdec)
+  include(${CMAKE_CURRENT_LIST_DIR}/../jpegdec/jpegdec.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
+set(LIB_NAME inky_frame)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a uc8159 jpegdec)

libraries/inky_frame_7/inky_frame_7.cmake

@@ -1,13 +1,41 @@
-set(LIB_NAME inky_frame_7)
-add_library(${LIB_NAME} INTERFACE)
-
-target_sources(${LIB_NAME} INTERFACE
-  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
-)
-
-target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
-
-# Pull in pico libraries that we need
-target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a psram_display inky73 jpegdec)
-
+if(NOT TARGET sdcard)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/sdcard/sdcard.cmake)
+endif()
+
+if(NOT TARGET fatfs)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/fatfs/fatfs.cmake)
+endif()
+
+if(NOT TARGET pcf85063a)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/pcf85063a/pcf85063a.cmake)
+endif()
+
+if(NOT TARGET psram_display)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/psram_display/psram_display.cmake)
+endif()
+
+if(NOT TARGET inky73)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/inky73/inky73.cmake)
+endif()
+
+if(NOT TARGET jpegdec)
+  include(${CMAKE_CURRENT_LIST_DIR}/../jpegdec/jpegdec.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
+set(LIB_NAME inky_frame_7)
+add_library(${LIB_NAME} INTERFACE)
+
+target_sources(${LIB_NAME} INTERFACE
+  ${CMAKE_CURRENT_LIST_DIR}/${LIB_NAME}.cpp
+)
+
+target_include_directories(${LIB_NAME} INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+# Pull in pico libraries that we need
+target_link_libraries(${LIB_NAME} INTERFACE hardware_i2c pico_graphics hardware_spi hardware_pwm bitmap_fonts hershey_fonts pico_stdlib sdcard fatfs pcf85063a psram_display inky73 jpegdec)
+
 target_compile_options(${LIB_NAME} INTERFACE -Wno-error=reorder)

libraries/interstate75/interstate75.cmake

@@ -1,3 +1,19 @@
+if(NOT TARGET hub75)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/hub75/hub75.cmake)
+endif()
+
+if(NOT TARGET button)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/button/button.cmake)
+endif()
+
+if(NOT TARGET rgbled)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/rgbled/rgbled.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 set(LIB_NAME interstate75)
 add_library(${LIB_NAME} INTERFACE)
 

libraries/inventor2040w/inventor.cmake

@@ -1,3 +1,19 @@
+if(NOT TARGET motor)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/motor/motor.cmake)
+endif()
+
+if(NOT TARGET servo)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/servo/servo.cmake)
+endif()
+
+if(NOT TARGET encoder)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/encoder/encoder.cmake)
+endif()
+
+if(NOT TARGET plasma)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/plasma/plasma.cmake)
+endif()
+
 add_library(inventor INTERFACE)
 
 target_sources(inventor INTERFACE
@@ -7,4 +23,4 @@ target_sources(inventor INTERFACE
 target_include_directories(inventor INTERFACE ${CMAKE_CURRENT_LIST_DIR})
 
 # Pull in pico libraries that we need
-target_link_libraries(inventor INTERFACE pico_stdlib hardware_pwm hardware_pio hardware_i2c pimoroni_i2c motor servo encoder plasma pimoroni_i2c)
+target_link_libraries(inventor INTERFACE pico_stdlib hardware_pwm hardware_pio hardware_i2c pimoroni_i2c motor servo encoder plasma)

libraries/jpegdec/JPEGDEC.h

@@ -68,6 +68,7 @@
 enum {
     RGB565_LITTLE_ENDIAN = 0,
     RGB565_BIG_ENDIAN,
+    RGB888_LITTLE_ENDIAN,
     EIGHT_BIT_GRAYSCALE,
     FOUR_BIT_DITHERED,
     TWO_BIT_DITHERED,

libraries/jpegdec/jpeg.inl

@@ -182,138 +182,82 @@ static const uint16_t usGrayTo565[] = {0x0000,0x0000,0x0000,0x0000,0x0020,0x0020
 //
 // Clip and convert red value into 5-bits for RGB565
 //
-static const uint16_t usRangeTableR[] = {0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 0
-    0x0800,0x0800,0x0800,0x0800,0x0800,0x0800,0x0800,0x0800,
-    0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,0x1000,
-    0x1800,0x1800,0x1800,0x1800,0x1800,0x1800,0x1800,0x1800,
-    0x2000,0x2000,0x2000,0x2000,0x2000,0x2000,0x2000,0x2000,
-    0x2800,0x2800,0x2800,0x2800,0x2800,0x2800,0x2800,0x2800,
-    0x3000,0x3000,0x3000,0x3000,0x3000,0x3000,0x3000,0x3000,
-    0x3800,0x3800,0x3800,0x3800,0x3800,0x3800,0x3800,0x3800,
-    0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,0x4000,
-    0x4800,0x4800,0x4800,0x4800,0x4800,0x4800,0x4800,0x4800,
-    0x5000,0x5000,0x5000,0x5000,0x5000,0x5000,0x5000,0x5000,
-    0x5800,0x5800,0x5800,0x5800,0x5800,0x5800,0x5800,0x5800,
-    0x6000,0x6000,0x6000,0x6000,0x6000,0x6000,0x6000,0x6000,
-    0x6800,0x6800,0x6800,0x6800,0x6800,0x6800,0x6800,0x6800,
-    0x7000,0x7000,0x7000,0x7000,0x7000,0x7000,0x7000,0x7000,
-    0x7800,0x7800,0x7800,0x7800,0x7800,0x7800,0x7800,0x7800,
-    0x8000,0x8000,0x8000,0x8000,0x8000,0x8000,0x8000,0x8000,
-    0x8800,0x8800,0x8800,0x8800,0x8800,0x8800,0x8800,0x8800,
-    0x9000,0x9000,0x9000,0x9000,0x9000,0x9000,0x9000,0x9000,
-    0x9800,0x9800,0x9800,0x9800,0x9800,0x9800,0x9800,0x9800,
-    0xa000,0xa000,0xa000,0xa000,0xa000,0xa000,0xa000,0xa000,
-    0xa800,0xa800,0xa800,0xa800,0xa800,0xa800,0xa800,0xa800,
-    0xb000,0xb000,0xb000,0xb000,0xb000,0xb000,0xb000,0xb000,
-    0xb800,0xb800,0xb800,0xb800,0xb800,0xb800,0xb800,0xb800,
-    0xc000,0xc000,0xc000,0xc000,0xc000,0xc000,0xc000,0xc000,
-    0xc800,0xc800,0xc800,0xc800,0xc800,0xc800,0xc800,0xc800,
-    0xd000,0xd000,0xd000,0xd000,0xd000,0xd000,0xd000,0xd000,
-    0xd800,0xd800,0xd800,0xd800,0xd800,0xd800,0xd800,0xd800,
-    0xe000,0xe000,0xe000,0xe000,0xe000,0xe000,0xe000,0xe000,
-    0xe800,0xe800,0xe800,0xe800,0xe800,0xe800,0xe800,0xe800,
-    0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,0xf000,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800, // 256
+static const uint16_t usRangeTableR[] = {0x0000, // 0
+    0x0800,
+    0x1000,
+    0x1800,
+    0x2000,
+    0x2800,
+    0x3000,
+    0x3800,
+    0x4000,
+    0x4800,
+    0x5000,
+    0x5800,
+    0x6000,
+    0x6800,
+    0x7000,
+    0x7800,
+    0x8000,
+    0x8800,
+    0x9000,
+    0x9800,
+    0xa000,
+    0xa800,
+    0xb000,
+    0xb800,
+    0xc000,
+    0xc800,
+    0xd000,
+    0xd800,
+    0xe000,
+    0xe800,
+    0xf000,
+    0xf800,
+    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800, // 32
     0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
     0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
     0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,0xf800,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 512
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 768
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 64
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 96
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 //
-// Clip and convert green value into 5-bits for RGB565
+// Clip and convert green value into 6-bits for RGB565
 //
-static const uint16_t usRangeTableG[] = {0x0000,0x0000,0x0000,0x0000,0x0020,0x0020,0x0020,0x0020, // 0
-    0x0040,0x0040,0x0040,0x0040,0x0060,0x0060,0x0060,0x0060,
-    0x0080,0x0080,0x0080,0x0080,0x00a0,0x00a0,0x00a0,0x00a0,
-    0x00c0,0x00c0,0x00c0,0x00c0,0x00e0,0x00e0,0x00e0,0x00e0,
-    0x0100,0x0100,0x0100,0x0100,0x0120,0x0120,0x0120,0x0120,
-    0x0140,0x0140,0x0140,0x0140,0x0160,0x0160,0x0160,0x0160,
-    0x0180,0x0180,0x0180,0x0180,0x01a0,0x01a0,0x01a0,0x01a0,
-    0x01c0,0x01c0,0x01c0,0x01c0,0x01e0,0x01e0,0x01e0,0x01e0,
-    0x0200,0x0200,0x0200,0x0200,0x0220,0x0220,0x0220,0x0220,
-    0x0240,0x0240,0x0240,0x0240,0x0260,0x0260,0x0260,0x0260,
-    0x0280,0x0280,0x0280,0x0280,0x02a0,0x02a0,0x02a0,0x02a0,
-    0x02c0,0x02c0,0x02c0,0x02c0,0x02e0,0x02e0,0x02e0,0x02e0,
-    0x0300,0x0300,0x0300,0x0300,0x0320,0x0320,0x0320,0x0320,
-    0x0340,0x0340,0x0340,0x0340,0x0360,0x0360,0x0360,0x0360,
-    0x0380,0x0380,0x0380,0x0380,0x03a0,0x03a0,0x03a0,0x03a0,
-    0x03c0,0x03c0,0x03c0,0x03c0,0x03e0,0x03e0,0x03e0,0x03e0,
-    0x0400,0x0400,0x0400,0x0400,0x0420,0x0420,0x0420,0x0420,
-    0x0440,0x0440,0x0440,0x0440,0x0460,0x0460,0x0460,0x0460,
-    0x0480,0x0480,0x0480,0x0480,0x04a0,0x04a0,0x04a0,0x04a0,
-    0x04c0,0x04c0,0x04c0,0x04c0,0x04e0,0x04e0,0x04e0,0x04e0,
-    0x0500,0x0500,0x0500,0x0500,0x0520,0x0520,0x0520,0x0520,
-    0x0540,0x0540,0x0540,0x0540,0x0560,0x0560,0x0560,0x0560,
-    0x0580,0x0580,0x0580,0x0580,0x05a0,0x05a0,0x05a0,0x05a0,
-    0x05c0,0x05c0,0x05c0,0x05c0,0x05e0,0x05e0,0x05e0,0x05e0,
-    0x0600,0x0600,0x0600,0x0600,0x0620,0x0620,0x0620,0x0620,
-    0x0640,0x0640,0x0640,0x0640,0x0660,0x0660,0x0660,0x0660,
-    0x0680,0x0680,0x0680,0x0680,0x06a0,0x06a0,0x06a0,0x06a0,
-    0x06c0,0x06c0,0x06c0,0x06c0,0x06e0,0x06e0,0x06e0,0x06e0,
-    0x0700,0x0700,0x0700,0x0700,0x0720,0x0720,0x0720,0x0720,
-    0x0740,0x0740,0x0740,0x0740,0x0760,0x0760,0x0760,0x0760,
-    0x0780,0x0780,0x0780,0x0780,0x07a0,0x07a0,0x07a0,0x07a0,
-    0x07c0,0x07c0,0x07c0,0x07c0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0, // 256
+static const uint16_t usRangeTableG[] = {0x0000,0x0020, // 0
+    0x0040,0x0060,
+    0x0080,0x00a0,
+    0x00c0,0x00e0,
+    0x0100,0x0120,
+    0x0140,0x0160,
+    0x0180,0x01a0,
+    0x01c0,0x01e0,
+    0x0200,0x0220,
+    0x0240,0x0260,
+    0x0280,0x02a0,
+    0x02c0,0x02e0,
+    0x0300,0x0320,
+    0x0340,0x0360,
+    0x0380,0x03a0,
+    0x03c0,0x03e0,
+    0x0400,0x0420,
+    0x0440,0x0460,
+    0x0480,0x04a0,
+    0x04c0,0x04e0,
+    0x0500,0x0520,
+    0x0540,0x0560,
+    0x0580,0x05a0,
+    0x05c0,0x05e0,
+    0x0600,0x0620,
+    0x0640,0x0660,
+    0x0680,0x06a0,
+    0x06c0,0x06e0,
+    0x0700,0x0720,
+    0x0740,0x0760,
+    0x0780,0x07a0,
+    0x07c0,0x07e0,
+    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0, // 64
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
@@ -321,160 +265,56 @@ static const uint16_t usRangeTableG[] = {0x0000,0x0000,0x0000,0x0000,0x0020,0x00
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
     0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,0x07e0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 512
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 768
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 128
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 196
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 //
 // Clip and convert blue value into 5-bits for RGB565
 //
-static const uint16_t usRangeTableB[] = {0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000, // 0
-    0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,0x0001,
-    0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,0x0002,
-    0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,0x0003,
-    0x0004,0x0004,0x0004,0x0004,0x0004,0x0004,0x0004,0x0004,
-    0x0005,0x0005,0x0005,0x0005,0x0005,0x0005,0x0005,0x0005,
-    0x0006,0x0006,0x0006,0x0006,0x0006,0x0006,0x0006,0x0006,
-    0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,0x0007,
-    0x0008,0x0008,0x0008,0x0008,0x0008,0x0008,0x0008,0x0008,
-    0x0009,0x0009,0x0009,0x0009,0x0009,0x0009,0x0009,0x0009,
-    0x000a,0x000a,0x000a,0x000a,0x000a,0x000a,0x000a,0x000a,
-    0x000b,0x000b,0x000b,0x000b,0x000b,0x000b,0x000b,0x000b,
-    0x000c,0x000c,0x000c,0x000c,0x000c,0x000c,0x000c,0x000c,
-    0x000d,0x000d,0x000d,0x000d,0x000d,0x000d,0x000d,0x000d,
-    0x000e,0x000e,0x000e,0x000e,0x000e,0x000e,0x000e,0x000e,
-    0x000f,0x000f,0x000f,0x000f,0x000f,0x000f,0x000f,0x000f,
-    0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,
-    0x0011,0x0011,0x0011,0x0011,0x0011,0x0011,0x0011,0x0011,
-    0x0012,0x0012,0x0012,0x0012,0x0012,0x0012,0x0012,0x0012,
-    0x0013,0x0013,0x0013,0x0013,0x0013,0x0013,0x0013,0x0013,
-    0x0014,0x0014,0x0014,0x0014,0x0014,0x0014,0x0014,0x0014,
-    0x0015,0x0015,0x0015,0x0015,0x0015,0x0015,0x0015,0x0015,
-    0x0016,0x0016,0x0016,0x0016,0x0016,0x0016,0x0016,0x0016,
-    0x0017,0x0017,0x0017,0x0017,0x0017,0x0017,0x0017,0x0017,
-    0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,0x0018,
-    0x0019,0x0019,0x0019,0x0019,0x0019,0x0019,0x0019,0x0019,
-    0x001a,0x001a,0x001a,0x001a,0x001a,0x001a,0x001a,0x001a,
-    0x001b,0x001b,0x001b,0x001b,0x001b,0x001b,0x001b,0x001b,
-    0x001c,0x001c,0x001c,0x001c,0x001c,0x001c,0x001c,0x001c,
-    0x001d,0x001d,0x001d,0x001d,0x001d,0x001d,0x001d,0x001d,
-    0x001e,0x001e,0x001e,0x001e,0x001e,0x001e,0x001e,0x001e,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f, // 256
+static const uint16_t usRangeTableB[] = {0x0000, // 0
+    0x0001,
+    0x0002,
+    0x0003,
+    0x0004,
+    0x0005,
+    0x0006,
+    0x0007,
+    0x0008,
+    0x0009,
+    0x000a,
+    0x000b,
+    0x000c,
+    0x000d,
+    0x000e,
+    0x000f,
+    0x0010,
+    0x0011,
+    0x0012,
+    0x0013,
+    0x0014,
+    0x0015,
+    0x0016,
+    0x0017,
+    0x0018,
+    0x0019,
+    0x001a,
+    0x001b,
+    0x001c,
+    0x001d,
+    0x001e,
+    0x001f,
+    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f, // 32
     0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
     0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
     0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,0x001f,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 512
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 768
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 64
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+    0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 96
     0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
 #if defined (__MACH__) || defined( __LINUX__ ) || defined( __MCUXPRESSO )
 //
@@ -2288,9 +2128,9 @@ static void JPEGPixelLE(uint16_t *pDest, int iY, int iCb, int iCr)
     iCBG = -1409 * (iCb-0x80);
     iCRG = -2925 * (iCr-0x80);
     iCRR = 5742  * (iCr-0x80);
-    usPixel = usRangeTableB[((iCBB + iY) >> 12) & 0x3ff]; // blue pixel
-    usPixel |= usRangeTableG[((iCBG + iCRG + iY) >> 12) & 0x3ff]; // green pixel
-    usPixel |= usRangeTableR[((iCRR + iY) >> 12) & 0x3ff]; // red pixel
+    usPixel = usRangeTableB[((iCBB + iY) >> 15) & 0x7f]; // blue pixel
+    usPixel |= usRangeTableG[((iCBG + iCRG + iY) >> 14) & 0xff]; // green pixel
+    usPixel |= usRangeTableR[((iCRR + iY) >> 15) & 0x7f]; // red pixel
     pDest[0] = usPixel;
 #endif
 } /* JPEGPixelLE() */
@@ -2304,9 +2144,9 @@ static void JPEGPixelBE(uint16_t *pDest, int iY, int iCb, int iCr)
     iCBG = -1409 * (iCb-0x80);
     iCRG = -2925 * (iCr-0x80);
     iCRR = 5742  * (iCr-0x80);
-    usPixel = usRangeTableB[((iCBB + iY) >> 12) & 0x3ff]; // blue pixel
-    usPixel |= usRangeTableG[((iCBG + iCRG + iY) >> 12) & 0x3ff]; // green pixel
-    usPixel |= usRangeTableR[((iCRR + iY) >> 12) & 0x3ff]; // red pixel
+    usPixel = usRangeTableB[((iCBB + iY) >> 15) & 0x7f]; // blue pixel
+    usPixel |= usRangeTableG[((iCBG + iCRG + iY) >> 14) & 0xff]; // green pixel
+    usPixel |= usRangeTableR[((iCRR + iY) >> 15) & 0x7f]; // red pixel
     pDest[0] = __builtin_bswap16(usPixel);
 } /* JPEGPixelBE() */
 
@@ -2340,13 +2180,13 @@ static void JPEGPixel2LE(uint16_t *pDest, int iY1, int iY2, int iCb, int iCr)
     iCBG = -1409 * (iCb-0x80);
     iCRG = -2925 * (iCr-0x80);
     iCRR = 5742  * (iCr-0x80);
-    ulPixel1 = usRangeTableB[((iCBB + iY1) >> 12) & 0x3ff]; // blue pixel
-    ulPixel1 |= usRangeTableG[((iCBG + iCRG + iY1) >> 12) & 0x3ff]; // green pixel
-    ulPixel1 |= usRangeTableR[((iCRR + iY1) >> 12) & 0x3ff]; // red pixel
+    ulPixel1 = usRangeTableB[((iCBB + iY1) >> 15) & 0x7f]; // blue pixel
+    ulPixel1 |= usRangeTableG[((iCBG + iCRG + iY1) >> 14) & 0xff]; // green pixel
+    ulPixel1 |= usRangeTableR[((iCRR + iY1) >> 15) & 0x7f]; // red pixel
     
-    ulPixel2 = usRangeTableB[((iCBB + iY2) >> 12) & 0x3ff]; // blue pixel
-    ulPixel2 |= usRangeTableG[((iCBG + iCRG + iY2) >> 12) & 0x3ff]; // green pixel
-    ulPixel2 |= usRangeTableR[((iCRR + iY2) >> 12) & 0x3ff]; // red pixel
+    ulPixel2 = usRangeTableB[((iCBB + iY2) >> 15) & 0x7f]; // blue pixel
+    ulPixel2 |= usRangeTableG[((iCBG + iCRG + iY2) >> 14) & 0xff]; // green pixel
+    ulPixel2 |= usRangeTableR[((iCRR + iY2) >> 15) & 0x7f]; // red pixel
     *(uint32_t *)&pDest[0] = (ulPixel1 | (ulPixel2<<16));
 #endif
 } /* JPEGPixel2LE() */
@@ -2360,16 +2200,42 @@ static void JPEGPixel2BE(uint16_t *pDest, int32_t iY1, int32_t iY2, int32_t iCb,
     iCBG = -1409L * (iCb-0x80);
     iCRG = -2925L * (iCr-0x80);
     iCRR = 5742L  * (iCr-0x80);
-    ulPixel1 = usRangeTableB[((iCBB + iY1) >> 12) & 0x3ff]; // blue pixel
-    ulPixel1 |= usRangeTableG[((iCBG + iCRG + iY1) >> 12) & 0x3ff]; // green pixel
-    ulPixel1 |= usRangeTableR[((iCRR + iY1) >> 12) & 0x3ff]; // red pixel
+    ulPixel1 = usRangeTableB[((iCBB + iY1) >> 15) & 0x7f]; // blue pixel
+    ulPixel1 |= usRangeTableG[((iCBG + iCRG + iY1) >> 14) & 0xff]; // green pixel
+    ulPixel1 |= usRangeTableR[((iCRR + iY1) >> 15) & 0x7f]; // red pixel
     
-    ulPixel2 = usRangeTableB[((iCBB + iY2) >> 12) & 0x3ff]; // blue pixel
-    ulPixel2 |= usRangeTableG[((iCBG + iCRG + iY2) >> 12) & 0x3ff]; // green pixel
-    ulPixel2 |= usRangeTableR[((iCRR + iY2) >> 12) & 0x3ff]; // red pixel
+    ulPixel2 = usRangeTableB[((iCBB + iY2) >> 15) & 0x7f]; // blue pixel
+    ulPixel2 |= usRangeTableG[((iCBG + iCRG + iY2) >> 14) & 0xff]; // green pixel
+    ulPixel2 |= usRangeTableR[((iCRR + iY2) >> 15) & 0x7f]; // red pixel
     *(uint32_t *)&pDest[0] = __builtin_bswap16(ulPixel1) | ((uint32_t)__builtin_bswap16(ulPixel2)<<16);
 } /* JPEGPixel2BE() */
 
+static void JPEGPixelLE888(uint8_t *pDest, int iY, int iCb, int iCr)
+{
+    int32_t iCBB, iCBG, iCRG, iCRR;
+    uint32_t uVal;
+
+    iCBB = 7258  * (iCb-0x80);
+    iCBG = -1409 * (iCb-0x80);
+    iCRG = -2925 * (iCr-0x80);
+    iCRR = 5742  * (iCr-0x80);
+
+    // Red
+    uVal = ((iCRR + iY) >> 13) & 0x1FF;
+    if (uVal & 0x100) uVal = 0;
+    *pDest++ = uVal;
+
+    // Green
+    uVal = ((iCBG + iCRG + iY) >> 13) & 0x1FF;
+    if (uVal & 0x100) uVal = 0;
+    *pDest++ = uVal;
+
+    // Blue
+    uVal = ((iCBB + iY) >> 13) & 0x1FF;
+    if (uVal & 0x100) uVal = 0;
+    *pDest++ = uVal;
+}
+
 static void JPEGPutMCU11(JPEGIMAGE *pJPEG, int x, int iPitch)
 {
     int iCr, iCb;
@@ -2378,6 +2244,7 @@ static void JPEGPutMCU11(JPEGIMAGE *pJPEG, int x, int iPitch)
     int iRow;
     uint8_t *pY, *pCr, *pCb;
     uint16_t *pOutput = &pJPEG->usPixels[x];
+    uint8_t *pOutput8 = ((uint8_t*)pJPEG->usPixels) + x * 3;
 
     pY  = (unsigned char *)&pJPEG->sMCUs[0*DCTSIZE];
     pCb = (unsigned char *)&pJPEG->sMCUs[1*DCTSIZE];
@@ -2474,6 +2341,17 @@ static void JPEGPutMCU11(JPEGIMAGE *pJPEG, int x, int iPitch)
                 JPEGPixelLE(pOutput+iCol, Y, iCb, iCr);
             } // for col
         }
+        else if (pJPEG->ucPixelType == RGB888_LITTLE_ENDIAN)
+        {
+            for (iCol=0; iCol<8; iCol++) // up to 4x2 cols to do
+            {
+                iCr = *pCr++;
+                iCb = *pCb++;
+                Y = (int)(*pY++) << 12;
+                JPEGPixelLE888(pOutput8+iCol*3, Y, iCb, iCr);
+            } // for col
+            pOutput8 += iPitch * 3;
+        }
         else
         {
             for (iCol=0; iCol<8; iCol++) // up to 4x2 cols to do
@@ -2829,6 +2707,7 @@ static void JPEGPutMCU12(JPEGIMAGE *pJPEG, int x, int iPitch)
     int iRow, iCol, iXCount, iYCount;
     uint8_t *pY, *pCr, *pCb;
     uint16_t *pOutput = &pJPEG->usPixels[x];
+    uint8_t *pOutput8 = ((uint8_t*)pJPEG->usPixels) + x * 3;
     
     pY  = (uint8_t *)&pJPEG->sMCUs[0*DCTSIZE];
     pCb = (uint8_t *)&pJPEG->sMCUs[2*DCTSIZE];
@@ -2960,6 +2839,11 @@ static void JPEGPutMCU12(JPEGIMAGE *pJPEG, int x, int iPitch)
                 JPEGPixelLE(pOutput + iCol, Y1, Cb, Cr);
                 JPEGPixelLE(pOutput + iPitch + iCol, Y2, Cb, Cr);
             }
+            else if (pJPEG->ucPixelType == RGB888_LITTLE_ENDIAN)
+            {
+                JPEGPixelLE888(pOutput8 + iCol*3, Y1, Cb, Cr);
+                JPEGPixelLE888(pOutput8 + (iPitch + iCol)*3, Y2, Cb, Cr);
+            }
             else
             {
                 JPEGPixelBE(pOutput + iCol, Y1, Cb, Cr);
@@ -2972,6 +2856,7 @@ static void JPEGPutMCU12(JPEGIMAGE *pJPEG, int x, int iPitch)
         pCb += 8;
         pCr += 8;
         pOutput += iPitch*2; // next 2 lines of dest pixels
+        pOutput8 += iPitch*6;
     }
 } /* JPEGPutMCU12() */
 static void JPEGPutMCU21(JPEGIMAGE *pJPEG, int x, int iPitch)
@@ -3229,6 +3114,8 @@ static int DecodeJPEG(JPEGIMAGE *pJPEG)
     cDCTable2 = pJPEG->JPCI[2].dc_tbl_no;
     cACTable2 = pJPEG->JPCI[2].ac_tbl_no;
     iDCPred0 = iDCPred1 = iDCPred2 = mcuCX = mcuCY = 0;
+
+    printf("SubSample mode: 0x%x\n", pJPEG->ucSubSample);
     
     switch (pJPEG->ucSubSample) // set up the parameters for the different subsampling options
     {
@@ -3287,6 +3174,8 @@ static int DecodeJPEG(JPEGIMAGE *pJPEG)
     iMCUCount = MAX_BUFFERED_PIXELS / (mcuCX * mcuCY);
     if (pJPEG->ucPixelType == EIGHT_BIT_GRAYSCALE)
         iMCUCount *= 2; // each pixel is only 1 byte
+    else if (pJPEG->ucPixelType == RGB888_LITTLE_ENDIAN)
+        iMCUCount = (iMCUCount >> 1) + (iMCUCount >> 3);  // each picel is 3 bytes
     if (iMCUCount > cx)
         iMCUCount = cx; // don't go wider than the image
     if (iMCUCount > pJPEG->iMaxMCUs) // did the user set an upper bound on how many pixels per JPEGDraw callback?
@@ -3296,6 +3185,9 @@ static int DecodeJPEG(JPEGIMAGE *pJPEG)
     jd.iBpp = 16;
     switch (pJPEG->ucPixelType)
     {
+        case RGB888_LITTLE_ENDIAN:
+            jd.iBpp = 24;
+            break;
         case EIGHT_BIT_GRAYSCALE:
             jd.iBpp = 8;
             break;

libraries/motor2040/motor2040.cmake

@@ -1,3 +1,19 @@
+if(NOT TARGET plasma)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/plasma/plasma.cmake)
+endif()
+
+if(NOT TARGET motor)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/motor/motor.cmake)
+endif()
+
+if(NOT TARGET motor_cluster)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/motor/motor_cluster.cmake)
+endif()
+
+if(NOT TARGET encoder)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/encoder/encoder.cmake)
+endif()
+
 add_library(motor2040 INTERFACE)
 
 target_include_directories(motor2040 INTERFACE ${CMAKE_CURRENT_LIST_DIR})

libraries/motor2040/motor2040.hpp

@@ -47,6 +47,10 @@ namespace motor {
     const uint LED_DATA = 18;
     const uint NUM_LEDS = 1;
 
+    const uint I2C_INT = 19;
+    const uint I2C_SDA = 20;
+    const uint I2C_SCL = 21;
+
     const uint USER_SW = 23;
 
     const uint ADC_ADDR_0 = 22;

libraries/pico_display_2/README.md

@@ -1,6 +1,6 @@
 # Pico Display 2.0" Pack <!-- omit in toc -->
 
-Our Pico Display Pack offers a vibrant 1.14" (240x135) IPS LCD screen for your Raspberry Pi Pico it also includes four switches and and an RGB LED!
+Our Pico Display Pack offers a vibrant 2.0" (320x240) IPS LCD screen for your Raspberry Pi Pico it also includes four switches and and an RGB LED!
 
 - [Example Program](#example-program)
 - [Function Reference](#function-reference)
@@ -81,4 +81,4 @@ Pico Display uses our Pico Graphics library to draw graphics and text. For more
 
 ### ST7789
 
-Pico Display uses the ST7789 display driver to handle the LCD. For more information [read the ST7789 README.](../../drivers/st7789/README.md).
+Pico Display uses the ST7789 display driver to handle the LCD. For more information [read the ST7789 README.](../../drivers/st7789/README.md).

libraries/pico_explorer/pico_explorer.cmake

@@ -1,5 +1,10 @@
-include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/st7789/st7789.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+if(NOT TARGET st7789)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/st7789/st7789.cmake)
+endif()
+
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
 
 add_library(pico_explorer INTERFACE)
 

libraries/pico_graphics/pico_graphics.cpp

@@ -8,6 +8,7 @@ namespace pimoroni {
   int PicoGraphics::reset_pen(uint8_t i) {return -1;};
   int PicoGraphics::create_pen(uint8_t r, uint8_t g, uint8_t b) {return -1;};
   int PicoGraphics::create_pen_hsv(float h, float s, float v){return -1;};
+  void PicoGraphics::set_pixel_alpha(const Point &p, const uint8_t a) {};
   void PicoGraphics::set_pixel_dither(const Point &p, const RGB &c) {};
   void PicoGraphics::set_pixel_dither(const Point &p, const RGB565 &c) {};
   void PicoGraphics::set_pixel_dither(const Point &p, const uint8_t &c) {};
@@ -16,6 +17,7 @@ namespace pimoroni {
 
   int PicoGraphics::get_palette_size() {return 0;}
   RGB* PicoGraphics::get_palette() {return nullptr;}
+  bool PicoGraphics::supports_alpha_blend() {return false;}
 
   void PicoGraphics::set_dimensions(int width, int height) {
     bounds = clip = {0, 0, width, height};
@@ -132,7 +134,7 @@ namespace pimoroni {
     if (bitmap_font) {
       bitmap::character(bitmap_font, [this](int32_t x, int32_t y, int32_t w, int32_t h) {
         rectangle(Rect(x, y, w, h));
-      }, c, p.x, p.y, std::max(1.0f, s));
+      }, c, p.x, p.y, std::max(1.0f, s), int32_t(a) % 360);
       return;
     }
 
@@ -148,7 +150,7 @@ namespace pimoroni {
     if (bitmap_font) {
       bitmap::text(bitmap_font, [this](int32_t x, int32_t y, int32_t w, int32_t h) {
         rectangle(Rect(x, y, w, h));
-      }, t, p.x, p.y, wrap, std::max(1.0f, s), letter_spacing, fixed_width);
+      }, t, p.x, p.y, wrap, std::max(1.0f, s), letter_spacing, fixed_width, int32_t(a) % 360);
       return;
     }
 
@@ -266,7 +268,7 @@ namespace pimoroni {
           int32_t ex = points[j].x;
           int32_t px = int32_t(sx + float(fy - sy) / float(ey - sy) * float(ex - sx));
 
-          nodes[n++] = px < clip.x ? clip.x : (px >= clip.x + clip.w ? clip.x + clip.w - 1 : px);// clamp(int32_t(sx + float(fy - sy) / float(ey - sy) * float(ex - sx)), clip.x, clip.x + clip.w);
+          nodes[n++] = px;
         }
       }
 

libraries/pico_graphics/pico_graphics.hpp

@@ -26,6 +26,7 @@
 namespace pimoroni {
   typedef uint8_t RGB332;
   typedef uint16_t RGB565;
+  typedef uint16_t RGB555;
   typedef uint32_t RGB888;
 
 
@@ -46,7 +47,19 @@ namespace pimoroni {
       g((c >> 8) & 0xff),
       b(c & 0xff) {}
     constexpr RGB(int16_t r, int16_t g, int16_t b) : r(r), g(g), b(b) {}
-  
+
+    constexpr uint8_t blend(uint8_t s, uint8_t d, uint8_t a) {
+      return d + ((a * (s - d) + 127) >> 8);
+    }
+
+    constexpr RGB blend(RGB with, const uint8_t alpha) {
+      return RGB(
+        blend(with.r, r, alpha),
+        blend(with.g, g, alpha),
+        blend(with.b, b, alpha)
+      );
+    }
+
     static RGB from_hsv(float h, float s, float v) {
       float i = floor(h * 6.0f);
       float f = h * 6.0f - i;
@@ -108,6 +121,14 @@ namespace pimoroni {
       return __builtin_bswap16(p);
     }
 
+    constexpr RGB555 to_rgb555() {
+      uint16_t p = ((r & 0b11111000) << 7) |
+                   ((g & 0b11111000) << 2) |
+                   ((b & 0b11111000) >> 3);
+
+      return p;
+    }
+
     constexpr RGB565 to_rgb332() {
       return (r & 0b11100000) | ((g & 0b11100000) >> 3) | ((b & 0b11000000) >> 6);
     }
@@ -192,7 +213,10 @@ namespace pimoroni {
       PEN_RGB332,
       PEN_RGB565,
       PEN_RGB888,
-      PEN_INKY7
+      PEN_INKY7,
+      PEN_DV_RGB555,
+      PEN_DV_P5,
+      PEN_DV_RGB888,
     };
 
     void *frame_buffer;
@@ -256,6 +280,7 @@ namespace pimoroni {
 
     virtual int get_palette_size();
     virtual RGB* get_palette();
+    virtual bool supports_alpha_blend();
 
     virtual int create_pen(uint8_t r, uint8_t g, uint8_t b);
     virtual int create_pen_hsv(float h, float s, float v);
@@ -264,9 +289,12 @@ namespace pimoroni {
     virtual void set_pixel_dither(const Point &p, const RGB &c);
     virtual void set_pixel_dither(const Point &p, const RGB565 &c);
     virtual void set_pixel_dither(const Point &p, const uint8_t &c);
+    virtual void set_pixel_alpha(const Point &p, const uint8_t a);
     virtual void frame_convert(PenType type, conversion_callback_func callback);
     virtual void sprite(void* data, const Point &sprite, const Point &dest, const int scale, const int transparent);
 
+    virtual bool render_pico_vector_tile(const Rect &bounds, uint8_t* alpha_data, uint32_t stride, uint8_t alpha_type) { return false; }
+
     void set_font(const bitmap::font_t *font);
     void set_font(const hershey::font_t *font);
     void set_font(std::string_view name);
@@ -459,6 +487,9 @@ namespace pimoroni {
       void set_pixel_span(const Point &p, uint l) override;
       void set_pixel_dither(const Point &p, const RGB &c) override;
       void set_pixel_dither(const Point &p, const RGB565 &c) override;
+      void set_pixel_alpha(const Point &p, const uint8_t a) override;
+
+      bool supports_alpha_blend() override {return true;}
 
       void sprite(void* data, const Point &sprite, const Point &dest, const int scale, const int transparent) override;
 
@@ -528,6 +559,12 @@ namespace pimoroni {
        virtual void read_pixel_span(const Point &p, uint l, T *data) {};
    };
 
+  class IPaletteDisplayDriver {
+    public:
+      virtual void write_palette_pixel(const Point &p, uint8_t colour) = 0;
+      virtual void write_palette_pixel_span(const Point &p, uint l, uint8_t colour) = 0;
+      virtual void set_palette_colour(uint8_t entry, RGB888 colour) = 0;
+  };
 
   class PicoGraphics_PenInky7 : public PicoGraphics {
     public:

libraries/pico_graphics/pico_graphics_pen_1bitY.cpp

@@ -15,7 +15,7 @@ namespace pimoroni {
   }
 
   void PicoGraphics_Pen1BitY::set_pen(uint8_t r, uint8_t g, uint8_t b) {
-    color = std::max(r, std::max(g, b));
+    color = std::max(r, std::max(g, b)) >> 4;
   }
 
   void PicoGraphics_Pen1BitY::set_pixel(const Point &p) {

libraries/pico_graphics/pico_graphics_pen_rgb332.cpp

@@ -34,6 +34,15 @@ namespace pimoroni {
             *buf++ = color;
         }
     }
+    void PicoGraphics_PenRGB332::set_pixel_alpha(const Point &p, const uint8_t a) {
+        if(!bounds.contains(p)) return;
+
+        uint8_t *buf = (uint8_t *)frame_buffer;
+
+        RGB332 blended = RGB(buf[p.y * bounds.w + p.x]).blend(RGB(color), a).to_rgb332();
+
+        buf[p.y * bounds.w + p.x] = blended;
+    };
     void PicoGraphics_PenRGB332::set_pixel_dither(const Point &p, const RGB &c) {
         if(!bounds.contains(p)) return;
         uint8_t _dmv = dither16_pattern[(p.x & 0b11) | ((p.y & 0b11) << 2)];

libraries/pico_motor_shim/pico_motor_shim.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET motor)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/motor/motor.cmake)
+endif()
+
 add_library(pico_motor_shim INTERFACE)
 
 target_include_directories(pico_motor_shim INTERFACE ${CMAKE_CURRENT_LIST_DIR})

libraries/pico_scroll/pico_scroll.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(pico_scroll INTERFACE)
 
 set(PICO_SCROLL_SOURCES

libraries/pico_unicorn/pico_unicorn.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET pico_graphics)
+  include(${CMAKE_CURRENT_LIST_DIR}/../pico_graphics/pico_graphics.cmake)
+endif()
+
 add_library(pico_unicorn INTERFACE)
 
 pico_generate_pio_header(pico_unicorn ${CMAKE_CURRENT_LIST_DIR}/pico_unicorn.pio)

libraries/pico_unicorn/pico_unicorn.cpp

@@ -2,7 +2,9 @@
 #include "hardware/irq.h"
 #include "common/pimoroni_common.hpp"
 
+#ifndef NO_QSTR
 #include "pico_unicorn.pio.h"
+#endif
 #include "pico_unicorn.hpp"
 
 // pixel data is stored as a stream of bits delivered in the

libraries/pico_vector/alright_fonts.cpp

@@ -0,0 +1,181 @@
+#include <cstdint>
+#include <math.h>
+#include <string.h>
+#include <algorithm>
+#include <vector>
+#include <optional>
+#include <map>
+
+#include "alright_fonts.hpp"
+
+using namespace pretty_poly;
+
+namespace alright_fonts {
+  /*
+    utility functions
+  */
+  pretty_poly::rect_t measure_character(text_metrics_t &tm, uint16_t codepoint) {
+    if(tm.face.glyphs.count(codepoint) == 1) {
+      glyph_t glyph = tm.face.glyphs[codepoint];
+
+      return {0, 0, ((glyph.advance * tm.size) / 128), tm.size};
+    }
+
+    return {0, 0, 0, 0};
+  }
+
+  /*
+    render functions
+  */
+
+  void render_character(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin) {
+    if(tm.face.glyphs.count(codepoint) == 1) {
+      glyph_t glyph = tm.face.glyphs[codepoint];
+
+      // scale is a fixed point 16:16 value, our font data is already scaled to
+      // -128..127 so to get the pixel size we want we can just shift the
+      // users requested size up one bit
+      unsigned scale = tm.size << 9;
+
+      pretty_poly::draw_polygon<int8_t>(glyph.contours, origin, scale);
+    }
+  }
+
+  template<typename mat_t>
+  void render_character(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin, mat_t transform) {
+    if(tm.face.glyphs.count(codepoint) == 1) {
+      glyph_t glyph = tm.face.glyphs[codepoint];
+
+      // scale is a fixed point 16:16 value, our font data is already scaled to
+      // -128..127 so to get the pixel size we want we can just shift the
+      // users requested size up one bit
+      unsigned scale = tm.size << 9;
+
+      std::vector<pretty_poly::contour_t<int8_t>> contours;
+      contours.reserve(glyph.contours.size());
+
+      unsigned int total_points = 0;
+      for(auto i = 0u; i < glyph.contours.size(); i++) {
+        total_points += glyph.contours[i].count;;
+      }
+
+      point_t<int8_t> *points = (point_t<int8_t> *)malloc(sizeof(point_t<int8_t>) * total_points);
+
+      for(auto i = 0u; i < glyph.contours.size(); i++) {
+        const unsigned int count = glyph.contours[i].count;
+        for(auto j = 0u; j < count; j++) {
+          point_t<float> point(glyph.contours[i].points[j].x, glyph.contours[i].points[j].y);
+          point *= transform;
+          points[j] = point_t<int8_t>(point.x, point.y);
+        }
+        contours.emplace_back(points, count);
+        points += count;
+      }
+
+      pretty_poly::draw_polygon<int8_t>(contours, origin, scale);
+
+      free(contours[0].points);
+    }
+  }
+
+  template void render_character<pretty_poly::mat3_t>(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin, pretty_poly::mat3_t transform);
+  template void render_character<pretty_poly::mat2_t>(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin, pretty_poly::mat2_t transform);
+
+  /*
+    load functions
+  */
+
+  // big endian stream value helpers
+  uint16_t  ru16(file_io &ifs) {uint8_t w[2]; ifs.read((char *)w, 2); return w[0] << 8 | w[1];}
+  int16_t   rs16(file_io &ifs) {uint8_t w[2]; ifs.read((char *)w, 2); return w[0] << 8 | w[1];}
+  uint32_t  ru32(file_io &ifs) {uint8_t dw[4]; ifs.read((char *)dw, 4); return dw[0] << 24 | dw[1] << 16 | dw[2] << 8 | dw[3];}
+  uint8_t   ru8(file_io &ifs) {uint8_t w; ifs.read(&w, 1); return w;}
+  int8_t    rs8(file_io &ifs) {int8_t w; ifs.read(&w, 1); return w;}
+
+  bool face_t::load(file_io &ifs) {
+    char marker[4];
+    ifs.read(marker, sizeof(marker));
+
+    // check header magic bytes are present
+    if(memcmp(marker, "af!?", 4) != 0) {
+      // doesn't start with magic marker
+      return false;
+    }
+
+    // number of glyphs embedded in font file
+    this->glyph_count = ru16(ifs);
+
+    // extract flags and ensure none set
+    this->flags = ru16(ifs);
+    if(this->flags != 0) {
+      // unknown flags set
+      return false;
+    }
+
+    // extract glyph dictionary
+    uint16_t glyph_entry_size = 9;
+    uint32_t contour_data_offset = 8 + this->glyph_count * glyph_entry_size;
+    for(auto i = 0; i < this->glyph_count; i++) {
+      glyph_t g;
+      g.codepoint = ru16(ifs);
+      g.bounds.x  = rs8(ifs);
+      g.bounds.y  = rs8(ifs);
+      g.bounds.w  = ru8(ifs);
+      g.bounds.h  = ru8(ifs);
+      g.advance   = ru8(ifs);
+
+      if(ifs.fail()) {
+        // could not read glyph dictionary entry
+        return false;
+      }
+
+      // allocate space for the contour data and read it from the font file
+      uint16_t contour_data_length = ru16(ifs);
+
+      // remember where we are in the dictionary
+      int pos = ifs.tell();
+
+      // read contour data
+      ifs.seek(contour_data_offset);
+      while(true) {
+        // get number of points in contour
+        uint16_t count = ru16(ifs);
+
+        // if count is zero then this is the end of contour marker
+        if(count == 0) {
+          break;
+        }
+
+        // allocate space to store point data for contour and read
+        // from file
+        pretty_poly::point_t<int8_t> *points = new pretty_poly::point_t<int8_t>[count];
+        ifs.read((char *)points, count * 2);
+
+        g.contours.push_back({points, count});
+      }
+
+      // return back to position in dictionary
+      ifs.seek(pos);
+      contour_data_offset += contour_data_length;
+
+      if(ifs.fail()) {
+        // could not read glyph contour data
+        return false;
+      }
+
+      this->glyphs[g.codepoint] = g;
+    }
+
+    return true;
+  }
+
+  bool face_t::load(std::string_view path) {
+    file_io ifs(path);
+    if(ifs.fail()) {
+      // could not open file
+      return false;
+    }
+    return load(ifs);
+  }
+
+}

libraries/pico_vector/alright_fonts.hpp

@@ -0,0 +1,75 @@
+#include <cstdint>
+#include <math.h>
+#include <string.h>
+#include <algorithm>
+#include <vector>
+#include <optional>
+#include <map>
+
+#include "pretty_poly.hpp"
+
+namespace alright_fonts {
+
+  struct glyph_t {
+    uint16_t codepoint;
+    pretty_poly::rect_t bounds;
+    uint8_t advance;
+    std::vector<pretty_poly::contour_t<int8_t>> contours;
+  };
+
+  struct face_t {
+    uint16_t glyph_count;
+    uint16_t flags;
+    std::map<uint16_t, glyph_t> glyphs;
+
+    face_t() {};
+    face_t(pretty_poly::file_io &ifs) {load(ifs);}
+    face_t(std::string_view path) {load(path);}
+
+    bool load(pretty_poly::file_io &ifs);
+    bool load(std::string_view path);
+  };
+
+  enum alignment_t {
+    left    = 0,
+    center  = 1,
+    right   = 2,
+    justify = 4,
+    top     = 8,
+    bottom  = 16
+  };
+
+  struct text_metrics_t {
+    face_t face;                      // font to write in
+    int size;                         // text size in pixels
+    uint scroll;                      // vertical scroll offset
+    int line_height;                  // spacing between lines (%)
+    int letter_spacing;               // spacing between characters
+    int word_spacing;                 // spacing between words
+    alignment_t align;                // horizontal and vertical alignment
+    //optional<mat3_t> transform;     // arbitrary transformation
+    pretty_poly::antialias_t antialiasing = pretty_poly::X4;    // level of antialiasing to apply
+
+    void set_size(int s) {
+      size = s;
+      line_height = size;
+      letter_spacing = 0;
+      word_spacing = size / 2;
+    }
+
+    text_metrics_t() {};
+  };
+
+  /*
+    utility functions
+  */
+  pretty_poly::rect_t measure_character(text_metrics_t &tm, uint16_t codepoint);
+
+  /* 
+    render functions
+  */
+
+  void render_character(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin);
+  template<typename mat_t>
+  void render_character(text_metrics_t &tm, uint16_t codepoint, pretty_poly::point_t<int> origin, mat_t transform);
+}

libraries/pico_vector/pico_vector.cmake

@@ -0,0 +1,9 @@
+add_library(pico_vector 
+    ${CMAKE_CURRENT_LIST_DIR}/pico_vector.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/pretty_poly.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/alright_fonts.cpp
+)
+
+target_include_directories(pico_vector INTERFACE ${CMAKE_CURRENT_LIST_DIR})
+
+target_link_libraries(pico_vector pico_stdlib hardware_interp)

libraries/pico_vector/pico_vector.cpp

@@ -0,0 +1,192 @@
+#include "pico_vector.hpp"
+#include <vector>
+
+namespace pimoroni {
+  void PicoVector::polygon(std::vector<pretty_poly::contour_t<picovector_point_type>> contours, Point origin, int scale) {
+    pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h};
+    pretty_poly::draw_polygon<picovector_point_type>(
+        contours,
+        pretty_poly::point_t<int>(origin.x, origin.y),
+        scale);
+  }
+
+  void PicoVector::rotate(std::vector<pretty_poly::contour_t<picovector_point_type>> &contours, Point origin, float angle) {
+    pretty_poly::point_t<picovector_point_type> t{(picovector_point_type)origin.x, (picovector_point_type)origin.y};
+    angle = (2 * (float)M_PI / 360.f) * angle;
+    pretty_poly::mat2_t r = pretty_poly::mat2_t::rotation(angle);
+    for(auto &contour : contours) {
+      for(auto i = 0u; i < contour.count; i++) {
+        contour.points[i] -= t;
+        contour.points[i] *= r;
+        contour.points[i] += t;
+      }
+    }
+  }
+
+  void PicoVector::translate(std::vector<pretty_poly::contour_t<picovector_point_type>> &contours, Point translation) {
+    pretty_poly::point_t<picovector_point_type> t{(picovector_point_type)translation.x, (picovector_point_type)translation.y};
+    for(auto &contour : contours) {
+      for(auto i = 0u; i < contour.count; i++) {
+        contour.points[i] += t;
+      }
+    }
+  }
+
+  void PicoVector::rotate(pretty_poly::contour_t<picovector_point_type> &contour, Point origin, float angle) {
+    pretty_poly::point_t<picovector_point_type> t{(picovector_point_type)origin.x, (picovector_point_type)origin.y};
+    angle = (2 * (float)M_PI / 360.f) * angle;
+    pretty_poly::mat2_t r = pretty_poly::mat2_t::rotation(angle);
+    for(auto i = 0u; i < contour.count; i++) {
+      contour.points[i] -= t;
+      contour.points[i] *= r;
+      contour.points[i] += t;
+    }
+  }
+
+  void PicoVector::translate(pretty_poly::contour_t<picovector_point_type> &contour, Point translation) {
+    pretty_poly::point_t<picovector_point_type> t{(picovector_point_type)translation.x, (picovector_point_type)translation.y};
+    for(auto i = 0u; i < contour.count; i++) {
+      contour.points[i] += t;
+    }
+  }
+
+  Point PicoVector::text(std::string_view text, Point origin) {
+    // Copy clipping bounds from the PicoGraphics instance
+    pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h};
+    // TODO: Normalize types somehow, so we're not converting?
+    pretty_poly::point_t<int> caret = pretty_poly::point_t<int>(origin.x, origin.y);
+
+    // Align text from the bottom left
+    caret.y += text_metrics.size;
+
+    int16_t space_width = alright_fonts::measure_character(text_metrics, ' ').w;
+    if (space_width == 0) {
+      space_width = text_metrics.word_spacing;
+    }
+
+    size_t i = 0;
+
+    while(i < text.length()) {
+      size_t next_space = text.find(' ', i + 1);
+
+      if(next_space == std::string::npos) {
+        next_space = text.length();
+      }
+
+      size_t next_linebreak = text.find('\n', i + 1);
+
+      if(next_linebreak == std::string::npos) {
+        next_linebreak = text.length();
+      }
+
+      size_t next_break = std::min(next_space, next_linebreak);
+
+      uint16_t word_width = 0;
+      for(size_t j = i; j < next_break; j++) {
+        word_width += alright_fonts::measure_character(text_metrics, text[j]).w;
+        word_width += text_metrics.letter_spacing;
+      }
+
+      if(caret.x != 0 && caret.x + word_width > graphics->clip.w) {
+        caret.x = origin.x;
+        caret.y += text_metrics.line_height;
+      }
+
+      for(size_t j = i; j < std::min(next_break + 1, text.length()); j++) {
+        if (text[j] == '\n') { // Linebreak
+          caret.x = origin.x;
+          caret.y += text_metrics.line_height;
+        } else if (text[j] == ' ') { // Space
+          caret.x += space_width;
+        } else {
+          alright_fonts::render_character(text_metrics, text[j], caret);
+        }
+        caret.x += alright_fonts::measure_character(text_metrics, text[j]).w;
+        caret.x += text_metrics.letter_spacing;
+      }
+
+      i = next_break + 1;
+    }
+
+    return Point(caret.x, caret.y);
+  }
+
+  Point PicoVector::text(std::string_view text, Point origin, float angle) {
+    // Copy clipping bounds from the PicoGraphics instance
+    pretty_poly::settings::clip = {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h};
+    // TODO: Normalize types somehow, so we're not converting?
+    pretty_poly::point_t<float> caret(0, 0);
+
+    // Prepare a transformation matrix for character and offset rotation
+    angle = (2 * (float)M_PI / 360.f) * angle;
+    pretty_poly::mat2_t transform = pretty_poly::mat2_t::rotation(angle);
+
+    // Align text from the bottom left
+    caret.y += text_metrics.line_height;
+    caret *= transform;
+
+    pretty_poly::point_t<float> space;
+    pretty_poly::point_t<float> carriage_return(0, -text_metrics.line_height);
+
+    space.x = alright_fonts::measure_character(text_metrics, ' ').w;
+    if (space.x == 0) {
+      space.x = text_metrics.word_spacing;
+    }
+
+    space *= transform;
+    carriage_return *= transform;
+    const pretty_poly::point_t<float> initial_carriage_return = carriage_return;
+
+    size_t i = 0;
+
+    while(i < text.length()) {
+      size_t next_space = text.find(' ', i + 1);
+
+      if(next_space == std::string::npos) {
+        next_space = text.length();
+      }
+
+      size_t next_linebreak = text.find('\n', i + 1);
+
+      if(next_linebreak == std::string::npos) {
+        next_linebreak = text.length();
+      }
+
+      size_t next_break = std::min(next_space, next_linebreak);
+
+      uint16_t word_width = 0;
+      for(size_t j = i; j < next_break; j++) {
+        word_width += alright_fonts::measure_character(text_metrics, text[j]).w;
+        word_width += text_metrics.letter_spacing;
+      }
+
+      if(caret.x != 0 && caret.x + word_width > graphics->clip.w) {
+        caret -= carriage_return;
+        carriage_return = initial_carriage_return;
+      }
+
+      for(size_t j = i; j < std::min(next_break + 1, text.length()); j++) {
+        if (text[j] == '\n') { // Linebreak
+          caret -= carriage_return;
+          carriage_return = initial_carriage_return;
+        } else if (text[j] == ' ') { // Space
+          caret += space;
+          carriage_return += space;
+        } else {
+          alright_fonts::render_character(text_metrics, text[j], pretty_poly::point_t<int>(origin.x + caret.x, origin.y + caret.y), transform);
+        }
+        pretty_poly::point_t<float> advance(
+          alright_fonts::measure_character(text_metrics, text[j]).w + text_metrics.letter_spacing,
+          0
+        );
+        advance *= transform;
+        caret += advance;
+        carriage_return += advance;
+      }
+
+      i = next_break + 1;
+    }
+
+    return Point(caret.x, caret.y);
+  }
+}

libraries/pico_vector/pico_vector.hpp

@@ -0,0 +1,87 @@
+#include "pretty_poly.hpp"
+#include "alright_fonts.hpp"
+#include "pico_graphics.hpp"
+
+namespace pimoroni {
+
+    // Integer point types cause compound error in transformations
+    typedef float picovector_point_type;
+
+    class PicoVector {
+        private:
+            PicoGraphics *graphics;
+            alright_fonts::text_metrics_t text_metrics;
+            const uint8_t alpha_map[4] {0, 128, 192, 255};
+
+        public:
+            PicoVector(PicoGraphics *graphics, void *mem = nullptr) : graphics(graphics) {
+                pretty_poly::init(mem);
+
+                set_options([this](const pretty_poly::tile_t &tile) -> void {
+                    uint8_t *tile_data = tile.data;
+
+                    if(this->graphics->supports_alpha_blend() && pretty_poly::settings::antialias != pretty_poly::NONE) {
+                        if (this->graphics->render_pico_vector_tile({tile.bounds.x, tile.bounds.y, tile.bounds.w, tile.bounds.h},
+                                                                    tile.data,
+                                                                    tile.stride,
+                                                                    (uint8_t)pretty_poly::settings::antialias)) {
+                            return;
+                        }
+                        for(auto y = 0; y < tile.bounds.h; y++) {
+                            for(auto x = 0; x < tile.bounds.w; x++) {
+                                uint8_t alpha = *tile_data++;
+                                if (alpha >= 4) {
+                                    this->graphics->set_pixel({x + tile.bounds.x, y + tile.bounds.y});
+                                } else if (alpha > 0) {
+                                    alpha = alpha_map[alpha];
+                                    this->graphics->set_pixel_alpha({x + tile.bounds.x, y + tile.bounds.y}, alpha);
+                                }
+                            }
+                            tile_data += tile.stride - tile.bounds.w;
+                        }
+                    } else {
+                        for(auto y = 0; y < tile.bounds.h; y++) {
+                            for(auto x = 0; x < tile.bounds.w; x++) {
+                                uint8_t alpha = *tile_data++;
+                                if (alpha) {
+                                    this->graphics->set_pixel({x + tile.bounds.x, y + tile.bounds.y});
+                                }
+                            }
+                            tile_data += tile.stride - tile.bounds.w;
+                        }
+                    }
+                }, graphics->supports_alpha_blend() ? pretty_poly::X4 : pretty_poly::NONE, {graphics->clip.x, graphics->clip.y, graphics->clip.w, graphics->clip.h});
+            }
+
+            void set_antialiasing(pretty_poly::antialias_t antialias) {
+                set_options(pretty_poly::settings::callback, antialias, pretty_poly::settings::clip);
+            }
+
+            void set_font_size(unsigned int font_size) {
+                text_metrics.set_size(font_size);
+            }
+
+            bool set_font(std::string_view font_path, unsigned int font_size) {
+                bool result = text_metrics.face.load(font_path);
+
+                set_font_size(font_size);
+
+                return result;
+            }
+
+            void rotate(std::vector<pretty_poly::contour_t<picovector_point_type>> &contours, Point origin, float angle);
+            void translate(std::vector<pretty_poly::contour_t<picovector_point_type>> &contours, Point translation);
+
+            void rotate(pretty_poly::contour_t<picovector_point_type> &contour, Point origin, float angle);
+            void translate(pretty_poly::contour_t<picovector_point_type> &contour, Point translation);
+
+            Point text(std::string_view text, Point origin);
+            Point text(std::string_view text, Point origin, float angle);
+
+            void polygon(std::vector<pretty_poly::contour_t<picovector_point_type>> contours, Point origin = Point(0, 0), int scale=65536);
+
+            static constexpr size_t pretty_poly_buffer_size() {
+                return pretty_poly::buffer_size();
+            };
+    };
+}

libraries/pico_vector/pretty_poly.cpp

@@ -0,0 +1,339 @@
+#include <cstdint>
+#include <algorithm>
+#include <optional>
+#include <cstring>
+#include <new>
+#include <filesystem>
+#include <fstream>
+
+#include "pretty_poly.hpp"
+
+#include "hardware/interp.h"
+
+#ifdef PP_DEBUG
+#define debug(...) printf(__VA_ARGS__)
+#else
+#define debug(...)
+#endif
+
+namespace pretty_poly {
+
+  uint8_t *tile_buffer;
+
+  int (*nodes)[32];
+  unsigned *node_counts;
+
+  // default tile bounds to X1 antialiasing
+  rect_t tile_bounds(0, 0, tile_buffer_size / node_buffer_size, node_buffer_size);
+
+  // user settings
+  namespace settings {
+    rect_t clip(0, 0, 320, 240);
+    tile_callback_t callback;
+    antialias_t antialias = antialias_t::NONE;
+  }
+
+  void init(void *memory) {
+    uintptr_t m = (uintptr_t)memory;
+    tile_buffer = new(memory) uint8_t[tile_buffer_size];
+    node_counts = new((void *)(m + tile_buffer_size)) unsigned[node_buffer_size];
+    nodes = new((void *)(m + tile_buffer_size + (node_buffer_size * sizeof(unsigned)))) int[node_buffer_size][32];
+  }
+
+  void set_options(tile_callback_t callback, antialias_t antialias, rect_t clip) {
+    settings::callback = callback;
+    settings::antialias = antialias;
+    settings::clip = clip;
+
+    // recalculate the tile size for rendering based on antialiasing level
+    int tile_height = node_buffer_size >> antialias;
+    tile_bounds = rect_t(0, 0, tile_buffer_size / tile_height, tile_height);
+  }
+
+  // dy step (returns 1, 0, or -1 if the supplied value is > 0, == 0, < 0)
+  inline constexpr int sign(int v) {
+    // assumes 32-bit int/unsigned
+    return ((unsigned)-v >> 31) - ((unsigned)v >> 31);
+  }
+
+  // write out the tile bits
+  void debug_tile(const tile_t &tile) {
+    debug("  - tile %d, %d (%d x %d)\n", tile.bounds.x, tile.bounds.y, tile.bounds.w, tile.bounds.h);
+    for(auto y = 0; y < tile.bounds.h; y++) {
+      debug("[%3d]: ", y);
+      for(auto x = 0; x < tile.bounds.w; x++) {
+        debug("%d", tile.get_value(x, y));
+      }  
+      debug("\n");              
+    }
+    debug("-----------------------\n");
+  }
+
+  void add_line_segment_to_nodes(const point_t<int> &start, const point_t<int> &end) {
+    // swap endpoints if line "pointing up", we do this because we
+    // alway skip the last scanline (so that polygons can but cleanly
+    // up against each other without overlap)
+    int sx = start.x, sy = start.y, ex = end.x, ey = end.y;
+
+    if(ey < sy) {
+      std::swap(sy, ey);
+      std::swap(sx, ex);
+    }
+
+    // Early out if line is completely outside the tile, or has no lines
+    if (ey < 0 || sy >= (int)node_buffer_size || sy == ey) return;
+
+    debug("      + line segment from %d, %d to %d, %d\n", sx, sy, ex, ey);
+
+    // Determine how many in-bounds lines to render
+    int y = std::max(0, sy);
+    int count = std::min((int)node_buffer_size, ey) - y;
+
+    // Handle cases where x is completely off to one side or other
+    if (std::max(sx, ex) <= 0) {
+      while (count--) {
+        nodes[y][node_counts[y]++] = 0;
+        ++y;
+      }
+      return;
+    }
+
+    const int full_tile_width = (tile_bounds.w << settings::antialias);
+    if (std::min(sx, ex) >= full_tile_width) {
+      while (count--) {
+        nodes[y][node_counts[y]++] = full_tile_width;
+        ++y;
+      }
+      return;
+    }
+
+    // Normal case
+    int x = sx;
+    int e = 0;
+
+    const int xinc = sign(ex - sx);
+    const int einc = abs(ex - sx) + 1;
+    const int dy = ey - sy;
+
+    // If sy < 0 jump to the start, note this does use a divide
+    // but potentially saves many wasted loops below, so is likely worth it.
+    if (sy < 0) {
+      e = einc * -sy;
+      int xjump = e / dy;
+      e -= dy * xjump;
+      x += xinc * xjump;
+    }
+
+    interp1->base[1] = full_tile_width;
+    interp1->accum[0] = x;
+
+    // loop over scanlines
+    while(count--) {
+      // consume accumulated error
+      while(e > dy) {e -= dy; interp1->add_raw[0] = xinc;}
+
+      // clamp node x value to tile bounds
+      const int nx = interp1->peek[0];
+      debug("      + adding node at %d, %d\n", x, y);
+      // add node to node list
+      nodes[y][node_counts[y]++] = nx;
+
+      // step to next scanline and accumulate error
+      y++;
+      e += einc;
+    }
+  }
+
+  template<typename T>
+  void build_nodes(const contour_t<T> &contour, const tile_t &tile, point_t<int> origin, int scale) {
+    int ox = (origin.x - tile.bounds.x) << settings::antialias;
+    int oy = (origin.y - tile.bounds.y) << settings::antialias;
+
+    // start with the last point to close the loop
+    point_t<int> last(
+      (((int(contour.points[contour.count - 1].x) * scale) << settings::antialias) / 65536) + ox,
+      (((int(contour.points[contour.count - 1].y) * scale) << settings::antialias) / 65536) + oy
+    );
+
+    for(auto i = 0u; i < contour.count; i++) {
+      point_t<int> point(
+        (((int(contour.points[i].x) * scale) << settings::antialias) / 65536) + ox,
+        (((int(contour.points[i].y) * scale) << settings::antialias) / 65536) + oy
+      );
+
+      add_line_segment_to_nodes(last, point);
+      
+      last = point;
+    }
+  }
+
+  void render_nodes(const tile_t &tile, rect_t &bounds) {
+    int maxy = -1;
+    bounds.y = 0;
+    bounds.x = tile.bounds.w;
+    int maxx = 0;
+    int anitialias_mask = (1 << settings::antialias) - 1;
+
+    for(auto y = 0; y < (int)node_buffer_size; y++) {
+      if(node_counts[y] == 0) {
+        if (y == bounds.y) ++bounds.y;
+        continue;
+      }
+
+      std::sort(&nodes[y][0], &nodes[y][0] + node_counts[y]);
+
+      uint8_t* row_data = &tile.data[(y >> settings::antialias) * tile.stride];
+      bool rendered_any = false;
+      for(auto i = 0u; i < node_counts[y]; i += 2) {
+        int sx = nodes[y][i + 0];
+        int ex = nodes[y][i + 1];
+
+        if(sx == ex) {
+          continue;
+        }
+
+        rendered_any = true;
+
+        maxx = std::max((ex - 1) >> settings::antialias, maxx);
+
+        debug(" - render span at %d from %d to %d\n", y, sx, ex);
+
+        if (settings::antialias) {
+          int ax = sx >> settings::antialias;
+          const int aex = ex >> settings::antialias;
+
+          bounds.x = std::min(ax, bounds.x);
+
+          if (ax == aex) {
+            row_data[ax] += ex - sx;
+            continue;
+          }
+
+          row_data[ax] += (1 << settings::antialias) - (sx & anitialias_mask);
+          for(ax++; ax < aex; ax++) {
+            row_data[ax] += (1 << settings::antialias);
+          }
+
+          // This might add 0 to the byte after the end of the row, we pad the tile data
+          // by 1 byte to ensure that is OK
+          row_data[ax] += ex & anitialias_mask;
+        }
+        else {
+          bounds.x = std::min(sx, bounds.x);
+          for(int x = sx; x < ex; x++) {
+            row_data[x]++;
+          }       
+        }
+      }
+
+      if (rendered_any) {
+        debug("  - rendered line %d\n", y);
+        maxy = y;
+      }
+      else if (y == bounds.y) {
+        debug(" - render nothing on line %d\n", y);
+        ++bounds.y;
+      }
+    }
+
+    bounds.y >>= settings::antialias;
+    maxy >>= settings::antialias;
+    bounds.w = (maxx >= bounds.x) ? maxx + 1 - bounds.x : 0;
+    bounds.h = (maxy >= bounds.y) ? maxy + 1 - bounds.y : 0;
+    debug(" - rendered tile bounds %d, %d (%d x %d)\n", bounds.x, bounds.y, bounds.w, bounds.h);
+  }
+
+  template<typename T>
+  void draw_polygon(T *points, unsigned count) {
+    std::vector<contour_t<T>> contours;
+    contour_t<T> c(points, count);
+    contours.push_back(c);
+    draw_polygon<T>(contours);
+  }
+  
+  template<typename T>
+  void draw_polygon(const std::vector<contour_t<T>>& contours, point_t<int> origin, int scale) {    
+
+    debug("> draw polygon with %lu contours\n", contours.size());
+
+    if(contours.size() == 0) {
+      return;
+    }
+
+    // determine extreme bounds
+    rect_t polygon_bounds = contours[0].bounds();
+    for(auto &contour : contours) {
+      polygon_bounds = polygon_bounds.merge(contour.bounds());
+    }
+
+    polygon_bounds.x = ((polygon_bounds.x * scale) / 65536) + origin.x;
+    polygon_bounds.y = ((polygon_bounds.y * scale) / 65536) + origin.y;
+    polygon_bounds.w = ((polygon_bounds.w * scale) / 65536);
+    polygon_bounds.h = ((polygon_bounds.h * scale) / 65536);
+
+    debug("  - bounds %d, %d (%d x %d)\n", polygon_bounds.x, polygon_bounds.y, polygon_bounds.w, polygon_bounds.h);
+    debug("  - clip %d, %d (%d x %d)\n", settings::clip.x, settings::clip.y, settings::clip.w, settings::clip.h);
+
+    interp_hw_save_t interp1_save;
+    interp_save(interp1, &interp1_save);
+
+    interp_config cfg = interp_default_config();
+    interp_config_set_clamp(&cfg, true);
+    interp_config_set_signed(&cfg, true);
+    interp_set_config(interp1, 0, &cfg);
+    interp1->base[0] = 0;
+
+    //memset(nodes, 0, node_buffer_size * sizeof(unsigned) * 32);
+
+    // iterate over tiles
+    debug("  - processing tiles\n");
+    for(auto y = polygon_bounds.y; y < polygon_bounds.y + polygon_bounds.h; y += tile_bounds.h) {
+      for(auto x = polygon_bounds.x; x < polygon_bounds.x + polygon_bounds.w; x += tile_bounds.w) {
+        tile_t tile;
+        tile.bounds = rect_t(x, y, tile_bounds.w, tile_bounds.h).intersection(settings::clip);
+        tile.stride = tile_bounds.w;
+        tile.data = tile_buffer;
+        debug("    : %d, %d (%d x %d)\n", tile.bounds.x, tile.bounds.y, tile.bounds.w, tile.bounds.h);
+
+        // if no intersection then skip tile
+        if(tile.bounds.empty()) {
+          debug("    : empty when clipped, skipping\n");
+          continue;
+        }
+
+        // clear existing tile data and nodes
+        memset(node_counts, 0, node_buffer_size * sizeof(unsigned));
+        memset(tile.data, 0, tile_buffer_size);
+
+        // build the nodes for each contour
+        for(const contour_t<T> &contour : contours) {
+          debug("    : build nodes for contour\n");
+          build_nodes(contour, tile, origin, scale);
+        }
+
+        debug("    : render the tile\n");
+        // render the tile
+        rect_t bounds;
+        render_nodes(tile, bounds);
+        if (bounds.empty()) {
+          continue;
+        }
+
+        tile.data += bounds.x + tile.stride * bounds.y;
+        tile.bounds.x += bounds.x;
+        tile.bounds.y += bounds.y;
+        tile.bounds.w = bounds.w;
+        tile.bounds.h = bounds.h;
+
+        settings::callback(tile);
+      }
+    }
+
+    interp_restore(interp1, &interp1_save);
+  }
+}
+
+template void pretty_poly::draw_polygon<int>(const std::vector<contour_t<int>>& contours, point_t<int> origin, int scale);
+template void pretty_poly::draw_polygon<float>(const std::vector<contour_t<float>>& contours, point_t<int> origin, int scale);
+template void pretty_poly::draw_polygon<uint8_t>(const std::vector<contour_t<uint8_t>>& contours, point_t<int> origin, int scale);
+template void pretty_poly::draw_polygon<int8_t>(const std::vector<contour_t<int8_t>>& contours, point_t<int> origin, int scale);

libraries/pico_vector/pretty_poly.hpp

@@ -0,0 +1,73 @@
+#pragma once
+#include <cstdint>
+#include <algorithm>
+#include <optional>
+#include <cstring>
+#include <new>
+#include <filesystem>
+#include <fstream>
+#include <functional>
+
+#include "pretty_poly_types.hpp"
+
+namespace pretty_poly {
+ 
+  class file_io {
+    private:
+      void *state;
+      size_t filesize = 0;
+  
+    public:
+      file_io(std::string_view path);
+      ~file_io();
+      size_t seek(size_t pos);
+      size_t read(void *buf, size_t len);
+      size_t tell();
+      bool fail();
+  };
+
+  // buffer that each tile is rendered into before callback
+  constexpr unsigned tile_buffer_size = 1024;
+
+  // polygon node buffer handles at most 16 line intersections per scanline
+  // is this enough for cjk/emoji? (requires a 2kB buffer)
+  constexpr unsigned node_buffer_size = 32;
+
+  typedef std::function<void(const tile_t &tile)> tile_callback_t;
+
+  // user settings
+  namespace settings {
+    extern rect_t clip;
+    extern tile_callback_t callback;
+    extern antialias_t antialias;
+  }
+
+  constexpr size_t buffer_size() {
+    return tile_buffer_size + (node_buffer_size * sizeof(unsigned)) + (node_buffer_size * 32 * sizeof(int));
+  }
+
+  constexpr size_t buffer_size();
+
+  void init(void *memory);
+
+  void set_options(tile_callback_t callback, antialias_t antialias, rect_t clip);
+
+  // dy step (returns 1, 0, or -1 if the supplied value is > 0, == 0, < 0)
+  inline constexpr int sign(int v);
+
+  // write out the tile bits
+  void debug_tile(const tile_t &tile);
+
+  void add_line_segment_to_nodes(const point_t<int> &start, const point_t<int> &end);
+
+  template<typename T>
+  void build_nodes(const contour_t<T> &contour, const tile_t &tile, point_t<int> origin = point_t<int>(0, 0), int scale = 65536);
+
+  void render_nodes(const tile_t &tile, rect_t &bounds);
+
+  template<typename T>
+  void draw_polygon(T *points, unsigned count);
+
+  template<typename T>
+  void draw_polygon(const std::vector<contour_t<T>>& contours, point_t<int> origin = point_t<int>(0, 0), int scale = 65536);
+}

libraries/pico_vector/pretty_poly_types.hpp

@@ -0,0 +1,162 @@
+#pragma once
+#include <cstdint>
+#include <math.h>
+#include <vector>
+
+#ifdef PP_DEBUG
+#define debug(...) printf(__VA_ARGS__)
+#else
+#define debug(...)
+#endif
+
+namespace pretty_poly {
+
+  enum antialias_t {NONE = 0, X4 = 1, X16 = 2};
+
+  // 3x3 matrix for coordinate transformations
+  struct mat3_t {
+    float v00 = 0.0f, v10 = 0.0f, v20 = 0.0f, v01 = 0.0f, v11 = 0.0f, v21 = 0.0f, v02 = 0.0f, v12 = 0.0f, v22 = 0.0f;
+    mat3_t() = default;
+    mat3_t(const mat3_t &m) = default;
+    inline mat3_t& operator*= (const mat3_t &m) {        
+      float r00 = this->v00 * m.v00 + this->v01 * m.v10 + this->v02 * m.v20;
+      float r01 = this->v00 * m.v01 + this->v01 * m.v11 + this->v02 * m.v21;
+      float r02 = this->v00 * m.v02 + this->v01 * m.v12 + this->v02 * m.v22;
+      float r10 = this->v10 * m.v00 + this->v11 * m.v10 + this->v12 * m.v20;
+      float r11 = this->v10 * m.v01 + this->v11 * m.v11 + this->v12 * m.v21;
+      float r12 = this->v10 * m.v02 + this->v11 * m.v12 + this->v12 * m.v22;
+      float r20 = this->v20 * m.v00 + this->v21 * m.v10 + this->v22 * m.v20;
+      float r21 = this->v20 * m.v01 + this->v21 * m.v11 + this->v22 * m.v21;
+      float r22 = this->v20 * m.v02 + this->v21 * m.v12 + this->v22 * m.v22;    
+      this->v00 = r00; this->v01 = r01; this->v02 = r02;
+      this->v10 = r10; this->v11 = r11; this->v12 = r12;
+      this->v20 = r20; this->v21 = r21; this->v22 = r22;
+      return *this;
+    }
+
+    static mat3_t identity() {mat3_t m; m.v00 = m.v11 = m.v22 = 1.0f; return m;}
+    static mat3_t rotation(float a) {
+      float c = cosf(a), s = sinf(a); mat3_t r = mat3_t::identity();
+      r.v00 = c; r.v01 = -s; r.v10 = s; r.v11 = c; return r;}
+    static mat3_t translation(float x, float y) {
+      mat3_t r = mat3_t::identity(); r.v02 = x; r.v12 = y; return r;}
+    static mat3_t scale(float x, float y) {
+      mat3_t r = mat3_t::identity(); r.v00 = x; r.v11 = y; return r;}
+  };
+
+  // 2x2 matrix for rotations and scales
+  struct mat2_t {
+    float v00 = 0.0f, v10 = 0.0f, v01 = 0.0f, v11 = 0.0f;
+    mat2_t() = default;
+    mat2_t(const mat2_t &m) = default;
+    inline mat2_t& operator*= (const mat2_t &m) {        
+      float r00 = this->v00 * m.v00 + this->v01 * m.v10;
+      float r01 = this->v00 * m.v01 + this->v01 * m.v11;
+      float r10 = this->v10 * m.v00 + this->v11 * m.v10;
+      float r11 = this->v10 * m.v01 + this->v11 * m.v11;
+      this->v00 = r00; this->v01 = r01;
+      this->v10 = r10; this->v11 = r11;
+      return *this;
+    }
+
+    static mat2_t identity() {mat2_t m; m.v00 = m.v11 = 1.0f; return m;}
+    static mat2_t rotation(float a) {
+      float c = cosf(a), s = sinf(a); mat2_t r;
+      r.v00 = c; r.v01 = -s; r.v10 = s; r.v11 = c; return r;}
+    static mat2_t scale(float x, float y) {
+      mat2_t r; r.v00 = x; r.v11 = y; return r;}
+  };
+
+  // point type for contour points
+  template<typename T = int>
+  struct __attribute__ ((packed)) point_t {
+    T x, y;
+    point_t(T x, T y) : x(x), y(y) {}
+    point_t() : x(0), y(0) {}
+    inline point_t& operator-= (const point_t &a) {x -= a.x; y -= a.y; return *this;}
+    inline point_t& operator+= (const point_t &a) {x += a.x; y += a.y; return *this;}
+    inline point_t& operator*= (const float a) {x *= a; y *= a; return *this;}
+    inline point_t& operator*= (const mat2_t &a) {this->transform(a); return *this;}
+    inline point_t& operator*= (const mat3_t &a) {this->transform(a); return *this;}
+    inline point_t& operator/= (const float a) {x /= a; y /= a; return *this;}
+    inline point_t& operator/= (const point_t &a) {x /= a.x; y /= a.y; return *this;}
+    void transform(const mat3_t &m) {
+      float tx = x, ty = y;
+      this->x = (m.v00 * tx + m.v01 * ty + m.v02);
+      this->y = (m.v10 * tx + m.v11 * ty + m.v12);
+    }
+    void transform(const mat2_t &m) {
+      float tx = x, ty = y;
+      this->x = (m.v00 * tx + m.v01 * ty);
+      this->y = (m.v10 * tx + m.v11 * ty);
+    }
+
+  };
+
+  template<typename T> inline point_t<T> operator-  (point_t<T> lhs, const point_t<T> &rhs) { lhs -= rhs; return lhs; }
+  template<typename T> inline point_t<T> operator-  (const point_t<T> &rhs) { return point_t<T>(-rhs.x, -rhs.y); }
+  template<typename T> inline point_t<T> operator+  (point_t<T> lhs, const point_t<T> &rhs) { lhs += rhs; return lhs; }
+  template<typename T> inline point_t<T> operator*  (point_t<T> lhs, const float rhs) { lhs *= rhs; return lhs; }
+  template<typename T> inline point_t<T> operator*  (point_t<T> lhs, const point_t<T> &rhs) { lhs *= rhs; return lhs; }
+  template<typename T> inline point_t<T> operator*  (point_t<T> lhs, const mat3_t &rhs) { lhs *= rhs; return lhs; }
+  template<typename T> inline point_t<T> operator/  (point_t<T> lhs, const float rhs) { lhs /= rhs; return lhs; }
+  template<typename T> inline point_t<T> operator/  (point_t<T> lhs, const point_t<T> &rhs) { lhs.x /= rhs.x; lhs.y /= rhs.y; return lhs; }
+
+
+  // rect type for bounds and clipping rectangles
+  struct rect_t {
+    int x, y, w, h;    
+    rect_t() : x(0), y(0), w(0), h(0) {}
+    rect_t(int x, int y, int w, int h) : x(x), y(y), w(w), h(h) {}
+    bool empty() const {return this->w == 0 || this->h == 0;}
+    rect_t intersection(const rect_t &c) {
+      return rect_t(std::max(this->x, c.x), std::max(this->y, c.y),
+        std::max(0, std::min(this->x + this->w, c.x + c.w) - std::max(this->x, c.x)),
+        std::max(0, std::min(this->y + this->h, c.y + c.h) - std::max(this->y, c.y)));
+    }
+    rect_t merge(const rect_t &c) {
+      return rect_t(std::min(this->x, c.x), std::min(this->y, c.y),
+        std::max(this->x + this->w, c.x + c.w) - std::min(this->x, c.x),
+        std::max(this->y + this->h, c.y + c.h) - std::min(this->y, c.y));
+    }
+  };
+
+  struct tile_t {
+    rect_t bounds;
+    unsigned stride;
+    uint8_t *data;
+
+    tile_t() {};
+
+    inline int get_value(int x, int y) const {
+      return this->data[x + y * this->stride];
+    }
+  };
+
+  template<typename T>
+  struct contour_t {
+    point_t<T> *points;
+    unsigned count;
+
+    contour_t() {}
+    contour_t(const std::vector<point_t<T>>& v) : points(v.data()), count(v.size()) {};
+    contour_t(point_t<T> *points, unsigned count) : points(points), count(count) {};
+
+    // TODO: Make this work, it's so much nicer to use auto point : contour
+    //point_t<T> *begin() const { return points; };
+    //point_t<T> *end() const { return points + count * sizeof(point_t<T>); };
+
+    rect_t bounds() const {
+      T minx = this->points[0].x, maxx = minx;
+      T miny = this->points[0].y, maxy = miny;
+      for(auto i = 1u; i < this->count; i++) {
+        minx = std::min(minx, this->points[i].x);
+        miny = std::min(miny, this->points[i].y);
+        maxx = std::max(maxx, this->points[i].x); 
+        maxy = std::max(maxy, this->points[i].y);
+      }
+      return rect_t(minx, miny, maxx - minx, maxy - miny);
+    }
+  };
+  
+}

libraries/pico_wireless/pico_wireless.cmake

@@ -1,4 +1,7 @@
-include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/esp32spi/esp32spi.cmake)
+if(NOT TARGET esp32spi)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/esp32spi/esp32spi.cmake)
+endif()
+
 add_library(pico_wireless INTERFACE)
 
 target_sources(pico_wireless INTERFACE

libraries/plasma2040/plasma2040.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET plasma)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/plasma/plasma.cmake)
+endif()
+
 add_library(plasma2040 INTERFACE)
 
 target_include_directories(plasma2040 INTERFACE ${CMAKE_CURRENT_LIST_DIR})

libraries/plasma_stick/plasma_stick.cmake

@@ -1,3 +1,7 @@
+if(NOT TARGET plasma)
+  include(${CMAKE_CURRENT_LIST_DIR}/../../drivers/plasma/plasma.cmake)
+endif()
+
 add_library(plasma_stick INTERFACE)
 
 target_include_directories(plasma_stick INTERFACE ${CMAKE_CURRENT_LIST_DIR})

libraries/pngdec/CMakeLists.txt

@@ -0,0 +1 @@
+include(pngdec.cmake)

libraries/pngdec/LICENSE

@@ -0,0 +1,204 @@
+Copyright 2020 BitBank Software, Inc.  All rights reserved.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

libraries/pngdec/PNGdec.cpp

@@ -0,0 +1,209 @@
+//
+// PNG Decoder
+//
+// written by Larry Bank
+// bitbank@pobox.com
+// Arduino port started 5/3/2021
+// Original PNG code written 20+ years ago :)
+// The goal of this code is to decode PNG images on embedded systems
+//
+// Copyright 2021 BitBank Software, Inc. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===========================================================================
+//
+#include "PNGdec.h"
+
+// forward references
+PNG_STATIC int PNGInit(PNGIMAGE *pPNG);
+PNG_STATIC int DecodePNG(PNGIMAGE *pImage, void *pUser, int iOptions);
+PNG_STATIC uint8_t PNGMakeMask(PNGDRAW *pDraw, uint8_t *pMask, uint8_t ucThreshold);
+// Include the C code which does the actual work
+#include "png.inl"
+
+//
+// Memory initialization
+//
+int PNG::openRAM(uint8_t *pData, int iDataSize, PNG_DRAW_CALLBACK *pfnDraw)
+{
+    memset(&_png, 0, sizeof(PNGIMAGE));
+    _png.ucMemType = PNG_MEM_RAM;
+    _png.pfnRead = readRAM;
+    _png.pfnSeek = seekMem;
+    _png.pfnDraw = pfnDraw;
+    _png.pfnOpen = NULL;
+    _png.pfnClose = NULL;
+    _png.PNGFile.iSize = iDataSize;
+    _png.PNGFile.pData = pData;
+    return PNGInit(&_png);
+} /* openRAM() */
+//
+// It's necessary to separate out a FLASH version on Harvard architecture machines
+//
+int PNG::openFLASH(uint8_t *pData, int iDataSize, PNG_DRAW_CALLBACK *pfnDraw)
+{
+    memset(&_png, 0, sizeof(PNGIMAGE));
+    _png.ucMemType = PNG_MEM_FLASH;
+    _png.pfnRead = readFLASH;
+    _png.pfnSeek = seekMem;
+    _png.pfnDraw = pfnDraw;
+    _png.pfnOpen = NULL;
+    _png.pfnClose = NULL;
+    _png.PNGFile.iSize = iDataSize;
+    _png.PNGFile.pData = pData;
+    return PNGInit(&_png);
+} /* openRAM() */
+
+//
+// File (SD/MMC) based initialization
+//
+int PNG::open(const char *szFilename, PNG_OPEN_CALLBACK *pfnOpen, PNG_CLOSE_CALLBACK *pfnClose, PNG_READ_CALLBACK *pfnRead, PNG_SEEK_CALLBACK *pfnSeek, PNG_DRAW_CALLBACK *pfnDraw)
+{
+    memset(&_png, 0, sizeof(PNGIMAGE));
+    _png.pfnRead = pfnRead;
+    _png.pfnSeek = pfnSeek;
+    _png.pfnDraw = pfnDraw;
+    _png.pfnOpen = pfnOpen;
+    _png.pfnClose = pfnClose;
+    _png.PNGFile.fHandle = (*pfnOpen)(szFilename, &_png.PNGFile.iSize);
+    if (_png.PNGFile.fHandle == NULL)
+       return 0;
+    return PNGInit(&_png);
+
+} /* open() */
+//
+// return the last error (if any)
+//
+int PNG::getLastError()
+{
+    return _png.iError;
+} /* getLastError() */
+//
+// Get the width of the image in pixels
+// can be called after opening the file (before decoding)
+//
+int PNG::getWidth()
+{
+    return _png.iWidth;
+} /* getWidth() */
+//
+// Get the height of the image in pixels
+// can be called after opening the file (before decoding)
+//
+int PNG::getHeight()
+{
+    return _png.iHeight;
+} /* getHeight() */
+//
+// For truecolor and palette images, it's possible to have a single
+// transparent color defined. This call will return it if defined
+//
+uint32_t PNG::getTransparentColor()
+{
+    return _png.iTransparent;
+} /* getTransparentColor() */
+//
+// Alpha information can be per pixel, per color or a single color
+// depending on the PNG pixel type of the image
+// This call simply tells you if there is alpha for the current pixel type
+//
+int PNG::hasAlpha()
+{
+    return _png.iHasAlpha;
+} /* hasAlpha() */
+//
+// Returns true or false for the use of Adam7 interlacing
+// This option is not supported by the decoder, but after opening the image
+// you can determine if it's set
+//
+int PNG::isInterlaced()
+{
+    return _png.iInterlaced;
+} /* isInterlaced() */
+
+//
+// Returns the number of bits per color stimulus
+// values of 1,2,4, and 8 are supported
+//
+int PNG::getBpp()
+{
+    return (int)_png.ucBpp;
+} /* getBpp() */
+//
+// Returns the PNG pixel type (see enum in PNGdec.h)
+//
+int PNG::getPixelType()
+{
+    return (int)_png.ucPixelType;
+} /* getPixelType() */
+//
+// Set the image buffer to memory managed by the caller
+// If set, decode() will not use the PNGDRAW callback function
+// and instead write the image into this buffer in one shot
+//
+void PNG::setBuffer(uint8_t *pBuffer)
+{
+    _png.pImage = pBuffer;
+} /* setBuffer() */
+//
+// Returns the previously set image buffer or NULL if there is none
+//
+uint8_t * PNG::getBuffer()
+{
+    return _png.pImage;
+} /* getBuffer() */
+//
+// Returns the size in bytes of the buffer needed to hold the uncompressed image
+//
+int PNG::getBufferSize()
+{
+    return _png.iHeight * _png.iPitch;
+} /* getBufferSize() */
+//
+// Returns a pointer to the palette
+// If there is alpha info for the palette, it starts at pPalette[768]
+//
+uint8_t * PNG::getPalette()
+{
+    return _png.ucPalette;
+} /* getPalette() */
+//
+// Close the file - not needed when decoding from memory
+//
+void PNG::close()
+{
+    if (_png.pfnClose)
+        (*_png.pfnClose)(_png.PNGFile.fHandle);
+} /* close() */
+
+//
+// Decode the image
+// returns:
+// 0 = PNG_SUCCESS
+// non 0 = PNG enumerated error code
+//
+int PNG::decode(void *pUser, int iOptions)
+{
+    return DecodePNG(&_png, pUser, iOptions);
+} /* decode() */
+//
+// Convert a line of native pixels (all supported formats) into RGB565
+// can optionally mix in a background color - set to -1 to disable
+// Background color is in the form of a uint32_t -> 00BBGGRR (MSB on left)
+//
+void PNG::getLineAsRGB565(PNGDRAW *pDraw, uint16_t *pPixels, int iEndianness, uint32_t u32Bkgd)
+{
+    PNGRGB565(pDraw, pPixels, iEndianness, u32Bkgd, hasAlpha());
+} /* getLineAsRGB565() */
+
+uint8_t PNG::getAlphaMask(PNGDRAW *pDraw, uint8_t *pMask, uint8_t ucThreshold)
+{
+    return PNGMakeMask(pDraw, pMask, ucThreshold);
+} /* getAlphaMask() */

libraries/pngdec/PNGdec.h

@@ -0,0 +1,218 @@
+//
+// PNG Decoder
+//
+// written by Larry Bank
+// bitbank@pobox.com
+// Arduino port started 5/3/2021
+// Original PNG code written 20+ years ago :)
+// The goal of this code is to decode PNG images on embedded systems
+//
+// Copyright 2021 BitBank Software, Inc. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===========================================================================
+//
+#ifndef __PNGDEC__
+#define __PNGDEC__
+//#if defined( __MACH__ ) || defined( __LINUX__ ) || defined( __MCUXPRESSO )
+#include <stdlib.h>
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+#ifndef PROGMEM
+#define memcpy_P memcpy
+#define PROGMEM
+#endif
+//#else
+//#include <Arduino.h>
+//#endif
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+//
+// PNG Decoder
+// Written by Larry Bank
+// Copyright (c) 2021 BitBank Software, Inc.
+// 
+// Designed to decode most PNG images (1-32 bpp)
+// using less than 40K of RAM
+//
+#ifndef FALSE
+#define FALSE 0
+#define TRUE 1
+#endif
+/* Defines and variables */
+#define PNG_FILE_BUF_SIZE 2048
+// Number of bytes to reserve for current and previous lines
+// Defaults to 640 32-bit pixels max width
+#define PNG_MAX_BUFFERED_PIXELS (640*4 + 1)
+// PNG filter type
+enum {
+    PNG_FILTER_NONE=0,
+    PNG_FILTER_SUB,
+    PNG_FILTER_UP,
+    PNG_FILTER_AVG,
+    PNG_FILTER_PAETH,
+    PNG_FILTER_COUNT
+};
+
+// decode options
+enum {
+    PNG_CHECK_CRC = 1,
+    PNG_FAST_PALETTE = 2
+};
+
+// source pixel type
+enum {
+  PNG_PIXEL_GRAYSCALE=0,
+    PNG_PIXEL_TRUECOLOR=2,
+    PNG_PIXEL_INDEXED=3,
+    PNG_PIXEL_GRAY_ALPHA=4,
+    PNG_PIXEL_TRUECOLOR_ALPHA=6
+};
+// RGB565 endianness
+enum {
+    PNG_RGB565_LITTLE_ENDIAN = 0,
+    PNG_RGB565_BIG_ENDIAN
+};
+
+enum {
+    PNG_MEM_RAM=0,
+    PNG_MEM_FLASH
+};
+
+// Error codes returned by getLastError()
+enum {
+    PNG_SUCCESS = 0,
+    PNG_INVALID_PARAMETER,
+    PNG_DECODE_ERROR,
+    PNG_MEM_ERROR,
+    PNG_NO_BUFFER,
+    PNG_UNSUPPORTED_FEATURE,
+    PNG_INVALID_FILE,
+    PNG_TOO_BIG
+};
+
+typedef struct png_draw_tag
+{
+    int y; // starting x,y of this line
+    int iWidth; // size of this line
+    int iPitch; // bytes per line
+    int iPixelType; // PNG pixel type (0,2,3,4,6)
+    int iBpp; // bits per color stimulus
+    int iHasAlpha; // flag indicating the presence of an alpha palette
+    void *pUser; // user supplied pointer
+    uint8_t *pPalette;
+    uint16_t *pFastPalette;
+    uint8_t *pPixels;
+} PNGDRAW;
+
+typedef struct png_file_tag
+{
+  int32_t iPos; // current file position
+  int32_t iSize; // file size
+  uint8_t *pData; // memory file pointer
+  void * fHandle; // class pointer to File/SdFat or whatever you want
+} PNGFILE;
+
+// Callback function prototypes
+typedef int32_t (PNG_READ_CALLBACK)(PNGFILE *pFile, uint8_t *pBuf, int32_t iLen);
+typedef int32_t (PNG_SEEK_CALLBACK)(PNGFILE *pFile, int32_t iPosition);
+typedef void * (PNG_OPEN_CALLBACK)(const char *szFilename, int32_t *pFileSize);
+typedef void (PNG_DRAW_CALLBACK)(PNGDRAW *);
+typedef void (PNG_CLOSE_CALLBACK)(void *pHandle);
+
+//
+// our private structure to hold a JPEG image decode state
+//
+typedef struct png_image_tag
+{
+    int iWidth, iHeight; // image size
+    uint8_t ucBpp, ucPixelType;
+    uint8_t ucMemType;
+    uint8_t *pImage;
+    int iPitch; // bytes per line
+    int iHasAlpha;
+    int iInterlaced;
+    uint32_t iTransparent; // transparent color index/value
+    int iError;
+    PNG_READ_CALLBACK *pfnRead;
+    PNG_SEEK_CALLBACK *pfnSeek;
+    PNG_OPEN_CALLBACK *pfnOpen;
+    PNG_DRAW_CALLBACK *pfnDraw;
+    PNG_CLOSE_CALLBACK *pfnClose;
+    PNGFILE PNGFile;
+    uint8_t ucZLIB[32768 + sizeof(inflate_state)]; // put this here to avoid needing malloc/free
+    uint8_t ucPalette[1024];
+    uint8_t ucPixels[PNG_MAX_BUFFERED_PIXELS * 2];
+    uint8_t ucFileBuf[PNG_FILE_BUF_SIZE]; // holds temp file data
+} PNGIMAGE;
+
+#ifdef __cplusplus
+#define PNG_STATIC static
+//
+// The PNG class wraps portable C code which does the actual work
+//
+class PNG
+{
+  public:
+    int openRAM(uint8_t *pData, int iDataSize, PNG_DRAW_CALLBACK *pfnDraw);
+    int openFLASH(uint8_t *pData, int iDataSize, PNG_DRAW_CALLBACK *pfnDraw);
+    int open(const char *szFilename, PNG_OPEN_CALLBACK *pfnOpen, PNG_CLOSE_CALLBACK *pfnClose, PNG_READ_CALLBACK *pfnRead, PNG_SEEK_CALLBACK *pfnSeek, PNG_DRAW_CALLBACK *pfnDraw);
+    void close();
+    int decode(void *pUser, int iOptions);
+    int getWidth();
+    int getHeight();
+    int getBpp();
+    int hasAlpha();
+    uint32_t getTransparentColor();
+    int isInterlaced();
+    uint8_t * getPalette();
+    int getPixelType();
+    int getLastError();
+    int getBufferSize();
+    uint8_t *getBuffer();
+    void setBuffer(uint8_t *pBuffer);
+    uint8_t getAlphaMask(PNGDRAW *pDraw, uint8_t *pMask, uint8_t ucThreshold);
+    void getLineAsRGB565(PNGDRAW *pDraw, uint16_t *pPixels, int iEndianness, uint32_t u32Bkgd);
+
+  private:
+    PNGIMAGE _png;
+};
+#else
+#define PNG_STATIC
+int PNG_openRAM(PNGIMAGE *pPNG, uint8_t *pData, int iDataSize);
+int PNG_openFile(PNGIMAGE *pPNG, const char *szFilename);
+int PNG_getWidth(PNGIMAGE *pPNG);
+int PNG_getHeight(PNGIMAGE *pPNG);
+int PNG_decode(PNGIMAGE *pPNG, void *pUser, int iOptions);
+void PNG_close(PNGIMAGE *pPNG);
+int PNG_getLastError(PNGIMAGE *pPNG);
+int PNG_getBpp(PNGIMAGE *pPNG);
+int PNG_getLastError(PNGIMAGE *pPNG);
+int PNG_getBufferSize(PNGIMAGE *pPNG);
+uint8_t *PNG_getPalette(PNGIMAGE *pPNG);
+int PNG_getPixelType(PNGIMAGE *pPNG);
+int PNG_hasAlpha(PNGIMAGE *pPNG);
+int PNG_isInterlaced(PNGIMAGE *pPNG);
+uint8_t *PNG_getBuffer(PNGIMAGE *pPNG);
+void PNG_setBuffer(PNGIMAGE *pPNG, uint8_t *pBuffer);
+#endif // __cplusplus
+
+// Due to unaligned memory causing an exception, we have to do these macros the slow way
+#define INTELSHORT(p) ((*p) + (*(p+1)<<8))
+#define INTELLONG(p) ((*p) + (*(p+1)<<8) + (*(p+2)<<16) + (*(p+3)<<24))
+#define MOTOSHORT(p) (((*(p))<<8) + (*(p+1)))
+#define MOTOLONG(p) (((*p)<<24) + ((*(p+1))<<16) + ((*(p+2))<<8) + (*(p+3)))
+
+// Must be a 32-bit target processor
+#define REGISTER_WIDTH 32
+
+#endif // __PNGDEC__

libraries/pngdec/adler32.c

@@ -0,0 +1,186 @@
+/* adler32.c -- compute the Adler-32 checksum of a data stream
+ * Copyright (C) 1995-2011, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* @(#) $Id$ */
+
+#include "zutil.h"
+
+local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
+
+#define BASE 65521U     /* largest prime smaller than 65536 */
+#define NMAX 5552
+/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
+
+#define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
+#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
+#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
+#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
+#define DO16(buf)   DO8(buf,0); DO8(buf,8);
+
+/* use NO_DIVIDE if your processor does not do division in hardware --
+   try it both ways to see which is faster */
+#ifdef NO_DIVIDE
+/* note that this assumes BASE is 65521, where 65536 % 65521 == 15
+   (thank you to John Reiser for pointing this out) */
+#  define CHOP(a) \
+    do { \
+        unsigned long tmp = a >> 16; \
+        a &= 0xffffUL; \
+        a += (tmp << 4) - tmp; \
+    } while (0)
+#  define MOD28(a) \
+    do { \
+        CHOP(a); \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#  define MOD(a) \
+    do { \
+        CHOP(a); \
+        MOD28(a); \
+    } while (0)
+#  define MOD63(a) \
+    do { /* this assumes a is not negative */ \
+        z_off64_t tmp = a >> 32; \
+        a &= 0xffffffffL; \
+        a += (tmp << 8) - (tmp << 5) + tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        tmp = a >> 16; \
+        a &= 0xffffL; \
+        a += (tmp << 4) - tmp; \
+        if (a >= BASE) a -= BASE; \
+    } while (0)
+#else
+#  define MOD(a) a %= BASE
+#  define MOD28(a) a %= BASE
+#  define MOD63(a) a %= BASE
+#endif
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_z(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    z_size_t len;
+{
+    unsigned long sum2;
+    unsigned n;
+
+    /* split Adler-32 into component sums */
+    sum2 = (adler >> 16) & 0xffff;
+    adler &= 0xffff;
+
+    /* in case user likes doing a byte at a time, keep it fast */
+    if (len == 1) {
+        adler += buf[0];
+        if (adler >= BASE)
+            adler -= BASE;
+        sum2 += adler;
+        if (sum2 >= BASE)
+            sum2 -= BASE;
+        return adler | (sum2 << 16);
+    }
+
+    /* initial Adler-32 value (deferred check for len == 1 speed) */
+    if (buf == Z_NULL)
+        return 1L;
+
+    /* in case short lengths are provided, keep it somewhat fast */
+    if (len < 16) {
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        if (adler >= BASE)
+            adler -= BASE;
+        MOD28(sum2);            /* only added so many BASE's */
+        return adler | (sum2 << 16);
+    }
+
+    /* do length NMAX blocks -- requires just one modulo operation */
+    while (len >= NMAX) {
+        len -= NMAX;
+        n = NMAX / 16;          /* NMAX is divisible by 16 */
+        do {
+            DO16(buf);          /* 16 sums unrolled */
+            buf += 16;
+        } while (--n);
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* do remaining bytes (less than NMAX, still just one modulo) */
+    if (len) {                  /* avoid modulos if none remaining */
+        while (len >= 16) {
+            len -= 16;
+            DO16(buf);
+            buf += 16;
+        }
+        while (len--) {
+            adler += *buf++;
+            sum2 += adler;
+        }
+        MOD(adler);
+        MOD(sum2);
+    }
+
+    /* return recombined sums */
+    return adler | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32(adler, buf, len)
+    uLong adler;
+    const Bytef *buf;
+    uInt len;
+{
+    return adler32_z(adler, buf, len);
+}
+
+/* ========================================================================= */
+local uLong adler32_combine_(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    unsigned long sum1;
+    unsigned long sum2;
+    unsigned rem;
+
+    /* for negative len, return invalid adler32 as a clue for debugging */
+    if (len2 < 0)
+        return 0xffffffffUL;
+
+    /* the derivation of this formula is left as an exercise for the reader */
+    MOD63(len2);                /* assumes len2 >= 0 */
+    rem = (unsigned)len2;
+    sum1 = adler1 & 0xffff;
+    sum2 = rem * sum1;
+    MOD(sum2);
+    sum1 += (adler2 & 0xffff) + BASE - 1;
+    sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum1 >= BASE) sum1 -= BASE;
+    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
+    if (sum2 >= BASE) sum2 -= BASE;
+    return sum1 | (sum2 << 16);
+}
+
+/* ========================================================================= */
+uLong ZEXPORT adler32_combine(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}
+
+uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
+    uLong adler1;
+    uLong adler2;
+    z_off64_t len2;
+{
+    return adler32_combine_(adler1, adler2, len2);
+}

libraries/pngdec/crc32.c

@@ -0,0 +1,442 @@
+/* crc32.c -- compute the CRC-32 of a data stream
+ * Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ *
+ * Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster
+ * CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing
+ * tables for updating the shift register in one step with three exclusive-ors
+ * instead of four steps with four exclusive-ors.  This results in about a
+ * factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.
+ */
+
+/* @(#) $Id$ */
+
+/*
+  Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore
+  protection on the static variables used to control the first-use generation
+  of the crc tables.  Therefore, if you #define DYNAMIC_CRC_TABLE, you should
+  first call get_crc_table() to initialize the tables before allowing more than
+  one thread to use crc32().
+
+  DYNAMIC_CRC_TABLE and MAKECRCH can be #defined to write out crc32.h.
+ */
+
+#ifdef MAKECRCH
+#  include <stdio.h>
+#  ifndef DYNAMIC_CRC_TABLE
+#    define DYNAMIC_CRC_TABLE
+#  endif /* !DYNAMIC_CRC_TABLE */
+#endif /* MAKECRCH */
+
+#include "zutil.h"      /* for STDC and FAR definitions */
+
+/* Definitions for doing the crc four data bytes at a time. */
+#if !defined(NOBYFOUR) && defined(Z_U4)
+#  define BYFOUR
+#endif
+#ifdef BYFOUR
+   local unsigned long crc32_little OF((unsigned long,
+                        const unsigned char FAR *, z_size_t));
+   local unsigned long crc32_big OF((unsigned long,
+                        const unsigned char FAR *, z_size_t));
+#  define TBLS 8
+#else
+#  define TBLS 1
+#endif /* BYFOUR */
+
+/* Local functions for crc concatenation */
+local unsigned long gf2_matrix_times OF((unsigned long *mat,
+                                         unsigned long vec));
+local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat));
+local uLong crc32_combine_ OF((uLong crc1, uLong crc2, z_off64_t len2));
+
+
+#ifdef DYNAMIC_CRC_TABLE
+
+local volatile int crc_table_empty = 1;
+local z_crc_t FAR crc_table[TBLS][256];
+local void make_crc_table OF((void));
+#ifdef MAKECRCH
+   local void write_table OF((FILE *, const z_crc_t FAR *));
+#endif /* MAKECRCH */
+/*
+  Generate tables for a byte-wise 32-bit CRC calculation on the polynomial:
+  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
+
+  Polynomials over GF(2) are represented in binary, one bit per coefficient,
+  with the lowest powers in the most significant bit.  Then adding polynomials
+  is just exclusive-or, and multiplying a polynomial by x is a right shift by
+  one.  If we call the above polynomial p, and represent a byte as the
+  polynomial q, also with the lowest power in the most significant bit (so the
+  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
+  where a mod b means the remainder after dividing a by b.
+
+  This calculation is done using the shift-register method of multiplying and
+  taking the remainder.  The register is initialized to zero, and for each
+  incoming bit, x^32 is added mod p to the register if the bit is a one (where
+  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
+  x (which is shifting right by one and adding x^32 mod p if the bit shifted
+  out is a one).  We start with the highest power (least significant bit) of
+  q and repeat for all eight bits of q.
+
+  The first table is simply the CRC of all possible eight bit values.  This is
+  all the information needed to generate CRCs on data a byte at a time for all
+  combinations of CRC register values and incoming bytes.  The remaining tables
+  allow for word-at-a-time CRC calculation for both big-endian and little-
+  endian machines, where a word is four bytes.
+*/
+local void make_crc_table()
+{
+    z_crc_t c;
+    int n, k;
+    z_crc_t poly;                       /* polynomial exclusive-or pattern */
+    /* terms of polynomial defining this crc (except x^32): */
+    static volatile int first = 1;      /* flag to limit concurrent making */
+    static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
+
+    /* See if another task is already doing this (not thread-safe, but better
+       than nothing -- significantly reduces duration of vulnerability in
+       case the advice about DYNAMIC_CRC_TABLE is ignored) */
+    if (first) {
+        first = 0;
+
+        /* make exclusive-or pattern from polynomial (0xedb88320UL) */
+        poly = 0;
+        for (n = 0; n < (int)(sizeof(p)/sizeof(unsigned char)); n++)
+            poly |= (z_crc_t)1 << (31 - p[n]);
+
+        /* generate a crc for every 8-bit value */
+        for (n = 0; n < 256; n++) {
+            c = (z_crc_t)n;
+            for (k = 0; k < 8; k++)
+                c = c & 1 ? poly ^ (c >> 1) : c >> 1;
+            crc_table[0][n] = c;
+        }
+
+#ifdef BYFOUR
+        /* generate crc for each value followed by one, two, and three zeros,
+           and then the byte reversal of those as well as the first table */
+        for (n = 0; n < 256; n++) {
+            c = crc_table[0][n];
+            crc_table[4][n] = ZSWAP32(c);
+            for (k = 1; k < 4; k++) {
+                c = crc_table[0][c & 0xff] ^ (c >> 8);
+                crc_table[k][n] = c;
+                crc_table[k + 4][n] = ZSWAP32(c);
+            }
+        }
+#endif /* BYFOUR */
+
+        crc_table_empty = 0;
+    }
+    else {      /* not first */
+        /* wait for the other guy to finish (not efficient, but rare) */
+        while (crc_table_empty)
+            ;
+    }
+
+#ifdef MAKECRCH
+    /* write out CRC tables to crc32.h */
+    {
+        FILE *out;
+
+        out = fopen("crc32.h", "w");
+        if (out == NULL) return;
+        fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n");
+        fprintf(out, " * Generated automatically by crc32.c\n */\n\n");
+        fprintf(out, "local const z_crc_t FAR ");
+        fprintf(out, "crc_table[TBLS][256] =\n{\n  {\n");
+        write_table(out, crc_table[0]);
+#  ifdef BYFOUR
+        fprintf(out, "#ifdef BYFOUR\n");
+        for (k = 1; k < 8; k++) {
+            fprintf(out, "  },\n  {\n");
+            write_table(out, crc_table[k]);
+        }
+        fprintf(out, "#endif\n");
+#  endif /* BYFOUR */
+        fprintf(out, "  }\n};\n");
+        fclose(out);
+    }
+#endif /* MAKECRCH */
+}
+
+#ifdef MAKECRCH
+local void write_table(out, table)
+    FILE *out;
+    const z_crc_t FAR *table;
+{
+    int n;
+
+    for (n = 0; n < 256; n++)
+        fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : "    ",
+                (unsigned long)(table[n]),
+                n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", "));
+}
+#endif /* MAKECRCH */
+
+#else /* !DYNAMIC_CRC_TABLE */
+/* ========================================================================
+ * Tables of CRC-32s of all single-byte values, made by make_crc_table().
+ */
+#include "crc32.h"
+#endif /* DYNAMIC_CRC_TABLE */
+
+/* =========================================================================
+ * This function can be used by asm versions of crc32()
+ */
+const z_crc_t FAR * ZEXPORT get_crc_table()
+{
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+    return (const z_crc_t FAR *)crc_table;
+}
+
+/* ========================================================================= */
+#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8)
+#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32_z(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    if (buf == Z_NULL) return 0UL;
+
+#ifdef DYNAMIC_CRC_TABLE
+    if (crc_table_empty)
+        make_crc_table();
+#endif /* DYNAMIC_CRC_TABLE */
+
+#ifdef BYFOUR
+    if (sizeof(void *) == sizeof(ptrdiff_t)) {
+        z_crc_t endian;
+
+        endian = 1;
+        if (*((unsigned char *)(&endian)))
+            return crc32_little(crc, buf, len);
+        else
+            return crc32_big(crc, buf, len);
+    }
+#endif /* BYFOUR */
+    crc = crc ^ 0xffffffffUL;
+    while (len >= 8) {
+        DO8;
+        len -= 8;
+    }
+    if (len) do {
+        DO1;
+    } while (--len);
+    return crc ^ 0xffffffffUL;
+}
+
+/* ========================================================================= */
+unsigned long ZEXPORT crc32(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    uInt len;
+{
+    return crc32_z(crc, buf, len);
+}
+
+#ifdef BYFOUR
+
+/*
+   This BYFOUR code accesses the passed unsigned char * buffer with a 32-bit
+   integer pointer type. This violates the strict aliasing rule, where a
+   compiler can assume, for optimization purposes, that two pointers to
+   fundamentally different types won't ever point to the same memory. This can
+   manifest as a problem only if one of the pointers is written to. This code
+   only reads from those pointers. So long as this code remains isolated in
+   this compilation unit, there won't be a problem. For this reason, this code
+   should not be copied and pasted into a compilation unit in which other code
+   writes to the buffer that is passed to these routines.
+ */
+
+/* ========================================================================= */
+#define DOLIT4 c ^= *buf4++; \
+        c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \
+            crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24]
+#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4
+
+/* ========================================================================= */
+local unsigned long crc32_little(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
+
+    c = (z_crc_t)crc;
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOLIT32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOLIT4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)c;
+}
+
+/* ========================================================================= */
+#define DOBIG4 c ^= *buf4++; \
+        c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \
+            crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24]
+#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4
+
+/* ========================================================================= */
+local unsigned long crc32_big(crc, buf, len)
+    unsigned long crc;
+    const unsigned char FAR *buf;
+    z_size_t len;
+{
+    register z_crc_t c;
+    register const z_crc_t FAR *buf4;
+
+    c = ZSWAP32((z_crc_t)crc);
+    c = ~c;
+    while (len && ((ptrdiff_t)buf & 3)) {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+        len--;
+    }
+
+    buf4 = (const z_crc_t FAR *)(const void FAR *)buf;
+    while (len >= 32) {
+        DOBIG32;
+        len -= 32;
+    }
+    while (len >= 4) {
+        DOBIG4;
+        len -= 4;
+    }
+    buf = (const unsigned char FAR *)buf4;
+
+    if (len) do {
+        c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8);
+    } while (--len);
+    c = ~c;
+    return (unsigned long)(ZSWAP32(c));
+}
+
+#endif /* BYFOUR */
+
+#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
+
+/* ========================================================================= */
+local unsigned long gf2_matrix_times(mat, vec)
+    unsigned long *mat;
+    unsigned long vec;
+{
+    unsigned long sum;
+
+    sum = 0;
+    while (vec) {
+        if (vec & 1)
+            sum ^= *mat;
+        vec >>= 1;
+        mat++;
+    }
+    return sum;
+}
+
+/* ========================================================================= */
+local void gf2_matrix_square(square, mat)
+    unsigned long *square;
+    unsigned long *mat;
+{
+    int n;
+
+    for (n = 0; n < GF2_DIM; n++)
+        square[n] = gf2_matrix_times(mat, mat[n]);
+}
+
+/* ========================================================================= */
+local uLong crc32_combine_(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    int n;
+    unsigned long row;
+    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
+    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
+
+    /* degenerate case (also disallow negative lengths) */
+    if (len2 <= 0)
+        return crc1;
+
+    /* put operator for one zero bit in odd */
+    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
+    row = 1;
+    for (n = 1; n < GF2_DIM; n++) {
+        odd[n] = row;
+        row <<= 1;
+    }
+
+    /* put operator for two zero bits in even */
+    gf2_matrix_square(even, odd);
+
+    /* put operator for four zero bits in odd */
+    gf2_matrix_square(odd, even);
+
+    /* apply len2 zeros to crc1 (first square will put the operator for one
+       zero byte, eight zero bits, in even) */
+    do {
+        /* apply zeros operator for this bit of len2 */
+        gf2_matrix_square(even, odd);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(even, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+        if (len2 == 0)
+            break;
+
+        /* another iteration of the loop with odd and even swapped */
+        gf2_matrix_square(odd, even);
+        if (len2 & 1)
+            crc1 = gf2_matrix_times(odd, crc1);
+        len2 >>= 1;
+
+        /* if no more bits set, then done */
+    } while (len2 != 0);
+
+    /* return combined crc */
+    crc1 ^= crc2;
+    return crc1;
+}
+
+/* ========================================================================= */
+uLong ZEXPORT crc32_combine(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}
+
+uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
+    uLong crc1;
+    uLong crc2;
+    z_off64_t len2;
+{
+    return crc32_combine_(crc1, crc2, len2);
+}

libraries/pngdec/crc32.h

@@ -0,0 +1,441 @@
+/* crc32.h -- tables for rapid CRC calculation
+ * Generated automatically by crc32.c
+ */
+
+local const z_crc_t FAR crc_table[TBLS][256] =
+{
+  {
+    0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL,
+    0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL,
+    0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL,
+    0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL,
+    0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL,
+    0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL,
+    0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL,
+    0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL,
+    0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL,
+    0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL,
+    0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL,
+    0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL,
+    0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL,
+    0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL,
+    0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL,
+    0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL,
+    0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL,
+    0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL,
+    0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL,
+    0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL,
+    0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL,
+    0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL,
+    0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL,
+    0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL,
+    0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL,
+    0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL,
+    0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL,
+    0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL,
+    0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL,
+    0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL,
+    0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL,
+    0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL,
+    0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL,
+    0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL,
+    0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL,
+    0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL,
+    0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL,
+    0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL,
+    0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL,
+    0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL,
+    0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL,
+    0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL,
+    0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL,
+    0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL,
+    0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL,
+    0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL,
+    0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL,
+    0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL,
+    0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL,
+    0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL,
+    0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL,
+    0x2d02ef8dUL
+#ifdef BYFOUR
+  },
+  {
+    0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL,
+    0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL,
+    0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL,
+    0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL,
+    0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL,
+    0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL,
+    0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL,
+    0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL,
+    0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL,
+    0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL,
+    0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL,
+    0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL,
+    0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL,
+    0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL,
+    0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL,
+    0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL,
+    0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL,
+    0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL,
+    0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL,
+    0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL,
+    0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL,
+    0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL,
+    0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL,
+    0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL,
+    0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL,
+    0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL,
+    0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL,
+    0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL,
+    0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL,
+    0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL,
+    0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL,
+    0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL,
+    0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL,
+    0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL,
+    0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL,
+    0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL,
+    0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL,
+    0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL,
+    0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL,
+    0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL,
+    0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL,
+    0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL,
+    0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL,
+    0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL,
+    0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL,
+    0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL,
+    0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL,
+    0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL,
+    0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL,
+    0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL,
+    0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL,
+    0x9324fd72UL
+  },
+  {
+    0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL,
+    0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL,
+    0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL,
+    0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL,
+    0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL,
+    0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL,
+    0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL,
+    0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL,
+    0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL,
+    0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL,
+    0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL,
+    0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL,
+    0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL,
+    0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL,
+    0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL,
+    0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL,
+    0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL,
+    0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL,
+    0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL,
+    0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL,
+    0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL,
+    0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL,
+    0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL,
+    0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL,
+    0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL,
+    0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL,
+    0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL,
+    0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL,
+    0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL,
+    0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL,
+    0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL,
+    0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL,
+    0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL,
+    0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL,
+    0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL,
+    0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL,
+    0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL,
+    0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL,
+    0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL,
+    0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL,
+    0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL,
+    0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL,
+    0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL,
+    0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL,
+    0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL,
+    0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL,
+    0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL,
+    0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL,
+    0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL,
+    0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL,
+    0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL,
+    0xbe9834edUL
+  },
+  {
+    0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL,
+    0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL,
+    0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL,
+    0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL,
+    0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL,
+    0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL,
+    0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL,
+    0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL,
+    0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL,
+    0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL,
+    0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL,
+    0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL,
+    0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL,
+    0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL,
+    0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL,
+    0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL,
+    0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL,
+    0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL,
+    0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL,
+    0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL,
+    0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL,
+    0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL,
+    0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL,
+    0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL,
+    0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL,
+    0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL,
+    0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL,
+    0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL,
+    0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL,
+    0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL,
+    0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL,
+    0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL,
+    0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL,
+    0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL,
+    0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL,
+    0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL,
+    0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL,
+    0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL,
+    0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL,
+    0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL,
+    0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL,
+    0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL,
+    0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL,
+    0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL,
+    0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL,
+    0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL,
+    0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL,
+    0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL,
+    0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL,
+    0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL,
+    0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL,
+    0xde0506f1UL
+  },
+  {
+    0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL,
+    0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL,
+    0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL,
+    0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL,
+    0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL,
+    0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL,
+    0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL,
+    0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL,
+    0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL,
+    0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL,
+    0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL,
+    0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL,
+    0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL,
+    0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL,
+    0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL,
+    0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL,
+    0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL,
+    0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL,
+    0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL,
+    0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL,
+    0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL,
+    0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL,
+    0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL,
+    0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL,
+    0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL,
+    0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL,
+    0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL,
+    0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL,
+    0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL,
+    0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL,
+    0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL,
+    0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL,
+    0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL,
+    0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL,
+    0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL,
+    0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL,
+    0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL,
+    0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL,
+    0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL,
+    0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL,
+    0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL,
+    0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL,
+    0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL,
+    0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL,
+    0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL,
+    0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL,
+    0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL,
+    0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL,
+    0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL,
+    0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL,
+    0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL,
+    0x8def022dUL
+  },
+  {
+    0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL,
+    0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL,
+    0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL,
+    0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL,
+    0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL,
+    0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL,
+    0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL,
+    0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL,
+    0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL,
+    0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL,
+    0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL,
+    0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL,
+    0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL,
+    0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL,
+    0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL,
+    0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL,
+    0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL,
+    0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL,
+    0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL,
+    0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL,
+    0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL,
+    0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL,
+    0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL,
+    0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL,
+    0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL,
+    0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL,
+    0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL,
+    0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL,
+    0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL,
+    0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL,
+    0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL,
+    0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL,
+    0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL,
+    0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL,
+    0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL,
+    0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL,
+    0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL,
+    0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL,
+    0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL,
+    0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL,
+    0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL,
+    0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL,
+    0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL,
+    0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL,
+    0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL,
+    0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL,
+    0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL,
+    0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL,
+    0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL,
+    0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL,
+    0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL,
+    0x72fd2493UL
+  },
+  {
+    0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL,
+    0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL,
+    0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL,
+    0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL,
+    0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL,
+    0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL,
+    0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL,
+    0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL,
+    0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL,
+    0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL,
+    0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL,
+    0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL,
+    0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL,
+    0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL,
+    0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL,
+    0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL,
+    0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL,
+    0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL,
+    0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL,
+    0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL,
+    0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL,
+    0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL,
+    0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL,
+    0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL,
+    0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL,
+    0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL,
+    0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL,
+    0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL,
+    0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL,
+    0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL,
+    0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL,
+    0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL,
+    0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL,
+    0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL,
+    0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL,
+    0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL,
+    0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL,
+    0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL,
+    0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL,
+    0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL,
+    0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL,
+    0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL,
+    0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL,
+    0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL,
+    0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL,
+    0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL,
+    0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL,
+    0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL,
+    0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL,
+    0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL,
+    0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL,
+    0xed3498beUL
+  },
+  {
+    0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL,
+    0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL,
+    0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL,
+    0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL,
+    0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL,
+    0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL,
+    0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL,
+    0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL,
+    0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL,
+    0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL,
+    0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL,
+    0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL,
+    0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL,
+    0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL,
+    0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL,
+    0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL,
+    0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL,
+    0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL,
+    0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL,
+    0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL,
+    0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL,
+    0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL,
+    0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL,
+    0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL,
+    0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL,
+    0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL,
+    0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL,
+    0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL,
+    0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL,
+    0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL,
+    0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL,
+    0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL,
+    0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL,
+    0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL,
+    0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL,
+    0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL,
+    0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL,
+    0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL,
+    0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL,
+    0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL,
+    0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL,
+    0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL,
+    0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL,
+    0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL,
+    0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL,
+    0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL,
+    0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL,
+    0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL,
+    0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL,
+    0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL,
+    0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL,
+    0xf10605deUL
+#endif
+  }
+};

libraries/pngdec/infback.c

@@ -0,0 +1,640 @@
+/* infback.c -- inflate using a call-back interface
+ * Copyright (C) 1995-2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/*
+   This code is largely copied from inflate.c.  Normally either infback.o or
+   inflate.o would be linked into an application--not both.  The interface
+   with inffast.c is retained so that optimized assembler-coded versions of
+   inflate_fast() can be used with either inflate.c or infback.c.
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+/* function prototypes */
+local void fixedtables OF((struct inflate_state FAR *state));
+
+/*
+   strm provides memory allocation functions in zalloc and zfree, or
+   Z_NULL to use the library memory allocation functions.
+
+   windowBits is in the range 8..15, and window is a user-supplied
+   window and output buffer that is 2**windowBits bytes.
+ */
+int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
+z_streamp strm;
+int windowBits;
+unsigned char FAR *window;
+const char *version;
+int stream_size;
+{
+    struct inflate_state FAR *state;
+
+    if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
+        stream_size != (int)(sizeof(z_stream)))
+        return Z_VERSION_ERROR;
+    if (strm == Z_NULL || window == Z_NULL ||
+        windowBits < 8 || windowBits > 15)
+        return Z_STREAM_ERROR;
+    strm->msg = Z_NULL;                 /* in case we return an error */
+    if (strm->zalloc == (alloc_func)0) {
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+        strm->zalloc = zcalloc;
+        strm->opaque = (voidpf)0;
+#endif
+    }
+    if (strm->zfree == (free_func)0)
+#ifdef Z_SOLO
+        return Z_STREAM_ERROR;
+#else
+    strm->zfree = zcfree;
+#endif
+    state = (struct inflate_state FAR *)ZALLOC(strm, 1,
+                                               sizeof(struct inflate_state));
+    if (state == Z_NULL) return Z_MEM_ERROR;
+    Tracev((stderr, "inflate: allocated\n"));
+    strm->state = (struct internal_state FAR *)state;
+    state->dmax = 32768U;
+    state->wbits = (uInt)windowBits;
+    state->wsize = 1U << windowBits;
+    state->window = window;
+    state->wnext = 0;
+    state->whave = 0;
+    return Z_OK;
+}
+
+/*
+   Return state with length and distance decoding tables and index sizes set to
+   fixed code decoding.  Normally this returns fixed tables from inffixed.h.
+   If BUILDFIXED is defined, then instead this routine builds the tables the
+   first time it's called, and returns those tables the first time and
+   thereafter.  This reduces the size of the code by about 2K bytes, in
+   exchange for a little execution time.  However, BUILDFIXED should not be
+   used for threaded applications, since the rewriting of the tables and virgin
+   may not be thread-safe.
+ */
+local void fixedtables(state)
+struct inflate_state FAR *state;
+{
+#ifdef BUILDFIXED
+    static int virgin = 1;
+    static code *lenfix, *distfix;
+    static code fixed[544];
+
+    /* build fixed huffman tables if first call (may not be thread safe) */
+    if (virgin) {
+        unsigned sym, bits;
+        static code *next;
+
+        /* literal/length table */
+        sym = 0;
+        while (sym < 144) state->lens[sym++] = 8;
+        while (sym < 256) state->lens[sym++] = 9;
+        while (sym < 280) state->lens[sym++] = 7;
+        while (sym < 288) state->lens[sym++] = 8;
+        next = fixed;
+        lenfix = next;
+        bits = 9;
+        inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
+
+        /* distance table */
+        sym = 0;
+        while (sym < 32) state->lens[sym++] = 5;
+        distfix = next;
+        bits = 5;
+        inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
+
+        /* do this just once */
+        virgin = 0;
+    }
+#else /* !BUILDFIXED */
+#   include "inffixed.h"
+#endif /* BUILDFIXED */
+    state->lencode = lenfix;
+    state->lenbits = 9;
+    state->distcode = distfix;
+    state->distbits = 5;
+}
+
+/* Macros for inflateBack(): */
+
+/* Load returned state from inflate_fast() */
+#define LOAD() \
+    do { \
+        put = strm->next_out; \
+        left = strm->avail_out; \
+        next = strm->next_in; \
+        have = strm->avail_in; \
+        hold = state->hold; \
+        bits = state->bits; \
+    } while (0)
+
+/* Set state from registers for inflate_fast() */
+#define RESTORE() \
+    do { \
+        strm->next_out = put; \
+        strm->avail_out = left; \
+        strm->next_in = next; \
+        strm->avail_in = have; \
+        state->hold = hold; \
+        state->bits = bits; \
+    } while (0)
+
+/* Clear the input bit accumulator */
+#define INITBITS() \
+    do { \
+        hold = 0; \
+        bits = 0; \
+    } while (0)
+
+/* Assure that some input is available.  If input is requested, but denied,
+   then return a Z_BUF_ERROR from inflateBack(). */
+#define PULL() \
+    do { \
+        if (have == 0) { \
+            have = in(in_desc, &next); \
+            if (have == 0) { \
+                next = Z_NULL; \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/* Get a byte of input into the bit accumulator, or return from inflateBack()
+   with an error if there is no input available. */
+#define PULLBYTE() \
+    do { \
+        PULL(); \
+        have--; \
+        hold += (unsigned long)(*next++) << bits; \
+        bits += 8; \
+    } while (0)
+
+/* Assure that there are at least n bits in the bit accumulator.  If there is
+   not enough available input to do that, then return from inflateBack() with
+   an error. */
+#define NEEDBITS(n) \
+    do { \
+        while (bits < (unsigned)(n)) \
+            PULLBYTE(); \
+    } while (0)
+
+/* Return the low n bits of the bit accumulator (n < 16) */
+#define BITS(n) \
+    ((unsigned)hold & ((1U << (n)) - 1))
+
+/* Remove n bits from the bit accumulator */
+#define DROPBITS(n) \
+    do { \
+        hold >>= (n); \
+        bits -= (unsigned)(n); \
+    } while (0)
+
+/* Remove zero to seven bits as needed to go to a byte boundary */
+#define BYTEBITS() \
+    do { \
+        hold >>= bits & 7; \
+        bits -= bits & 7; \
+    } while (0)
+
+/* Assure that some output space is available, by writing out the window
+   if it's full.  If the write fails, return from inflateBack() with a
+   Z_BUF_ERROR. */
+#define ROOM() \
+    do { \
+        if (left == 0) { \
+            put = state->window; \
+            left = state->wsize; \
+            state->whave = left; \
+            if (out(out_desc, put, left)) { \
+                ret = Z_BUF_ERROR; \
+                goto inf_leave; \
+            } \
+        } \
+    } while (0)
+
+/*
+   strm provides the memory allocation functions and window buffer on input,
+   and provides information on the unused input on return.  For Z_DATA_ERROR
+   returns, strm will also provide an error message.
+
+   in() and out() are the call-back input and output functions.  When
+   inflateBack() needs more input, it calls in().  When inflateBack() has
+   filled the window with output, or when it completes with data in the
+   window, it calls out() to write out the data.  The application must not
+   change the provided input until in() is called again or inflateBack()
+   returns.  The application must not change the window/output buffer until
+   inflateBack() returns.
+
+   in() and out() are called with a descriptor parameter provided in the
+   inflateBack() call.  This parameter can be a structure that provides the
+   information required to do the read or write, as well as accumulated
+   information on the input and output such as totals and check values.
+
+   in() should return zero on failure.  out() should return non-zero on
+   failure.  If either in() or out() fails, than inflateBack() returns a
+   Z_BUF_ERROR.  strm->next_in can be checked for Z_NULL to see whether it
+   was in() or out() that caused in the error.  Otherwise,  inflateBack()
+   returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
+   error, or Z_MEM_ERROR if it could not allocate memory for the state.
+   inflateBack() can also return Z_STREAM_ERROR if the input parameters
+   are not correct, i.e. strm is Z_NULL or the state was not initialized.
+ */
+int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
+z_streamp strm;
+in_func in;
+void FAR *in_desc;
+out_func out;
+void FAR *out_desc;
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *next;    /* next input */
+    unsigned char FAR *put;     /* next output */
+    unsigned have, left;        /* available input and output */
+    unsigned long hold;         /* bit buffer */
+    unsigned bits;              /* bits in bit buffer */
+    unsigned copy;              /* number of stored or match bytes to copy */
+    unsigned char FAR *from;    /* where to copy match bytes from */
+    code here;                  /* current decoding table entry */
+    code last;                  /* parent table entry */
+    unsigned len;               /* length to copy for repeats, bits to drop */
+    int ret;                    /* return code */
+    static const unsigned short order[19] = /* permutation of code lengths */
+        {16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
+
+    /* Check that the strm exists and that the state was initialized */
+    if (strm == Z_NULL || strm->state == Z_NULL)
+        return Z_STREAM_ERROR;
+    state = (struct inflate_state FAR *)strm->state;
+
+    /* Reset the state */
+    strm->msg = Z_NULL;
+    state->mode = TYPE;
+    state->last = 0;
+    state->whave = 0;
+    next = strm->next_in;
+    have = next != Z_NULL ? strm->avail_in : 0;
+    hold = 0;
+    bits = 0;
+    put = state->window;
+    left = state->wsize;
+
+    /* Inflate until end of block marked as last */
+    for (;;)
+        switch (state->mode) {
+        case TYPE:
+            /* determine and dispatch block type */
+            if (state->last) {
+                BYTEBITS();
+                state->mode = DONE;
+                break;
+            }
+            NEEDBITS(3);
+            state->last = BITS(1);
+            DROPBITS(1);
+            switch (BITS(2)) {
+            case 0:                             /* stored block */
+                Tracev((stderr, "inflate:     stored block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = STORED;
+                break;
+            case 1:                             /* fixed block */
+                fixedtables(state);
+                Tracev((stderr, "inflate:     fixed codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = LEN;              /* decode codes */
+                break;
+            case 2:                             /* dynamic block */
+                Tracev((stderr, "inflate:     dynamic codes block%s\n",
+                        state->last ? " (last)" : ""));
+                state->mode = TABLE;
+                break;
+            case 3:
+                strm->msg = (char *)"invalid block type";
+                state->mode = BAD;
+            }
+            DROPBITS(2);
+            break;
+
+        case STORED:
+            /* get and verify stored block length */
+            BYTEBITS();                         /* go to byte boundary */
+            NEEDBITS(32);
+            if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
+                strm->msg = (char *)"invalid stored block lengths";
+                state->mode = BAD;
+                break;
+            }
+            state->length = (unsigned)hold & 0xffff;
+            Tracev((stderr, "inflate:       stored length %u\n",
+                    state->length));
+            INITBITS();
+
+            /* copy stored block from input to output */
+            while (state->length != 0) {
+                copy = state->length;
+                PULL();
+                ROOM();
+                if (copy > have) copy = have;
+                if (copy > left) copy = left;
+                zmemcpy(put, next, copy);
+                have -= copy;
+                next += copy;
+                left -= copy;
+                put += copy;
+                state->length -= copy;
+            }
+            Tracev((stderr, "inflate:       stored end\n"));
+            state->mode = TYPE;
+            break;
+
+        case TABLE:
+            /* get dynamic table entries descriptor */
+            NEEDBITS(14);
+            state->nlen = BITS(5) + 257;
+            DROPBITS(5);
+            state->ndist = BITS(5) + 1;
+            DROPBITS(5);
+            state->ncode = BITS(4) + 4;
+            DROPBITS(4);
+#ifndef PKZIP_BUG_WORKAROUND
+            if (state->nlen > 286 || state->ndist > 30) {
+                strm->msg = (char *)"too many length or distance symbols";
+                state->mode = BAD;
+                break;
+            }
+#endif
+            Tracev((stderr, "inflate:       table sizes ok\n"));
+
+            /* get code length code lengths (not a typo) */
+            state->have = 0;
+            while (state->have < state->ncode) {
+                NEEDBITS(3);
+                state->lens[order[state->have++]] = (unsigned short)BITS(3);
+                DROPBITS(3);
+            }
+            while (state->have < 19)
+                state->lens[order[state->have++]] = 0;
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 7;
+            ret = inflate_table(CODES, state->lens, 19, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid code lengths set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       code lengths ok\n"));
+
+            /* get length and distance code code lengths */
+            state->have = 0;
+            while (state->have < state->nlen + state->ndist) {
+                for (;;) {
+                    here = state->lencode[BITS(state->lenbits)];
+                    if ((unsigned)(here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                if (here.val < 16) {
+                    DROPBITS(here.bits);
+                    state->lens[state->have++] = here.val;
+                }
+                else {
+                    if (here.val == 16) {
+                        NEEDBITS(here.bits + 2);
+                        DROPBITS(here.bits);
+                        if (state->have == 0) {
+                            strm->msg = (char *)"invalid bit length repeat";
+                            state->mode = BAD;
+                            break;
+                        }
+                        len = (unsigned)(state->lens[state->have - 1]);
+                        copy = 3 + BITS(2);
+                        DROPBITS(2);
+                    }
+                    else if (here.val == 17) {
+                        NEEDBITS(here.bits + 3);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 3 + BITS(3);
+                        DROPBITS(3);
+                    }
+                    else {
+                        NEEDBITS(here.bits + 7);
+                        DROPBITS(here.bits);
+                        len = 0;
+                        copy = 11 + BITS(7);
+                        DROPBITS(7);
+                    }
+                    if (state->have + copy > state->nlen + state->ndist) {
+                        strm->msg = (char *)"invalid bit length repeat";
+                        state->mode = BAD;
+                        break;
+                    }
+                    while (copy--)
+                        state->lens[state->have++] = (unsigned short)len;
+                }
+            }
+
+            /* handle error breaks in while */
+            if (state->mode == BAD) break;
+
+            /* check for end-of-block code (better have one) */
+            if (state->lens[256] == 0) {
+                strm->msg = (char *)"invalid code -- missing end-of-block";
+                state->mode = BAD;
+                break;
+            }
+
+            /* build code tables -- note: do not change the lenbits or distbits
+               values here (9 and 6) without reading the comments in inftrees.h
+               concerning the ENOUGH constants, which depend on those values */
+            state->next = state->codes;
+            state->lencode = (code const FAR *)(state->next);
+            state->lenbits = 9;
+            ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
+                                &(state->lenbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid literal/lengths set";
+                state->mode = BAD;
+                break;
+            }
+            state->distcode = (code const FAR *)(state->next);
+            state->distbits = 6;
+            ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
+                            &(state->next), &(state->distbits), state->work);
+            if (ret) {
+                strm->msg = (char *)"invalid distances set";
+                state->mode = BAD;
+                break;
+            }
+            Tracev((stderr, "inflate:       codes ok\n"));
+            state->mode = LEN;
+
+        case LEN:
+            /* use inflate_fast() if we have enough input and output */
+            if (have >= 6 && left >= 258) {
+                RESTORE();
+                if (state->whave < state->wsize)
+                    state->whave = state->wsize - left;
+                inflate_fast(strm, state->wsize);
+                LOAD();
+                break;
+            }
+
+            /* get a literal, length, or end-of-block code */
+            for (;;) {
+                here = state->lencode[BITS(state->lenbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if (here.op && (here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->lencode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            state->length = (unsigned)here.val;
+
+            /* process literal */
+            if (here.op == 0) {
+                Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                        "inflate:         literal '%c'\n" :
+                        "inflate:         literal 0x%02x\n", here.val));
+                ROOM();
+                *put++ = (unsigned char)(state->length);
+                left--;
+                state->mode = LEN;
+                break;
+            }
+
+            /* process end of block */
+            if (here.op & 32) {
+                Tracevv((stderr, "inflate:         end of block\n"));
+                state->mode = TYPE;
+                break;
+            }
+
+            /* invalid code */
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid literal/length code";
+                state->mode = BAD;
+                break;
+            }
+
+            /* length code -- get extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->length += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            Tracevv((stderr, "inflate:         length %u\n", state->length));
+
+            /* get distance code */
+            for (;;) {
+                here = state->distcode[BITS(state->distbits)];
+                if ((unsigned)(here.bits) <= bits) break;
+                PULLBYTE();
+            }
+            if ((here.op & 0xf0) == 0) {
+                last = here;
+                for (;;) {
+                    here = state->distcode[last.val +
+                            (BITS(last.bits + last.op) >> last.bits)];
+                    if ((unsigned)(last.bits + here.bits) <= bits) break;
+                    PULLBYTE();
+                }
+                DROPBITS(last.bits);
+            }
+            DROPBITS(here.bits);
+            if (here.op & 64) {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+            state->offset = (unsigned)here.val;
+
+            /* get distance extra bits, if any */
+            state->extra = (unsigned)(here.op) & 15;
+            if (state->extra != 0) {
+                NEEDBITS(state->extra);
+                state->offset += BITS(state->extra);
+                DROPBITS(state->extra);
+            }
+            if (state->offset > state->wsize - (state->whave < state->wsize ?
+                                                left : 0)) {
+                strm->msg = (char *)"invalid distance too far back";
+                state->mode = BAD;
+                break;
+            }
+            Tracevv((stderr, "inflate:         distance %u\n", state->offset));
+
+            /* copy match from window to output */
+            do {
+                ROOM();
+                copy = state->wsize - state->offset;
+                if (copy < left) {
+                    from = put + copy;
+                    copy = left - copy;
+                }
+                else {
+                    from = put - state->offset;
+                    copy = left;
+                }
+                if (copy > state->length) copy = state->length;
+                state->length -= copy;
+                left -= copy;
+                do {
+                    *put++ = *from++;
+                } while (--copy);
+            } while (state->length != 0);
+            break;
+
+        case DONE:
+            /* inflate stream terminated properly -- write leftover output */
+            ret = Z_STREAM_END;
+            if (left < state->wsize) {
+                if (out(out_desc, state->window, state->wsize - left))
+                    ret = Z_BUF_ERROR;
+            }
+            goto inf_leave;
+
+        case BAD:
+            ret = Z_DATA_ERROR;
+            goto inf_leave;
+
+        default:                /* can't happen, but makes compilers happy */
+            ret = Z_STREAM_ERROR;
+            goto inf_leave;
+        }
+
+    /* Return unused input */
+  inf_leave:
+    strm->next_in = next;
+    strm->avail_in = have;
+    return ret;
+}
+
+int ZEXPORT inflateBackEnd(strm)
+z_streamp strm;
+{
+    if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
+        return Z_STREAM_ERROR;
+    ZFREE(strm, strm->state);
+    strm->state = Z_NULL;
+    Tracev((stderr, "inflate: end\n"));
+    return Z_OK;
+}

libraries/pngdec/inffast.c

@@ -0,0 +1,343 @@
+/* inffast.c -- fast decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+#include "inflate.h"
+#include "inffast.h"
+
+#ifdef ASMINF
+#  pragma message("Assembler code may have bugs -- use at your own risk")
+#else
+
+/*
+   Decode literal, length, and distance codes and write out the resulting
+   literal and match bytes until either not enough input or output is
+   available, an end-of-block is encountered, or a data error is encountered.
+   When large enough input and output buffers are supplied to inflate(), for
+   example, a 16K input buffer and a 64K output buffer, more than 95% of the
+   inflate execution time is spent in this routine.
+
+   Entry assumptions:
+
+        state->mode == LEN
+        strm->avail_in >= 6
+        strm->avail_out >= 258
+        start >= strm->avail_out
+        state->bits < 8
+
+   On return, state->mode is one of:
+
+        LEN -- ran out of enough output space or enough available input
+        TYPE -- reached end of block code, inflate() to interpret next block
+        BAD -- error in block data
+
+   Notes:
+
+    - The maximum input bits used by a length/distance pair is 15 bits for the
+      length code, 5 bits for the length extra, 15 bits for the distance code,
+      and 13 bits for the distance extra.  This totals 48 bits, or six bytes.
+      Therefore if strm->avail_in >= 6, then there is enough input to avoid
+      checking for available input while decoding.
+
+    - The maximum bytes that a single length/distance pair can output is 258
+      bytes, which is the maximum length that can be coded.  inflate_fast()
+      requires strm->avail_out >= 258 for each loop to avoid checking for
+      output space.
+ */
+void ZLIB_INTERNAL inflate_fast(strm, start)
+z_streamp strm;
+unsigned start;         /* inflate()'s starting value for strm->avail_out */
+{
+    struct inflate_state FAR *state;
+    z_const unsigned char FAR *in;      /* local strm->next_in */
+    z_const unsigned char FAR *last;    /* have enough input while in < last */
+    unsigned char FAR *out;     /* local strm->next_out */
+    unsigned char FAR *beg;     /* inflate()'s initial strm->next_out */
+    unsigned char FAR *end;     /* while out < end, enough space available */
+#ifdef INFLATE_STRICT
+    unsigned dmax;              /* maximum distance from zlib header */
+#endif
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if wsize != 0 */
+    unsigned long hold;         /* local strm->hold */
+    unsigned bits;              /* local strm->bits */
+    code const FAR *lcode;      /* local strm->lencode */
+    code const FAR *dcode;      /* local strm->distcode */
+    unsigned lmask;             /* mask for first level of length codes */
+    unsigned dmask;             /* mask for first level of distance codes */
+    code here;                  /* retrieved table entry */
+    unsigned op;                /* code bits, operation, extra bits, or */
+                                /*  window position, window bytes to copy */
+    unsigned len;               /* match length, unused bytes */
+    unsigned dist;              /* match distance */
+    unsigned char FAR *from;    /* where to copy match from */
+
+    /* copy state to local variables */
+    state = (struct inflate_state FAR *)strm->state;
+    in = strm->next_in;
+    last = in + (strm->avail_in - 5);
+    out = strm->next_out;
+    beg = out - (start - strm->avail_out);
+    end = out + (strm->avail_out - 257);
+#ifdef INFLATE_STRICT
+    dmax = state->dmax;
+#endif
+    wsize = state->wsize;
+    whave = state->whave;
+    wnext = state->wnext;
+    window = state->window;
+    hold = state->hold;
+    bits = state->bits;
+    lcode = state->lencode;
+    dcode = state->distcode;
+    lmask = (1U << state->lenbits) - 1;
+    dmask = (1U << state->distbits) - 1;
+
+    /* decode literals and length/distances until end-of-block or not enough
+       input data or output space */
+    do {
+        if (bits < 15) {
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+            hold += (unsigned long)(*in++) << bits;
+            bits += 8;
+        }
+        here = lcode[hold & lmask];
+      dolen:
+        op = (unsigned)(here.bits);
+        hold >>= op;
+        bits -= op;
+        op = (unsigned)(here.op);
+        if (op == 0) {                          /* literal */
+            Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
+                    "inflate:         literal '%c'\n" :
+                    "inflate:         literal 0x%02x\n", here.val));
+            *out++ = (unsigned char)(here.val);
+        }
+        else if (op & 16) {                     /* length base */
+            len = (unsigned)(here.val);
+            op &= 15;                           /* number of extra bits */
+            if (op) {
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                }
+                len += (unsigned)hold & ((1U << op) - 1);
+                hold >>= op;
+                bits -= op;
+            }
+            Tracevv((stderr, "inflate:         length %u\n", len));
+            if (bits < 15) {
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+                hold += (unsigned long)(*in++) << bits;
+                bits += 8;
+            }
+            here = dcode[hold & dmask];
+          dodist:
+            op = (unsigned)(here.bits);
+            hold >>= op;
+            bits -= op;
+            op = (unsigned)(here.op);
+            if (op & 16) {                      /* distance base */
+                dist = (unsigned)(here.val);
+                op &= 15;                       /* number of extra bits */
+                if (bits < op) {
+                    hold += (unsigned long)(*in++) << bits;
+                    bits += 8;
+                    if (bits < op) {
+                        hold += (unsigned long)(*in++) << bits;
+                        bits += 8;
+                    }
+                }
+                dist += (unsigned)hold & ((1U << op) - 1);
+#ifdef INFLATE_STRICT
+                if (dist > dmax) {
+                    strm->msg = (char *)"invalid distance too far back";
+                    state->mode = BAD;
+                    break;
+                }
+#endif
+                hold >>= op;
+                bits -= op;
+                Tracevv((stderr, "inflate:         distance %u\n", dist));
+                op = (unsigned)(out - beg);     /* max distance in output */
+                if (dist > op) {                /* see if copy from window */
+                    op = dist - op;             /* distance back in window */
+                    if (op > whave) {
+                        if (state->sane) {
+                            strm->msg =
+                                (char *)"invalid distance too far back";
+                            state->mode = BAD;
+                            break;
+                        }
+#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR
+                        if (len <= op - whave) {
+                            do {
+                                *out++ = 0;
+                            } while (--len);
+                            continue;
+                        }
+                        len -= op - whave;
+                        do {
+                            *out++ = 0;
+                        } while (--op > whave);
+                        if (op == 0) {
+                            from = out - dist;
+                            do {
+                                *out++ = *from++;
+                            } while (--len);
+                            continue;
+                        }
+#endif
+                    }
+                    from = window;
+                    if (wnext == 0) {           /* very common case */
+                        from += wsize - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+                    else if (wnext < op) {      /* wrap around window */
+                        from += wsize + wnext - op;
+                        op -= wnext;
+                        if (op < len) {         /* some from end of window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = window;
+                            if (wnext < len) {  /* some from start of window */
+                                op = wnext;
+                                len -= op;
+                                do {
+                                    *out++ = *from++;
+                                } while (--op);
+                                from = out - dist;      /* rest from output */
+                            }
+                        }
+                    }
+                    else {                      /* contiguous in window */
+                        from += wnext - op;
+                        if (op < len) {         /* some from window */
+                            len -= op;
+                            do {
+                                *out++ = *from++;
+                            } while (--op);
+                            from = out - dist;  /* rest from output */
+                        }
+                    }
+//                    if (len > 50 && len < dist) {
+//                        memmove(out, from, len);
+//                        out += len;
+//                        from += len;
+//                        len = 0;
+//                    } else {
+                        while (len > 2) {
+                            *out++ = *from++;
+                            *out++ = *from++;
+                            *out++ = *from++;
+                            len -= 3;
+                        }
+                        if (len) {
+                            *out++ = *from++;
+                            if (len > 1)
+                                *out++ = *from++;
+                        }
+//                    }
+                }
+                else {
+                    from = out - dist;          /* copy direct from output */
+                    // Larry Bank added -
+                    // For relatively large runs, it's faster to let memmove
+                    // use whatever code is efficient on the target platform
+//                    if (dist == 1) { // frequent case for images
+//                        memset(out, *from, len);
+//                        out += len;
+//                    } else if (len > 50 && len < dist) {
+//                        memmove(out, from, len);
+//                        out += len;
+//                        from += len;
+//                        len = 0;
+//                    } else {
+                        do {                        /* minimum length is three */
+                            *out++ = *from++;
+                            *out++ = *from++;
+                            *out++ = *from++;
+                            len -= 3;
+                        } while (len > 2);
+                        if (len) {
+                            *out++ = *from++;
+                            if (len > 1)
+                                *out++ = *from++;
+                        }
+//                    }
+                }
+            }
+            else if ((op & 64) == 0) {          /* 2nd level distance code */
+                here = dcode[here.val + (hold & ((1U << op) - 1))];
+                goto dodist;
+            }
+            else {
+                strm->msg = (char *)"invalid distance code";
+                state->mode = BAD;
+                break;
+            }
+        }
+        else if ((op & 64) == 0) {              /* 2nd level length code */
+            here = lcode[here.val + (hold & ((1U << op) - 1))];
+            goto dolen;
+        }
+        else if (op & 32) {                     /* end-of-block */
+            Tracevv((stderr, "inflate:         end of block\n"));
+            state->mode = TYPE;
+            break;
+        }
+        else {
+            strm->msg = (char *)"invalid literal/length code";
+            state->mode = BAD;
+            break;
+        }
+    } while (in < last && out < end);
+
+    /* return unused bytes (on entry, bits < 8, so in won't go too far back) */
+    len = bits >> 3;
+    in -= len;
+    bits -= len << 3;
+    hold &= (1U << bits) - 1;
+
+    /* update state and return */
+    strm->next_in = in;
+    strm->next_out = out;
+    strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last));
+    strm->avail_out = (unsigned)(out < end ?
+                                 257 + (end - out) : 257 - (out - end));
+    state->hold = hold;
+    state->bits = bits;
+    return;
+}
+
+/*
+   inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe):
+   - Using bit fields for code structure
+   - Different op definition to avoid & for extra bits (do & for table bits)
+   - Three separate decoding do-loops for direct, window, and wnext == 0
+   - Special case for distance > 1 copies to do overlapped load and store copy
+   - Explicit branch predictions (based on measured branch probabilities)
+   - Deferring match copy and interspersed it with decoding subsequent codes
+   - Swapping literal/length else
+   - Swapping window/direct else
+   - Larger unrolled copy loops (three is about right)
+   - Moving len -= 3 statement into middle of loop
+ */
+
+#endif /* !ASMINF */

libraries/pngdec/inffast.h

@@ -0,0 +1,11 @@
+/* inffast.h -- header to use inffast.c
+ * Copyright (C) 1995-2003, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start));

libraries/pngdec/inffixed.h

@@ -0,0 +1,94 @@
+    /* inffixed.h -- table for decoding fixed codes
+     * Generated automatically by makefixed().
+     */
+
+    /* WARNING: this file should *not* be used by applications.
+       It is part of the implementation of this library and is
+       subject to change. Applications should only use zlib.h.
+     */
+
+    static const code lenfix[512] = {
+        {96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48},
+        {0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128},
+        {0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59},
+        {0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176},
+        {0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20},
+        {21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100},
+        {0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8},
+        {0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216},
+        {18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76},
+        {0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114},
+        {0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2},
+        {0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148},
+        {20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42},
+        {0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86},
+        {0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15},
+        {0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236},
+        {16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62},
+        {0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142},
+        {0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31},
+        {0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162},
+        {0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25},
+        {0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105},
+        {0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4},
+        {0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202},
+        {17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69},
+        {0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125},
+        {0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13},
+        {0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195},
+        {19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35},
+        {0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91},
+        {0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19},
+        {0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246},
+        {16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55},
+        {0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135},
+        {0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99},
+        {0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190},
+        {0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16},
+        {20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96},
+        {0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6},
+        {0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209},
+        {17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72},
+        {0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116},
+        {0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4},
+        {0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153},
+        {20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44},
+        {0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82},
+        {0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11},
+        {0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229},
+        {16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58},
+        {0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138},
+        {0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51},
+        {0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173},
+        {0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30},
+        {0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110},
+        {0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0},
+        {0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195},
+        {16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65},
+        {0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121},
+        {0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9},
+        {0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258},
+        {19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37},
+        {0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93},
+        {0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23},
+        {0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251},
+        {16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51},
+        {0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131},
+        {0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67},
+        {0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183},
+        {0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23},
+        {64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103},
+        {0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9},
+        {0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223},
+        {18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79},
+        {0,9,255}
+    };
+
+    static const code distfix[32] = {
+        {16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025},
+        {21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193},
+        {18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385},
+        {19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577},
+        {16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073},
+        {22,5,193},{64,5,0}
+    };

libraries/pngdec/inflate.h

@@ -0,0 +1,125 @@
+/* inflate.h -- internal inflate state definition
+ * Copyright (C) 1995-2016 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* define NO_GZIP when compiling if you want to disable gzip header and
+   trailer decoding by inflate().  NO_GZIP would be used to avoid linking in
+   the crc code when it is not needed.  For shared libraries, gzip decoding
+   should be left enabled. */
+#ifndef NO_GZIP
+#  define GUNZIP
+#endif
+
+/* Possible inflate modes between inflate() calls */
+typedef enum {
+    HEAD = 16180,   /* i: waiting for magic header */
+    FLAGS,      /* i: waiting for method and flags (gzip) */
+    TIME,       /* i: waiting for modification time (gzip) */
+    OS,         /* i: waiting for extra flags and operating system (gzip) */
+    EXLEN,      /* i: waiting for extra length (gzip) */
+    EXTRA,      /* i: waiting for extra bytes (gzip) */
+    NAME,       /* i: waiting for end of file name (gzip) */
+    COMMENT,    /* i: waiting for end of comment (gzip) */
+    HCRC,       /* i: waiting for header crc (gzip) */
+    DICTID,     /* i: waiting for dictionary check value */
+    DICT,       /* waiting for inflateSetDictionary() call */
+        TYPE,       /* i: waiting for type bits, including last-flag bit */
+        TYPEDO,     /* i: same, but skip check to exit inflate on new block */
+        STORED,     /* i: waiting for stored size (length and complement) */
+        COPY_,      /* i/o: same as COPY below, but only first time in */
+        COPY,       /* i/o: waiting for input or output to copy stored block */
+        TABLE,      /* i: waiting for dynamic block table lengths */
+        LENLENS,    /* i: waiting for code length code lengths */
+        CODELENS,   /* i: waiting for length/lit and distance code lengths */
+            LEN_,       /* i: same as LEN below, but only first time in */
+            LEN,        /* i: waiting for length/lit/eob code */
+            LENEXT,     /* i: waiting for length extra bits */
+            DIST,       /* i: waiting for distance code */
+            DISTEXT,    /* i: waiting for distance extra bits */
+            MATCH,      /* o: waiting for output space to copy string */
+            LIT,        /* o: waiting for output space to write literal */
+    CHECK,      /* i: waiting for 32-bit check value */
+    LENGTH,     /* i: waiting for 32-bit length (gzip) */
+    DONE,       /* finished check, done -- remain here until reset */
+    BAD,        /* got a data error -- remain here until reset */
+    MEM,        /* got an inflate() memory error -- remain here until reset */
+    SYNC        /* looking for synchronization bytes to restart inflate() */
+} inflate_mode;
+
+/*
+    State transitions between above modes -
+
+    (most modes can go to BAD or MEM on error -- not shown for clarity)
+
+    Process header:
+        HEAD -> (gzip) or (zlib) or (raw)
+        (gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT ->
+                  HCRC -> TYPE
+        (zlib) -> DICTID or TYPE
+        DICTID -> DICT -> TYPE
+        (raw) -> TYPEDO
+    Read deflate blocks:
+            TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK
+            STORED -> COPY_ -> COPY -> TYPE
+            TABLE -> LENLENS -> CODELENS -> LEN_
+            LEN_ -> LEN
+    Read deflate codes in fixed or dynamic block:
+                LEN -> LENEXT or LIT or TYPE
+                LENEXT -> DIST -> DISTEXT -> MATCH -> LEN
+                LIT -> LEN
+    Process trailer:
+        CHECK -> LENGTH -> DONE
+ */
+
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+   including the allocated sliding window, which is up to 32K bytes. */
+struct inflate_state {
+    z_streamp strm;             /* pointer back to this zlib stream */
+    inflate_mode mode;          /* current inflate mode */
+    int last;                   /* true if processing last block */
+    int wrap;                   /* bit 0 true for zlib, bit 1 true for gzip,
+                                   bit 2 true to validate check value */
+    int havedict;               /* true if dictionary provided */
+    int flags;                  /* gzip header method and flags (0 if zlib) */
+    unsigned dmax;              /* zlib header max distance (INFLATE_STRICT) */
+    unsigned long check;        /* protected copy of check value */
+    unsigned long total;        /* protected copy of output count */
+    gz_headerp head;            /* where to save gzip header information */
+        /* sliding window */
+    unsigned wbits;             /* log base 2 of requested window size */
+    unsigned wsize;             /* window size or zero if not using window */
+    unsigned whave;             /* valid bytes in the window */
+    unsigned wnext;             /* window write index */
+    unsigned char FAR *window;  /* allocated sliding window, if needed */
+        /* bit accumulator */
+    unsigned long hold;         /* input bit accumulator */
+    unsigned bits;              /* number of bits in "in" */
+        /* for string and stored block copying */
+    unsigned length;            /* literal or length of data to copy */
+    unsigned offset;            /* distance back to copy string from */
+        /* for table and code decoding */
+    unsigned extra;             /* extra bits needed */
+        /* fixed and dynamic code tables */
+    code const FAR *lencode;    /* starting table for length/literal codes */
+    code const FAR *distcode;   /* starting table for distance codes */
+    unsigned lenbits;           /* index bits for lencode */
+    unsigned distbits;          /* index bits for distcode */
+        /* dynamic table building */
+    unsigned ncode;             /* number of code length code lengths */
+    unsigned nlen;              /* number of length code lengths */
+    unsigned ndist;             /* number of distance code lengths */
+    unsigned have;              /* number of code lengths in lens[] */
+    code FAR *next;             /* next available space in codes[] */
+    unsigned short lens[320];   /* temporary storage for code lengths */
+    unsigned short work[288];   /* work area for code table building */
+    code codes[ENOUGH];         /* space for code tables */
+    int sane;                   /* if false, allow invalid distance too far */
+    int back;                   /* bits back of last unprocessed length/lit */
+    unsigned was;               /* initial length of match */
+};

libraries/pngdec/inftrees.c

@@ -0,0 +1,304 @@
+/* inftrees.c -- generate Huffman trees for efficient decoding
+ * Copyright (C) 1995-2017 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+#include "zutil.h"
+#include "inftrees.h"
+
+#define MAXBITS 15
+
+const char inflate_copyright[] =
+   " inflate 1.2.11 Copyright 1995-2017 Mark Adler ";
+/*
+  If you use the zlib library in a product, an acknowledgment is welcome
+  in the documentation of your product. If for some reason you cannot
+  include such an acknowledgment, I would appreciate that you keep this
+  copyright string in the executable of your product.
+ */
+
+/*
+   Build a set of tables to decode the provided canonical Huffman code.
+   The code lengths are lens[0..codes-1].  The result starts at *table,
+   whose indices are 0..2^bits-1.  work is a writable array of at least
+   lens shorts, which is used as a work area.  type is the type of code
+   to be generated, CODES, LENS, or DISTS.  On return, zero is success,
+   -1 is an invalid code, and +1 means that ENOUGH isn't enough.  table
+   on return points to the next available entry's address.  bits is the
+   requested root table index bits, and on return it is the actual root
+   table index bits.  It will differ if the request is greater than the
+   longest code or if it is less than the shortest code.
+ */
+int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work)
+codetype type;
+unsigned short FAR *lens;
+unsigned codes;
+code FAR * FAR *table;
+unsigned FAR *bits;
+unsigned short FAR *work;
+{
+    unsigned len;               /* a code's length in bits */
+    unsigned sym;               /* index of code symbols */
+    unsigned min, max;          /* minimum and maximum code lengths */
+    unsigned root;              /* number of index bits for root table */
+    unsigned curr;              /* number of index bits for current table */
+    unsigned drop;              /* code bits to drop for sub-table */
+    int left;                   /* number of prefix codes available */
+    unsigned used;              /* code entries in table used */
+    unsigned huff;              /* Huffman code */
+    unsigned incr;              /* for incrementing code, index */
+    unsigned fill;              /* index for replicating entries */
+    unsigned low;               /* low bits for current root entry */
+    unsigned mask;              /* mask for low root bits */
+    code here;                  /* table entry for duplication */
+    code FAR *next;             /* next available space in table */
+    const unsigned short FAR *base;     /* base value table to use */
+    const unsigned short FAR *extra;    /* extra bits table to use */
+    unsigned match;             /* use base and extra for symbol >= match */
+    unsigned short count[MAXBITS+1];    /* number of codes of each length */
+    unsigned short offs[MAXBITS+1];     /* offsets in table for each length */
+    static const unsigned short lbase[31] = { /* Length codes 257..285 base */
+        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
+    static const unsigned short lext[31] = { /* Length codes 257..285 extra */
+        16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
+        19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 77, 202};
+    static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
+        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+        8193, 12289, 16385, 24577, 0, 0};
+    static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
+        16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22,
+        23, 23, 24, 24, 25, 25, 26, 26, 27, 27,
+        28, 28, 29, 29, 64, 64};
+
+    /*
+       Process a set of code lengths to create a canonical Huffman code.  The
+       code lengths are lens[0..codes-1].  Each length corresponds to the
+       symbols 0..codes-1.  The Huffman code is generated by first sorting the
+       symbols by length from short to long, and retaining the symbol order
+       for codes with equal lengths.  Then the code starts with all zero bits
+       for the first code of the shortest length, and the codes are integer
+       increments for the same length, and zeros are appended as the length
+       increases.  For the deflate format, these bits are stored backwards
+       from their more natural integer increment ordering, and so when the
+       decoding tables are built in the large loop below, the integer codes
+       are incremented backwards.
+
+       This routine assumes, but does not check, that all of the entries in
+       lens[] are in the range 0..MAXBITS.  The caller must assure this.
+       1..MAXBITS is interpreted as that code length.  zero means that that
+       symbol does not occur in this code.
+
+       The codes are sorted by computing a count of codes for each length,
+       creating from that a table of starting indices for each length in the
+       sorted table, and then entering the symbols in order in the sorted
+       table.  The sorted table is work[], with that space being provided by
+       the caller.
+
+       The length counts are used for other purposes as well, i.e. finding
+       the minimum and maximum length codes, determining if there are any
+       codes at all, checking for a valid set of lengths, and looking ahead
+       at length counts to determine sub-table sizes when building the
+       decoding tables.
+     */
+
+    /* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */
+    for (len = 0; len <= MAXBITS; len++)
+        count[len] = 0;
+    for (sym = 0; sym < codes; sym++)
+        count[lens[sym]]++;
+
+    /* bound code lengths, force root to be within code lengths */
+    root = *bits;
+    for (max = MAXBITS; max >= 1; max--)
+        if (count[max] != 0) break;
+    if (root > max) root = max;
+    if (max == 0) {                     /* no symbols to code at all */
+        here.op = (unsigned char)64;    /* invalid code marker */
+        here.bits = (unsigned char)1;
+        here.val = (unsigned short)0;
+        *(*table)++ = here;             /* make a table to force an error */
+        *(*table)++ = here;
+        *bits = 1;
+        return 0;     /* no symbols, but wait for decoding to report error */
+    }
+    for (min = 1; min < max; min++)
+        if (count[min] != 0) break;
+    if (root < min) root = min;
+
+    /* check for an over-subscribed or incomplete set of lengths */
+    left = 1;
+    for (len = 1; len <= MAXBITS; len++) {
+        left <<= 1;
+        left -= count[len];
+        if (left < 0) return -1;        /* over-subscribed */
+    }
+    if (left > 0 && (type == CODES || max != 1))
+        return -1;                      /* incomplete set */
+
+    /* generate offsets into symbol table for each length for sorting */
+    offs[1] = 0;
+    for (len = 1; len < MAXBITS; len++)
+        offs[len + 1] = offs[len] + count[len];
+
+    /* sort symbols by length, by symbol order within each length */
+    for (sym = 0; sym < codes; sym++)
+        if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym;
+
+    /*
+       Create and fill in decoding tables.  In this loop, the table being
+       filled is at next and has curr index bits.  The code being used is huff
+       with length len.  That code is converted to an index by dropping drop
+       bits off of the bottom.  For codes where len is less than drop + curr,
+       those top drop + curr - len bits are incremented through all values to
+       fill the table with replicated entries.
+
+       root is the number of index bits for the root table.  When len exceeds
+       root, sub-tables are created pointed to by the root entry with an index
+       of the low root bits of huff.  This is saved in low to check for when a
+       new sub-table should be started.  drop is zero when the root table is
+       being filled, and drop is root when sub-tables are being filled.
+
+       When a new sub-table is needed, it is necessary to look ahead in the
+       code lengths to determine what size sub-table is needed.  The length
+       counts are used for this, and so count[] is decremented as codes are
+       entered in the tables.
+
+       used keeps track of how many table entries have been allocated from the
+       provided *table space.  It is checked for LENS and DIST tables against
+       the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in
+       the initial root table size constants.  See the comments in inftrees.h
+       for more information.
+
+       sym increments through all symbols, and the loop terminates when
+       all codes of length max, i.e. all codes, have been processed.  This
+       routine permits incomplete codes, so another loop after this one fills
+       in the rest of the decoding tables with invalid code markers.
+     */
+
+    /* set up for code type */
+    switch (type) {
+    case CODES:
+        base = extra = work;    /* dummy value--not used */
+        match = 20;
+        break;
+    case LENS:
+        base = lbase;
+        extra = lext;
+        match = 257;
+        break;
+    default:    /* DISTS */
+        base = dbase;
+        extra = dext;
+        match = 0;
+    }
+
+    /* initialize state for loop */
+    huff = 0;                   /* starting code */
+    sym = 0;                    /* starting code symbol */
+    len = min;                  /* starting code length */
+    next = *table;              /* current table to fill in */
+    curr = root;                /* current table index bits */
+    drop = 0;                   /* current bits to drop from code for index */
+    low = (unsigned)(-1);       /* trigger new sub-table when len > root */
+    used = 1U << root;          /* use root table entries */
+    mask = used - 1;            /* mask for comparing low */
+
+    /* check available table space */
+    if ((type == LENS && used > ENOUGH_LENS) ||
+        (type == DISTS && used > ENOUGH_DISTS))
+        return 1;
+
+    /* process all codes and make table entries */
+    for (;;) {
+        /* create table entry */
+        here.bits = (unsigned char)(len - drop);
+        if (work[sym] + 1U < match) {
+            here.op = (unsigned char)0;
+            here.val = work[sym];
+        }
+        else if (work[sym] >= match) {
+            here.op = (unsigned char)(extra[work[sym] - match]);
+            here.val = base[work[sym] - match];
+        }
+        else {
+            here.op = (unsigned char)(32 + 64);         /* end of block */
+            here.val = 0;
+        }
+
+        /* replicate for those indices with low len bits equal to huff */
+        incr = 1U << (len - drop);
+        fill = 1U << curr;
+        min = fill;                 /* save offset to next table */
+        do {
+            fill -= incr;
+            next[(huff >> drop) + fill] = here;
+        } while (fill != 0);
+
+        /* backwards increment the len-bit code huff */
+        incr = 1U << (len - 1);
+        while (huff & incr)
+            incr >>= 1;
+        if (incr != 0) {
+            huff &= incr - 1;
+            huff += incr;
+        }
+        else
+            huff = 0;
+
+        /* go to next symbol, update count, len */
+        sym++;
+        if (--(count[len]) == 0) {
+            if (len == max) break;
+            len = lens[work[sym]];
+        }
+
+        /* create new sub-table if needed */
+        if (len > root && (huff & mask) != low) {
+            /* if first time, transition to sub-tables */
+            if (drop == 0)
+                drop = root;
+
+            /* increment past last table */
+            next += min;            /* here min is 1 << curr */
+
+            /* determine length of next table */
+            curr = len - drop;
+            left = (int)(1 << curr);
+            while (curr + drop < max) {
+                left -= count[curr + drop];
+                if (left <= 0) break;
+                curr++;
+                left <<= 1;
+            }
+
+            /* check for enough space */
+            used += 1U << curr;
+            if ((type == LENS && used > ENOUGH_LENS) ||
+                (type == DISTS && used > ENOUGH_DISTS))
+                return 1;
+
+            /* point entry in root table to sub-table */
+            low = huff & mask;
+            (*table)[low].op = (unsigned char)curr;
+            (*table)[low].bits = (unsigned char)root;
+            (*table)[low].val = (unsigned short)(next - *table);
+        }
+    }
+
+    /* fill in remaining table entry if code is incomplete (guaranteed to have
+       at most one remaining entry, since if the code is incomplete, the
+       maximum code length that was allowed to get this far is one bit) */
+    if (huff != 0) {
+        here.op = (unsigned char)64;            /* invalid code marker */
+        here.bits = (unsigned char)(len - drop);
+        here.val = (unsigned short)0;
+        next[huff] = here;
+    }
+
+    /* set return parameters */
+    *table += used;
+    *bits = root;
+    return 0;
+}

libraries/pngdec/inftrees.h

@@ -0,0 +1,62 @@
+/* inftrees.h -- header to use inftrees.c
+ * Copyright (C) 1995-2005, 2010 Mark Adler
+ * For conditions of distribution and use, see copyright notice in zlib.h
+ */
+
+/* WARNING: this file should *not* be used by applications. It is
+   part of the implementation of the compression library and is
+   subject to change. Applications should only use zlib.h.
+ */
+
+/* Structure for decoding tables.  Each entry provides either the
+   information needed to do the operation requested by the code that
+   indexed that table entry, or it provides a pointer to another
+   table that indexes more bits of the code.  op indicates whether
+   the entry is a pointer to another table, a literal, a length or
+   distance, an end-of-block, or an invalid code.  For a table
+   pointer, the low four bits of op is the number of index bits of
+   that table.  For a length or distance, the low four bits of op
+   is the number of extra bits to get after the code.  bits is
+   the number of bits in this code or part of the code to drop off
+   of the bit buffer.  val is the actual byte to output in the case
+   of a literal, the base length or distance, or the offset from
+   the current table to the next table.  Each entry is four bytes. */
+typedef struct {
+    unsigned char op;           /* operation, extra bits, table bits */
+    unsigned char bits;         /* bits in this part of the code */
+    unsigned short val;         /* offset in table or code value */
+} code;
+
+/* op values as set by inflate_table():
+    00000000 - literal
+    0000tttt - table link, tttt != 0 is the number of table index bits
+    0001eeee - length or distance, eeee is the number of extra bits
+    01100000 - end of block
+    01000000 - invalid code
+ */
+
+/* Maximum size of the dynamic table.  The maximum number of code structures is
+   1444, which is the sum of 852 for literal/length codes and 592 for distance
+   codes.  These values were found by exhaustive searches using the program
+   examples/enough.c found in the zlib distribtution.  The arguments to that
+   program are the number of symbols, the initial root table size, and the
+   maximum bit length of a code.  "enough 286 9 15" for literal/length codes
+   returns returns 852, and "enough 30 6 15" for distance codes returns 592.
+   The initial root table size (9 or 6) is found in the fifth argument of the
+   inflate_table() calls in inflate.c and infback.c.  If the root table size is
+   changed, then these maximum sizes would be need to be recalculated and
+   updated. */
+#define ENOUGH_LENS 852
+#define ENOUGH_DISTS 592
+#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
+
+/* Type of code to build for inflate_table() */
+typedef enum {
+    CODES,
+    LENS,
+    DISTS
+} codetype;
+
+int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens,
+                             unsigned codes, code FAR * FAR *table,
+                             unsigned FAR *bits, unsigned short FAR *work));

libraries/pngdec/png.inl

@@ -0,0 +1,871 @@
+//
+// PNG Decoder
+//
+// written by Larry Bank
+// bitbank@pobox.com
+// Arduino port started 5/3/2021
+// Original PNG code written 20+ years ago :)
+// The goal of this code is to decode PNG images on embedded systems
+//
+// Copyright 2021 BitBank Software, Inc. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//    http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//===========================================================================
+//
+#include "zlib.h"
+//
+// Convert 8-bit grayscale into RGB565
+//
+static const uint16_t usGrayTo565[] = {0x0000,0x0000,0x0000,0x0000,0x0020,0x0020,0x0020,0x0020, // 0
+    0x0841,0x0841,0x0841,0x0841,0x0861,0x0861,0x0861,0x0861,
+    0x1082,0x1082,0x1082,0x1082,0x10a2,0x10a2,0x10a2,0x10a2,
+    0x18c3,0x18c3,0x18c3,0x18c3,0x18e3,0x18e3,0x18e3,0x18e3,
+    0x2104,0x2104,0x2104,0x2104,0x2124,0x2124,0x2124,0x2124,
+    0x2945,0x2945,0x2945,0x2945,0x2965,0x2965,0x2965,0x2965,
+    0x3186,0x3186,0x3186,0x3186,0x31a6,0x31a6,0x31a6,0x31a6,
+    0x39c7,0x39c7,0x39c7,0x39c7,0x39e7,0x39e7,0x39e7,0x39e7,
+    0x4208,0x4208,0x4208,0x4208,0x4228,0x4228,0x4228,0x4228,
+    0x4a49,0x4a49,0x4a49,0x4a49,0x4a69,0x4a69,0x4a69,0x4a69,
+    0x528a,0x528a,0x528a,0x528a,0x52aa,0x52aa,0x52aa,0x52aa,
+    0x5acb,0x5acb,0x5acb,0x5acb,0x5aeb,0x5aeb,0x5aeb,0x5aeb,
+    0x630c,0x630c,0x630c,0x630c,0x632c,0x632c,0x632c,0x632c,
+    0x6b4d,0x6b4d,0x6b4d,0x6b4d,0x6b6d,0x6b6d,0x6b6d,0x6b6d,
+    0x738e,0x738e,0x738e,0x738e,0x73ae,0x73ae,0x73ae,0x73ae,
+    0x7bcf,0x7bcf,0x7bcf,0x7bcf,0x7bef,0x7bef,0x7bef,0x7bef,
+    0x8410,0x8410,0x8410,0x8410,0x8430,0x8430,0x8430,0x8430,
+    0x8c51,0x8c51,0x8c51,0x8c51,0x8c71,0x8c71,0x8c71,0x8c71,
+    0x9492,0x9492,0x9492,0x9492,0x94b2,0x94b2,0x94b2,0x94b2,
+    0x9cd3,0x9cd3,0x9cd3,0x9cd3,0x9cf3,0x9cf3,0x9cf3,0x9cf3,
+    0xa514,0xa514,0xa514,0xa514,0xa534,0xa534,0xa534,0xa534,
+    0xad55,0xad55,0xad55,0xad55,0xad75,0xad75,0xad75,0xad75,
+    0xb596,0xb596,0xb596,0xb596,0xb5b6,0xb5b6,0xb5b6,0xb5b6,
+    0xbdd7,0xbdd7,0xbdd7,0xbdd7,0xbdf7,0xbdf7,0xbdf7,0xbdf7,
+    0xc618,0xc618,0xc618,0xc618,0xc638,0xc638,0xc638,0xc638,
+    0xce59,0xce59,0xce59,0xce59,0xce79,0xce79,0xce79,0xce79,
+    0xd69a,0xd69a,0xd69a,0xd69a,0xd6ba,0xd6ba,0xd6ba,0xd6ba,
+    0xdedb,0xdedb,0xdedb,0xdedb,0xdefb,0xdefb,0xdefb,0xdefb,
+    0xe71c,0xe71c,0xe71c,0xe71c,0xe73c,0xe73c,0xe73c,0xe73c,
+    0xef5d,0xef5d,0xef5d,0xef5d,0xef7d,0xef7d,0xef7d,0xef7d,
+    0xf79e,0xf79e,0xf79e,0xf79e,0xf7be,0xf7be,0xf7be,0xf7be,
+    0xffdf,0xffdf,0xffdf,0xffdf,0xffff,0xffff,0xffff,0xffff};
+
+//
+// C interface
+//
+#ifndef __cplusplus
+// C API
+int PNG_openRAM(PNGIMAGE *pPNG, uint8_t *pData, int iDataSize, PNG_DRAW_CALLBACK *pfnDraw)
+{
+    pPNG->iError = PNG_SUCCESS;
+    pPNG->pfnRead = readMem;
+    pPNG->pfnSeek = seekMem;
+    pPNG->pfnDraw = pfnDraw;
+    pPNG->pfnOpen = NULL;
+    pPNG->pfnClose = NULL;
+    pPNG->PNGFile.iSize = iDataSize;
+    pPNG->PNGFile.pData = pData;
+    return PNGInit(pPNG);
+} /* PNG_openRAM() */
+
+#ifdef __LINUX__
+int PNG_openFile(PNGIMAGE *pPNG, const char *szFilename, PNG_DRAW_CALLBACK *pfnDraw)
+{
+    pPNG->iError = PNG_SUCCESS;
+    pPNG->pfnRead = readFile;
+    pPNG->pfnSeek = seekFile;
+    pPNG->pfnDraw = pfnDraw;
+    pPNG->pfnOpen = NULL;
+    pPNG->pfnClose = closeFile;
+    pPNG->PNGFile.fHandle = fopen(szFilename, "r+b");
+    if (pPNG->PNGFile.fHandle == NULL)
+       return 0;
+    fseek((FILE *)pPNG->PNGFile.fHandle, 0, SEEK_END);
+    pPNG->PNGFile.iSize = (int)ftell((FILE *)pPNG->PNGFile.fHandle);
+    fseek((FILE *)pPNG->PNGFile.fHandle, 0, SEEK_SET);
+    return PNGInit(pPNG);
+} /* PNG_openFile() */
+#endif // __LINUX__
+void PNG_close(PNGIMAGE *pPNG)
+{
+    if (pPNG->pfnClose)
+        (*pPNG->pfnClose)(pPNG->PNGFile.fHandle);
+} /* PNG_close() */
+
+int PNG_getWidth(PNGIMAGE *pPNG)
+{
+    return pPNG->iWidth;
+} /* PNG_getsWidth() */
+
+int PNG_getHeight(PNGIMAGE *pPNG)
+{
+    return pPNG->iHeight;
+} /* PNG_getHeight() */
+
+int PNG_getLastError(PNGIMAGE *pPNG)
+{
+    return pPNG->iError;
+} /* PNG_getLastError() */
+
+uint8_t *PNG_getPalette(PNGIMAGE *pPNG)
+{
+    return pPNG->ucPalette;
+} /* PNG_getPalette() */
+
+int PNG_getBufferSize(PNGIMAGE *pPNG)
+{
+    return pPNG->iHeight * pPNG->iPitch;
+} /* PNG_getBufferSize() */
+
+uint8_t * PNG_getBuffer(PNGIMAGE *pPNG)
+{
+    return pPNG->pImage;
+} /* PNG_getBuffer() */
+
+#endif // !__cplusplus
+PNG_STATIC uint8_t PNGMakeMask(PNGDRAW *pDraw, uint8_t *pMask, uint8_t ucThreshold)
+{
+    uint8_t alpha, c, *s, *d, *pPal;
+    uint8_t cHasOpaque = 0;
+    int i, x;
+    
+    switch (pDraw->iPixelType) {
+        case PNG_PIXEL_TRUECOLOR_ALPHA: // truecolor + alpha
+            s = pDraw->pPixels;
+            d = pMask;
+            for (x=0; x<pDraw->iWidth; x+=8) { // groups of 8 pixels in each byte of mask
+                c = 0;
+                for (i=0; i<8; i++) {
+                    c <<= 1;
+                    alpha = s[3];
+                   if (alpha >= ucThreshold) // if opaque 'enough', set the bit
+                       c |= 1;
+                    s += 4;
+                }
+                *d++ = c;
+                cHasOpaque |= c;
+            }
+            break;
+        case PNG_PIXEL_GRAY_ALPHA:
+            s = pDraw->pPixels;
+            d = pMask;
+            for (x=0; x<pDraw->iWidth; x+=8) { // groups of 8 pixels in each byte of mask
+                c = 0;
+                for (i=0; i<8; i++) {
+                    c <<= 1;
+                    alpha = s[1];
+                   if (alpha >= ucThreshold) // if opaque 'enough', set the bit
+                       c |= 1;
+                    s += 2;
+                }
+                *d++ = c;
+                cHasOpaque |= c;
+            }
+            break;
+        case PNG_PIXEL_INDEXED:
+            s = pDraw->pPixels;
+            pPal = &pDraw->pPalette[768];
+            d = pMask;
+            for (x=0; x<pDraw->iWidth; x+=8) { // groups of 8 pixels in each byte of mask
+                uint8_t ucPix = 0;
+                c = 0;
+                switch (pDraw->iBpp) {
+                    case 2:
+                        for (i=0; i<8; i++) {
+                            if (i == 0 || i == 4)
+                                ucPix = *s++;
+                            c <<= 1;
+                            alpha = pPal[ucPix >> 6]; // get palette alpha for this color
+                           if (alpha >= ucThreshold) // if opaque 'enough', set the bit
+                               c |= 1;
+                            ucPix <<= 2;
+                        }
+                        break;
+                    case 4:
+                        for (i=0; i<8; i++) {
+                            if ((i & 1) == 0)
+                                ucPix = *s++;
+                            c <<= 1;
+                            alpha = pPal[ucPix >> 4]; // get palette alpha for this color
+                           if (alpha >= ucThreshold) // if opaque 'enough', set the bit
+                               c |= 1;
+                            ucPix <<= 4;
+                        }
+                        break;
+                    case 8:
+                        for (i=0; i<8; i++) {
+                            c <<= 1;
+                            alpha = pPal[s[0]]; // get palette alpha for this color
+                           if (alpha >= ucThreshold) // if opaque 'enough', set the bit
+                               c |= 1;
+                            s++;
+                        }
+                        break;
+                } // switch on bit depth
+                *d++ = c;
+                cHasOpaque |= c;
+            }
+            break;
+        default: // No alpha channel; make a mask of all 1's
+            memset(pMask, 0xff, (pDraw->iWidth+7)>>3);
+            cHasOpaque = 1;
+            break;
+    } // switch on pixel type
+    return cHasOpaque; // let the caller know if any pixels are opaque
+} /* PNGMakeMask() */
+//
+// Convert a line of native PNG pixels into RGB565
+// handles all standard pixel types
+// written for simplicity, not necessarily performance
+//
+PNG_STATIC void PNGRGB565(PNGDRAW *pDraw, uint16_t *pPixels, int iEndiannes, uint32_t u32Bkgd, int iHasAlpha)
+{
+    int x, j;
+    uint16_t usPixel, *pDest = pPixels;
+    uint8_t c, a, *pPal, *s = pDraw->pPixels;
+    
+    switch (pDraw->iPixelType) {
+        case PNG_PIXEL_GRAY_ALPHA:
+            for (x=0; x<pDraw->iWidth; x++) {
+                c = *s++; // gray level
+                a = *s++;
+                j = (a * c) >> 8; // multiply by the alpha
+                usPixel = usGrayTo565[j]; 
+                if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                    usPixel = __builtin_bswap16(usPixel);
+                *pDest++ = usPixel;
+            }
+            break;
+        case PNG_PIXEL_GRAYSCALE:
+            for (x=0; x<pDraw->iWidth; x++) {
+                c = *s++;
+                usPixel = (c >> 3); // blue
+                usPixel |= ((c >> 2) << 5); // green
+                usPixel |= ((c >> 3) << 11); // red
+                if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                    usPixel = __builtin_bswap16(usPixel);
+                *pDest++ = usPixel;
+            }
+            break;
+        case PNG_PIXEL_TRUECOLOR:
+            for (x=0; x<pDraw->iWidth; x++) {
+                usPixel = (s[2] >> 3); // blue
+                usPixel |= ((s[1] >> 2) << 5); // green
+                usPixel |= ((s[0] >> 3) << 11); // red
+                if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                    usPixel = __builtin_bswap16(usPixel);
+                *pDest++ = usPixel;
+                s += 3;
+            }
+            break;
+        case PNG_PIXEL_INDEXED: // palette color (can be 1/2/4 or 8 bits per pixel)
+            if (pDraw->pFastPalette && !pDraw->iHasAlpha) { // faster RGB565 palette exists
+               switch (pDraw->iBpp) {
+                   case 8:
+                       for (x=0; x<pDraw->iWidth; x++) {
+                           c = *s++;
+                           usPixel = pDraw->pFastPalette[c];
+                           if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                               usPixel = __builtin_bswap16(usPixel);
+                           *pDest++ = usPixel;
+                       }
+                       break;
+                   case 4:
+                       for (x=0; x<pDraw->iWidth; x+=2) {
+                           c = *s++;
+                           usPixel = pDraw->pFastPalette[c >> 4];
+                           if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                               usPixel = __builtin_bswap16(usPixel);
+                           *pDest++ = usPixel;
+                           usPixel = pDraw->pFastPalette[c & 0xf];
+                           if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                               usPixel = __builtin_bswap16(usPixel);
+                           *pDest++ = usPixel;
+                       }
+                       break;
+                   case 2:
+                       for (x=0; x<pDraw->iWidth; x+=4) {
+                           c = *s++;
+                           for (j=0; j<4; j++) { // work on pairs of bits
+                               usPixel = pDraw->pFastPalette[c >> 6];
+                               if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                   usPixel = __builtin_bswap16(usPixel);
+                               *pDest++ = usPixel;
+                               c <<= 2;
+                           }
+                       }
+                       break;
+                   case 1:
+                       for (x=0; x<pDraw->iWidth; x+=4) {
+                           c = *s++;
+                           for (j=0; j<8; j++) { // work on pairs of bits
+                               usPixel = pDraw->pFastPalette[c >> 7];
+                               if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                   usPixel = __builtin_bswap16(usPixel);
+                               *pDest++ = usPixel;
+                               c <<= 1;
+                           }
+                       }
+                       break;
+               } // switch on bpp 
+               return;
+            }
+            switch (pDraw->iBpp) {
+                case 8: // 8-bit palette also supports palette alpha
+                    if (pDraw->iHasAlpha) { // use the alpha to modify the palette
+                        for (x=0; x<pDraw->iWidth; x++) {
+                            int a;
+                            c = *s++;
+                            a = pDraw->pPalette[768+c]; // get alpha
+                            pPal = &pDraw->pPalette[c * 3];
+                            usPixel = ((pPal[2] * a) >> 11); // blue
+                            usPixel |= (((pPal[1] * a) >> 10) << 5); // green
+                            usPixel |= (((pPal[0] * a) >> 11) << 11); // red
+                            if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                usPixel = __builtin_bswap16(usPixel);
+                            *pDest++ = usPixel;
+                        } // for x
+                    } else {
+                        for (x=0; x<pDraw->iWidth; x++) {
+                            c = *s++;
+                            pPal = &pDraw->pPalette[c * 3];
+                            usPixel = (pPal[2] >> 3); // blue
+                            usPixel |= ((pPal[1] >> 2) << 5); // green
+                            usPixel |= ((pPal[0] >> 3) << 11); // red
+                            if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                usPixel = __builtin_bswap16(usPixel);
+                            *pDest++ = usPixel;
+                        } // for x
+                    } // not alpha palette
+                    break;
+                case 4:
+                    for (x=0; x<pDraw->iWidth; x+=2) {
+                        c = *s++;
+                        pPal = &pDraw->pPalette[(c >> 4) * 3];
+                        usPixel = (pPal[2] >> 3); // blue
+                        usPixel |= ((pPal[1] >> 2) << 5); // green
+                        usPixel |= ((pPal[0] >> 3) << 11); // red
+                        if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                            usPixel = __builtin_bswap16(usPixel);
+                        *pDest++ = usPixel;
+                        pPal = &pDraw->pPalette[(c & 0xf) * 3];
+                        usPixel = (pPal[2] >> 3); // blue
+                        usPixel |= ((pPal[1] >> 2) << 5); // green
+                        usPixel |= ((pPal[0] >> 3) << 11); // red
+                        if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                            usPixel = __builtin_bswap16(usPixel);
+                        *pDest++ = usPixel;
+                    }
+                    break;
+                case 2:
+                    for (x=0; x<pDraw->iWidth; x+=4) {
+                        c = *s++;
+                        for (j=0; j<4; j++) { // work on pairs of bits
+                            pPal = &pDraw->pPalette[(c >> 6) * 3];
+                            usPixel = (pPal[2] >> 3); // blue
+                            usPixel |= ((pPal[1] >> 2) << 5); // green
+                            usPixel |= ((pPal[0] >> 3) << 11); // red
+                            if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                usPixel = __builtin_bswap16(usPixel);
+                            *pDest++ = usPixel;
+                            c <<= 2;
+                        }
+                    }
+                    break;
+                case 1:
+                    for (x=0; x<pDraw->iWidth; x+=4) {
+                        c = *s++;
+                        for (j=0; j<8; j++) { // work on pairs of bits
+                            pPal = &pDraw->pPalette[(c >> 7) * 3];
+                            usPixel = (pPal[2] >> 3); // blue
+                            usPixel |= ((pPal[1] >> 2) << 5); // green
+                            usPixel |= ((pPal[0] >> 3) << 11); // red
+                            if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                                usPixel = __builtin_bswap16(usPixel);
+                            *pDest++ = usPixel;
+                            c <<= 1;
+                        }
+                    }
+                    break;
+            } // switch on bits per pixel
+            break;
+        case PNG_PIXEL_TRUECOLOR_ALPHA: // truecolor + alpha
+            if (u32Bkgd != 0xffffffff) { // user wants to blend it with a background color
+                uint32_t r, g, b, a;
+                uint32_t b_r, b_g, b_b;
+                b_r = u32Bkgd & 0xff; b_g = (u32Bkgd & 0xff00) >> 8;
+                b_b = (u32Bkgd >> 16) & 0xff;
+                uint16_t u16Clr = (u32Bkgd & 0xf8) << 8;
+                u16Clr |= ((u32Bkgd & 0xfc00) >> 5);
+                u16Clr |= ((u32Bkgd & 0xf80000) >> 19);
+                for (x=0; x<pDraw->iWidth; x++) {
+                    r = s[0]; g = s[1]; b = s[2]; a = s[3];
+                    if (a == 0)
+                        usPixel = u16Clr;
+                    else if (a == 255) { // fully opaque
+                        usPixel = (s[2] >> 3); // blue
+                        usPixel |= ((s[1] >> 2) << 5); // green
+                        usPixel |= ((s[0] >> 3) << 11); // red
+                    } else { // mix the colors
+                        r = ((r * a) + (b_r * (255-a))) >> 8;
+                        g = ((g * a) + (b_g * (255-a))) >> 8;
+                        b = ((b * a) + (b_b * (255-a))) >> 8;
+                        usPixel = (b >> 3); // blue
+                        usPixel |= ((g >> 2) << 5); // green
+                        usPixel |= ((r >> 3) << 11); // red
+                    }
+                    if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                        usPixel = __builtin_bswap16(usPixel);
+                    *pDest++ = usPixel;
+                    s += 4; // skip alpha
+                }
+            } else { // ignore alpha
+                for (x=0; x<pDraw->iWidth; x++) {
+                    usPixel = (s[2] >> 3); // blue
+                    usPixel |= ((s[1] >> 2) << 5); // green
+                    usPixel |= ((s[0] >> 3) << 11); // red
+                    if (iEndiannes == PNG_RGB565_BIG_ENDIAN)
+                        usPixel = __builtin_bswap16(usPixel);
+                    *pDest++ = usPixel;
+                    s += 4; // skip alpha
+                }
+            }
+            break;
+    }
+} /* PNGRGB565() */
+//
+// Helper functions for memory based images
+//
+PNG_STATIC int32_t seekMem(PNGFILE *pFile, int32_t iPosition)
+{
+    if (iPosition < 0) iPosition = 0;
+    else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1;
+    pFile->iPos = iPosition;
+    return iPosition;
+} /* seekMem() */
+
+PNG_STATIC int32_t readFLASH(PNGFILE *pFile, uint8_t *pBuf, int32_t iLen)
+{
+    int32_t iBytesRead;
+
+    iBytesRead = iLen;
+    if ((pFile->iSize - pFile->iPos) < iLen)
+       iBytesRead = pFile->iSize - pFile->iPos;
+    if (iBytesRead <= 0)
+       return 0;
+    memcpy_P(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
+    pFile->iPos += iBytesRead;
+    return iBytesRead;
+} /* readFLASH() */
+
+PNG_STATIC int32_t readRAM(PNGFILE *pFile, uint8_t *pBuf, int32_t iLen)
+{
+    int32_t iBytesRead;
+
+    iBytesRead = iLen;
+    if ((pFile->iSize - pFile->iPos) < iLen)
+       iBytesRead = pFile->iSize - pFile->iPos;
+    if (iBytesRead <= 0)
+       return 0;
+    memcpy(pBuf, &pFile->pData[pFile->iPos], iBytesRead);
+    pFile->iPos += iBytesRead;
+    return iBytesRead;
+} /* readRAM() */
+//
+// Verify it's a PNG file and then parse the IHDR chunk
+// to get basic image size/type/etc
+//
+PNG_STATIC int PNGParseInfo(PNGIMAGE *pPage)
+{
+    uint8_t *s = pPage->ucFileBuf;
+    int iBytesRead;
+    
+    pPage->iHasAlpha = pPage->iInterlaced = 0;
+    // Read a few bytes to just parse the size/pixel info
+    iBytesRead = (*pPage->pfnRead)(&pPage->PNGFile, s, 32);
+    if (iBytesRead < 32) { // a PNG file this tiny? probably bad
+        pPage->iError = PNG_INVALID_FILE;
+        return pPage->iError;
+    }
+
+    if (MOTOLONG(s) != (int32_t)0x89504e47) { // check that it's a PNG file
+        pPage->iError = PNG_INVALID_FILE;
+        return pPage->iError;
+    }
+    if (MOTOLONG(&s[12]) == 0x49484452/*'IHDR'*/) {
+        pPage->iWidth = MOTOLONG(&s[16]);
+        pPage->iHeight = MOTOLONG(&s[20]);
+        pPage->ucBpp = s[24]; // bits per pixel
+        pPage->ucPixelType = s[25]; // pixel type
+        pPage->iInterlaced = s[28];
+        if (pPage->iInterlaced || pPage->ucBpp > 8) { // 16-bit pixels are not supported (yet)
+            pPage->iError = PNG_UNSUPPORTED_FEATURE;
+            return pPage->iError;
+        }
+        // calculate the number of bytes per line of pixels
+        switch (pPage->ucPixelType) {
+            case PNG_PIXEL_GRAYSCALE: // grayscale
+            case PNG_PIXEL_INDEXED: // indexed
+                pPage->iPitch = (pPage->iWidth * pPage->ucBpp + 7)/8; // bytes per pixel
+                break;
+            case PNG_PIXEL_TRUECOLOR: // truecolor
+                pPage->iPitch = ((3 * pPage->ucBpp) * pPage->iWidth + 7)/8;
+                break;
+            case PNG_PIXEL_GRAY_ALPHA: // grayscale + alpha
+                pPage->iPitch = ((2 * pPage->ucBpp) * pPage->iWidth + 7)/8;
+                pPage->iHasAlpha = 1;
+                break;
+            case PNG_PIXEL_TRUECOLOR_ALPHA: // truecolor + alpha
+                pPage->iPitch = ((4 * pPage->ucBpp) * pPage->iWidth + 7)/8;
+                pPage->iHasAlpha = 1;
+        } // switch
+    }
+    if (pPage->iPitch >= PNG_MAX_BUFFERED_PIXELS)
+       return PNG_TOO_BIG;
+
+    return PNG_SUCCESS;
+} /* PNGParseInfo() */
+//
+// De-filter the current line of pixels
+//
+PNG_STATIC void DeFilter(uint8_t *pCurr, uint8_t *pPrev, int iWidth, int iPitch)
+{
+    uint8_t ucFilter = *pCurr++;
+    int x, iBpp;
+    if (iPitch <= iWidth)
+        iBpp = 1;
+    else
+        iBpp = iPitch / iWidth;
+    
+    pPrev++; // skip filter of previous line
+    switch (ucFilter) { // switch on filter type
+        case PNG_FILTER_NONE:
+            // nothing to do :)
+            break;
+        case PNG_FILTER_SUB:
+            for (x=iBpp; x<iPitch; x++) {
+                pCurr[x] += pCurr[x-iBpp];
+            }
+            break;
+        case PNG_FILTER_UP:
+            for (x = 0; x < iPitch; x++) {
+               pCurr[x] += pPrev[x];
+            }
+            break;
+        case PNG_FILTER_AVG:
+            for (x = 0; x < iBpp; x++) {
+               pCurr[x] = (pCurr[x] +
+                  pPrev[x] / 2 );
+            }
+            for (x = iBpp; x < iPitch; x++) {
+               pCurr[x] = pCurr[x] +
+                  (pPrev[x] + pCurr[x-iBpp]) / 2;
+            }
+            break;
+        case PNG_FILTER_PAETH:
+            if (iBpp == 1) {
+                int a, c;
+                uint8_t *pEnd = &pCurr[iPitch];
+                // First pixel/byte
+                c = *pPrev++;
+                a = *pCurr + c;
+                *pCurr++ = (uint8_t)a;
+                while (pCurr < pEnd) {
+                   int b, pa, pb, pc, p;
+                   a &= 0xff; // From previous iteration
+                   b = *pPrev++;
+                   p = b - c;
+                   pc = a - c;
+                   // assume no native ABS() instruction
+                   pa = p < 0 ? -p : p;
+                   pb = pc < 0 ? -pc : pc;
+                   pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+                   // choose the best predictor
+                   if (pb < pa) {
+                      pa = pb; a = b;
+                   }
+                   if (pc < pa) a = c;
+                   // Calculate current pixel
+                   c = b;
+                   a += *pCurr;
+                   *pCurr++ = (uint8_t)a;
+                }
+            } else { // multi-byte
+                uint8_t *pEnd = &pCurr[iBpp];
+                // first pixel is treated the same as 'up'
+                while (pCurr < pEnd) {
+                   int a = *pCurr + *pPrev++;
+                   *pCurr++ = (uint8_t)a;
+                }
+                pEnd = pEnd + (iPitch - iBpp);
+                while (pCurr < pEnd) {
+                   int a, b, c, pa, pb, pc, p;
+                   c = pPrev[-iBpp];
+                   a = pCurr[-iBpp];
+                   b = *pPrev++;
+                   p = b - c;
+                   pc = a - c;
+                    // asume no native ABS() instruction
+                   pa = p < 0 ? -p : p;
+                   pb = pc < 0 ? -pc : pc;
+                   pc = (p + pc) < 0 ? -(p + pc) : p + pc;
+                   if (pb < pa) {
+                      pa = pb; a = b;
+                   }
+                   if (pc < pa) a = c;
+                   a += *pCurr;
+                   *pCurr++ = (uint8_t)a;
+                }
+            } // multi-byte
+            break;
+    } // switch on filter type
+} /* DeFilter() */
+//
+// PNGInit
+// Parse the PNG file header and confirm that it's a valid file
+//
+// returns 0 for success, 1 for failure
+//
+PNG_STATIC int PNGInit(PNGIMAGE *pPNG)
+{
+    return PNGParseInfo(pPNG); // gather info for image
+} /* PNGInit() */
+//
+// Decode the PNG file
+//
+// You must call open() before calling decode()
+// This function can be called repeatedly without having
+// to close and re-open the file
+//
+PNG_STATIC int DecodePNG(PNGIMAGE *pPage, void *pUser, int iOptions)
+{
+    int err, y, iLen=0;
+    int bDone, iOffset, iFileOffset, iBytesRead;
+    int iMarker=0;
+    uint8_t *tmp, *pCurr, *pPrev;
+    z_stream d_stream; /* decompression stream */
+    uint8_t *s = pPage->ucFileBuf;
+    struct inflate_state *state;
+    
+    // Either the image buffer must be allocated or a draw callback must be set before entering
+    if (pPage->pImage == NULL && pPage->pfnDraw == NULL) {
+        pPage->iError = PNG_NO_BUFFER;
+        return 0;
+    }
+    // Use internal buffer to maintain the current and previous lines
+    pCurr = pPage->ucPixels;
+    pPrev = &pPage->ucPixels[pPage->iPitch+1];
+    pPage->iError = PNG_SUCCESS;
+    // Start decoding the image
+    bDone = FALSE;
+    // Inflate the compressed image data
+    // The allocation functions are disabled and zlib has been modified
+    // to not use malloc/free and instead the buffer is part of the PNG class
+    d_stream.zalloc = (alloc_func)0;
+    d_stream.zfree = (free_func)0;
+    d_stream.opaque = (voidpf)0;
+    // Insert the memory pointer here to avoid having to use malloc() inside zlib
+    state = (struct inflate_state FAR *)pPage->ucZLIB;
+    d_stream.state = (struct internal_state FAR *)state;
+    state->window = &pPage->ucZLIB[sizeof(inflate_state)]; // point to 32k dictionary buffer
+    err = inflateInit(&d_stream);
+#ifdef FUTURE
+//    if (inpage->cCompression == PIL_COMP_IPHONE_FLATE)
+//        err = mz_inflateInit2(&d_stream, -15); // undocumented option which ignores header and crcs
+//    else
+//        err = mz_inflateInit2(&d_stream, 15);
+#endif // FUTURE
+    
+    iFileOffset = 8; // skip PNG file signature
+    iOffset = 0; // internal buffer offset starts at 0
+    // Read some data to start
+    (*pPage->pfnSeek)(&pPage->PNGFile, iFileOffset);
+    iBytesRead = (*pPage->pfnRead)(&pPage->PNGFile, s, PNG_FILE_BUF_SIZE);
+    iFileOffset += iBytesRead;
+    y = 0;
+    d_stream.avail_out = 0;
+    d_stream.next_out = pPage->pImage;
+
+    while (y < pPage->iHeight) { // continue until fully decoded
+        // parse the markers until the next data block
+    while (!bDone)
+    {
+        iLen = MOTOLONG(&s[iOffset]); // chunk length
+        if (iLen < 0 || iLen + (iFileOffset - iBytesRead) > pPage->PNGFile.iSize) // invalid data
+        {
+            pPage->iError = PNG_DECODE_ERROR;
+            return 1;
+        }
+        iMarker = MOTOLONG(&s[iOffset+4]);
+        iOffset += 8; // point to the marker data
+        switch (iMarker)
+        {
+            case 0x44474b62: // 'bKGD' DEBUG
+                break;
+            case 0x67414d41: //'gAMA'
+                break;
+#ifdef FUTURE
+            case 0x6663544C: //'fcTL' frame control block for animated PNG (need to get size of this partial image)
+                pPage->iWidth = MOTOLONG(&pPage->pData[iOffset + 4]); // frame width
+                pPage->iHeight = MOTOLONG(&pPage->pData[iOffset + 8]); // frame height
+                bDone = TRUE;
+                break;
+#endif
+            case 0x504c5445: //'PLTE' palette colors
+                memset(&pPage->ucPalette[768], 0xff, 256); // assume all colors are opaque unless specified
+                memcpy(pPage->ucPalette, &s[iOffset], iLen);
+                if (iOptions & PNG_FAST_PALETTE) { // create a RGB565 palette
+                    int i, iColors = 1 << pPage->ucBpp;
+                    uint16_t usPixel, *d;
+                    uint8_t *s = pPage->ucPalette;
+                    d = (uint16_t *)&pPage->ucPixels[sizeof(pPage->ucPixels)-512];
+                    for (i=0; i<iColors; i++) {
+                    usPixel = (s[2] >> 3); // blue
+                    usPixel |= ((s[1] >> 2) << 5); // green
+                    usPixel |= ((s[0] >> 3) << 11); // red
+                    *d++ = usPixel;
+                    s += 3;
+                    }
+                }
+                break;
+            case 0x74524e53: //'tRNS' transparency info
+                if (pPage->ucPixelType == PNG_PIXEL_INDEXED) // if palette exists
+                {
+                    memcpy(&pPage->ucPalette[768], &s[iOffset], iLen);
+                    pPage->iHasAlpha = 1;
+                }
+                else if (iLen == 2) // for grayscale images
+                {
+                    pPage->iTransparent = s[iOffset + 1]; // lower part of 2-byte value is transparent color index
+                    pPage->iHasAlpha = 1;
+                }
+                else if (iLen == 6) // transparent color for 24-bpp image
+                {
+                    pPage->iTransparent = s[iOffset + 5]; // lower part of 2-byte value is transparent color value
+                    pPage->iTransparent |= (s[iOffset + 3] << 8);
+                    pPage->iTransparent |= (s[iOffset + 1] << 16);
+                    pPage->iHasAlpha = 1;
+                }
+                break;
+            case 0x49444154: //'IDAT' image data block
+                while (iLen) {
+                    if (iOffset >= iBytesRead) {
+                        // we ran out of data; get some more
+                        iBytesRead = (*pPage->pfnRead)(&pPage->PNGFile, pPage->ucFileBuf, (iLen > PNG_FILE_BUF_SIZE) ? PNG_FILE_BUF_SIZE : iLen);
+                        iFileOffset += iBytesRead;
+                        iOffset = 0;
+                    } else {
+                        // number of bytes remaining in buffer
+                        iBytesRead -= iOffset;
+                    }
+                    d_stream.next_in  = &pPage->ucFileBuf[iOffset];
+                    d_stream.avail_in = iBytesRead;
+                    iLen -= iBytesRead;
+                    if (iLen < 0) iLen = 0;
+                    iOffset += iBytesRead;
+            //        if (iMarker == 0x66644154) // data starts at offset 4 in APNG frame data block
+            //        {
+            //            d_stream.next_in += 4;
+            //            d_stream.avail_in -= 4;
+            //        }
+                    err = 0;
+                    while (err == Z_OK) {
+                        if (d_stream.avail_out == 0) { // reset for next line
+                            d_stream.avail_out = pPage->iPitch+1;
+                            d_stream.next_out = pCurr;
+                        } // otherwise it could be a continuation of an unfinished line
+                        err = inflate(&d_stream, Z_NO_FLUSH, iOptions & PNG_CHECK_CRC);
+                        if ((err == Z_OK || err == Z_STREAM_END) && d_stream.avail_out == 0) {// successfully decoded line
+                            DeFilter(pCurr, pPrev, pPage->iWidth, pPage->iPitch);
+                            if (pPage->pImage == NULL) { // no image buffer, send it line by line
+                                PNGDRAW pngd;
+                                pngd.pUser = pUser;
+                                pngd.iPitch = pPage->iPitch;
+                                pngd.iWidth = pPage->iWidth;
+                                pngd.pPalette = pPage->ucPalette;
+                                pngd.pFastPalette = (iOptions & PNG_FAST_PALETTE) ? (uint16_t *)&pPage->ucPixels[sizeof(pPage->ucPixels)-512] : NULL;
+                                pngd.pPixels = pCurr+1;
+                                pngd.iPixelType = pPage->ucPixelType;
+                                pngd.iHasAlpha = pPage->iHasAlpha;
+                                pngd.iBpp = pPage->ucBpp;
+                                pngd.y = y;
+                                (*pPage->pfnDraw)(&pngd);
+                            } else {
+                                // copy to destination bitmap
+                                memcpy(&pPage->pImage[y * pPage->iPitch], &pCurr[1], pPage->iPitch);
+                            }
+                            y++;
+                        // swap current and previous lines
+                        tmp = pCurr; pCurr = pPrev; pPrev = tmp;
+                        } else { // some error
+                            tmp = NULL;
+                        }
+                    }
+                    if (err == Z_STREAM_END && d_stream.avail_out == 0) {
+                        // successful decode, stop here
+                        y = pPage->iHeight;
+                        bDone = TRUE;
+                    } else  if (err == Z_DATA_ERROR || err == Z_STREAM_ERROR) {
+                        iLen = 0; // quit now
+                        y = pPage->iHeight;
+                        pPage->iError = PNG_DECODE_ERROR;
+                        bDone = TRUE; // force loop to exit with error
+                    } else if (err == Z_BUF_ERROR) {
+                        y |= 0; // need more data
+                    }
+                } // while (iLen)
+                if (y != pPage->iHeight && iFileOffset < pPage->PNGFile.iSize) {
+                    // need to read more IDAT chunks
+                    iBytesRead = (*pPage->pfnRead)(&pPage->PNGFile, pPage->ucFileBuf,  PNG_FILE_BUF_SIZE);
+                    iFileOffset += iBytesRead;
+                    iOffset = 0;
+                }
+                break;
+                //               case 0x69545874: //'iTXt'
+                //               case 0x7a545874: //'zTXt'
+#ifdef FUTURE
+            case 0x74455874: //'tEXt'
+            {
+                char szTemp[256];
+                char *pDest = NULL;
+                memcpy(szTemp, &s[iOffset], 80); // get the label length (Title, Author, Description, Copyright, Creation Time, Software, Disclaimer, Warning, Source, Comment)
+                i = (int)strlen(szTemp) + 1; // start of actual text
+                if (strcmp(szTemp, "Comment") == 0 || strcmp(szTemp, "Description") == 0) pDest = &pPage->szComment[0];
+                else if (strcmp(szTemp, "Software") == 0) pDest = &pPage->szSoftware[0];
+                else if (strcmp(szTemp, "Author") == 0) pDest = &pPage->szArtist[0];
+                if (pDest != NULL)
+                {
+                    if ((iLen - i) < 128)
+                    {
+                        memcpy(pPage->szComment, &pPage->pData[iOffset + i], iLen - i);
+                        pPage->szComment[iLen - i + 1] = 0;
+                    }
+                    else
+                    {
+                        memcpy(pPage->szComment, &pPage->pData[iOffset + i], 127);
+                        pPage->szComment[127] = '\0';
+                    }
+                }
+            }
+                break;
+#endif
+        } // switch
+        iOffset += (iLen + 4); // skip data + CRC
+        if (iOffset > iBytesRead-8) { // need to read more data
+            iFileOffset += (iOffset - iBytesRead);
+            (*pPage->pfnSeek)(&pPage->PNGFile, iFileOffset);
+            iBytesRead = (*pPage->pfnRead)(&pPage->PNGFile, s, PNG_FILE_BUF_SIZE);
+            iFileOffset += iBytesRead;
+            iOffset = 0;
+        }
+    } // while !bDone
+    } // while y < height
+    err = inflateEnd(&d_stream);
+    return pPage->iError;
+} /* DecodePNG() */