graphics/lerc: update to 4.1.0.

see https://github.com/Esri/lerc/blob/v4.1.0/CHANGELOG.md#410---2026-03-09
This commit is contained in:
landry
2026-03-10 09:37:14 +00:00
parent c5ba7bd612
commit 4fcaef3ac4
4 changed files with 3 additions and 95 deletions
+1 -1
View File
@@ -2,7 +2,7 @@ COMMENT = Limited Error Raster Compression
GH_ACCOUNT = esri
GH_PROJECT = lerc
GH_TAGNAME = v4.0.0
GH_TAGNAME = v4.1.0
CATEGORIES = graphics
SHARED_LIBS += Lerc 0.0 # 0.0
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (lerc-4.0.0.tar.gz) = kUMcKxbQ495suuoYhgM1n4fK7QglmmRf1aOAV4TuMKA=
SIZE (lerc-4.0.0.tar.gz) = 4710408
SHA256 (lerc-4.1.0.tar.gz) = 8Fsk0jaL7KuRRIc4eGVbtxiRBjFVDU94YmI3jBarlKc=
SIZE (lerc-4.1.0.tar.gz) = 4056763
@@ -1,32 +0,0 @@
https://github.com/Esri/lerc/commit/215c195fcfc6f41b87a4c62069911e9ea12cf741
Index: src/LercLib/fpl_EsriHuffman.cpp
--- src/LercLib/fpl_EsriHuffman.cpp.orig
+++ src/LercLib/fpl_EsriHuffman.cpp
@@ -31,7 +31,7 @@ Original coding 2021 Yuriy Yakimenko
USING_NAMESPACE_LERC
-void _assert(bool v);
+void lerc_assert(bool v);
bool decodePackBits (const unsigned char *ptr, const size_t size, size_t expected, unsigned char **output)
{
@@ -331,7 +331,7 @@ int fpl_EsriHuffman::EncodeHuffman (const char *input,
ptr[0] = HUFFMAN_RLE; // RLE flag
ptr[1] = input[0];
- _assert(input_len <= 0xffffffff);
+ lerc_assert(input_len <= 0xffffffff);
uint32_t len = (uint32_t)input_len;
@@ -508,7 +508,7 @@ bool fpl_EsriHuffman::DecodeHuffman(const unsigned cha
{
unsigned char *unpacked = NULL;
- _assert (true == decodePackBits (ppByte + 1, inCount - 1, nBytesRemainingInOut, &unpacked));
+ lerc_assert (true == decodePackBits (ppByte + 1, inCount - 1, nBytesRemainingInOut, &unpacked));
*output = unpacked;
@@ -1,60 +0,0 @@
https://github.com/Esri/lerc/commit/215c195fcfc6f41b87a4c62069911e9ea12cf741
Index: src/LercLib/fpl_Lerc2Ext.cpp
--- src/LercLib/fpl_Lerc2Ext.cpp.orig
+++ src/LercLib/fpl_Lerc2Ext.cpp
@@ -31,7 +31,7 @@ Original coding 2021 Yuriy Yakimenko
USING_NAMESPACE_LERC
-void _assert(bool v)
+void lerc_assert(bool v)
{
if (v == false)
throw "Assertion failed";
@@ -64,7 +64,7 @@ static void generateListOfTestBlocks(const int width,
{
size_t size = (size_t)width * height;
- _assert(size > 0);
+ lerc_assert(size > 0);
const int block_target_size = 8 * 1024;
@@ -613,11 +613,11 @@ bool restoreCrossBytes(std::vector<std::pair<int, char
//FILE* output,
const UnitType unit_type, uint8_t** output_block)
{
- _assert(predictor == PREDICTOR_NONE || predictor == PREDICTOR_ROWS_COLS);
+ lerc_assert(predictor == PREDICTOR_NONE || predictor == PREDICTOR_ROWS_COLS);
size_t unit_size = output_buffers.size();
- _assert(unit_size == UnitTypes::size(unit_type));
+ lerc_assert(unit_size == UnitTypes::size(unit_type));
const int delta = Predictor::getIntDelta(predictor);
@@ -669,11 +669,11 @@ bool restoreByteOrder(std::vector<std::pair<int, char*
const size_t cols, const size_t rows, const PredictorType predictor, //FILE* output,
const UnitType unit_type, uint8_t** output_block)
{
- _assert(predictor == PREDICTOR_NONE || predictor == PREDICTOR_DELTA1);
+ lerc_assert(predictor == PREDICTOR_NONE || predictor == PREDICTOR_DELTA1);
size_t unit_size = output_buffers.size();
- _assert(unit_size == UnitTypes::size(unit_type));
+ lerc_assert(unit_size == UnitTypes::size(unit_type));
const int delta = Predictor::getIntDelta(predictor);
@@ -806,7 +806,7 @@ bool LosslessFPCompression::DecodeHuffmanFltSlice (con
size_t extracted_size = fpl_Compression::extract_buffer((const char *)compressed, compressed_size, expected_size, &uncompressed);
- _assert(expected_size == extracted_size);
+ lerc_assert(expected_size == extracted_size);
free(compressed);
compressed = NULL;