diff --git a/.github/scripts/esp-idf-versions.php b/.github/scripts/esp-idf-versions.php
index bb14fe35..6e23f7a9 100644
--- a/.github/scripts/esp-idf-versions.php
+++ b/.github/scripts/esp-idf-versions.php
@@ -1,121 +1,436 @@
$line )
+$fqbns = [];
+
+foreach($idf_versions_json['VERSIONS'] as $version)
{
- if( !preg_match("/release/", $line ) )
- continue; // tag or commit
- $line = trim($line);
- if( empty($line) )
- continue; // EOL or separator
- $line_parts = explode("/", trim($line)); // tag name is the last part
- if( !empty( $line_parts ) )
- $releases[] = end($line_parts);
+ if(!isset($version['name']) || !isset($version['old']) || !isset($version['supported_targets']) )
+ continue; // skip first entry, EOL, unsupported and preview versions
+ if($version['old']!=='false')
+ continue; // only keep current versions
+
+ foreach($version['supported_targets'] as $board)
+ {
+ if(in_array($board, $idf_boards)) // only keep supported targets
+ {
+ // e.g. esp32@5.2.1
+ $fqbns[] = $board.'@'.str_replace(["v","V"], "", $version['name']);
+ }
+ }
+
}
-!empty($releases) or php_die("releases not found");
+// merge collected fqbns with hardcoded fqbns
+array_push($fqbns, ...$hardcoded_fqbns);
-arsort( $releases );
+// print the json and exit
+php_die( json_encode( [ "esp-idf-fqbn" => $fqbns ], JSON_PRETTY_PRINT ), 0 );
-// get version numbers from enumerated tags
-foreach( $lines as $num => $line )
+// same as die() with with end of line
+function php_die($msg, $errcode=1)
{
- if( !preg_match("/tags/", $line ) )
- continue;
- $line = trim($line);
- $tag_parts = explode("/", $line );
- $tag_name = end( $tag_parts );
- if( substr( $tag_name, 0, 1 ) == 'v' // esp-idf official tag names are prefixed with "v"
- && substr( $tag_name, -3 ) != '^{}' // ignore commit pointers returned by git ls-remote
- /*&& !preg_match( '/beta|dev|rc|head|merge/i', $tag_name)*/ ) // ignore beta/dev/rc and other non significant tags
+ echo $msg.PHP_EOL;
+ exit($errcode);
+}
+
+
+// grabbed from https://github.com/ovidigital/js-object-to-json/blob/master/src/JsConverter.php
+// changes by tobozo:
+// - added ::trimToBrackets(string $input):string
+// - disabled the unquoting of booleans in ::convertToJson()
+class JsConverter
+{
+ /**
+ * Converts a JavaScript object string to a JSON formatted string.
+ *
+ * @param string $jsObjectString The JavaScript object
+ * @return string
+ */
+ public static function convertToJson(string $jsObjectString): string
{
- if(! preg_match("/^v?(0|(?:[1-9]\d*))(?:\.(0|(?:[1-9]\d*))(?:\.(0|(?:[1-9]\d*)))?(?:\-([\w][\w\.\-_]*))?)?$/i", $tag_name, $results ) )
+ $replacedStringsList = [];
+ // Remove single line comments
+ $convertedString = self::removeSingleLineComments($jsObjectString);
+ // Remove functions from objects
+ $convertedString = self::removeFunctions($convertedString);
+ // Replace all delimited string literals with placeholders
+ $convertedString = self::escapeSingleQuoteBetweenDoubleQuotes($convertedString);
+ $convertedString = self::replaceSectionsWithPlaceholders($convertedString, $replacedStringsList, "`");
+ $convertedString = self::replaceSectionsWithPlaceholders($convertedString, $replacedStringsList, "'");
+ self::fixQuoteEscapingForSingleQuoteDelimitedStrings($replacedStringsList);
+ $convertedString = self::unescapeSingleQuoteBetweenDoubleQuotes($convertedString);
+ $convertedString = self::replaceSectionsWithPlaceholders($convertedString, $replacedStringsList, '"');
+ // Now is safe to remove all white space
+ $convertedString = preg_replace('/\s+/m', '', $convertedString);
+ // And remove all trailing commas in objects
+ $convertedString = str_replace([',}', ',]'], ['}', ']'], $convertedString);
+ // Add double quotes for keys
+ $convertedString = preg_replace('/([^{}\[\]#,]+):/', '"$1":', $convertedString);
+ // Add double quotes for values
+ $convertedString = preg_replace_callback(
+ '/:([^{}\[\]#,]+)/',
+ static function ($matches)
+ {
+ if (is_numeric($matches[1]))
+ {
+ return ':' . $matches[1];
+ }
+
+ return ':"' . $matches[1] . '"';
+ },
+ $convertedString
+ );
+ // Make sure "true", "false" and "null" values get delimited by double quotes
+ // Need to run the replacement twice, because not all values get replaced if they are adjacent
+ $convertedString = preg_replace('/([^"])(true|false|null)([^"])/', '$1"$2"$3', $convertedString);
+ $convertedString = preg_replace('/([^"])(true|false|null)([^"])/', '$1"$2"$3', $convertedString);
+ // Replace the placeholders with the initial strings
+ $deep = false;
+ do
{
- php_die("Bad semver with entry $num: $tag_name");
+ $convertedString = preg_replace_callback(
+ '/###(\d+)###/',
+ static function ($matches) use (&$replacedStringsList, $deep)
+ {
+ $replace = $replacedStringsList[$matches[1]];
+ unset($replacedStringsList[$matches[1]]);
+ return ($deep ? "'" . $replace . "'" : '"' . $replace . '"');
+ },
+ $convertedString
+ );
+
+ $deep = true;
+ } while (!empty($replacedStringsList));
+ // Note: unquoting booleans is disabled for the sakes of this script only
+ // $convertedString = preg_replace('/:(")(true|false|null)(")/', ':$2', $convertedString);
+ return self::trimToBrackets($convertedString);
+ }
+
+ /**
+ * Convert the given JS object to JSON and json_decode it
+ *
+ * @param string $input
+ * @return array|null
+ */
+ public static function convertToArray(string $input): ?array
+ {
+ return json_decode(self::convertToJson($input), true);
+ }
+
+ // remove (var/let/const) root declaration and trailing semicolon
+ // so the output is really enclosed by curly brackets and no javascript
+ // artefact remains
+ public static function trimToBrackets(string $input): string
+ {
+ $input = trim($input);
+ if($input[0] !== '{')
+ {
+ $input = substr($input, strpos($input, '{'));
}
- unset($results[0]);
- $semver = "v".implode('.', $results );
- if( $semver != $tag_name )
- continue; // pattern matching failed with $semver
- //php_die("uh oh pattern matching failed with $semver/$tag_name");
- $minor = $results[1].'.'.$results[2];
- $patch = !empty($results[3]) ? $results[1].'.'.$results[2].'.'.$results[3] : "";
- if( !in_array( 'v'.$minor, $releases ) )
- continue; // this tag is not listed in releases
- if( !empty($results[3]) && !in_array( $patch, $patch_versions ) )
- $patch_versions[] = $patch;
+ if($input[-1] == ';' )
+ $input[-1] = ' ';
+ //echo $input;
+ return trim($input);
}
-}
-!empty($patch_versions) or php_die("tags not found");
+ /**
+ * Remove all JS functions by counting the number of braces between open and
+ * close (excl strings which should be placeholder-ed at this point).
+ *
+ * Removes shorthand and longhand functions whether they're single or multi-line:
+ * key: (var) => 'Test',
+ * key: var => 'Test',
+ * key: () => 'Test',
+ * key: () => { return 'Test'; },
+ * key: (var) => {
+ * return 'Test';
+ * },
+ * key: () => {
+ * return 'Test';
+ * },
+ * key: () => {
+ * if (complex) {
+ * return 'Test';
+ * }
+ *
+ * return 'Test';
+ * },
+ * key() {
+ * return 'Test';
+ * },
+ *
+ * @param string $input
+ * @param boolean $debug (optional table view of the logic being broken down)
+ * @return string
+ */
+ protected static function removeFunctions(string $input, bool $debug = false): string
+ {
+ $functionLines = '/^(\s*)(?:([\'"]?\w+[\'"]?):\s*(function\s*\([^)]*\)\s*{|\s*(?:\([^)]*\)|[a-z0-9]+)\s*=>\s*)|[a-z0-9]+\([^)]*\)\s*{)/i';
+ $lines = preg_split('/[\n\r]/', $input);
-arsort( $patch_versions );
+ $delete = false;
-$max_boards = (count($idf_boards)*$max_versions);
+ $opens = 0;
+ $closes = 0;
+ $table = [];
-// match release versions with tag versions
-foreach( $releases as $minor )
-{
- $top_version = '';
- foreach( $patch_versions as $patch )
- {
- if( str_starts_with( 'v'.$patch, $minor ) )
+ foreach ($lines as $index => $line)
{
- if( $patch > $top_version ) // SEQ comparator on a string is just cheap semver, what could go wrong ? :)
+ $row = [
+ 'line' => $line,
+ 'mode' => 'standard',
+ 'action' => 'Keep',
+ 'opens' => $opens,
+ 'closes' => $closes,
+ ];
+
+ if (preg_match($functionLines, $line))
+ {
+ $opens = substr_count($line, '{');
+ $closes = substr_count($line, '}');
+
+ $row['mode'] = 'Start (found opens: ' . substr_count($line, '{') . ')';
+ $row['opens'] = $opens;
+ $row['closes'] = $closes;
+ unset($lines[$index]);
+
+ if ($opens === $closes)
+ {
+ $row['action'] = 'Delete (Final)';
+ }
+ else
+ {
+ $delete = true;
+ $row['action'] = 'Delete (Continue)';
+ }
+
+
+ $table[] = $row;
+ continue;
+ }
+
+ if ($delete)
+ {
+ $opens += substr_count($line, '{');
+ $closes += substr_count($line, '}');
+
+ $row['opens'] = $opens;
+ $row['closes'] = $closes;
+ $row['action'] = 'Delete';
+
+ unset($lines[$index]);
+
+ if ($opens === $closes)
+ {
+ $row['action'] = 'Delete (Final)';
+ $delete = false;
+ }
+ }
+
+ if ($debug)
{
- $top_version = $patch;
+ $table[] = $row;
}
}
- }
- if( $top_version == '' )
- continue;
- $idf_versions[] = str_replace('v', '', $top_version );
- if( count( $idf_versions ) == $max_versions )
- break;
-}
+ if ($debug)
+ {
+ print '| Index | Line | Mode | Action | Opens | Closes |
|---|
';
-!empty($idf_versions) or php_die("latest versions not found");
-!empty($idf_boards) or php_die("no board selected");
+ foreach ($table as $index => $row)
+ {
+ print ''
+ . '| ' . $index . ' | '
+ . ''. $row['line'] . ' | '
+ . ''. $row['mode'] . ' | '
+ . ''. $row['action'] . ' | '
+ . ''. $row['opens'] . ' | '
+ . ''. $row['closes'] . ' | '
+ . '
';
+ }
+
+ print '
';
+ die();
+ }
+
+ return implode("\n", $lines);
-// finally fill matrix json array with jobs
-foreach( $idf_versions as $idx => $idf_version )
-{
- if( count( $idf_fqbns ) >= $max_boards ) {
- break;
- }
- foreach( $idf_boards as $idf_board ) {
- $idf_fqbns[] = $idf_board.'@'.$idf_version;
}
-}
-// add hardcoded versions
-$idf_fqbns[] = 'esp32@4.1.4';
-$idf_fqbns[] = 'esp32@4.3.6';
-//$idf_fqbns[] = 'esp32@5.2-beta1';
-//$idf_fqbns[] = 'esp32@5.2-dev';
-//$idf_fqbns[] = 'esp32@5.3-dev';
+ /**
+ * Replaces sections enclosed by a specified delimiter with placeholders of form '######'.
+ *
+ * @param string $input The string input
+ * @param array $replacedSectionsList The replaced sections will be added to this array
+ * @param string $delimiter The delimiter that encloses the sections (e.g. "'" - single quote)
+ * @param bool $removeDelimitersFromSections Flag to remove or preserve the delimiters for the sections
+ * @return string
+ */
+ protected static function replaceSectionsWithPlaceholders(
+ string $input,
+ array &$replacedSectionsList,
+ string $delimiter,
+ bool $removeDelimitersFromSections = true
+ ): string
+ {
+ $output = $input[0];
+ $sectionStartPos = $sectionEndPos = -1;
+ $contentCopiedUntilPos = 0;
+
+ for ($i = 1; $i < strlen($input) - 1; $i++)
+ {
+ $char = $input[$i];
+ $prevChar = $input[$i - 1];
+
+ if ($char === $delimiter && $prevChar !== '\\')
+ {
+ if ($sectionStartPos === -1)
+ {
+ $sectionStartPos = $i;
+ }
+ elseif ($sectionEndPos === -1)
+ {
+ $sectionEndPos = $i;
+ }
+ }
-$json_array = [ "esp-idf-fqbn" => $idf_fqbns ];
+ // If a section has been identified
+ if ($sectionEndPos > -1)
+ {
+ $output .= substr($input, $contentCopiedUntilPos + 1, $sectionStartPos - $contentCopiedUntilPos - 1);
-echo json_encode( $json_array, JSON_PRETTY_PRINT );
+ // Replace section with placeholder
+ $output .= '###' . count($replacedSectionsList) . '###';
+ // Extract the section and add it to the replaced sections list
+ if ($removeDelimitersFromSections)
+ {
+ $section = substr($input, $sectionStartPos + 1, $sectionEndPos - $sectionStartPos - 1);
+ }
+ else
+ {
+ $section = substr($input, $sectionStartPos, $sectionEndPos - $sectionStartPos);
+ }
+ $replacedSectionsList[] = $section;
-function php_die($msg)
-{
- echo $msg.PHP_EOL;
- exit(1);
+ // Update relevant local vars
+ $contentCopiedUntilPos = $sectionEndPos;
+ $sectionStartPos = -1;
+ $sectionEndPos = -1;
+ }
+ }
+
+ $output .= substr($input, $contentCopiedUntilPos + 1);
+
+ return $output;
+ }
+
+ /**
+ * Fix the escaping for quotes inside strings that were initially delimited by single quotes.
+ *
+ * For example:
+ * ```
+ * 'string containing \' single quote' => "string containing ' single quote"
+ * 'string containing " double quote' => "string containing \" double quote"
+ * ```
+ * @param array $strings
+ */
+ protected static function fixQuoteEscapingForSingleQuoteDelimitedStrings(array &$strings): void
+ {
+ foreach ($strings as &$string)
+ {
+ // Escape contained double quotes
+ $string = preg_replace('/([^\\\])"/', '$1\"', $string);
+ // Unescape contained single quotes
+ $string = preg_replace("/\\\\'/", "'", $string);
+ }
+ }
+
+ protected static function escapeSingleQuoteBetweenDoubleQuotes(string $jsonString): string
+ {
+ return preg_replace_callback(
+ '/("[^\'"\n]*\'[^\'"\n]*")/',
+ static function ($matches)
+ {
+ return str_replace("'", "\'", $matches[1]);
+ },
+ $jsonString
+ );
+ }
+
+ protected static function unescapeSingleQuoteBetweenDoubleQuotes(string $jsonString): string
+ {
+ return preg_replace_callback(
+ '/("[^\'"\n]*\'[^\'"\n]*")/',
+ static function ($matches)
+ {
+ return str_replace("\'", "'", $matches[1]);
+ },
+ $jsonString
+ );
+ }
+
+ /**
+ * Removes single line comments (// ) from the given string.
+ *
+ * In order to avoid conflicts with URIs, the comments are only removed if the two forward slashes (//)
+ * are immediately followed by a white space character.
+ *
+ * @param string $jsonString
+ * @return string
+ */
+ protected static function removeSingleLineComments(string $jsonString): string
+ {
+ return preg_replace("@//\s.*$@m", "", $jsonString);
+ }
}
diff --git a/.github/workflows/ArduinoBuild.yml b/.github/workflows/ArduinoBuild.yml
index 5ce1c8cc..c4b3a69f 100644
--- a/.github/workflows/ArduinoBuild.yml
+++ b/.github/workflows/ArduinoBuild.yml
@@ -37,15 +37,10 @@ jobs:
platform-version:
# ESP32 Core versions for 3D matrix
- #- 1.0.6
- #- 2.0.0
- #- 2.0.1
- #- 2.0.2
- #- 2.0.3
- #- 2.0.4
- - 2.0.11
- - 2.0.12
- - 2.0.13
+ - 2.0.15
+ - 2.0.16
+ - 2.0.17
+ #- 3.0.0
include:
# 3D matrix doesn't apply to these:
@@ -61,19 +56,22 @@ jobs:
- { board: adafruit_funhouse_esp32s2, platform: esp32, archi: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', ... }
- { board: rpipico, platform: rp2040, archi: rp2040, platform-version: 2.3.3, cli-args: '--build-property compiler.cpp.extra_flags=-DSKIP_I2C_TEST', platform-url: 'https://github.com/earlephilhower/arduino-pico/releases/download/global/package_rp2040_index.json', ... }
+ - { board: esp32, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+ - { board: esp32s2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+ - { board: esp32s3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+ - { board: esp32c6, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+ - { board: esp32c3, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+ # - { board: esp32h2, platform: esp32, platform-version: latest, platform-url: 'https://espressif.github.io/arduino-esp32/package_esp32_index.json', archi: esp32, ... }
+
# 3D matrix applies to these:
- - { board: esp32, platform: esp32, archi: esp32, ... }
- - { board: esp32s2, platform: esp32, archi: esp32, ... }
- - { board: m5stick-c, platform: esp32, archi: esp32, ... }
- - { board: m5stack-core-esp32, platform: esp32, archi: esp32, ... }
- - { board: m5stack-core2, platform: esp32, archi: esp32, ... }
- - { board: esp32s3box, platform: esp32, archi: esp32, ... }
+ - { platform: esp32, archi: esp32, ... }
+
fail-fast: false
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/IDFBuild.yml b/.github/workflows/IDFBuild.yml
index 9a6f49dc..f87b3488 100644
--- a/.github/workflows/IDFBuild.yml
+++ b/.github/workflows/IDFBuild.yml
@@ -1,5 +1,7 @@
name: IDFBuild
+
+
env:
REPO_URL: https://github.com/espressif/esp-idf
PROJECT_DIR: examples/Test/build_test
@@ -33,7 +35,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
@@ -60,7 +62,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/OpenCVBuild.yml b/.github/workflows/OpenCVBuild.yml
index a65ff860..7ac41c6a 100644
--- a/.github/workflows/OpenCVBuild.yml
+++ b/.github/workflows/OpenCVBuild.yml
@@ -37,7 +37,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: 🪟 📦 Use GNU tar instead BSD tar
if: matrix.os == 'windows-latest'
diff --git a/.github/workflows/PlatformioBuild.yml b/.github/workflows/PlatformioBuild.yml
index 78240006..79955a5b 100644
--- a/.github/workflows/PlatformioBuild.yml
+++ b/.github/workflows/PlatformioBuild.yml
@@ -57,35 +57,36 @@ jobs:
- board: m5stack-core-esp32
- board: m5stack-core2
- board: m5stack-cores3
- - { board: esp8266, platform-version: 3.0.0, ... }
- - { board: esp8266, platform-version: 3.1.0, ... }
- - { board: esp8266, platform-version: 3.2.0, ... }
+ - { board: esp8266, platform-version: 4.2.1, ... }
+ - { board: esp8266, platform-version: 4.2.0, ... }
+ - { board: esp8266, platform-version: 4.1.0, ... }
- { board: seeed_wio_terminal, platform-version: default, ... }
- { board: adafruit_pybadge_m4, platform-version: default, ... }
- { board: pico, platform-version: default, ... }
+ - { board: native, platform-version: portduino, ... }
fail-fast: false
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
- name: Cache pip
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.cache/pip
key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
restore-keys: |
${{ runner.os }}-pip-
- name: Cache PlatformIO
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
path: ~/.platformio
key: ${{ runner.os }}-${{ hashFiles('**/lockfiles') }}
- name: Set up Python
- uses: actions/setup-python@v4
+ uses: actions/setup-python@v5
with:
python-version: '3.9'
@@ -101,4 +102,5 @@ jobs:
export pio_ver=${{ matrix.platform-version }}
export pio_env="${pio_ver//./_}"
pio pkg install -e ${{ matrix.board }}-$pio_env --no-save --library file://$(realpath ../../../)
+ [[ "$pio_env" == "portduino" ]] && { sudo apt update; sudo apt-get install libgpiod-dev libbluetooth-dev; export PLATFORMIO_SRC_DIR=portduino; }
pio run -e ${{ matrix.board }}-$pio_env
diff --git a/.github/workflows/SDLBuild.yml b/.github/workflows/SDLBuild.yml
index 86e80faf..14d731cc 100644
--- a/.github/workflows/SDLBuild.yml
+++ b/.github/workflows/SDLBuild.yml
@@ -49,12 +49,12 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Cache SDL2 for Windows
if: ${{ matrix.os == 'windows-latest' }}
- uses: actions/cache@v3
+ uses: actions/cache@v4
id: cache-SLD2-windows
with:
path: contrib
@@ -111,7 +111,7 @@ jobs:
- name: Upload WASM artifact
if: ${{ matrix.os == 'ubuntu-latest' }}
- uses: actions/upload-pages-artifact@v2
+ uses: actions/upload-pages-artifact@v3
with:
path: ${{env.WASM_DIR}}/build/www
diff --git a/.github/workflows/pioPkgPublish.yml b/.github/workflows/pioPkgPublish.yml
index 5ed95e4e..d2f4249d 100644
--- a/.github/workflows/pioPkgPublish.yml
+++ b/.github/workflows/pioPkgPublish.yml
@@ -11,7 +11,7 @@ jobs:
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.sha }}
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 2ea95bef..11c6cc17 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -12,7 +12,7 @@ jobs:
env:
ACTIONS_STEP_DEBUG: true
steps:
- - uses: actions/stale@v3.0.14
+ - uses: actions/stale@v9.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
diff --git a/CMakeLists.txt b/CMakeLists.txt
index eee5105d..353c5df3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,6 @@ file(GLOB SRCS
src/lgfx/Fonts/efont/*.c
src/lgfx/Fonts/IPA/*.c
src/lgfx/utility/*.c
- src/lgfx/v0/*.cpp
- src/lgfx/v0/panel/*.cpp
- src/lgfx/v0/platforms/*.cpp
- src/lgfx/v0/touch/*.cpp
src/lgfx/v1/*.cpp
src/lgfx/v1/misc/*.cpp
src/lgfx/v1/panel/*.cpp
diff --git a/README.md b/README.md
index 475bc9c1..a3efa194 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ This library is also compatible with the above models and display panels with a
// #define LGFX_FEATHER_ESP32_S3_TFT // Adafruit Feather ESP32 S3 TFT
// #define LGFX_ESPBOY // ESPboy
// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT // wywy ESP32S3 HMI DevKit
-// #define LGFX_ESP32_2432S028 // Sunton ESP32 2432S028
+// #define LGFX_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028
#define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
diff --git a/examples/HowToUse/1_simple_use/1_simple_use.ino b/examples/HowToUse/1_simple_use/1_simple_use.ino
index 22cb58ca..bf267f2c 100644
--- a/examples/HowToUse/1_simple_use/1_simple_use.ino
+++ b/examples/HowToUse/1_simple_use/1_simple_use.ino
@@ -22,6 +22,7 @@
// #define LGFX_ESP_WROVER_KIT // Espressif ESP-WROVER-KIT
// #define LGFX_ESP32_S3_BOX // Espressif ESP32-S3-BOX
// #define LGFX_ESP32_S3_BOX_LITE // Espressif ESP32-S3-BOX Lite
+// #define LGFX_ESP32_S3_BOX_V3 // Espressif ESP32-S3-BOX-3/3B
// #define LGFX_WIFIBOY_PRO // WiFiBoy Pro
// #define LGFX_WIFIBOY_MINI // WiFiBoy mini
// #define LGFX_MAKERFABS_TOUCHCAMERA // Makerfabs Touch with Camera
@@ -36,7 +37,7 @@
// #define LGFX_FEATHER_ESP32_S3_TFT // Adafruit Feather ESP32 S3 TFT
// #define LGFX_ESPBOY // ESPboy
// #define LGFX_WYWY_ESP32S3_HMI_DEVKIT // wywy ESP32S3 HMI DevKit
-// #define LGFX_ESP32_2432S028 // Sunton ESP32 2432S028
+// #define LGFX_SUNTON_ESP32_2432S028 // Sunton ESP32 2432S028
#define LGFX_AUTODETECT // 自動認識 (D-duino-32 XS, WT32-SC01, PyBadge はパネルID読取りが出来ないため自動認識の対象から外れています)
diff --git a/examples/Standard/DrawLineThickness/DrawLineThickness.ino b/examples/Standard/DrawLineThickness/DrawLineThickness.ino
new file mode 100644
index 00000000..fb02f661
--- /dev/null
+++ b/examples/Standard/DrawLineThickness/DrawLineThickness.ino
@@ -0,0 +1,290 @@
+#define LGFX_AUTODETECT
+#include
+
+LGFX tft;
+
+/*\
+ *
+ * ⚠️ Some of those features use a lot of maths, don't expect FTL performances :-)
+ *
+ * Features:
+ *
+ * - Antialiased thick lines, filled with plain color or gradient
+ * - Antialiased circles, filled with plain color or gradient
+ * - Rectangular fill with linear or radial gradient
+ *
+ * LGFX Methods:
+ *
+ * NOTE: COLOR can be any of uint8_t, uint16_t, uint32_t, RGBColor, rgb888_t, rgb565_t, rgb888_t, etc
+ *
+ * - Draw thick+smooth lines:
+ * void drawWideLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, float thick, COLOR color)
+ *
+ * - Draw thick+smooth lines (gradient fill):
+ * void drawWideLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, float thick, const colors_t gradient)
+ *
+ * - Draw wedge line:
+ * void drawWedgeLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, float thick0, float thick1, COLOR color)
+ *
+ * - Draw wedge line (gradient fill):
+ * void drawWedgeLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, float thick0, float thick1, const colors_t gradient)
+ *
+ * - Fill smooth circle with single color (redundant with fillSmoothCircle(), kept for benchmark):
+ * void drawSpot(int32_t x, int32_t y, float radius, COLOR fg_color)
+ *
+ * - Fill smooth circle, like fillSmoothCircle() but with gradient fill:
+ * void drawGradientSpot(int32_t x, int32_t y, float radius, const colors_t gradient)
+ *
+ * - Draw antialiased line:
+ * void drawSmoothLine( LovyanGFX* gfx, int32_t x0, int32_t y0, int32_t x1, int32_t y1, COLOR color )
+ *
+ * - Draw gradient line (not smoothed, used for filling):
+ * void drawGradientLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1, const colors_t gradient )
+ * void drawGradientHLine(int32_t x, int32_t y, uint32_t w, const colors_t gradient )
+ * void drawGradientVLine(int32_t x, int32_t y, uint32_t h, const colors_t gradient )
+ *
+ * - Fill rect with radial/linear gradient (fill_style_t can be any of RADIAL, HLINEAR or VLINEAR):
+ * void fillGradientRect(int32_t x, int32_t y, uint32_t w, uint32_t h, COLOR start, COLOR end, fill_style_t style=RADIAL )
+ * void fillGradientRect(int32_t x, int32_t y, uint32_t w, uint32_t h, const colors_t gradient, fill_style_t style=RADIAL )
+ *
+ * - Create a gradient item from a sized array of colors or from a pointer to an array of colors:
+ * colors_t createGradient( rgb888_t[] colors )
+ * colors_t createGradient( rgb888_t* colors, uint32_t count )
+ *
+ * - Example:
+ * lgfx::rgb888_t colors[] = { {0x00,0xff,0x00}, {0xff,0xff,0x00}, {0xff,0x80,0x00}, {0xff,0x00,0x00} };
+ * auto gradient = tft.createGradient( colors ); // create a gradient item
+ * tft.fillGradientRect( 10, 10, 200, 200, gradient, HLINEAR );
+ *
+ *
+\*/
+
+// a couple of colors array for the gradient examples
+static constexpr const lgfx::rgb888_t heatMap[] = { {0, 0xff, 0}, {0xff, 0xff, 0}, {0xff, 0x80, 0}, {0xff, 0, 0}, {0x80, 0, 0} }; // green => yellow => orange => red => dark red
+static constexpr const lgfx::rgb888_t greyscale[] = { {0,0,0}, {0xff,0xff,0xff} }; // black => white
+// a couple of gradient examples based on colors arrays
+static constexpr const lgfx::colors_t heatMapGradient = { heatMap, sizeof(heatMap)/sizeof(lgfx::rgb888_t) };
+static constexpr const lgfx::colors_t greyScaleGradient = { greyscale, sizeof(greyscale)/sizeof(lgfx::rgb888_t) };
+// for degrees to radians conversions
+static constexpr double deg2rad = M_PI/180.0;
+
+
+// some constant values based on display width/height
+struct constValues_t
+{
+ const uint32_t middleX = (tft.width()/2)-1;
+ const uint32_t middleY = (tft.height()/2)-1;
+ const uint32_t r1 = std::min(tft.width(),tft.height()) *.39;
+ const uint32_t r2 = r1/5;
+ const uint32_t r3 = std::min(tft.width(),tft.height()) *.45;
+ const uint32_t r4 = std::min(tft.width(),tft.height()) *.37;
+ const uint32_t thick1 = std::min(tft.width(),tft.height())/35;
+ const uint32_t thick2 = std::min(tft.width(),tft.height())/75;
+ const uint32_t thick3 = std::min(tft.width(),tft.height())/150;
+ const uint32_t bw0 = std::max(tft.width(),tft.height())/4;
+ const uint32_t bw1 = std::max(tft.width(),tft.height())/8;
+ const uint32_t max_thickness = std::min(tft.width(),tft.height())/25;
+ const lgfx::rgb888_t colors888[4] = { {0x00,0xff,0x00}, {0xff,0xff,0x00}, {0xff,0x80,0x00}, {0xff,0x00,0x00} };
+ const lgfx::colors_t gradient888 = tft.createGradient( colors888 );
+};
+
+
+// some random values based on display width/height
+struct randomValues_t
+{
+ constValues_t constValues;
+ const uint32_t x0 = random()%tft.width();
+ const uint32_t y0 = random()%tft.height();
+ const uint32_t x1 = random()%tft.width();
+ const uint32_t y1 = random()%tft.height();
+ const uint32_t thickness0 = (random()%constValues.max_thickness)+2;
+ const uint32_t thickness1 = (random()%constValues.max_thickness)+2;
+ const RGBColor colorstart = RGBColor( uint8_t(rand() % 0xff), uint8_t(rand() % 0xff), uint8_t(rand() % 0xff) );
+ const RGBColor colorend = RGBColor( uint8_t(rand() % 0xff), uint8_t(rand() % 0xff), uint8_t(rand() % 0xff) );
+ const lgfx::rgb888_t color24start = rand()%0x1000000u;
+ const lgfx::rgb888_t color24end = rand()%0x1000000u;
+ const lgfx::rgb565_t color16start = rand()%0x10000;
+ const lgfx::rgb565_t color16end = rand()%0x10000;
+ const lgfx::rgb332_t color8start = rand()%256;
+ const lgfx::rgb332_t color8end = rand()%256;
+ const lgfx::rgb888_t colors888[2] = { color24start, color24end };
+ const lgfx::colors_t gradient888 = tft.createGradient( colors888 );
+};
+
+
+
+void drawGrid()
+{
+ randomValues_t v;
+ auto cv = v.constValues;
+
+ float theta = ( M_PI / 180.0f ) * 22.5; // angle
+ float sin0 = sinf(theta);
+ float cos0 = cosf(theta);
+ float sin1 = sinf(M_PI-theta);
+ float cos1 = cosf(M_PI-theta);
+
+ for( int32_t y=-tft.height()*2; y=0 && last_y>=0 && (i/15)%2==1 ) {
+ lgfx::rgb888_t colorsRGB[] = { last_color, color };
+ auto gradientRGB = tft.createGradient( colorsRGB );
+ tft.drawWedgeLine( last_x, last_y, x2, y2, cv.thick1, cv.thick3, gradientRGB );
+ }
+ last_color = color;
+ last_x = x2;
+ last_y = y2;
+ }
+}
+
+
+void setup()
+{
+ tft.init();
+ tft.fillScreen(TFT_WHITE);
+}
+
+void loop()
+{
+ static bool toggler = true;
+ toggler = !toggler;
+ if( toggler ) {
+ runRandomLinesDemo();
+ vTaskDelay(1000);
+ } else {
+ runGradientDemo();
+ vTaskDelay(5000);
+ }
+}
+
diff --git a/examples/Test/build_test/platformio.ini b/examples/Test/build_test/platformio.ini
index 6dec1889..4476d8a5 100644
--- a/examples/Test/build_test/platformio.ini
+++ b/examples/Test/build_test/platformio.ini
@@ -9,6 +9,7 @@ extra_configs = platformio_esp8266.ini
platformio_esp32.ini
platformio_atmelsam.ini
platformio_rpipico.ini
+ platformio_native.ini
[env]
framework = arduino
diff --git a/examples/Test/build_test/platformio_atmelsam.ini b/examples/Test/build_test/platformio_atmelsam.ini
index 16e4b499..b0250c81 100644
--- a/examples/Test/build_test/platformio_atmelsam.ini
+++ b/examples/Test/build_test/platformio_atmelsam.ini
@@ -12,7 +12,9 @@ board = seeed_wio_terminal
[env:adafruit_pybadge_m4-default]
platform = ${atmelsam_default.platform}
board = adafruit_pybadge_m4
+lib_ignore = Adafruit TinyUSB Library
build_src_flags =
${env.src_build_flags}
-DLED_PIN=13
-O3 -flto
+ -DUSE_TINYUSB
diff --git a/examples/Test/build_test/platformio_esp8266.ini b/examples/Test/build_test/platformio_esp8266.ini
index a4c5289a..1369a33e 100644
--- a/examples/Test/build_test/platformio_esp8266.ini
+++ b/examples/Test/build_test/platformio_esp8266.ini
@@ -11,18 +11,26 @@ platform = espressif8266@3.1.0
[esp8266_3_2_0]
platform = espressif8266@3.2.0
+[esp8266_4_1_0]
+platform = espressif8266@4.1.0
+
+[esp8266_4_2_0]
+platform = espressif8266@4.2.0
+
+[esp8266_4_2_1]
+platform = espressif8266@4.2.1
+
[env:esp8266]
-[env:esp8266-3_0_0]
-platform = ${esp8266_3_0_0.platform}
+[env:esp8266-4_1_0]
+platform = ${esp8266_4_1_0.platform}
board = d1_mini
-[env:esp8266-3_1_0]
-platform = ${esp8266_3_1_0.platform}
+[env:esp8266-4_2_0]
+platform = ${esp8266_4_2_0.platform}
board = d1_mini
-[env:esp8266-3_2_0]
-platform = ${esp8266_3_2_0.platform}
+[env:esp8266-4_2_1]
+platform = ${esp8266_4_2_1.platform}
board = d1_mini
-
diff --git a/examples/Test/build_test/platformio_native.ini b/examples/Test/build_test/platformio_native.ini
new file mode 100644
index 00000000..ff2c1136
--- /dev/null
+++ b/examples/Test/build_test/platformio_native.ini
@@ -0,0 +1,43 @@
+[env:native-default]
+platform = https://github.com/geeksville/platform-native.git
+;build_flags = ${env.build_flags} -O0 -lgpiod
+; framework = arduino
+board = linux_hardware
+
+; build_src_filter =
+; -
+; -
+; -
+; -
+; -
+; -
+; -
+; -
+; -
+; +<../variants/portduino>
+
+; lib_deps = LovyanGFX
+
+;build_flags = -fPIC -Isrc/platform/portduino -O0 -lgpiod
+build_flags = -O0 -xc++ -std=c++14
+
+
+[env:native-portduino]
+platform = https://github.com/meshtastic/platform-native.git#784007630ca43b4811c6637606440588bb5acf39
+framework = arduino
+board = cross_platform
+;build_src_filter = +<**/*.cpp> -
+
+
+
+build_flags =
+ ${env.build_flags}
+ -lgpiod
+ -DPORTDUINO_LINUX_HARDWARE
+ -DARCH_PORTDUINO
+ -O0
+
+lib_deps =
+ SPI
+ Wire
+ LovyanGFX
\ No newline at end of file
diff --git a/examples/Test/build_test/portduino/main.cpp b/examples/Test/build_test/portduino/main.cpp
new file mode 100644
index 00000000..0bb562d8
--- /dev/null
+++ b/examples/Test/build_test/portduino/main.cpp
@@ -0,0 +1,55 @@
+
+#include "main.h"
+
+
+void setup()
+{
+ gpioInit();
+ initGPIOPin(25, "gpiochip4");
+ initGPIOPin(24, "gpiochip4");
+
+ Wire.begin(1);
+ display = new LGFX();
+ display->init();
+
+ canvas.setColorDepth(8);
+ canvas.setFont(&fonts::lgfxJapanMinchoP_32);
+ canvas.setTextWrap(false); // 右端到達時のカーソル折り返しを禁止
+ canvas.createSprite(display->width(), 36);
+ canvas.clear();
+ canvas.setCursor(0, 0);
+ canvas.printf("Touch to start\n");
+ canvas.pushSprite(display, 0, 0);
+}
+
+
+void loop()
+{
+ if (display->touch()) {
+ canvas.clear();
+ canvas.setCursor(0, 0);
+ lgfx::touch_point_t tp;
+ auto blah = display->getTouchRaw(&tp, 1);
+ if (blah > 0) {
+ canvas.printf("Touch %i, %i\n", tp.x, tp.y);
+ canvas.pushSprite(display, 0, 0);
+ }
+ }
+}
+
+
+int initGPIOPin(int pinNum, std::string gpioChipName)
+{
+ std::string gpio_name = "GPIO" + std::to_string(pinNum);
+ try {
+ GPIOPin *csPin;
+ csPin = new LinuxGPIOPin(pinNum, gpioChipName.c_str(), pinNum, gpio_name.c_str());
+ csPin->setSilent();
+ gpioBind(csPin);
+ return 1;
+ } catch (...) {
+ std::exception_ptr p = std::current_exception();
+ std::cout << "Warning, cannot claim pin " << gpio_name << (p ? p.__cxa_exception_type()->name() : "null") << std::endl;
+ return 0;
+ }
+}
diff --git a/examples/Test/build_test/portduino/main.h b/examples/Test/build_test/portduino/main.h
new file mode 100644
index 00000000..6d8f226b
--- /dev/null
+++ b/examples/Test/build_test/portduino/main.h
@@ -0,0 +1,65 @@
+#include "LovyanGFX.h"
+#include "Arduino.h"
+#include
+#include
+#include "linux/gpio/LinuxGPIOPin.h"
+#include "PortduinoGPIO.h"
+#include
+
+int initGPIOPin(int pinNum, std::string gpioChipName);
+
+class LGFX : public lgfx::LGFX_Device
+{
+ lgfx::Panel_ILI9341 _panel_instance;
+ lgfx::Bus_SPI _bus_instance;
+ lgfx::Touch_FT5x06 _touch_instance;
+
+public:
+ LGFX(void)
+ {
+ {
+ // Create I2C
+
+ //Init the TFT and touch
+ auto buscfg = _bus_instance.config();
+ buscfg.spi_mode = 0;
+ buscfg.pin_dc = 25;
+
+ // to use spidevX.Y
+ int x = 0;
+ int y = 0;
+ buscfg.spi_host = x + y << 4;
+ _bus_instance.config(buscfg); // applies the set value to the bus.
+ _panel_instance.setBus(&_bus_instance); // set the bus on the panel.
+ }
+ {
+ auto cfg = _panel_instance.config(); // Gets a structure for display panel settings.
+
+ cfg.panel_width = 240;
+ cfg.panel_height = 320;
+ cfg.offset_x = 0;
+ cfg.offset_y = 0;
+ cfg.offset_rotation = 0; // Rotation direction value offset 0~7 (4~7 is mirrored)
+ cfg.invert = 0;
+
+ _panel_instance.config(cfg);
+ }
+ {
+ auto touch_cfg = _touch_instance.config();
+ touch_cfg.x_min = 0;
+ touch_cfg.x_max = 319;
+ touch_cfg.y_min = 0;
+ touch_cfg.y_max = 239;
+ touch_cfg.pin_int = 24;
+ touch_cfg.bus_shared = true;
+ touch_cfg.offset_rotation = 1;
+ touch_cfg.i2c_addr = 0x38;
+ _touch_instance.config(touch_cfg);
+ _panel_instance.setTouch(&_touch_instance);
+ }
+ setPanel(&_panel_instance); // Sets the panel to use.
+ }
+};
+
+LGFX *display;
+LGFX_Sprite canvas;
diff --git a/library.json b/library.json
index 886ea499..8b45b0b9 100644
--- a/library.json
+++ b/library.json
@@ -11,7 +11,7 @@
"type": "git",
"url": "https://github.com/lovyan03/LovyanGFX.git"
},
- "version": "1.1.12",
+ "version": "1.1.16",
"frameworks": ["arduino", "espidf", "*"],
"platforms": ["espressif32", "espressif8266", "atmelsam", "native"],
"headers": "LovyanGFX.hpp",
diff --git a/library.properties b/library.properties
index f9d70beb..5240b8ef 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
name=LovyanGFX
-version=1.1.12
+version=1.1.16
author=lovyan03
maintainer=lovyan03
sentence=TFT LCD Graphics driver with touch for ESP32, ESP8266, SAMD21, SAMD51, RP2040
diff --git a/src/LovyanGFX.hpp b/src/LovyanGFX.hpp
index d6a04897..96648af7 100644
--- a/src/LovyanGFX.hpp
+++ b/src/LovyanGFX.hpp
@@ -22,20 +22,13 @@ Original Source:
#undef setFont
#endif
- #if defined ( LGFX_USE_V0 ) && __has_include("lgfx/v0_init.hpp")
+#include "lgfx/v1_init.hpp"
- #include "lgfx/v0_init.hpp"
+#if defined ( LGFX_AUTODETECT )
- #else
+ #include "LGFX_AUTODETECT.hpp"
- #include "lgfx/v1_init.hpp"
-
- #if defined ( LGFX_AUTODETECT )
-
- #include "LGFX_AUTODETECT.hpp"
-
- #endif
+#endif
- #endif
#endif
diff --git a/src/lgfx/boards.hpp b/src/lgfx/boards.hpp
index 45cc2f3b..ad89c3f0 100644
--- a/src/lgfx/boards.hpp
+++ b/src/lgfx/boards.hpp
@@ -53,7 +53,8 @@ namespace lgfx
, board_Feather_ESP32_S3_TFT
, board_FunHouse
, board_PyGamer
- , board_ESP32_2432S028
+ , board_Sunton_ESP32_2432S028
+ , board_ESP32_2432S028 = board_Sunton_ESP32_2432S028
, board_Makerfabs_ESP32_C3_TFT_Touch_SPI
, board_Makerfabs_ESP32_S3_TFT_Touch_SPI
, board_Makerfabs_ESP32_S2_TFT_Touch_Parallel16
@@ -62,6 +63,7 @@ namespace lgfx
, board_M5ModuleDisplay
, board_ESP32_S3_BOX_Lite
, board_LoLinS3Pro
+ , board_ESP32_S3_BOX_V3
};
}
using namespace boards;
diff --git a/src/lgfx/internal/alloca.h b/src/lgfx/internal/alloca.h
new file mode 100644
index 00000000..63a2981d
--- /dev/null
+++ b/src/lgfx/internal/alloca.h
@@ -0,0 +1,11 @@
+#pragma once
+
+#if __has_include()
+#include
+#else
+#include
+#include
+#ifndef alloca
+#define alloca _alloca
+#endif
+#endif
diff --git a/src/lgfx/utility/miniz.c b/src/lgfx/utility/lgfx_miniz.c
similarity index 65%
rename from src/lgfx/utility/miniz.c
rename to src/lgfx/utility/lgfx_miniz.c
index 26fbc935..a4fea636 100644
--- a/src/lgfx/utility/miniz.c
+++ b/src/lgfx/utility/lgfx_miniz.c
@@ -9,13 +9,13 @@
* Change History
10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!):
- Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks kahmyong.moon@hp.com) which could cause locate files to not find files. This bug
- would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place()
+ would only have occured in earlier versions if you explicitly used this flag, OR if you used lgfx_mz_zip_extract_archive_file_to_heap() or lgfx_mz_zip_add_mem_to_archive_file_in_place()
(which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag).
- - Bugfix in mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size
- - Fixing mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries.
+ - Bugfix in lgfx_mz_zip_reader_extract_to_mem_no_alloc() from kymoon when pUser_read_buf is not NULL and compressed size is > uncompressed size
+ - Fixing lgfx_mz_zip_reader_extract_*() funcs so they don't try to extract compressed data from directory entries, to account for weird zipfiles which contain zero-size compressed data on dir entries.
Hopefully this fix won't cause any issues on weird zip archives, because it assumes the low 16-bits of zip external attributes are DOS attributes (which I believe they always are in practice).
- - Fixing mz_zip_reader_is_file_a_directory() so it doesn't check the internal attributes, just the filename and external attributes
- - mz_zip_reader_init_file() - missing MZ_FCLOSE() call if the seek failed
+ - Fixing lgfx_mz_zip_reader_is_file_a_directory() so it doesn't check the internal attributes, just the filename and external attributes
+ - lgfx_mz_zip_reader_init_file() - missing MZ_FCLOSE() call if the seek failed
- Added cmake support for Linux builds which builds all the examples, tested with clang v3.3 and gcc v4.6.
- Clang fix for tdefl_write_image_to_png_file_in_memory() from toffaletti
- Merged MZ_FORCEINLINE fix from hdeanclark
@@ -26,11 +26,11 @@
- Retested this build under Windows (VS 2010, including static analysis), tcc 0.9.26, gcc v4.6 and clang v3.3.
- Added example6.c, which dumps an image of the mandelbrot set to a PNG file.
- Modified example2 to help test the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY flag more.
- - In r3: Bugfix to mz_zip_writer_add_file() found during merge: Fix possible src file fclose() leak if alignment bytes+local header file write faiiled
- - In r4: Minor bugfix to mz_zip_writer_add_from_zip_reader(): Was pushing the wrong central dir header offset, appears harmless in this release, but it became a problem in the zip64 branch
+ - In r3: Bugfix to lgfx_mz_zip_writer_add_file() found during merge: Fix possible src file fclose() leak if alignment bytes+local header file write faiiled
+ - In r4: Minor bugfix to lgfx_mz_zip_writer_add_from_zip_reader(): Was pushing the wrong central dir header offset, appears harmless in this release, but it became a problem in the zip64 branch
5/20/12 v1.14 - MinGW32/64 GCC 4.6.1 compiler fixes: added MZ_FORCEINLINE, #include (thanks fermtect).
- 5/19/12 v1.13 - From jason@cornsyrup.org and kelwert@mtu.edu - Fix mz_crc32() so it doesn't compute the wrong CRC-32's when mz_ulong is 64-bit.
- - Temporarily/locally slammed in "typedef unsigned long mz_ulong" and re-ran a randomized regression test on ~500k files.
+ 5/19/12 v1.13 - From jason@cornsyrup.org and kelwert@mtu.edu - Fix lgfx_mz_crc32() so it doesn't compute the wrong CRC-32's when lgfx_mz_ulong is 64-bit.
+ - Temporarily/locally slammed in "typedef unsigned long lgfx_mz_ulong" and re-ran a randomized regression test on ~500k files.
- Eliminated a bunch of warnings when compiling with GCC 32-bit/64.
- Ran all examples, miniz.c, and tinfl.c through MSVC 2008's /analyze (static analysis) option and fixed all warnings (except for the silly
"Use of the comma-operator in a tested expression.." analysis warning, which I purposely use to work around a MSVC compiler warning).
@@ -58,7 +58,7 @@
approximately as well as zlib.
Decompression: Use the "tinfl" API's. The entire decompressor is implemented as a single function
- coroutine: see tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory
+ coroutine: see lgfx_tinfl_decompress(). It supports decompression into a 32KB (or larger power of 2) wrapping buffer, or into a memory
block large enough to hold the entire file.
The low-level tdefl/tinfl API's do not make any use of dynamic memory allocation.
@@ -92,24 +92,24 @@
- Archive reading: Just call this function to read a single file from a disk archive:
- void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name,
- size_t *pSize, mz_uint zip_flags);
+ void *lgfx_mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name,
+ size_t *pSize, lgfx_mz_uint zip_flags);
- For more complex cases, use the "mz_zip_reader" functions. Upon opening an archive, the entire central
+ For more complex cases, use the "lgfx_mz_zip_reader" functions. Upon opening an archive, the entire central
directory is located and read as-is into memory, and subsequent file access only occurs when reading individual files.
- Archives file scanning: The simple way is to use this function to scan a loaded archive for a specific file:
- int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
+ int lgfx_mz_zip_reader_locate_file(lgfx_mz_zip_archive *pZip, const char *pName, const char *pComment, lgfx_mz_uint flags);
The locate operation can optionally check file comments too, which (as one example) can be used to identify
multiple versions of the same file in an archive. This function uses a simple linear search through the central
directory, so it's not very fast.
- Alternately, you can iterate through all the files in an archive (using mz_zip_reader_get_num_files()) and
- retrieve detailed info on each file by calling mz_zip_reader_file_stat().
+ Alternately, you can iterate through all the files in an archive (using lgfx_mz_zip_reader_get_num_files()) and
+ retrieve detailed info on each file by calling lgfx_mz_zip_reader_file_stat().
- - Archive creation: Use the "mz_zip_writer" functions. The ZIP writer immediately writes compressed file data
+ - Archive creation: Use the "lgfx_mz_zip_writer" functions. The ZIP writer immediately writes compressed file data
to disk and builds an exact image of the central directory in memory. The central directory image is written
all at once at the end of the archive file when the archive is finalized.
@@ -120,8 +120,8 @@
- Archive appending: The simple way to add a single file to an archive is to call this function:
- mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name,
- const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+ lgfx_mz_bool lgfx_mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name,
+ const void *pBuf, size_t buf_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags);
The archive will be created if it doesn't already exist, otherwise it'll be appended to.
Note the appending is done in-place and is not an atomic operation, so if something goes wrong
@@ -129,14 +129,14 @@
file headers and file data will be fine, so the archive will be recoverable).
For more complex archive modification scenarios:
- 1. The safest way is to use a mz_zip_reader to read the existing archive, cloning only those bits you want to
- preserve into a new archive using using the mz_zip_writer_add_from_zip_reader() function (which compiles the
+ 1. The safest way is to use a lgfx_mz_zip_reader to read the existing archive, cloning only those bits you want to
+ preserve into a new archive using using the lgfx_mz_zip_writer_add_from_zip_reader() function (which compiles the
compressed file data as-is). When you're done, delete the old archive and rename the newly written archive, and
you're done. This is safe but requires a bunch of temporary disk space or heap memory.
- 2. Or, you can convert an mz_zip_reader in-place to an mz_zip_writer using mz_zip_writer_init_from_reader(),
+ 2. Or, you can convert an lgfx_mz_zip_reader in-place to an lgfx_mz_zip_writer using lgfx_mz_zip_writer_init_from_reader(),
append new files as needed, then finalize the archive which will write an updated central directory to the
- original archive. (This is basically what mz_zip_add_mem_to_archive_file_in_place() does.) There's a
+ original archive. (This is basically what lgfx_mz_zip_add_mem_to_archive_file_in_place() does.) There's a
possibility that the archive's central directory could be lost with this method if anything goes wrong, though.
- ZIP archive support limitations:
@@ -144,7 +144,7 @@
Requires streams capable of seeking.
* This is a header file library, like stb_image.c. To get only a header file, either cut and paste the
- below header, or create miniz.h, #define MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it.
+ below header, or create miniz.h, #define LGFX_MINIZ_HEADER_FILE_ONLY, and then include miniz.c from it.
* Important: For best perf. be sure to customize the below macros for your target platform:
#define MINIZ_USE_UNALIGNED_LOADS_AND_STORES 1
@@ -187,7 +187,7 @@
// Define MINIZ_NO_MALLOC to disable all calls to malloc, free, and realloc.
// Note if MINIZ_NO_MALLOC is defined then the user must always provide custom user alloc/free/realloc
// callbacks to the zlib and archive API's, and a few stand-alone helper API's which don't provide custom user
-// functions (such as tdefl_compress_mem_to_heap() and tinfl_decompress_mem_to_heap()) won't work.
+// functions (such as tdefl_compress_mem_to_heap() and lgfx_tinfl_decompress_mem_to_heap()) won't work.
//#define MINIZ_NO_MALLOC
//
@@ -230,19 +230,19 @@ extern "C" {
// ------------------- zlib-style API Definitions.
-// For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: mz_ulong can be either 32 or 64-bits!
-typedef unsigned long mz_ulong;
+// For more compatibility with zlib, miniz.c uses unsigned long for some parameters/struct members. Beware: lgfx_mz_ulong can be either 32 or 64-bits!
+typedef unsigned long lgfx_mz_ulong;
-// mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap.
-void mz_free(void *p);
+// lgfx_mz_free() internally uses the MZ_FREE() macro (which by default calls free() unless you've modified the MZ_MALLOC macro) to release a block allocated from the heap.
+void lgfx_mz_free(void *p);
#define MZ_ADLER32_INIT (1)
-// mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL.
-mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len);
+// lgfx_mz_adler32() returns the initial adler-32 value to use when called with ptr==NULL.
+lgfx_mz_ulong lgfx_mz_adler32(lgfx_mz_ulong adler, const unsigned char *ptr, size_t buf_len);
#define MZ_CRC32_INIT (0)
-// mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL.
-mz_ulong mz_crc32(mz_ulong crc, const unsigned char *ptr, size_t buf_len);
+// lgfx_mz_crc32() returns the initial CRC-32 value to use when called with ptr==NULL.
+lgfx_mz_ulong lgfx_mz_crc32(lgfx_mz_ulong crc, const unsigned char *ptr, size_t buf_len);
// Compression strategies.
enum { MZ_DEFAULT_STRATEGY = 0, MZ_FILTERED = 1, MZ_HUFFMAN_ONLY = 2, MZ_RLE = 3, MZ_FIXED = 4 };
@@ -253,10 +253,10 @@ enum { MZ_DEFAULT_STRATEGY = 0, MZ_FILTERED = 1, MZ_HUFFMAN_ONLY = 2, MZ_RLE = 3
#ifndef MINIZ_NO_ZLIB_APIS
// Heap allocation callbacks.
-// Note that mz_alloc_func parameter types purpsosely differ from zlib's: items/size is size_t, not unsigned long.
-typedef void *(*mz_alloc_func)(void *opaque, size_t items, size_t size);
-typedef void (*mz_free_func)(void *opaque, void *address);
-typedef void *(*mz_realloc_func)(void *opaque, void *address, size_t items, size_t size);
+// Note that lgfx_mz_alloc_func parameter types purpsosely differ from zlib's: items/size is size_t, not unsigned long.
+typedef void *(*lgfx_mz_alloc_func)(void *opaque, size_t items, size_t size);
+typedef void (*lgfx_mz_free_func)(void *opaque, void *address);
+typedef void *(*lgfx_mz_realloc_func)(void *opaque, void *address, size_t items, size_t size);
#define MZ_VERSION "9.1.15"
#define MZ_VERNUM 0x91F0
@@ -277,39 +277,39 @@ enum { MZ_NO_COMPRESSION = 0, MZ_BEST_SPEED = 1, MZ_BEST_COMPRESSION = 9, MZ_UBE
// Window bits
#define MZ_DEFAULT_WINDOW_BITS 15
-struct mz_internal_state;
+struct lgfx_mz_internal_state;
// Compression/decompression stream struct.
-typedef struct mz_stream_s
+typedef struct lgfx_mz_stream_s
{
const unsigned char *next_in; // pointer to next byte to read
unsigned int avail_in; // number of bytes available at next_in
- mz_ulong total_in; // total number of bytes consumed so far
+ lgfx_mz_ulong total_in; // total number of bytes consumed so far
unsigned char *next_out; // pointer to next byte to write
unsigned int avail_out; // number of bytes that can be written to next_out
- mz_ulong total_out; // total number of bytes produced so far
+ lgfx_mz_ulong total_out; // total number of bytes produced so far
char *msg; // error msg (unused)
- struct mz_internal_state *state; // internal state, allocated by zalloc/zfree
+ struct lgfx_mz_internal_state *state; // internal state, allocated by zalloc/zfree
- mz_alloc_func zalloc; // optional heap allocation function (defaults to malloc)
- mz_free_func zfree; // optional heap free function (defaults to free)
+ lgfx_mz_alloc_func zalloc; // optional heap allocation function (defaults to malloc)
+ lgfx_mz_free_func zfree; // optional heap free function (defaults to free)
void *opaque; // heap alloc function user pointer
int data_type; // data_type (unused)
- mz_ulong adler; // adler32 of the source or uncompressed data
- mz_ulong reserved; // not used
-} mz_stream;
+ lgfx_mz_ulong adler; // adler32 of the source or uncompressed data
+ lgfx_mz_ulong reserved; // not used
+} lgfx_mz_stream;
-typedef mz_stream *mz_streamp;
+typedef lgfx_mz_stream *lgfx_mz_streamp;
// Returns the version string of miniz.c.
-const char *mz_version(void);
+const char *lgfx_mz_version(void);
-// mz_deflateInit() initializes a compressor with default options:
+// lgfx_mz_deflateInit() initializes a compressor with default options:
// Parameters:
-// pStream must point to an initialized mz_stream struct.
+// pStream must point to an initialized lgfx_mz_stream struct.
// level must be between [MZ_NO_COMPRESSION, MZ_BEST_COMPRESSION].
// level 1 enables a specially optimized compression function that's been optimized purely for performance, not ratio.
// (This special func. is currently only enabled when MINIZ_USE_UNALIGNED_LOADS_AND_STORES and MINIZ_LITTLE_ENDIAN are defined.)
@@ -318,53 +318,53 @@ const char *mz_version(void);
// MZ_STREAM_ERROR if the stream is bogus.
// MZ_PARAM_ERROR if the input parameters are bogus.
// MZ_MEM_ERROR on out of memory.
-int mz_deflateInit(mz_streamp pStream, int level);
+int lgfx_mz_deflateInit(lgfx_mz_streamp pStream, int level);
-// mz_deflateInit2() is like mz_deflate(), except with more control:
+// lgfx_mz_deflateInit2() is like lgfx_mz_deflate(), except with more control:
// Additional parameters:
// method must be MZ_DEFLATED
// window_bits must be MZ_DEFAULT_WINDOW_BITS (to wrap the deflate stream with zlib header/adler-32 footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate/no header or footer)
// mem_level must be between [1, 9] (it's checked but ignored by miniz.c)
-int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy);
+int lgfx_mz_deflateInit2(lgfx_mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy);
-// Quickly resets a compressor without having to reallocate anything. Same as calling mz_deflateEnd() followed by mz_deflateInit()/mz_deflateInit2().
-int mz_deflateReset(mz_streamp pStream);
+// Quickly resets a compressor without having to reallocate anything. Same as calling lgfx_mz_deflateEnd() followed by lgfx_mz_deflateInit()/lgfx_mz_deflateInit2().
+int lgfx_mz_deflateReset(lgfx_mz_streamp pStream);
-// mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible.
+// lgfx_mz_deflate() compresses the input to output, consuming as much of the input and producing as much output as possible.
// Parameters:
// pStream is the stream to read from and write to. You must initialize/update the next_in, avail_in, next_out, and avail_out members.
// flush may be MZ_NO_FLUSH, MZ_PARTIAL_FLUSH/MZ_SYNC_FLUSH, MZ_FULL_FLUSH, or MZ_FINISH.
// Return values:
// MZ_OK on success (when flushing, or if more input is needed but not available, and/or there's more output to be written but the output buffer is full).
-// MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call mz_deflate() on the stream anymore.
+// MZ_STREAM_END if all input has been consumed and all output bytes have been written. Don't call lgfx_mz_deflate() on the stream anymore.
// MZ_STREAM_ERROR if the stream is bogus.
// MZ_PARAM_ERROR if one of the parameters is invalid.
// MZ_BUF_ERROR if no forward progress is possible because the input and/or output buffers are empty. (Fill up the input buffer or free up some output space and try again.)
-int mz_deflate(mz_streamp pStream, int flush);
+int lgfx_mz_deflate(lgfx_mz_streamp pStream, int flush);
-// mz_deflateEnd() deinitializes a compressor:
+// lgfx_mz_deflateEnd() deinitializes a compressor:
// Return values:
// MZ_OK on success.
// MZ_STREAM_ERROR if the stream is bogus.
-int mz_deflateEnd(mz_streamp pStream);
+int lgfx_mz_deflateEnd(lgfx_mz_streamp pStream);
-// mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH.
-mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len);
+// lgfx_mz_deflateBound() returns a (very) conservative upper bound on the amount of data that could be generated by deflate(), assuming flush is set to only MZ_NO_FLUSH or MZ_FINISH.
+lgfx_mz_ulong lgfx_mz_deflateBound(lgfx_mz_streamp pStream, lgfx_mz_ulong source_len);
-// Single-call compression functions mz_compress() and mz_compress2():
-// Returns MZ_OK on success, or one of the error codes from mz_deflate() on failure.
-int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
-int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level);
+// Single-call compression functions lgfx_mz_compress() and lgfx_mz_compress2():
+// Returns MZ_OK on success, or one of the error codes from lgfx_mz_deflate() on failure.
+int lgfx_mz_compress(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len);
+int lgfx_mz_compress2(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len, int level);
-// mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling mz_compress().
-mz_ulong mz_compressBound(mz_ulong source_len);
+// lgfx_mz_compressBound() returns a (very) conservative upper bound on the amount of data that could be generated by calling lgfx_mz_compress().
+lgfx_mz_ulong lgfx_mz_compressBound(lgfx_mz_ulong source_len);
// Initializes a decompressor.
-int mz_inflateInit(mz_streamp pStream);
+int lgfx_mz_inflateInit(lgfx_mz_streamp pStream);
-// mz_inflateInit2() is like mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer:
+// lgfx_mz_inflateInit2() is like lgfx_mz_inflateInit() with an additional option that controls the window size and whether or not the stream has been wrapped with a zlib header/footer:
// window_bits must be MZ_DEFAULT_WINDOW_BITS (to parse zlib header/footer) or -MZ_DEFAULT_WINDOW_BITS (raw deflate).
-int mz_inflateInit2(mz_streamp pStream, int window_bits);
+int lgfx_mz_inflateInit2(lgfx_mz_streamp pStream, int window_bits);
// Decompresses the input stream to the output, consuming only as much of the input as needed, and writing as much to the output as possible.
// Parameters:
@@ -378,26 +378,26 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits);
// MZ_STREAM_ERROR if the stream is bogus.
// MZ_DATA_ERROR if the deflate stream is invalid.
// MZ_PARAM_ERROR if one of the parameters is invalid.
-// MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call mz_inflate() again
+// MZ_BUF_ERROR if no forward progress is possible because the input buffer is empty but the inflater needs more input to continue, or if the output buffer is not large enough. Call lgfx_mz_inflate() again
// with more input data, or with more room in the output buffer (except when using single call decompression, described above).
-int mz_inflate(mz_streamp pStream, int flush);
+int lgfx_mz_inflate(lgfx_mz_streamp pStream, int flush);
// Deinitializes a decompressor.
-int mz_inflateEnd(mz_streamp pStream);
+int lgfx_mz_inflateEnd(lgfx_mz_streamp pStream);
// Single-call decompression.
-// Returns MZ_OK on success, or one of the error codes from mz_inflate() on failure.
-int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len);
+// Returns MZ_OK on success, or one of the error codes from lgfx_mz_inflate() on failure.
+int lgfx_mz_uncompress(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len);
// Returns a string description of the specified error code, or NULL if the error code is invalid.
-const char *mz_error(int err);
+const char *lgfx_mz_error(int err);
// Redefine zlib-compatible names to miniz equivalents, so miniz.c can be used as a drop-in replacement for the subset of zlib that miniz.c supports.
// Define MINIZ_NO_ZLIB_COMPATIBLE_NAMES to disable zlib-compatibility if you use zlib in the same project.
#ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
typedef unsigned char Byte;
typedef unsigned int uInt;
- typedef mz_ulong uLong;
+ typedef lgfx_mz_ulong uLong;
typedef Byte Bytef;
typedef uInt uIntf;
typedef char charf;
@@ -434,51 +434,51 @@ const char *mz_error(int err);
#define Z_FIXED MZ_FIXED
#define Z_DEFLATED MZ_DEFLATED
#define Z_DEFAULT_WINDOW_BITS MZ_DEFAULT_WINDOW_BITS
- #define alloc_func mz_alloc_func
- #define free_func mz_free_func
- #define internal_state mz_internal_state
- #define z_stream mz_stream
- #define deflateInit mz_deflateInit
- #define deflateInit2 mz_deflateInit2
- #define deflateReset mz_deflateReset
- #define deflate mz_deflate
- #define deflateEnd mz_deflateEnd
- #define deflateBound mz_deflateBound
- #define compress mz_compress
- #define compress2 mz_compress2
- #define compressBound mz_compressBound
- #define inflateInit mz_inflateInit
- #define inflateInit2 mz_inflateInit2
- #define inflate mz_inflate
- #define inflateEnd mz_inflateEnd
- #define uncompress mz_uncompress
- #define crc32 mz_crc32
- #define adler32 mz_adler32
+ #define alloc_func lgfx_mz_alloc_func
+ #define free_func lgfx_mz_free_func
+ #define internal_state lgfx_mz_internal_state
+ #define z_stream lgfx_mz_stream
+ #define deflateInit lgfx_mz_deflateInit
+ #define deflateInit2 lgfx_mz_deflateInit2
+ #define deflateReset lgfx_mz_deflateReset
+ #define deflate lgfx_mz_deflate
+ #define deflateEnd lgfx_mz_deflateEnd
+ #define deflateBound lgfx_mz_deflateBound
+ #define compress lgfx_mz_compress
+ #define compress2 lgfx_mz_compress2
+ #define compressBound lgfx_mz_compressBound
+ #define inflateInit lgfx_mz_inflateInit
+ #define inflateInit2 lgfx_mz_inflateInit2
+ #define inflate lgfx_mz_inflate
+ #define inflateEnd lgfx_mz_inflateEnd
+ #define uncompress lgfx_mz_uncompress
+ #define crc32 lgfx_mz_crc32
+ #define adler32 lgfx_mz_adler32
#define MAX_WBITS 15
#define MAX_MEM_LEVEL 9
- #define zError mz_error
+ #define zError lgfx_mz_error
#define ZLIB_VERSION MZ_VERSION
#define ZLIB_VERNUM MZ_VERNUM
#define ZLIB_VER_MAJOR MZ_VER_MAJOR
#define ZLIB_VER_MINOR MZ_VER_MINOR
#define ZLIB_VER_REVISION MZ_VER_REVISION
#define ZLIB_VER_SUBREVISION MZ_VER_SUBREVISION
- #define zlibVersion mz_version
- #define zlib_version mz_version()
+ #define zlibVersion lgfx_mz_version
+ #define zlib_version lgfx_mz_version()
#endif // #ifndef MINIZ_NO_ZLIB_COMPATIBLE_NAMES
#endif // MINIZ_NO_ZLIB_APIS
// ------------------- Types and macros
-typedef unsigned char mz_uint8;
-typedef signed short mz_int16;
-typedef unsigned short mz_uint16;
-typedef unsigned int mz_uint32;
-typedef unsigned int mz_uint;
-typedef long long mz_int64;
-typedef unsigned long long mz_uint64;
-typedef int mz_bool;
+typedef unsigned char lgfx_mz_uint8;
+typedef signed short lgfx_mz_int16;
+typedef unsigned short lgfx_mz_uint16;
+typedef unsigned int lgfx_mz_uint32;
+typedef unsigned int lgfx_mz_uint;
+typedef long long lgfx_mz_int64;
+typedef unsigned long long lgfx_mz_uint64;
+typedef int lgfx_mz_bool;
#define MZ_FALSE (0)
#define MZ_TRUE (1)
@@ -503,31 +503,31 @@ enum
typedef struct
{
- mz_uint32 m_file_index;
- mz_uint32 m_central_dir_ofs;
- mz_uint16 m_version_made_by;
- mz_uint16 m_version_needed;
- mz_uint16 m_bit_flag;
- mz_uint16 m_method;
+ lgfx_mz_uint32 m_file_index;
+ lgfx_mz_uint32 m_central_dir_ofs;
+ lgfx_mz_uint16 m_version_made_by;
+ lgfx_mz_uint16 m_version_needed;
+ lgfx_mz_uint16 m_bit_flag;
+ lgfx_mz_uint16 m_method;
#ifndef MINIZ_NO_TIME
time_t m_time;
#endif
- mz_uint32 m_crc32;
- mz_uint64 m_comp_size;
- mz_uint64 m_uncomp_size;
- mz_uint16 m_internal_attr;
- mz_uint32 m_external_attr;
- mz_uint64 m_local_header_ofs;
- mz_uint32 m_comment_size;
+ lgfx_mz_uint32 m_crc32;
+ lgfx_mz_uint64 m_comp_size;
+ lgfx_mz_uint64 m_uncomp_size;
+ lgfx_mz_uint16 m_internal_attr;
+ lgfx_mz_uint32 m_external_attr;
+ lgfx_mz_uint64 m_local_header_ofs;
+ lgfx_mz_uint32 m_comment_size;
char m_filename[MZ_ZIP_MAX_ARCHIVE_FILENAME_SIZE];
char m_comment[MZ_ZIP_MAX_ARCHIVE_FILE_COMMENT_SIZE];
-} mz_zip_archive_file_stat;
+} lgfx_mz_zip_archive_file_stat;
-typedef size_t (*mz_file_read_func)(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n);
-typedef size_t (*mz_file_write_func)(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n);
+typedef size_t (*lgfx_mz_file_read_func)(void *pOpaque, lgfx_mz_uint64 file_ofs, void *pBuf, size_t n);
+typedef size_t (*lgfx_mz_file_write_func)(void *pOpaque, lgfx_mz_uint64 file_ofs, const void *pBuf, size_t n);
-struct mz_zip_internal_state_tag;
-typedef struct mz_zip_internal_state_tag mz_zip_internal_state;
+struct lgfx_mz_zip_internal_state_tag;
+typedef struct lgfx_mz_zip_internal_state_tag lgfx_mz_zip_internal_state;
typedef enum
{
@@ -535,29 +535,29 @@ typedef enum
MZ_ZIP_MODE_READING = 1,
MZ_ZIP_MODE_WRITING = 2,
MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED = 3
-} mz_zip_mode;
+} lgfx_mz_zip_mode;
-typedef struct mz_zip_archive_tag
+typedef struct lgfx_mz_zip_archive_tag
{
- mz_uint64 m_archive_size;
- mz_uint64 m_central_directory_file_ofs;
- mz_uint m_total_files;
- mz_zip_mode m_zip_mode;
+ lgfx_mz_uint64 m_archive_size;
+ lgfx_mz_uint64 m_central_directory_file_ofs;
+ lgfx_mz_uint m_total_files;
+ lgfx_mz_zip_mode m_zip_mode;
- mz_uint m_file_offset_alignment;
+ lgfx_mz_uint m_file_offset_alignment;
- mz_alloc_func m_pAlloc;
- mz_free_func m_pFree;
- mz_realloc_func m_pRealloc;
+ lgfx_mz_alloc_func m_pAlloc;
+ lgfx_mz_free_func m_pFree;
+ lgfx_mz_realloc_func m_pRealloc;
void *m_pAlloc_opaque;
- mz_file_read_func m_pRead;
- mz_file_write_func m_pWrite;
+ lgfx_mz_file_read_func m_pRead;
+ lgfx_mz_file_write_func m_pWrite;
void *m_pIO_opaque;
- mz_zip_internal_state *m_pState;
+ lgfx_mz_zip_internal_state *m_pState;
-} mz_zip_archive;
+} lgfx_mz_zip_archive;
typedef enum
{
@@ -565,119 +565,119 @@ typedef enum
MZ_ZIP_FLAG_IGNORE_PATH = 0x0200,
MZ_ZIP_FLAG_COMPRESSED_DATA = 0x0400,
MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY = 0x0800
-} mz_zip_flags;
+} lgfx_mz_zip_flags;
// ZIP archive reading
// Inits a ZIP archive reader.
// These functions read and validate the archive's central directory.
-mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint32 flags);
-mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint32 flags);
+lgfx_mz_bool lgfx_mz_zip_reader_init(lgfx_mz_zip_archive *pZip, lgfx_mz_uint64 size, lgfx_mz_uint32 flags);
+lgfx_mz_bool lgfx_mz_zip_reader_init_mem(lgfx_mz_zip_archive *pZip, const void *pMem, size_t size, lgfx_mz_uint32 flags);
#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags);
+lgfx_mz_bool lgfx_mz_zip_reader_init_file(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_uint32 flags);
#endif
// Returns the total number of files in the archive.
-mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip);
+lgfx_mz_uint lgfx_mz_zip_reader_get_num_files(lgfx_mz_zip_archive *pZip);
// Returns detailed information about an archive file entry.
-mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat);
+lgfx_mz_bool lgfx_mz_zip_reader_file_stat(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, lgfx_mz_zip_archive_file_stat *pStat);
// Determines if an archive file entry is a directory entry.
-mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index);
-mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index);
+lgfx_mz_bool lgfx_mz_zip_reader_is_file_a_directory(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index);
+lgfx_mz_bool lgfx_mz_zip_reader_is_file_encrypted(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index);
// Retrieves the filename of an archive file entry.
// Returns the number of bytes written to pFilename, or if filename_buf_size is 0 this function returns the number of bytes needed to fully store the filename.
-mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size);
+lgfx_mz_uint lgfx_mz_zip_reader_get_filename(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, char *pFilename, lgfx_mz_uint filename_buf_size);
// Attempts to locates a file in the archive's central directory.
// Valid flags: MZ_ZIP_FLAG_CASE_SENSITIVE, MZ_ZIP_FLAG_IGNORE_PATH
// Returns -1 if the file cannot be found.
-int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags);
+int lgfx_mz_zip_reader_locate_file(lgfx_mz_zip_archive *pZip, const char *pName, const char *pComment, lgfx_mz_uint flags);
// Extracts a archive file to a memory buffer using no memory allocation.
-mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
-mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_mem_no_alloc(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, void *pBuf, size_t buf_size, lgfx_mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_mem_no_alloc(lgfx_mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, lgfx_mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size);
// Extracts a archive file to a memory buffer.
-mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_mem(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, void *pBuf, size_t buf_size, lgfx_mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_mem(lgfx_mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, lgfx_mz_uint flags);
// Extracts a archive file to a dynamically allocated heap buffer.
-void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags);
-void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags);
+void *lgfx_mz_zip_reader_extract_to_heap(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, size_t *pSize, lgfx_mz_uint flags);
+void *lgfx_mz_zip_reader_extract_file_to_heap(lgfx_mz_zip_archive *pZip, const char *pFilename, size_t *pSize, lgfx_mz_uint flags);
// Extracts a archive file using a callback function to output the file's data.
-mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_callback(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, lgfx_mz_file_write_func pCallback, void *pOpaque, lgfx_mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_callback(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_file_write_func pCallback, void *pOpaque, lgfx_mz_uint flags);
#ifndef MINIZ_NO_STDIO
// Extracts a archive file to a disk file and sets its last accessed and modified times.
// This function only extracts files, not archive directory records.
-mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags);
-mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_file(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, const char *pDst_filename, lgfx_mz_uint flags);
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_file(lgfx_mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, lgfx_mz_uint flags);
#endif
-// Ends archive reading, freeing all allocations, and closing the input archive file if mz_zip_reader_init_file() was used.
-mz_bool mz_zip_reader_end(mz_zip_archive *pZip);
+// Ends archive reading, freeing all allocations, and closing the input archive file if lgfx_mz_zip_reader_init_file() was used.
+lgfx_mz_bool lgfx_mz_zip_reader_end(lgfx_mz_zip_archive *pZip);
// ZIP archive writing
#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
// Inits a ZIP archive writer.
-mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size);
-mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size);
+lgfx_mz_bool lgfx_mz_zip_writer_init(lgfx_mz_zip_archive *pZip, lgfx_mz_uint64 existing_size);
+lgfx_mz_bool lgfx_mz_zip_writer_init_heap(lgfx_mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size);
#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning);
+lgfx_mz_bool lgfx_mz_zip_writer_init_file(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_uint64 size_to_reserve_at_beginning);
#endif
// Converts a ZIP archive reader object into a writer object, to allow efficient in-place file appends to occur on an existing archive.
-// For archives opened using mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, mz_zip_reader_end() will be called.
-// For archives opened using mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it).
-// Finally, for archives opened using mz_zip_reader_init, the mz_zip_archive's user provided m_pWrite function cannot be NULL.
+// For archives opened using lgfx_mz_zip_reader_init_file, pFilename must be the archive's filename so it can be reopened for writing. If the file can't be reopened, lgfx_mz_zip_reader_end() will be called.
+// For archives opened using lgfx_mz_zip_reader_init_mem, the memory block must be growable using the realloc callback (which defaults to realloc unless you've overridden it).
+// Finally, for archives opened using lgfx_mz_zip_reader_init, the lgfx_mz_zip_archive's user provided m_pWrite function cannot be NULL.
// Note: In-place archive modification is not recommended unless you know what you're doing, because if execution stops or something goes wrong before
// the archive is finalized the file's central directory will be hosed.
-mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename);
+lgfx_mz_bool lgfx_mz_zip_writer_init_from_reader(lgfx_mz_zip_archive *pZip, const char *pFilename);
// Adds the contents of a memory buffer to an archive. These functions record the current local time into the archive.
// To add a directory entry, call this method with an archive name ending in a forwardslash with empty buffer.
-// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags);
-mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32);
+// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more lgfx_mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
+lgfx_mz_bool lgfx_mz_zip_writer_add_mem(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, lgfx_mz_uint level_and_flags);
+lgfx_mz_bool lgfx_mz_zip_writer_add_mem_ex(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags, lgfx_mz_uint64 uncomp_size, lgfx_mz_uint32 uncomp_crc32);
#ifndef MINIZ_NO_STDIO
// Adds the contents of a disk file to an archive. This function also records the disk file's modified time into the archive.
-// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more lgfx_mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
+lgfx_mz_bool lgfx_mz_zip_writer_add_file(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags);
#endif
// Adds a file to an archive by fully cloning the data from another archive.
// This function fully clones the source file's compressed data (no recompression), along with its full filename, extra data, and comment fields.
-mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint file_index);
+lgfx_mz_bool lgfx_mz_zip_writer_add_from_zip_reader(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_archive *pSource_zip, lgfx_mz_uint file_index);
// Finalizes the archive by writing the central directory records followed by the end of central directory record.
-// After an archive is finalized, the only valid call on the mz_zip_archive struct is mz_zip_writer_end().
+// After an archive is finalized, the only valid call on the lgfx_mz_zip_archive struct is lgfx_mz_zip_writer_end().
// An archive must be manually finalized by calling this function for it to be valid.
-mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip);
-mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf, size_t *pSize);
+lgfx_mz_bool lgfx_mz_zip_writer_finalize_archive(lgfx_mz_zip_archive *pZip);
+lgfx_mz_bool lgfx_mz_zip_writer_finalize_heap_archive(lgfx_mz_zip_archive *pZip, void **pBuf, size_t *pSize);
-// Ends archive writing, freeing all allocations, and closing the output file if mz_zip_writer_init_file() was used.
+// Ends archive writing, freeing all allocations, and closing the output file if lgfx_mz_zip_writer_init_file() was used.
// Note for the archive to be valid, it must have been finalized before ending.
-mz_bool mz_zip_writer_end(mz_zip_archive *pZip);
+lgfx_mz_bool lgfx_mz_zip_writer_end(lgfx_mz_zip_archive *pZip);
// Misc. high-level helper functions:
-// mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive.
-// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
-mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags);
+// lgfx_mz_zip_add_mem_to_archive_file_in_place() efficiently (but not atomically) appends a memory blob to a ZIP archive.
+// level_and_flags - compression level (0-10, see MZ_BEST_SPEED, MZ_BEST_COMPRESSION, etc.) logically OR'd with zero or more lgfx_mz_zip_flags, or just set to MZ_DEFAULT_COMPRESSION.
+lgfx_mz_bool lgfx_mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags);
// Reads a single file from an archive into a heap block.
// Returns NULL on failure.
-void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint zip_flags);
+void *lgfx_mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, lgfx_mz_uint zip_flags);
#endif // #ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
@@ -685,7 +685,7 @@ void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char
// ------------------- Low-level Decompression API Definitions
-// Decompression flags used by tinfl_decompress().
+// Decompression flags used by lgfx_tinfl_decompress().
// TINFL_FLAG_PARSE_ZLIB_HEADER: If set, the input has a valid zlib header and ends with an adler32 checksum (it's a valid zlib stream). Otherwise, the input is a raw deflate stream.
// TINFL_FLAG_HAS_MORE_INPUT: If set, there are more input bytes available beyond the end of the supplied input buffer. If clear, the input buffer contains all remaining input.
// TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF: If set, the output buffer is large enough to hold the entire decompressed stream. If clear, the output buffer is at least the size of the dictionary (typically 32KB).
@@ -699,26 +699,26 @@ enum
};
// High level decompression functions:
-// tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc().
+// lgfx_tinfl_decompress_mem_to_heap() decompresses a block in memory to a heap block allocated via malloc().
// On entry:
// pSrc_buf, src_buf_len: Pointer and size of the Deflate or zlib source data to decompress.
// On return:
// Function returns a pointer to the decompressed data, or NULL on failure.
// *pOut_len will be set to the decompressed data's size, which could be larger than src_buf_len on uncompressible data.
-// The caller must call mz_free() on the returned block when it's no longer needed.
-void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
+// The caller must call lgfx_mz_free() on the returned block when it's no longer needed.
+void *lgfx_tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags);
-// tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory.
+// lgfx_tinfl_decompress_mem_to_mem() decompresses a block in memory to another block in memory.
// Returns TINFL_DECOMPRESS_MEM_TO_MEM_FAILED on failure, or the number of bytes written on success.
#define TINFL_DECOMPRESS_MEM_TO_MEM_FAILED ((size_t)(-1))
-size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
+size_t lgfx_tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags);
-// tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer.
+// lgfx_tinfl_decompress_mem_to_callback() decompresses a block in memory to an internal 32KB buffer, and a user provided callback function will be called to flush the buffer.
// Returns 1 on success or 0 on failure.
-typedef int (*tinfl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser);
-int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
+typedef int (*lgfx_tinfl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser);
+int lgfx_tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, lgfx_tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
-struct tinfl_decompressor_tag; typedef struct tinfl_decompressor_tag tinfl_decompressor;
+struct lgfx_tinfl_decompressor_tag; typedef struct lgfx_tinfl_decompressor_tag lgfx_tinfl_decompressor;
// Max size of LZ dictionary.
#define TINFL_LZ_DICT_SIZE 32768
@@ -732,15 +732,15 @@ typedef enum
TINFL_STATUS_DONE = 0,
TINFL_STATUS_NEEDS_MORE_INPUT = 1,
TINFL_STATUS_HAS_MORE_OUTPUT = 2
-} tinfl_status;
+} lgfx_tinfl_status;
// Initializes the decompressor to its initial state.
-#define tinfl_init(r) do { (r)->m_state = 0; } MZ_MACRO_END
-#define tinfl_get_adler32(r) (r)->m_check_adler32
+#define lgfx_tinfl_init(r) do { (r)->m_state = 0; } MZ_MACRO_END
+#define lgfx_tinfl_get_adler32(r) (r)->m_check_adler32
// Main low-level decompressor coroutine function. This is the only function actually needed for decompression. All the other functions are just high-level helpers for improved usability.
// This is a universal API, i.e. it can be used as a building block to build any desired higher level decompression API. In the limit case, it can be called once per every byte input or output.
-tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags);
+lgfx_tinfl_status lgfx_tinfl_decompress(lgfx_tinfl_decompressor *r, const lgfx_mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, lgfx_mz_uint8 *pOut_buf_start, lgfx_mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const lgfx_mz_uint32 decomp_flags);
// Internal/private bits follow.
enum
@@ -751,29 +751,29 @@ enum
typedef struct
{
- mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0];
- mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
-} tinfl_huff_table;
+ lgfx_mz_uint8 m_code_size[TINFL_MAX_HUFF_SYMBOLS_0];
+ lgfx_mz_int16 m_look_up[TINFL_FAST_LOOKUP_SIZE], m_tree[TINFL_MAX_HUFF_SYMBOLS_0 * 2];
+} lgfx_tinfl_huff_table;
#if MINIZ_HAS_64BIT_REGISTERS
#define TINFL_USE_64BIT_BITBUF 1
#endif
#if TINFL_USE_64BIT_BITBUF
- typedef mz_uint64 tinfl_bit_buf_t;
+ typedef lgfx_mz_uint64 lgfx_tinfl_bit_buf_t;
#define TINFL_BITBUF_SIZE (64)
#else
- typedef mz_uint32 tinfl_bit_buf_t;
+ typedef lgfx_mz_uint32 lgfx_tinfl_bit_buf_t;
#define TINFL_BITBUF_SIZE (32)
#endif
-struct tinfl_decompressor_tag
+struct lgfx_tinfl_decompressor_tag
{
- mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
- tinfl_bit_buf_t m_bit_buf;
+ lgfx_mz_uint32 m_state, m_num_bits, m_zhdr0, m_zhdr1, m_z_adler32, m_final, m_type, m_check_adler32, m_dist, m_counter, m_num_extra, m_table_sizes[TINFL_MAX_HUFF_TABLES];
+ lgfx_tinfl_bit_buf_t m_bit_buf;
size_t m_dist_from_out_buf_start;
- tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES];
- mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
+ lgfx_tinfl_huff_table m_tables[TINFL_MAX_HUFF_TABLES];
+ lgfx_mz_uint8 m_raw_header[4], m_len_codes[TINFL_MAX_HUFF_SYMBOLS_0 + TINFL_MAX_HUFF_SYMBOLS_1 + 137];
};
@@ -835,19 +835,19 @@ size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void
// On return:
// Function returns a pointer to the compressed data, or NULL on failure.
// *pLen_out will be set to the size of the PNG image file.
-// The caller must mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed.
-void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip);
+// The caller must lgfx_mz_free() the returned heap block (which will typically be larger than *pLen_out) when it's no longer needed.
+void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, lgfx_mz_uint level, lgfx_mz_bool flip);
void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h, int num_chans, size_t *pLen_out);
-typedef mz_uint8 *(*tdefl_get_png_row_func)(mz_uint8 *pImage, mz_bool flip, int w, int h, int y, int bpl, void *target);
-mz_uint8 *tdefl_get_png_row_default( mz_uint8 *pImage, mz_bool flip, int w, int h, int y, int bpl, void *target );
-void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip, tdefl_get_png_row_func cb, void *target);
+typedef lgfx_mz_uint8 *(*tdefl_get_png_row_func)(lgfx_mz_uint8 *pImage, lgfx_mz_bool flip, int w, int h, int y, int bpl, void *target);
+lgfx_mz_uint8 *tdefl_get_png_row_default( lgfx_mz_uint8 *pImage, lgfx_mz_bool flip, int w, int h, int y, int bpl, void *target );
+void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, lgfx_mz_uint level, lgfx_mz_bool flip, tdefl_get_png_row_func cb, void *target);
// Output stream interface. The compressor uses this interface to write compressed data. It'll typically be called TDEFL_OUT_BUF_SIZE at a time.
-typedef mz_bool (*tdefl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser);
+typedef lgfx_mz_bool (*tdefl_put_buf_func_ptr)(const void* pBuf, int len, void *pUser);
// tdefl_compress_mem_to_output() compresses a block to an output stream. The above helpers use this function internally.
-mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
+lgfx_mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags);
enum { TDEFL_MAX_HUFF_TABLES = 3, TDEFL_MAX_HUFF_SYMBOLS_0 = 288, TDEFL_MAX_HUFF_SYMBOLS_1 = 32, TDEFL_MAX_HUFF_SYMBOLS_2 = 19, TDEFL_LZ_DICT_SIZE = 4096, TDEFL_LZ_DICT_SIZE_MASK = TDEFL_LZ_DICT_SIZE - 1, TDEFL_MIN_MATCH_LEN = 3, TDEFL_MAX_MATCH_LEN = 258 };
@@ -881,27 +881,27 @@ typedef struct
{
tdefl_put_buf_func_ptr m_pPut_buf_func;
void *m_pPut_buf_user;
- mz_uint m_flags, m_max_probes[2];
+ lgfx_mz_uint m_flags, m_max_probes[2];
int m_greedy_parsing;
- mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
- mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
- mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
- mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
+ lgfx_mz_uint m_adler32, m_lookahead_pos, m_lookahead_size, m_dict_size;
+ lgfx_mz_uint8 *m_pLZ_code_buf, *m_pLZ_flags, *m_pOutput_buf, *m_pOutput_buf_end;
+ lgfx_mz_uint m_num_flags_left, m_total_lz_bytes, m_lz_code_buf_dict_pos, m_bits_in, m_bit_buffer;
+ lgfx_mz_uint m_saved_match_dist, m_saved_match_len, m_saved_lit, m_output_flush_ofs, m_output_flush_remaining, m_finished, m_block_index, m_wants_to_finish;
tdefl_status m_prev_return_status;
const void *m_pIn_buf;
void *m_pOut_buf;
size_t *m_pIn_buf_size, *m_pOut_buf_size;
tdefl_flush m_flush;
- const mz_uint8 *m_pSrc;
+ const lgfx_mz_uint8 *m_pSrc;
size_t m_src_buf_left, m_out_buf_ofs;
- mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1];
- mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
- mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
- mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
- mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE];
- mz_uint16 m_next[TDEFL_LZ_DICT_SIZE];
- mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE];
- mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
+ lgfx_mz_uint8 m_dict[TDEFL_LZ_DICT_SIZE + TDEFL_MAX_MATCH_LEN - 1];
+ lgfx_mz_uint16 m_huff_count[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+ lgfx_mz_uint16 m_huff_codes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+ lgfx_mz_uint8 m_huff_code_sizes[TDEFL_MAX_HUFF_TABLES][TDEFL_MAX_HUFF_SYMBOLS];
+ lgfx_mz_uint8 m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE];
+ lgfx_mz_uint16 m_next[TDEFL_LZ_DICT_SIZE];
+ lgfx_mz_uint16 m_hash[TDEFL_LZ_HASH_SIZE];
+ lgfx_mz_uint8 m_output_buf[TDEFL_OUT_BUF_SIZE];
} tdefl_compressor;
// Initializes the compressor.
@@ -919,7 +919,7 @@ tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pI
tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, size_t in_buf_size, tdefl_flush flush);
tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d);
-mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
+lgfx_mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
// Can't use tdefl_create_comp_flags_from_zip_params if MINIZ_NO_ZLIB_APIS isn't defined, because it uses some of its macros.
#ifndef MINIZ_NO_ZLIB_APIS
@@ -927,7 +927,7 @@ mz_uint32 tdefl_get_adler32(tdefl_compressor *d);
// level may range from [0,10] (where 10 is absolute max compression, but may be much slower on some files)
// window_bits may be -15 (raw deflate) or 15 (zlib)
// strategy may be either MZ_DEFAULT_STRATEGY, MZ_FILTERED, MZ_HUFFMAN_ONLY, MZ_RLE, or MZ_FIXED
-mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
+lgfx_mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy);
#endif // #ifndef MINIZ_NO_ZLIB_APIS
#endif // MINIZ_NO_COMPRESSION
@@ -938,13 +938,13 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int
#endif // MINIZ_HEADER_INCLUDED
-// ------------------- End of Header: Implementation follows. (If you only want the header, define MINIZ_HEADER_FILE_ONLY.)
+// ------------------- End of Header: Implementation follows. (If you only want the header, define LGFX_MINIZ_HEADER_FILE_ONLY.)
-#ifndef MINIZ_HEADER_FILE_ONLY
+#ifndef LGFX_MINIZ_HEADER_FILE_ONLY
-typedef unsigned char mz_validate_uint16[sizeof(mz_uint16)==2 ? 1 : -1];
-typedef unsigned char mz_validate_uint32[sizeof(mz_uint32)==4 ? 1 : -1];
-typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
+typedef unsigned char lgfx_mz_validate_uint16[sizeof(lgfx_mz_uint16)==2 ? 1 : -1];
+typedef unsigned char lgfx_mz_validate_uint32[sizeof(lgfx_mz_uint32)==4 ? 1 : -1];
+typedef unsigned char lgfx_mz_validate_uint64[sizeof(lgfx_mz_uint64)==8 ? 1 : -1];
#include
#include
@@ -956,7 +956,7 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
#define MZ_FREE(x) (void)x, ((void)0)
#define MZ_REALLOC(p, x) NULL
#else
- #ifdef BOARD_HAS_PSRAM
+ #if defined (ESP_PLATFORM) && (BOARD_HAS_PSRAM)
#if __has_include()
#include
#elif __has_include()
@@ -979,11 +979,11 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
#define MZ_CLEAR_OBJ(obj) memset(&(obj), 0, sizeof(obj))
#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
- #define MZ_READ_LE16(p) *((const mz_uint16 *)(p))
- #define MZ_READ_LE32(p) *((const mz_uint32 *)(p))
+ #define MZ_READ_LE16(p) *((const lgfx_mz_uint16 *)(p))
+ #define MZ_READ_LE32(p) *((const lgfx_mz_uint32 *)(p))
#else
- #define MZ_READ_LE16(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U))
- #define MZ_READ_LE32(p) ((mz_uint32)(((const mz_uint8 *)(p))[0]) | ((mz_uint32)(((const mz_uint8 *)(p))[1]) << 8U) | ((mz_uint32)(((const mz_uint8 *)(p))[2]) << 16U) | ((mz_uint32)(((const mz_uint8 *)(p))[3]) << 24U))
+ #define MZ_READ_LE16(p) ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[0]) | ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[1]) << 8U))
+ #define MZ_READ_LE32(p) ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[0]) | ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[1]) << 8U) | ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[2]) << 16U) | ((lgfx_mz_uint32)(((const lgfx_mz_uint8 *)(p))[3]) << 24U))
#endif
#ifdef _MSC_VER
@@ -1000,9 +1000,9 @@ typedef unsigned char mz_validate_uint64[sizeof(mz_uint64)==8 ? 1 : -1];
// ------------------- zlib-style API's
-mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
+lgfx_mz_ulong lgfx_mz_adler32(lgfx_mz_ulong adler, const unsigned char *ptr, size_t buf_len)
{
- mz_uint32 i, s1 = (mz_uint32)(adler & 0xffff), s2 = (mz_uint32)(adler >> 16); size_t block_len = buf_len % 5552;
+ lgfx_mz_uint32 i, s1 = (lgfx_mz_uint32)(adler & 0xffff), s2 = (lgfx_mz_uint32)(adler >> 16); size_t block_len = buf_len % 5552;
if (!ptr) return MZ_ADLER32_INIT;
while (buf_len) {
for (i = 0; i + 7 < block_len; i += 8, ptr += 8) {
@@ -1016,17 +1016,17 @@ mz_ulong mz_adler32(mz_ulong adler, const unsigned char *ptr, size_t buf_len)
}
// Karl Malbrain's compact CRC-32. See "A compact CCITT crc16 and crc32 C implementation that balances processor cache usage against speed": http://www.geocities.com/malbrain/
-mz_ulong mz_crc32(mz_ulong crc, const mz_uint8 *ptr, size_t buf_len)
+lgfx_mz_ulong lgfx_mz_crc32(lgfx_mz_ulong crc, const lgfx_mz_uint8 *ptr, size_t buf_len)
{
- static const mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
+ static const lgfx_mz_uint32 s_crc32[16] = { 0, 0x1db71064, 0x3b6e20c8, 0x26d930ac, 0x76dc4190, 0x6b6b51f4, 0x4db26158, 0x5005713c,
0xedb88320, 0xf00f9344, 0xd6d6a3e8, 0xcb61b38c, 0x9b64c2b0, 0x86d3d2d4, 0xa00ae278, 0xbdbdf21c };
- mz_uint32 crcu32 = (mz_uint32)crc;
+ lgfx_mz_uint32 crcu32 = (lgfx_mz_uint32)crc;
if (!ptr) return MZ_CRC32_INIT;
- crcu32 = ~crcu32; while (buf_len--) { mz_uint8 b = *ptr++; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)]; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)]; }
+ crcu32 = ~crcu32; while (buf_len--) { lgfx_mz_uint8 b = *ptr++; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b & 0xF)]; crcu32 = (crcu32 >> 4) ^ s_crc32[(crcu32 & 0xF) ^ (b >> 4)]; }
return ~crcu32;
}
-void mz_free(void *p)
+void lgfx_mz_free(void *p)
{
MZ_FREE(p);
}
@@ -1037,22 +1037,22 @@ static void *def_alloc_func(void *opaque, size_t items, size_t size) { (void)opa
static void def_free_func(void *opaque, void *address) { (void)opaque, (void)address; MZ_FREE(address); }
static void *def_realloc_func(void *opaque, void *address, size_t items, size_t size) { (void)opaque, (void)address, (void)items, (void)size; return MZ_REALLOC(address, items * size); }
-const char *mz_version(void)
+const char *lgfx_mz_version(void)
{
return MZ_VERSION;
}
#ifndef MINIZ_NO_COMPRESSION
-int mz_deflateInit(mz_streamp pStream, int level)
+int lgfx_mz_deflateInit(lgfx_mz_streamp pStream, int level)
{
- return mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY);
+ return lgfx_mz_deflateInit2(pStream, level, MZ_DEFLATED, MZ_DEFAULT_WINDOW_BITS, 9, MZ_DEFAULT_STRATEGY);
}
-int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
+int lgfx_mz_deflateInit2(lgfx_mz_streamp pStream, int level, int method, int window_bits, int mem_level, int strategy)
{
tdefl_compressor *pComp;
- mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy);
+ lgfx_mz_uint comp_flags = TDEFL_COMPUTE_ADLER32 | tdefl_create_comp_flags_from_zip_params(level, window_bits, strategy);
if (!pStream) return MZ_STREAM_ERROR;
if ((method != MZ_DEFLATED) || ((mem_level < 1) || (mem_level > 9)) || ((window_bits != MZ_DEFAULT_WINDOW_BITS) && (-window_bits != MZ_DEFAULT_WINDOW_BITS))) return MZ_PARAM_ERROR;
@@ -1070,18 +1070,18 @@ int mz_deflateInit2(mz_streamp pStream, int level, int method, int window_bits,
if (!pComp)
return MZ_MEM_ERROR;
- pStream->state = (struct mz_internal_state *)pComp;
+ pStream->state = (struct lgfx_mz_internal_state *)pComp;
if (tdefl_init(pComp, NULL, NULL, comp_flags) != TDEFL_STATUS_OKAY)
{
- mz_deflateEnd(pStream);
+ lgfx_mz_deflateEnd(pStream);
return MZ_PARAM_ERROR;
}
return MZ_OK;
}
-int mz_deflateReset(mz_streamp pStream)
+int lgfx_mz_deflateReset(lgfx_mz_streamp pStream)
{
if ((!pStream) || (!pStream->state) || (!pStream->zalloc) || (!pStream->zfree)) return MZ_STREAM_ERROR;
pStream->total_in = pStream->total_out = 0;
@@ -1089,11 +1089,11 @@ int mz_deflateReset(mz_streamp pStream)
return MZ_OK;
}
-int mz_deflate(mz_streamp pStream, int flush)
+int lgfx_mz_deflate(lgfx_mz_streamp pStream, int flush)
{
size_t in_bytes, out_bytes;
- mz_ulong orig_total_in, orig_total_out;
- int mz_status = MZ_OK;
+ lgfx_mz_ulong orig_total_in, orig_total_out;
+ int lgfx_mz_status = MZ_OK;
if ((!pStream) || (!pStream->state) || (flush < 0) || (flush > MZ_FINISH) || (!pStream->next_out)) return MZ_STREAM_ERROR;
if (!pStream->avail_out) return MZ_BUF_ERROR;
@@ -1110,20 +1110,20 @@ int mz_deflate(mz_streamp pStream, int flush)
in_bytes = pStream->avail_in; out_bytes = pStream->avail_out;
defl_status = tdefl_compress((tdefl_compressor*)pStream->state, pStream->next_in, &in_bytes, pStream->next_out, &out_bytes, (tdefl_flush)flush);
- pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes;
- pStream->total_in += (mz_uint)in_bytes; pStream->adler = tdefl_get_adler32((tdefl_compressor*)pStream->state);
+ pStream->next_in += (lgfx_mz_uint)in_bytes; pStream->avail_in -= (lgfx_mz_uint)in_bytes;
+ pStream->total_in += (lgfx_mz_uint)in_bytes; pStream->adler = tdefl_get_adler32((tdefl_compressor*)pStream->state);
- pStream->next_out += (mz_uint)out_bytes; pStream->avail_out -= (mz_uint)out_bytes;
- pStream->total_out += (mz_uint)out_bytes;
+ pStream->next_out += (lgfx_mz_uint)out_bytes; pStream->avail_out -= (lgfx_mz_uint)out_bytes;
+ pStream->total_out += (lgfx_mz_uint)out_bytes;
if (defl_status < 0)
{
- mz_status = MZ_STREAM_ERROR;
+ lgfx_mz_status = MZ_STREAM_ERROR;
break;
}
else if (defl_status == TDEFL_STATUS_DONE)
{
- mz_status = MZ_STREAM_END;
+ lgfx_mz_status = MZ_STREAM_END;
break;
}
else if (!pStream->avail_out)
@@ -1135,10 +1135,10 @@ int mz_deflate(mz_streamp pStream, int flush)
return MZ_BUF_ERROR; // Can't make forward progress without some input.
}
}
- return mz_status;
+ return lgfx_mz_status;
}
-int mz_deflateEnd(mz_streamp pStream)
+int lgfx_mz_deflateEnd(lgfx_mz_streamp pStream)
{
if (!pStream) return MZ_STREAM_ERROR;
if (pStream->state)
@@ -1149,62 +1149,62 @@ int mz_deflateEnd(mz_streamp pStream)
return MZ_OK;
}
-mz_ulong mz_deflateBound(mz_streamp pStream, mz_ulong source_len)
+lgfx_mz_ulong lgfx_mz_deflateBound(lgfx_mz_streamp pStream, lgfx_mz_ulong source_len)
{
(void)pStream;
// This is really over conservative. (And lame, but it's actually pretty tricky to compute a true upper bound given the way tdefl's blocking works.)
return MZ_MAX(128 + (source_len * 110) / 100, 128 + source_len + ((source_len / (31 * 1024)) + 1) * 5);
}
-int mz_compress2(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len, int level)
+int lgfx_mz_compress2(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len, int level)
{
int status;
- mz_stream stream;
+ lgfx_mz_stream stream;
memset(&stream, 0, sizeof(stream));
- // In case mz_ulong is 64-bits (argh I hate longs).
+ // In case lgfx_mz_ulong is 64-bits (argh I hate longs).
if ((source_len | *pDest_len) > 0xFFFFFFFFU) return MZ_PARAM_ERROR;
stream.next_in = pSource;
- stream.avail_in = (mz_uint32)source_len;
+ stream.avail_in = (lgfx_mz_uint32)source_len;
stream.next_out = pDest;
- stream.avail_out = (mz_uint32)*pDest_len;
+ stream.avail_out = (lgfx_mz_uint32)*pDest_len;
- status = mz_deflateInit(&stream, level);
+ status = lgfx_mz_deflateInit(&stream, level);
if (status != MZ_OK) return status;
- status = mz_deflate(&stream, MZ_FINISH);
+ status = lgfx_mz_deflate(&stream, MZ_FINISH);
if (status != MZ_STREAM_END)
{
- mz_deflateEnd(&stream);
+ lgfx_mz_deflateEnd(&stream);
return (status == MZ_OK) ? MZ_BUF_ERROR : status;
}
*pDest_len = stream.total_out;
- return mz_deflateEnd(&stream);
+ return lgfx_mz_deflateEnd(&stream);
}
-int mz_compress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
+int lgfx_mz_compress(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len)
{
- return mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION);
+ return lgfx_mz_compress2(pDest, pDest_len, pSource, source_len, MZ_DEFAULT_COMPRESSION);
}
-mz_ulong mz_compressBound(mz_ulong source_len)
+lgfx_mz_ulong lgfx_mz_compressBound(lgfx_mz_ulong source_len)
{
- return mz_deflateBound(NULL, source_len);
+ return lgfx_mz_deflateBound(NULL, source_len);
}
#endif // MINIZ_NO_COMPRESSION
typedef struct
{
- tinfl_decompressor m_decomp;
- mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; int m_window_bits;
- mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
- tinfl_status m_last_status;
+ lgfx_tinfl_decompressor m_decomp;
+ lgfx_mz_uint m_dict_ofs, m_dict_avail, m_first_call, m_has_flushed; int m_window_bits;
+ lgfx_mz_uint8 m_dict[TINFL_LZ_DICT_SIZE];
+ lgfx_tinfl_status m_last_status;
} inflate_state;
-int mz_inflateInit2(mz_streamp pStream, int window_bits)
+int lgfx_mz_inflateInit2(lgfx_mz_streamp pStream, int window_bits)
{
inflate_state *pDecomp;
if (!pStream) return MZ_STREAM_ERROR;
@@ -1222,9 +1222,9 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits)
pDecomp = (inflate_state*)pStream->zalloc(pStream->opaque, 1, sizeof(inflate_state));
if (!pDecomp) return MZ_MEM_ERROR;
- pStream->state = (struct mz_internal_state *)pDecomp;
+ pStream->state = (struct lgfx_mz_internal_state *)pDecomp;
- tinfl_init(&pDecomp->m_decomp);
+ lgfx_tinfl_init(&pDecomp->m_decomp);
pDecomp->m_dict_ofs = 0;
pDecomp->m_dict_avail = 0;
pDecomp->m_last_status = TINFL_STATUS_NEEDS_MORE_INPUT;
@@ -1235,17 +1235,17 @@ int mz_inflateInit2(mz_streamp pStream, int window_bits)
return MZ_OK;
}
-int mz_inflateInit(mz_streamp pStream)
+int lgfx_mz_inflateInit(lgfx_mz_streamp pStream)
{
- return mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
+ return lgfx_mz_inflateInit2(pStream, MZ_DEFAULT_WINDOW_BITS);
}
-int mz_inflate(mz_streamp pStream, int flush)
+int lgfx_mz_inflate(lgfx_mz_streamp pStream, int flush)
{
inflate_state* pState;
- mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
+ lgfx_mz_uint n, first_call, decomp_flags = TINFL_FLAG_COMPUTE_ADLER32;
size_t in_bytes, out_bytes, orig_avail_in;
- tinfl_status status;
+ lgfx_tinfl_status status;
if ((!pStream) || (!pStream->state)) return MZ_STREAM_ERROR;
if (flush == MZ_PARTIAL_FLUSH) flush = MZ_SYNC_FLUSH;
@@ -1266,11 +1266,11 @@ int mz_inflate(mz_streamp pStream, int flush)
// MZ_FINISH on the first call implies that the input and output buffers are large enough to hold the entire compressed/decompressed file.
decomp_flags |= TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF;
in_bytes = pStream->avail_in; out_bytes = pStream->avail_out;
- status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
+ status = lgfx_tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pStream->next_out, pStream->next_out, &out_bytes, decomp_flags);
pState->m_last_status = status;
- pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes; pStream->total_in += (mz_uint)in_bytes;
- pStream->adler = tinfl_get_adler32(&pState->m_decomp);
- pStream->next_out += (mz_uint)out_bytes; pStream->avail_out -= (mz_uint)out_bytes; pStream->total_out += (mz_uint)out_bytes;
+ pStream->next_in += (lgfx_mz_uint)in_bytes; pStream->avail_in -= (lgfx_mz_uint)in_bytes; pStream->total_in += (lgfx_mz_uint)in_bytes;
+ pStream->adler = lgfx_tinfl_get_adler32(&pState->m_decomp);
+ pStream->next_out += (lgfx_mz_uint)out_bytes; pStream->avail_out -= (lgfx_mz_uint)out_bytes; pStream->total_out += (lgfx_mz_uint)out_bytes;
if (status < 0)
return MZ_DATA_ERROR;
@@ -1298,13 +1298,13 @@ int mz_inflate(mz_streamp pStream, int flush)
in_bytes = pStream->avail_in;
out_bytes = TINFL_LZ_DICT_SIZE - pState->m_dict_ofs;
- status = tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
+ status = lgfx_tinfl_decompress(&pState->m_decomp, pStream->next_in, &in_bytes, pState->m_dict, pState->m_dict + pState->m_dict_ofs, &out_bytes, decomp_flags);
pState->m_last_status = status;
- pStream->next_in += (mz_uint)in_bytes; pStream->avail_in -= (mz_uint)in_bytes;
- pStream->total_in += (mz_uint)in_bytes; pStream->adler = tinfl_get_adler32(&pState->m_decomp);
+ pStream->next_in += (lgfx_mz_uint)in_bytes; pStream->avail_in -= (lgfx_mz_uint)in_bytes;
+ pStream->total_in += (lgfx_mz_uint)in_bytes; pStream->adler = lgfx_tinfl_get_adler32(&pState->m_decomp);
- pState->m_dict_avail = (mz_uint)out_bytes;
+ pState->m_dict_avail = (lgfx_mz_uint)out_bytes;
n = MZ_MIN(pState->m_dict_avail, pStream->avail_out);
memcpy(pStream->next_out, pState->m_dict + pState->m_dict_ofs, n);
@@ -1331,7 +1331,7 @@ int mz_inflate(mz_streamp pStream, int flush)
return ((status == TINFL_STATUS_DONE) && (!pState->m_dict_avail)) ? MZ_STREAM_END : MZ_OK;
}
-int mz_inflateEnd(mz_streamp pStream)
+int lgfx_mz_inflateEnd(lgfx_mz_streamp pStream)
{
if (!pStream)
return MZ_STREAM_ERROR;
@@ -1343,43 +1343,43 @@ int mz_inflateEnd(mz_streamp pStream)
return MZ_OK;
}
-int mz_uncompress(unsigned char *pDest, mz_ulong *pDest_len, const unsigned char *pSource, mz_ulong source_len)
+int lgfx_mz_uncompress(unsigned char *pDest, lgfx_mz_ulong *pDest_len, const unsigned char *pSource, lgfx_mz_ulong source_len)
{
- mz_stream stream;
+ lgfx_mz_stream stream;
int status;
memset(&stream, 0, sizeof(stream));
- // In case mz_ulong is 64-bits (argh I hate longs).
+ // In case lgfx_mz_ulong is 64-bits (argh I hate longs).
if ((source_len | *pDest_len) > 0xFFFFFFFFU) return MZ_PARAM_ERROR;
stream.next_in = pSource;
- stream.avail_in = (mz_uint32)source_len;
+ stream.avail_in = (lgfx_mz_uint32)source_len;
stream.next_out = pDest;
- stream.avail_out = (mz_uint32)*pDest_len;
+ stream.avail_out = (lgfx_mz_uint32)*pDest_len;
- status = mz_inflateInit(&stream);
+ status = lgfx_mz_inflateInit(&stream);
if (status != MZ_OK)
return status;
- status = mz_inflate(&stream, MZ_FINISH);
+ status = lgfx_mz_inflate(&stream, MZ_FINISH);
if (status != MZ_STREAM_END)
{
- mz_inflateEnd(&stream);
+ lgfx_mz_inflateEnd(&stream);
return ((status == MZ_BUF_ERROR) && (!stream.avail_in)) ? MZ_DATA_ERROR : status;
}
*pDest_len = stream.total_out;
- return mz_inflateEnd(&stream);
+ return lgfx_mz_inflateEnd(&stream);
}
-const char *mz_error(int err)
+const char *lgfx_mz_error(int err)
{
static struct { int m_err; const char *m_pDesc; } s_error_descs[] =
{
{ MZ_OK, "" }, { MZ_STREAM_END, "stream end" }, { MZ_NEED_DICT, "need dictionary" }, { MZ_ERRNO, "file error" }, { MZ_STREAM_ERROR, "stream error" },
{ MZ_DATA_ERROR, "data error" }, { MZ_MEM_ERROR, "out of memory" }, { MZ_BUF_ERROR, "buf error" }, { MZ_VERSION_ERROR, "version error" }, { MZ_PARAM_ERROR, "parameter error" }
};
- mz_uint i; for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i) if (s_error_descs[i].m_err == err) return s_error_descs[i].m_pDesc;
+ lgfx_mz_uint i; for (i = 0; i < sizeof(s_error_descs) / sizeof(s_error_descs[0]); ++i) if (s_error_descs[i].m_err == err) return s_error_descs[i].m_pDesc;
return NULL;
}
@@ -1405,9 +1405,9 @@ const char *mz_error(int err)
if (pIn_buf_cur < pIn_buf_end) { \
c = *pIn_buf_cur++; \
} } MZ_MACRO_END
-#define TINFL_NEED_BITS(state_index, n) do { mz_uint c; TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; } while (num_bits < (mz_uint)(n))
-#define TINFL_SKIP_BITS(state_index, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
-#define TINFL_GET_BITS(state_index, b, n) do { if (num_bits < (mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } b = bit_buf & ((1 << (n)) - 1); bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
+#define TINFL_NEED_BITS(state_index, n) do { lgfx_mz_uint c; TINFL_GET_BYTE(state_index, c); bit_buf |= (((lgfx_tinfl_bit_buf_t)c) << num_bits); num_bits += 8; } while (num_bits < (lgfx_mz_uint)(n))
+#define TINFL_SKIP_BITS(state_index, n) do { if (num_bits < (lgfx_mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
+#define TINFL_GET_BITS(state_index, b, n) do { if (num_bits < (lgfx_mz_uint)(n)) { TINFL_NEED_BITS(state_index, n); } b = bit_buf & ((1 << (n)) - 1); bit_buf >>= (n); num_bits -= (n); } MZ_MACRO_END
// TINFL_HUFF_BITBUF_FILL() is only used rarely, when the number of bytes remaining in the input buffer falls below 2.
// It reads just enough bytes from the input stream that are needed to decode the next Huffman code (and absolutely no more). It works by trying to fully decode a
@@ -1425,7 +1425,7 @@ const char *mz_error(int err)
do { \
temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; \
} while ((temp < 0) && (num_bits >= (code_len + 1))); if (temp >= 0) break; \
- } TINFL_GET_BYTE(state_index, c); bit_buf |= (((tinfl_bit_buf_t)c) << num_bits); num_bits += 8; \
+ } TINFL_GET_BYTE(state_index, c); bit_buf |= (((lgfx_tinfl_bit_buf_t)c) << num_bits); num_bits += 8; \
} while (num_bits < 15);
// TINFL_HUFF_DECODE() decodes the next Huffman coded symbol. It's more complex than you would initially expect because the zlib API expects the decompressor to never read
@@ -1433,12 +1433,12 @@ const char *mz_error(int err)
// decode the next Huffman code.) Handling this properly is particularly important on raw deflate (non-zlib) streams, which aren't followed by a byte aligned adler-32.
// The slow path is only executed at the very end of the input buffer.
#define TINFL_HUFF_DECODE(state_index, sym, pHuff) do { \
- int temp; mz_uint code_len, c; \
+ int temp; lgfx_mz_uint code_len, c; \
if (num_bits < 15) { \
if ((pIn_buf_end - pIn_buf_cur) < 2) { \
TINFL_HUFF_BITBUF_FILL(state_index, pHuff); \
} else { \
- c = ((tinfl_bit_buf_t)pIn_buf_cur[0]) + (((tinfl_bit_buf_t)pIn_buf_cur[1]) << 8); \
+ c = ((lgfx_tinfl_bit_buf_t)pIn_buf_cur[0]) + (((lgfx_tinfl_bit_buf_t)pIn_buf_cur[1]) << 8); \
bit_buf += c << num_bits; pIn_buf_cur += 2; num_bits += 16; \
} \
} \
@@ -1448,18 +1448,18 @@ const char *mz_error(int err)
code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \
} sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END
-tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags)
+lgfx_tinfl_status lgfx_tinfl_decompress(lgfx_tinfl_decompressor *r, const lgfx_mz_uint8 *pIn_buf_next, size_t *pIn_buf_size, lgfx_mz_uint8 *pOut_buf_start, lgfx_mz_uint8 *pOut_buf_next, size_t *pOut_buf_size, const lgfx_mz_uint32 decomp_flags)
{
- static const mz_uint16 s_length_base[32] = { 0,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 mz_uint8 s_length_extra[32]= { 0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
- static const mz_uint16 s_dist_base[32] = { 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 mz_uint8 s_dist_extra[32] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
- static const mz_uint8 s_length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
- static const mz_uint16 s_min_table_sizes[3] = { 257, 1, 4 };
+ static const lgfx_mz_uint16 s_length_base[32] = { 0,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 lgfx_mz_uint8 s_length_extra[32]= { 0,0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
+ static const lgfx_mz_uint16 s_dist_base[32] = { 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 lgfx_mz_uint8 s_dist_extra[32] = { 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+ static const lgfx_mz_uint8 s_length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+ static const lgfx_mz_uint16 s_min_table_sizes[3] = { 257, 1, 4 };
- tinfl_status status = TINFL_STATUS_FAILED; mz_uint32 num_bits, dist, counter, num_extra; tinfl_bit_buf_t bit_buf;
- const mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
- mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
+ lgfx_tinfl_status status = TINFL_STATUS_FAILED; lgfx_mz_uint32 num_bits, dist, counter, num_extra; lgfx_tinfl_bit_buf_t bit_buf;
+ const lgfx_mz_uint8 *pIn_buf_cur = pIn_buf_next, *const pIn_buf_end = pIn_buf_next + *pIn_buf_size;
+ lgfx_mz_uint8 *pOut_buf_cur = pOut_buf_next, *const pOut_buf_end = pOut_buf_next + *pOut_buf_size;
size_t out_buf_size_mask = (decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) ? (size_t)-1 : ((pOut_buf_next - pOut_buf_start) + *pOut_buf_size) - 1, dist_from_out_buf_start;
// Ensure the output buffer's size is a power of 2, unless the output buffer is large enough to hold the entire output file (in which case it doesn't matter).
@@ -1484,12 +1484,12 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
{
TINFL_SKIP_BITS(5, num_bits & 7);
for (counter = 0; counter < 4; ++counter) { if (num_bits) TINFL_GET_BITS(6, r->m_raw_header[counter], 8); else TINFL_GET_BYTE(7, r->m_raw_header[counter]); }
- if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) { TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); }
+ if ((counter = (r->m_raw_header[0] | (r->m_raw_header[1] << 8))) != (lgfx_mz_uint)(0xFFFF ^ (r->m_raw_header[2] | (r->m_raw_header[3] << 8)))) { TINFL_CR_RETURN_FOREVER(39, TINFL_STATUS_FAILED); }
while ((counter) && (num_bits))
{
TINFL_GET_BITS(51, dist, 8);
while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(52, TINFL_STATUS_HAS_MORE_OUTPUT); }
- *pOut_buf_cur++ = (mz_uint8)dist;
+ *pOut_buf_cur++ = (lgfx_mz_uint8)dist;
counter--;
}
while (counter)
@@ -1507,7 +1507,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
}
n = MZ_MIN(MZ_MIN((size_t)(pOut_buf_end - pOut_buf_cur), (size_t)(pIn_buf_end - pIn_buf_cur)), counter);
- TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); pIn_buf_cur += n; pOut_buf_cur += n; counter -= (mz_uint)n;
+ TINFL_MEMCPY(pOut_buf_cur, pIn_buf_cur, n); pIn_buf_cur += n; pOut_buf_cur += n; counter -= (lgfx_mz_uint)n;
}
}
else if (r->m_type == 3)
@@ -1518,7 +1518,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
{
if (r->m_type == 1)
{
- mz_uint8 *p = r->m_tables[0].m_code_size; mz_uint i;
+ lgfx_mz_uint8 *p = r->m_tables[0].m_code_size; lgfx_mz_uint i;
r->m_table_sizes[0] = 288; r->m_table_sizes[1] = 32; TINFL_MEMSET(r->m_tables[1].m_code_size, 5, 32);
for ( i = 0; i <= 143; ++i) { *p++ = 8; }
for ( ; i <= 255; ++i) { *p++ = 9; }
@@ -1528,13 +1528,13 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
else
{
for (counter = 0; counter < 3; counter++) { TINFL_GET_BITS(11, r->m_table_sizes[counter], "\05\05\04"[counter]); r->m_table_sizes[counter] += s_min_table_sizes[counter]; }
- MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (mz_uint8)s; }
+ MZ_CLEAR_OBJ(r->m_tables[2].m_code_size); for (counter = 0; counter < r->m_table_sizes[2]; counter++) { lgfx_mz_uint s; TINFL_GET_BITS(14, s, 3); r->m_tables[2].m_code_size[s_length_dezigzag[counter]] = (lgfx_mz_uint8)s; }
r->m_table_sizes[2] = 19;
}
for ( ; (int)r->m_type >= 0; r->m_type--)
{
- int tree_next, tree_cur; tinfl_huff_table *pTable;
- mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_OBJ(total_syms); MZ_CLEAR_OBJ(pTable->m_look_up); MZ_CLEAR_OBJ(pTable->m_tree);
+ int tree_next, tree_cur; lgfx_tinfl_huff_table *pTable;
+ lgfx_mz_uint i, j, used_syms, total, sym_index, next_code[17], total_syms[16]; pTable = &r->m_tables[r->m_type]; MZ_CLEAR_OBJ(total_syms); MZ_CLEAR_OBJ(pTable->m_look_up); MZ_CLEAR_OBJ(pTable->m_tree);
i = r->m_table_sizes[r->m_type] - 1; do { total_syms[pTable->m_code_size[i]]++; } while (--i != ~0u);
used_syms = 0, total = 0; next_code[0] = next_code[1] = 0;
for (i = 1; i <= 15; ++i) { used_syms += total_syms[i]; next_code[i + 1] = (total = ((total + total_syms[i]) << 1)); }
@@ -1544,23 +1544,23 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
for (tree_next = -1, sym_index = 0; sym_index < r->m_table_sizes[r->m_type]; ++sym_index)
{
- mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index]; if (!code_size) continue;
+ lgfx_mz_uint rev_code = 0, l, cur_code, code_size = pTable->m_code_size[sym_index]; if (!code_size) continue;
cur_code = next_code[code_size]++; for (l = code_size; l > 0; l--, cur_code >>= 1) rev_code = (rev_code << 1) | (cur_code & 1);
- if (code_size <= TINFL_FAST_LOOKUP_BITS) { mz_int16 k = (mz_int16)((code_size << 9) | sym_index); while (rev_code < TINFL_FAST_LOOKUP_SIZE) { pTable->m_look_up[rev_code] = k; rev_code += (1 << code_size); } continue; }
- if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) { pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; }
+ if (code_size <= TINFL_FAST_LOOKUP_BITS) { lgfx_mz_int16 k = (lgfx_mz_int16)((code_size << 9) | sym_index); while (rev_code < TINFL_FAST_LOOKUP_SIZE) { pTable->m_look_up[rev_code] = k; rev_code += (1 << code_size); } continue; }
+ if (0 == (tree_cur = pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)])) { pTable->m_look_up[rev_code & (TINFL_FAST_LOOKUP_SIZE - 1)] = (lgfx_mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; }
rev_code >>= (TINFL_FAST_LOOKUP_BITS - 1);
for (j = code_size; j > (TINFL_FAST_LOOKUP_BITS + 1); j--)
{
tree_cur -= ((rev_code >>= 1) & 1);
- if (!pTable->m_tree[-tree_cur - 1]) { pTable->m_tree[-tree_cur - 1] = (mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; } else tree_cur = pTable->m_tree[-tree_cur - 1];
+ if (!pTable->m_tree[-tree_cur - 1]) { pTable->m_tree[-tree_cur - 1] = (lgfx_mz_int16)tree_next; tree_cur = tree_next; tree_next -= 2; } else tree_cur = pTable->m_tree[-tree_cur - 1];
}
- tree_cur -= ((rev_code >>= 1) & 1); pTable->m_tree[-tree_cur - 1] = (mz_int16)sym_index;
+ tree_cur -= ((rev_code >>= 1) & 1); pTable->m_tree[-tree_cur - 1] = (lgfx_mz_int16)sym_index;
}
if (r->m_type == 2)
{
for (counter = 0; counter < (r->m_table_sizes[0] + r->m_table_sizes[1]); )
{
- mz_uint s; TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); if (dist < 16) { r->m_len_codes[counter++] = (mz_uint8)dist; continue; }
+ lgfx_mz_uint s; TINFL_HUFF_DECODE(16, dist, &r->m_tables[2]); if (dist < 16) { r->m_len_codes[counter++] = (lgfx_mz_uint8)dist; continue; }
if ((dist == 16) && (!counter))
{
TINFL_CR_RETURN_FOREVER(17, TINFL_STATUS_FAILED);
@@ -1577,7 +1577,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
for ( ; ; )
{
- mz_uint8 *pSrc;
+ lgfx_mz_uint8 *pSrc;
for ( ; ; )
{
if (((pIn_buf_end - pIn_buf_cur) < 4) || ((pOut_buf_end - pOut_buf_cur) < 2))
@@ -1586,15 +1586,15 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
if (counter >= 256)
break;
while (pOut_buf_cur >= pOut_buf_end) { TINFL_CR_RETURN(24, TINFL_STATUS_HAS_MORE_OUTPUT); }
- *pOut_buf_cur++ = (mz_uint8)counter;
+ *pOut_buf_cur++ = (lgfx_mz_uint8)counter;
}
else
{
- int sym2; mz_uint code_len;
+ int sym2; lgfx_mz_uint code_len;
#if TINFL_USE_64BIT_BITBUF
- if (num_bits < 30) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); pIn_buf_cur += 4; num_bits += 32; }
+ if (num_bits < 30) { bit_buf |= (((lgfx_tinfl_bit_buf_t)MZ_READ_LE32(pIn_buf_cur)) << num_bits); pIn_buf_cur += 4; num_bits += 32; }
#else
- if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
+ if (num_bits < 15) { bit_buf |= (((lgfx_tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
#endif
if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
code_len = sym2 >> 9;
@@ -1607,7 +1607,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
break;
#if !TINFL_USE_64BIT_BITBUF
- if (num_bits < 15) { bit_buf |= (((tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
+ if (num_bits < 15) { bit_buf |= (((lgfx_tinfl_bit_buf_t)MZ_READ_LE16(pIn_buf_cur)) << num_bits); pIn_buf_cur += 2; num_bits += 16; }
#endif
if ((sym2 = r->m_tables[0].m_look_up[bit_buf & (TINFL_FAST_LOOKUP_SIZE - 1)]) >= 0)
code_len = sym2 >> 9;
@@ -1617,25 +1617,25 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
bit_buf >>= code_len; num_bits -= code_len;
- pOut_buf_cur[0] = (mz_uint8)counter;
+ pOut_buf_cur[0] = (lgfx_mz_uint8)counter;
if (sym2 & 256)
{
pOut_buf_cur++;
counter = sym2;
break;
}
- pOut_buf_cur[1] = (mz_uint8)sym2;
+ pOut_buf_cur[1] = (lgfx_mz_uint8)sym2;
pOut_buf_cur += 2;
}
}
if ((counter &= 255) == 0) break;
num_extra = s_length_extra[counter]; counter = s_length_base[counter];
- if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(25, extra_bits, num_extra); counter += extra_bits; }
+ if (num_extra) { lgfx_mz_uint extra_bits; TINFL_GET_BITS(25, extra_bits, num_extra); counter += extra_bits; }
TINFL_HUFF_DECODE(26, dist, &r->m_tables[1]);
num_extra = s_dist_extra[dist]; dist = s_dist_base[dist];
- if (num_extra) { mz_uint extra_bits; TINFL_GET_BITS(27, extra_bits, num_extra); dist += extra_bits; }
+ if (num_extra) { lgfx_mz_uint extra_bits; TINFL_GET_BITS(27, extra_bits, num_extra); dist += extra_bits; }
dist_from_out_buf_start = pOut_buf_cur - pOut_buf_start;
if ((decomp_flags & TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF) && (dist > dist_from_out_buf_start))
@@ -1657,7 +1657,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
else if ((counter >= 9) && (counter <= dist))
{
- mz_uint32 copylen = counter & ~3;
+ lgfx_mz_uint32 copylen = counter & ~3;
memcpy(pOut_buf_cur, pSrc, copylen);
pOut_buf_cur += copylen;
pSrc += copylen;
@@ -1674,7 +1674,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
}
#endif
- mz_uint32 i = 0;
+ lgfx_mz_uint32 i = 0;
do {
pOut_buf_cur[i] = pSrc[i];
} while (++i != counter);
@@ -1684,7 +1684,7 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
} while (!(r->m_final & 1));
if (decomp_flags & TINFL_FLAG_PARSE_ZLIB_HEADER)
{
- TINFL_SKIP_BITS(32, num_bits & 7); for (counter = 0; counter < 4; ++counter) { mz_uint s; if (num_bits) TINFL_GET_BITS(41, s, 8); else TINFL_GET_BYTE(42, s); r->m_z_adler32 = (r->m_z_adler32 << 8) | s; }
+ TINFL_SKIP_BITS(32, num_bits & 7); for (counter = 0; counter < 4; ++counter) { lgfx_mz_uint s; if (num_bits) TINFL_GET_BITS(41, s, 8); else TINFL_GET_BYTE(42, s); r->m_z_adler32 = (r->m_z_adler32 << 8) | s; }
}
TINFL_CR_RETURN_FOREVER(34, TINFL_STATUS_DONE);
TINFL_CR_FINISH
@@ -1695,8 +1695,8 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
/*
if ((decomp_flags & (TINFL_FLAG_PARSE_ZLIB_HEADER | TINFL_FLAG_COMPUTE_ADLER32)) && (status >= 0))
{
- const mz_uint8 *ptr = pOut_buf_next; size_t buf_len = *pOut_buf_size;
- mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16; size_t block_len = buf_len % 5552;
+ const lgfx_mz_uint8 *ptr = pOut_buf_next; size_t buf_len = *pOut_buf_size;
+ lgfx_mz_uint32 i, s1 = r->m_check_adler32 & 0xffff, s2 = r->m_check_adler32 >> 16; size_t block_len = buf_len % 5552;
while (buf_len)
{
for (i = 0; i < block_len; ++i) s1 += *ptr++, s2 += s1;
@@ -1709,15 +1709,15 @@ tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 *pIn_buf_nex
}
// Higher level helper functions.
-void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
+void *lgfx_tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, size_t *pOut_len, int flags)
{
- tinfl_decompressor decomp; void *pBuf = NULL, *pNew_buf; size_t src_buf_ofs = 0, out_buf_capacity = 0;
+ lgfx_tinfl_decompressor decomp; void *pBuf = NULL, *pNew_buf; size_t src_buf_ofs = 0, out_buf_capacity = 0;
*pOut_len = 0;
- tinfl_init(&decomp);
+ lgfx_tinfl_init(&decomp);
for ( ; ; )
{
size_t src_buf_size = src_buf_len - src_buf_ofs, dst_buf_size = out_buf_capacity - *pOut_len, new_out_buf_capacity;
- tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8*)pSrc_buf + src_buf_ofs, &src_buf_size, (mz_uint8*)pBuf, pBuf ? (mz_uint8*)pBuf + *pOut_len : NULL, &dst_buf_size,
+ lgfx_tinfl_status status = lgfx_tinfl_decompress(&decomp, (const lgfx_mz_uint8*)pSrc_buf + src_buf_ofs, &src_buf_size, (lgfx_mz_uint8*)pBuf, pBuf ? (lgfx_mz_uint8*)pBuf + *pOut_len : NULL, &dst_buf_size,
(flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
if ((status < 0) || (status == TINFL_STATUS_NEEDS_MORE_INPUT))
{
@@ -1737,25 +1737,25 @@ void *tinfl_decompress_mem_to_heap(const void *pSrc_buf, size_t src_buf_len, siz
return pBuf;
}
-size_t tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
+size_t lgfx_tinfl_decompress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void *pSrc_buf, size_t src_buf_len, int flags)
{
- tinfl_decompressor decomp; tinfl_status status; tinfl_init(&decomp);
- status = tinfl_decompress(&decomp, (const mz_uint8*)pSrc_buf, &src_buf_len, (mz_uint8*)pOut_buf, (mz_uint8*)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
+ lgfx_tinfl_decompressor decomp; lgfx_tinfl_status status; lgfx_tinfl_init(&decomp);
+ status = lgfx_tinfl_decompress(&decomp, (const lgfx_mz_uint8*)pSrc_buf, &src_buf_len, (lgfx_mz_uint8*)pOut_buf, (lgfx_mz_uint8*)pOut_buf, &out_buf_len, (flags & ~TINFL_FLAG_HAS_MORE_INPUT) | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF);
return (status != TINFL_STATUS_DONE) ? TINFL_DECOMPRESS_MEM_TO_MEM_FAILED : out_buf_len;
}
-int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
+int lgfx_tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size, lgfx_tinfl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
{
int result = 0;
- tinfl_decompressor decomp;
- mz_uint8 *pDict = (mz_uint8*)MZ_MALLOC(TINFL_LZ_DICT_SIZE); size_t in_buf_ofs = 0, dict_ofs = 0;
+ lgfx_tinfl_decompressor decomp;
+ lgfx_mz_uint8 *pDict = (lgfx_mz_uint8*)MZ_MALLOC(TINFL_LZ_DICT_SIZE); size_t in_buf_ofs = 0, dict_ofs = 0;
if (!pDict)
return TINFL_STATUS_FAILED;
- tinfl_init(&decomp);
+ lgfx_tinfl_init(&decomp);
for ( ; ; )
{
size_t in_buf_size = *pIn_buf_size - in_buf_ofs, dst_buf_size = TINFL_LZ_DICT_SIZE - dict_ofs;
- tinfl_status status = tinfl_decompress(&decomp, (const mz_uint8*)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
+ lgfx_tinfl_status status = lgfx_tinfl_decompress(&decomp, (const lgfx_mz_uint8*)pIn_buf + in_buf_ofs, &in_buf_size, pDict, pDict + dict_ofs, &dst_buf_size,
(flags & ~(TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF)));
in_buf_ofs += in_buf_size;
if ((dst_buf_size) && (!(*pPut_buf_func)(pDict + dict_ofs, (int)dst_buf_size, pPut_buf_user)))
@@ -1776,7 +1776,7 @@ int tinfl_decompress_mem_to_callback(const void *pIn_buf, size_t *pIn_buf_size,
// ------------------- Low-level Compression (independent from all decompression API's)
// Purposely making these tables static for faster init and thread safety.
-static const mz_uint16 s_tdefl_len_sym[256] = {
+static const lgfx_mz_uint16 s_tdefl_len_sym[256] = {
257,258,259,260,261,262,263,264,265,265,266,266,267,267,268,268,269,269,269,269,270,270,270,270,271,271,271,271,272,272,272,272,
273,273,273,273,273,273,273,273,274,274,274,274,274,274,274,274,275,275,275,275,275,275,275,275,276,276,276,276,276,276,276,276,
277,277,277,277,277,277,277,277,277,277,277,277,277,277,277,277,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,278,
@@ -1786,13 +1786,13 @@ static const mz_uint16 s_tdefl_len_sym[256] = {
283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,283,
284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,284,285 };
-static const mz_uint8 s_tdefl_len_extra[256] = {
+static const lgfx_mz_uint8 s_tdefl_len_extra[256] = {
0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,
4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,0 };
-static const mz_uint8 s_tdefl_small_dist_sym[512] = {
+static const lgfx_mz_uint8 s_tdefl_small_dist_sym[512] = {
0,1,2,3,4,4,5,5,6,6,6,6,7,7,7,7,8,8,8,8,8,8,8,8,9,9,9,9,9,9,9,9,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,10,11,11,11,11,11,11,
11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,
13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,14,14,14,14,14,14,14,14,14,14,14,14,
@@ -1806,7 +1806,7 @@ static const mz_uint8 s_tdefl_small_dist_sym[512] = {
17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,
17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17 };
-static const mz_uint8 s_tdefl_small_dist_extra[512] = {
+static const lgfx_mz_uint8 s_tdefl_small_dist_extra[512] = {
0,0,0,0,1,1,1,1,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,5,5,5,5,5,5,5,5,
5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
@@ -1816,27 +1816,27 @@ static const mz_uint8 s_tdefl_small_dist_extra[512] = {
7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,
7,7,7,7,7,7,7,7 };
-static const mz_uint8 s_tdefl_large_dist_sym[128] = {
+static const lgfx_mz_uint8 s_tdefl_large_dist_sym[128] = {
0,0,18,19,20,20,21,21,22,22,22,22,23,23,23,23,24,24,24,24,24,24,24,24,25,25,25,25,25,25,25,25,26,26,26,26,26,26,26,26,26,26,26,26,
26,26,26,26,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,27,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
28,28,28,28,28,28,28,28,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29,29 };
-static const mz_uint8 s_tdefl_large_dist_extra[128] = {
+static const lgfx_mz_uint8 s_tdefl_large_dist_extra[128] = {
0,0,8,8,9,9,9,9,10,10,10,10,10,10,10,10,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,
12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,
13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13,13 };
// Radix sorts tdefl_sym_freq[] array by 16-bit key m_key. Returns ptr to sorted values.
-typedef struct { mz_uint16 m_key, m_sym_index; } tdefl_sym_freq;
-static tdefl_sym_freq* tdefl_radix_sort_syms(mz_uint num_syms, tdefl_sym_freq* pSyms0, tdefl_sym_freq* pSyms1)
+typedef struct { lgfx_mz_uint16 m_key, m_sym_index; } tdefl_sym_freq;
+static tdefl_sym_freq* tdefl_radix_sort_syms(lgfx_mz_uint num_syms, tdefl_sym_freq* pSyms0, tdefl_sym_freq* pSyms1)
{
- mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2]; tdefl_sym_freq* pCur_syms = pSyms0, *pNew_syms = pSyms1; MZ_CLEAR_OBJ(hist);
- for (i = 0; i < num_syms; i++) { mz_uint freq = pSyms0[i].m_key; hist[freq & 0xFF]++; hist[256 + ((freq >> 8) & 0xFF)]++; }
+ lgfx_mz_uint32 total_passes = 2, pass_shift, pass, i, hist[256 * 2]; tdefl_sym_freq* pCur_syms = pSyms0, *pNew_syms = pSyms1; MZ_CLEAR_OBJ(hist);
+ for (i = 0; i < num_syms; i++) { lgfx_mz_uint freq = pSyms0[i].m_key; hist[freq & 0xFF]++; hist[256 + ((freq >> 8) & 0xFF)]++; }
while ((total_passes > 1) && (num_syms == hist[(total_passes - 1) * 256])) total_passes--;
for (pass_shift = 0, pass = 0; pass < total_passes; pass++, pass_shift += 8)
{
- const mz_uint32* pHist = &hist[pass << 8];
- mz_uint offsets[256], cur_ofs = 0;
+ const lgfx_mz_uint32* pHist = &hist[pass << 8];
+ lgfx_mz_uint offsets[256], cur_ofs = 0;
for (i = 0; i < 256; i++) { offsets[i] = cur_ofs; cur_ofs += pHist[i]; }
for (i = 0; i < num_syms; i++) pNew_syms[offsets[(pCur_syms[i].m_key >> pass_shift) & 0xFF]++] = pCur_syms[i];
{ tdefl_sym_freq* t = pCur_syms; pCur_syms = pNew_syms; pNew_syms = t; }
@@ -1852,15 +1852,15 @@ static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n)
A[0].m_key += A[1].m_key; root = 0; leaf = 2;
for (next=1; next < n-1; next++)
{
- if (leaf>=n || A[root].m_key=n || (root=n || A[root].m_key=n || (root=0; next--) A[next].m_key = A[A[next].m_key].m_key+1;
avbl = 1; used = dpth = 0; root = n-2; next = n-1;
while (avbl>0)
{
while (root>=0 && (int)A[root].m_key==dpth) { used++; root--; }
- while (avbl>used) { A[next--].m_key = (mz_uint16)(dpth); avbl--; }
+ while (avbl>used) { A[next--].m_key = (lgfx_mz_uint16)(dpth); avbl--; }
avbl = 2*used; dpth++; used = 0;
}
}
@@ -1869,9 +1869,9 @@ static void tdefl_calculate_minimum_redundancy(tdefl_sym_freq *A, int n)
enum { TDEFL_MAX_SUPPORTED_HUFF_CODESIZE = 32 };
static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_len, int max_code_size)
{
- int i; mz_uint32 total = 0; if (code_list_len <= 1) return;
+ int i; lgfx_mz_uint32 total = 0; if (code_list_len <= 1) return;
for (i = max_code_size + 1; i <= TDEFL_MAX_SUPPORTED_HUFF_CODESIZE; i++) pNum_codes[max_code_size] += pNum_codes[i];
- for (i = max_code_size; i > 0; i--) total += (((mz_uint32)pNum_codes[i]) << (max_code_size - i));
+ for (i = max_code_size; i > 0; i--) total += (((lgfx_mz_uint32)pNum_codes[i]) << (max_code_size - i));
while (total != (1UL << max_code_size))
{
pNum_codes[max_code_size]--;
@@ -1882,7 +1882,7 @@ static void tdefl_huffman_enforce_max_code_size(int *pNum_codes, int code_list_l
static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int table_len, int code_size_limit, int static_table)
{
- int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE]; mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1]; MZ_CLEAR_OBJ(num_codes);
+ int i, j, l, num_codes[1 + TDEFL_MAX_SUPPORTED_HUFF_CODESIZE]; lgfx_mz_uint next_code[TDEFL_MAX_SUPPORTED_HUFF_CODESIZE + 1]; MZ_CLEAR_OBJ(num_codes);
if (static_table)
{
for (i = 0; i < table_len; i++) num_codes[d->m_huff_code_sizes[table_num][i]]++;
@@ -1891,8 +1891,8 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int
{
tdefl_sym_freq syms0[TDEFL_MAX_HUFF_SYMBOLS], syms1[TDEFL_MAX_HUFF_SYMBOLS], *pSyms;
int num_used_syms = 0;
- const mz_uint16 *pSym_count = &d->m_huff_count[table_num][0];
- for (i = 0; i < table_len; i++) if (pSym_count[i]) { syms0[num_used_syms].m_key = (mz_uint16)pSym_count[i]; syms0[num_used_syms++].m_sym_index = (mz_uint16)i; }
+ const lgfx_mz_uint16 *pSym_count = &d->m_huff_count[table_num][0];
+ for (i = 0; i < table_len; i++) if (pSym_count[i]) { syms0[num_used_syms].m_key = (lgfx_mz_uint16)pSym_count[i]; syms0[num_used_syms++].m_sym_index = (lgfx_mz_uint16)i; }
pSyms = tdefl_radix_sort_syms(num_used_syms, syms0, syms1); tdefl_calculate_minimum_redundancy(pSyms, num_used_syms);
@@ -1902,24 +1902,24 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int
MZ_CLEAR_OBJ(d->m_huff_code_sizes[table_num]); MZ_CLEAR_OBJ(d->m_huff_codes[table_num]);
for (i = 1, j = num_used_syms; i <= code_size_limit; i++)
- for (l = num_codes[i]; l > 0; l--) d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (mz_uint8)(i);
+ for (l = num_codes[i]; l > 0; l--) d->m_huff_code_sizes[table_num][pSyms[--j].m_sym_index] = (lgfx_mz_uint8)(i);
}
next_code[1] = 0; for (j = 0, i = 2; i <= code_size_limit; i++) next_code[i] = j = ((j + num_codes[i - 1]) << 1);
for (i = 0; i < table_len; i++)
{
- mz_uint rev_code = 0, code, code_size; if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0) continue;
+ lgfx_mz_uint rev_code = 0, code, code_size; if ((code_size = d->m_huff_code_sizes[table_num][i]) == 0) continue;
code = next_code[code_size]++; for (l = code_size; l > 0; l--, code >>= 1) rev_code = (rev_code << 1) | (code & 1);
- d->m_huff_codes[table_num][i] = (mz_uint16)rev_code;
+ d->m_huff_codes[table_num][i] = (lgfx_mz_uint16)rev_code;
}
}
#define TDEFL_PUT_BITS(b, l) do { \
- mz_uint bits = b; mz_uint len = l; MZ_ASSERT(bits <= ((1U << len) - 1U)); \
+ lgfx_mz_uint bits = b; lgfx_mz_uint len = l; MZ_ASSERT(bits <= ((1U << len) - 1U)); \
d->m_bit_buffer |= (bits << d->m_bits_in); d->m_bits_in += len; \
while (d->m_bits_in >= 8) { \
- if (d->m_pOutput_buf < d->m_pOutput_buf_end) { *d->m_pOutput_buf++ = (mz_uint8)(d->m_bit_buffer); } \
+ if (d->m_pOutput_buf < d->m_pOutput_buf_end) { *d->m_pOutput_buf++ = (lgfx_mz_uint8)(d->m_bit_buffer); } \
d->m_bit_buffer >>= 8; \
d->m_bits_in -= 8; \
} \
@@ -1927,27 +1927,27 @@ static void tdefl_optimize_huffman_table(tdefl_compressor *d, int table_num, int
#define TDEFL_RLE_PREV_CODE_SIZE() { if (rle_repeat_count) { \
if (rle_repeat_count < 3) { \
- d->m_huff_count[2][prev_code_size] = (mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \
+ d->m_huff_count[2][prev_code_size] = (lgfx_mz_uint16)(d->m_huff_count[2][prev_code_size] + rle_repeat_count); \
while (rle_repeat_count--) packed_code_sizes[num_packed_code_sizes++] = prev_code_size; \
} else { \
- d->m_huff_count[2][16] = (mz_uint16)(d->m_huff_count[2][16] + 1); packed_code_sizes[num_packed_code_sizes++] = 16; packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_repeat_count - 3); \
+ d->m_huff_count[2][16] = (lgfx_mz_uint16)(d->m_huff_count[2][16] + 1); packed_code_sizes[num_packed_code_sizes++] = 16; packed_code_sizes[num_packed_code_sizes++] = (lgfx_mz_uint8)(rle_repeat_count - 3); \
} rle_repeat_count = 0; } }
#define TDEFL_RLE_ZERO_CODE_SIZE() { if (rle_z_count) { \
if (rle_z_count < 3) { \
- d->m_huff_count[2][0] = (mz_uint16)(d->m_huff_count[2][0] + rle_z_count); while (rle_z_count--) packed_code_sizes[num_packed_code_sizes++] = 0; \
+ d->m_huff_count[2][0] = (lgfx_mz_uint16)(d->m_huff_count[2][0] + rle_z_count); while (rle_z_count--) packed_code_sizes[num_packed_code_sizes++] = 0; \
} else if (rle_z_count <= 10) { \
- d->m_huff_count[2][17] = (mz_uint16)(d->m_huff_count[2][17] + 1); packed_code_sizes[num_packed_code_sizes++] = 17; packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 3); \
+ d->m_huff_count[2][17] = (lgfx_mz_uint16)(d->m_huff_count[2][17] + 1); packed_code_sizes[num_packed_code_sizes++] = 17; packed_code_sizes[num_packed_code_sizes++] = (lgfx_mz_uint8)(rle_z_count - 3); \
} else { \
- d->m_huff_count[2][18] = (mz_uint16)(d->m_huff_count[2][18] + 1); packed_code_sizes[num_packed_code_sizes++] = 18; packed_code_sizes[num_packed_code_sizes++] = (mz_uint8)(rle_z_count - 11); \
+ d->m_huff_count[2][18] = (lgfx_mz_uint16)(d->m_huff_count[2][18] + 1); packed_code_sizes[num_packed_code_sizes++] = 18; packed_code_sizes[num_packed_code_sizes++] = (lgfx_mz_uint8)(rle_z_count - 11); \
} rle_z_count = 0; } }
-static mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
+static lgfx_mz_uint8 s_tdefl_packed_code_size_syms_swizzle[] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };
static void tdefl_start_dynamic_block(tdefl_compressor *d)
{
- int num_lit_codes, num_dist_codes, num_bit_lengths; mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index;
- mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF;
+ int num_lit_codes, num_dist_codes, num_bit_lengths; lgfx_mz_uint i, total_code_sizes_to_pack, num_packed_code_sizes, rle_z_count, rle_repeat_count, packed_code_sizes_index;
+ lgfx_mz_uint8 code_sizes_to_pack[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], packed_code_sizes[TDEFL_MAX_HUFF_SYMBOLS_0 + TDEFL_MAX_HUFF_SYMBOLS_1], prev_code_size = 0xFF;
d->m_huff_count[0][256] = 1;
@@ -1964,7 +1964,7 @@ static void tdefl_start_dynamic_block(tdefl_compressor *d)
memset(&d->m_huff_count[2][0], 0, sizeof(d->m_huff_count[2][0]) * TDEFL_MAX_HUFF_SYMBOLS_2);
for (i = 0; i < total_code_sizes_to_pack; i++)
{
- mz_uint8 code_size = code_sizes_to_pack[i];
+ lgfx_mz_uint8 code_size = code_sizes_to_pack[i];
if (!code_size)
{
TDEFL_RLE_PREV_CODE_SIZE();
@@ -1976,7 +1976,7 @@ static void tdefl_start_dynamic_block(tdefl_compressor *d)
if (code_size != prev_code_size)
{
TDEFL_RLE_PREV_CODE_SIZE();
- d->m_huff_count[2][code_size] = (mz_uint16)(d->m_huff_count[2][code_size] + 1); packed_code_sizes[num_packed_code_sizes++] = code_size;
+ d->m_huff_count[2][code_size] = (lgfx_mz_uint16)(d->m_huff_count[2][code_size] + 1); packed_code_sizes[num_packed_code_sizes++] = code_size;
}
else if (++rle_repeat_count == 6)
{
@@ -2000,7 +2000,7 @@ static void tdefl_start_dynamic_block(tdefl_compressor *d)
for (packed_code_sizes_index = 0; packed_code_sizes_index < num_packed_code_sizes; )
{
- mz_uint code = packed_code_sizes[packed_code_sizes_index++]; MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2);
+ lgfx_mz_uint code = packed_code_sizes[packed_code_sizes_index++]; MZ_ASSERT(code < TDEFL_MAX_HUFF_SYMBOLS_2);
TDEFL_PUT_BITS(d->m_huff_codes[2][code], d->m_huff_code_sizes[2][code]);
if (code >= 16) TDEFL_PUT_BITS(packed_code_sizes[packed_code_sizes_index++], "\02\03\07"[code - 16]);
}
@@ -2008,8 +2008,8 @@ static void tdefl_start_dynamic_block(tdefl_compressor *d)
static void tdefl_start_static_block(tdefl_compressor *d)
{
- mz_uint i;
- mz_uint8 *p = &d->m_huff_code_sizes[0][0];
+ lgfx_mz_uint i;
+ lgfx_mz_uint8 *p = &d->m_huff_code_sizes[0][0];
for (i = 0; i <= 143; ++i) *p++ = 8;
for ( ; i <= 255; ++i) *p++ = 9;
@@ -2024,19 +2024,19 @@ static void tdefl_start_static_block(tdefl_compressor *d)
TDEFL_PUT_BITS(1, 2);
}
-static const mz_uint mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
+static const lgfx_mz_uint lgfx_mz_bitmasks[17] = { 0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F, 0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF, 0xFFFF };
#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS
-static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
+static lgfx_mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
{
- mz_uint flags;
- mz_uint8 *pLZ_codes;
- mz_uint8 *pOutput_buf = d->m_pOutput_buf;
- mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf;
- mz_uint64 bit_buffer = d->m_bit_buffer;
- mz_uint bits_in = d->m_bits_in;
+ lgfx_mz_uint flags;
+ lgfx_mz_uint8 *pLZ_codes;
+ lgfx_mz_uint8 *pOutput_buf = d->m_pOutput_buf;
+ lgfx_mz_uint8 *pLZ_code_buf_end = d->m_pLZ_code_buf;
+ lgfx_mz_uint64 bit_buffer = d->m_bit_buffer;
+ lgfx_mz_uint bits_in = d->m_bits_in;
-#define TDEFL_PUT_BITS_FAST(b, l) { bit_buffer |= (((mz_uint64)(b)) << bits_in); bits_in += (l); }
+#define TDEFL_PUT_BITS_FAST(b, l) { bit_buffer |= (((lgfx_mz_uint64)(b)) << bits_in); bits_in += (l); }
flags = 1;
for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < pLZ_code_buf_end; flags >>= 1)
@@ -2046,12 +2046,12 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
if (flags & 1)
{
- mz_uint s0, s1, n0, n1, sym, num_extra_bits;
- mz_uint match_len = pLZ_codes[0], match_dist = *(const mz_uint16 *)(pLZ_codes + 1); pLZ_codes += 3;
+ lgfx_mz_uint s0, s1, n0, n1, sym, num_extra_bits;
+ lgfx_mz_uint match_len = pLZ_codes[0], match_dist = *(const lgfx_mz_uint16 *)(pLZ_codes + 1); pLZ_codes += 3;
MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
- TDEFL_PUT_BITS_FAST(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
+ TDEFL_PUT_BITS_FAST(match_len & lgfx_mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
// This sequence coaxes MSVC into using cmov's vs. jmp's.
s0 = s_tdefl_small_dist_sym[match_dist & 511];
@@ -2063,11 +2063,11 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
TDEFL_PUT_BITS_FAST(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
- TDEFL_PUT_BITS_FAST(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
+ TDEFL_PUT_BITS_FAST(match_dist & lgfx_mz_bitmasks[num_extra_bits], num_extra_bits);
}
else
{
- mz_uint lit = *pLZ_codes++;
+ lgfx_mz_uint lit = *pLZ_codes++;
MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
TDEFL_PUT_BITS_FAST(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
@@ -2091,7 +2091,7 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
if (pOutput_buf >= d->m_pOutput_buf_end)
return MZ_FALSE;
- *(mz_uint64*)pOutput_buf = bit_buffer;
+ *(lgfx_mz_uint64*)pOutput_buf = bit_buffer;
pOutput_buf += (bits_in >> 3);
bit_buffer >>= (bits_in & ~7);
bits_in &= 7;
@@ -2105,8 +2105,8 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
while (bits_in)
{
- mz_uint32 n = MZ_MIN(bits_in, 16);
- TDEFL_PUT_BITS((mz_uint)bit_buffer & mz_bitmasks[n], n);
+ lgfx_mz_uint32 n = MZ_MIN(bits_in, 16);
+ TDEFL_PUT_BITS((lgfx_mz_uint)bit_buffer & lgfx_mz_bitmasks[n], n);
bit_buffer >>= n;
bits_in -= n;
}
@@ -2116,10 +2116,10 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
return (d->m_pOutput_buf < d->m_pOutput_buf_end);
}
#else
-static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
+static lgfx_mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
{
- mz_uint flags;
- mz_uint8 *pLZ_codes;
+ lgfx_mz_uint flags;
+ lgfx_mz_uint8 *pLZ_codes;
flags = 1;
for (pLZ_codes = d->m_lz_code_buf; pLZ_codes < d->m_pLZ_code_buf; flags >>= 1)
@@ -2128,12 +2128,12 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
flags = *pLZ_codes++ | 0x100;
if (flags & 1)
{
- mz_uint sym, num_extra_bits;
- mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8)); pLZ_codes += 3;
+ lgfx_mz_uint sym, num_extra_bits;
+ lgfx_mz_uint match_len = pLZ_codes[0], match_dist = (pLZ_codes[1] | (pLZ_codes[2] << 8)); pLZ_codes += 3;
MZ_ASSERT(d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
TDEFL_PUT_BITS(d->m_huff_codes[0][s_tdefl_len_sym[match_len]], d->m_huff_code_sizes[0][s_tdefl_len_sym[match_len]]);
- TDEFL_PUT_BITS(match_len & mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
+ TDEFL_PUT_BITS(match_len & lgfx_mz_bitmasks[s_tdefl_len_extra[match_len]], s_tdefl_len_extra[match_len]);
if (match_dist < 512)
{
@@ -2145,11 +2145,11 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
}
MZ_ASSERT(d->m_huff_code_sizes[1][sym]);
TDEFL_PUT_BITS(d->m_huff_codes[1][sym], d->m_huff_code_sizes[1][sym]);
- TDEFL_PUT_BITS(match_dist & mz_bitmasks[num_extra_bits], num_extra_bits);
+ TDEFL_PUT_BITS(match_dist & lgfx_mz_bitmasks[num_extra_bits], num_extra_bits);
}
else
{
- mz_uint lit = *pLZ_codes++;
+ lgfx_mz_uint lit = *pLZ_codes++;
MZ_ASSERT(d->m_huff_code_sizes[0][lit]);
TDEFL_PUT_BITS(d->m_huff_codes[0][lit], d->m_huff_code_sizes[0][lit]);
}
@@ -2161,7 +2161,7 @@ static mz_bool tdefl_compress_lz_codes(tdefl_compressor *d)
}
#endif // MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN && MINIZ_HAS_64BIT_REGISTERS
-static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block)
+static lgfx_mz_bool tdefl_compress_block(tdefl_compressor *d, lgfx_mz_bool static_block)
{
if (static_block)
tdefl_start_static_block(d);
@@ -2172,11 +2172,11 @@ static mz_bool tdefl_compress_block(tdefl_compressor *d, mz_bool static_block)
static int tdefl_flush_block(tdefl_compressor *d, int flush)
{
- mz_uint saved_bit_buf, saved_bits_in;
- mz_uint8 *pSaved_output_buf;
- mz_bool comp_block_succeeded = MZ_FALSE;
+ lgfx_mz_uint saved_bit_buf, saved_bits_in;
+ lgfx_mz_uint8 *pSaved_output_buf;
+ lgfx_mz_bool comp_block_succeeded = MZ_FALSE;
int n, use_raw_block = ((d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS) != 0) && (d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size;
- mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf;
+ lgfx_mz_uint8 *pOutput_buf_start = ((d->m_pPut_buf_func == NULL) && ((*d->m_pOut_buf_size - d->m_out_buf_ofs) >= TDEFL_OUT_BUF_SIZE)) ? ((lgfx_mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs) : d->m_output_buf;
d->m_pOutput_buf = pOutput_buf_start;
d->m_pOutput_buf_end = d->m_pOutput_buf + TDEFL_OUT_BUF_SIZE - 16;
@@ -2185,7 +2185,7 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush)
d->m_output_flush_ofs = 0;
d->m_output_flush_remaining = 0;
- *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left);
+ *d->m_pLZ_flags = (lgfx_mz_uint8)(*d->m_pLZ_flags >> d->m_num_flags_left);
d->m_pLZ_code_buf -= (d->m_num_flags_left == 8);
if ((d->m_flags & TDEFL_WRITE_ZLIB_HEADER) && (!d->m_block_index))
@@ -2204,7 +2204,7 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush)
if ( ((use_raw_block) || ((d->m_total_lz_bytes) && ((d->m_pOutput_buf - pSaved_output_buf + 1U) >= d->m_total_lz_bytes))) &&
((d->m_lookahead_pos - d->m_lz_code_buf_dict_pos) <= d->m_dict_size) )
{
- mz_uint i; d->m_pOutput_buf = pSaved_output_buf; d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
+ lgfx_mz_uint i; d->m_pOutput_buf = pSaved_output_buf; d->m_bit_buffer = saved_bit_buf, d->m_bits_in = saved_bits_in;
TDEFL_PUT_BITS(0, 2);
if (d->m_bits_in) { TDEFL_PUT_BITS(0, 8 - d->m_bits_in); }
for (i = 2; i; --i, d->m_total_lz_bytes ^= 0xFFFF)
@@ -2228,11 +2228,11 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush)
if (flush == TDEFL_FINISH)
{
if (d->m_bits_in) { TDEFL_PUT_BITS(0, 8 - d->m_bits_in); }
- if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER) { mz_uint i, a = d->m_adler32; for (i = 0; i < 4; i++) { TDEFL_PUT_BITS((a >> 24) & 0xFF, 8); a <<= 8; } }
+ if (d->m_flags & TDEFL_WRITE_ZLIB_HEADER) { lgfx_mz_uint i, a = d->m_adler32; for (i = 0; i < 4; i++) { TDEFL_PUT_BITS((a >> 24) & 0xFF, 8); a <<= 8; } }
}
else
{
- mz_uint i, z = 0; TDEFL_PUT_BITS(0, 3); if (d->m_bits_in) { TDEFL_PUT_BITS(0, 8 - d->m_bits_in); } for (i = 2; i; --i, z ^= 0xFFFF) { TDEFL_PUT_BITS(z & 0xFFFF, 16); }
+ lgfx_mz_uint i, z = 0; TDEFL_PUT_BITS(0, 3); if (d->m_bits_in) { TDEFL_PUT_BITS(0, 8 - d->m_bits_in); } for (i = 2; i; --i, z ^= 0xFFFF) { TDEFL_PUT_BITS(z & 0xFFFF, 16); }
}
}
@@ -2247,14 +2247,14 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush)
{
if (d->m_pPut_buf_func)
{
- *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
+ *d->m_pIn_buf_size = d->m_pSrc - (const lgfx_mz_uint8 *)d->m_pIn_buf;
if (!(*d->m_pPut_buf_func)(d->m_output_buf, n, d->m_pPut_buf_user))
return (d->m_prev_return_status = TDEFL_STATUS_PUT_BUF_FAILED);
}
else if (pOutput_buf_start == d->m_output_buf)
{
int bytes_to_copy = (int)MZ_MIN((size_t)n, (size_t)(*d->m_pOut_buf_size - d->m_out_buf_ofs));
- memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy);
+ memcpy((lgfx_mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf, bytes_to_copy);
d->m_out_buf_ofs += bytes_to_copy;
if ((n -= bytes_to_copy) != 0)
{
@@ -2272,13 +2272,13 @@ static int tdefl_flush_block(tdefl_compressor *d, int flush)
}
#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
-#define TDEFL_READ_UNALIGNED_WORD(p) *(const mz_uint16*)(p)
-static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
+#define TDEFL_READ_UNALIGNED_WORD(p) *(const lgfx_mz_uint16*)(p)
+static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, lgfx_mz_uint lookahead_pos, lgfx_mz_uint max_dist, lgfx_mz_uint max_match_len, lgfx_mz_uint *pMatch_dist, lgfx_mz_uint *pMatch_len)
{
- mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
- mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
- const mz_uint16 *s = (const mz_uint16*)(d->m_dict + pos), *p, *q;
- mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD(s);
+ lgfx_mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
+ lgfx_mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
+ const lgfx_mz_uint16 *s = (const lgfx_mz_uint16*)(d->m_dict + pos), *p, *q;
+ lgfx_mz_uint16 c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]), s01 = TDEFL_READ_UNALIGNED_WORD(s);
MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); if (max_match_len <= match_len) return;
for ( ; ; )
{
@@ -2287,19 +2287,19 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
if (--num_probes_left == 0) return;
#define TDEFL_PROBE \
next_probe_pos = d->m_next[probe_pos]; \
- if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) return; \
+ if ((!next_probe_pos) || ((dist = (lgfx_mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) return; \
probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \
if (TDEFL_READ_UNALIGNED_WORD(&d->m_dict[probe_pos + match_len - 1]) == c01) break;
TDEFL_PROBE; TDEFL_PROBE; TDEFL_PROBE;
}
- if (!dist) { break; } q = (const mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) { continue; } p = s; probe_len = 32;
+ if (!dist) { break; } q = (const lgfx_mz_uint16*)(d->m_dict + probe_pos); if (TDEFL_READ_UNALIGNED_WORD(q) != s01) { continue; } p = s; probe_len = 32;
do { } while ( (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) &&
(TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (--probe_len > 0) );
if (!probe_len)
{
*pMatch_dist = dist; *pMatch_len = MZ_MIN(max_match_len, TDEFL_MAX_MATCH_LEN); break;
}
- else if ((probe_len = ((mz_uint)(p - s) * 2) + (mz_uint)(*(const mz_uint8*)p == *(const mz_uint8*)q)) > match_len)
+ else if ((probe_len = ((lgfx_mz_uint)(p - s) * 2) + (lgfx_mz_uint)(*(const lgfx_mz_uint8*)p == *(const lgfx_mz_uint8*)q)) > match_len)
{
*pMatch_dist = dist; if ((*pMatch_len = match_len = MZ_MIN(max_match_len, probe_len)) == max_match_len) break;
c01 = TDEFL_READ_UNALIGNED_WORD(&d->m_dict[pos + match_len - 1]);
@@ -2307,12 +2307,12 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
}
}
#else
-static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahead_pos, mz_uint max_dist, mz_uint max_match_len, mz_uint *pMatch_dist, mz_uint *pMatch_len)
+static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, lgfx_mz_uint lookahead_pos, lgfx_mz_uint max_dist, lgfx_mz_uint max_match_len, lgfx_mz_uint *pMatch_dist, lgfx_mz_uint *pMatch_len)
{
- mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
- mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
- const mz_uint8 *s = d->m_dict + pos, *p, *q;
- mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
+ lgfx_mz_uint dist, pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK, match_len = *pMatch_len, probe_pos = pos, next_probe_pos, probe_len;
+ lgfx_mz_uint num_probes_left = d->m_max_probes[match_len >= 32];
+ const lgfx_mz_uint8 *s = d->m_dict + pos, *p, *q;
+ lgfx_mz_uint8 c0 = d->m_dict[pos + match_len], c1 = d->m_dict[pos + match_len - 1];
MZ_ASSERT(max_match_len <= TDEFL_MAX_MATCH_LEN); if (max_match_len <= match_len) return;
for ( ; ; )
{
@@ -2321,7 +2321,7 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
if (--num_probes_left == 0) return;
#define TDEFL_PROBE \
next_probe_pos = d->m_next[probe_pos]; \
- if ((!next_probe_pos) || ((dist = (mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) return; \
+ if ((!next_probe_pos) || ((dist = (lgfx_mz_uint16)(lookahead_pos - next_probe_pos)) > max_dist)) return; \
probe_pos = next_probe_pos & TDEFL_LZ_DICT_SIZE_MASK; \
if ((d->m_dict[probe_pos + match_len] == c0) && (d->m_dict[probe_pos + match_len - 1] == c1)) break;
TDEFL_PROBE; TDEFL_PROBE; TDEFL_PROBE;
@@ -2342,24 +2342,24 @@ static MZ_FORCEINLINE void tdefl_find_match(tdefl_compressor *d, mz_uint lookahe
#endif // #if MINIZ_USE_UNALIGNED_LOADS_AND_STORES
#if MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-static mz_bool tdefl_compress_fast(tdefl_compressor *d)
+static lgfx_mz_bool tdefl_compress_fast(tdefl_compressor *d)
{
// Faster, minimally featured LZRW1-style match+parse loop with better register utilization. Intended for applications where raw throughput is valued more highly than ratio.
- mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
- mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
- mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
+ lgfx_mz_uint lookahead_pos = d->m_lookahead_pos, lookahead_size = d->m_lookahead_size, dict_size = d->m_dict_size, total_lz_bytes = d->m_total_lz_bytes, num_flags_left = d->m_num_flags_left;
+ lgfx_mz_uint8 *pLZ_code_buf = d->m_pLZ_code_buf, *pLZ_flags = d->m_pLZ_flags;
+ lgfx_mz_uint cur_pos = lookahead_pos & TDEFL_LZ_DICT_SIZE_MASK;
while ((d->m_src_buf_left) || ((d->m_flush) && (lookahead_size)))
{
- const mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096;
- mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
- mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size);
+ const lgfx_mz_uint TDEFL_COMP_FAST_LOOKAHEAD_SIZE = 4096;
+ lgfx_mz_uint dst_pos = (lookahead_pos + lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
+ lgfx_mz_uint num_bytes_to_process = (lgfx_mz_uint)MZ_MIN(d->m_src_buf_left, TDEFL_COMP_FAST_LOOKAHEAD_SIZE - lookahead_size);
d->m_src_buf_left -= num_bytes_to_process;
lookahead_size += num_bytes_to_process;
while (num_bytes_to_process)
{
- mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process);
+ lgfx_mz_uint32 n = MZ_MIN(TDEFL_LZ_DICT_SIZE - dst_pos, num_bytes_to_process);
memcpy(d->m_dict + dst_pos, d->m_pSrc, n);
if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
memcpy(d->m_dict + TDEFL_LZ_DICT_SIZE + dst_pos, d->m_pSrc, MZ_MIN(n, (TDEFL_MAX_MATCH_LEN - 1) - dst_pos));
@@ -2373,44 +2373,44 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d)
while (lookahead_size >= 4)
{
- mz_uint cur_match_dist, cur_match_len = 1;
- mz_uint8 *pCur_dict = d->m_dict + cur_pos;
- mz_uint first_trigram = (*(const mz_uint32 *)pCur_dict) & 0xFFFFFF;
- mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK;
- mz_uint probe_pos = d->m_hash[hash];
- d->m_hash[hash] = (mz_uint16)lookahead_pos;
-
- if (((cur_match_dist = (mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((*(const mz_uint32 *)(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram))
+ lgfx_mz_uint cur_match_dist, cur_match_len = 1;
+ lgfx_mz_uint8 *pCur_dict = d->m_dict + cur_pos;
+ lgfx_mz_uint first_trigram = (*(const lgfx_mz_uint32 *)pCur_dict) & 0xFFFFFF;
+ lgfx_mz_uint hash = (first_trigram ^ (first_trigram >> (24 - (TDEFL_LZ_HASH_BITS - 8)))) & TDEFL_LEVEL1_HASH_SIZE_MASK;
+ lgfx_mz_uint probe_pos = d->m_hash[hash];
+ d->m_hash[hash] = (lgfx_mz_uint16)lookahead_pos;
+
+ if (((cur_match_dist = (lgfx_mz_uint16)(lookahead_pos - probe_pos)) <= dict_size) && ((*(const lgfx_mz_uint32 *)(d->m_dict + (probe_pos &= TDEFL_LZ_DICT_SIZE_MASK)) & 0xFFFFFF) == first_trigram))
{
- const mz_uint16 *p = (const mz_uint16 *)pCur_dict;
- const mz_uint16 *q = (const mz_uint16 *)(d->m_dict + probe_pos);
- mz_uint32 probe_len = 32;
+ const lgfx_mz_uint16 *p = (const lgfx_mz_uint16 *)pCur_dict;
+ const lgfx_mz_uint16 *q = (const lgfx_mz_uint16 *)(d->m_dict + probe_pos);
+ lgfx_mz_uint32 probe_len = 32;
do { } while ( (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) &&
(TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (TDEFL_READ_UNALIGNED_WORD(++p) == TDEFL_READ_UNALIGNED_WORD(++q)) && (--probe_len > 0) );
- cur_match_len = ((mz_uint)(p - (const mz_uint16 *)pCur_dict) * 2) + (mz_uint)(*(const mz_uint8 *)p == *(const mz_uint8 *)q);
+ cur_match_len = ((lgfx_mz_uint)(p - (const lgfx_mz_uint16 *)pCur_dict) * 2) + (lgfx_mz_uint)(*(const lgfx_mz_uint8 *)p == *(const lgfx_mz_uint8 *)q);
if (!probe_len)
cur_match_len = cur_match_dist ? TDEFL_MAX_MATCH_LEN : 0;
if ((cur_match_len < TDEFL_MIN_MATCH_LEN) || ((cur_match_len == TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 8U*1024U)))
{
cur_match_len = 1;
- *pLZ_code_buf++ = (mz_uint8)first_trigram;
- *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
- d->m_huff_count[0][(mz_uint8)first_trigram]++;
+ *pLZ_code_buf++ = (lgfx_mz_uint8)first_trigram;
+ *pLZ_flags = (lgfx_mz_uint8)(*pLZ_flags >> 1);
+ d->m_huff_count[0][(lgfx_mz_uint8)first_trigram]++;
}
else
{
- mz_uint32 s0, s1;
+ lgfx_mz_uint32 s0, s1;
cur_match_len = MZ_MIN(cur_match_len, lookahead_size);
MZ_ASSERT((cur_match_len >= TDEFL_MIN_MATCH_LEN) && (cur_match_dist >= 1) && (cur_match_dist <= TDEFL_LZ_DICT_SIZE));
cur_match_dist--;
- pLZ_code_buf[0] = (mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
- *(mz_uint16 *)(&pLZ_code_buf[1]) = (mz_uint16)cur_match_dist;
+ pLZ_code_buf[0] = (lgfx_mz_uint8)(cur_match_len - TDEFL_MIN_MATCH_LEN);
+ *(lgfx_mz_uint16 *)(&pLZ_code_buf[1]) = (lgfx_mz_uint16)cur_match_dist;
pLZ_code_buf += 3;
- *pLZ_flags = (mz_uint8)((*pLZ_flags >> 1) | 0x80);
+ *pLZ_flags = (lgfx_mz_uint8)((*pLZ_flags >> 1) | 0x80);
s0 = s_tdefl_small_dist_sym[cur_match_dist & 511];
s1 = s_tdefl_large_dist_sym[cur_match_dist >> 8];
@@ -2421,9 +2421,9 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d)
}
else
{
- *pLZ_code_buf++ = (mz_uint8)first_trigram;
- *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
- d->m_huff_count[0][(mz_uint8)first_trigram]++;
+ *pLZ_code_buf++ = (lgfx_mz_uint8)first_trigram;
+ *pLZ_flags = (lgfx_mz_uint8)(*pLZ_flags >> 1);
+ d->m_huff_count[0][(lgfx_mz_uint8)first_trigram]++;
}
if (--num_flags_left == 0) { num_flags_left = 8; pLZ_flags = pLZ_code_buf++; }
@@ -2448,11 +2448,11 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d)
while (lookahead_size)
{
- mz_uint8 lit = d->m_dict[cur_pos];
+ lgfx_mz_uint8 lit = d->m_dict[cur_pos];
total_lz_bytes++;
*pLZ_code_buf++ = lit;
- *pLZ_flags = (mz_uint8)(*pLZ_flags >> 1);
+ *pLZ_flags = (lgfx_mz_uint8)(*pLZ_flags >> 1);
if (--num_flags_left == 0) { num_flags_left = 8; pLZ_flags = pLZ_code_buf++; }
d->m_huff_count[0][lit]++;
@@ -2480,29 +2480,29 @@ static mz_bool tdefl_compress_fast(tdefl_compressor *d)
}
#endif // MINIZ_USE_UNALIGNED_LOADS_AND_STORES && MINIZ_LITTLE_ENDIAN
-static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, mz_uint8 lit)
+static MZ_FORCEINLINE void tdefl_record_literal(tdefl_compressor *d, lgfx_mz_uint8 lit)
{
d->m_total_lz_bytes++;
*d->m_pLZ_code_buf++ = lit;
- *d->m_pLZ_flags = (mz_uint8)(*d->m_pLZ_flags >> 1); if (--d->m_num_flags_left == 0) { d->m_num_flags_left = 8; d->m_pLZ_flags = d->m_pLZ_code_buf++; }
+ *d->m_pLZ_flags = (lgfx_mz_uint8)(*d->m_pLZ_flags >> 1); if (--d->m_num_flags_left == 0) { d->m_num_flags_left = 8; d->m_pLZ_flags = d->m_pLZ_code_buf++; }
d->m_huff_count[0][lit]++;
}
-static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match_len, mz_uint match_dist)
+static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, lgfx_mz_uint match_len, lgfx_mz_uint match_dist)
{
- mz_uint32 s0, s1;
+ lgfx_mz_uint32 s0, s1;
MZ_ASSERT((match_len >= TDEFL_MIN_MATCH_LEN) && (match_dist >= 1) && (match_dist <= TDEFL_LZ_DICT_SIZE));
d->m_total_lz_bytes += match_len;
- d->m_pLZ_code_buf[0] = (mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN);
+ d->m_pLZ_code_buf[0] = (lgfx_mz_uint8)(match_len - TDEFL_MIN_MATCH_LEN);
match_dist -= 1;
- d->m_pLZ_code_buf[1] = (mz_uint8)(match_dist & 0xFF);
- d->m_pLZ_code_buf[2] = (mz_uint8)(match_dist >> 8); d->m_pLZ_code_buf += 3;
+ d->m_pLZ_code_buf[1] = (lgfx_mz_uint8)(match_dist & 0xFF);
+ d->m_pLZ_code_buf[2] = (lgfx_mz_uint8)(match_dist >> 8); d->m_pLZ_code_buf += 3;
- *d->m_pLZ_flags = (mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80); if (--d->m_num_flags_left == 0) { d->m_num_flags_left = 8; d->m_pLZ_flags = d->m_pLZ_code_buf++; }
+ *d->m_pLZ_flags = (lgfx_mz_uint8)((*d->m_pLZ_flags >> 1) | 0x80); if (--d->m_num_flags_left == 0) { d->m_num_flags_left = 8; d->m_pLZ_flags = d->m_pLZ_code_buf++; }
s0 = s_tdefl_small_dist_sym[match_dist & 511]; s1 = s_tdefl_large_dist_sym[(match_dist >> 8) & 127];
d->m_huff_count[1][(match_dist < 512) ? s0 : s1]++;
@@ -2510,28 +2510,28 @@ static MZ_FORCEINLINE void tdefl_record_match(tdefl_compressor *d, mz_uint match
if (match_len >= TDEFL_MIN_MATCH_LEN) d->m_huff_count[0][s_tdefl_len_sym[match_len - TDEFL_MIN_MATCH_LEN]]++;
}
-static mz_bool tdefl_compress_normal(tdefl_compressor *d)
+static lgfx_mz_bool tdefl_compress_normal(tdefl_compressor *d)
{
- const mz_uint8 *pSrc = d->m_pSrc; size_t src_buf_left = d->m_src_buf_left;
+ const lgfx_mz_uint8 *pSrc = d->m_pSrc; size_t src_buf_left = d->m_src_buf_left;
tdefl_flush flush = d->m_flush;
while ((src_buf_left) || ((flush) && (d->m_lookahead_size)))
{
- mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
+ lgfx_mz_uint len_to_move, cur_match_dist, cur_match_len, cur_pos;
// Update dictionary and hash chains. Keeps the lookahead size equal to TDEFL_MAX_MATCH_LEN.
if ((d->m_lookahead_size + d->m_dict_size) >= (TDEFL_MIN_MATCH_LEN - 1))
{
- mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2;
- mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
- mz_uint num_bytes_to_process = (mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
- const mz_uint8 *pSrc_end = pSrc + num_bytes_to_process;
+ lgfx_mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK, ins_pos = d->m_lookahead_pos + d->m_lookahead_size - 2;
+ lgfx_mz_uint hash = (d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK];
+ lgfx_mz_uint num_bytes_to_process = (lgfx_mz_uint)MZ_MIN(src_buf_left, TDEFL_MAX_MATCH_LEN - d->m_lookahead_size);
+ const lgfx_mz_uint8 *pSrc_end = pSrc + num_bytes_to_process;
src_buf_left -= num_bytes_to_process;
d->m_lookahead_size += num_bytes_to_process;
while (pSrc != pSrc_end)
{
- mz_uint8 c = *pSrc++; d->m_dict[dst_pos] = c; if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
+ lgfx_mz_uint8 c = *pSrc++; d->m_dict[dst_pos] = c; if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1)) d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
hash = ((hash << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
- d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; d->m_hash[hash] = (mz_uint16)(ins_pos);
+ d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; d->m_hash[hash] = (lgfx_mz_uint16)(ins_pos);
dst_pos = (dst_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK; ins_pos++;
}
}
@@ -2539,17 +2539,17 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d)
{
while ((src_buf_left) && (d->m_lookahead_size < TDEFL_MAX_MATCH_LEN))
{
- mz_uint8 c = *pSrc++;
- mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
+ lgfx_mz_uint8 c = *pSrc++;
+ lgfx_mz_uint dst_pos = (d->m_lookahead_pos + d->m_lookahead_size) & TDEFL_LZ_DICT_SIZE_MASK;
src_buf_left--;
d->m_dict[dst_pos] = c;
if (dst_pos < (TDEFL_MAX_MATCH_LEN - 1))
d->m_dict[TDEFL_LZ_DICT_SIZE + dst_pos] = c;
if ((++d->m_lookahead_size + d->m_dict_size) >= TDEFL_MIN_MATCH_LEN)
{
- mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2;
- mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
- d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; d->m_hash[hash] = (mz_uint16)(ins_pos);
+ lgfx_mz_uint ins_pos = d->m_lookahead_pos + (d->m_lookahead_size - 1) - 2;
+ lgfx_mz_uint hash = ((d->m_dict[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] << (TDEFL_LZ_HASH_SHIFT * 2)) ^ (d->m_dict[(ins_pos + 1) & TDEFL_LZ_DICT_SIZE_MASK] << TDEFL_LZ_HASH_SHIFT) ^ c) & (TDEFL_LZ_HASH_SIZE - 1);
+ d->m_next[ins_pos & TDEFL_LZ_DICT_SIZE_MASK] = d->m_hash[hash]; d->m_hash[hash] = (lgfx_mz_uint16)(ins_pos);
}
}
}
@@ -2563,7 +2563,7 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d)
{
if ((d->m_dict_size) && (!(d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS)))
{
- mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK];
+ lgfx_mz_uint8 c = d->m_dict[(cur_pos - 1) & TDEFL_LZ_DICT_SIZE_MASK];
cur_match_len = 0; while (cur_match_len < d->m_lookahead_size) { if (d->m_dict[cur_pos + cur_match_len] != c) break; cur_match_len++; }
if (cur_match_len < TDEFL_MIN_MATCH_LEN) cur_match_len = 0; else cur_match_dist = 1;
}
@@ -2580,7 +2580,7 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d)
{
if (cur_match_len > d->m_saved_match_len)
{
- tdefl_record_literal(d, (mz_uint8)d->m_saved_lit);
+ tdefl_record_literal(d, (lgfx_mz_uint8)d->m_saved_lit);
if (cur_match_len >= 128)
{
tdefl_record_match(d, cur_match_len, cur_match_dist);
@@ -2615,7 +2615,7 @@ static mz_bool tdefl_compress_normal(tdefl_compressor *d)
d->m_dict_size = MZ_MIN(d->m_dict_size + len_to_move, TDEFL_LZ_DICT_SIZE);
// Check if it's time to flush the current LZ codes to the internal output buffer.
if ( (d->m_pLZ_code_buf > &d->m_lz_code_buf[TDEFL_LZ_CODE_BUF_SIZE - 8]) ||
- ( (d->m_total_lz_bytes > 31*1024) && (((((mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))) )
+ ( (d->m_total_lz_bytes > 31*1024) && (((((lgfx_mz_uint)(d->m_pLZ_code_buf - d->m_lz_code_buf) * 115) >> 7) >= d->m_total_lz_bytes) || (d->m_flags & TDEFL_FORCE_ALL_RAW_BLOCKS))) )
{
int n;
d->m_pSrc = pSrc; d->m_src_buf_left = src_buf_left;
@@ -2632,15 +2632,15 @@ static tdefl_status tdefl_flush_output_buffer(tdefl_compressor *d)
{
if (d->m_pIn_buf_size)
{
- *d->m_pIn_buf_size = d->m_pSrc - (const mz_uint8 *)d->m_pIn_buf;
+ *d->m_pIn_buf_size = d->m_pSrc - (const lgfx_mz_uint8 *)d->m_pIn_buf;
}
if (d->m_pOut_buf_size)
{
size_t n = MZ_MIN(*d->m_pOut_buf_size - d->m_out_buf_ofs, d->m_output_flush_remaining);
- memcpy((mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n);
- d->m_output_flush_ofs += (mz_uint)n;
- d->m_output_flush_remaining -= (mz_uint)n;
+ memcpy((lgfx_mz_uint8 *)d->m_pOut_buf + d->m_out_buf_ofs, d->m_output_buf + d->m_output_flush_ofs, n);
+ d->m_output_flush_ofs += (lgfx_mz_uint)n;
+ d->m_output_flush_remaining -= (lgfx_mz_uint)n;
d->m_out_buf_ofs += n;
*d->m_pOut_buf_size = d->m_out_buf_ofs;
@@ -2660,7 +2660,7 @@ tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pI
d->m_pIn_buf = pIn_buf; d->m_pIn_buf_size = pIn_buf_size;
d->m_pOut_buf = pOut_buf; d->m_pOut_buf_size = pOut_buf_size;
- d->m_pSrc = (const mz_uint8 *)(pIn_buf); d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0;
+ d->m_pSrc = (const lgfx_mz_uint8 *)(pIn_buf); d->m_src_buf_left = pIn_buf_size ? *pIn_buf_size : 0;
d->m_out_buf_ofs = 0;
d->m_flush = flush;
@@ -2692,7 +2692,7 @@ tdefl_status tdefl_compress(tdefl_compressor *d, const void *pIn_buf, size_t *pI
}
if ((d->m_flags & (TDEFL_WRITE_ZLIB_HEADER | TDEFL_COMPUTE_ADLER32)) && (pIn_buf))
- d->m_adler32 = (mz_uint32)mz_adler32(d->m_adler32, (const mz_uint8 *)pIn_buf, d->m_pSrc - (const mz_uint8 *)pIn_buf);
+ d->m_adler32 = (lgfx_mz_uint32)lgfx_mz_adler32(d->m_adler32, (const lgfx_mz_uint8 *)pIn_buf, d->m_pSrc - (const lgfx_mz_uint8 *)pIn_buf);
if ((flush) && (!d->m_lookahead_size) && (!d->m_src_buf_left) && (!d->m_output_flush_remaining))
{
@@ -2713,7 +2713,7 @@ tdefl_status tdefl_compress_buffer(tdefl_compressor *d, const void *pIn_buf, siz
tdefl_status tdefl_init(tdefl_compressor *d, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
{
d->m_pPut_buf_func = pPut_buf_func; d->m_pPut_buf_user = pPut_buf_user;
- d->m_flags = (mz_uint)(flags); d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3; d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
+ d->m_flags = (lgfx_mz_uint)(flags); d->m_max_probes[0] = 1 + ((flags & 0xFFF) + 2) / 3; d->m_greedy_parsing = (flags & TDEFL_GREEDY_PARSING_FLAG) != 0;
d->m_max_probes[1] = 1 + (((flags & 0xFFF) >> 2) + 2) / 3;
if (!(flags & TDEFL_NONDETERMINISTIC_PARSING_FLAG)) MZ_CLEAR_OBJ(d->m_hash);
d->m_lookahead_pos = d->m_lookahead_size = d->m_dict_size = d->m_total_lz_bytes = d->m_lz_code_buf_dict_pos = d->m_bits_in = 0;
@@ -2734,14 +2734,14 @@ tdefl_status tdefl_get_prev_return_status(tdefl_compressor *d)
return d->m_prev_return_status;
}
-mz_uint32 tdefl_get_adler32(tdefl_compressor *d)
+lgfx_mz_uint32 tdefl_get_adler32(tdefl_compressor *d)
{
return d->m_adler32;
}
-mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
+lgfx_mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put_buf_func_ptr pPut_buf_func, void *pPut_buf_user, int flags)
{
- tdefl_compressor *pComp; mz_bool succeeded; if (((buf_len) && (!pBuf)) || (!pPut_buf_func)) return MZ_FALSE;
+ tdefl_compressor *pComp; lgfx_mz_bool succeeded; if (((buf_len) && (!pBuf)) || (!pPut_buf_func)) return MZ_FALSE;
pComp = (tdefl_compressor*)MZ_MALLOC(sizeof(tdefl_compressor)); if (!pComp) return MZ_FALSE;
succeeded = (tdefl_init(pComp, pPut_buf_func, pPut_buf_user, flags) == TDEFL_STATUS_OKAY);
succeeded = succeeded && (tdefl_compress_buffer(pComp, pBuf, buf_len, TDEFL_FINISH) == TDEFL_STATUS_DONE);
@@ -2751,22 +2751,22 @@ mz_bool tdefl_compress_mem_to_output(const void *pBuf, size_t buf_len, tdefl_put
typedef struct
{
size_t m_size, m_capacity;
- mz_uint8 *m_pBuf;
- mz_bool m_expandable;
+ lgfx_mz_uint8 *m_pBuf;
+ lgfx_mz_bool m_expandable;
} tdefl_output_buffer;
-static mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser)
+static lgfx_mz_bool tdefl_output_buffer_putter(const void *pBuf, int len, void *pUser)
{
tdefl_output_buffer *p = (tdefl_output_buffer *)pUser;
size_t new_size = p->m_size + len;
if (new_size > p->m_capacity)
{
- size_t new_capacity = p->m_capacity; mz_uint8 *pNew_buf; if (!p->m_expandable) return MZ_FALSE;
+ size_t new_capacity = p->m_capacity; lgfx_mz_uint8 *pNew_buf; if (!p->m_expandable) return MZ_FALSE;
do { new_capacity = MZ_MAX(128U, new_capacity << 1U); } while (new_size > new_capacity);
- pNew_buf = (mz_uint8*)MZ_REALLOC(p->m_pBuf, new_capacity); if (!pNew_buf) return MZ_FALSE;
+ pNew_buf = (lgfx_mz_uint8*)MZ_REALLOC(p->m_pBuf, new_capacity); if (!pNew_buf) return MZ_FALSE;
p->m_pBuf = pNew_buf; p->m_capacity = new_capacity;
}
- memcpy((mz_uint8*)p->m_pBuf + p->m_size, pBuf, len); p->m_size = new_size;
+ memcpy((lgfx_mz_uint8*)p->m_pBuf + p->m_size, pBuf, len); p->m_size = new_size;
return MZ_TRUE;
}
@@ -2783,18 +2783,18 @@ size_t tdefl_compress_mem_to_mem(void *pOut_buf, size_t out_buf_len, const void
{
tdefl_output_buffer out_buf; MZ_CLEAR_OBJ(out_buf);
if (!pOut_buf) return 0;
- out_buf.m_pBuf = (mz_uint8*)pOut_buf; out_buf.m_capacity = out_buf_len;
+ out_buf.m_pBuf = (lgfx_mz_uint8*)pOut_buf; out_buf.m_capacity = out_buf_len;
if (!tdefl_compress_mem_to_output(pSrc_buf, src_buf_len, tdefl_output_buffer_putter, &out_buf, flags)) return 0;
return out_buf.m_size;
}
#ifndef MINIZ_NO_ZLIB_APIS
-static const mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
+static const lgfx_mz_uint s_tdefl_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
// level may actually range from [0,10] (10 is a "hidden" max level, where we want a bit more compression and it's fine if throughput to fall off a cliff on some files).
-mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy)
+lgfx_mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int strategy)
{
- mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0);
+ lgfx_mz_uint comp_flags = s_tdefl_num_probes[(level >= 0) ? MZ_MIN(10, level) : MZ_DEFAULT_LEVEL] | ((level <= 3) ? TDEFL_GREEDY_PARSING_FLAG : 0);
if (window_bits > 0) comp_flags |= TDEFL_WRITE_ZLIB_HEADER;
if (!level) comp_flags |= TDEFL_FORCE_ALL_RAW_BLOCKS;
@@ -2812,29 +2812,29 @@ mz_uint tdefl_create_comp_flags_from_zip_params(int level, int window_bits, int
#pragma warning (disable:4204) // nonstandard extension used : non-constant aggregate initializer (also supported by GNU C and C99, so no big deal)
#endif
-mz_uint8 *tdefl_get_png_row_default( mz_uint8 *pImage, mz_bool flip, int w, int h, int y, int bpl, void *target ) {
+lgfx_mz_uint8 *tdefl_get_png_row_default( lgfx_mz_uint8 *pImage, lgfx_mz_bool flip, int w, int h, int y, int bpl, void *target ) {
(void)target; // unused here
(void)w;
- return (mz_uint8*)pImage + (flip ? (h - 1 - y) : y) * bpl;
+ return (lgfx_mz_uint8*)pImage + (flip ? (h - 1 - y) : y) * bpl;
}
// Simple PNG writer function by Alex Evans, 2011. Released into the public domain: https://gist.github.com/908299, more context at
// http://altdevblogaday.org/2011/04/06/a-smaller-jpg-encoder/.
// This is actually a modification of Alex's original code so PNG files generated by this function pass pngcheck.
-void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip)
+void *tdefl_write_image_to_png_file_in_memory_ex(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, lgfx_mz_uint level, lgfx_mz_bool flip)
{
return tdefl_write_image_to_png_file_in_memory_ex_with_cb(pImage, w, h, num_chans, pLen_out, level, flip, &tdefl_get_png_row_default, NULL);
}
-void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, mz_uint level, mz_bool flip, tdefl_get_png_row_func cb, void *target)
+void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int w, int h, int num_chans, size_t *pLen_out, lgfx_mz_uint level, lgfx_mz_bool flip, tdefl_get_png_row_func cb, void *target)
{
tdefl_get_png_row_func get_row_func = cb;
// Using a local copy of this array here in case MINIZ_NO_ZLIB_APIS was defined.
- static const mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
- tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); tdefl_output_buffer out_buf; int i, bpl = w * num_chans, y, z; mz_uint32 c; *pLen_out = 0;
+ static const lgfx_mz_uint s_tdefl_png_num_probes[11] = { 0, 1, 6, 32, 16, 32, 128, 256, 512, 768, 1500 };
+ tdefl_compressor *pComp = (tdefl_compressor *)MZ_MALLOC(sizeof(tdefl_compressor)); tdefl_output_buffer out_buf; int i, bpl = w * num_chans, y, z; lgfx_mz_uint32 c; *pLen_out = 0;
if (!pComp) return NULL;
MZ_CLEAR_OBJ(out_buf); out_buf.m_expandable = MZ_TRUE; out_buf.m_capacity = 57+MZ_MAX(64, (1+bpl)*h);
- if (NULL == (out_buf.m_pBuf = (mz_uint8*)MZ_MALLOC(out_buf.m_capacity)))
+ if (NULL == (out_buf.m_pBuf = (lgfx_mz_uint8*)MZ_MALLOC(out_buf.m_capacity)))
{
MZ_FREE(pComp);
return NULL;
@@ -2847,7 +2847,7 @@ void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int
for (y = 0; y < h; ++y)
{
tdefl_compress_buffer(pComp, &z, 1, TDEFL_NO_FLUSH);
- tdefl_compress_buffer(pComp, get_row_func( (mz_uint8*)pImage, flip, w, h, y, bpl, target ), bpl, TDEFL_NO_FLUSH);
+ tdefl_compress_buffer(pComp, get_row_func( (lgfx_mz_uint8*)pImage, flip, w, h, y, bpl, target ), bpl, TDEFL_NO_FLUSH);
}
if (tdefl_compress_buffer(pComp, NULL, 0, TDEFL_FINISH) != TDEFL_STATUS_DONE)
{
@@ -2858,11 +2858,11 @@ void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int
// write real header
*pLen_out = out_buf.m_size-41;
{
- static const mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06};
- mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
- 0,0,(mz_uint8)(w>>8),(mz_uint8)w,0,0,(mz_uint8)(h>>8),(mz_uint8)h,8,chans[num_chans],0,0,0,0,0,0,0,
- (mz_uint8)(*pLen_out>>24),(mz_uint8)(*pLen_out>>16),(mz_uint8)(*pLen_out>>8),(mz_uint8)*pLen_out,0x49,0x44,0x41,0x54};
- c=(mz_uint32)mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((mz_uint8*)(pnghdr+29))[i]=(mz_uint8)(c>>24);
+ static const lgfx_mz_uint8 chans[] = {0x00, 0x00, 0x04, 0x02, 0x06};
+ lgfx_mz_uint8 pnghdr[41]={0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
+ 0,0,(lgfx_mz_uint8)(w>>8),(lgfx_mz_uint8)w,0,0,(lgfx_mz_uint8)(h>>8),(lgfx_mz_uint8)h,8,chans[num_chans],0,0,0,0,0,0,0,
+ (lgfx_mz_uint8)(*pLen_out>>24),(lgfx_mz_uint8)(*pLen_out>>16),(lgfx_mz_uint8)(*pLen_out>>8),(lgfx_mz_uint8)*pLen_out,0x49,0x44,0x41,0x54};
+ c=(lgfx_mz_uint32)lgfx_mz_crc32(MZ_CRC32_INIT,pnghdr+12,17); for (i=0; i<4; ++i, c<<=8) ((lgfx_mz_uint8*)(pnghdr+29))[i]=(lgfx_mz_uint8)(c>>24);
memcpy(out_buf.m_pBuf, pnghdr, 41);
}
// write footer (IDAT CRC-32, followed by IEND chunk)
@@ -2872,7 +2872,7 @@ void *tdefl_write_image_to_png_file_in_memory_ex_with_cb(const void *pImage, int
MZ_FREE(out_buf.m_pBuf);
return NULL;
}
- c = (mz_uint32)mz_crc32(MZ_CRC32_INIT,out_buf.m_pBuf+41-4, *pLen_out+4); for (i=0; i<4; ++i, c<<=8) (out_buf.m_pBuf+out_buf.m_size-16)[i] = (mz_uint8)(c >> 24);
+ c = (lgfx_mz_uint32)lgfx_mz_crc32(MZ_CRC32_INIT,out_buf.m_pBuf+41-4, *pLen_out+4); for (i=0; i<4; ++i, c<<=8) (out_buf.m_pBuf+out_buf.m_size-16)[i] = (lgfx_mz_uint8)(c >> 24);
// compute final size of file, grab compressed data buffer and return
*pLen_out += 57; MZ_FREE(pComp); return out_buf.m_pBuf;
}
@@ -2899,13 +2899,13 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
#include
#if defined(_MSC_VER) || defined(__MINGW64__)
- static FILE *mz_fopen(const char *pFilename, const char *pMode)
+ static FILE *lgfx_mz_fopen(const char *pFilename, const char *pMode)
{
FILE* pFile = NULL;
fopen_s(&pFile, pFilename, pMode);
return pFile;
}
- static FILE *mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
+ static FILE *lgfx_mz_freopen(const char *pPath, const char *pMode, FILE *pStream)
{
FILE* pFile = NULL;
if (freopen_s(&pFile, pPath, pMode, pStream))
@@ -2916,7 +2916,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
#include
#endif
#define MZ_FILE FILE
- #define MZ_FOPEN mz_fopen
+ #define MZ_FOPEN lgfx_mz_fopen
#define MZ_FCLOSE fclose
#define MZ_FREAD fread
#define MZ_FWRITE fwrite
@@ -2925,7 +2925,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
#define MZ_FILE_STAT_STRUCT _stat
#define MZ_FILE_STAT _stat
#define MZ_FFLUSH fflush
- #define MZ_FREOPEN mz_freopen
+ #define MZ_FREOPEN lgfx_mz_freopen
#define MZ_DELETE_FILE remove
#elif defined(__MINGW32__)
#ifndef MINIZ_NO_TIME
@@ -3020,14 +3020,14 @@ typedef struct
{
void *m_p;
size_t m_size, m_capacity;
- mz_uint m_element_size;
-} mz_zip_array;
+ lgfx_mz_uint m_element_size;
+} lgfx_mz_zip_array;
-struct mz_zip_internal_state_tag
+struct lgfx_mz_zip_internal_state_tag
{
- mz_zip_array m_central_dir;
- mz_zip_array m_central_dir_offsets;
- mz_zip_array m_sorted_central_dir_offsets;
+ lgfx_mz_zip_array m_central_dir;
+ lgfx_mz_zip_array m_central_dir_offsets;
+ lgfx_mz_zip_array m_sorted_central_dir_offsets;
MZ_FILE *m_pFile;
void *m_pMem;
size_t m_mem_size;
@@ -3037,13 +3037,13 @@ struct mz_zip_internal_state_tag
#define MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(array_ptr, element_size) (array_ptr)->m_element_size = element_size
#define MZ_ZIP_ARRAY_ELEMENT(array_ptr, element_type, index) ((element_type *)((array_ptr)->m_p))[index]
-static MZ_FORCEINLINE void mz_zip_array_clear(mz_zip_archive *pZip, mz_zip_array *pArray)
+static MZ_FORCEINLINE void lgfx_mz_zip_array_clear(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray)
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pArray->m_p);
- memset(pArray, 0, sizeof(mz_zip_array));
+ memset(pArray, 0, sizeof(lgfx_mz_zip_array));
}
-static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *pArray, size_t min_new_capacity, mz_uint growing)
+static lgfx_mz_bool lgfx_mz_zip_array_ensure_capacity(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray, size_t min_new_capacity, lgfx_mz_uint growing)
{
void *pNew_p; size_t new_capacity = min_new_capacity; MZ_ASSERT(pArray->m_element_size); if (pArray->m_capacity >= min_new_capacity) return MZ_TRUE;
if (growing) { new_capacity = MZ_MAX(1, pArray->m_capacity); while (new_capacity < min_new_capacity) new_capacity *= 2; }
@@ -3052,33 +3052,33 @@ static mz_bool mz_zip_array_ensure_capacity(mz_zip_archive *pZip, mz_zip_array *
return MZ_TRUE;
}
-static MZ_FORCEINLINE mz_bool mz_zip_array_reserve(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_capacity, mz_uint growing)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_array_reserve(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray, size_t new_capacity, lgfx_mz_uint growing)
{
- if (new_capacity > pArray->m_capacity) { if (!mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing)) return MZ_FALSE; }
+ if (new_capacity > pArray->m_capacity) { if (!lgfx_mz_zip_array_ensure_capacity(pZip, pArray, new_capacity, growing)) return MZ_FALSE; }
return MZ_TRUE;
}
-static MZ_FORCEINLINE mz_bool mz_zip_array_resize(mz_zip_archive *pZip, mz_zip_array *pArray, size_t new_size, mz_uint growing)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_array_resize(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray, size_t new_size, lgfx_mz_uint growing)
{
- if (new_size > pArray->m_capacity) { if (!mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing)) return MZ_FALSE; }
+ if (new_size > pArray->m_capacity) { if (!lgfx_mz_zip_array_ensure_capacity(pZip, pArray, new_size, growing)) return MZ_FALSE; }
pArray->m_size = new_size;
return MZ_TRUE;
}
-static MZ_FORCEINLINE mz_bool mz_zip_array_ensure_room(mz_zip_archive *pZip, mz_zip_array *pArray, size_t n)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_array_ensure_room(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray, size_t n)
{
- return mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE);
+ return lgfx_mz_zip_array_reserve(pZip, pArray, pArray->m_size + n, MZ_TRUE);
}
-static MZ_FORCEINLINE mz_bool mz_zip_array_push_back(mz_zip_archive *pZip, mz_zip_array *pArray, const void *pElements, size_t n)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_array_push_back(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_array *pArray, const void *pElements, size_t n)
{
- size_t orig_size = pArray->m_size; if (!mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE)) return MZ_FALSE;
- memcpy((mz_uint8*)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size);
+ size_t orig_size = pArray->m_size; if (!lgfx_mz_zip_array_resize(pZip, pArray, orig_size + n, MZ_TRUE)) return MZ_FALSE;
+ memcpy((lgfx_mz_uint8*)pArray->m_p + orig_size * pArray->m_element_size, pElements, n * pArray->m_element_size);
return MZ_TRUE;
}
#ifndef MINIZ_NO_TIME
-static time_t mz_zip_dos_to_time_t(int dos_time, int dos_date)
+static time_t lgfx_mz_zip_dos_to_time_t(int dos_time, int dos_date)
{
struct tm tm;
memset(&tm, 0, sizeof(tm)); tm.tm_isdst = -1;
@@ -3087,7 +3087,7 @@ static time_t mz_zip_dos_to_time_t(int dos_time, int dos_date)
return mktime(&tm);
}
-static void mz_zip_time_to_dos_time(time_t time, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date)
+static void lgfx_mz_zip_time_to_dos_time(time_t time, lgfx_mz_uint16 *pDOS_time, lgfx_mz_uint16 *pDOS_date)
{
#ifdef _MSC_VER
struct tm tm_struct;
@@ -3101,13 +3101,13 @@ static void mz_zip_time_to_dos_time(time_t time, mz_uint16 *pDOS_time, mz_uint16
#else
struct tm *tm = localtime(&time);
#endif
- *pDOS_time = (mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1));
- *pDOS_date = (mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday);
+ *pDOS_time = (lgfx_mz_uint16)(((tm->tm_hour) << 11) + ((tm->tm_min) << 5) + ((tm->tm_sec) >> 1));
+ *pDOS_date = (lgfx_mz_uint16)(((tm->tm_year + 1900 - 1980) << 9) + ((tm->tm_mon + 1) << 5) + tm->tm_mday);
}
#endif
#ifndef MINIZ_NO_STDIO
-static mz_bool mz_zip_get_file_modified_time(const char *pFilename, mz_uint16 *pDOS_time, mz_uint16 *pDOS_date)
+static lgfx_mz_bool lgfx_mz_zip_get_file_modified_time(const char *pFilename, lgfx_mz_uint16 *pDOS_time, lgfx_mz_uint16 *pDOS_date)
{
#ifdef MINIZ_NO_TIME
(void)pFilename; *pDOS_date = *pDOS_time = 0;
@@ -3116,13 +3116,13 @@ static mz_bool mz_zip_get_file_modified_time(const char *pFilename, mz_uint16 *p
// On Linux with x86 glibc, this call will fail on large files (>= 0x80000000 bytes) unless you compiled with _LARGEFILE64_SOURCE. Argh.
if (MZ_FILE_STAT(pFilename, &file_stat) != 0)
return MZ_FALSE;
- mz_zip_time_to_dos_time(file_stat.st_mtime, pDOS_time, pDOS_date);
+ lgfx_mz_zip_time_to_dos_time(file_stat.st_mtime, pDOS_time, pDOS_date);
#endif // #ifdef MINIZ_NO_TIME
return MZ_TRUE;
}
#ifndef MINIZ_NO_TIME
-static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time, time_t modified_time)
+static lgfx_mz_bool lgfx_mz_zip_set_file_times(const char *pFilename, time_t access_time, time_t modified_time)
{
struct utimbuf t; t.actime = access_time; t.modtime = modified_time;
return !utime(pFilename, &t);
@@ -3130,7 +3130,7 @@ static mz_bool mz_zip_set_file_times(const char *pFilename, time_t access_time,
#endif // #ifndef MINIZ_NO_TIME
#endif // #ifndef MINIZ_NO_STDIO
-static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint32 flags)
+static lgfx_mz_bool lgfx_mz_zip_reader_init_internal(lgfx_mz_zip_archive *pZip, lgfx_mz_uint32 flags)
{
(void)flags;
if ((!pZip) || (pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
@@ -3145,21 +3145,21 @@ static mz_bool mz_zip_reader_init_internal(mz_zip_archive *pZip, mz_uint32 flags
pZip->m_central_directory_file_ofs = 0;
pZip->m_total_files = 0;
- if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
+ if (NULL == (pZip->m_pState = (lgfx_mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(lgfx_mz_zip_internal_state))))
return MZ_FALSE;
- memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
+ memset(pZip->m_pState, 0, sizeof(lgfx_mz_zip_internal_state));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(lgfx_mz_uint8));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(lgfx_mz_uint32));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(lgfx_mz_uint32));
return MZ_TRUE;
}
-static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, mz_uint r_index)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_reader_filename_less(const lgfx_mz_zip_array *pCentral_dir_array, const lgfx_mz_zip_array *pCentral_dir_offsets, lgfx_mz_uint l_index, lgfx_mz_uint r_index)
{
- const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
- const mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, r_index));
- mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
- mz_uint8 l = 0, r = 0;
+ const lgfx_mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, lgfx_mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, lgfx_mz_uint32, l_index)), *pE;
+ const lgfx_mz_uint8 *pR = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, lgfx_mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, lgfx_mz_uint32, r_index));
+ lgfx_mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS), r_len = MZ_READ_LE16(pR + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+ lgfx_mz_uint8 l = 0, r = 0;
pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE; pR += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
pE = pL + MZ_MIN(l_len, r_len);
while (pL < pE)
@@ -3171,15 +3171,15 @@ static MZ_FORCEINLINE mz_bool mz_zip_reader_filename_less(const mz_zip_array *pC
return (pL == pE) ? (l_len < r_len) : (l < r);
}
-#define MZ_SWAP_UINT32(a, b) do { mz_uint32 t = a; a = b; b = t; } MZ_MACRO_END
+#define MZ_SWAP_UINT32(a, b) do { lgfx_mz_uint32 t = a; a = b; b = t; } MZ_MACRO_END
-// Heap sort of lowercased filenames, used to help accelerate plain central directory searches by mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.)
-static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *pZip)
+// Heap sort of lowercased filenames, used to help accelerate plain central directory searches by lgfx_mz_zip_reader_locate_file(). (Could also use qsort(), but it could allocate memory.)
+static void lgfx_mz_zip_reader_sort_central_dir_offsets_by_filename(lgfx_mz_zip_archive *pZip)
{
- mz_zip_internal_state *pState = pZip->m_pState;
- const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
- const mz_zip_array *pCentral_dir = &pState->m_central_dir;
- mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
+ lgfx_mz_zip_internal_state *pState = pZip->m_pState;
+ const lgfx_mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
+ const lgfx_mz_zip_array *pCentral_dir = &pState->m_central_dir;
+ lgfx_mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, lgfx_mz_uint32, 0);
const int size = pZip->m_total_files;
int start = (size - 2) >> 1, end;
while (start >= 0)
@@ -3189,8 +3189,8 @@ static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *p
{
if ((child = (root << 1) + 1) >= size)
break;
- child += (((child + 1) < size) && (mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1])));
- if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
+ child += (((child + 1) < size) && (lgfx_mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1])));
+ if (!lgfx_mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
break;
MZ_SWAP_UINT32(pIndices[root], pIndices[child]); root = child;
}
@@ -3206,8 +3206,8 @@ static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *p
{
if ((child = (root << 1) + 1) >= end)
break;
- child += (((child + 1) < end) && mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1]));
- if (!mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
+ child += (((child + 1) < end) && lgfx_mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[child], pIndices[child + 1]));
+ if (!lgfx_mz_zip_reader_filename_less(pCentral_dir, pCentral_dir_offsets, pIndices[root], pIndices[child]))
break;
MZ_SWAP_UINT32(pIndices[root], pIndices[child]); root = child;
}
@@ -3215,23 +3215,23 @@ static void mz_zip_reader_sort_central_dir_offsets_by_filename(mz_zip_archive *p
}
}
-static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint32 flags)
+static lgfx_mz_bool lgfx_mz_zip_reader_read_central_dir(lgfx_mz_zip_archive *pZip, lgfx_mz_uint32 flags)
{
- mz_uint cdir_size, num_this_disk, cdir_disk_index;
- mz_uint64 cdir_ofs;
- mz_int64 cur_file_ofs;
- const mz_uint8 *p;
- mz_uint32 buf_u32[4096 / sizeof(mz_uint32)]; mz_uint8 *pBuf = (mz_uint8 *)buf_u32;
- mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0);
+ lgfx_mz_uint cdir_size, num_this_disk, cdir_disk_index;
+ lgfx_mz_uint64 cdir_ofs;
+ lgfx_mz_int64 cur_file_ofs;
+ const lgfx_mz_uint8 *p;
+ lgfx_mz_uint32 buf_u32[4096 / sizeof(lgfx_mz_uint32)]; lgfx_mz_uint8 *pBuf = (lgfx_mz_uint8 *)buf_u32;
+ lgfx_mz_bool sort_central_dir = ((flags & MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY) == 0);
// Basic sanity checks - reject files which are too small, and check the first 4 bytes of the file to make sure a local header is there.
if (pZip->m_archive_size < MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE)
return MZ_FALSE;
// Find the end of central directory record by scanning the file from the end towards the beginning.
- cur_file_ofs = MZ_MAX((mz_int64)pZip->m_archive_size - (mz_int64)sizeof(buf_u32), 0);
+ cur_file_ofs = MZ_MAX((lgfx_mz_int64)pZip->m_archive_size - (lgfx_mz_int64)sizeof(buf_u32), 0);
for ( ; ; )
{
int i, n = (int)MZ_MIN(sizeof(buf_u32), pZip->m_archive_size - cur_file_ofs);
- if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (mz_uint)n)
+ if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, n) != (lgfx_mz_uint)n)
return MZ_FALSE;
for (i = n - 4; i >= 0; --i)
if (MZ_READ_LE32(pBuf + i) == MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIG)
@@ -3261,23 +3261,23 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint32 fl
return MZ_FALSE;
cdir_ofs = MZ_READ_LE32(pBuf + MZ_ZIP_ECDH_CDIR_OFS_OFS);
- if ((cdir_ofs + (mz_uint64)cdir_size) > pZip->m_archive_size)
+ if ((cdir_ofs + (lgfx_mz_uint64)cdir_size) > pZip->m_archive_size)
return MZ_FALSE;
pZip->m_central_directory_file_ofs = cdir_ofs;
if (pZip->m_total_files)
{
- mz_uint i, n;
+ lgfx_mz_uint i, n;
// Read the entire central directory into a heap block, and allocate another heap block to hold the unsorted central dir file record offsets, and another to hold the sorted indices.
- if ((!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) ||
- (!mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE)))
+ if ((!lgfx_mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir, cdir_size, MZ_FALSE)) ||
+ (!lgfx_mz_zip_array_resize(pZip, &pZip->m_pState->m_central_dir_offsets, pZip->m_total_files, MZ_FALSE)))
return MZ_FALSE;
if (sort_central_dir)
{
- if (!mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE))
+ if (!lgfx_mz_zip_array_resize(pZip, &pZip->m_pState->m_sorted_central_dir_offsets, pZip->m_total_files, MZ_FALSE))
return MZ_FALSE;
}
@@ -3285,15 +3285,15 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint32 fl
return MZ_FALSE;
// Now create an index into the central directory file records, do some basic sanity checking on each record, and check for zip64 entries (which are not yet supported).
- p = (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p;
+ p = (const lgfx_mz_uint8 *)pZip->m_pState->m_central_dir.m_p;
for (n = cdir_size, i = 0; i < pZip->m_total_files; ++i)
{
- mz_uint total_header_size, comp_size, decomp_size, disk_index;
+ lgfx_mz_uint total_header_size, comp_size, decomp_size, disk_index;
if ((n < MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) || (MZ_READ_LE32(p) != MZ_ZIP_CENTRAL_DIR_HEADER_SIG))
return MZ_FALSE;
- MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, i) = (mz_uint32)(p - (const mz_uint8 *)pZip->m_pState->m_central_dir.m_p);
+ MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, lgfx_mz_uint32, i) = (lgfx_mz_uint32)(p - (const lgfx_mz_uint8 *)pZip->m_pState->m_central_dir.m_p);
if (sort_central_dir)
- MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, mz_uint32, i) = i;
+ MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_sorted_central_dir_offsets, lgfx_mz_uint32, i) = i;
comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
decomp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_DECOMPRESSED_SIZE_OFS);
if (((!MZ_READ_LE32(p + MZ_ZIP_CDH_METHOD_OFS)) && (decomp_size != comp_size)) || (decomp_size && !comp_size) || (decomp_size == 0xFFFFFFFF) || (comp_size == 0xFFFFFFFF))
@@ -3301,7 +3301,7 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint32 fl
disk_index = MZ_READ_LE16(p + MZ_ZIP_CDH_DISK_START_OFS);
if ((disk_index != num_this_disk) && (disk_index != 1))
return MZ_FALSE;
- if (((mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size)
+ if (((lgfx_mz_uint64)MZ_READ_LE32(p + MZ_ZIP_CDH_LOCAL_HEADER_OFS) + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + comp_size) > pZip->m_archive_size)
return MZ_FALSE;
if ((total_header_size = MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(p + MZ_ZIP_CDH_COMMENT_LEN_OFS)) > n)
return MZ_FALSE;
@@ -3310,40 +3310,40 @@ static mz_bool mz_zip_reader_read_central_dir(mz_zip_archive *pZip, mz_uint32 fl
}
if (sort_central_dir)
- mz_zip_reader_sort_central_dir_offsets_by_filename(pZip);
+ lgfx_mz_zip_reader_sort_central_dir_offsets_by_filename(pZip);
return MZ_TRUE;
}
-mz_bool mz_zip_reader_init(mz_zip_archive *pZip, mz_uint64 size, mz_uint32 flags)
+lgfx_mz_bool lgfx_mz_zip_reader_init(lgfx_mz_zip_archive *pZip, lgfx_mz_uint64 size, lgfx_mz_uint32 flags)
{
if ((!pZip) || (!pZip->m_pRead))
return MZ_FALSE;
- if (!mz_zip_reader_init_internal(pZip, flags))
+ if (!lgfx_mz_zip_reader_init_internal(pZip, flags))
return MZ_FALSE;
pZip->m_archive_size = size;
- if (!mz_zip_reader_read_central_dir(pZip, flags))
+ if (!lgfx_mz_zip_reader_read_central_dir(pZip, flags))
{
- mz_zip_reader_end(pZip);
+ lgfx_mz_zip_reader_end(pZip);
return MZ_FALSE;
}
return MZ_TRUE;
}
-static size_t mz_zip_mem_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
+static size_t lgfx_mz_zip_mem_read_func(void *pOpaque, lgfx_mz_uint64 file_ofs, void *pBuf, size_t n)
{
- mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
+ lgfx_mz_zip_archive *pZip = (lgfx_mz_zip_archive *)pOpaque;
size_t s = (file_ofs >= pZip->m_archive_size) ? 0 : (size_t)MZ_MIN(pZip->m_archive_size - file_ofs, n);
- memcpy(pBuf, (const mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s);
+ memcpy(pBuf, (const lgfx_mz_uint8 *)pZip->m_pState->m_pMem + file_ofs, s);
return s;
}
-mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t size, mz_uint32 flags)
+lgfx_mz_bool lgfx_mz_zip_reader_init_mem(lgfx_mz_zip_archive *pZip, const void *pMem, size_t size, lgfx_mz_uint32 flags)
{
- if (!mz_zip_reader_init_internal(pZip, flags))
+ if (!lgfx_mz_zip_reader_init_internal(pZip, flags))
return MZ_FALSE;
pZip->m_archive_size = size;
- pZip->m_pRead = mz_zip_mem_read_func;
+ pZip->m_pRead = lgfx_mz_zip_mem_read_func;
pZip->m_pIO_opaque = pZip;
#ifdef __cplusplus
pZip->m_pState->m_pMem = const_cast(pMem);
@@ -3351,27 +3351,27 @@ mz_bool mz_zip_reader_init_mem(mz_zip_archive *pZip, const void *pMem, size_t si
pZip->m_pState->m_pMem = (void *)pMem;
#endif
pZip->m_pState->m_mem_size = size;
- if (!mz_zip_reader_read_central_dir(pZip, flags))
+ if (!lgfx_mz_zip_reader_read_central_dir(pZip, flags))
{
- mz_zip_reader_end(pZip);
+ lgfx_mz_zip_reader_end(pZip);
return MZ_FALSE;
}
return MZ_TRUE;
}
#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_read_func(void *pOpaque, mz_uint64 file_ofs, void *pBuf, size_t n)
+static size_t lgfx_mz_zip_file_read_func(void *pOpaque, lgfx_mz_uint64 file_ofs, void *pBuf, size_t n)
{
- mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
- mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
- if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
+ lgfx_mz_zip_archive *pZip = (lgfx_mz_zip_archive *)pOpaque;
+ lgfx_mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+ if (((lgfx_mz_int64)file_ofs < 0) || (((cur_ofs != (lgfx_mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (lgfx_mz_int64)file_ofs, SEEK_SET))))
return 0;
return MZ_FREAD(pBuf, 1, n, pZip->m_pState->m_pFile);
}
-mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint32 flags)
+lgfx_mz_bool lgfx_mz_zip_reader_init_file(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_uint32 flags)
{
- mz_uint64 file_size;
+ lgfx_mz_uint64 file_size;
MZ_FILE *pFile = MZ_FOPEN(pFilename, "rb");
if (!pFile)
return MZ_FALSE;
@@ -3381,50 +3381,50 @@ mz_bool mz_zip_reader_init_file(mz_zip_archive *pZip, const char *pFilename, mz_
return MZ_FALSE;
}
file_size = MZ_FTELL64(pFile);
- if (!mz_zip_reader_init_internal(pZip, flags))
+ if (!lgfx_mz_zip_reader_init_internal(pZip, flags))
{
MZ_FCLOSE(pFile);
return MZ_FALSE;
}
- pZip->m_pRead = mz_zip_file_read_func;
+ pZip->m_pRead = lgfx_mz_zip_file_read_func;
pZip->m_pIO_opaque = pZip;
pZip->m_pState->m_pFile = pFile;
pZip->m_archive_size = file_size;
- if (!mz_zip_reader_read_central_dir(pZip, flags))
+ if (!lgfx_mz_zip_reader_read_central_dir(pZip, flags))
{
- mz_zip_reader_end(pZip);
+ lgfx_mz_zip_reader_end(pZip);
return MZ_FALSE;
}
return MZ_TRUE;
}
#endif // #ifndef MINIZ_NO_STDIO
-mz_uint mz_zip_reader_get_num_files(mz_zip_archive *pZip)
+lgfx_mz_uint lgfx_mz_zip_reader_get_num_files(lgfx_mz_zip_archive *pZip)
{
return pZip ? pZip->m_total_files : 0;
}
-static MZ_FORCEINLINE const mz_uint8 *mz_zip_reader_get_cdh(mz_zip_archive *pZip, mz_uint file_index)
+static MZ_FORCEINLINE const lgfx_mz_uint8 *lgfx_mz_zip_reader_get_cdh(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index)
{
if ((!pZip) || (!pZip->m_pState) || (file_index >= pZip->m_total_files) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
return NULL;
- return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
+ return &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, lgfx_mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, lgfx_mz_uint32, file_index));
}
-mz_bool mz_zip_reader_is_file_encrypted(mz_zip_archive *pZip, mz_uint file_index)
+lgfx_mz_bool lgfx_mz_zip_reader_is_file_encrypted(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index)
{
- mz_uint m_bit_flag;
- const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+ lgfx_mz_uint m_bit_flag;
+ const lgfx_mz_uint8 *p = lgfx_mz_zip_reader_get_cdh(pZip, file_index);
if (!p)
return MZ_FALSE;
m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
return (m_bit_flag & 1);
}
-mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_index)
+lgfx_mz_bool lgfx_mz_zip_reader_is_file_a_directory(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index)
{
- mz_uint filename_len, external_attr;
- const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+ lgfx_mz_uint filename_len, external_attr;
+ const lgfx_mz_uint8 *p = lgfx_mz_zip_reader_get_cdh(pZip, file_index);
if (!p)
return MZ_FALSE;
@@ -3446,22 +3446,22 @@ mz_bool mz_zip_reader_is_file_a_directory(mz_zip_archive *pZip, mz_uint file_ind
return MZ_FALSE;
}
-mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip_archive_file_stat *pStat)
+lgfx_mz_bool lgfx_mz_zip_reader_file_stat(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, lgfx_mz_zip_archive_file_stat *pStat)
{
- mz_uint n;
- const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+ lgfx_mz_uint n;
+ const lgfx_mz_uint8 *p = lgfx_mz_zip_reader_get_cdh(pZip, file_index);
if ((!p) || (!pStat))
return MZ_FALSE;
// Unpack the central directory record.
pStat->m_file_index = file_index;
- pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index);
+ pStat->m_central_dir_ofs = MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, lgfx_mz_uint32, file_index);
pStat->m_version_made_by = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_MADE_BY_OFS);
pStat->m_version_needed = MZ_READ_LE16(p + MZ_ZIP_CDH_VERSION_NEEDED_OFS);
pStat->m_bit_flag = MZ_READ_LE16(p + MZ_ZIP_CDH_BIT_FLAG_OFS);
pStat->m_method = MZ_READ_LE16(p + MZ_ZIP_CDH_METHOD_OFS);
#ifndef MINIZ_NO_TIME
- pStat->m_time = mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS));
+ pStat->m_time = lgfx_mz_zip_dos_to_time_t(MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_TIME_OFS), MZ_READ_LE16(p + MZ_ZIP_CDH_FILE_DATE_OFS));
#endif
pStat->m_crc32 = MZ_READ_LE32(p + MZ_ZIP_CDH_CRC32_OFS);
pStat->m_comp_size = MZ_READ_LE32(p + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
@@ -3481,10 +3481,10 @@ mz_bool mz_zip_reader_file_stat(mz_zip_archive *pZip, mz_uint file_index, mz_zip
return MZ_TRUE;
}
-mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, char *pFilename, mz_uint filename_buf_size)
+lgfx_mz_uint lgfx_mz_zip_reader_get_filename(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, char *pFilename, lgfx_mz_uint filename_buf_size)
{
- mz_uint n;
- const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+ lgfx_mz_uint n;
+ const lgfx_mz_uint8 *p = lgfx_mz_zip_reader_get_cdh(pZip, file_index);
if (!p) { if (filename_buf_size) pFilename[0] = '\0'; return 0; }
n = MZ_READ_LE16(p + MZ_ZIP_CDH_FILENAME_LEN_OFS);
if (filename_buf_size)
@@ -3496,9 +3496,9 @@ mz_uint mz_zip_reader_get_filename(mz_zip_archive *pZip, mz_uint file_index, cha
return n + 1;
}
-static MZ_FORCEINLINE mz_bool mz_zip_reader_string_equal(const char *pA, const char *pB, mz_uint len, mz_uint flags)
+static MZ_FORCEINLINE lgfx_mz_bool lgfx_mz_zip_reader_string_equal(const char *pA, const char *pB, lgfx_mz_uint len, lgfx_mz_uint flags)
{
- mz_uint i;
+ lgfx_mz_uint i;
if (flags & MZ_ZIP_FLAG_CASE_SENSITIVE)
return 0 == memcmp(pA, pB, len);
for (i = 0; i < len; ++i)
@@ -3507,11 +3507,11 @@ static MZ_FORCEINLINE mz_bool mz_zip_reader_string_equal(const char *pA, const c
return MZ_TRUE;
}
-static MZ_FORCEINLINE int mz_zip_reader_filename_compare(const mz_zip_array *pCentral_dir_array, const mz_zip_array *pCentral_dir_offsets, mz_uint l_index, const char *pR, mz_uint r_len)
+static MZ_FORCEINLINE int lgfx_mz_zip_reader_filename_compare(const lgfx_mz_zip_array *pCentral_dir_array, const lgfx_mz_zip_array *pCentral_dir_offsets, lgfx_mz_uint l_index, const char *pR, lgfx_mz_uint r_len)
{
- const mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, mz_uint32, l_index)), *pE;
- mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
- mz_uint8 l = 0, r = 0;
+ const lgfx_mz_uint8 *pL = &MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_array, lgfx_mz_uint8, MZ_ZIP_ARRAY_ELEMENT(pCentral_dir_offsets, lgfx_mz_uint32, l_index)), *pE;
+ lgfx_mz_uint l_len = MZ_READ_LE16(pL + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+ lgfx_mz_uint8 l = 0, r = 0;
pL += MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
pE = pL + MZ_MIN(l_len, r_len);
while (pL < pE)
@@ -3523,18 +3523,18 @@ static MZ_FORCEINLINE int mz_zip_reader_filename_compare(const mz_zip_array *pCe
return (pL == pE) ? (int)(l_len - r_len) : (l - r);
}
-static int mz_zip_reader_locate_file_binary_search(mz_zip_archive *pZip, const char *pFilename)
+static int lgfx_mz_zip_reader_locate_file_binary_search(lgfx_mz_zip_archive *pZip, const char *pFilename)
{
- mz_zip_internal_state *pState = pZip->m_pState;
- const mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
- const mz_zip_array *pCentral_dir = &pState->m_central_dir;
- mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, mz_uint32, 0);
+ lgfx_mz_zip_internal_state *pState = pZip->m_pState;
+ const lgfx_mz_zip_array *pCentral_dir_offsets = &pState->m_central_dir_offsets;
+ const lgfx_mz_zip_array *pCentral_dir = &pState->m_central_dir;
+ lgfx_mz_uint32 *pIndices = &MZ_ZIP_ARRAY_ELEMENT(&pState->m_sorted_central_dir_offsets, lgfx_mz_uint32, 0);
const int size = pZip->m_total_files;
- const mz_uint filename_len = (mz_uint)strlen(pFilename);
+ const lgfx_mz_uint filename_len = (lgfx_mz_uint)strlen(pFilename);
int l = 0, h = size - 1;
while (l <= h)
{
- int m = (l + h) >> 1, file_index = pIndices[m], comp = mz_zip_reader_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len);
+ int m = (l + h) >> 1, file_index = pIndices[m], comp = lgfx_mz_zip_reader_filename_compare(pCentral_dir, pCentral_dir_offsets, file_index, pFilename, filename_len);
if (!comp)
return file_index;
else if (comp < 0)
@@ -3545,27 +3545,27 @@ static int mz_zip_reader_locate_file_binary_search(mz_zip_archive *pZip, const c
return -1;
}
-int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const char *pComment, mz_uint flags)
+int lgfx_mz_zip_reader_locate_file(lgfx_mz_zip_archive *pZip, const char *pName, const char *pComment, lgfx_mz_uint flags)
{
- mz_uint file_index; size_t name_len, comment_len;
+ lgfx_mz_uint file_index; size_t name_len, comment_len;
if ((!pZip) || (!pZip->m_pState) || (!pName) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
return -1;
if (((flags & (MZ_ZIP_FLAG_IGNORE_PATH | MZ_ZIP_FLAG_CASE_SENSITIVE)) == 0) && (!pComment) && (pZip->m_pState->m_sorted_central_dir_offsets.m_size))
- return mz_zip_reader_locate_file_binary_search(pZip, pName);
+ return lgfx_mz_zip_reader_locate_file_binary_search(pZip, pName);
name_len = strlen(pName); if (name_len > 0xFFFF) return -1;
comment_len = pComment ? strlen(pComment) : 0; if (comment_len > 0xFFFF) return -1;
for (file_index = 0; file_index < pZip->m_total_files; file_index++)
{
- const mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, mz_uint32, file_index));
- mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
+ const lgfx_mz_uint8 *pHeader = &MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir, lgfx_mz_uint8, MZ_ZIP_ARRAY_ELEMENT(&pZip->m_pState->m_central_dir_offsets, lgfx_mz_uint32, file_index));
+ lgfx_mz_uint filename_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_FILENAME_LEN_OFS);
const char *pFilename = (const char *)pHeader + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE;
if (filename_len < name_len)
continue;
if (comment_len)
{
- mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
+ lgfx_mz_uint file_extra_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_EXTRA_LEN_OFS), file_comment_len = MZ_READ_LE16(pHeader + MZ_ZIP_CDH_COMMENT_LEN_OFS);
const char *pFile_comment = pFilename + filename_len + file_extra_len;
- if ((file_comment_len != comment_len) || (!mz_zip_reader_string_equal(pComment, pFile_comment, file_comment_len, flags)))
+ if ((file_comment_len != comment_len) || (!lgfx_mz_zip_reader_string_equal(pComment, pFile_comment, file_comment_len, flags)))
continue;
}
if ((flags & MZ_ZIP_FLAG_IGNORE_PATH) && (filename_len))
@@ -3579,25 +3579,25 @@ int mz_zip_reader_locate_file(mz_zip_archive *pZip, const char *pName, const cha
ofs++;
pFilename += ofs; filename_len -= ofs;
}
- if ((filename_len == name_len) && (mz_zip_reader_string_equal(pName, pFilename, filename_len, flags)))
+ if ((filename_len == name_len) && (lgfx_mz_zip_reader_string_equal(pName, pFilename, filename_len, flags)))
return file_index;
}
return -1;
}
-mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_mem_no_alloc(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, void *pBuf, size_t buf_size, lgfx_mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
{
int status = TINFL_STATUS_DONE;
- mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
- mz_zip_archive_file_stat file_stat;
+ lgfx_mz_uint64 needed_size, cur_file_ofs, comp_remaining, out_buf_ofs = 0, read_buf_size, read_buf_ofs = 0, read_buf_avail;
+ lgfx_mz_zip_archive_file_stat file_stat;
void *pRead_buf;
- mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
- tinfl_decompressor inflator;
+ lgfx_mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(lgfx_mz_uint32) - 1) / sizeof(lgfx_mz_uint32)]; lgfx_mz_uint8 *pLocal_header = (lgfx_mz_uint8 *)local_header_u32;
+ lgfx_tinfl_decompressor inflator;
if ((buf_size) && (!pBuf))
return MZ_FALSE;
- if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+ if (!lgfx_mz_zip_reader_file_stat(pZip, file_index, &file_stat))
return MZ_FALSE;
// Empty file, or a directory (but not always a directory - I've seen odd zips with directories that have compressed data which inflates to 0 bytes)
@@ -3606,7 +3606,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
// Entry is a subdirectory (I've seen old zips with dir entries which have compressed deflate data which inflates to 0 bytes, but these entries claim to uncompress to 512 bytes in the headers).
// I'm torn how to handle this case - should it fail instead?
- if (mz_zip_reader_is_file_a_directory(pZip, file_index))
+ if (lgfx_mz_zip_reader_is_file_a_directory(pZip, file_index))
return MZ_TRUE;
// Encryption and patch files are not supported.
@@ -3638,16 +3638,16 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
// The file is stored or the caller has requested the compressed data.
if (pZip->m_pRead(pZip->m_pIO_opaque, cur_file_ofs, pBuf, (size_t)needed_size) != needed_size)
return MZ_FALSE;
- return ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) != 0) || (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) == file_stat.m_crc32);
+ return ((flags & MZ_ZIP_FLAG_COMPRESSED_DATA) != 0) || (lgfx_mz_crc32(MZ_CRC32_INIT, (const lgfx_mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) == file_stat.m_crc32);
}
// Decompress the file either directly from memory or from a file input buffer.
- tinfl_init(&inflator);
+ lgfx_tinfl_init(&inflator);
if (pZip->m_pState->m_pMem)
{
// Read directly from the archive in memory.
- pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
+ pRead_buf = (lgfx_mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
read_buf_size = read_buf_avail = file_stat.m_comp_size;
comp_remaining = 0;
}
@@ -3656,7 +3656,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
// Use a user provided read buffer.
if (!user_read_buf_size)
return MZ_FALSE;
- pRead_buf = (mz_uint8 *)pUser_read_buf;
+ pRead_buf = (lgfx_mz_uint8 *)pUser_read_buf;
read_buf_size = user_read_buf_size;
read_buf_avail = 0;
comp_remaining = file_stat.m_comp_size;
@@ -3666,9 +3666,9 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
// Temporarily allocate a read buffer.
read_buf_size = MZ_MIN(file_stat.m_comp_size, MZ_ZIP_MAX_IO_BUF_SIZE);
#ifdef _MSC_VER
- if (((0, sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
+ if (((0, sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
#else
- if (((sizeof(size_t) == sizeof(mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
+ if (((sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (read_buf_size > 0x7FFFFFFF))
#endif
return MZ_FALSE;
if (NULL == (pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)read_buf_size)))
@@ -3693,7 +3693,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
read_buf_ofs = 0;
}
in_buf_size = (size_t)read_buf_avail;
- status = tinfl_decompress(&inflator, (mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pBuf, (mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0));
+ status = lgfx_tinfl_decompress(&inflator, (lgfx_mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (lgfx_mz_uint8 *)pBuf, (lgfx_mz_uint8 *)pBuf + out_buf_ofs, &out_buf_size, TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | (comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0));
read_buf_avail -= in_buf_size;
read_buf_ofs += in_buf_size;
out_buf_ofs += out_buf_size;
@@ -3702,7 +3702,7 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
if (status == TINFL_STATUS_DONE)
{
// Make sure the entire file was decompressed, and check its CRC.
- if ((out_buf_ofs != file_stat.m_uncomp_size) || (mz_crc32(MZ_CRC32_INIT, (const mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32))
+ if ((out_buf_ofs != file_stat.m_uncomp_size) || (lgfx_mz_crc32(MZ_CRC32_INIT, (const lgfx_mz_uint8 *)pBuf, (size_t)file_stat.m_uncomp_size) != file_stat.m_crc32))
status = TINFL_STATUS_FAILED;
}
@@ -3712,28 +3712,28 @@ mz_bool mz_zip_reader_extract_to_mem_no_alloc(mz_zip_archive *pZip, mz_uint file
return status == TINFL_STATUS_DONE;
}
-mz_bool mz_zip_reader_extract_file_to_mem_no_alloc(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_mem_no_alloc(lgfx_mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, lgfx_mz_uint flags, void *pUser_read_buf, size_t user_read_buf_size)
{
- int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
+ int file_index = lgfx_mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
if (file_index < 0)
return MZ_FALSE;
- return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size);
+ return lgfx_mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, pUser_read_buf, user_read_buf_size);
}
-mz_bool mz_zip_reader_extract_to_mem(mz_zip_archive *pZip, mz_uint file_index, void *pBuf, size_t buf_size, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_mem(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, void *pBuf, size_t buf_size, lgfx_mz_uint flags)
{
- return mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, NULL, 0);
+ return lgfx_mz_zip_reader_extract_to_mem_no_alloc(pZip, file_index, pBuf, buf_size, flags, NULL, 0);
}
-mz_bool mz_zip_reader_extract_file_to_mem(mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_mem(lgfx_mz_zip_archive *pZip, const char *pFilename, void *pBuf, size_t buf_size, lgfx_mz_uint flags)
{
- return mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0);
+ return lgfx_mz_zip_reader_extract_file_to_mem_no_alloc(pZip, pFilename, pBuf, buf_size, flags, NULL, 0);
}
-void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, size_t *pSize, mz_uint flags)
+void *lgfx_mz_zip_reader_extract_to_heap(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, size_t *pSize, lgfx_mz_uint flags)
{
- mz_uint64 comp_size, uncomp_size, alloc_size;
- const mz_uint8 *p = mz_zip_reader_get_cdh(pZip, file_index);
+ lgfx_mz_uint64 comp_size, uncomp_size, alloc_size;
+ const lgfx_mz_uint8 *p = lgfx_mz_zip_reader_get_cdh(pZip, file_index);
void *pBuf;
if (pSize)
@@ -3746,15 +3746,15 @@ void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, si
alloc_size = (flags & MZ_ZIP_FLAG_COMPRESSED_DATA) ? comp_size : uncomp_size;
#ifdef _MSC_VER
- if (((0, sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
+ if (((0, sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (alloc_size > 0x7FFFFFFF))
#else
- if (((sizeof(size_t) == sizeof(mz_uint32))) && (alloc_size > 0x7FFFFFFF))
+ if (((sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (alloc_size > 0x7FFFFFFF))
#endif
return NULL;
if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)alloc_size)))
return NULL;
- if (!mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size, flags))
+ if (!lgfx_mz_zip_reader_extract_to_mem(pZip, file_index, pBuf, (size_t)alloc_size, flags))
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
return NULL;
@@ -3764,26 +3764,26 @@ void *mz_zip_reader_extract_to_heap(mz_zip_archive *pZip, mz_uint file_index, si
return pBuf;
}
-void *mz_zip_reader_extract_file_to_heap(mz_zip_archive *pZip, const char *pFilename, size_t *pSize, mz_uint flags)
+void *lgfx_mz_zip_reader_extract_file_to_heap(lgfx_mz_zip_archive *pZip, const char *pFilename, size_t *pSize, lgfx_mz_uint flags)
{
- int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
+ int file_index = lgfx_mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
if (file_index < 0)
{
if (pSize) *pSize = 0;
return MZ_FALSE;
}
- return mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags);
+ return lgfx_mz_zip_reader_extract_to_heap(pZip, file_index, pSize, flags);
}
-mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_index, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_callback(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, lgfx_mz_file_write_func pCallback, void *pOpaque, lgfx_mz_uint flags)
{
- int status = TINFL_STATUS_DONE; mz_uint file_crc32 = MZ_CRC32_INIT;
- mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs;
- mz_zip_archive_file_stat file_stat;
+ int status = TINFL_STATUS_DONE; lgfx_mz_uint file_crc32 = MZ_CRC32_INIT;
+ lgfx_mz_uint64 read_buf_size, read_buf_ofs = 0, read_buf_avail, comp_remaining, out_buf_ofs = 0, cur_file_ofs;
+ lgfx_mz_zip_archive_file_stat file_stat;
void *pRead_buf = NULL; void *pWrite_buf = NULL;
- mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
+ lgfx_mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(lgfx_mz_uint32) - 1) / sizeof(lgfx_mz_uint32)]; lgfx_mz_uint8 *pLocal_header = (lgfx_mz_uint8 *)local_header_u32;
- if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+ if (!lgfx_mz_zip_reader_file_stat(pZip, file_index, &file_stat))
return MZ_FALSE;
// Empty file, or a directory (but not always a directory - I've seen odd zips with directories that have compressed data which inflates to 0 bytes)
@@ -3792,7 +3792,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
// Entry is a subdirectory (I've seen old zips with dir entries which have compressed deflate data which inflates to 0 bytes, but these entries claim to uncompress to 512 bytes in the headers).
// I'm torn how to handle this case - should it fail instead?
- if (mz_zip_reader_is_file_a_directory(pZip, file_index))
+ if (lgfx_mz_zip_reader_is_file_a_directory(pZip, file_index))
return MZ_TRUE;
// Encryption and patch files are not supported.
@@ -3817,7 +3817,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
// Decompress the file either directly from memory or from a file input buffer.
if (pZip->m_pState->m_pMem)
{
- pRead_buf = (mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
+ pRead_buf = (lgfx_mz_uint8 *)pZip->m_pState->m_pMem + cur_file_ofs;
read_buf_size = read_buf_avail = file_stat.m_comp_size;
comp_remaining = 0;
}
@@ -3836,15 +3836,15 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
if (pZip->m_pState->m_pMem)
{
#ifdef _MSC_VER
- if (((0, sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > 0xFFFFFFFF))
+ if (((0, sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (file_stat.m_comp_size > 0xFFFFFFFF))
#else
- if (((sizeof(size_t) == sizeof(mz_uint32))) && (file_stat.m_comp_size > 0xFFFFFFFF))
+ if (((sizeof(size_t) == sizeof(lgfx_mz_uint32))) && (file_stat.m_comp_size > 0xFFFFFFFF))
#endif
return MZ_FALSE;
if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)file_stat.m_comp_size) != file_stat.m_comp_size)
status = TINFL_STATUS_FAILED;
else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
- file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size);
+ file_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(file_crc32, (const lgfx_mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size);
cur_file_ofs += file_stat.m_comp_size;
out_buf_ofs += file_stat.m_comp_size;
comp_remaining = 0;
@@ -3861,7 +3861,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
}
if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
- file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
+ file_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(file_crc32, (const lgfx_mz_uint8 *)pRead_buf, (size_t)read_buf_avail);
if (pCallback(pOpaque, out_buf_ofs, pRead_buf, (size_t)read_buf_avail) != read_buf_avail)
{
@@ -3876,8 +3876,8 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
}
else
{
- tinfl_decompressor inflator;
- tinfl_init(&inflator);
+ lgfx_tinfl_decompressor inflator;
+ lgfx_tinfl_init(&inflator);
if (NULL == (pWrite_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, TINFL_LZ_DICT_SIZE)))
status = TINFL_STATUS_FAILED;
@@ -3885,7 +3885,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
{
do
{
- mz_uint8 *pWrite_buf_cur = (mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
+ lgfx_mz_uint8 *pWrite_buf_cur = (lgfx_mz_uint8 *)pWrite_buf + (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
size_t in_buf_size, out_buf_size = TINFL_LZ_DICT_SIZE - (out_buf_ofs & (TINFL_LZ_DICT_SIZE - 1));
if ((!read_buf_avail) && (!pZip->m_pState->m_pMem))
{
@@ -3901,7 +3901,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
}
in_buf_size = (size_t)read_buf_avail;
- status = tinfl_decompress(&inflator, (const mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
+ status = lgfx_tinfl_decompress(&inflator, (const lgfx_mz_uint8 *)pRead_buf + read_buf_ofs, &in_buf_size, (lgfx_mz_uint8 *)pWrite_buf, pWrite_buf_cur, &out_buf_size, comp_remaining ? TINFL_FLAG_HAS_MORE_INPUT : 0);
read_buf_avail -= in_buf_size;
read_buf_ofs += in_buf_size;
@@ -3912,7 +3912,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
status = TINFL_STATUS_FAILED;
break;
}
- file_crc32 = (mz_uint32)mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
+ file_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(file_crc32, pWrite_buf_cur, out_buf_size);
if ((out_buf_ofs += out_buf_size) > file_stat.m_uncomp_size)
{
status = TINFL_STATUS_FAILED;
@@ -3938,52 +3938,52 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind
return status == TINFL_STATUS_DONE;
}
-mz_bool mz_zip_reader_extract_file_to_callback(mz_zip_archive *pZip, const char *pFilename, mz_file_write_func pCallback, void *pOpaque, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_callback(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_file_write_func pCallback, void *pOpaque, lgfx_mz_uint flags)
{
- int file_index = mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
+ int file_index = lgfx_mz_zip_reader_locate_file(pZip, pFilename, NULL, flags);
if (file_index < 0)
return MZ_FALSE;
- return mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags);
+ return lgfx_mz_zip_reader_extract_to_callback(pZip, file_index, pCallback, pOpaque, flags);
}
#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_write_callback(void *pOpaque, mz_uint64 ofs, const void *pBuf, size_t n)
+static size_t lgfx_mz_zip_file_write_callback(void *pOpaque, lgfx_mz_uint64 ofs, const void *pBuf, size_t n)
{
(void)ofs; return MZ_FWRITE(pBuf, 1, n, (MZ_FILE*)pOpaque);
}
-mz_bool mz_zip_reader_extract_to_file(mz_zip_archive *pZip, mz_uint file_index, const char *pDst_filename, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_to_file(lgfx_mz_zip_archive *pZip, lgfx_mz_uint file_index, const char *pDst_filename, lgfx_mz_uint flags)
{
- mz_bool status;
- mz_zip_archive_file_stat file_stat;
+ lgfx_mz_bool status;
+ lgfx_mz_zip_archive_file_stat file_stat;
MZ_FILE *pFile;
- if (!mz_zip_reader_file_stat(pZip, file_index, &file_stat))
+ if (!lgfx_mz_zip_reader_file_stat(pZip, file_index, &file_stat))
return MZ_FALSE;
pFile = MZ_FOPEN(pDst_filename, "wb");
if (!pFile)
return MZ_FALSE;
- status = mz_zip_reader_extract_to_callback(pZip, file_index, mz_zip_file_write_callback, pFile, flags);
+ status = lgfx_mz_zip_reader_extract_to_callback(pZip, file_index, lgfx_mz_zip_file_write_callback, pFile, flags);
if (MZ_FCLOSE(pFile) == EOF)
return MZ_FALSE;
#ifndef MINIZ_NO_TIME
if (status)
- mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
+ lgfx_mz_zip_set_file_times(pDst_filename, file_stat.m_time, file_stat.m_time);
#endif
return status;
}
#endif // #ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_reader_end(mz_zip_archive *pZip)
+lgfx_mz_bool lgfx_mz_zip_reader_end(lgfx_mz_zip_archive *pZip)
{
if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
return MZ_FALSE;
if (pZip->m_pState)
{
- mz_zip_internal_state *pState = pZip->m_pState; pZip->m_pState = NULL;
- mz_zip_array_clear(pZip, &pState->m_central_dir);
- mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
- mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+ lgfx_mz_zip_internal_state *pState = pZip->m_pState; pZip->m_pState = NULL;
+ lgfx_mz_zip_array_clear(pZip, &pState->m_central_dir);
+ lgfx_mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+ lgfx_mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
#ifndef MINIZ_NO_STDIO
if (pState->m_pFile)
@@ -4001,12 +4001,12 @@ mz_bool mz_zip_reader_end(mz_zip_archive *pZip)
}
#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, mz_uint flags)
+lgfx_mz_bool lgfx_mz_zip_reader_extract_file_to_file(lgfx_mz_zip_archive *pZip, const char *pArchive_filename, const char *pDst_filename, lgfx_mz_uint flags)
{
- int file_index = mz_zip_reader_locate_file(pZip, pArchive_filename, NULL, flags);
+ int file_index = lgfx_mz_zip_reader_locate_file(pZip, pArchive_filename, NULL, flags);
if (file_index < 0)
return MZ_FALSE;
- return mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
+ return lgfx_mz_zip_reader_extract_to_file(pZip, file_index, pDst_filename, flags);
}
#endif
@@ -4014,12 +4014,12 @@ mz_bool mz_zip_reader_extract_file_to_file(mz_zip_archive *pZip, const char *pAr
#ifndef MINIZ_NO_ARCHIVE_WRITING_APIS
-static void mz_write_le16(mz_uint8 *p, mz_uint16 v) { p[0] = (mz_uint8)v; p[1] = (mz_uint8)(v >> 8); }
-static void mz_write_le32(mz_uint8 *p, mz_uint32 v) { p[0] = (mz_uint8)v; p[1] = (mz_uint8)(v >> 8); p[2] = (mz_uint8)(v >> 16); p[3] = (mz_uint8)(v >> 24); }
-#define MZ_WRITE_LE16(p, v) mz_write_le16((mz_uint8 *)(p), (mz_uint16)(v))
-#define MZ_WRITE_LE32(p, v) mz_write_le32((mz_uint8 *)(p), (mz_uint32)(v))
+static void lgfx_mz_write_le16(lgfx_mz_uint8 *p, lgfx_mz_uint16 v) { p[0] = (lgfx_mz_uint8)v; p[1] = (lgfx_mz_uint8)(v >> 8); }
+static void lgfx_mz_write_le32(lgfx_mz_uint8 *p, lgfx_mz_uint32 v) { p[0] = (lgfx_mz_uint8)v; p[1] = (lgfx_mz_uint8)(v >> 8); p[2] = (lgfx_mz_uint8)(v >> 16); p[3] = (lgfx_mz_uint8)(v >> 24); }
+#define MZ_WRITE_LE16(p, v) lgfx_mz_write_le16((lgfx_mz_uint8 *)(p), (lgfx_mz_uint16)(v))
+#define MZ_WRITE_LE32(p, v) lgfx_mz_write_le32((lgfx_mz_uint8 *)(p), (lgfx_mz_uint32)(v))
-mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size)
+lgfx_mz_bool lgfx_mz_zip_writer_init(lgfx_mz_zip_archive *pZip, lgfx_mz_uint64 existing_size)
{
if ((!pZip) || (pZip->m_pState) || (!pZip->m_pWrite) || (pZip->m_zip_mode != MZ_ZIP_MODE_INVALID))
return MZ_FALSE;
@@ -4040,24 +4040,24 @@ mz_bool mz_zip_writer_init(mz_zip_archive *pZip, mz_uint64 existing_size)
pZip->m_central_directory_file_ofs = 0;
pZip->m_total_files = 0;
- if (NULL == (pZip->m_pState = (mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(mz_zip_internal_state))))
+ if (NULL == (pZip->m_pState = (lgfx_mz_zip_internal_state *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(lgfx_mz_zip_internal_state))))
return MZ_FALSE;
- memset(pZip->m_pState, 0, sizeof(mz_zip_internal_state));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(mz_uint8));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(mz_uint32));
- MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(mz_uint32));
+ memset(pZip->m_pState, 0, sizeof(lgfx_mz_zip_internal_state));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir, sizeof(lgfx_mz_uint8));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_central_dir_offsets, sizeof(lgfx_mz_uint32));
+ MZ_ZIP_ARRAY_SET_ELEMENT_SIZE(&pZip->m_pState->m_sorted_central_dir_offsets, sizeof(lgfx_mz_uint32));
return MZ_TRUE;
}
-static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
+static size_t lgfx_mz_zip_heap_write_func(void *pOpaque, lgfx_mz_uint64 file_ofs, const void *pBuf, size_t n)
{
- mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
- mz_zip_internal_state *pState = pZip->m_pState;
- mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
+ lgfx_mz_zip_archive *pZip = (lgfx_mz_zip_archive *)pOpaque;
+ lgfx_mz_zip_internal_state *pState = pZip->m_pState;
+ lgfx_mz_uint64 new_size = MZ_MAX(file_ofs + n, pState->m_mem_size);
#ifdef _MSC_VER
- if ((!n) || ((0, sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)))
+ if ((!n) || ((0, sizeof(size_t) == sizeof(lgfx_mz_uint32)) && (new_size > 0x7FFFFFFF)))
#else
- if ((!n) || ((sizeof(size_t) == sizeof(mz_uint32)) && (new_size > 0x7FFFFFFF)))
+ if ((!n) || ((sizeof(size_t) == sizeof(lgfx_mz_uint32)) && (new_size > 0x7FFFFFFF)))
#endif
return 0;
if (new_size > pState->m_mem_capacity)
@@ -4068,22 +4068,22 @@ static size_t mz_zip_heap_write_func(void *pOpaque, mz_uint64 file_ofs, const vo
return 0;
pState->m_pMem = pNew_block; pState->m_mem_capacity = new_capacity;
}
- memcpy((mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n);
+ memcpy((lgfx_mz_uint8 *)pState->m_pMem + file_ofs, pBuf, n);
pState->m_mem_size = (size_t)new_size;
return n;
}
-mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size)
+lgfx_mz_bool lgfx_mz_zip_writer_init_heap(lgfx_mz_zip_archive *pZip, size_t size_to_reserve_at_beginning, size_t initial_allocation_size)
{
- pZip->m_pWrite = mz_zip_heap_write_func;
+ pZip->m_pWrite = lgfx_mz_zip_heap_write_func;
pZip->m_pIO_opaque = pZip;
- if (!mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
+ if (!lgfx_mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
return MZ_FALSE;
if (0 != (initial_allocation_size = MZ_MAX(initial_allocation_size, size_to_reserve_at_beginning)))
{
if (NULL == (pZip->m_pState->m_pMem = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, initial_allocation_size)))
{
- mz_zip_writer_end(pZip);
+ lgfx_mz_zip_writer_end(pZip);
return MZ_FALSE;
}
pZip->m_pState->m_mem_capacity = initial_allocation_size;
@@ -4092,37 +4092,37 @@ mz_bool mz_zip_writer_init_heap(mz_zip_archive *pZip, size_t size_to_reserve_at_
}
#ifndef MINIZ_NO_STDIO
-static size_t mz_zip_file_write_func(void *pOpaque, mz_uint64 file_ofs, const void *pBuf, size_t n)
+static size_t lgfx_mz_zip_file_write_func(void *pOpaque, lgfx_mz_uint64 file_ofs, const void *pBuf, size_t n)
{
- mz_zip_archive *pZip = (mz_zip_archive *)pOpaque;
- mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
- if (((mz_int64)file_ofs < 0) || (((cur_ofs != (mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (mz_int64)file_ofs, SEEK_SET))))
+ lgfx_mz_zip_archive *pZip = (lgfx_mz_zip_archive *)pOpaque;
+ lgfx_mz_int64 cur_ofs = MZ_FTELL64(pZip->m_pState->m_pFile);
+ if (((lgfx_mz_int64)file_ofs < 0) || (((cur_ofs != (lgfx_mz_int64)file_ofs)) && (MZ_FSEEK64(pZip->m_pState->m_pFile, (lgfx_mz_int64)file_ofs, SEEK_SET))))
return 0;
return MZ_FWRITE(pBuf, 1, n, pZip->m_pState->m_pFile);
}
-mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_uint64 size_to_reserve_at_beginning)
+lgfx_mz_bool lgfx_mz_zip_writer_init_file(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_uint64 size_to_reserve_at_beginning)
{
MZ_FILE *pFile;
- pZip->m_pWrite = mz_zip_file_write_func;
+ pZip->m_pWrite = lgfx_mz_zip_file_write_func;
pZip->m_pIO_opaque = pZip;
- if (!mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
+ if (!lgfx_mz_zip_writer_init(pZip, size_to_reserve_at_beginning))
return MZ_FALSE;
if (NULL == (pFile = MZ_FOPEN(pFilename, "wb")))
{
- mz_zip_writer_end(pZip);
+ lgfx_mz_zip_writer_end(pZip);
return MZ_FALSE;
}
pZip->m_pState->m_pFile = pFile;
if (size_to_reserve_at_beginning)
{
- mz_uint64 cur_ofs = 0; char buf[4096]; MZ_CLEAR_OBJ(buf);
+ lgfx_mz_uint64 cur_ofs = 0; char buf[4096]; MZ_CLEAR_OBJ(buf);
do
{
size_t n = (size_t)MZ_MIN(sizeof(buf), size_to_reserve_at_beginning);
if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_ofs, buf, n) != n)
{
- mz_zip_writer_end(pZip);
+ lgfx_mz_zip_writer_end(pZip);
return MZ_FALSE;
}
cur_ofs += n; size_to_reserve_at_beginning -= n;
@@ -4132,9 +4132,9 @@ mz_bool mz_zip_writer_init_file(mz_zip_archive *pZip, const char *pFilename, mz_
}
#endif // #ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilename)
+lgfx_mz_bool lgfx_mz_zip_writer_init_from_reader(lgfx_mz_zip_archive *pZip, const char *pFilename)
{
- mz_zip_internal_state *pState;
+ lgfx_mz_zip_internal_state *pState;
if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_READING))
return MZ_FALSE;
// No sense in trying to write to an archive that's already at the support max size
@@ -4153,11 +4153,11 @@ mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilena
return MZ_FALSE;
if (!pFilename)
return MZ_FALSE;
- pZip->m_pWrite = mz_zip_file_write_func;
+ pZip->m_pWrite = lgfx_mz_zip_file_write_func;
if (NULL == (pState->m_pFile = MZ_FREOPEN(pFilename, "r+b", pState->m_pFile)))
{
- // The mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it.
- mz_zip_reader_end(pZip);
+ // The lgfx_mz_zip_archive is now in a bogus state because pState->m_pFile is NULL, so just close it.
+ lgfx_mz_zip_reader_end(pZip);
return MZ_FALSE;
}
#endif // #ifdef MINIZ_NO_STDIO
@@ -4168,7 +4168,7 @@ mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilena
if (pZip->m_pIO_opaque != pZip)
return MZ_FALSE;
pState->m_mem_capacity = pState->m_mem_size;
- pZip->m_pWrite = mz_zip_heap_write_func;
+ pZip->m_pWrite = lgfx_mz_zip_heap_write_func;
}
// Archive is being read via a user provided read function - make sure the user has specified a write function too.
else if (!pZip->m_pWrite)
@@ -4182,21 +4182,21 @@ mz_bool mz_zip_writer_init_from_reader(mz_zip_archive *pZip, const char *pFilena
return MZ_TRUE;
}
-mz_bool mz_zip_writer_add_mem(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, mz_uint level_and_flags)
+lgfx_mz_bool lgfx_mz_zip_writer_add_mem(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, lgfx_mz_uint level_and_flags)
{
- return mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0);
+ return lgfx_mz_zip_writer_add_mem_ex(pZip, pArchive_name, pBuf, buf_size, NULL, 0, level_and_flags, 0, 0);
}
typedef struct
{
- mz_zip_archive *m_pZip;
- mz_uint64 m_cur_archive_file_ofs;
- mz_uint64 m_comp_size;
-} mz_zip_writer_add_state;
+ lgfx_mz_zip_archive *m_pZip;
+ lgfx_mz_uint64 m_cur_archive_file_ofs;
+ lgfx_mz_uint64 m_comp_size;
+} lgfx_mz_zip_writer_add_state;
-static mz_bool mz_zip_writer_add_put_buf_callback(const void* pBuf, int len, void *pUser)
+static lgfx_mz_bool lgfx_mz_zip_writer_add_put_buf_callback(const void* pBuf, int len, void *pUser)
{
- mz_zip_writer_add_state *pState = (mz_zip_writer_add_state *)pUser;
+ lgfx_mz_zip_writer_add_state *pState = (lgfx_mz_zip_writer_add_state *)pUser;
if ((int)pState->m_pZip->m_pWrite(pState->m_pZip->m_pIO_opaque, pState->m_cur_archive_file_ofs, pBuf, len) != len)
return MZ_FALSE;
pState->m_cur_archive_file_ofs += len;
@@ -4204,7 +4204,7 @@ static mz_bool mz_zip_writer_add_put_buf_callback(const void* pBuf, int len, voi
return MZ_TRUE;
}
-static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date)
+static lgfx_mz_bool lgfx_mz_zip_writer_create_local_dir_header(lgfx_mz_zip_archive *pZip, lgfx_mz_uint8 *pDst, lgfx_mz_uint16 filename_size, lgfx_mz_uint16 extra_size, lgfx_mz_uint64 uncomp_size, lgfx_mz_uint64 comp_size, lgfx_mz_uint32 uncomp_crc32, lgfx_mz_uint16 method, lgfx_mz_uint16 bit_flags, lgfx_mz_uint16 dos_time, lgfx_mz_uint16 dos_date)
{
(void)pZip;
memset(pDst, 0, MZ_ZIP_LOCAL_DIR_HEADER_SIZE);
@@ -4222,7 +4222,7 @@ static mz_bool mz_zip_writer_create_local_dir_header(mz_zip_archive *pZip, mz_ui
return MZ_TRUE;
}
-static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_uint8 *pDst, mz_uint16 filename_size, mz_uint16 extra_size, mz_uint16 comment_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date, mz_uint64 local_header_ofs, mz_uint32 ext_attributes)
+static lgfx_mz_bool lgfx_mz_zip_writer_create_central_dir_header(lgfx_mz_zip_archive *pZip, lgfx_mz_uint8 *pDst, lgfx_mz_uint16 filename_size, lgfx_mz_uint16 extra_size, lgfx_mz_uint16 comment_size, lgfx_mz_uint64 uncomp_size, lgfx_mz_uint64 comp_size, lgfx_mz_uint32 uncomp_crc32, lgfx_mz_uint16 method, lgfx_mz_uint16 bit_flags, lgfx_mz_uint16 dos_time, lgfx_mz_uint16 dos_date, lgfx_mz_uint64 local_header_ofs, lgfx_mz_uint32 ext_attributes)
{
(void)pZip;
memset(pDst, 0, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
@@ -4243,35 +4243,35 @@ static mz_bool mz_zip_writer_create_central_dir_header(mz_zip_archive *pZip, mz_
return MZ_TRUE;
}
-static mz_bool mz_zip_writer_add_to_central_dir(mz_zip_archive *pZip, const char *pFilename, mz_uint16 filename_size, const void *pExtra, mz_uint16 extra_size, const void *pComment, mz_uint16 comment_size, mz_uint64 uncomp_size, mz_uint64 comp_size, mz_uint32 uncomp_crc32, mz_uint16 method, mz_uint16 bit_flags, mz_uint16 dos_time, mz_uint16 dos_date, mz_uint64 local_header_ofs, mz_uint32 ext_attributes)
+static lgfx_mz_bool lgfx_mz_zip_writer_add_to_central_dir(lgfx_mz_zip_archive *pZip, const char *pFilename, lgfx_mz_uint16 filename_size, const void *pExtra, lgfx_mz_uint16 extra_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint64 uncomp_size, lgfx_mz_uint64 comp_size, lgfx_mz_uint32 uncomp_crc32, lgfx_mz_uint16 method, lgfx_mz_uint16 bit_flags, lgfx_mz_uint16 dos_time, lgfx_mz_uint16 dos_date, lgfx_mz_uint64 local_header_ofs, lgfx_mz_uint32 ext_attributes)
{
- mz_zip_internal_state *pState = pZip->m_pState;
- mz_uint32 central_dir_ofs = (mz_uint32)pState->m_central_dir.m_size;
+ lgfx_mz_zip_internal_state *pState = pZip->m_pState;
+ lgfx_mz_uint32 central_dir_ofs = (lgfx_mz_uint32)pState->m_central_dir.m_size;
size_t orig_central_dir_size = pState->m_central_dir.m_size;
- mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
+ lgfx_mz_uint8 central_dir_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
// No zip64 support yet
- if ((local_header_ofs > 0xFFFFFFFF) || (((mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + comment_size) > 0xFFFFFFFF))
+ if ((local_header_ofs > 0xFFFFFFFF) || (((lgfx_mz_uint64)pState->m_central_dir.m_size + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + filename_size + extra_size + comment_size) > 0xFFFFFFFF))
return MZ_FALSE;
- if (!mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, extra_size, comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes))
+ if (!lgfx_mz_zip_writer_create_central_dir_header(pZip, central_dir_header, filename_size, extra_size, comment_size, uncomp_size, comp_size, uncomp_crc32, method, bit_flags, dos_time, dos_date, local_header_ofs, ext_attributes))
return MZ_FALSE;
- if ((!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
- (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) ||
- (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) ||
- (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) ||
- (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, ¢ral_dir_ofs, 1)))
+ if ((!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, central_dir_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE)) ||
+ (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, pFilename, filename_size)) ||
+ (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, pExtra, extra_size)) ||
+ (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, pComment, comment_size)) ||
+ (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, ¢ral_dir_ofs, 1)))
{
// Try to push the central directory array back into its original state.
- mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+ lgfx_mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
return MZ_FALSE;
}
return MZ_TRUE;
}
-static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name)
+static lgfx_mz_bool lgfx_mz_zip_writer_validate_archive_name(const char *pArchive_name)
{
// Basic ZIP archive filename validity checks: Valid filenames cannot start with a forward slash, cannot contain a drive letter, and cannot use DOS-style backward slashes.
if (*pArchive_name == '/')
@@ -4285,22 +4285,22 @@ static mz_bool mz_zip_writer_validate_archive_name(const char *pArchive_name)
return MZ_TRUE;
}
-static mz_uint mz_zip_writer_compute_padding_needed_for_file_alignment(mz_zip_archive *pZip)
+static lgfx_mz_uint lgfx_mz_zip_writer_compute_padding_needed_for_file_alignment(lgfx_mz_zip_archive *pZip)
{
- mz_uint32 n;
+ lgfx_mz_uint32 n;
if (!pZip->m_file_offset_alignment)
return 0;
- n = (mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1));
+ n = (lgfx_mz_uint32)(pZip->m_archive_size & (pZip->m_file_offset_alignment - 1));
return (pZip->m_file_offset_alignment - n) & (pZip->m_file_offset_alignment - 1);
}
-static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_file_ofs, mz_uint32 n)
+static lgfx_mz_bool lgfx_mz_zip_writer_write_zeros(lgfx_mz_zip_archive *pZip, lgfx_mz_uint64 cur_file_ofs, lgfx_mz_uint32 n)
{
char buf[4096];
memset(buf, 0, MZ_MIN(sizeof(buf), n));
while (n)
{
- mz_uint32 s = MZ_MIN(sizeof(buf), n);
+ lgfx_mz_uint32 s = MZ_MIN(sizeof(buf), n);
if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_file_ofs, buf, s) != s)
return MZ_FALSE;
cur_file_ofs += s; n -= s;
@@ -4308,16 +4308,16 @@ static mz_bool mz_zip_writer_write_zeros(mz_zip_archive *pZip, mz_uint64 cur_fil
return MZ_TRUE;
}
-mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags, mz_uint64 uncomp_size, mz_uint32 uncomp_crc32)
+lgfx_mz_bool lgfx_mz_zip_writer_add_mem_ex(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags, lgfx_mz_uint64 uncomp_size, lgfx_mz_uint32 uncomp_crc32)
{
- mz_uint16 method = 0, dos_time = 0, dos_date = 0;
- mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
- mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
+ lgfx_mz_uint16 method = 0, dos_time = 0, dos_date = 0;
+ lgfx_mz_uint level, ext_attributes = 0, num_alignment_padding_bytes;
+ lgfx_mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, comp_size = 0;
size_t archive_name_size;
- mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
+ lgfx_mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
tdefl_compressor *pComp = NULL;
- mz_bool store_data_uncompressed;
- mz_zip_internal_state *pState;
+ lgfx_mz_bool store_data_uncompressed;
+ lgfx_mz_zip_internal_state *pState;
if ((int)level_and_flags < 0)
level_and_flags = MZ_DEFAULT_LEVEL;
@@ -4334,13 +4334,13 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
// No zip64 support yet
if ((buf_size > 0xFFFFFFFF) || (uncomp_size > 0xFFFFFFFF))
return MZ_FALSE;
- if (!mz_zip_writer_validate_archive_name(pArchive_name))
+ if (!lgfx_mz_zip_writer_validate_archive_name(pArchive_name))
return MZ_FALSE;
#ifndef MINIZ_NO_TIME
{
time_t cur_time; time(&cur_time);
- mz_zip_time_to_dos_time(cur_time, &dos_time, &dos_date);
+ lgfx_mz_zip_time_to_dos_time(cur_time, &dos_time, &dos_date);
}
#endif // #ifndef MINIZ_NO_TIME
@@ -4348,7 +4348,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
if (archive_name_size > 0xFFFF)
return MZ_FALSE;
- num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+ num_alignment_padding_bytes = lgfx_mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
// no zip64 support yet
if ((pZip->m_total_files == 0xFFFF) || ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + comment_size + archive_name_size) > 0xFFFFFFFF))
@@ -4364,7 +4364,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
}
// Try to do any allocations before writing to the archive, so if an allocation fails the file remains unmodified. (A good idea if we're doing an in-place modification.)
- if ((!mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size)) || (!mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
+ if ((!lgfx_mz_zip_array_ensure_room(pZip, &pState->m_central_dir, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + archive_name_size + comment_size)) || (!lgfx_mz_zip_array_ensure_room(pZip, &pState->m_central_dir_offsets, 1)))
return MZ_FALSE;
if ((!store_data_uncompressed) && (buf_size))
@@ -4373,7 +4373,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
return MZ_FALSE;
}
- if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes + sizeof(local_dir_header)))
+ if (!lgfx_mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes + sizeof(local_dir_header)))
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
return MZ_FALSE;
@@ -4392,7 +4392,7 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
if (!(level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
{
- uncomp_crc32 = (mz_uint32)mz_crc32(MZ_CRC32_INIT, (const mz_uint8*)pBuf, buf_size);
+ uncomp_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(MZ_CRC32_INIT, (const lgfx_mz_uint8*)pBuf, buf_size);
uncomp_size = buf_size;
if (uncomp_size <= 3)
{
@@ -4417,13 +4417,13 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
}
else if (buf_size)
{
- mz_zip_writer_add_state state;
+ lgfx_mz_zip_writer_add_state state;
state.m_pZip = pZip;
state.m_cur_archive_file_ofs = cur_archive_file_ofs;
state.m_comp_size = 0;
- if ((tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) ||
+ if ((tdefl_init(pComp, lgfx_mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY) ||
(tdefl_compress_buffer(pComp, pBuf, buf_size, TDEFL_FINISH) != TDEFL_STATUS_DONE))
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
@@ -4443,13 +4443,13 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
if ((comp_size > 0xFFFFFFFF) || (cur_archive_file_ofs > 0xFFFFFFFF))
return MZ_FALSE;
- if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, 0, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
+ if (!lgfx_mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (lgfx_mz_uint16)archive_name_size, 0, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
return MZ_FALSE;
if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
return MZ_FALSE;
- if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, NULL, 0, pComment, comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date, local_dir_header_ofs, ext_attributes))
+ if (!lgfx_mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (lgfx_mz_uint16)archive_name_size, NULL, 0, pComment, comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date, local_dir_header_ofs, ext_attributes))
return MZ_FALSE;
pZip->m_total_files++;
@@ -4459,13 +4459,13 @@ mz_bool mz_zip_writer_add_mem_ex(mz_zip_archive *pZip, const char *pArchive_name
}
#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
+lgfx_mz_bool lgfx_mz_zip_writer_add_file(lgfx_mz_zip_archive *pZip, const char *pArchive_name, const char *pSrc_filename, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags)
{
- mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
- mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
- mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = 0, comp_size = 0;
+ lgfx_mz_uint uncomp_crc32 = MZ_CRC32_INIT, level, num_alignment_padding_bytes;
+ lgfx_mz_uint16 method = 0, dos_time = 0, dos_date = 0, ext_attributes = 0;
+ lgfx_mz_uint64 local_dir_header_ofs = pZip->m_archive_size, cur_archive_file_ofs = pZip->m_archive_size, uncomp_size = 0, comp_size = 0;
size_t archive_name_size;
- mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
+ lgfx_mz_uint8 local_dir_header[MZ_ZIP_LOCAL_DIR_HEADER_SIZE];
MZ_FILE *pSrc_file = NULL;
if ((int)level_and_flags < 0)
@@ -4476,20 +4476,20 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
return MZ_FALSE;
if (level_and_flags & MZ_ZIP_FLAG_COMPRESSED_DATA)
return MZ_FALSE;
- if (!mz_zip_writer_validate_archive_name(pArchive_name))
+ if (!lgfx_mz_zip_writer_validate_archive_name(pArchive_name))
return MZ_FALSE;
archive_name_size = strlen(pArchive_name);
if (archive_name_size > 0xFFFF)
return MZ_FALSE;
- num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+ num_alignment_padding_bytes = lgfx_mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
// no zip64 support yet
if ((pZip->m_total_files == 0xFFFF) || ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE + comment_size + archive_name_size) > 0xFFFFFFFF))
return MZ_FALSE;
- if (!mz_zip_get_file_modified_time(pSrc_filename, &dos_time, &dos_date))
+ if (!lgfx_mz_zip_get_file_modified_time(pSrc_filename, &dos_time, &dos_date))
return MZ_FALSE;
pSrc_file = MZ_FOPEN(pSrc_filename, "rb");
@@ -4508,7 +4508,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
if (uncomp_size <= 3)
level = 0;
- if (!mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes + sizeof(local_dir_header)))
+ if (!lgfx_mz_zip_writer_write_zeros(pZip, cur_archive_file_ofs, num_alignment_padding_bytes + sizeof(local_dir_header)))
{
MZ_FCLOSE(pSrc_file);
return MZ_FALSE;
@@ -4527,7 +4527,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
if (uncomp_size)
{
- mz_uint64 uncomp_remaining = uncomp_size;
+ lgfx_mz_uint64 uncomp_remaining = uncomp_size;
void *pRead_buf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, MZ_ZIP_MAX_IO_BUF_SIZE);
if (!pRead_buf)
{
@@ -4539,14 +4539,14 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
{
while (uncomp_remaining)
{
- mz_uint n = (mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, uncomp_remaining);
+ lgfx_mz_uint n = (lgfx_mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, uncomp_remaining);
if ((MZ_FREAD(pRead_buf, 1, n, pSrc_file) != n) || (pZip->m_pWrite(pZip->m_pIO_opaque, cur_archive_file_ofs, pRead_buf, n) != n))
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
MZ_FCLOSE(pSrc_file);
return MZ_FALSE;
}
- uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, n);
+ uncomp_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(uncomp_crc32, (const lgfx_mz_uint8 *)pRead_buf, n);
uncomp_remaining -= n;
cur_archive_file_ofs += n;
}
@@ -4554,8 +4554,8 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
}
else
{
- mz_bool result = MZ_FALSE;
- mz_zip_writer_add_state state;
+ lgfx_mz_bool result = MZ_FALSE;
+ lgfx_mz_zip_writer_add_state state;
tdefl_compressor *pComp = (tdefl_compressor *)pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, sizeof(tdefl_compressor));
if (!pComp)
{
@@ -4568,7 +4568,7 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
state.m_cur_archive_file_ofs = cur_archive_file_ofs;
state.m_comp_size = 0;
- if (tdefl_init(pComp, mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY)
+ if (tdefl_init(pComp, lgfx_mz_zip_writer_add_put_buf_callback, &state, tdefl_create_comp_flags_from_zip_params(level, -15, MZ_DEFAULT_STRATEGY)) != TDEFL_STATUS_OKAY)
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pComp);
pZip->m_pFree(pZip->m_pAlloc_opaque, pRead_buf);
@@ -4578,13 +4578,13 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
for ( ; ; )
{
- size_t in_buf_size = (mz_uint32)MZ_MIN(uncomp_remaining, MZ_ZIP_MAX_IO_BUF_SIZE);
+ size_t in_buf_size = (lgfx_mz_uint32)MZ_MIN(uncomp_remaining, MZ_ZIP_MAX_IO_BUF_SIZE);
tdefl_status status;
if (MZ_FREAD(pRead_buf, 1, in_buf_size, pSrc_file) != in_buf_size)
break;
- uncomp_crc32 = (mz_uint32)mz_crc32(uncomp_crc32, (const mz_uint8 *)pRead_buf, in_buf_size);
+ uncomp_crc32 = (lgfx_mz_uint32)lgfx_mz_crc32(uncomp_crc32, (const lgfx_mz_uint8 *)pRead_buf, in_buf_size);
uncomp_remaining -= in_buf_size;
status = tdefl_compress_buffer(pComp, pRead_buf, in_buf_size, uncomp_remaining ? TDEFL_NO_FLUSH : TDEFL_FINISH);
@@ -4621,13 +4621,13 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
if ((comp_size > 0xFFFFFFFF) || (cur_archive_file_ofs > 0xFFFFFFFF))
return MZ_FALSE;
- if (!mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (mz_uint16)archive_name_size, 0, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
+ if (!lgfx_mz_zip_writer_create_local_dir_header(pZip, local_dir_header, (lgfx_mz_uint16)archive_name_size, 0, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date))
return MZ_FALSE;
if (pZip->m_pWrite(pZip->m_pIO_opaque, local_dir_header_ofs, local_dir_header, sizeof(local_dir_header)) != sizeof(local_dir_header))
return MZ_FALSE;
- if (!mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (mz_uint16)archive_name_size, NULL, 0, pComment, comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date, local_dir_header_ofs, ext_attributes))
+ if (!lgfx_mz_zip_writer_add_to_central_dir(pZip, pArchive_name, (lgfx_mz_uint16)archive_name_size, NULL, 0, pComment, comment_size, uncomp_size, comp_size, uncomp_crc32, method, 0, dos_time, dos_date, local_dir_header_ofs, ext_attributes))
return MZ_FALSE;
pZip->m_total_files++;
@@ -4637,24 +4637,24 @@ mz_bool mz_zip_writer_add_file(mz_zip_archive *pZip, const char *pArchive_name,
}
#endif // #ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *pSource_zip, mz_uint file_index)
+lgfx_mz_bool lgfx_mz_zip_writer_add_from_zip_reader(lgfx_mz_zip_archive *pZip, lgfx_mz_zip_archive *pSource_zip, lgfx_mz_uint file_index)
{
- mz_uint n, bit_flags, num_alignment_padding_bytes;
- mz_uint64 comp_bytes_remaining, local_dir_header_ofs;
- mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
- mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(mz_uint32) - 1) / sizeof(mz_uint32)]; mz_uint8 *pLocal_header = (mz_uint8 *)local_header_u32;
- mz_uint8 central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
+ lgfx_mz_uint n, bit_flags, num_alignment_padding_bytes;
+ lgfx_mz_uint64 comp_bytes_remaining, local_dir_header_ofs;
+ lgfx_mz_uint64 cur_src_file_ofs, cur_dst_file_ofs;
+ lgfx_mz_uint32 local_header_u32[(MZ_ZIP_LOCAL_DIR_HEADER_SIZE + sizeof(lgfx_mz_uint32) - 1) / sizeof(lgfx_mz_uint32)]; lgfx_mz_uint8 *pLocal_header = (lgfx_mz_uint8 *)local_header_u32;
+ lgfx_mz_uint8 central_header[MZ_ZIP_CENTRAL_DIR_HEADER_SIZE];
size_t orig_central_dir_size;
- mz_zip_internal_state *pState;
- void *pBuf; const mz_uint8 *pSrc_central_header;
+ lgfx_mz_zip_internal_state *pState;
+ void *pBuf; const lgfx_mz_uint8 *pSrc_central_header;
if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
return MZ_FALSE;
- if (NULL == (pSrc_central_header = mz_zip_reader_get_cdh(pSource_zip, file_index)))
+ if (NULL == (pSrc_central_header = lgfx_mz_zip_reader_get_cdh(pSource_zip, file_index)))
return MZ_FALSE;
pState = pZip->m_pState;
- num_alignment_padding_bytes = mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
+ num_alignment_padding_bytes = lgfx_mz_zip_writer_compute_padding_needed_for_file_alignment(pZip);
// no zip64 support yet
if ((pZip->m_total_files == 0xFFFF) || ((pZip->m_archive_size + num_alignment_padding_bytes + MZ_ZIP_LOCAL_DIR_HEADER_SIZE + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE) > 0xFFFFFFFF))
@@ -4669,7 +4669,7 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
return MZ_FALSE;
cur_src_file_ofs += MZ_ZIP_LOCAL_DIR_HEADER_SIZE;
- if (!mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes))
+ if (!lgfx_mz_zip_writer_write_zeros(pZip, cur_dst_file_ofs, num_alignment_padding_bytes))
return MZ_FALSE;
cur_dst_file_ofs += num_alignment_padding_bytes;
local_dir_header_ofs = cur_dst_file_ofs;
@@ -4682,12 +4682,12 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
n = MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pLocal_header + MZ_ZIP_LDH_EXTRA_LEN_OFS);
comp_bytes_remaining = n + MZ_READ_LE32(pSrc_central_header + MZ_ZIP_CDH_COMPRESSED_SIZE_OFS);
- if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(sizeof(mz_uint32) * 4, MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, comp_bytes_remaining)))))
+ if (NULL == (pBuf = pZip->m_pAlloc(pZip->m_pAlloc_opaque, 1, (size_t)MZ_MAX(sizeof(lgfx_mz_uint32) * 4, MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, comp_bytes_remaining)))))
return MZ_FALSE;
while (comp_bytes_remaining)
{
- n = (mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, comp_bytes_remaining);
+ n = (lgfx_mz_uint)MZ_MIN(MZ_ZIP_MAX_IO_BUF_SIZE, comp_bytes_remaining);
if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, n) != n)
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
@@ -4709,13 +4709,13 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
if (bit_flags & 8)
{
// Copy data descriptor
- if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(mz_uint32) * 4) != sizeof(mz_uint32) * 4)
+ if (pSource_zip->m_pRead(pSource_zip->m_pIO_opaque, cur_src_file_ofs, pBuf, sizeof(lgfx_mz_uint32) * 4) != sizeof(lgfx_mz_uint32) * 4)
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
return MZ_FALSE;
}
- n = sizeof(mz_uint32) * ((MZ_READ_LE32(pBuf) == 0x08074b50) ? 4 : 3);
+ n = sizeof(lgfx_mz_uint32) * ((MZ_READ_LE32(pBuf) == 0x08074b50) ? 4 : 3);
if (pZip->m_pWrite(pZip->m_pIO_opaque, cur_dst_file_ofs, pBuf, n) != n)
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
@@ -4735,22 +4735,22 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
memcpy(central_header, pSrc_central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE);
MZ_WRITE_LE32(central_header + MZ_ZIP_CDH_LOCAL_HEADER_OFS, local_dir_header_ofs);
- if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
+ if (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, central_header, MZ_ZIP_CENTRAL_DIR_HEADER_SIZE))
return MZ_FALSE;
n = MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_FILENAME_LEN_OFS) + MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_EXTRA_LEN_OFS) + MZ_READ_LE16(pSrc_central_header + MZ_ZIP_CDH_COMMENT_LEN_OFS);
- if (!mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n))
+ if (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir, pSrc_central_header + MZ_ZIP_CENTRAL_DIR_HEADER_SIZE, n))
{
- mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+ lgfx_mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
return MZ_FALSE;
}
if (pState->m_central_dir.m_size > 0xFFFFFFFF)
return MZ_FALSE;
- n = (mz_uint32)orig_central_dir_size;
- if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1))
+ n = (lgfx_mz_uint32)orig_central_dir_size;
+ if (!lgfx_mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1))
{
- mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
+ lgfx_mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE);
return MZ_FALSE;
}
@@ -4760,11 +4760,11 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
return MZ_TRUE;
}
-mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip)
+lgfx_mz_bool lgfx_mz_zip_writer_finalize_archive(lgfx_mz_zip_archive *pZip)
{
- mz_zip_internal_state *pState;
- mz_uint64 central_dir_ofs, central_dir_size;
- mz_uint8 hdr[MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE];
+ lgfx_mz_zip_internal_state *pState;
+ lgfx_mz_uint64 central_dir_ofs, central_dir_size;
+ lgfx_mz_uint8 hdr[MZ_ZIP_END_OF_CENTRAL_DIR_HEADER_SIZE];
if ((!pZip) || (!pZip->m_pState) || (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING))
return MZ_FALSE;
@@ -4809,13 +4809,13 @@ mz_bool mz_zip_writer_finalize_archive(mz_zip_archive *pZip)
return MZ_TRUE;
}
-mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf, size_t *pSize)
+lgfx_mz_bool lgfx_mz_zip_writer_finalize_heap_archive(lgfx_mz_zip_archive *pZip, void **pBuf, size_t *pSize)
{
if ((!pZip) || (!pZip->m_pState) || (!pBuf) || (!pSize))
return MZ_FALSE;
- if (pZip->m_pWrite != mz_zip_heap_write_func)
+ if (pZip->m_pWrite != lgfx_mz_zip_heap_write_func)
return MZ_FALSE;
- if (!mz_zip_writer_finalize_archive(pZip))
+ if (!lgfx_mz_zip_writer_finalize_archive(pZip))
return MZ_FALSE;
*pBuf = pZip->m_pState->m_pMem;
@@ -4825,18 +4825,18 @@ mz_bool mz_zip_writer_finalize_heap_archive(mz_zip_archive *pZip, void **pBuf, s
return MZ_TRUE;
}
-mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
+lgfx_mz_bool lgfx_mz_zip_writer_end(lgfx_mz_zip_archive *pZip)
{
- mz_zip_internal_state *pState;
- mz_bool status = MZ_TRUE;
+ lgfx_mz_zip_internal_state *pState;
+ lgfx_mz_bool status = MZ_TRUE;
if ((!pZip) || (!pZip->m_pState) || (!pZip->m_pAlloc) || (!pZip->m_pFree) || ((pZip->m_zip_mode != MZ_ZIP_MODE_WRITING) && (pZip->m_zip_mode != MZ_ZIP_MODE_WRITING_HAS_BEEN_FINALIZED)))
return MZ_FALSE;
pState = pZip->m_pState;
pZip->m_pState = NULL;
- mz_zip_array_clear(pZip, &pState->m_central_dir);
- mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
- mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
+ lgfx_mz_zip_array_clear(pZip, &pState->m_central_dir);
+ lgfx_mz_zip_array_clear(pZip, &pState->m_central_dir_offsets);
+ lgfx_mz_zip_array_clear(pZip, &pState->m_sorted_central_dir_offsets);
#ifndef MINIZ_NO_STDIO
if (pState->m_pFile)
@@ -4846,7 +4846,7 @@ mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
}
#endif // #ifndef MINIZ_NO_STDIO
- if ((pZip->m_pWrite == mz_zip_heap_write_func) && (pState->m_pMem))
+ if ((pZip->m_pWrite == lgfx_mz_zip_heap_write_func) && (pState->m_pMem))
{
pZip->m_pFree(pZip->m_pAlloc_opaque, pState->m_pMem);
pState->m_pMem = NULL;
@@ -4858,41 +4858,41 @@ mz_bool mz_zip_writer_end(mz_zip_archive *pZip)
}
#ifndef MINIZ_NO_STDIO
-mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, mz_uint16 comment_size, mz_uint level_and_flags)
+lgfx_mz_bool lgfx_mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const char *pArchive_name, const void *pBuf, size_t buf_size, const void *pComment, lgfx_mz_uint16 comment_size, lgfx_mz_uint level_and_flags)
{
- mz_bool status, created_new_archive = MZ_FALSE;
- mz_zip_archive zip_archive;
+ lgfx_mz_bool status, created_new_archive = MZ_FALSE;
+ lgfx_mz_zip_archive zip_archive;
struct MZ_FILE_STAT_STRUCT file_stat;
MZ_CLEAR_OBJ(zip_archive);
if ((int)level_and_flags < 0)
level_and_flags = MZ_DEFAULT_LEVEL;
if ((!pZip_filename) || (!pArchive_name) || ((buf_size) && (!pBuf)) || ((comment_size) && (!pComment)) || ((level_and_flags & 0xF) > MZ_UBER_COMPRESSION))
return MZ_FALSE;
- if (!mz_zip_writer_validate_archive_name(pArchive_name))
+ if (!lgfx_mz_zip_writer_validate_archive_name(pArchive_name))
return MZ_FALSE;
if (MZ_FILE_STAT(pZip_filename, &file_stat) != 0)
{
// Create a new archive.
- if (!mz_zip_writer_init_file(&zip_archive, pZip_filename, 0))
+ if (!lgfx_mz_zip_writer_init_file(&zip_archive, pZip_filename, 0))
return MZ_FALSE;
created_new_archive = MZ_TRUE;
}
else
{
// Append to an existing archive.
- if (!mz_zip_reader_init_file(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
+ if (!lgfx_mz_zip_reader_init_file(&zip_archive, pZip_filename, level_and_flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
return MZ_FALSE;
- if (!mz_zip_writer_init_from_reader(&zip_archive, pZip_filename))
+ if (!lgfx_mz_zip_writer_init_from_reader(&zip_archive, pZip_filename))
{
- mz_zip_reader_end(&zip_archive);
+ lgfx_mz_zip_reader_end(&zip_archive);
return MZ_FALSE;
}
}
- status = mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0);
+ status = lgfx_mz_zip_writer_add_mem_ex(&zip_archive, pArchive_name, pBuf, buf_size, pComment, comment_size, level_and_flags, 0, 0);
// Always finalize, even if adding failed for some reason, so we have a valid central directory. (This may not always succeed, but we can try.)
- if (!mz_zip_writer_finalize_archive(&zip_archive))
+ if (!lgfx_mz_zip_writer_finalize_archive(&zip_archive))
status = MZ_FALSE;
- if (!mz_zip_writer_end(&zip_archive))
+ if (!lgfx_mz_zip_writer_end(&zip_archive))
status = MZ_FALSE;
if ((!status) && (created_new_archive))
{
@@ -4903,10 +4903,10 @@ mz_bool mz_zip_add_mem_to_archive_file_in_place(const char *pZip_filename, const
return status;
}
-void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, mz_uint flags)
+void *lgfx_mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char *pArchive_name, size_t *pSize, lgfx_mz_uint flags)
{
int file_index;
- mz_zip_archive zip_archive;
+ lgfx_mz_zip_archive zip_archive;
void *p = NULL;
if (pSize)
@@ -4916,13 +4916,13 @@ void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char
return NULL;
MZ_CLEAR_OBJ(zip_archive);
- if (!mz_zip_reader_init_file(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
+ if (!lgfx_mz_zip_reader_init_file(&zip_archive, pZip_filename, flags | MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY))
return NULL;
- if ((file_index = mz_zip_reader_locate_file(&zip_archive, pArchive_name, NULL, flags)) >= 0)
- p = mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
+ if ((file_index = lgfx_mz_zip_reader_locate_file(&zip_archive, pArchive_name, NULL, flags)) >= 0)
+ p = lgfx_mz_zip_reader_extract_to_heap(&zip_archive, file_index, pSize, flags);
- mz_zip_reader_end(&zip_archive);
+ lgfx_mz_zip_reader_end(&zip_archive);
return p;
}
@@ -4936,7 +4936,7 @@ void *mz_zip_extract_archive_file_to_heap(const char *pZip_filename, const char
}
#endif
-#endif // MINIZ_HEADER_FILE_ONLY
+#endif // LGFX_MINIZ_HEADER_FILE_ONLY
/*
This is free and unencumbered software released into the public domain.
diff --git a/src/lgfx/utility/lgfx_miniz.h b/src/lgfx/utility/lgfx_miniz.h
new file mode 100644
index 00000000..3e007aa9
--- /dev/null
+++ b/src/lgfx/utility/lgfx_miniz.h
@@ -0,0 +1,2 @@
+#define LGFX_MINIZ_HEADER_FILE_ONLY
+#include "lgfx_miniz.c"
diff --git a/src/lgfx/utility/lgfx_pngle.c b/src/lgfx/utility/lgfx_pngle.c
index dbf9b1a4..ff06f21c 100644
--- a/src/lgfx/utility/lgfx_pngle.c
+++ b/src/lgfx/utility/lgfx_pngle.c
@@ -36,7 +36,7 @@
#include
#include
-#include "miniz.h"
+#include "lgfx_miniz.h"
#include "lgfx_pngle.h"
#include "pgmspace.h"
@@ -109,7 +109,7 @@ struct _pngle_t {
size_t avail_out;
uint32_t out_buf[LGFX_PNGLE_OUTBUF_LEN >> 2]; // out_buf + read_buf (Do not change the order)
uint8_t read_buf[LGFX_PNGLE_READBUF_LEN];
- tinfl_decompressor inflator; // 11000 bytes
+ lgfx_tinfl_decompressor inflator; // 11000 bytes
uint8_t lz_buf[TINFL_LZ_DICT_SIZE]; // 32768 bytes
};
@@ -405,7 +405,7 @@ int lgfx_pngle_prepare(pngle_t *pngle, lgfx_pngle_read_callback_t read_cb, void*
pngle->avail_out = TINFL_LZ_DICT_SIZE;
pngle->filter_type = ~0;
pngle->trans_color = LGFX_PNGLE_NON_TRANS_COLOR;
- tinfl_init(&pngle->inflator);
+ lgfx_tinfl_init(&pngle->inflator);
if (pngle->read_callback(user_data, pngle->read_buf, 29) != 29
|| memcmp_P(pngle->read_buf, png_header, sizeof(png_header))) return PNGLE_ERROR("Incorrect PNG signature");
@@ -520,19 +520,19 @@ int lgfx_pngle_decomp(pngle_t *pngle, lgfx_pngle_draw_callback_t draw_cb)
size_t in_bytes = len;
size_t out_bytes = pngle->avail_out;
- // XXX: tinfl_decompress always requires (next_out - lz_buf + avail_out) == TINFL_LZ_DICT_SIZE
- tinfl_status status = tinfl_decompress(&pngle->inflator, (const mz_uint8*)&read_buf[in_pos], &in_bytes, pngle->lz_buf, (mz_uint8*)pngle->next_out, &out_bytes, TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_PARSE_ZLIB_HEADER);
+ // XXX: lgfx_tinfl_decompress always requires (next_out - lz_buf + avail_out) == TINFL_LZ_DICT_SIZE
+ lgfx_tinfl_status status = lgfx_tinfl_decompress(&pngle->inflator, (const lgfx_mz_uint8*)&read_buf[in_pos], &in_bytes, pngle->lz_buf, (lgfx_mz_uint8*)pngle->next_out, &out_bytes, TINFL_FLAG_HAS_MORE_INPUT | TINFL_FLAG_PARSE_ZLIB_HEADER);
if (status < TINFL_STATUS_DONE)
{
// Decompression failed.
- debug_printf("[pngle] tinfl_decompress() failed with status %d!\n", status);
+ debug_printf("[pngle] lgfx_tinfl_decompress() failed with status %d!\n", status);
return PNGLE_ERROR("Failed to decompress the IDAT stream");
}
len -= in_bytes;
in_pos += in_bytes;
- //debug_printf("[pngle] tinfl_decompress\n");
+ //debug_printf("[pngle] lgfx_tinfl_decompress\n");
//debug_printf("[pngle] => in_bytes %zd, out_bytes %zd, next_out %p, status %d\n", in_bytes, out_bytes, pngle->next_out, status);
if (out_bytes)
diff --git a/src/lgfx/utility/lgfx_qrcode.c b/src/lgfx/utility/lgfx_qrcode.c
index f59ff3da..64aa7776 100644
--- a/src/lgfx/utility/lgfx_qrcode.c
+++ b/src/lgfx/utility/lgfx_qrcode.c
@@ -40,12 +40,7 @@
#include
#include
-#if __has_include()
-#include
-#elif !defined(alloca)
-#include
-#define alloca _alloca
-#endif
+#include "../internal/alloca.h"
#ifdef max
#undef max
diff --git a/src/lgfx/utility/miniz.h b/src/lgfx/utility/miniz.h
deleted file mode 100644
index 971d34e8..00000000
--- a/src/lgfx/utility/miniz.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define MINIZ_HEADER_FILE_ONLY
-#include "miniz.c"
diff --git a/src/lgfx/v0/LGFXBase.cpp b/src/lgfx/v0/LGFXBase.cpp
deleted file mode 100644
index 7f4878ab..00000000
--- a/src/lgfx/v0/LGFXBase.cpp
+++ /dev/null
@@ -1,2814 +0,0 @@
-/*----------------------------------------------------------------------------/
- Lovyan GFX library - LCD graphics library .
-
- support platform:
- ESP32 (SPI/I2S) with Arduino/ESP-IDF
- ATSAMD51 (SPI) with Arduino
-
-Original Source:
- https://github.com/lovyan03/LovyanGFX/
-
-Licence:
- [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
-
-Author:
- [lovyan03](https://twitter.com/lovyan03)
-
-Contributors:
- [ciniml](https://github.com/ciniml)
- [mongonta0716](https://github.com/mongonta0716)
- [tobozo](https://github.com/tobozo)
-/----------------------------------------------------------------------------*/
-#include "lgfx_common.hpp"
-#if defined (LGFX_ENABLE_V0)
-
-#include "LGFXBase.hpp"
-
-#include "../utility/lgfx_tjpgd.h" // JPEG decode support
-#include "../utility/lgfx_pngle.h" // PNG decode support
-#include "../utility/lgfx_qrcode.h" // QR code support
-#include "../utility/miniz.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#if __has_include()
-#include
-#else
-#include
-#define alloca _alloca
-#endif
-
-extern "C" {
- #pragma GCC diagnostic ignored "-Wshadow"
- #pragma GCC diagnostic ignored "-Wdouble-promotion"
-}
-
-namespace lgfx
-{
- inline namespace v0
- {
-//----------------------------------------------------------------------------
- static constexpr float deg_to_rad = 0.017453292519943295769236907684886;
-
- void LGFXBase::setAddrWindow(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- if (_adjust_abs(x, w)||_adjust_abs(y, h)) return;
- if (x < 0) { w += x; x = 0; }
- if (w > _width - x) w = _width - x;
- if (w < 1) { x = 0; w = 0; }
- if (y < 0) { h += y; y = 0; }
- if (h > _height - y) h = _height - y;
- if (h < 1) { y = 0; h = 0; }
-
- startWrite();
- setWindow(x, y, x + w - 1, y + h - 1);
- endWrite();
- }
-
- void LGFXBase::setClipRect(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- if (x < 0) { w += x; x = 0; }
- if (w > _width - x) w = _width - x;
- if (w < 1) { x = 0; w = 0; }
- _clip_l = x;
- _clip_r = x + w - 1;
-
- if (y < 0) { h += y; y = 0; }
- if (h > _height - y) h = _height - y;
- if (h < 1) { y = 0; h = 0; }
- _clip_t = y;
- _clip_b = y + h - 1;
- }
-
- void LGFXBase::getClipRect(int32_t *x, int32_t *y, int32_t *w, int32_t *h)
- {
- *x = _clip_l;
- *w = _clip_r - *x + 1;
- *y = _clip_t;
- *h = _clip_b - *y + 1;
- }
-
- void LGFXBase::clearClipRect(void)
- {
- _clip_l = 0;
- _clip_r = _width - 1;
- _clip_t = 0;
- _clip_b = _height - 1;
- }
-
- void LGFXBase::setScrollRect(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- _adjust_abs(x, w);
- if (x < 0) { w += x; x = 0; }
- if (w > _width - x) w = _width - x;
- if (w < 0) w = 0;
- _sx = x;
- _sw = w;
-
- _adjust_abs(y, h);
- if (y < 0) { h += y; y = 0; }
- if (h > _height - y) h = _height - y;
- if (h < 0) h = 0;
- _sy = y;
- _sh = h;
- }
-
- void LGFXBase::getScrollRect(int32_t *x, int32_t *y, int32_t *w, int32_t *h)
- {
- *x = _sx;
- *y = _sy;
- *w = _sw;
- *h = _sh;
- }
-
- void LGFXBase::clearScrollRect(void)
- {
- _sx = 0;
- _sw = _width;
- _sy = 0;
- _sh = _height;
- }
-
- void LGFXBase::drawFastVLine(int32_t x, int32_t y, int32_t h)
- {
- _adjust_abs(y, h);
- startWrite();
- writeFastVLine(x, y, h);
- endWrite();
- }
-
- void LGFXBase::writeFastVLine(int32_t x, int32_t y, int32_t h)
- {
- if (x < _clip_l || x > _clip_r) return;
- auto ct = _clip_t;
- if (y < ct) { h += y - ct; y = ct; }
- auto cb = _clip_b + 1 - y;
- if (h > cb) h = cb;
- if (h < 1) return;
-
- writeFillRect_impl(x, y, 1, h);
- }
-
- void LGFXBase::drawFastHLine(int32_t x, int32_t y, int32_t w)
- {
- _adjust_abs(x, w);
- startWrite();
- writeFastHLine(x, y, w);
- endWrite();
- }
-
- void LGFXBase::writeFastHLine(int32_t x, int32_t y, int32_t w)
- {
- if (y < _clip_t || y > _clip_b) return;
- auto cl = _clip_l;
- if (x < cl) { w += x - cl; x = cl; }
- auto cr = _clip_r + 1 - x;
- if (w > cr) w = cr;
- if (w < 1) return;
-
- writeFillRect_impl(x, y, w, 1);
- }
-
- void LGFXBase::fillRect(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- _adjust_abs(x, w);
- _adjust_abs(y, h);
- startWrite();
- writeFillRect(x, y, w, h);
- endWrite();
- }
-
- void LGFXBase::writeFillRect(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- auto cl = _clip_l;
- if (x < cl) { w += x - cl; x = cl; }
- auto cr = _clip_r + 1 - x;
- if (w > cr) w = cr;
- if (w < 1) return;
-
- auto ct = _clip_t;
- if (y < ct) { h += y - ct; y = ct; }
- auto cb = _clip_b + 1 - y;
- if (h > cb) h = cb;
- if (h < 1) return;
-
- writeFillRect_impl(x, y, w, h);
- }
-
-
- void LGFXBase::drawRect(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- if (_adjust_abs(x, w)||_adjust_abs(y, h)) return;
- startWrite();
- writeFastHLine(x, y , w);
- if (--h) {
- writeFastHLine(x, y + h , w);
- if (--h) {
- writeFastVLine(x , ++y, h);
- writeFastVLine(x + w - 1, y, h);
- }
- }
- endWrite();
- }
-
- void LGFXBase::drawCircle(int32_t x, int32_t y, int32_t r)
- {
- if ( r <= 0 ) {
- drawPixel(x, y);
- return;
- }
-
- startWrite();
- int32_t f = 1 - r;
- int32_t ddF_y = - (r << 1);
- int32_t ddF_x = 1;
- int32_t i = 0;
- int32_t j = -1;
- do {
- while (f < 0) {
- ++i;
- f += (ddF_x += 2);
- }
- f += (ddF_y += 2);
-
- writeFastHLine(x - i , y + r, i - j);
- writeFastHLine(x - i , y - r, i - j);
- writeFastHLine(x + j + 1, y - r, i - j);
- writeFastHLine(x + j + 1, y + r, i - j);
-
- writeFastVLine(x + r, y + j + 1, i - j);
- writeFastVLine(x + r, y - i , i - j);
- writeFastVLine(x - r, y - i , i - j);
- writeFastVLine(x - r, y + j + 1, i - j);
- j = i;
- } while (i < --r);
- endWrite();
- }
-
- void LGFXBase::drawCircleHelper(int32_t x, int32_t y, int32_t r, uint_fast8_t cornername)
- {
- if (r <= 0) return;
- int32_t f = 1 - r;
- int32_t ddF_y = - (r << 1);
- int32_t ddF_x = 1;
- int32_t i = 0;
- int32_t j = 0;
-
- startWrite();
- do {
- while (f < 0) {
- ++i;
- f += (ddF_x += 2);
- }
- f += (ddF_y += 2);
-
- if (cornername & 0x1) { // left top
- writeFastHLine(x - i, y - r, i - j);
- writeFastVLine(x - r, y - i, i - j);
- }
- if (cornername & 0x2) { // right top
- writeFastVLine(x + r , y - i, i - j);
- writeFastHLine(x + j + 1, y - r, i - j);
- }
- if (cornername & 0x4) { // right bottom
- writeFastHLine(x + j + 1, y + r , i - j);
- writeFastVLine(x + r , y + j + 1, i - j);
- }
- if (cornername & 0x8) { // left bottom
- writeFastVLine(x - r, y + j + 1, i - j);
- writeFastHLine(x - i, y + r , i - j);
- }
- j = i;
- } while (i < --r);
- endWrite();
- }
-
- void LGFXBase::fillCircle(int32_t x, int32_t y, int32_t r) {
- startWrite();
- writeFastHLine(x - r, y, (r << 1) + 1);
- fillCircleHelper(x, y, r, 3, 0);
- endWrite();
- }
-
- void LGFXBase::fillCircleHelper(int32_t x, int32_t y, int32_t r, uint_fast8_t corners, int32_t delta)
- {
- if (r <= 0) return;
-
- ++delta;
-
- int32_t f = 1 - r;
- int32_t ddF_y = - (r << 1);
- int32_t ddF_x = 1;
- int32_t i = 0;
-
- startWrite();
- do {
- int32_t len = 0;
- while (f < 0) {
- f += (ddF_x += 2);
- ++len;
- }
- i += len;
- f += (ddF_y += 2);
-
- if (corners & 0x1) {
- if (len) writeFillRect(x - r, y + i - len + 1, (r << 1) + delta, len);
- writeFastHLine(x - i, y + r, (i << 1) + delta);
- }
- if (corners & 0x2) {
- writeFastHLine(x - i, y - r, (i << 1) + delta);
- if (len) writeFillRect(x - r, y - i, (r << 1) + delta, len);
- }
- } while (i < --r);
- endWrite();
- }
-
- void LGFXBase::drawEllipse(int32_t x, int32_t y, int32_t rx, int32_t ry)
- {
- if (ry == 0) {
- drawFastHLine(x - rx, y, (ry << 2) + 1);
- return;
- }
- if (rx == 0) {
- drawFastVLine(x, y - ry, (rx << 2) + 1);
- return;
- }
- if (rx < 0 || ry < 0) return;
-
- int32_t xt, yt, s, i;
- int32_t rx2 = rx * rx;
- int32_t ry2 = ry * ry;
-
- startWrite();
-
- i = -1;
- xt = 0;
- yt = ry;
- s = (ry2 << 1) + rx2 * (1 - (ry << 1));
- do {
- while ( s < 0 ) s += ry2 * ((++xt << 2) + 2);
- writeFastHLine(x - xt , y - yt, xt - i);
- writeFastHLine(x + i + 1, y - yt, xt - i);
- writeFastHLine(x + i + 1, y + yt, xt - i);
- writeFastHLine(x - xt , y + yt, xt - i);
- i = xt;
- s -= (--yt) * rx2 << 2;
- } while (ry2 * xt <= rx2 * yt);
-
- i = -1;
- yt = 0;
- xt = rx;
- s = (rx2 << 1) + ry2 * (1 - (rx << 1));
- do {
- while ( s < 0 ) s += rx2 * ((++yt << 2) + 2);
- writeFastVLine(x - xt, y - yt , yt - i);
- writeFastVLine(x - xt, y + i + 1, yt - i);
- writeFastVLine(x + xt, y + i + 1, yt - i);
- writeFastVLine(x + xt, y - yt , yt - i);
- i = yt;
- s -= (--xt) * ry2 << 2;
- } while (rx2 * yt <= ry2 * xt);
-
- endWrite();
- }
-
- void LGFXBase::fillEllipse(int32_t x, int32_t y, int32_t rx, int32_t ry)
- {
- if (ry == 0) {
- drawFastHLine(x - rx, y, (ry << 2) + 1);
- return;
- }
- if (rx == 0) {
- drawFastVLine(x, y - ry, (rx << 2) + 1);
- return;
- }
- if (rx < 0 || ry < 0) return;
-
- int32_t xt, yt, i;
- int32_t rx2 = rx * rx;
- int32_t ry2 = ry * ry;
- int32_t s;
-
- startWrite();
-
- writeFastHLine(x - rx, y, (rx << 1) + 1);
- i = 0;
- yt = 0;
- xt = rx;
- s = (rx2 << 1) + ry2 * (1 - (rx << 1));
- do {
- while (s < 0) s += rx2 * ((++yt << 2) + 2);
- writeFillRect(x - xt, y - yt , (xt << 1) + 1, yt - i);
- writeFillRect(x - xt, y + i + 1, (xt << 1) + 1, yt - i);
- i = yt;
- s -= (--xt) * ry2 << 2;
- } while (rx2 * yt <= ry2 * xt);
-
- xt = 0;
- yt = ry;
- s = (ry2 << 1) + rx2 * (1 - (ry << 1));
- do {
- while (s < 0) s += ry2 * ((++xt << 2) + 2);
- writeFastHLine(x - xt, y - yt, (xt << 1) + 1);
- writeFastHLine(x - xt, y + yt, (xt << 1) + 1);
- s -= (--yt) * rx2 << 2;
- } while(ry2 * xt <= rx2 * yt);
-
- endWrite();
- }
-
- void LGFXBase::drawRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t r)
- {
- if (_adjust_abs(x, w)||_adjust_abs(y, h)) return;
- startWrite();
-
- w--;
- h--;
- int32_t len = (r << 1) + 1;
- int32_t y1 = y + h - r;
- int32_t y0 = y + r;
- writeFastVLine(x , y0 + 1, h - len);
- writeFastVLine(x + w , y0 + 1, h - len);
-
- int32_t x1 = x + w - r;
- int32_t x0 = x + r;
- writeFastHLine(x0 + 1, y , w - len);
- writeFastHLine(x0 + 1, y + h , w - len);
-
- int32_t f = 1 - r;
- int32_t ddF_y = -(r << 1);
- int32_t ddF_x = 1;
-
- len = 0;
- for (int32_t i = 0; i <= r; i++) {
- len++;
- if (f >= 0) {
- writeFastHLine(x0 - i , y0 - r, len);
- writeFastHLine(x0 - i , y1 + r, len);
- writeFastHLine(x1 + i - len + 1, y1 + r, len);
- writeFastHLine(x1 + i - len + 1, y0 - r, len);
- writeFastVLine(x1 + r, y1 + i - len + 1, len);
- writeFastVLine(x0 - r, y1 + i - len + 1, len);
- writeFastVLine(x1 + r, y0 - i, len);
- writeFastVLine(x0 - r, y0 - i, len);
- len = 0;
- r--;
- ddF_y += 2;
- f += ddF_y;
- }
- ddF_x += 2;
- f += ddF_x;
- }
- endWrite();
- }
-
- void LGFXBase::fillRoundRect(int32_t x, int32_t y, int32_t w, int32_t h, int32_t r)
- {
- if (_adjust_abs(x, w)||_adjust_abs(y, h)) return;
- startWrite();
- int32_t y2 = y + r;
- int32_t y1 = y + h - r - 1;
- int32_t ddF_y = - (r << 1);
- int32_t delta = w + ddF_y;
- writeFillRect(x, y2, w, h + ddF_y);
- int32_t x0 = x + r;
- int32_t f = 1 - r;
- int32_t ddF_x = 1;
- int32_t len = 0;
- for (int32_t i = 0; i <= r; i++) {
- len++;
- if (f >= 0) {
- writeFillRect(x0 - r, y2 - i , (r << 1) + delta, len);
- writeFillRect(x0 - r, y1 + i - len + 1, (r << 1) + delta, len);
- if (i == r) break;
- len = 0;
- writeFastHLine(x0 - i, y1 + r, (i << 1) + delta);
- ddF_y += 2;
- f += ddF_y;
- writeFastHLine(x0 - i, y2 - r, (i << 1) + delta);
- r--;
- }
- ddF_x += 2;
- f += ddF_x;
- }
- endWrite();
- }
-
- void LGFXBase::drawLine(int32_t x0, int32_t y0, int32_t x1, int32_t y1)
- {
- bool steep = abs(y1 - y0) > abs(x1 - x0);
-
- int32_t xstart = _clip_l;
- int32_t xend = _clip_r;
- int32_t ystart = _clip_t;
- int32_t yend = _clip_b;
-
- if (steep) {
- std::swap(xstart, ystart);
- std::swap(xend, yend);
- std::swap(x0, y0);
- std::swap(x1, y1);
- }
- if (x0 > x1) {
- std::swap(x0, x1);
- std::swap(y0, y1);
- }
- if (x0 > xend || x1 < xstart) return;
- xend = std::min(x1, xend);
-
- int32_t dy = abs(y1 - y0);
- int32_t ystep = (y1 > y0) ? 1 : -1;
- int32_t dx = x1 - x0;
- int32_t err = dx >> 1;
-
- while (x0 < xstart || y0 < ystart || y0 > yend) {
- if (++x0 > xend) return;
- err -= dy;
- if (err < 0) {
- err += dx;
- y0 += ystep;
- }
- }
- int32_t xs = x0;
- int32_t dlen = 0;
- if (ystep < 0) std::swap(ystart, yend);
- yend += ystep;
-
- startWrite();
- if (steep) {
- do {
- ++dlen;
- if ((err -= dy) < 0) {
- writeFillRectPreclipped(y0, xs, 1, dlen);
- err += dx;
- xs = x0 + 1; dlen = 0; y0 += ystep;
- if (y0 == yend) break;
- }
- } while (++x0 <= xend);
- if (dlen) writeFillRectPreclipped(y0, xs, 1, dlen);
- } else {
- do {
- ++dlen;
- if ((err -= dy) < 0) {
- writeFillRectPreclipped(xs, y0, dlen, 1);
- err += dx;
- xs = x0 + 1; dlen = 0; y0 += ystep;
- if (y0 == yend) break;
- }
- } while (++x0 <= xend);
- if (dlen) writeFillRectPreclipped(xs, y0, dlen, 1);
- }
- endWrite();
- }
-
- void LGFXBase::drawTriangle(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2)
- {
- startWrite();
- drawLine(x0, y0, x1, y1);
- drawLine(x1, y1, x2, y2);
- drawLine(x2, y2, x0, y0);
- endWrite();
- }
-
- void LGFXBase::fillTriangle(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2)
- {
- int32_t a, b;
-
- // Sort coordinates by Y order (y2 >= y1 >= y0)
- if (y0 > y1) { std::swap(y0, y1); std::swap(x0, x1); }
- if (y1 > y2) { std::swap(y2, y1); std::swap(x2, x1); }
- if (y0 > y1) { std::swap(y0, y1); std::swap(x0, x1); }
-
- if (y0 == y2) { // Handle awkward all-on-same-line case as its own thing
- a = b = x0;
- if (x1 < a) a = x1;
- else if (x1 > b) b = x1;
- if (x2 < a) a = x2;
- else if (x2 > b) b = x2;
- drawFastHLine(a, y0, b - a + 1);
- return;
- }
- if ((x1-x0) * (y2-y0) == (x2-x0) * (y1-y0)) {
- drawLine(x0,y0,x2,y2);
- return;
- }
-
- int32_t dy1 = y1 - y0;
- int32_t dy2 = y2 - y0;
- bool change = ((x1 - x0) * dy2 > (x2 - x0) * dy1);
- int32_t dx1 = abs(x1 - x0);
- int32_t dx2 = abs(x2 - x0);
- int32_t xstep1 = x1 < x0 ? -1 : 1;
- int32_t xstep2 = x2 < x0 ? -1 : 1;
- a = b = x0;
- if (change) {
- std::swap(dx1, dx2);
- std::swap(dy1, dy2);
- std::swap(xstep1, xstep2);
- }
- int32_t err1 = (std::max(dx1, dy1) >> 1)
- + (xstep1 < 0
- ? std::min(dx1, dy1)
- : dx1);
- int32_t err2 = (std::max(dx2, dy2) >> 1)
- + (xstep2 > 0
- ? std::min(dx2, dy2)
- : dx2);
- startWrite();
- if (y0 != y1) {
- do {
- err1 -= dx1;
- while (err1 < 0) { err1 += dy1; a += xstep1; }
- err2 -= dx2;
- while (err2 < 0) { err2 += dy2; b += xstep2; }
- writeFastHLine(a, y0, b - a + 1);
- } while (++y0 < y1);
- }
-
- if (change) {
- b = x1;
- xstep2 = x2 < x1 ? -1 : 1;
- dx2 = abs(x2 - x1);
- dy2 = y2 - y1;
- err2 = (std::max(dx2, dy2) >> 1)
- + (xstep2 > 0
- ? std::min(dx2, dy2)
- : dx2);
- } else {
- a = x1;
- dx1 = abs(x2 - x1);
- dy1 = y2 - y1;
- xstep1 = x2 < x1 ? -1 : 1;
- err1 = (std::max(dx1, dy1) >> 1)
- + (xstep1 < 0
- ? std::min(dx1, dy1)
- : dx1);
- }
- do {
- err1 -= dx1;
- while (err1 < 0) { err1 += dy1; if ((a += xstep1) == x2) break; }
- err2 -= dx2;
- while (err2 < 0) { err2 += dy2; if ((b += xstep2) == x2) break; }
- writeFastHLine(a, y0, b - a + 1);
- } while (++y0 <= y2);
- endWrite();
- }
-
- void LGFXBase::drawBezier( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2)
- {
- int32_t x = x0 - x1, y = y0 - y1;
- double t = x0 - 2 * x1 + x2, r;
-
- startWrite();
-
- if (x * (x2 - x1) > 0) {
- if (y * (y2 - y1) > 0)
- if (fabs((y0 - 2 * y1 + y2) / t * x) > abs(y)) {
- x0 = x2; x2 = x + x1; y0 = y2; y2 = y + y1;
- }
- t = (x0 - x1) / t;
- r = (1 - t) * ((1 - t) * y0 + 2.0 * t * y1) + t * t * y2;
- t = (x0 * x2 - x1 * x1) * t / (x0 - x1);
- x = floor(t + 0.5); y = floor(r + 0.5);
- r = (y1 - y0) * (t - x0) / (x1 - x0) + y0;
- draw_bezier_helper(x0, y0, x, floor(r + 0.5), x, y);
- r = (y1 - y2) * (t - x2) / (x1 - x2) + y2;
- x0 = x1 = x; y0 = y; y1 = floor(r + 0.5);
- }
- if ((y0 - y1) * (y2 - y1) > 0) {
- t = y0 - 2 * y1 + y2; t = (y0 - y1) / t;
- r = (1 - t) * ((1 - t) * x0 + 2.0 * t * x1) + t * t * x2;
- t = (y0 * y2 - y1 * y1) * t / (y0 - y1);
- x = floor(r + 0.5); y = floor(t + 0.5);
- r = (x1 - x0) * (t - y0) / (y1 - y0) + x0;
- draw_bezier_helper(x0, y0, floor(r + 0.5), y, x, y);
- r = (x1 - x2) * (t - y2) / (y1 - y2) + x2;
- x0 = x; x1 = floor(r + 0.5); y0 = y1 = y;
- }
- draw_bezier_helper(x0, y0, x1, y1, x2, y2);
-
- endWrite();
- }
-
- void LGFXBase::draw_bezier_helper( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2)
- {
- // Check if coordinates are sequential (replaces assert)
- if (((x2 >= x1 && x1 >= x0) || (x2 <= x1 && x1 <= x0))
- && ((y2 >= y1 && y1 >= y0) || (y2 <= y1 && y1 <= y0)))
- {
- // Coordinates are sequential
- int32_t sx = x2 - x1, sy = y2 - y1;
- int32_t xx = x0 - x1, yy = y0 - y1, xy;
- float dx, dy, err, cur = xx * sy - yy * sx;
-
- if (sx * (int32_t)sx + sy * (int32_t)sy > xx * xx + yy * yy) {
- x2 = x0; x0 = sx + x1; y2 = y0; y0 = sy + y1; cur = -cur;
- }
- if (cur != 0) {
- xx += sx; xx *= sx = x0 < x2 ? 1 : -1;
- yy += sy; yy *= sy = y0 < y2 ? 1 : -1;
- xy = 2 * xx * yy; xx *= xx; yy *= yy;
- if (cur * sx * sy < 0) {
- xx = -xx; yy = -yy; xy = -xy; cur = -cur;
- }
- dx = 4.0 * sy * cur * (x1 - x0) + xx - xy;
- dy = 4.0 * sx * cur * (y0 - y1) + yy - xy;
- xx += xx; yy += yy; err = dx + dy + xy;
- do {
- drawPixel(x0, y0);
- if (x0 == x2 && y0 == y2)
- {
- return;
- }
- y1 = 2 * err < dx;
- if (2 * err > dy) {
- x0 += sx;
- dx -= xy;
- err += dy += yy;
- }
- if ( y1 ) {
- y0 += sy;
- dy -= xy;
- err += dx += xx;
- }
- } while (dy < dx );
- }
- drawLine(x0, y0, x2, y2);
- }
- }
-
- void LGFXBase::drawBezier( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x3, int32_t y3)
- {
- int32_t w = x0-x1;
- int32_t h = y0-y1;
- int32_t len = w*w+h*h;
- w = x1-x2;
- h = y1-y2;
- int32_t len2 = w*w+h*h;
- if (len < len2) len = len2;
- w = x2-x3;
- h = y2-y3;
- len2 = w*w+h*h;
- if (len < len2) len = len2;
- len = (int32_t)round(sqrt(len)) >> 2;
-
- float fx0 = x0;
- float fy0 = y0;
- float fx1 = x1;
- float fy1 = y1;
- float fx2 = x2;
- float fy2 = y2;
- float fx3 = x3;
- float fy3 = y3;
-
- int32_t i = 0;
- startWrite();
-//drawLine(x0, y0, x1, y1);
-//drawLine(x1, y1, x2, y2);
-//drawLine(x2, y2, x3, y3);
-//drawCircle(x0, y0, 3);
-//drawCircle(x1, y1, 3);
-//drawCircle(x2, y2, 3);
-//drawCircle(x3, y3, 3);
- do {
- float t = i;
- t = t / (len<<1);
- float tr = 1 - t;
- float f0 = tr * tr;
- float f1 = f0 * t * 3;
- f0 = f0 * tr;
- float f3 = t * t;
- float f2 = tr * f3 * 3;
- f3 = f3 * t;
- x1 = roundf( fx0 * f0 + fx1 * f1 + fx2 * f2 + fx3 * f3);
- y1 = roundf( fy0 * f0 + fy1 * f1 + fy2 * f2 + fy3 * f3);
- if (x0 != x1 || y0 != y1) {
- drawLine(x0, y0, x1, y1);
-//drawCircle(x1, y1, 3);
- x0 = x1;
- y0 = y1;
- }
- x2 = roundf( fx0 * f3 + fx1 * f2 + fx2 * f1 + fx3 * f0);
- y2 = roundf( fy0 * f3 + fy1 * f2 + fy2 * f1 + fy3 * f0);
- if (x3 != x2 || y3 != y2) {
- drawLine(x3, y3, x2, y2);
-//drawCircle(x2, y2, 3);
- x3 = x2;
- y3 = y2;
- }
- } while (++i <= len);
- endWrite();
- }
-
- void LGFXBase::draw_gradient_line( int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t colorstart, uint32_t colorend )
- {
- if ( colorstart == colorend || (x0 == x1 && y0 == y1)) {
- setColor(colorstart);
- drawLine( x0, y0, x1, y1);
- return;
- }
-
- bool steep = abs(y1 - y0) > abs(x1 - x0);
- if (steep) { // swap axis
- std::swap(x0, y0);
- std::swap(x1, y1);
- }
-
- if (x0 > x1) { // swap points
- std::swap(x0, x1);
- std::swap(y0, y1);
- std::swap(colorstart, colorend);
- }
-
- int32_t dx = x1 - x0;
- int32_t err = dx >> 1;
- int32_t dy = abs(y1 - y0);
- int32_t ystep = (y0 < y1) ? 1 : -1;
-
- int32_t r = (colorstart >> 16)&0xFF;
- int32_t g = (colorstart >> 8 )&0xFF;
- int32_t b = (colorstart )&0xFF;
-
- int32_t diff_r = ((colorend >> 16)&0xFF) - r;
- int32_t diff_g = ((colorend >> 8 )&0xFF) - g;
- int32_t diff_b = ((colorend )&0xFF) - b;
-
- startWrite();
- for (int32_t x = x0; x <= x1; x++) {
- setColor(color888( (x - x0) * diff_r / dx + r
- , (x - x0) * diff_g / dx + g
- , (x - x0) * diff_b / dx + b));
- if (steep) writePixel(y0, x);
- else writePixel(x, y0);
- err -= dy;
- if (err < 0) {
- err += dx;
- y0 += ystep;
- }
- }
- endWrite();
- }
-
- void LGFXBase::drawEllipseArc(int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float start, float end)
- {
- if (r0x < r1x) std::swap(r0x, r1x);
- if (r0y < r1y) std::swap(r0y, r1y);
- if (r1x < 0) return;
- if (r1y < 0) return;
-
- bool equal = fabsf(start - end) < std::numeric_limits::epsilon();
- start = fmodf(start, 360);
- end = fmodf(end, 360);
- if (start < 0) start += 360.0;
- if (end < 0) end += 360.0;
-
- startWrite();
- fill_arc_helper(x, y, r0x, r1x, r0y, r1y, start, start);
- fill_arc_helper(x, y, r0x, r1x, r0y, r1y, end, end);
- if (!equal && (fabsf(start - end) <= 0.0001)) { start = .0; end = 360.0; }
- fill_arc_helper(x, y, r0x, r0x, r0y, r0y, start, end);
- fill_arc_helper(x, y, r1x, r1x, r1y, r1y, start, end);
- endWrite();
- }
-
- void LGFXBase::fillEllipseArc(int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float start, float end)
- {
- if (r0x < r1x) std::swap(r0x, r1x);
- if (r0y < r1y) std::swap(r0y, r1y);
- if (r1x < 0) return;
- if (r1y < 0) return;
-
- bool equal = fabsf(start - end) < std::numeric_limits::epsilon();
- start = fmodf(start, 360);
- end = fmodf(end, 360);
- if (start < 0) start += 360.0;
- if (end < 0) end += 360.0;
- if (!equal && (fabsf(start - end) <= 0.0001)) { start = .0; end = 360.0; }
-
- startWrite();
- fill_arc_helper(x, y, r0x, r1x, r0y, r1y, start, end);
- endWrite();
- }
-
- void LGFXBase::fill_arc_helper(int32_t cx, int32_t cy, int32_t oradius_x, int32_t iradius_x, int32_t oradius_y, int32_t iradius_y, float start, float end)
- {
- float s_cos = (cosf(start * deg_to_rad));
- float e_cos = (cosf(end * deg_to_rad));
- float sslope = s_cos / (sinf(start * deg_to_rad));
- float eslope = -1000000;
- if (end != 360.0) eslope = e_cos / (sinf(end * deg_to_rad));
- float swidth = 0.5 / s_cos;
- float ewidth = -0.5 / e_cos;
-
- bool start180 = !(start < 180);
- bool end180 = end < 180;
- bool reversed = start + 180 < end || (end < start && start < end + 180);
-
- int32_t xleft = -oradius_x;
- int32_t xright = oradius_x + 1;
- int32_t y = -oradius_y;
- int32_t ye = oradius_y;
- if (!reversed)
- {
- if ( (end >= 270 || end < 90) && (start >= 270 || start < 90)) xleft = 0;
- else if (end < 270 && end >= 90 && start < 270 && start >= 90) xright = 1;
- if ( end >= 180 && start >= 180) ye = 0;
- else if (end < 180 && start < 180) y = 0;
- }
- if (y < _clip_t - cy ) y = _clip_t - cy;
- if (ye > _clip_b - cy + 1) ye = _clip_b - cy + 1;
-
- if (xleft < _clip_l - cx ) xleft = _clip_l - cx;
- if (xright > _clip_r - cx + 1) xright = _clip_r - cx + 1;
-
- bool trueCircle = (oradius_x == oradius_y) && (iradius_x == iradius_y);
-
- int32_t iradius_y2 = iradius_y * (iradius_y - 1);
- int32_t iradius_x2 = iradius_x * (iradius_x - 1);
- float irad_rate = iradius_x2 && iradius_y2 ? (float)iradius_x2 / (float)iradius_y2 : 0;
-
- int32_t oradius_y2 = oradius_y * (oradius_y + 1);
- int32_t oradius_x2 = oradius_x * (oradius_x + 1);
- float orad_rate = oradius_x2 && oradius_y2 ? (float)oradius_x2 / (float)oradius_y2 : 0;
-
- do
- {
- int32_t y2 = y * y;
- int32_t compare_o = oradius_y2 - y2;
- int32_t compare_i = iradius_y2 - y2;
- if (!trueCircle)
- {
- compare_i = floorf(compare_i * irad_rate);
- compare_o = ceilf (compare_o * orad_rate);
- }
- int32_t xe = ceilf(sqrtf(compare_o));
- int32_t x = 1 - xe;
-
- if ( x < xleft ) x = xleft;
- if (xe > xright) xe = xright;
- float ysslope = (y + swidth) * sslope;
- float yeslope = (y + ewidth) * eslope;
- int len = 0;
- do
- {
- bool flg1 = start180 != (x <= ysslope);
- bool flg2 = end180 != (x <= yeslope);
- int32_t x2 = x * x;
- if (x2 >= compare_i
- && ((flg1 && flg2) || (reversed && (flg1 || flg2)))
- && x != xe
- && x2 < compare_o)
- {
- ++len;
- }
- else
- {
- if (len)
- {
- writeFastHLine(cx + x - len, cy + y, len);
- len = 0;
- }
- if (x2 >= compare_o) break;
- if (x < 0 && x2 < compare_i) { x = -x; }
- }
- } while (++x <= xe);
- } while (++y <= ye);
- }
-
- void LGFXBase::draw_bitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, uint32_t fg_rawcolor, uint32_t bg_rawcolor)
- {
- if (w < 1 || h < 1) return;
- setRawColor(fg_rawcolor);
- int32_t byteWidth = (w + 7) >> 3;
- uint_fast8_t byte = 0;
-
- bool fg = true;
- int32_t j = 0;
- startWrite();
- do {
- int32_t i = 0;
- do {
- int32_t ip = i;
- for (;;) {
- if (!(i & 7)) byte = bitmap[i >> 3];
- if (fg != (bool)(byte & 0x80) || (++i >= w)) break;
- byte <<= 1;
- }
- if ((ip != i) && (fg || bg_rawcolor != ~0u)) {
- writeFastHLine(x + ip, y + j, i - ip);
- }
- fg = !fg;
- if (bg_rawcolor != ~0u) setRawColor(fg ? fg_rawcolor : bg_rawcolor);
- } while (i < w);
- bitmap += byteWidth;
- } while (++j < h);
- endWrite();
- }
-
- void LGFXBase::draw_xbitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, uint32_t fg_rawcolor, uint32_t bg_rawcolor)
- {
- if (w < 1 || h < 1) return;
- setRawColor(fg_rawcolor);
- int32_t byteWidth = (w + 7) >> 3;
- uint_fast8_t byte = 0;
-
- bool fg = true;
- int32_t j = 0;
- startWrite();
- do {
- int32_t i = 0;
- do {
- int32_t ip = i;
- for (;;) {
- if (!(i & 7)) byte = bitmap[i >> 3];
- if (fg != (bool)(byte & 0x01) || (++i >= w)) break;
- byte >>= 1;
- }
- if ((ip != i) && (fg || bg_rawcolor != ~0u)) {
- writeFastHLine(x + ip, y + j, i - ip);
- }
- fg = !fg;
- if (bg_rawcolor != ~0u) setRawColor(fg ? fg_rawcolor : bg_rawcolor);
- } while (i < w);
- bitmap += byteWidth;
- } while (++j < h);
- endWrite();
- }
-
- void LGFXBase::pushImage(int32_t x, int32_t y, int32_t w, int32_t h, pixelcopy_t *param, bool use_dma)
- {
- param->src_bitwidth = w;
- if (param->src_bits < 8) { // get bitwidth
-// uint32_t x_mask = (1 << (4 - __builtin_ffs(param->src_bits))) - 1;
-// uint32_t x_mask = (1 << ((~(param->src_bits>>1)) & 3)) - 1;
- uint32_t x_mask = (param->src_bits == 1) ? 7
- : (param->src_bits == 2) ? 3
- : 1;
- param->src_bitwidth = (w + x_mask) & (~x_mask);
- }
-
- int32_t dx=0, dw=w;
- if (0 < _clip_l - x) { dx = _clip_l - x; dw -= dx; x = _clip_l; }
-
- if (_adjust_width(x, dx, dw, _clip_l, _clip_r - _clip_l + 1)) return;
- param->src_x = dx;
-
-
- int32_t dy=0, dh=h;
- if (0 < _clip_t - y) { dy = _clip_t - y; dh -= dy; y = _clip_t; }
- if (_adjust_width(y, dy, dh, _clip_t, _clip_b - _clip_t + 1)) return;
- param->src_y = dy;
-
- startWrite();
- pushImage_impl(x, y, dw, dh, param, use_dma);
- endWrite();
- }
-
- void LGFXBase::make_rotation_matrix(float* result, float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y)
- {
- float rad = fmodf(angle, 360) * deg_to_rad;
- float sin_f = sinf(rad);
- float cos_f = cosf(rad);
- result[0] = cos_f * zoom_x;
- result[1] = -sin_f * zoom_y;
- result[2] = dst_x - src_x * result[0] - src_y * result[1];
- result[3] = sin_f * zoom_x;
- result[4] = cos_f * zoom_y;
- result[5] = dst_y - src_x * result[3] - src_y * result[4];
- }
-
- static bool make_invert_affine32(int32_t* __restrict result, const float* __restrict matrix)
- {
- float det = matrix[0] * matrix[4] - matrix[1] * matrix[3];
- if (det == 0.0f) return false;
- det = (1 << FP_SCALE) / det;
- result[0] = roundf(det * matrix[4]);
- result[1] = roundf(det * -matrix[1]);
- result[2] = roundf(det * (matrix[1] * matrix[5] - matrix[2] * matrix[4]));
- result[3] = roundf(det * -matrix[3]);
- result[4] = roundf(det * matrix[0]);
- result[5] = roundf(det * (matrix[2] * matrix[3] - matrix[0] * matrix[5]));
- return true;
- }
-
- void LGFXBase::push_image_rotate_zoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, pixelcopy_t* pc)
- {
- float matrix[6];
- make_rotation_matrix(matrix, dst_x + 0.5, dst_y + 0.5, src_x + 0.5, src_y + 0.5, angle, zoom_x, zoom_y);
- push_image_affine(matrix, w, h, pc);
- }
-
- void LGFXBase::push_image_rotate_zoom_aa(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, pixelcopy_t* pc)
- {
- float matrix[6];
- make_rotation_matrix(matrix, dst_x + 0.5, dst_y + 0.5, src_x + 0.5, src_y + 0.5, angle, zoom_x, zoom_y);
- push_image_affine_aa(matrix, w, h, pc);
- }
-
- void LGFXBase::push_image_affine(const float* matrix, int32_t w, int32_t h, pixelcopy_t* pc)
- {
- pc->no_convert = false;
- pc->src_height = h;
- pc->src_width = w;
- pc->src_bitwidth = w;
- if (pc->src_bits < 8) {
- uint32_t x_mask = (pc->src_bits == 1) ? 7
- : (pc->src_bits == 2) ? 3
- : 1;
- pc->src_bitwidth = (w + x_mask) & (~x_mask);
- }
- push_image_affine(matrix, pc);
- }
-
- void LGFXBase::push_image_affine_aa(const float* matrix, int32_t w, int32_t h, pixelcopy_t* pc)
- {
- pc->no_convert = false;
- pc->src_height = h;
- pc->src_width = w;
- pc->src_bitwidth = w;
- if (pc->src_bits < 8) {
- uint32_t x_mask = (pc->src_bits == 1) ? 7
- : (pc->src_bits == 2) ? 3
- : 1;
- pc->src_bitwidth = (w + x_mask) & (~x_mask);
- }
- pixelcopy_t pc_post;
- auto dst_depth = getColorDepth();
- if (hasPalette() || dst_depth < 8)
- {
- pc_post.dst_bits = dst_depth;
- pc_post.dst_mask = (1 << dst_depth) - 1;
- pc_post.fp_copy = pixelcopy_t::blend_palette_fast;
- }
- else
- if (dst_depth > rgb565_2Byte) {
- if (dst_depth == rgb888_3Byte) {
- pc_post.fp_copy = pixelcopy_t::blend_rgb_fast;
- } else {
- pc_post.fp_copy = pixelcopy_t::blend_rgb_fast;
- }
- } else {
- if (dst_depth == rgb565_2Byte) {
- pc_post.fp_copy = pixelcopy_t::blend_rgb_fast;
- } else { // src_depth == rgb332_1Byte:
- pc_post.fp_copy = pixelcopy_t::blend_rgb_fast;
- }
- }
- push_image_affine_aa(matrix, pc, &pc_post);
- }
-
- void LGFXBase::fillAffine(const float matrix[6], int32_t w, int32_t h)
- {
- int32_t min_y = matrix[3] * (w << FP_SCALE);
- int32_t max_y = matrix[4] * (h << FP_SCALE);
- if ((min_y < 0) == (max_y < 0))
- {
- max_y += min_y;
- min_y = 0;
- }
- if (min_y > max_y)
- {
- std::swap(min_y, max_y);
- }
-
- {
- int32_t offset_y32 = matrix[5] * (1 << FP_SCALE) + (1 << (FP_SCALE-1));
- min_y = std::max(_clip_t , (offset_y32 + min_y - 1) >> FP_SCALE);
- max_y = std::min(_clip_b + 1, (offset_y32 + max_y + 1) >> FP_SCALE);
- if (min_y >= max_y) return;
- }
-
-
- int32_t iA[6];
- if (!make_invert_affine32(iA, matrix)) return;
-
- int32_t offset = (min_y << 1) - 1;
- iA[2] += ((iA[0] + iA[1] * offset) >> 1);
- iA[5] += ((iA[3] + iA[4] * offset) >> 1);
-
- int32_t scale_w = w << FP_SCALE;
- int32_t xs1 = (iA[0] < 0 ? - scale_w : 1) - iA[0];
- int32_t xs2 = (iA[0] < 0 ? 0 : (1 - scale_w)) - iA[0];
-
- int32_t scale_h = h << FP_SCALE;
- int32_t ys1 = (iA[3] < 0 ? - scale_h : 1) - iA[3];
- int32_t ys2 = (iA[3] < 0 ? 0 : (1 - scale_h)) - iA[3];
-
- int32_t cl = _clip_l ;
- int32_t cr = _clip_r + 1;
-
- int32_t div1 = iA[0] ? - iA[0] : -1;
- int32_t div2 = iA[3] ? - iA[3] : -1;
- int32_t y = min_y - max_y;
-
- startWrite();
- do
- {
- iA[2] += iA[1];
- iA[5] += iA[4];
- int32_t left = std::max(cl, std::max((iA[2] + xs1) / div1, (iA[5] + ys1) / div2));
- int32_t right = std::min(cr, std::min((iA[2] + xs2) / div1, (iA[5] + ys2) / div2));
- if (left < right)
- {
- writeFillRectPreclipped(left, y + max_y, right - left, 1);
- }
- } while (++y);
- endWrite();
- }
-
- void LGFXBase::push_image_affine(const float* matrix, pixelcopy_t* pc)
- {
- int32_t min_y = matrix[3] * (pc->src_width << FP_SCALE);
- int32_t max_y = matrix[4] * (pc->src_height << FP_SCALE);
- if ((min_y < 0) == (max_y < 0))
- {
- max_y += min_y;
- min_y = 0;
- }
- if (min_y > max_y)
- {
- std::swap(min_y, max_y);
- }
-
- {
- int32_t offset_y32 = matrix[5] * (1 << FP_SCALE) + (1 << (FP_SCALE-1));
- min_y = std::max(_clip_t , (offset_y32 + min_y - 1) >> FP_SCALE);
- max_y = std::min(_clip_b + 1, (offset_y32 + max_y + 1) >> FP_SCALE);
- if (min_y >= max_y) return;
- }
-
-
- int32_t iA[6];
- if (!make_invert_affine32(iA, matrix)) return;
-
- pc->src_x32_add = iA[0];
- pc->src_y32_add = iA[3];
-
- int32_t offset = (min_y << 1) - 1;
- iA[2] += ((iA[0] + iA[1] * offset) >> 1);
- iA[5] += ((iA[3] + iA[4] * offset) >> 1);
-
- int32_t scale_w = pc->src_width << FP_SCALE;
- int32_t xs1 = (iA[0] < 0 ? - scale_w : 1) - iA[0];
- int32_t xs2 = (iA[0] < 0 ? 0 : (1 - scale_w)) - iA[0];
-
- int32_t scale_h = pc->src_height << FP_SCALE;
- int32_t ys1 = (iA[3] < 0 ? - scale_h : 1) - iA[3];
- int32_t ys2 = (iA[3] < 0 ? 0 : (1 - scale_h)) - iA[3];
-
- int32_t cl = _clip_l ;
- int32_t cr = _clip_r + 1;
-
- int32_t y = min_y - max_y;
-
- startWrite();
- do
- {
- iA[2] += iA[1];
- iA[5] += iA[4];
- int32_t left = std::max(cl, std::max(iA[0] ? (iA[2] + xs1) / - iA[0] : cl, iA[3] ? (iA[5] + ys1) / - iA[3] : cl));
- int32_t right = std::min(cr, std::min(iA[0] ? (iA[2] + xs2) / - iA[0] : cr, iA[3] ? (iA[5] + ys2) / - iA[3] : cr));
- if (left < right)
- {
- pc->src_x32 = iA[2] + left * iA[0];
- if (static_cast(pc->src_x) < pc->src_width)
- {
- pc->src_y32 = iA[5] + left * iA[3];
- if (static_cast(pc->src_y) < pc->src_height)
- {
- pushImage_impl(left, y + max_y, right - left, 1, pc, true);
- }
- }
- }
- } while (++y);
- endWrite();
- }
-
- void LGFXBase::push_image_affine_aa(const float* matrix, pixelcopy_t* pc, pixelcopy_t* pc2)
- {
- int32_t min_y = matrix[3] * (pc->src_width << FP_SCALE);
- int32_t max_y = matrix[4] * (pc->src_height << FP_SCALE);
- if ((min_y < 0) == (max_y < 0))
- {
- max_y += min_y;
- min_y = 0;
- }
- if (min_y > max_y)
- {
- std::swap(min_y, max_y);
- }
-
- {
- int32_t offset_y32 = matrix[5] * (1 << FP_SCALE);
- min_y = std::max(_clip_t, (offset_y32 + min_y ) >> FP_SCALE);
- max_y = std::min(_clip_b, (offset_y32 + max_y -1) >> FP_SCALE) + 1;
- if (min_y >= max_y) return;
- }
-
- int32_t iA[6];
- if (!make_invert_affine32(iA, matrix)) return;
-
- pc->src_x32_add = iA[0];
- pc->src_y32_add = iA[3];
- uint32_t x32_diff = std::min(8 << FP_SCALE, std::max(abs(iA[0]), abs(iA[1])) - 1) >> 1;
- uint32_t y32_diff = std::min(8 << FP_SCALE, std::max(abs(iA[3]), abs(iA[4])) - 1) >> 1;
-
- int32_t offset = (min_y << 1) - 1;
- iA[2] += ((iA[0] + iA[1] * offset) >> 1);
- iA[5] += ((iA[3] + iA[4] * offset) >> 1);
-
- int32_t scale_w = (pc->src_width << FP_SCALE) + (x32_diff << 1);
- int32_t xs1 = (iA[0] < 0 ? - scale_w : 1) - iA[0] + x32_diff;
- int32_t xs2 = (iA[0] < 0 ? 0 : (1 - scale_w)) - iA[0] + x32_diff;
-
- int32_t scale_h = (pc->src_height << FP_SCALE) + (y32_diff << 1);
- int32_t ys1 = (iA[3] < 0 ? - scale_h : 1) - iA[3] + y32_diff;
- int32_t ys2 = (iA[3] < 0 ? 0 : (1 - scale_h)) - iA[3] + y32_diff;
-
- int32_t cl = _clip_l ;
- int32_t cr = _clip_r + 1;
- argb8888_t buffer[cr - cl];
- pc2->src_data = buffer;
-
- startWrite();
- do
- {
- iA[2] += iA[1];
- iA[5] += iA[4];
- int32_t left = std::max(cl, std::max(iA[0] ? (iA[2] + xs1) / - iA[0] : cl, iA[3] ? (iA[5] + ys1) / - iA[3] : cl));
- int32_t right = std::min(cr, std::min(iA[0] ? (iA[2] + xs2) / - iA[0] : cr, iA[3] ? (iA[5] + ys2) / - iA[3] : cr));
- if (left < right)
- {
- int32_t len = right - left;
-
- uint32_t xs = iA[2] + left * iA[0];
- pc->src_x32 = xs - x32_diff;
- pc->src_xe32 = xs + x32_diff;
- uint32_t ys = iA[5] + left * iA[3];
- pc->src_y32 = ys - y32_diff;
- pc->src_ye32 = ys + y32_diff;
-
- pc->fp_copy(buffer, 0, len, pc);
- pc2->src_x = 0;
- pc2->src_y = 0;
- pushImageARGB_impl(left, min_y, len, 1, pc2);
- }
- } while (++min_y != max_y);
- endWrite();
- }
-
- void LGFXBase::readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t* data)
- {
- pixelcopy_t p(nullptr, rgb332_t::depth, _read_conv.depth, false, getPalette());
- read_rect(x, y, w, h, data, &p);
- }
- void LGFXBase::readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t* data)
- {
- pixelcopy_t p(nullptr, swap565_t::depth, _read_conv.depth, false, getPalette());
- if (_swapBytes && !_palette_count && _read_conv.depth >= 8) {
- p.no_convert = false;
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine_dst(_read_conv.depth);
- }
- read_rect(x, y, w, h, data, &p);
- }
- void LGFXBase::readRect(int32_t x, int32_t y, int32_t w, int32_t h, void* data)
- {
- pixelcopy_t p(nullptr, bgr888_t::depth, _read_conv.depth, false, getPalette());
- if (_swapBytes && !_palette_count && _read_conv.depth >= 8) {
- p.no_convert = false;
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine_dst(_read_conv.depth);
- }
- read_rect(x, y, w, h, data, &p);
- }
-
- void LGFXBase::scroll(int_fast16_t dx, int_fast16_t dy)
- {
- setColor(_base_rgb888);
- int32_t absx = abs(dx);
- int32_t absy = abs(dy);
- if (absx >= _sw || absy >= _sh) {
- writeFillRect(_sx, _sy, _sw, _sh);
- return;
- }
-
- int32_t w = _sw - absx;
- int32_t h = _sh - absy;
-
- int32_t src_x = dx < 0 ? _sx - dx : _sx;
- int32_t dst_x = src_x + dx;
- int32_t src_y = dy < 0 ? _sy - dy : _sy;
- int32_t dst_y = src_y + dy;
-
- startWrite();
- copyRect_impl(dst_x, dst_y, w, h, src_x, src_y);
-
- if ( dx > 0) writeFillRect(_sx , dst_y, dx, h);
- else if (dx < 0) writeFillRect(_sx + _sw + dx, dst_y, -dx, h);
- if ( dy > 0) writeFillRect(_sx, _sy , _sw, dy);
- else if (dy < 0) writeFillRect(_sx, _sy + _sh + dy, _sw, -dy);
- endWrite();
- }
-
- void LGFXBase::copyRect(int32_t dst_x, int32_t dst_y, int32_t w, int32_t h, int32_t src_x, int32_t src_y)
- {
- if (src_x < dst_x) { if (src_x < 0) { w += src_x; dst_x -= src_x; src_x = 0; } if (w > _width - dst_x) w = _width - dst_x; }
- else { if (dst_x < 0) { w += dst_x; src_x -= dst_x; dst_x = 0; } if (w > _width - src_x) w = _width - src_x; }
- if (w < 1) return;
-
- if (src_y < dst_y) { if (src_y < 0) { h += src_y; dst_y -= src_y; src_y = 0; } if (h > _height - dst_y) h = _height - dst_y; }
- else { if (dst_y < 0) { h += dst_y; src_y -= dst_y; dst_y = 0; } if (h > _height - src_y) h = _height - src_y; }
- if (h < 1) return;
-
- startWrite();
- copyRect_impl(dst_x, dst_y, w, h, src_x, src_y);
- endWrite();
- }
-
- void LGFXBase::read_rect(int32_t x, int32_t y, int32_t w, int32_t h, void* dst, pixelcopy_t* param)
- {
- _adjust_abs(x, w);
- if (x < 0) { w += x; x = 0; }
- if (w > _width - x) w = _width - x;
- if (w < 1) return;
-
- _adjust_abs(y, h);
- if (y < 0) { h += y; y = 0; }
- if (h > _height - y) h = _height - y;
- if (h < 1) return;
-
- readRect_impl(x, y, w, h, dst, param);
- }
-
- struct paint_point_t { int32_t lx,rx,y,oy; };
-
- static void paint_add_points(std::list& points, int lx, int rx, int y, int oy, bool* linebuf)
- {
- paint_point_t pt { 0, 0, y, oy };
- while (lx <= rx) {
- while (lx < rx && !linebuf[lx]) ++lx;
- if (!linebuf[lx]) break;
- pt.lx = lx;
- while (++lx <= rx && linebuf[lx]);
- pt.rx = lx - 1;
- points.push_back(pt);
- }
- }
- void LGFXBase::floodFill(int32_t x, int32_t y) {
- if (x < _clip_l || x > _clip_r || y < _clip_t || y > _clip_b) return;
- bgr888_t target;
- readRectRGB(x, y, 1, 1, &target);
- if (_color.raw == _write_conv.convert(lgfx::color888(target.r, target.g, target.b))) return;
-
- pixelcopy_t p;
- p.transp = _read_conv.convert(lgfx::color888(target.r, target.g, target.b));
- switch (_read_conv.depth) {
- case 24: p.fp_copy = pixelcopy_t::compare_rgb_fast; break;
- case 18: p.fp_copy = pixelcopy_t::compare_rgb_fast; break;
- case 16: p.fp_copy = pixelcopy_t::compare_rgb_fast; break;
- case 8: p.fp_copy = pixelcopy_t::compare_rgb_fast; break;
- default: p.fp_copy = pixelcopy_t::compare_bit_fast;
- p.src_bits = _read_conv.depth;
- p.src_mask = (1 << p.src_bits) - 1;
- p.transp &= p.src_mask;
- break;
- }
-
- int32_t cl = _clip_l;
- int w = _clip_r - cl + 1;
- uint8_t bufIdx = 0;
- bool* linebufs[3] = { new bool[w], new bool[w], new bool[w] };
- int32_t bufY[3] = {-2, -2, -2}; // 3 line buffer (default: out of range.)
- bufY[0] = y;
- read_rect(cl, y, w, 1, linebufs[0], &p);
- std::list points;
- points.push_back({x, x, y, y});
-
- startWrite();
- while (!points.empty()) {
- int32_t y0 = bufY[bufIdx];
- auto it = points.begin();
- int32_t counter = 0;
- while (it->y != y0 && ++it != points.end()) ++counter;
- if (it == points.end()) {
- if (counter < 256) {
- ++bufIdx;
- int32_t y1 = bufY[(bufIdx )%3];
- int32_t y2 = bufY[(bufIdx+1)%3];
- it = points.begin();
- while ((it->y != y1) && (it->y != y2) && (++it != points.end()));
- }
- }
-
- bufIdx = 0;
- if (it == points.end()) {
- it = points.begin();
- bufY[0] = it->y;
- read_rect(cl, it->y, w, 1, linebufs[0], &p);
- } else {
- for (; bufIdx < 2; ++bufIdx) if (it->y == bufY[bufIdx]) break;
- }
- bool* linebuf = &linebufs[bufIdx][- cl];
-
- int lx = it->lx;
- int rx = it->rx;
- int ly = it->y;
- int oy = it->oy;
- points.erase(it);
- if (!linebuf[lx]) continue;
-
- int lxsav = lx - 1;
- int rxsav = rx + 1;
-
- int cr = _clip_r;
- while (lx > cl && linebuf[lx - 1]) --lx;
- while (rx < cr && linebuf[rx + 1]) ++rx;
-
- writeFastHLine(lx, ly, rx - lx + 1);
- memset(&linebuf[lx], 0, rx - lx + 1);
-
- int newy = ly - 1;
- do {
- if (newy == oy && lx >= lxsav && rxsav >= rx) continue;
- if (newy < _clip_t) continue;
- if (newy > _clip_b) continue;
- int bidx = 0;
- while (newy != bufY[bidx] && ++bidx != 3);
- if (bidx == 3) {
- for (bidx = 0; bidx < 2 && (abs(bufY[bidx] - ly) <= 1); ++bidx);
- bufY[bidx] = newy;
- read_rect(cl, newy, w, 1, linebufs[bidx], &p);
- }
- bool* linebuf = &linebufs[bidx][- cl];
- if (newy == oy) {
- paint_add_points(points, lx ,lxsav, newy, ly, linebuf);
- paint_add_points(points, rxsav ,rx, newy, ly, linebuf);
- } else {
- paint_add_points(points, lx ,rx, newy, ly, linebuf);
- }
- } while ((newy += 2) < ly + 2);
- }
- int i = 0;
- do { delete[] linebufs[i]; } while (++i != 3);
- endWrite();
- }
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
- static char* numberToStr(unsigned long n, char* buf, size_t buflen, uint8_t base)
- {
- char *str = &buf[buflen - 1];
-
- *str = '\0';
-
- if (base < 2) { base = 10; } // prevent crash if called with base == 1
- do {
- unsigned long m = n;
- n /= base;
- char c = m - base * n;
- *--str = c < 10 ? c + '0' : c + 'A' - 10;
- } while (n);
-
- return str;
- }
-
- static char* numberToStr(long n, char* buf, size_t buflen, uint8_t base)
- {
- if (n >= 0) return numberToStr((unsigned long) n, buf, buflen, base);
- auto res = numberToStr(- n, buf, buflen, 10) - 1;
- res[0] = '-';
- return res;
- }
-
- static char* floatToStr(double number, char* buf, size_t /*buflen*/, uint8_t digits)
- {
- if (std::isnan(number)) { return strcpy(buf, "nan"); }
- if (std::isinf(number)) { return strcpy(buf, "inf"); }
- if (number > 4294967040.0) { return strcpy(buf, "ovf"); } // constant determined empirically
- if (number <-4294967040.0) { return strcpy(buf, "ovf"); } // constant determined empirically
-
- char* dst = buf;
- // Handle negative numbers
- //bool negative = (number < 0.0);
- if (number < 0.0) {
- number = -number;
- *dst++ = '-';
- }
-
- // Round correctly so that print(1.999, 2) prints as "2.00"
- double rounding = 0.5;
- for(uint8_t i = 0; i < digits; ++i) {
- rounding /= 10.0;
- }
-
- number += rounding;
-
- // Extract the integer part of the number and print it
- unsigned long int_part = (unsigned long) number;
- double remainder = number - (double) int_part;
-
- {
- constexpr size_t len = 14;
- char numstr[len];
- auto tmp = numberToStr(int_part, numstr, len, 10);
- auto slen = strlen(tmp);
- memcpy(dst, tmp, slen);
- dst += slen;
- }
-
- // Print the decimal point, but only if there are digits beyond
- if (digits > 0) {
- dst[0] = '.';
- ++dst;
- }
- // Extract digits from the remainder one at a time
- while (digits-- > 0) {
- remainder *= 10.0;
- unsigned int toPrint = (unsigned int)(remainder);
- dst[0] = '0' + toPrint;
- ++dst;
- remainder -= toPrint;
- }
- dst[0] = 0;
- return buf;
- }
-
- uint16_t LGFXBase::decodeUTF8(uint8_t c)
- {
- // 7 bit Unicode Code Point
- if (!(c & 0x80)) {
- _decoderState = utf8_decode_state_t::utf8_state0;
- return c;
- }
-
- if (_decoderState == utf8_decode_state_t::utf8_state0)
- {
- // 11 bit Unicode Code Point
- if ((c & 0xE0) == 0xC0)
- {
- _unicode_buffer = ((c & 0x1F)<<6);
- _decoderState = utf8_decode_state_t::utf8_state1;
- return 0;
- }
-
- // 16 bit Unicode Code Point
- if ((c & 0xF0) == 0xE0)
- {
- _unicode_buffer = ((c & 0x0F)<<12);
- _decoderState = utf8_decode_state_t::utf8_state2;
- return 0;
- }
- // 21 bit Unicode Code Point not supported so fall-back to extended ASCII
- //if ((c & 0xF8) == 0xF0) return (uint16_t)c;
- }
- else
- {
- if (_decoderState == utf8_decode_state_t::utf8_state2)
- {
- _unicode_buffer |= ((c & 0x3F)<<6);
- _decoderState = utf8_decode_state_t::utf8_state1;
- return 0;
- }
- _unicode_buffer |= (c & 0x3F);
- _decoderState = utf8_decode_state_t::utf8_state0;
- return _unicode_buffer;
- }
-
- _decoderState = utf8_decode_state_t::utf8_state0;
-
- return c; // fall-back to extended ASCII
- }
-
- int32_t LGFXBase::fontHeight(const IFont* font) const
- {
- FontMetrics fm;
- font->getDefaultMetric(&fm);
- return fm.height * _text_style.size_y;
- }
-
- int32_t LGFXBase::fontWidth(const IFont* font) const
- {
- FontMetrics fm;
- font->getDefaultMetric(&fm);
- return fm.width * _text_style.size_x;
- }
-
- int32_t LGFXBase::textLength(const char *string, int32_t width)
- {
- if (!string || !string[0]) return 0;
-
- auto sx = _text_style.size_x;
-
- int32_t left = 0;
- int32_t right = 0;
- auto str = string;
- do {
- uint16_t uniCode = *string;
- if (_text_style.utf8) {
- do {
- uniCode = decodeUTF8(*string);
- } while (uniCode < 0x20 && *(++string));
- if (uniCode < 0x20) break;
- }
-
- //if (!_font->updateFontMetric(&_font_metrics, uniCode)) continue;
- _font->updateFontMetric(&_font_metrics, uniCode);
- if (left == 0 && right == 0 && _font_metrics.x_offset < 0) left = right = - (int)(_font_metrics.x_offset * sx);
- right = left + std::max(_font_metrics.x_advance * sx, int(_font_metrics.width * sx) + int(_font_metrics.x_offset * sx));
- //right = left + (int)(std::max(_font_metrics.x_advance, _font_metrics.width + _font_metrics.x_offset) * sx);
- left += (int)(_font_metrics.x_advance * sx);
- if (width <= right) return string - str;
- } while (*(++string));
- return string - str;
- }
-
- int32_t LGFXBase::textWidth(const char *string)
- {
- if (!string || !string[0]) return 0;
-
- auto sx = _text_style.size_x;
-
- int32_t left = 0;
- int32_t right = 0;
- do {
- uint16_t uniCode = *string;
- if (_text_style.utf8) {
- do {
- uniCode = decodeUTF8(*string);
- } while (uniCode < 0x20 && *(++string));
- if (uniCode < 0x20) break;
- }
-
- //if (!_font->updateFontMetric(&_font_metrics, uniCode)) continue;
- _font->updateFontMetric(&_font_metrics, uniCode);
- if (left == 0 && right == 0 && _font_metrics.x_offset < 0) left = right = - (int)(_font_metrics.x_offset * sx);
- right = left + std::max(_font_metrics.x_advance*sx, int(_font_metrics.width*sx) + int(_font_metrics.x_offset * sx));
- //right = left + (int)(std::max(_font_metrics.x_advance, _font_metrics.width + _font_metrics.x_offset) * sx);
- left += (int)(_font_metrics.x_advance * sx);
- } while (*(++string));
- return right;
- }
-
-
- size_t LGFXBase::drawNumber(long long_num, int32_t poX, int32_t poY)
- {
- constexpr size_t len = 8 * sizeof(long) + 1;
- char buf[len];
- return drawString(numberToStr(long_num, buf, len, 10), poX, poY);
- }
-
- size_t LGFXBase::drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY)
- {
- size_t len = 14 + dp;
- char buf[len];
- return drawString(floatToStr(floatNumber, buf, len, dp), poX, poY);
- }
-
- size_t LGFXBase::drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font) {
- if (_font == fontdata[font]) return drawChar(uniCode, x, y);
- _filled_x = 0;
- return fontdata[font]->drawChar(this, x, y, uniCode, &_text_style);
- }
-
-
- size_t LGFXBase::draw_string(const char *string, int32_t x, int32_t y, textdatum_t datum)
- {
- int16_t sumX = 0;
- int32_t cwidth = textWidth(string); // Find the pixel width of the string in the font
- int32_t cheight = _font_metrics.height * _text_style.size_y;
-
- if (string && string[0]) {
- auto tmp = string;
- do {
- uint16_t uniCode = *tmp;
- if (_text_style.utf8) {
- do {
- uniCode = decodeUTF8(*tmp);
- } while (uniCode < 0x20 && *++tmp);
- if (uniCode < 0x20) break;
- }
- //if (_font->updateFontMetric(&_font_metrics, uniCode))
- {
- _font->updateFontMetric(&_font_metrics, uniCode);
- if (_font_metrics.x_offset < 0) sumX = - _font_metrics.x_offset * _text_style.size_x;
- break;
- }
- } while (*++tmp);
- }
- if (datum & middle_left) { // vertical: middle
- y -= cheight >> 1;
- } else if (datum & bottom_left) { // vertical: bottom
- y -= cheight;
- } else if (datum & baseline_left) { // vertical: baseline
- y -= (int)(_font_metrics.baseline * _text_style.size_y);
- }
-
- this->startWrite();
- int32_t padx = _padding_x;
- if ((_text_style.fore_rgb888 != _text_style.back_rgb888) && (padx > cwidth)) {
- this->setColor(_text_style.back_rgb888);
- if (datum & top_center) {
- auto halfcwidth = cwidth >> 1;
- auto halfpadx = (padx >> 1);
- this->writeFillRect(x - halfpadx, y, halfpadx - halfcwidth, cheight);
- halfcwidth = cwidth - halfcwidth;
- halfpadx = padx - halfpadx;
- this->writeFillRect(x + halfcwidth, y, halfpadx - halfcwidth, cheight);
- } else if (datum & top_right) {
- this->writeFillRect(x - padx, y, padx - cwidth, cheight);
- } else {
- this->writeFillRect(x + cwidth, y, padx - cwidth, cheight);
- }
- }
-
- if (datum & top_center) { // Horizontal: middle
- x -= cwidth >> 1;
- } else if (datum & top_right) { // Horizontal: right
- x -= cwidth;
- }
-
- y -= int(_font_metrics.y_offset * _text_style.size_y);
-
- _filled_x = 0;
- if (string && string[0]) {
- do {
- uint16_t uniCode = *string;
- if (_text_style.utf8) {
- do {
- uniCode = decodeUTF8(*string);
- } while (uniCode < 0x20 && *++string);
- if (uniCode < 0x20) break;
- }
-// sumX += (fpDrawChar)(this, x + sumX, y, uniCode, &_text_style, _font);
- sumX += _font->drawChar(this, x + sumX, y, uniCode, &_text_style);
- } while (*(++string));
- }
- this->endWrite();
-
- return sumX;
- }
-
- size_t LGFXBase::write(uint8_t utf8)
- {
- if (utf8 == '\r') return 1;
- if (utf8 == '\n') {
- _filled_x = (_textscroll) ? this->_sx : 0;
- _cursor_x = _filled_x;
- _cursor_y += _font_metrics.y_advance * _text_style.size_y;
- } else {
- uint16_t uniCode = utf8;
- if (_text_style.utf8) {
- uniCode = decodeUTF8(utf8);
- if (uniCode < 0x20) return 1;
- }
- //if (!(fpUpdateFontSize)(this, uniCode)) return 1;
- //if (!_font->updateFontMetric(&_font_metrics, uniCode)) return 1;
- _font->updateFontMetric(&_font_metrics, uniCode);
-
- int32_t xo = _font_metrics.x_offset * _text_style.size_x;
- int32_t w = std::max(xo + _font_metrics.width * _text_style.size_x, _font_metrics.x_advance * _text_style.size_x);
- if (_textscroll || _textwrap_x) {
- int32_t llimit = _textscroll ? this->_sx : this->_clip_l;
- int32_t rlimit = _textscroll ? this->_sx + this->_sw : (this->_clip_r + 1);
- if (_cursor_x + w > rlimit) {
- _filled_x = llimit;
- _cursor_x = llimit - std::min(0, xo);
- _cursor_y += _font_metrics.y_advance * _text_style.size_y;
- }
- if (_cursor_x < llimit - xo) _cursor_x = llimit - xo;
- }
-
- int32_t h = _font_metrics.height * _text_style.size_y;
-
- int32_t ydiff = 0;
- if (_text_style.datum & middle_left) { // vertical: middle
- ydiff -= h >> 1;
- } else if (_text_style.datum & bottom_left) { // vertical: bottom
- ydiff -= h;
- } else if (_text_style.datum & baseline_left) { // vertical: baseline
- ydiff -= (int)(_font_metrics.baseline * _text_style.size_y);
- }
- int32_t y = _cursor_y + ydiff;
-
- if (_textscroll) {
- if (y < this->_sy) y = this->_sy;
- else {
- int yshift = (this->_sy + this->_sh) - (y + h);
- if (yshift < 0) {
- this->scroll(0, yshift);
- y += yshift;
- }
- }
- } else if (_textwrap_y) {
- if (y + h > (this->_clip_b + 1)) {
- y = this->_clip_t;
- } else
- if (y < this->_clip_t) y = this->_clip_t;
- }
- _cursor_y = y - ydiff;
- y -= int(_font_metrics.y_offset * _text_style.size_y);
- //_cursor_x += (fpDrawChar)(this, _cursor_x, y, uniCode, &_text_style, _font);
- _cursor_x += _font->drawChar(this, _cursor_x, y, uniCode, &_text_style);
- }
-
- return 1;
- }
-
- size_t LGFXBase::printNumber(unsigned long n, uint8_t base)
- {
- size_t len = 8 * sizeof(long) + 1;
- char buf[len];
- return write(numberToStr(n, buf, len, base));
- }
-
- size_t LGFXBase::printFloat(double number, uint8_t digits)
- {
- size_t len = 14 + digits;
- char buf[len];
- return write(floatToStr(number, buf, len, digits));
- }
-
- #if !defined (ARDUINO)
- size_t LGFXBase::printf(const char * format, ...)
- {
- char loc_buf[64];
- char * temp = loc_buf;
- va_list arg;
- va_list copy;
- va_start(arg, format);
- va_copy(copy, arg);
- size_t len = vsnprintf(temp, sizeof(loc_buf), format, copy);
- va_end(copy);
-
- if (len >= sizeof(loc_buf)){
- temp = (char*) malloc(len+1);
- if (temp == nullptr) {
- va_end(arg);
- return 0;
- }
- len = vsnprintf(temp, len+1, format, arg);
- }
- va_end(arg);
- len = write((uint8_t*)temp, len);
- if (temp != loc_buf){
- free(temp);
- }
- return len;
- }
- #endif
-
- void LGFXBase::setFont(const IFont* font)
- {
- _runtime_font.reset();
- if (font == nullptr) font = &fonts::Font0;
- _font = font;
- //_decoderState = utf8_decode_state_t::utf8_state0;
-
- font->getDefaultMetric(&_font_metrics);
-
- //switch (font->getType()) {
- //default:
- //case IFont::font_type_t::ft_glcd: fpDrawChar = drawCharGLCD; break;
- //case IFont::font_type_t::ft_bmp: fpDrawChar = drawCharBMP; break;
- //case IFont::font_type_t::ft_rle: fpDrawChar = drawCharRLE; break;
- //case IFont::font_type_t::ft_bdf: fpDrawChar = drawCharBDF; break;
- //case IFont::font_type_t::ft_gfx: fpDrawChar = drawCharGFXFF; break;
- //}
- }
-
- /// load VLW font
- bool LGFXBase::loadFont(const uint8_t* array)
- {
- this->unloadFont();
- _font_data.set(array);
-
- auto font = new VLWfont();
- this->_runtime_font.reset(font);
-
- if (font->loadFont(&_font_data)) {
- this->_font = font;
- this->_font->getDefaultMetric(&this->_font_metrics);
- return true;
- } else {
- this->unloadFont();
- return false;
- }
- }
-
- void LGFXBase::unloadFont(void)
- {
- if (_runtime_font.get() != nullptr) { setFont(&fonts::Font0); }
- }
-
- void LGFXBase::showFont(uint32_t td)
- {
- auto font = (const VLWfont*)this->_font;
- if (!font->_fontLoaded) return;
-
- int16_t x = this->width();
- int16_t y = this->height();
- uint32_t timeDelay = 0; // No delay before first page
-
- this->fillScreen(this->_text_style.back_rgb888);
-
- for (uint16_t i = 0; i < font->gCount; i++)
- {
- // Check if this will need a new screen
- if (x + font->gdX[i] + font->gWidth[i] >= this->width()) {
- x = - font->gdX[i];
-
- y += font->yAdvance;
- if (y + font->maxAscent + font->descent >= this->height()) {
- x = - font->gdX[i];
- y = 0;
- delay(timeDelay);
- timeDelay = td;
- this->fillScreen(this->_text_style.back_rgb888);
- }
- }
-
- this->drawChar(font->gUnicode[i], x, y);
- x += font->gxAdvance[i];
- //yield();
- }
-
- delay(timeDelay);
- this->fillScreen(this->_text_style.back_rgb888);
- //fontFile.close();
- }
-
- void LGFXBase::setAttribute(attribute_t attr_id, uint8_t param) {
- switch (attr_id) {
- case cp437_switch:
- _text_style.cp437 = param;
- break;
- case utf8_switch:
- _text_style.utf8 = param;
- _decoderState = utf8_decode_state_t::utf8_state0;
- break;
- case epd_mode_switch:
- _epd_mode = (epd_mode_t)param;
- break;
- default: break;
- }
- }
-
- uint8_t LGFXBase::getAttribute(attribute_t attr_id) {
- switch (attr_id) {
- case cp437_switch: return _text_style.cp437;
- case utf8_switch: return _text_style.utf8;
- case epd_mode_switch: return _epd_mode;
- default: return 0;
- }
- }
-
-//----------------------------------------------------------------------------
- void LGFXBase::qrcode(const char *string, int32_t x, int32_t y, int32_t width, uint8_t version) {
- if (width == -1) {
- width = std::min(_width, _height) * 9 / 10;
- }
- if (x == -1 || y == -1) {
- x = (_width - width) >> 1;
- y = (_height- width) >> 1;
- }
-
- setColor(0xFFFFFFU);
- startWrite();
- writeFillRect(x, y, width, width);
- for (; version <= 40; ++version) {
- QRCode qrcode;
- uint8_t qrcodeData[lgfx_qrcode_getBufferSize(version)];
- if (0 != lgfx_qrcode_initText(&qrcode, qrcodeData, version, 0, string)) continue;
- int_fast16_t thickness = width / qrcode.size;
- if (!thickness) break;
- int_fast16_t lineLength = qrcode.size * thickness;
- int_fast16_t xOffset = x + ((width - lineLength) >> 1);
- int_fast16_t yOffset = y + ((width - lineLength) >> 1);
- setColor(0);
- y = 0;
- do {
- x = 0;
- do {
- if (lgfx_qrcode_getModule(&qrcode, x, y)) writeFillRect(x * thickness + xOffset, y * thickness + yOffset, thickness, thickness);
- } while (++x < qrcode.size);
- } while (++y < qrcode.size);
- break;
- }
- endWrite();
- }
-//----------------------------------------------------------------------------
-
- struct image_info_t
- {
- LGFXBase* gfx;
- int32_t x;
- int32_t y;
- int32_t maxWidth;
- int32_t maxHeight;
- int32_t offX;
- int32_t offY;
- float zoom_x;
- float zoom_y;
- datum_t datum;
-
- protected:
- int32_t _cl;
- int32_t _ct;
- int32_t _cw;
- int32_t _ch;
-
- public:
-
- void end(void)
- {
- gfx->setClipRect(_cl, _ct, _cw, _ch);
- }
-
- bool begin( LGFXBase* gfx
- , int32_t x
- , int32_t y
- , int32_t maxWidth
- , int32_t maxHeight
- , int32_t offX
- , int32_t offY
- , float zoom_x
- , float zoom_y
- , datum_t datum
- , int32_t w
- , int32_t h
- )
- {
- gfx->getClipRect(&_cl, &_ct, &_cw, &_ch);
-
- if (zoom_y <= 0.0f || zoom_x <= 0.0f)
- {
- float fit_width = (maxWidth > 0) ? maxWidth : gfx->width();
- float fit_height = (maxHeight > 0) ? maxHeight : gfx->height();
- if (zoom_x <= -1.0f) { zoom_x = fit_width / w; }
- if (zoom_y <= -1.0f) { zoom_y = fit_height / h; }
- if (zoom_x <= 0.0f)
- {
- if (zoom_y <= 0.0f)
- {
- zoom_y = std::min(fit_width / w, fit_height / h);
- }
- zoom_x = zoom_y;
- }
- if (zoom_y <= 0.0f)
- {
- zoom_y = zoom_x;
- }
- }
-
- if (datum)
- {
- if (datum & (datum_t::top_center | datum_t::top_right))
- {
- float fit_width = (maxWidth > 0) ? maxWidth : gfx->width();
- float fw = fit_width - w * zoom_x;
- if (datum & datum_t::top_center) { fw /= 2; }
- offX -= fw;
- }
- if (datum & (datum_t::middle_left | datum_t::bottom_left | datum_t::baseline_left))
- {
- float fit_height = (maxHeight > 0) ? maxHeight : gfx->height();
- float fh = fit_height - h * zoom_y;
- if (datum & datum_t::middle_left) { fh /= 2; }
- offY -= fh;
- }
- }
-
- if (maxWidth <= 0) { maxWidth = INT16_MAX; }
- int32_t right = x + maxWidth;
- const int32_t cr = _cw + _cl;
- if (right > cr) { right = cr; }
- if (x < _cl) { offX -= x - _cl; x = _cl; }
- if (offX < 0) { x -= offX; offX = 0; }
- if (maxWidth > right - x) { maxWidth = right - x; }
- int32_t ww = ((int32_t)ceilf(w * zoom_x)) - offX;
- if (maxWidth > ww) { maxWidth = ww; }
-
- if (maxHeight <= 0) { maxHeight = INT16_MAX; }
- int32_t bottom = y + maxHeight;
- const int32_t cb = _ch + _ct;
- if (bottom > cb) { bottom = cb; }
- if (y < _ct) { offY -= y - _ct; y = _ct; }
- if (offY < 0) { y -= offY; offY = 0; }
- if (maxHeight > bottom - y) { maxHeight = bottom - y; }
- int32_t hh = ((int32_t)ceilf(h * zoom_y)) - offY;
- if (maxHeight > hh) { maxHeight = hh; }
-
- this->gfx = gfx ;
- this->x = x ;
- this->y = y ;
- this->maxWidth = maxWidth ;
- this->maxHeight = maxHeight;
- this->offX = offX ;
- this->offY = offY ;
- this->zoom_x = zoom_x ;
- this->zoom_y = zoom_y ;
- this->datum = datum ;
-
- if (maxWidth <= 0) return false;
- if (maxHeight <= 0) return false;
-
- gfx->setClipRect(x, y, maxWidth, maxHeight);
- return true;
- }
- };
-
- bool LGFXBase::draw_bmp(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float zoom_x, float zoom_y, datum_t datum)
- {
- prepareTmpTransaction(data);
- bitmap_header_t bmpdata;
- if (!bmpdata.load_bmp_header(data) || (bmpdata.biCompression > 3)) {
- return false;
- }
-
- uint32_t seekOffset = bmpdata.bfOffBits;
- uint_fast16_t bpp = bmpdata.biBitCount; // 24 bcBitCount 24=RGB24bit
- int32_t w = bmpdata.biWidth;
- int32_t h = abs(bmpdata.biHeight); // bcHeight Image height (pixels)
-
- image_info_t info;
- if (!info.begin( this
- , x
- , y
- , maxWidth
- , maxHeight
- , offX
- , offY
- , zoom_x
- , zoom_y
- , datum
- , w, h))
- {
- return true;
- }
-
- argb8888_t *palette = nullptr;
- if (bpp <= 8) {
- palette = (argb8888_t*)alloca(sizeof(argb8888_t*) * (1 << bpp));
- if (!palette) { return false; }
- data->seek(bmpdata.biSize + 14);
- data->read((uint8_t*)palette, (1 << bpp)*sizeof(argb8888_t)); // load palette
- }
-
- x = info.x - info.offX;
- y = info.y - info.offY;
- zoom_x = info.zoom_x;
- zoom_y = info.zoom_y;
-
- data->seek(seekOffset);
-
- auto dst_depth = this->_write_conv.depth;
- uint32_t buffersize = ((w * bpp + 31) >> 5) << 2; // readline 4Byte align.
- auto lineBuffer = (uint8_t*)alloca(buffersize + 4);
-
- pixelcopy_t p(lineBuffer, dst_depth, (color_depth_t)bpp, this->_palette_count, palette);
- p.no_convert = false;
- if (8 >= bpp && !this->_palette_count) {
- p.fp_copy = pixelcopy_t::get_fp_copy_palette_affine(dst_depth);
- } else {
- if (bpp == 16) {
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(dst_depth);
- } else if (bpp == 24) {
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(dst_depth);
- } else if (bpp == 32) {
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(dst_depth);
- }
- }
- p.src_x32_add = (1u << FP_SCALE) / zoom_x;
-
- //If the value of Height is positive, the image data is from bottom to top
- //If the value of Height is negative, the image data is from top to bottom.
- int32_t flow = (bmpdata.biHeight > 0) ? -1 : 1;
- if (bmpdata.biHeight > 0) y += ceilf(h * zoom_y) - 1;
-
- int32_t y32 = (y << FP_SCALE);
- int32_t dst_y32_add = (1u << FP_SCALE) * zoom_y;
- if (bmpdata.biHeight > 0) dst_y32_add = - dst_y32_add;
-
- this->startWrite(!data->hasParent());
-
- float affine[6] = { zoom_x, 0.0f, (float)x, 0.0f, 1.0f, 0.0f };
- p.src_bitwidth = w;
- p.src_width = w;
- p.src_height = 1;
-
- do
- {
- data->preRead();
- if (bmpdata.biCompression == 1)
- {
- bmpdata.load_bmp_rle8(data, lineBuffer, w);
- } else
- if (bmpdata.biCompression == 2)
- {
- bmpdata.load_bmp_rle4(data, lineBuffer, w);
- }
- else
- {
- data->read(lineBuffer, buffersize);
- }
- data->postRead();
- y32 += dst_y32_add;
- int32_t next_y = y32 >> FP_SCALE;
- while (y != next_y)
- {
- p.src_x32 = 0;
- affine[5] = y;
- this->push_image_affine(affine, &p);
- y += flow;
- }
- } while (--h);
-
- info.end();
-
- this->endWrite();
-
- return true;
- }
-
-
- struct image_decoder_t : public image_info_t
- {
- DataWrapper* data;
-
- static uint32_t read_data(void* self, uint8_t* buf, uint32_t len)
- {
- auto data = ((image_decoder_t*)self)->data;
- auto res = len;
- data->preRead();
- if (buf) {
- res = data->read(buf, len);
- } else {
- data->skip(len);
- }
- return res;
- }
- };
-
- struct draw_jpg_info_t : public image_decoder_t
- {
- pixelcopy_t *pc;
- };
-
- static uint32_t jpg_push_image(void *device, void *bitmap, JRECT *rect)
- {
- draw_jpg_info_t *jpeg = static_cast(device);
- jpeg->pc->src_data = bitmap;
- auto data = static_cast(jpeg->data);
- data->postRead();
- int32_t x = rect->left;
- int32_t y = rect->top;
- int32_t w = rect->right - rect->left + 1;
- int32_t h = rect->bottom - rect->top + 1;
- jpeg->gfx->pushImage( jpeg->x + x
- , jpeg->y + y
- , w
- , h
- , jpeg->pc
- , false);
- return 1;
- }
-
- static uint32_t jpg_push_image_affine(void *device, void *bitmap, JRECT *rect)
- {
- draw_jpg_info_t *jpeg = static_cast(device);
- jpeg->pc->src_data = bitmap;
- auto data = static_cast(jpeg->data);
- data->postRead();
-
- int32_t x = rect->left;
- int32_t y = rect->top;
- int32_t w = rect->right - rect->left + 1;
- int32_t h = rect->bottom - rect->top + 1;
- float affine[6] =
- { jpeg->zoom_x, 0.0f , x * jpeg->zoom_x + jpeg->x
- , 0.0f , jpeg->zoom_y, y * jpeg->zoom_y + jpeg->y
- };
- jpeg->gfx->pushImageAffine( affine, w, h, (bgr888_t*)jpeg->pc->src_data );
- return 1;
- }
-
- bool LGFXBase::draw_jpg(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float zoom_x, float zoom_y, datum_t datum)
- {
- draw_jpg_info_t jpeg;
- pixelcopy_t pc(nullptr, this->getColorDepth(), bgr888_t::depth, this->hasPalette());
- jpeg.pc = &pc;
- jpeg.data = data;
-
- lgfxJdec jpegdec;
-
- static constexpr uint16_t sz_pool = 3100;
- uint8_t *pool = (uint8_t*)heap_alloc_dma(sz_pool);
- if (!pool) {
-// ESP_LOGE("LGFX","memory allocation failure");
- return false;
- }
-
- auto jres = lgfx_jd_prepare(&jpegdec, jpeg.read_data, pool, sz_pool, &jpeg);
-
- if (jres != JDR_OK) {
-//ESP_LOGE("LGFX","jpeg prepare error:%x", jres);
- heap_free(pool);
- return false;
- }
-
- if (!jpeg.begin( this
- , x
- , y
- , maxWidth
- , maxHeight
- , offX
- , offY
- , zoom_x
- , zoom_y
- , datum
- , jpegdec.width, jpegdec.height))
- {
- heap_free(pool);
- return false;
- }
-
- if (jpeg.offX) { jpeg.x -= jpeg.offX; jpeg.offX = 0; }
- if (jpeg.offY) { jpeg.y -= jpeg.offY; jpeg.offY = 0; }
-
- jpeg_div::jpeg_div_t div = jpeg_div::jpeg_div_t::JPEG_DIV_NONE;
- float scale_max = std::max(jpeg.zoom_x, jpeg.zoom_y);
- if (scale_max <= 0.5f)
- {
- if ( scale_max <= 0.125f) { div = jpeg_div::jpeg_div_t::JPEG_DIV_8; }
- else if (scale_max <= 0.25f) { div = jpeg_div::jpeg_div_t::JPEG_DIV_4; }
- else { div = jpeg_div::jpeg_div_t::JPEG_DIV_2; }
-
- jpeg.zoom_x *= 1 << div;
- jpeg.zoom_y *= 1 << div;
- }
-
- this->startWrite(!data->hasParent());
-
- jres = lgfx_jd_decomp(&jpegdec, jpeg.zoom_x == 1.0f && jpeg.zoom_y == 1.0f ? jpg_push_image : jpg_push_image_affine, div);
-
- jpeg.end();
- this->endWrite();
-
- heap_free(pool);
-
- if (jres != JDR_OK) {
-//ESP_LOGE("LGFX","jpeg decomp error:%x", jres);
- return false;
- }
- return true;
- }
-
-
-
- struct png_file_decoder_t : public image_decoder_t
- {
- bgra8888_t* lineBuffer;
- pixelcopy_t *pc;
- };
-
-//-----
-
-
- static void png_draw_alpha_callback(void *user_data, uint32_t x, uint32_t y, uint_fast8_t div_x, size_t len, const uint8_t* argb)
- {
- auto p = (png_file_decoder_t*)user_data;
-
- int32_t y0 = (int32_t)y - p->offY;
- int32_t y1 = y0 + 1;
- if (y0 < 0) y0 = 0;
- if (y1 > p->maxHeight) y1 = p->maxHeight;
- if (y0 >= y1) return;
-
-/*
- while ((argb[idx * 4 + 3] == 0) && ++idx != len);
- if (idx == len) return;
- while ((argb[len * 4 - 1] == 0) && idx != --len);
- if (idx)
- {
- len -= idx;
- argb += idx * 4;
- x += idx * div_x;
- idx = 0;
- }
-///*/
-
- while ((int32_t)x < p->offX && --len)
- {
- x += div_x;
- argb += 4;
- }
- x -= p->offX;
-
- if (!len || (int32_t)x >= p->maxWidth) return;
-
- size_t idx = 0;
- while ((argb[idx * 4] == 255) && ++idx != len);
- p->data->postRead();
-
- bool hasAlpha = (idx != len);
- if (hasAlpha)
- {
- p->gfx->readRect(p->x, p->y + y0, p->maxWidth, 1, p->lineBuffer);
- do
- {
- uint_fast8_t a = argb[0];
- if (a) {
- if (a == 255) {
- p->lineBuffer[x].set(*(uint32_t*)argb);
- } else {
- auto data = &p->lineBuffer[x];
- uint_fast8_t inv = 255 - a;
- data->set( (argb[1] * a + data->r * inv + 255) >> 8
- , (argb[2] * a + data->g * inv + 255) >> 8
- , (argb[3] * a + data->b * inv + 255) >> 8
- );
- }
- }
- x += div_x;
- if ((int32_t)x >= p->maxWidth) break;
- argb += 4;
- } while (--len);
- p->pc->src_data = p->lineBuffer;
- p->gfx->pushImage(p->x, p->y + y0, p->maxWidth, 1, p->pc, false);
- }
- else
- if (div_x == 1)
- {
- p->pc->src_data = argb;
- p->gfx->pushImage(p->x, p->y + y0, p->maxWidth, 1, p->pc, false);
- }
- else
- {
- do
- {
- p->gfx->setColor(color888(argb[1], argb[2], argb[3]));
- p->gfx->writeFillRectPreclipped(p->x + x, p->y + y0, 1, 1);
- x += div_x;
- if ((int32_t)x >= p->maxWidth) break;
- argb += 4;
- } while (--len);
- }
- }
-
- static void png_draw_alpha_scale_callback(void *user_data, uint32_t x, uint32_t y, uint_fast8_t div_x, size_t len, const uint8_t* argb)
- {
- auto p = (png_file_decoder_t*)user_data;
-
- int32_t y0 = ceilf( y * p->zoom_y) - p->offY;
- if (y0 < 0) y0 = 0;
- int32_t y1 = ceilf((y + 1) * p->zoom_y) - p->offY;
- if (y1 > p->maxHeight) y1 = p->maxHeight;
- if (y0 >= y1) return;
-
- size_t idx = 0;
-/*
- while ((argb[idx * 4 + 3] == 0) && ++idx != len);
- if (idx == len) return;
- while ((argb[len * 4 - 1] == 0) && idx != --len);
- if (idx)
- {
- len -= idx;
- argb += idx * 4;
- x += idx * div_x;
- idx = 0;
- }
-//*/
-
-/*
- int32_t left = ceilf( x * p->zoom_x) - p->offX;
- if (left < 0) left = 0;
- int32_t right = ceilf((x + (len-1) * div_x + 1) * p->zoom_x) - p->offX;
- if (right > p->maxWidth) right = p->maxWidth;
-//*/
- p->data->postRead();
-
- while ((argb[idx * 4] == 255) && ++idx != len);
- bool hasAlpha = (idx != len);
- if (hasAlpha)
- {
-// ESP_LOGE("TR","alpha:%d", argb[idx * 4 + 3]);
- // uint32_t left = idx;
- // idx = len;
- // while (idx-- && (0 == argb[idx * 4 + 3] || argb[idx * 4 + 3] == 255));
- // uint32_t right = idx;
- do
- {
- p->gfx->readRect(p->x, p->y + y0, p->maxWidth, 1, p->lineBuffer);
- const uint8_t* argbbuf = argb;
- size_t loop = len;
- size_t xtmp = x;
- do
- {
- int32_t l = ceilf( xtmp * p->zoom_x) - p->offX;
- if (l < 0) l = 0;
- int32_t r = ceilf((xtmp + 1) * p->zoom_x) - p->offX;
- if (r > p->maxWidth) r = p->maxWidth;
- if (l < r)
- {
- uint_fast8_t a = argbbuf[0];
- if (a) {
- if (a == 255)
- {
- do
- {
- p->lineBuffer[l].set(*(uint32_t*)argbbuf);
- } while (++l < r);
- }
- else
- {
- uint_fast8_t inv = 255 - a;
- size_t ar = argbbuf[1] * a + 255;
- size_t ag = argbbuf[2] * a + 255;
- size_t ab = argbbuf[3] * a + 255;
- do
- {
- auto data = &p->lineBuffer[l];
- data->set( (ar + data->r * inv) >> 8
- , (ag + data->g * inv) >> 8
- , (ab + data->b * inv) >> 8);
- } while (++l < r);
- }
- }
- }
- argbbuf += 4;
- xtmp += div_x;
- } while (--loop);
- p->gfx->pushImage(p->x, p->y + y0, p->maxWidth, 1, p->pc, true);
- } while (++y0 != y1);
- }
- else
- if (div_x == 1)
- {
-//*
- p->gfx->waitDMA();
- do
- {
- int32_t l = ceilf( x * p->zoom_x) - p->offX;
- if (l < 0) l = 0;
- int32_t r = ceilf((x + 1) * p->zoom_x) - p->offX;
- if (r > p->maxWidth) r = p->maxWidth;
- if (l < r)
- {
- do {
- p->lineBuffer[l].set(*(uint32_t*)argb);
- } while (++l < r);
- }
- argb += 4;
- ++x;
- } while (--len);
- do {
- p->gfx->pushImage(p->x, p->y + y0, p->maxWidth, 1, p->pc, true);
- } while (++y0 != y1);
-/*/
- p->pc->src_x32_add = (1 << FP_SCALE) / p->zoom_x;
- p->pc->src_data = argb;
- int32_t l = - p->offX;
- do {
- p->pc->src_x32 = 0;
- p->gfx->pushImage(p->x + l, p->y + y0, p->maxWidth - l, 1, p->pc, true);
- } while (++y0 != y1);
- p->pc->src_x32_add = (1 << FP_SCALE);
- p->pc->src_data = p->lineBuffer;
-//*/
- }
- else
- {
- size_t h = y1 - y0;
- do
- {
- int32_t l = ceilf( x * p->zoom_x) - p->offX;
- if (l < 0) l = 0;
- int32_t r = ceilf((x + 1) * p->zoom_x) - p->offX;
- if (r > p->maxWidth) r = p->maxWidth;
- if (l < r)
- {
- p->gfx->setColor(color888(argb[1], argb[2], argb[3]));
- p->gfx->writeFillRectPreclipped(p->x + l, p->y + y0, r - l, h);
- }
- argb += 4;
- x += div_x;
- } while (--len);
- }
- }
-
- bool LGFXBase::draw_png(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float zoom_x, float zoom_y, datum_t datum)
- {
- pngle_t *pngle = lgfx_pngle_new();
- if (pngle == nullptr) { return false; }
-
- prepareTmpTransaction(data);
- png_file_decoder_t png;
- png.lineBuffer = nullptr;
- png.data = data;
-
- if (lgfx_pngle_prepare(pngle, image_decoder_t::read_data, &png) < 0)
- {
- lgfx_pngle_destroy(pngle);
- return false;
- }
-
- // png_init_callback(pngle, lgfx_pngle_get_width(pngle), lgfx_pngle_get_height(pngle));
- if (!png.begin( this
- , x
- , y
- , maxWidth
- , maxHeight
- , offX
- , offY
- , zoom_x
- , zoom_y
- , datum
- , lgfx_pngle_get_width(pngle), lgfx_pngle_get_height(pngle)))
- {
- lgfx_pngle_destroy(pngle);
- return true;
- }
-
-// pixelcopy_t pc(nullptr, this->getColorDepth(), bgr888_t::depth, this->_palette_count);
- pixelcopy_t pc(nullptr, this->getColorDepth(), bgra8888_t::depth, this->_palette_count);
- if (this->hasPalette() || pc.dst_bits < 8) {
- pc.fp_copy = pixelcopy_t::copy_bit_affine;
- pc.fp_skip = pixelcopy_t::skip_bit_affine;
- }
- else
- {
- pc.fp_skip = pixelcopy_t::skip_rgb_affine;
- pc.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(this->getColorDepth());
- }
- png.lineBuffer = (bgra8888_t*)heap_alloc_dma(sizeof(bgra8888_t) * png.maxWidth);
- pc.src_data = png.lineBuffer;
-
- png.pc = &pc;
-
-
- this->startWrite(!data->hasParent());
-
- auto res = lgfx_pngle_decomp(pngle, png.zoom_x == 1.0f && png.zoom_y == 1.0f ? png_draw_alpha_callback : png_draw_alpha_scale_callback);
-
- this->endWrite();
- if (png.lineBuffer) {
- this->waitDMA();
- heap_free(png.lineBuffer);
- }
- png.end();
- lgfx_pngle_destroy(pngle);
-
- return res < 0 ? false : true;
- }
-
- struct png_encoder_t
- {
- LGFXBase* gfx;
- int32_t x;
- int32_t y;
- };
-
- static uint8_t *png_encoder_get_row( uint8_t *pImage, int flip, int w, int h, int y, int, void *target )
- {
- auto enc = static_cast(target);
- uint32_t ypos = (flip ? (h - 1 - y) : y);
- enc->gfx->readRectRGB( enc->x, enc->y + ypos, w, 1, pImage );
- return pImage;
- }
-
- void* LGFXBase::createPng(size_t* datalen, int32_t x, int32_t y, int32_t width, int32_t height)
- {
- if (x < 0) x = 0;
- if (y < 0) y = 0;
- if (width == 0) width = _width - x;
- if (height == 0) height = _height - y;
- if (width > _width - x) width = _width - x;
- if (height > _height - y) height = _height - y;
-
- if (width < 0 || height < 0) return nullptr;
-
- void* rgbBuffer = heap_alloc_dma(width * 3);
-
- png_encoder_t enc = { this, x, y };
-
- auto res = tdefl_write_image_to_png_file_in_memory_ex_with_cb(rgbBuffer, width, height, 3, datalen, 6, 0, (tdefl_get_png_row_func)png_encoder_get_row, &enc);
-
- heap_free(rgbBuffer);
-
- return res;
- }
-//----------------------------------------------------------------------------
- }
-}
-
-extern "C" {
- #pragma GCC diagnostic pop
-}
-
-#endif
diff --git a/src/lgfx/v0/LGFXBase.hpp b/src/lgfx/v0/LGFXBase.hpp
deleted file mode 100644
index 7481852e..00000000
--- a/src/lgfx/v0/LGFXBase.hpp
+++ /dev/null
@@ -1,1123 +0,0 @@
-/*----------------------------------------------------------------------------/
- Lovyan GFX library - LCD graphics library .
-
- support platform:
- ESP32 (SPI/I2S) with Arduino/ESP-IDF
- ATSAMD51 (SPI) with Arduino
-
-Original Source:
- https://github.com/lovyan03/LovyanGFX/
-
-Licence:
- [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
-
-Author:
- [lovyan03](https://twitter.com/lovyan03)
-
-Contributors:
- [ciniml](https://github.com/ciniml)
- [mongonta0716](https://github.com/mongonta0716)
- [tobozo](https://github.com/tobozo)
-/----------------------------------------------------------------------------*/
-#ifndef LGFX_BASE_HPP_
-#define LGFX_BASE_HPP_
-
-extern "C" {
- #pragma GCC diagnostic ignored "-Wshadow"
- #pragma GCC diagnostic ignored "-Wdouble-promotion"
-}
-
-#include "lgfx_common.hpp"
-#include "lgfx_fonts.hpp"
-
-#include
-#include
-#include
-
-#if defined (ARDUINO)
-#include
-#endif
-
-namespace lgfx
-{
- inline namespace v0
- {
-//----------------------------------------------------------------------------
-
- class PanelCommon;
- class TouchCommon;
- class LGFX_Sprite;
- class FileWrapper;
-
- class LGFXBase
-#if defined (ARDUINO)
- : public Print
-#endif
- {
- friend LGFX_Sprite;
- friend IFont;
- public:
- LGFXBase() {}
- virtual ~LGFXBase() {}
-
-// color param format:
-// rgb888 : uint32_t
-// rgb565 : uint16_t & int16_t & int
-// rgb332 : uint8_t
- __attribute__ ((always_inline)) inline void setColor(uint8_t r, uint8_t g, uint8_t b) { _color.raw = _write_conv.convert(lgfx::color888(r,g,b)); }
- template __attribute__ ((always_inline)) inline void setColor(T color) { _color.raw = _write_conv.convert(color); }
- __attribute__ ((always_inline)) inline void setRawColor(uint32_t c) { _color.raw = c; }
-
- template __attribute__ ((always_inline)) inline void setBaseColor(T c) { _base_rgb888 = hasPalette() ? c : convert_to_rgb888(c); }
- uint32_t getBaseColor(void) const { return _base_rgb888; }
-
-// AdafruitGFX compatible functions.
-// However, startWrite and endWrite have an internal counter and are executed when the counter is 0.
-// If you do not want to the counter, call the transaction function directly.
- __attribute__ ((always_inline)) inline void startWrite(void) { if (1 == ++_transaction_count) beginTransaction(); }
- __attribute__ ((always_inline)) inline void endWrite(void) { if (_transaction_count) { if (1 == _transaction_count) { endTransaction(); } --_transaction_count; } }
- __attribute__ ((always_inline)) inline void writePixel(int32_t x, int32_t y) { if (x >= _clip_l && x <= _clip_r && y >= _clip_t && y <= _clip_b) writeFillRect_impl(x, y, 1, 1); }
- template inline void writePixel ( int32_t x, int32_t y , const T& color) { setColor(color); writePixel (x, y ); }
- template inline void writeFastVLine( int32_t x, int32_t y , int32_t h, const T& color) { setColor(color); writeFastVLine(x, y , h); }
- void writeFastVLine( int32_t x, int32_t y , int32_t h);
- template inline void writeFastHLine( int32_t x, int32_t y, int32_t w , const T& color) { setColor(color); writeFastHLine(x, y, w ); }
- void writeFastHLine( int32_t x, int32_t y, int32_t w);
- template inline void writeFillRect ( int32_t x, int32_t y, int32_t w, int32_t h, const T& color) { setColor(color); writeFillRect (x, y, w, h); }
- void writeFillRect ( int32_t x, int32_t y, int32_t w, int32_t h);
- template inline void writeColor ( const T& color, int32_t length) { if (0 >= length) return; setColor(color); pushBlock_impl(length); }
- template inline void writeFillRectPreclipped( int32_t x, int32_t y, int32_t w, int32_t h, const T& color) { setColor(color); writeFillRect_impl (x, y, w, h); }
- void writeFillRectPreclipped( int32_t x, int32_t y, int32_t w, int32_t h) { writeFillRect_impl (x, y, w, h); }
-
-
- __attribute__ ((always_inline)) inline void drawPixel( int32_t x, int32_t y ) { if (x >= _clip_l && x <= _clip_r && y >= _clip_t && y <= _clip_b) drawPixel_impl(x, y); }
- template inline void drawPixel ( int32_t x, int32_t y , const T& color) { setColor(color); drawPixel (x, y ); }
- template inline void drawFastVLine ( int32_t x, int32_t y , int32_t h , const T& color) { setColor(color); drawFastVLine(x, y , h ); }
- void drawFastVLine ( int32_t x, int32_t y , int32_t h);
- template inline void drawFastHLine ( int32_t x, int32_t y, int32_t w , const T& color) { setColor(color); drawFastHLine(x, y, w ); }
- void drawFastHLine ( int32_t x, int32_t y, int32_t w);
- template inline void fillRect ( int32_t x, int32_t y, int32_t w, int32_t h , const T& color) { setColor(color); fillRect (x, y, w, h ); }
- void fillRect ( int32_t x, int32_t y, int32_t w, int32_t h);
- template inline void drawRect ( int32_t x, int32_t y, int32_t w, int32_t h , const T& color) { setColor(color); drawRect (x, y, w, h ); }
- void drawRect ( int32_t x, int32_t y, int32_t w, int32_t h);
- template inline void drawRoundRect ( int32_t x, int32_t y, int32_t w, int32_t h, int32_t r, const T& color) { setColor(color); drawRoundRect(x, y, w, h, r); }
- void drawRoundRect ( int32_t x, int32_t y, int32_t w, int32_t h, int32_t r);
- template inline void fillRoundRect ( int32_t x, int32_t y, int32_t w, int32_t h, int32_t r, const T& color) { setColor(color); fillRoundRect(x, y, w, h, r); }
- void fillRoundRect ( int32_t x, int32_t y, int32_t w, int32_t h, int32_t r);
- template inline void drawCircle ( int32_t x, int32_t y , int32_t r, const T& color) { setColor(color); drawCircle (x, y , r); }
- void drawCircle ( int32_t x, int32_t y , int32_t r);
- template inline void fillCircle ( int32_t x, int32_t y , int32_t r, const T& color) { setColor(color); fillCircle (x, y , r); }
- void fillCircle ( int32_t x, int32_t y , int32_t r);
- template inline void drawEllipse ( int32_t x, int32_t y, int32_t rx, int32_t ry , const T& color) { setColor(color); drawEllipse (x, y, rx, ry ); }
- void drawEllipse ( int32_t x, int32_t y, int32_t rx, int32_t ry);
- template inline void fillEllipse ( int32_t x, int32_t y, int32_t rx, int32_t ry , const T& color) { setColor(color); fillEllipse (x, y, rx, ry ); }
- void fillEllipse ( int32_t x, int32_t y, int32_t rx, int32_t ry);
- template inline void drawLine ( int32_t x0, int32_t y0, int32_t x1, int32_t y1 , const T& color) { setColor(color); drawLine( x0, y0, x1, y1 ); }
- void drawLine ( int32_t x0, int32_t y0, int32_t x1, int32_t y1);
- template inline void drawTriangle ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, const T& color) { setColor(color); drawTriangle(x0, y0, x1, y1, x2, y2); }
- void drawTriangle ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
- template inline void fillTriangle ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, const T& color) { setColor(color); fillTriangle(x0, y0, x1, y1, x2, y2); }
- void fillTriangle ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
- template inline void drawBezier ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, const T& color) { setColor(color); drawBezier(x0, y0, x1, y1, x2, y2); }
- void drawBezier ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
- template inline void drawBezier ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x3, int32_t y3, const T& color) { setColor(color); drawBezier(x0, y0, x1, y1, x2, y2, x3, y3); }
- void drawBezier ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, int32_t x3, int32_t y3);
- template inline void drawBezierHelper( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2, const T& color) { setColor(color); drawBezierHelper(x0, y0, x1, y1, x2, y2); }
- void drawBezierHelper( int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
- template inline void drawEllipseArc ( int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float angle0, float angle1, const T& color) { setColor(color); drawEllipseArc( x, y, r0x, r1x, r0y, r1y, angle0, angle1); }
- void drawEllipseArc ( int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float angle0, float angle1);
- template inline void fillEllipseArc ( int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float angle0, float angle1, const T& color) { setColor(color); fillEllipseArc( x, y, r0x, r1x, r0y, r1y, angle0, angle1); }
- void fillEllipseArc ( int32_t x, int32_t y, int32_t r0x, int32_t r1x, int32_t r0y, int32_t r1y, float angle0, float angle1);
- template inline void drawArc ( int32_t x, int32_t y, int32_t r0, int32_t r1, float angle0, float angle1, const T& color) { setColor(color); drawEllipseArc( x, y, r0, r1, r0, r1, angle0, angle1); }
- void drawArc ( int32_t x, int32_t y, int32_t r0, int32_t r1, float angle0, float angle1) { drawEllipseArc( x, y, r0, r1, r0, r1, angle0, angle1); }
- template inline void fillArc ( int32_t x, int32_t y, int32_t r0, int32_t r1, float angle0, float angle1, const T& color) { setColor(color); fillEllipseArc( x, y, r0, r1, r0, r1, angle0, angle1); }
- void fillArc ( int32_t x, int32_t y, int32_t r0, int32_t r1, float angle0, float angle1) { fillEllipseArc( x, y, r0, r1, r0, r1, angle0, angle1); }
- template inline void drawCircleHelper( int32_t x, int32_t y, int32_t r, uint_fast8_t cornername , const T& color) { setColor(color); drawCircleHelper(x, y, r, cornername ); }
- void drawCircleHelper( int32_t x, int32_t y, int32_t r, uint_fast8_t cornername);
- template inline void fillCircleHelper( int32_t x, int32_t y, int32_t r, uint_fast8_t corners, int32_t delta, const T& color) { setColor(color); fillCircleHelper(x, y, r, corners, delta); }
- void fillCircleHelper( int32_t x, int32_t y, int32_t r, uint_fast8_t corners, int32_t delta);
-
- template inline void floodFill( int32_t x, int32_t y, const T& color) { setColor(color); floodFill(x, y); }
- void floodFill( int32_t x, int32_t y );
- template inline void paint ( int32_t x, int32_t y, const T& color) { setColor(color); floodFill(x, y); }
- inline void paint ( int32_t x, int32_t y ) { floodFill(x, y); }
-
- template inline void fillAffine(const float matrix[6], int32_t w, int32_t h, const T& color) { setColor(color); fillAffine(matrix, w, h); }
- void fillAffine(const float matrix[6], int32_t w, int32_t h);
-
- template inline void drawGradientHLine( int32_t x, int32_t y, int32_t w, const T& colorstart, const T& colorend ) { drawGradientLine( x, y, x + w - 1, y, colorstart, colorend ); }
- template inline void drawGradientVLine( int32_t x, int32_t y, int32_t h, const T& colorstart, const T& colorend ) { drawGradientLine( x, y, x, y + h - 1, colorstart, colorend ); }
- template inline void drawGradientLine ( int32_t x0, int32_t y0, int32_t x1, int32_t y1, const T& colorstart, const T& colorend ) { draw_gradient_line( x0, y0, x1, y1, convert_to_rgb888(colorstart), convert_to_rgb888(colorend) ); }
-
- template inline void fillScreen ( const T& color) { setColor(color); fillRect(0, 0, _width, _height); }
- inline void fillScreen ( void ) { fillRect(0, 0, _width, _height); }
-
- template inline void clear ( const T& color) { setBaseColor(color); clear(); }
- inline void clear ( void ) { setColor(_base_rgb888); fillScreen(); }
- template inline void clearDisplay( const T& color) { setBaseColor(color); clear(); }
- inline void clearDisplay( void ) { setColor(_base_rgb888); fillScreen(); }
-
- template inline void pushBlock ( const T& color, int32_t length) { if (0 >= length) return; setColor(color); startWrite(); pushBlock_impl(length); endWrite(); }
-
-
- __attribute__ ((always_inline)) inline static uint8_t color332(uint8_t r, uint8_t g, uint8_t b) { return lgfx::color332(r, g, b); }
- __attribute__ ((always_inline)) inline static uint16_t color565(uint8_t r, uint8_t g, uint8_t b) { return lgfx::color565(r, g, b); }
- __attribute__ ((always_inline)) inline static uint32_t color888(uint8_t r, uint8_t g, uint8_t b) { return lgfx::color888(r, g, b); }
- __attribute__ ((always_inline)) inline static uint16_t swap565( uint8_t r, uint8_t g, uint8_t b) { return lgfx::swap565( r, g, b); }
- __attribute__ ((always_inline)) inline static uint32_t swap888( uint8_t r, uint8_t g, uint8_t b) { return lgfx::swap888( r, g, b); }
- __attribute__ ((always_inline)) inline static uint8_t color16to8(uint32_t rgb565) { return lgfx::convert_rgb565_to_rgb332(rgb565); }
- __attribute__ ((always_inline)) inline static uint16_t color8to16(uint32_t rgb332) { return lgfx::convert_rgb332_to_rgb565(rgb332); }
- __attribute__ ((always_inline)) inline static uint32_t color16to24(uint32_t rgb565) { return lgfx::convert_rgb565_to_rgb888(rgb565); }
- __attribute__ ((always_inline)) inline static uint16_t color24to16(uint32_t rgb888) { return lgfx::convert_rgb888_to_rgb565(rgb888); }
-
- __attribute__ ((always_inline)) inline void setPivot(float x, float y) { _xpivot = x; _ypivot = y; }
- __attribute__ ((always_inline)) inline float getPivotX(void) const { return _xpivot; }
- __attribute__ ((always_inline)) inline float getPivotY(void) const { return _ypivot; }
-
- __attribute__ ((always_inline)) inline int32_t width (void) const { return _width; }
- __attribute__ ((always_inline)) inline int32_t height (void) const { return _height; }
- __attribute__ ((always_inline)) inline int_fast8_t getRotation (void) const { return getRotation_impl(); }
- __attribute__ ((always_inline)) inline color_depth_t getColorDepth (void) const { return _write_conv.depth; }
- __attribute__ ((always_inline)) inline color_conv_t* getColorConverter(void) { return &_write_conv; }
- __attribute__ ((always_inline)) inline RGBColor* getPalette (void) const { return getPalette_impl(); }
- __attribute__ ((always_inline)) inline uint32_t getPaletteCount (void) const { return _palette_count; }
- __attribute__ ((always_inline)) inline bool hasPalette (void) const { return _palette_count; }
- __attribute__ ((always_inline)) inline bool isSPIShared (void) const { return _spi_shared; }
- __attribute__ ((always_inline)) inline bool isReadable (void) const { return isReadable_impl(); }
- __attribute__ ((always_inline)) inline bool getSwapBytes (void) const { return _swapBytes; }
- __attribute__ ((always_inline)) inline void setSwapBytes (bool swap) { _swapBytes = swap; }
- __attribute__ ((always_inline)) inline void setSPIShared (bool shared) { _spi_shared = shared; }
-
- __attribute__ ((always_inline)) inline void beginTransaction(void) { beginTransaction_impl(); }
- __attribute__ ((always_inline)) inline void endTransaction(void) { endTransaction_impl(); }
- __attribute__ ((always_inline)) inline void initDMA(void) { initDMA_impl(); }
- __attribute__ ((always_inline)) inline void waitDMA(void) { waitDMA_impl(); }
- __attribute__ ((always_inline)) inline bool dmaBusy(void) { return dmaBusy_impl(); }
- __attribute__ ((always_inline)) inline void setWindow(int32_t xs, int32_t ys, int32_t xe, int32_t ye) { setWindow_impl(xs, ys, xe, ye); }
-
- void setAddrWindow(int32_t x, int32_t y, int32_t w, int32_t h);
-
- void setClipRect(int32_t x, int32_t y, int32_t w, int32_t h);
- void getClipRect(int32_t *x, int32_t *y, int32_t *w, int32_t *h);
- void clearClipRect(void);
-
- template
- void setScrollRect(int32_t x, int32_t y, int32_t w, int32_t h, const T& color) {
- _base_rgb888 = convert_to_rgb888(color);
- setScrollRect(x, y, w, h);
- }
- void setScrollRect(int32_t x, int32_t y, int32_t w, int32_t h);
- void getScrollRect(int32_t *x, int32_t *y, int32_t *w, int32_t *h);
- void clearScrollRect(void);
-
- __attribute__ ((always_inline)) inline void pushPixelsDMA( const void* data, int32_t len) { if (len < 0) return; startWrite(); writePixelsDMA_impl(data, len); endWrite(); }
- __attribute__ ((always_inline)) inline void writePixelsDMA(const void* data, int32_t len) { if (len < 0) return; writePixelsDMA_impl(data, len); }
-
- template
- __attribute__ ((always_inline)) inline void pushPixels(T* data, int32_t len ) { startWrite(); writePixels(data, len ); endWrite(); }
- __attribute__ ((always_inline)) inline void pushPixels(const uint16_t* data, int32_t len, bool swap) { startWrite(); writePixels(data, len, swap); endWrite(); }
- __attribute__ ((always_inline)) inline void pushPixels(const void* data, int32_t len, bool swap) { startWrite(); writePixels(data, len, swap); endWrite(); }
-
- template
- void writePixels(const T *data, int32_t len) { auto pc = create_pc_fast(data ); writePixels_impl(len, &pc); }
- void writePixels(const uint16_t* data, int32_t len, bool swap) { auto pc = create_pc_fast(data, swap); writePixels_impl(len, &pc); }
- void writePixels(const void* data, int32_t len, bool swap) { auto pc = create_pc_fast(data, swap); writePixels_impl(len, &pc); }
-
- template
- void writeIndexedPixels(const uint8_t *data, T* palette, int32_t len, lgfx::color_depth_t colordepth = lgfx::rgb332_1Byte)
- {
- auto pc = create_pc_fast(data, palette, colordepth);
- writePixels_impl(len, &pc);
- }
-
- template void drawBitmap (int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, const T& color ) { draw_bitmap (x, y, bitmap, w, h, _write_conv.convert(color)); }
- template void drawBitmap (int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, const T& fgcolor, const T& bgcolor) { draw_bitmap (x, y, bitmap, w, h, _write_conv.convert(fgcolor), _write_conv.convert(bgcolor)); }
- template void drawXBitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, const T& color ) { draw_xbitmap(x, y, bitmap, w, h, _write_conv.convert(color)); }
- template void drawXBitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, const T& fgcolor, const T& bgcolor) { draw_xbitmap(x, y, bitmap, w, h, _write_conv.convert(fgcolor), _write_conv.convert(bgcolor)); }
-
- template
- void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc(data);
- pushImage(x, y, w, h, &pc);
- }
-
- template
- void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const T1* data, const T2& transparent)
- {
- auto pc = create_pc_tr(data, transparent);
- pushImage(x, y, w, h, &pc);
- }
-
- template
- void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth);
- pushImage(x, y, w, h, &pc);
- }
-
- template
- void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, const void* data, uint32_t transparent, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth, transparent);
- pushImage(x, y, w, h, &pc);
- }
-
- template
- void pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc(data);
- pushImage(x, y, w, h, &pc, true);
- }
-
- template
- void pushImageDMA(int32_t x, int32_t y, int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth);
- pushImage(x, y, w, h, &pc, true);
- }
-
- void pushImage(int32_t x, int32_t y, int32_t w, int32_t h, pixelcopy_t *param, bool use_dma = false);
-
-//----------------------------------------------------------------------------
-
- template
- void pushImageRotateZoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc(data);
- push_image_rotate_zoom(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const T1* data, const T2& transparent)
- {
- auto pc = create_pc_tr(data, transparent);
- push_image_rotate_zoom(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth);
- push_image_rotate_zoom(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const void* data, uint32_t transparent, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth, transparent);
- push_image_rotate_zoom(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
-
- template
- void pushImageRotateZoomWithAA(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc_antialias(data);
- push_image_rotate_zoom_aa(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoomWithAA(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const T1* data, const T2& transparent)
- {
- auto pc = create_pc_tr_antialias(data, transparent);
- push_image_rotate_zoom_aa(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoomWithAA(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_antialias(data, palette, depth);
- push_image_rotate_zoom_aa(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
- template
- void pushImageRotateZoomWithAA(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, const void* data, uint32_t transparent, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_antialias(data, palette, depth, transparent);
- push_image_rotate_zoom_aa(dst_x, dst_y, src_x, src_y, angle, zoom_x, zoom_y, w, h, &pc);
- }
-
-//----------------------------------------------------------------------------
-
- template
- void pushImageAffine(const float matrix[6], int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc(data);
- push_image_affine(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffine(const float matrix[6], int32_t w, int32_t h, const T1* data, const T2& transparent)
- {
- auto pc = create_pc_tr(data, transparent);
- push_image_affine(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffine(const float matrix[6], int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth);
- push_image_affine(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffine(const float matrix[6], int32_t w, int32_t h, const void* data, uint32_t transparent, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_palette(data, palette, depth, transparent);
- push_image_affine(matrix, w, h, &pc);
- }
-
-
- template
- void pushImageAffineWithAA(const float matrix[6], int32_t w, int32_t h, const T* data)
- {
- auto pc = create_pc_antialias(data);
- push_image_affine_aa(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffineWithAA(const float matrix[6], int32_t w, int32_t h, const T1* data, const T2& transparent)
- {
- auto pc = create_pc_tr_antialias(data, transparent);
- push_image_affine_aa(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffineWithAA(const float matrix[6], int32_t w, int32_t h, const void* data, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_antialias(data, palette, depth);
- push_image_affine_aa(matrix, w, h, &pc);
- }
-
- template
- void pushImageAffineWithAA(const float matrix[6], int32_t w, int32_t h, const void* data, uint32_t transparent, color_depth_t depth, const T* palette)
- {
- auto pc = create_pc_antialias(data, palette, depth, transparent);
- push_image_affine_aa(matrix, w, h, &pc);
- }
-
-//----------------------------------------------------------------------------
-
- /// read RGB565 16bit color
- uint16_t readPixel(int32_t x, int32_t y)
- {
- if (x < _clip_l || x > _clip_r || y < _clip_t || y > _clip_b) return 0;
-
- pixelcopy_t p(nullptr, swap565_t::depth, _read_conv.depth, false, getPalette());
- uint_fast16_t data = 0;
-
- readRect_impl(x, y, 1, 1, &data, &p);
-
- return __builtin_bswap16(data);
- }
-
- /// read RGB888 24bit color
- RGBColor readPixelRGB(int32_t x, int32_t y)
- {
- RGBColor data[1];
- if (x < _clip_l || x > _clip_r || y < _clip_t || y > _clip_b) return data[0];
-
- pixelcopy_t p(nullptr, bgr888_t::depth, _read_conv.depth, false, getPalette());
-
- readRect_impl(x, y, 1, 1, data, &p);
-
- return data[0];
- }
-
- __attribute__ ((always_inline)) inline
- void readRectRGB( int32_t x, int32_t y, int32_t w, int32_t h, uint8_t* data) { readRectRGB(x, y, w, h, (bgr888_t*)data); }
- void readRectRGB( int32_t x, int32_t y, int32_t w, int32_t h, RGBColor* data)
- {
- pixelcopy_t p(nullptr, bgr888_t::depth, _read_conv.depth, false, getPalette());
- read_rect(x, y, w, h, data, &p);
- }
-
- template inline
- void readRect( int32_t x, int32_t y, int32_t w, int32_t h, T* data)
- {
- pixelcopy_t p(nullptr, get_depth::value, _read_conv.depth, false, getPalette());
- if (std::is_same::value || std::is_same::value || std::is_same::value || std::is_same::value || p.fp_copy == nullptr)
- {
- p.no_convert = false;
- p.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine_dst(_read_conv.depth);
- }
- read_rect(x, y, w, h, data, &p);
- }
-
- void readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint8_t* data);
- void readRect(int32_t x, int32_t y, int32_t w, int32_t h, uint16_t* data);
- void readRect(int32_t x, int32_t y, int32_t w, int32_t h, void* data);
-
- void scroll(int_fast16_t dx, int_fast16_t dy = 0);
- void copyRect(int32_t dst_x, int32_t dst_y, int32_t w, int32_t h, int32_t src_x, int32_t src_y);
-
-
- [[deprecated("use IFont")]]
- void setCursor( int32_t x, int32_t y, uint8_t font) { _filled_x = 0; _cursor_x = x; _cursor_y = y; setFont(fontdata[font]); }
- void setCursor( int32_t x, int32_t y, const IFont* font) { _filled_x = 0; _cursor_x = x; _cursor_y = y; setFont(font); }
- void setCursor( int32_t x, int32_t y) { _filled_x = 0; _cursor_x = x; _cursor_y = y; }
- int32_t getCursorX(void) const { return _cursor_x; }
- int32_t getCursorY(void) const { return _cursor_y; }
- void setTextStyle(const TextStyle& text_style) { _text_style = text_style; }
- const TextStyle& getTextStyle(void) const { return _text_style; }
- void setTextSize(float size) { setTextSize(size, size); }
- void setTextSize(float sx, float sy) { _text_style.size_x = (sx > 0) ? sx : 1; _text_style.size_y = (sy > 0) ? sy : 1; }
- float getTextSizeX(void) const { return _text_style.size_x; }
- float getTextSizeY(void) const { return _text_style.size_y; }
- //[[deprecated("use textdatum_t")]]
- void setTextDatum(uint8_t datum) { _text_style.datum = (textdatum_t)datum; }
- void setTextDatum(textdatum_t datum) { _text_style.datum = datum; }
- textdatum_t getTextDatum(void) const { return _text_style.datum; }
- void setTextPadding(uint32_t padding_x) { _padding_x = padding_x; }
- uint32_t getTextPadding(void) const { return _padding_x; }
- void setTextWrap( bool wrapX, bool wrapY = false) { _textwrap_x = wrapX; _textwrap_y = wrapY; }
- void setTextScroll(bool scroll) { _textscroll = scroll; if (_cursor_x < this->_sx) { _cursor_x = this->_sx; } if (_cursor_y < this->_sy) { _cursor_y = this->_sy; } }
-
- template
- void setTextColor(T color) {
- _text_style.fore_rgb888 = _text_style.back_rgb888 = this->hasPalette() ? color : convert_to_rgb888(color);
- }
- template
- void setTextColor(T1 fgcolor, T2 bgcolor) {
- if (!this->hasPalette()) {
- _text_style.fore_rgb888 = convert_to_rgb888(fgcolor);
- _text_style.back_rgb888 = convert_to_rgb888(bgcolor);
- } else {
- _text_style.fore_rgb888 = fgcolor;
- _text_style.back_rgb888 = bgcolor;
- }
- }
-
- [[deprecated("use IFont")]]
- int32_t fontHeight(uint8_t font) const { return ((const BaseFont*)fontdata[font])->height * _text_style.size_y; }
- int32_t fontHeight(const IFont* font) const;
- int32_t fontHeight(void) const { return _font_metrics.height * _text_style.size_y; }
- int32_t fontWidth(uint8_t font) const { return ((const BaseFont*)fontdata[font])->width * _text_style.size_x; }
- int32_t fontWidth(const IFont* font) const;
- int32_t fontWidth(void) const { return _font_metrics.width * _text_style.size_x; }
- int32_t textLength(const char *string, int32_t width);
- int32_t textWidth(const char *string);
-
- [[deprecated("use IFont")]]
- inline size_t drawString(const char *string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string, x, y, _text_style.datum); }
- inline size_t drawString(const char *string, int32_t x, int32_t y, const IFont* font) { setFont(font ); return draw_string(string, x, y, _text_style.datum); }
- inline size_t drawString(const char *string, int32_t x, int32_t y ) { return draw_string(string, x, y, _text_style.datum); }
-
- [[deprecated("use IFont")]]
- inline size_t drawNumber(long long_num, int32_t poX, int32_t poY, uint8_t font) { setFont(fontdata[font]); return drawNumber(long_num, poX, poY); }
- inline size_t drawNumber(long long_num, int32_t poX, int32_t poY, const IFont* font) { setFont(font ); return drawNumber(long_num, poX, poY); }
- size_t drawNumber(long long_num, int32_t poX, int32_t poY);
- inline size_t drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY, const IFont* font) { setFont(font ); return drawFloat(floatNumber, dp, poX, poY); }
- inline size_t drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY, uint8_t font) { setFont(fontdata[font]); return drawFloat(floatNumber, dp, poX, poY); }
- size_t drawFloat(float floatNumber, uint8_t dp, int32_t poX, int32_t poY);
-
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawCentreString(const char *string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string, x, y, textdatum_t::top_center); }
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawCenterString(const char *string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string, x, y, textdatum_t::top_center); }
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawRightString( const char *string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string, x, y, textdatum_t::top_right); }
-
- #if defined (ARDUINO)
- inline int32_t textLength(const String& string, int32_t width) { return textLength(string.c_str(), width); }
- inline int32_t textWidth(const String& string) { return textWidth(string.c_str()); }
-
- inline size_t drawString(const String& string, int32_t x, int32_t y ) { return draw_string(string.c_str(), x, y, _text_style.datum); }
- inline size_t drawString(const String& string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string.c_str(), x, y, _text_style.datum); }
-
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawCentreString(const String& string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string.c_str(), x, y, textdatum_t::top_center); }
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawCenterString(const String& string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string.c_str(), x, y, textdatum_t::top_center); }
- [[deprecated("use setTextDatum() and drawString()")]] inline size_t drawRightString( const String& string, int32_t x, int32_t y, uint8_t font) { setFont(fontdata[font]); return draw_string(string.c_str(), x, y, textdatum_t::top_right); }
- #endif
-
- size_t drawChar(uint16_t uniCode, int32_t x, int32_t y, uint8_t font);
-// inline size_t drawChar(uint16_t uniCode, int32_t x, int32_t y ) { _filled_x = 0; return (fpDrawChar)(this, x, y, uniCode, &_text_style, _font); }
- inline size_t drawChar(uint16_t uniCode, int32_t x, int32_t y ) { _filled_x = 0; return _font->drawChar(this, x, y, uniCode, &_text_style); }
-
- template
- inline size_t drawChar(int32_t x, int32_t y, uint16_t uniCode, T color, T bg, float size) { return drawChar(x, y, uniCode, color, bg, size, size); }
- template
- inline size_t drawChar(int32_t x, int32_t y, uint16_t uniCode, T color, T bg, float size_x, float size_y)
- {
- TextStyle style = _text_style;
- style.back_rgb888 = convert_to_rgb888(color);
- style.fore_rgb888 = convert_to_rgb888(bg);
- style.size_x = size_x;
- style.size_y = size_y;
- _filled_x = 0;
- return _font->drawChar(this, x, y, uniCode, &style);
- //return (fpDrawChar)(this, x, y, uniCode, &style, _font);
- }
-
- [[deprecated("use getFont()")]]
- uint8_t getTextFont(void) const
- {
- size_t i = 0;
- do {
- if (fontdata[i] == _font) return i;
- } while (fontdata[++i]);
- return 0;
- }
-
- //[[deprecated("use setFont(&fonts::Font)")]]
- void setTextFont(int f)
- {
- if (f == 1 && _font && _font->getType() == IFont::font_type_t::ft_gfx) return;
- setFont(fontdata[f]);
- }
-
- [[deprecated("use setFont(&fonts::Font)")]]
- void setTextFont(const IFont* font = nullptr) { setFont(font); }
-
- [[deprecated("use setFont()")]]
- void setFreeFont(const IFont* font = nullptr) { setFont(font); }
-
- __attribute__ ((always_inline)) inline const IFont* getFont (void) const { return _font; }
-
- void setFont(const IFont* font);
-
- /// load VLW font
- bool loadFont(const uint8_t* array);
-
- /// unload VLW font
- void unloadFont(void);
-
- /// show VLW font
- void showFont(uint32_t td);
-
- void cp437(bool enable = true) { _text_style.cp437 = enable; } // AdafruitGFX compatible.
-
- epd_mode_t setEpdMode(epd_mode_t flg) { _epd_mode = flg; return flg; }
- epd_mode_t getEpdMode(void) const { return _epd_mode; }
-
- void setAttribute(attribute_t attr_id, uint8_t param);
- uint8_t getAttribute(attribute_t attr_id);
- uint8_t getAttribute(uint8_t attr_id) { return getAttribute((attribute_t)attr_id); }
-
- int32_t _get_text_filled_x(void) const { return _filled_x; }
- void _set_text_filled_x(int32_t x) { _filled_x = x; }
- FontMetrics _get_font_metrics(void) const { return _font_metrics; }
-
-//----------------------------------------------------------------------------
-// print & text support
-//----------------------------------------------------------------------------
-// Arduino Print.h compatible
- #if !defined (ARDUINO)
- size_t print(const char str[]) { return write(str); }
- size_t print(char c) { return write(c); }
- size_t print(int n, int base = 10) { return print((long)n, base); }
- size_t print(long n, int base = 10)
- {
- if (base == 0) { return write(n); }
- if (base == 10) {
- if (n < 0) {
- size_t t = print('-');
- return printNumber(-n, 10) + t;
- }
- return printNumber(n, 10);
- }
- return printNumber(n, base);
- }
-
- size_t print(unsigned char n, int base = 10) { return print((unsigned long)n, base); }
- size_t print(unsigned int n, int base = 10) { return print((unsigned long)n, base); }
- size_t print(unsigned long n, int base = 10) { return (base) ? printNumber(n, base) : write(n); }
- size_t print(double n, int digits= 2) { return printFloat(n, digits); }
-
- size_t println(void) { return print("\r\n"); }
- size_t println(const char c[]) { size_t t = print(c); return println() + t; }
- size_t println(char c ) { size_t t = print(c); return println() + t; }
- size_t println(int n, int base = 10) { size_t t = print(n,base); return println() + t; }
- size_t println(long n, int base = 10) { size_t t = print(n,base); return println() + t; }
- size_t println(unsigned char n, int base = 10) { size_t t = print(n,base); return println() + t; }
- size_t println(unsigned int n, int base = 10) { size_t t = print(n,base); return println() + t; }
- size_t println(unsigned long n, int base = 10) { size_t t = print(n,base); return println() + t; }
- size_t println(double n, int digits= 2) { size_t t = print(n, digits); return println() + t; }
-
- //size_t print(const String &s) { return write(s.c_str(), s.length()); }
- //size_t print(const __FlashStringHelper *s) { return print(reinterpret_cast(s)); }
- //size_t println(const String &s) { size_t t = print(s); return println() + t; }
- //size_t println(const __FlashStringHelper *s) { size_t t = print(s); return println() + t; }
-
- size_t printf(const char * format, ...) __attribute__ ((format (printf, 2, 3)));
-
- size_t write(const char* str) { return (!str) ? 0 : write((const uint8_t*)str, strlen(str)); }
- size_t write(const char *buf, size_t size) { return write((const uint8_t *) buf, size); }
- #else
- using Print::write;
- #endif
- size_t write(const uint8_t *buf, size_t size) { size_t n = 0; this->startWrite(); while (size--) { n += write(*buf++); } this->endWrite(); return n; }
- size_t write(uint8_t utf8);
-
-
-
-#ifdef ARDUINO
- void qrcode(const String &string, int32_t x = -1, int32_t y = -1, int32_t width = -1, uint8_t version = 1) {
- qrcode(string.c_str(), x, y, width, version);
- }
-#endif
- void qrcode(const char *string, int32_t x = -1, int32_t y = -1, int32_t width = -1, uint8_t version = 1);
-
-
- bool drawBmp(const uint8_t *bmp_data, uint32_t bmp_len, int32_t x=0, int32_t y=0, int32_t maxWidth=0, int32_t maxHeight=0, int32_t offX=0, int32_t offY=0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- PointerWrapper data;
- data.set(bmp_data, bmp_len);
- return this->draw_bmp(&data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
- bool drawJpg(const uint8_t *jpg_data, uint32_t jpg_len, int32_t x=0, int32_t y=0, int32_t maxWidth=0, int32_t maxHeight=0, int32_t offX=0, int32_t offY=0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- PointerWrapper data;
- data.set(jpg_data, jpg_len);
- return this->draw_jpg(&data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
- [[deprecated("use float scale")]] bool drawJpg(const uint8_t *jpg_data, uint32_t jpg_len, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, jpeg_div::jpeg_div_t scale)
- {
- return drawJpg(jpg_data, jpg_len, x, y, maxWidth, maxHeight, offX, offY, 1.0f / (1 << scale));
- }
- bool drawPng(const uint8_t *png_data, uint32_t png_len, int32_t x = 0, int32_t y = 0, int32_t maxWidth = 0, int32_t maxHeight = 0, int32_t offX = 0, int32_t offY = 0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- PointerWrapper data;
- data.set(png_data, png_len);
- return this->draw_png(&data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
-
- inline bool drawBmp(DataWrapper *data, int32_t x=0, int32_t y=0, int32_t maxWidth=0, int32_t maxHeight=0, int32_t offX=0, int32_t offY=0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- return this->draw_bmp(data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
- inline bool drawJpg(DataWrapper *data, int32_t x=0, int32_t y=0, int32_t maxWidth=0, int32_t maxHeight=0, int32_t offX=0, int32_t offY=0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- return this->draw_jpg(data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
- [[deprecated("use float scale")]] inline bool drawJpg(DataWrapper *data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, jpeg_div::jpeg_div_t scale)
- {
- return drawJpg(data, x, y, maxWidth, maxHeight, offX, offY, 1.0f / (1 << scale));
- }
- inline bool drawPng(DataWrapper *data, int32_t x = 0, int32_t y = 0, int32_t maxWidth = 0, int32_t maxHeight = 0, int32_t offX = 0, int32_t offY = 0, float scale_x = 1.0f, float scale_y = 0.0f, datum_t datum = datum_t::top_left)
- {
- return this->draw_png(data, x, y, maxWidth, maxHeight, offX, offY, scale_x, scale_y, datum);
- }
-
- void* createPng( size_t* datalen, int32_t x = 0, int32_t y = 0, int32_t width = 0, int32_t height = 0);
-
-
-
- template
- [[deprecated("use pushImage")]] void pushRect( int32_t x, int32_t y, int32_t w, int32_t h, const T* data) { pushImage(x, y, w, h, data); }
-
- template
- [[deprecated("use pushBlock")]] void pushColor(const T& color, int32_t length) { if (0 >= length) return; setColor(color); startWrite(); pushBlock_impl(length); endWrite(); }
- template
- [[deprecated("use pushBlock")]] void pushColor(const T& color ) { setColor(color); startWrite(); pushBlock_impl(1); endWrite(); }
-
- template
- [[deprecated("use pushPixels")]] void pushColors(T* data, int32_t len ) { startWrite(); writePixels(data, len ); endWrite(); }
- [[deprecated("use pushPixels")]] void pushColors(const void* data, int32_t len ) { startWrite(); writePixels(data, len, _swapBytes); endWrite(); }
- [[deprecated("use pushPixels")]] void pushColors(const uint16_t* data, int32_t len ) { startWrite(); writePixels(data, len, _swapBytes); endWrite(); }
- [[deprecated("use pushPixels")]] void pushColors(const uint8_t* data, int32_t len ) { startWrite(); writePixels((const rgb332_t*)data, len); endWrite(); }
- [[deprecated("use pushPixels")]] void pushColors(const void* data, int32_t len, bool swap) { startWrite(); writePixels(data, len, swap); endWrite(); }
- [[deprecated("use pushPixels")]] void pushColors(const uint16_t* data, int32_t len, bool swap) { startWrite(); writePixels(data, len, swap); endWrite(); }
-
-//----------------------------------------------------------------------------
-//----------------------------------------------------------------------------
-
- protected:
- bool _auto_display = true;
- PanelCommon* _panel = nullptr;
- TouchCommon* _touch = nullptr;
- FileWrapper* _font_file = nullptr;
- uint32_t _transaction_count = 0;
- int32_t _width = 0, _height = 0;
- int32_t _sx, _sy, _sw, _sh; // for scroll zone
-
- int32_t _clip_l = 0, _clip_r = -1, _clip_t = 0, _clip_b = -1; // clip rect
- uint32_t _base_rgb888 = 0; // gap fill colour for clear and scroll zone
- raw_color_t _color = 0xFFFFFFU;
-
- color_conv_t _write_conv;
- color_conv_t _read_conv;
-
- uint32_t _palette_count = 0;
-
- float _xpivot; // x pivot point coordinate
- float _ypivot; // x pivot point coordinate
-
- bool _spi_shared = true;
- bool _swapBytes = false;
- epd_mode_t _epd_mode = epd_mode_t::epd_quality;
-
- enum utf8_decode_state_t
- { utf8_state0 = 0
- , utf8_state1 = 1
- , utf8_state2 = 2
- };
- utf8_decode_state_t _decoderState = utf8_state0; // UTF8 decoder state
- uint_fast16_t _unicode_buffer = 0; // Unicode code-point buffer
-
- int32_t _cursor_x = 0; // print text cursor
- int32_t _cursor_y = 0;
- int32_t _filled_x = 0; // print filled position
- int32_t _padding_x = 0;
-
- TextStyle _text_style;
- FontMetrics _font_metrics = { 6, 6, 0, 8, 8, 0, 7 }; // Font0 default metric
- const IFont* _font = &fonts::Font0;
-
- std::shared_ptr _runtime_font; // run-time generated font
- PointerWrapper _font_data;
-
- bool _textwrap_x = true;
- bool _textwrap_y = false;
- bool _textscroll = false;
-
- __attribute__ ((always_inline)) inline static bool _adjust_abs(int32_t& x, int32_t& w) { if (w < 0) { x += w + 1; w = -w; } return !w; }
-
- static bool _adjust_width(int32_t& x, int32_t& dx, int32_t& dw, int32_t left, int32_t width)
- {
- if (x < left) { dx = -x; dw += x; x = left; }
- if (dw > left + width - x) dw = left + width - x;
- return (dw <= 0);
- }
-
-//----------------------------------------------------------------------------
-
- template
- pixelcopy_t create_pc_fast(const T *data)
- {
- auto dst_depth = _write_conv.depth;
- pixelcopy_t pc(data, dst_depth, get_depth::value, hasPalette());
- if (hasPalette() || dst_depth < rgb332_1Byte)
- {
- pc.fp_copy = pixelcopy_t::copy_bit_fast;
- }
- else
- if (dst_depth > rgb565_2Byte)
- {
- if ( dst_depth == rgb888_3Byte) { pc.fp_copy = pixelcopy_t::copy_rgb_fast; }
- else if (dst_depth == rgb666_3Byte) { pc.fp_copy = pixelcopy_t::copy_rgb_fast; }
- else { pc.fp_copy = pixelcopy_t::copy_rgb_fast; }
- }
- else
- {
- if (dst_depth == rgb565_2Byte) { pc.fp_copy = pixelcopy_t::copy_rgb_fast; }
- else { pc.fp_copy = pixelcopy_t::copy_rgb_fast; }
- }
- return pc;
- }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_fast(const uint8_t *data) { return create_pc_fast(reinterpret_cast(data)); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_fast(const uint16_t *data) { return create_pc_fast(data, _swapBytes); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_fast(const void *data) { return create_pc_fast(data, _swapBytes); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_fast(const uint16_t *data, bool swap)
- {
- return swap && !hasPalette() && _write_conv.depth >= 8
- ? create_pc_fast(reinterpret_cast(data))
- : create_pc_fast(reinterpret_cast(data));
- }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_fast(const void *data, bool swap)
- {
- return swap && !hasPalette() && _write_conv.depth >= 8
- ? create_pc_fast(reinterpret_cast(data))
- : create_pc_fast(reinterpret_cast(data));
- }
-
- template
- pixelcopy_t create_pc_fast(const void *data, const T *palette, lgfx::color_depth_t src_depth)
- {
- auto dst_depth = _write_conv.depth;
-/*
- pixelcopy_t pc(data, dst_depth, src_depth, hasPalette(), palette);
-/*/
- pixelcopy_t pc;
- pc.src_data = data ;
- pc.palette = palette;
- pc.src_bits = src_depth > 8 ? (src_depth + 7) & ~7 : src_depth;
- pc.dst_bits = dst_depth > 8 ? (dst_depth + 7) & ~7 : dst_depth;
- pc.src_mask = (1 << pc.src_bits) - 1 ;
- pc.dst_mask = (1 << pc.dst_bits) - 1 ;
- pc.no_convert= src_depth == dst_depth;
-//*/
- if (hasPalette() || dst_depth < rgb332_1Byte)
- {
- if (palette && (dst_depth == rgb332_1Byte) && (src_depth == rgb332_1Byte))
- {
- pc.fp_copy = pixelcopy_t::copy_rgb_fast;
- }
- else
- {
- pc.fp_copy = pixelcopy_t::copy_bit_fast;
- }
- }
- else
- {
- if (dst_depth > rgb565_2Byte)
- {
- if ( dst_depth == rgb888_3Byte) { pc.fp_copy = pixelcopy_t::copy_palette_fast; }
- else if (dst_depth == rgb666_3Byte) { pc.fp_copy = pixelcopy_t::copy_palette_fast; }
- else { pc.fp_copy = pixelcopy_t::copy_palette_fast; }
- }
- else
- {
- if (dst_depth == rgb565_2Byte) { pc.fp_copy = pixelcopy_t::copy_palette_fast; }
- else { pc.fp_copy = pixelcopy_t::copy_palette_fast; }
- }
- }
- return pc;
- }
-
-
- template
- pixelcopy_t create_pc(const T *data)
- {
- pixelcopy_t pc(data, _write_conv.depth, get_depth::value, hasPalette());
- if (std::is_same::value || std::is_same::value || std::is_same::value || std::is_same::value)
- {
- pc.no_convert = false;
- pc.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(_write_conv.depth);
- }
- return pc;
- }
-
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc(const uint8_t *data) { return create_pc(reinterpret_cast(data)); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc(const uint16_t *data) { return create_pc(data, _swapBytes); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc(const void *data) { return create_pc(data, _swapBytes); }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc(const uint16_t *data, bool swap)
- {
- return swap && !hasPalette() && _write_conv.depth >= 8
- ? create_pc(reinterpret_cast(data))
- : create_pc(reinterpret_cast(data));
- }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc(const void *data, bool swap)
- {
- return swap && !hasPalette() && _write_conv.depth >= 8
- ? create_pc(reinterpret_cast(data))
- : create_pc(reinterpret_cast(data));
- }
-
- template
- pixelcopy_t create_pc_rawtr(const T *data, uint32_t raw_transparent)
- {
- if (std::is_same::value) { raw_transparent = getSwap16(raw_transparent); }
- if (std::is_same::value) { raw_transparent = getSwap24(raw_transparent); }
- pixelcopy_t pc(data, _write_conv.depth, get_depth::value, hasPalette(), nullptr, raw_transparent);
- if (std::is_same::value || std::is_same::value || std::is_same::value || std::is_same::value)
- {
- pc.no_convert = false;
- pc.fp_copy = pixelcopy_t::get_fp_copy_rgb_affine(_write_conv.depth);
- pc.fp_skip = pixelcopy_t::skip_rgb_affine;
- }
- return pc;
- }
-
- template
- pixelcopy_t create_pc_tr(const T1 *data, const T2& transparent)
- {
- return create_pc_rawtr( data
- , (std::is_same::value)
- ? transparent
- : get_fp_convert_src(get_depth::value, false)(transparent));
- }
-
- template pixelcopy_t create_pc_tr(const uint8_t *data, const T& transparent) { return create_pc_tr(reinterpret_cast(data), transparent); }
- template pixelcopy_t create_pc_tr(const uint16_t *data, const T& transparent) { return create_pc_tr(data, transparent, _swapBytes); }
- template pixelcopy_t create_pc_tr(const void *data, const T& transparent) { return create_pc_tr(data, transparent, _swapBytes); }
- template pixelcopy_t create_pc_tr(const uint16_t *data, const T& transparent, bool swap)
- {
- return swap && _write_conv.depth >= 8 && !hasPalette()
- ? create_pc_tr(reinterpret_cast(data), transparent)
- : create_pc_tr(reinterpret_cast(data), transparent);
- }
- template pixelcopy_t create_pc_tr(const void *data, const T& transparent, bool swap)
- {
- return swap && _write_conv.depth >= 8 && !hasPalette()
- ? create_pc_tr(reinterpret_cast(data), transparent)
- : create_pc_tr(reinterpret_cast(data), transparent);
- }
-
- pixelcopy_t create_pc_palette(const void *data, const bgr888_t *palette, lgfx::color_depth_t depth, uint32_t transparent = ~0u)
- {
- return pixelcopy_t (data, _write_conv.depth, depth, hasPalette(), palette, transparent);
- }
-
- template
- pixelcopy_t create_pc_palette(const void *data, const T *palette, lgfx::color_depth_t depth, uint32_t transparent = ~0u)
- {
- pixelcopy_t pc(data, getColorDepth(), depth, hasPalette(), palette, transparent);
- if (!hasPalette() && palette && getColorDepth() >= 8)
- {
- pc.fp_copy = pixelcopy_t::get_fp_copy_palette_affine(getColorDepth());
- }
- return pc;
- }
-
-
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_antialias(const uint8_t *data, uint32_t raw_transparent = ~0u)
- {
- return create_pc_antialias(reinterpret_cast(data), raw_transparent);
- }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_antialias(const uint16_t *data, uint32_t raw_transparent = ~0u)
- {
- return _swapBytes
- ? create_pc_antialias(reinterpret_cast(data), raw_transparent)
- : create_pc_antialias(reinterpret_cast(data), raw_transparent);
- }
- __attribute__ ((always_inline)) inline pixelcopy_t create_pc_antialias(const void *data, uint32_t raw_transparent = ~0u)
- {
- return _swapBytes
- ? create_pc_antialias(reinterpret_cast(data), raw_transparent)
- : create_pc_antialias(reinterpret_cast(data), raw_transparent);
- }
-
- template
- pixelcopy_t create_pc_antialias(const T* data, uint32_t raw_transparent = ~0u)
- {
- pixelcopy_t pc(data, argb8888_t::depth, get_depth::value, false, nullptr, raw_transparent);
- pc.src_data = data;
- pc.fp_copy = pixelcopy_t::copy_rgb_antialias;
- return pc;
- }
-
- template
- pixelcopy_t create_pc_tr_antialias(const T1* data, const T2& transparent)
- {
- return create_pc_antialias( data
- , std::is_same::value
- ? transparent
- : get_fp_convert_src(get_depth::value, false)(transparent));
- }
-
- template
- static pixelcopy_t create_pc_antialias(const void* data, const T* palette, lgfx::color_depth_t depth, uint32_t transparent = ~0u)
- {
- pixelcopy_t pc(data, argb8888_t::depth, depth, false, palette, transparent);
- if (palette)
- {
- pc.fp_copy = pixelcopy_t::copy_palette_antialias;
- }
- else if (depth > rgb565_2Byte)
- {
- if (depth == rgb888_3Byte) {
- pc.fp_copy = pixelcopy_t::copy_rgb_antialias;
- } else {
- pc.fp_copy = pixelcopy_t::copy_rgb_antialias;
- }
- }
- else
- {
- if (depth == rgb565_2Byte) {
- pc.fp_copy = pixelcopy_t::copy_rgb_antialias;
- } else {
- pc.fp_copy = pixelcopy_t::copy_rgb_antialias;
- }
- }
- return pc;
- }
-
-//----------------------------------------------------------------------------
-
- static void make_rotation_matrix(float* result, float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y);
-
- void writeRawColor( uint32_t color, int32_t length) { if (0 >= length) return; setRawColor(color); pushBlock_impl(length); }
- void read_rect(int32_t x, int32_t y, int32_t w, int32_t h, void* dst, pixelcopy_t* param);
- void draw_gradient_line( int32_t x0, int32_t y0, int32_t x1, int32_t y1, uint32_t colorstart, uint32_t colorend );
- void fill_arc_helper(int32_t cx, int32_t cy, int32_t oradius_x, int32_t iradius_x, int32_t oradius_y, int32_t iradius_y, float start, float end);
- void draw_bezier_helper(int32_t x0, int32_t y0, int32_t x1, int32_t y1, int32_t x2, int32_t y2);
- void draw_bitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, uint32_t fg_rawcolor, uint32_t bg_rawcolor = ~0u);
- void draw_xbitmap(int32_t x, int32_t y, const uint8_t *bitmap, int32_t w, int32_t h, uint32_t fg_rawcolor, uint32_t bg_rawcolor = ~0u);
- void push_image_rotate_zoom(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, pixelcopy_t* pc);
- void push_image_rotate_zoom_aa(float dst_x, float dst_y, float src_x, float src_y, float angle, float zoom_x, float zoom_y, int32_t w, int32_t h, pixelcopy_t* pc);
- void push_image_affine(const float* matrix, int32_t w, int32_t h, pixelcopy_t *pc);
- void push_image_affine(const float* matrix, pixelcopy_t *pc);
- void push_image_affine_aa(const float* matrix, int32_t w, int32_t h, pixelcopy_t *pc);
- void push_image_affine_aa(const float* matrix, pixelcopy_t *pre_pc, pixelcopy_t *post_pc);
-
- uint16_t decodeUTF8(uint8_t c);
-
- size_t printNumber(unsigned long n, uint8_t base);
- size_t printFloat(double number, uint8_t digits);
- size_t draw_string(const char *string, int32_t x, int32_t y, textdatum_t datum);
-
- bool draw_bmp(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float scale_x, float scale_y, datum_t datum);
- bool draw_jpg(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float scale_x, float scale_y, datum_t datum);
- bool draw_png(DataWrapper* data, int32_t x, int32_t y, int32_t maxWidth, int32_t maxHeight, int32_t offX, int32_t offY, float scale_x, float scale_y, datum_t datum);
-
-
- virtual void setWindow_impl(int32_t xs, int32_t ys, int32_t xe, int32_t ye) = 0;
- virtual void writeFillRect_impl(int32_t x, int32_t y, int32_t w, int32_t h) = 0;
- virtual void drawPixel_impl(int32_t x, int32_t y) = 0;
- virtual void copyRect_impl(int32_t dst_x, int32_t dst_y, int32_t w, int32_t h, int32_t src_x, int32_t src_y) = 0;
- virtual void readRect_impl(int32_t x, int32_t y, int32_t w, int32_t h, void* dst, pixelcopy_t* param) = 0;
- virtual void pushImage_impl(int32_t x, int32_t y, int32_t w, int32_t h, pixelcopy_t* param, bool use_dma) = 0;
- virtual void pushImageARGB_impl(int32_t x, int32_t y, int32_t w, int32_t h, pixelcopy_t* param) = 0;
- virtual void writePixels_impl(int32_t length, pixelcopy_t* param) = 0;
- virtual void writePixelsDMA_impl(const void* data, int32_t length) = 0;
- virtual void pushBlock_impl(int32_t len) = 0;
- virtual bool isReadable_impl(void) const = 0;
- virtual int_fast8_t getRotation_impl(void) const = 0;
- virtual RGBColor* getPalette_impl(void) const { return nullptr; }
-
- virtual void initDMA_impl(void) = 0;
- virtual void waitDMA_impl(void) = 0;
- virtual bool dmaBusy_impl(void) = 0;
- virtual void beginTransaction_impl(void) = 0;
- virtual void endTransaction_impl(void) = 0;
-
- static void tmpBeginTransaction(void* lgfx)
- {
- auto me = (LGFXBase*)lgfx;
- if (me->_transaction_count) { me->beginTransaction(); }
- }
-
- static void tmpEndTransaction(void* lgfx)
- {
- auto me = (LGFXBase*)lgfx;
- if (me->_transaction_count)
- {
- auto ad = me->_auto_display;
- me->_auto_display = false;
- me->endTransaction();
- me->_auto_display = ad;
- }
- }
-
- void prepareTmpTransaction(DataWrapper* data)
- {
- if (data->need_transaction && isSPIShared())
- {
- data->parent = this;
- data->fp_pre_read = tmpEndTransaction;
- data->fp_post_read = tmpBeginTransaction;
- }
- }
- __attribute__ ((always_inline)) inline void startWrite(bool transaction)
- {
- if (1 == ++_transaction_count && transaction) { beginTransaction(); }
- }
- };
-
-//----------------------------------------------------------------------------
-
- class LovyanGFX : public
- #ifdef LGFX_FILESYSTEM_SUPPORT_HPP_
- LGFX_FILESYSTEM_Support<
- #endif
- LGFXBase
- #ifdef LGFX_FILESYSTEM_SUPPORT_HPP_
- >
- #endif
- {
- private:
- using LGFXBase::_get_text_filled_x;
- using LGFXBase::_set_text_filled_x;
- using LGFXBase::_get_font_metrics;
- using LGFXBase::writeRawColor;
- };
-
-//----------------------------------------------------------------------------
- }
-}
-
-using LovyanGFX = lgfx::LovyanGFX;
-
-extern "C" {
- #pragma GCC diagnostic pop
-}
-
-#endif
diff --git a/src/lgfx/v0/LGFX_Device.hpp b/src/lgfx/v0/LGFX_Device.hpp
deleted file mode 100644
index 64e40bd0..00000000
--- a/src/lgfx/v0/LGFX_Device.hpp
+++ /dev/null
@@ -1,696 +0,0 @@
-/*----------------------------------------------------------------------------/
- Lovyan GFX library - LCD graphics library .
-
- support platform:
- ESP32 (SPI/I2S) with Arduino/ESP-IDF
- ATSAMD51 (SPI) with Arduino
-
-Original Source:
- https://github.com/lovyan03/LovyanGFX/
-
-Licence:
- [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
-
-Author:
- [lovyan03](https://twitter.com/lovyan03)
-
-Contributors:
- [ciniml](https://github.com/ciniml)
- [mongonta0716](https://github.com/mongonta0716)
- [tobozo](https://github.com/tobozo)
-/----------------------------------------------------------------------------*/
-#ifndef LGFX_DEVICE_HPP_
-#define LGFX_DEVICE_HPP_
-
-#include "LGFXBase.hpp"
-#include "LGFX_Sprite.hpp"
-#include "touch/TouchCommon.hpp"
-#include "panel/PanelCommon.hpp"
-
-namespace lgfx
-{
- inline namespace v0
- {
-//----------------------------------------------------------------------------
-
- class LGFX_Device : public LovyanGFX
- {
- public:
- // Write single byte as COMMAND
- virtual void writeCommand(uint_fast8_t cmd) = 0; // AdafruitGFX compatible
- __attribute__ ((always_inline))
- inline void writecommand(uint_fast8_t cmd) { writeCommand(cmd); } // TFT_eSPI compatible
-
- // Write single bytes as DATA
- virtual void writeData(uint_fast8_t data) = 0; // TFT_eSPI compatible
- __attribute__ ((always_inline))
- inline void spiWrite( uint_fast8_t data) { writeData(data); } // AdafruitGFX compatible
- __attribute__ ((always_inline))
- inline void writedata(uint_fast8_t data) { writeData(data); } // TFT_eSPI compatible
-
- // Write double bytes as DATA
- virtual void writeData16(uint_fast16_t data) = 0;
- virtual void writeData32(uint32_t data) = 0;
-
- void writeBytes(const uint8_t* data, int32_t length, bool use_dma = true) { writeBytes_impl(data, length, use_dma); }
-
- void readBytes(uint8_t* dst, int32_t length) { readBytes_impl(dst, length); }
-
- virtual uint32_t readCommand(uint_fast8_t cmd, uint_fast8_t index=0, uint_fast8_t len=4) = 0;
-
- uint8_t readCommand8( uint_fast8_t cmd, uint_fast8_t index=0) { return readCommand(cmd, index, 1); }
- uint8_t readcommand8( uint_fast8_t cmd, uint_fast8_t index=0) { return readCommand(cmd, index, 1); }
- uint16_t readCommand16(uint_fast8_t cmd, uint_fast8_t index=0) { return __builtin_bswap16(readCommand(cmd, index, 2)); }
- uint16_t readcommand16(uint_fast8_t cmd, uint_fast8_t index=0) { return __builtin_bswap16(readCommand(cmd, index, 2)); }
- uint32_t readCommand32(uint_fast8_t cmd, uint_fast8_t index=0) { return __builtin_bswap32(readCommand(cmd, index, 4)); }
- uint32_t readcommand32(uint_fast8_t cmd, uint_fast8_t index=0) { return __builtin_bswap32(readCommand(cmd, index, 4)); }
- uint32_t readPanelID(void) { return readCommand(_panel->getCmdRddid()); }
-
- virtual uint32_t readData(uint_fast8_t index=0, uint_fast8_t len=1) = 0;
-
- uint8_t readData8( uint_fast8_t index=0) { return readData(index, 1); }
- uint8_t readdata8( uint_fast8_t index=0) { return readData(index, 1); }
- uint16_t readData16(uint_fast8_t index=0) { return __builtin_bswap16(readData(index, 2)); }
- uint16_t readdata16(uint_fast8_t index=0) { return __builtin_bswap16(readData(index, 2)); }
- uint32_t readData32(uint_fast8_t index=0) { return __builtin_bswap32(readData(index, 4)); }
- uint32_t readdata32(uint_fast8_t index=0) { return __builtin_bswap32(readData(index, 4)); }
-
- __attribute__ ((always_inline)) inline bool getInvert(void) const { return _panel->invert; }
-
- __attribute__ ((always_inline)) inline PanelCommon* getPanel(void) const { return _panel; }
- __attribute__ ((always_inline)) inline PanelCommon* panel(void) const { return _panel; }
- __attribute__ ((always_inline)) inline void setPanel(PanelCommon* panel) { _panel = panel; postSetPanel(); }
- __attribute__ ((always_inline)) inline void panel(PanelCommon* panel) { _panel = panel; postSetPanel(); }
-
- __attribute__ ((always_inline)) inline TouchCommon* touch(void) const { return _touch; }
- __attribute__ ((always_inline)) inline void setTouch(TouchCommon* touch_) { _touch = touch_; postSetTouch(); }
- __attribute__ ((always_inline)) inline void touch(TouchCommon* touch_) { _touch = touch_; postSetTouch(); }
-
- __attribute__ ((always_inline)) inline bool isEPD(void) const { return _panel != nullptr && _panel->isEPD(); }
-
- void sleep(void)
- {
- uint8_t buf[32];
- if (auto b = _panel->getSleepInCommands(buf)) commandList(b);
- _panel->sleep(this);
- }
-
- void wakeup(void)
- {
- uint8_t buf[32];
- if (auto b = _panel->getSleepOutCommands(buf)) commandList(b);
- _panel->wakeup(this);
- }
-
- void powerSave(bool flg)
- {
- uint8_t buf[32];
- const uint8_t* b = flg
- ? _panel->getPowerSaveOnCommands(buf)
- : _panel->getPowerSaveOffCommands(buf);
- if (b) commandList(b);
- }
-
- void powerSaveOn( void) { powerSave(true ); }
- void powerSaveOff(void) { powerSave(false); }
-
- [[deprecated("use powerSave")]]
- void partialOn(void) { powerSaveOn(); }
-
- [[deprecated("use powerSave")]]
- void partialOff(void) { powerSaveOff(); }
-
- void display(void)
- {
- if (nullptr == _panel->fp_display) return;
- startWrite();
- _panel->fp_display(_panel, this, 0, 0, 0, 0);
- endWrite();
- }
-
- void display(int32_t x, int32_t y, int32_t w, int32_t h)
- {
- if (nullptr == _panel->fp_display) return;
- if (x < 0) { w += x; x = 0; }
- if (w > _width - x) w = _width - x;
- if (w < 1) { x = 0; w = 0; }
- if (y < 0) { h += y; y = 0; }
- if (h > _height - y) h = _height - y;
- if (h < 1) { y = 0; h = 0; }
- startWrite();
- _panel->fp_display(_panel, this, x, y, w, h);
- endWrite();
- }
-
- void waitDisplay(void)
- {
- if (nullptr == _panel->fp_waitDisplay) return;
- startWrite();
- _panel->fp_waitDisplay(_panel, this);
- endWrite();
- }
-
- bool displayBusy(void)
- {
- if (nullptr == _panel->fp_displayBusy) return false;
- return _panel->fp_displayBusy(_panel, this);
- }
-
- void setAutoDisplay(bool flg)
- {
- _auto_display = flg;
- }
-
- void setColorDepth(uint8_t bpp) { setColorDepth((color_depth_t)bpp); }
- void setColorDepth(color_depth_t depth)
- {
- uint8_t buf[32];
- commandList(_panel->getColorDepthCommands(buf, depth));
- postSetColorDepth();
- }
-
- void setRotation(int_fast8_t r)
- {
- uint8_t buf[32];
- commandList(_panel->getRotationCommands(buf, r));
- postSetRotation();
- }
-
- void invertDisplay(bool i)
- {
- uint8_t buf[32];
- commandList(_panel->getInvertDisplayCommands(buf, i));
- }
-
- uint8_t getBrightness(void) const { return _panel->brightness; }
-
- void setBrightness(uint8_t brightness) {
- _panel->setBrightness(brightness);
- }
-
- virtual void initBus(void) = 0;
-
- virtual void writeBytes_impl(const uint8_t* data, int32_t length, bool use_dma) = 0;
-
- virtual void readBytes_impl(uint8_t* dst, int32_t length) = 0;
-
- void initPanel(bool use_reset = true)
- {
- preInit();
- if (!_panel) return;
-
- _panel->init(use_reset);
-
- _sx = _sy = 0;
- _sw = _width;
- _sh = _height;
-
- invertDisplay(getInvert());
-
- const uint8_t *cmds;
- for (uint8_t i = 0; (cmds = _panel->getInitCommands(i)); i++) {
- delay(120);
- startWrite();
- cs_l();
- commandList(cmds);
- cs_h();
- endWrite();
- }
-
- startWrite();
- invertDisplay(getInvert());
- setColorDepth(getColorDepth());
- setRotation(getRotation());
- setBrightness(getBrightness());
- endWrite();
-
- _panel->post_init(this, use_reset);
- }
-
- void initTouch(void)
- {
- if (!_touch) return;
-
- _touch->init();
- _touch->wakeup();
- }
-
- uint_fast8_t getTouchRaw(touch_point_t *tp, uint_fast8_t number = 0)
- {
- if (!_touch) return 0;
-
- bool need_transaction = (_touch->bus_shared && _in_transaction);
- if (need_transaction) { endTransaction(); }
- auto res = _touch->getTouch(tp, number);
- if (need_transaction) { beginTransaction(); }
- return res;
- }
-
- uint_fast8_t getTouchRaw(int32_t *x = nullptr, int32_t *y = nullptr, uint_fast8_t number = 0)
- {
- touch_point_t tp;
- auto res = getTouchRaw(&tp, number);
- if (x) *x = tp.x;
- if (y) *y = tp.y;
- return res;
- }
-
- template
- uint_fast8_t getTouch(T *x, T *y, uint_fast8_t number = 0)
- {
- int32_t tx = -1, ty = -1;
- auto res = getTouch(&tx, &ty, number);
- if (x) *x = tx;
- if (y) *y = ty;
- return res;
- }
-
- uint_fast8_t getTouch(int32_t *x, int32_t *y, uint_fast8_t number = 0)
- {
- int32_t tx = -1, ty = -1;
- auto res = getTouchRaw(&tx, &ty, number);
- if (0 == res) return 0;
- convertRawXY(&tx, &ty);
- if (x) *x = tx;
- if (y) *y = ty;
- return res;
- }
-
- uint_fast8_t getTouch(touch_point_t *tp, uint_fast8_t number = 0)
- {
- auto res = getTouchRaw(tp, number);
- if (0 == res || tp == nullptr) return res;
- convertRawXY(&(tp->x), &(tp->y));
- return res;
- }
-
- void convertRawXY(uint16_t *x, uint16_t *y)
- {
- int32_t tx = *x, ty = *y;
- convertRawXY(&tx, &ty);
- *x = tx;
- *y = ty;
- }
-
- void convertRawXY(int32_t *x, int32_t *y)
- {
- int32_t tx = (_touch_affine[0] * (float)*x + _touch_affine[1] * (float)*y) + _touch_affine[2];
- int32_t ty = (_touch_affine[3] * (float)*x + _touch_affine[4] * (float)*y) + _touch_affine[5];
-
- uint_fast8_t r = _panel->rotation & 7;
- if (r & 1) {
- std::swap(tx, ty);
- }
- if (x) {
- if (r & 2) tx = (_width-1) - tx;
- *x = tx;
- }
- if (y) {
- if ((0 == ((r + 1) & 2)) != (0 == (r & 4))) ty = (_height-1) - ty;
- *y = ty;
- }
- }
-
- // This requires a uint16_t array with 8 elements. ( or nullptr )
- template
- void calibrateTouch(uint16_t *parameters, const T& color_fg, const T& color_bg, uint8_t size = 10)
- {
- calibrate_touch(parameters, _write_conv.convert(color_fg), _write_conv.convert(color_bg), size);
- }
-
- // This requires a uint16_t array with 8 elements.
- void setTouchCalibrate(uint16_t *parameters) { set_touch_calibrate(parameters); }
-
- bool commandList(const uint8_t *addr)
- {
- if (addr == nullptr) return false;
- if (*reinterpret_cast(addr) == 0xFFFF) return false;
-
- startWrite();
- preCommandList();
- command_list(addr);
- postCommandList();
- endWrite();
- return true;
- }
-
- void command_list(const uint8_t *addr)
- {
- for (;;)
- { // For each command...
- if (*reinterpret_cast(addr) == 0xFFFF) break;
- writeCommand(*addr++); // Read, issue command
- uint_fast8_t numArgs = *addr++; // Number of args to follow
- uint_fast8_t ms = numArgs & CMD_INIT_DELAY; // If hibit set, delay follows args
- numArgs &= ~CMD_INIT_DELAY; // Mask out delay bit
- if (numArgs)
- {
- do { // For each argument...
- writeData(*addr++); // Read, issue argument
- } while (--numArgs);
- }
- if (ms) {
- ms = *addr++; // Read post-command delay time (ms)
- delay( (ms==255 ? 500 : ms) );
- }
- }
- }
-
- board_t getBoard(void) const { return board; }
-
- void cs_h(void) {
- waitDMA_impl();
- gpio_hi(_panel->spi_cs);
- }
-
- void cs_l(void) {
- waitDMA_impl();
- gpio_lo(_panel->spi_cs);
- }
-
- protected:
- board_t board = lgfx::board_t::board_unknown;
-
- float _touch_affine[6] = {1,0,0,0,1,0};
-
- bool _in_transaction = false;
-
- virtual void preInit(void) {}
- virtual void preCommandList(void) {}
- virtual void postCommandList(void) {}
- virtual void postSetPanel(void) {}
- virtual void postSetRotation(void) {}
- virtual void postSetTouch(void)
- {
- uint16_t xmin = _touch->x_min;
- uint16_t xmax = _touch->x_max;
- uint16_t ymin = _touch->y_min;
- uint16_t ymax = _touch->y_max;
- uint16_t parameters[8] =
- { xmin, ymin
- , xmin, ymax
- , xmax, ymin
- , xmax, ymax };
- set_touch_calibrate(parameters);
- }
-
- void postSetColorDepth(void)
- {
- _write_conv.setColorDepth(_panel->write_depth);
- _read_conv.setColorDepth(_panel->read_depth);
- }
-
- virtual void init_impl(bool use_reset = true)
- {
- initBus();
- initPanel(use_reset);
- initTouch();
- if (use_reset)
- {
- clear();
- display();
- waitDisplay();
- }
- }
-
- bool isReadable_impl(void) const override { return _panel->spi_read; }
- int_fast8_t getRotation_impl(void) const override { return _panel->rotation; }
-
- void copyRect_impl(int32_t dst_x, int32_t dst_y, int32_t w, int32_t h, int32_t src_x, int32_t src_y) override
- {
- pixelcopy_t pc_read((void*)nullptr, _write_conv.depth, _read_conv.depth);
- pixelcopy_t pc_write((void*)nullptr, _write_conv.depth, _write_conv.depth);
- if (w < h)
- {
- const uint32_t buflen = h * _write_conv.bytes;
- uint8_t buf[buflen];
- pc_write.src_data = buf;
- pc_write.src_width = 1;
- pc_write.src_bitwidth = 1;
- int32_t add = (src_x < dst_x) ? - 1 : 1;
- int32_t pos = (src_x < dst_x) ? w - 1 : 0;
- do {
- readRect_impl(src_x + pos, src_y, 1, h, buf, &pc_read);
- pc_write.src_x = 0;
- pc_write.src_y = 0;
- pushImage_impl(dst_x + pos, dst_y, 1, h, &pc_write, true);
- pos += add;
- } while (--w);
- waitDMA_impl();
- } else {
- const uint32_t buflen = w * _write_conv.bytes;
- uint8_t buf[buflen];
- pc_write.src_data = buf;
- int32_t add = (src_y < dst_y) ? - 1 : 1;
- int32_t pos = (src_y < dst_y) ? h - 1 : 0;
- do {
- readRect_impl(src_x, src_y + pos, w, 1, buf, &pc_read);
- pc_write.src_x = 0;
- pc_write.src_y = 0;
- pushImage_impl(dst_x, dst_y + pos, w, 1, &pc_write, true);
- pos += add;
- } while (--h);
- waitDMA_impl();
- }
- }
-
- void pushImageARGB_impl(int32_t x, int32_t y, int32_t w, int32_t h, pixelcopy_t* param) override
- {
- auto src_x = param->src_x;
- auto buffer = reinterpret_cast(const_cast(param->src_data));
- auto bytes = _write_conv.bytes;
-/*
- this->setWindow(x, y, x + w, y);
- uint8_t* dmabuf = get_dmabuffer(w * bytes);
- memset(dmabuf, 0, w * bytes);
- param->fp_copy(dmabuf, 0, w, param);
- this->writePixelsDMA_impl(dmabuf, w);
- return;
-//*/
- pixelcopy_t pc_read(nullptr, static_cast