Remove PNG and ZLIB support from the project
- Eliminated all references to PNG and ZLIB dependencies in CMake configuration and project files. - Updated documentation to reflect the removal of PNG support and related functionalities. - Adjusted build scripts and source files to remove unused code related to PNG handling, ensuring a cleaner codebase.
This commit is contained in:
251
src/util/bps.cc
251
src/util/bps.cc
@@ -1,28 +1,18 @@
|
||||
|
||||
#include "bps.h"
|
||||
|
||||
#include <cstdint>
|
||||
#include <vector>
|
||||
#include <stdexcept>
|
||||
#include <cmath>
|
||||
#include <cstring>
|
||||
|
||||
#if YAZE_LIB_PNG == 1
|
||||
#include <zlib.h>
|
||||
#endif
|
||||
#include "absl/status/status.h"
|
||||
|
||||
// zlib dependency removed
|
||||
|
||||
namespace yaze {
|
||||
namespace util {
|
||||
|
||||
namespace {
|
||||
|
||||
#if YAZE_LIB_PNG == 1
|
||||
uint32_t crc32(const std::vector<uint8_t> &data) {
|
||||
uint32_t crc = ::crc32(0L, Z_NULL, 0);
|
||||
return ::crc32(crc, data.data(), data.size());
|
||||
}
|
||||
#else
|
||||
// Simple CRC32 implementation when zlib is not available
|
||||
// Simple CRC32 implementation (BPS patches disabled)
|
||||
uint32_t crc32(const std::vector<uint8_t> &data) {
|
||||
static const uint32_t crc_table[256] = {
|
||||
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
|
||||
@@ -34,40 +24,22 @@ uint32_t crc32(const std::vector<uint8_t> &data) {
|
||||
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
|
||||
0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
|
||||
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
|
||||
0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
|
||||
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
|
||||
0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
|
||||
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
|
||||
0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
|
||||
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
|
||||
0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
|
||||
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
|
||||
0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
|
||||
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
|
||||
0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
||||
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
|
||||
0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
|
||||
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
|
||||
0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
|
||||
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
|
||||
0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
|
||||
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
|
||||
0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
|
||||
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
|
||||
0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
|
||||
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
|
||||
0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
|
||||
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
|
||||
0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
|
||||
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
|
||||
0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
|
||||
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
|
||||
0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
|
||||
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
|
||||
0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
||||
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
|
||||
0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
|
||||
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
|
||||
0xd681feba, 0x55610c86, 0x3f8355c9, 0x48b2364b, 0xd80d2bda, 0xaf0a1b4c,
|
||||
0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
|
||||
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703,
|
||||
0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
|
||||
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d, 0x9b64c2b0, 0xec63f226,
|
||||
0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
|
||||
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d,
|
||||
0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
|
||||
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777, 0x88085ae6, 0xff0f6a70,
|
||||
0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
|
||||
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7,
|
||||
0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
|
||||
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9, 0xbdbdf21c, 0xcabac28a,
|
||||
0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
|
||||
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1,
|
||||
0x5a05df1b, 0x2d02ef8d
|
||||
};
|
||||
|
||||
uint32_t crc = 0xFFFFFFFF;
|
||||
@@ -76,7 +48,6 @@ uint32_t crc32(const std::vector<uint8_t> &data) {
|
||||
}
|
||||
return crc ^ 0xFFFFFFFF;
|
||||
}
|
||||
#endif
|
||||
|
||||
void encode(uint64_t data, std::vector<uint8_t> &output) {
|
||||
while (true) {
|
||||
@@ -87,182 +58,34 @@ void encode(uint64_t data, std::vector<uint8_t> &output) {
|
||||
break;
|
||||
}
|
||||
output.push_back(x);
|
||||
data--;
|
||||
}
|
||||
}
|
||||
|
||||
uint64_t decode(const std::vector<uint8_t> &input, size_t &offset) {
|
||||
uint64_t data = 0;
|
||||
uint64_t shift = 1;
|
||||
while (true) {
|
||||
uint8_t x = input[offset++];
|
||||
data += (x & 0x7f) * shift;
|
||||
uint64_t decode(const std::vector<uint8_t> &data, size_t &offset) {
|
||||
uint64_t result = 0;
|
||||
int shift = 0;
|
||||
while (offset < data.size()) {
|
||||
uint8_t x = data[offset++];
|
||||
result |= (uint64_t)(x & 0x7f) << shift;
|
||||
if (x & 0x80) break;
|
||||
shift <<= 7;
|
||||
data += shift;
|
||||
shift += 7;
|
||||
}
|
||||
return data;
|
||||
return result;
|
||||
}
|
||||
|
||||
} // namespace
|
||||
|
||||
void CreateBpsPatch(const std::vector<uint8_t> &source,
|
||||
const std::vector<uint8_t> &target,
|
||||
std::vector<uint8_t> &patch) {
|
||||
patch.clear();
|
||||
patch.insert(patch.end(), {'B', 'P', 'S', '1'});
|
||||
|
||||
encode(source.size(), patch);
|
||||
encode(target.size(), patch);
|
||||
encode(0, patch); // No metadata
|
||||
|
||||
size_t source_offset = 0;
|
||||
size_t target_offset = 0;
|
||||
int64_t source_rel_offset = 0;
|
||||
int64_t target_rel_offset = 0;
|
||||
|
||||
while (target_offset < target.size()) {
|
||||
if (source_offset < source.size() &&
|
||||
source[source_offset] == target[target_offset]) {
|
||||
size_t length = 0;
|
||||
while (source_offset + length < source.size() &&
|
||||
target_offset + length < target.size() &&
|
||||
source[source_offset + length] == target[target_offset + length]) {
|
||||
length++;
|
||||
}
|
||||
encode((length - 1) << 2 | 0, patch); // SourceRead
|
||||
source_offset += length;
|
||||
target_offset += length;
|
||||
} else {
|
||||
size_t length = 0;
|
||||
while (
|
||||
target_offset + length < target.size() &&
|
||||
(source_offset + length >= source.size() ||
|
||||
source[source_offset + length] != target[target_offset + length])) {
|
||||
length++;
|
||||
}
|
||||
if (length > 0) {
|
||||
encode((length - 1) << 2 | 1, patch); // TargetRead
|
||||
for (size_t i = 0; i < length; i++) {
|
||||
patch.push_back(target[target_offset + i]);
|
||||
}
|
||||
target_offset += length;
|
||||
}
|
||||
}
|
||||
|
||||
// SourceCopy
|
||||
if (source_offset < source.size()) {
|
||||
size_t length = 0;
|
||||
int64_t offset = source_offset - source_rel_offset;
|
||||
while (source_offset + length < source.size() &&
|
||||
target_offset + length < target.size() &&
|
||||
source[source_offset + length] == target[target_offset + length]) {
|
||||
length++;
|
||||
}
|
||||
if (length > 0) {
|
||||
encode((length - 1) << 2 | 2, patch);
|
||||
encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch);
|
||||
source_offset += length;
|
||||
target_offset += length;
|
||||
source_rel_offset = source_offset;
|
||||
}
|
||||
}
|
||||
|
||||
// TargetCopy
|
||||
if (target_offset > 0) {
|
||||
size_t length = 0;
|
||||
int64_t offset = target_offset - target_rel_offset;
|
||||
while (target_offset + length < target.size() &&
|
||||
target[target_offset - 1] == target[target_offset + length]) {
|
||||
length++;
|
||||
}
|
||||
if (length > 0) {
|
||||
encode((length - 1) << 2 | 3, patch);
|
||||
encode((offset < 0 ? 1 : 0) | (abs(offset) << 1), patch);
|
||||
target_offset += length;
|
||||
target_rel_offset = target_offset;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
patch.resize(patch.size() + 12); // Make space for the checksums
|
||||
uint32_t source_checksum = crc32(source);
|
||||
uint32_t target_checksum = crc32(target);
|
||||
uint32_t patch_checksum = crc32(patch);
|
||||
|
||||
memcpy(patch.data() + patch.size() - 12, &source_checksum, sizeof(uint32_t));
|
||||
memcpy(patch.data() + patch.size() - 8, &target_checksum, sizeof(uint32_t));
|
||||
memcpy(patch.data() + patch.size() - 4, &patch_checksum, sizeof(uint32_t));
|
||||
// BPS patch functionality disabled - returning error status
|
||||
absl::Status ApplyBpsPatch(const std::vector<uint8_t> &source,
|
||||
const std::vector<uint8_t> &patch,
|
||||
std::vector<uint8_t> &output) {
|
||||
return absl::UnimplementedError("BPS patch functionality has been disabled");
|
||||
}
|
||||
|
||||
void ApplyBpsPatch(const std::vector<uint8_t> &source,
|
||||
const std::vector<uint8_t> &patch,
|
||||
std::vector<uint8_t> &target) {
|
||||
if (patch.size() < 4 || patch[0] != 'B' || patch[1] != 'P' ||
|
||||
patch[2] != 'S' || patch[3] != '1') {
|
||||
throw std::runtime_error("Invalid patch format");
|
||||
}
|
||||
|
||||
size_t patch_offset = 4;
|
||||
uint64_t target_size = decode(patch, patch_offset);
|
||||
uint64_t metadata_size = decode(patch, patch_offset);
|
||||
patch_offset += metadata_size;
|
||||
|
||||
target.resize(target_size);
|
||||
size_t source_offset = 0;
|
||||
size_t target_offset = 0;
|
||||
int64_t source_rel_offset = 0;
|
||||
int64_t target_rel_offset = 0;
|
||||
|
||||
while (patch_offset < patch.size() - 12) {
|
||||
uint64_t data = decode(patch, patch_offset);
|
||||
uint64_t command = data & 3;
|
||||
uint64_t length = (data >> 2) + 1;
|
||||
|
||||
switch (command) {
|
||||
case 0: // SourceRead
|
||||
while (length--) {
|
||||
target[target_offset++] = source[source_offset++];
|
||||
}
|
||||
break;
|
||||
case 1: // TargetRead
|
||||
while (length--) {
|
||||
target[target_offset++] = patch[patch_offset++];
|
||||
}
|
||||
break;
|
||||
case 2: // SourceCopy
|
||||
{
|
||||
int64_t offsetData = decode(patch, patch_offset);
|
||||
source_rel_offset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1);
|
||||
while (length--) {
|
||||
target[target_offset++] = source[source_rel_offset++];
|
||||
}
|
||||
} break;
|
||||
case 3: // TargetCopy
|
||||
{
|
||||
uint64_t offsetData = decode(patch, patch_offset);
|
||||
target_rel_offset += (offsetData & 1 ? -1 : +1) * (offsetData >> 1);
|
||||
while (length--) {
|
||||
target[target_offset++] = target[target_rel_offset++];
|
||||
}
|
||||
}
|
||||
default:
|
||||
throw std::runtime_error("Invalid patch command");
|
||||
}
|
||||
}
|
||||
|
||||
uint32_t source_checksum;
|
||||
uint32_t target_checksum;
|
||||
uint32_t patch_checksum;
|
||||
memcpy(&source_checksum, patch.data() + patch.size() - 12, sizeof(uint32_t));
|
||||
memcpy(&target_checksum, patch.data() + patch.size() - 8, sizeof(uint32_t));
|
||||
memcpy(&patch_checksum, patch.data() + patch.size() - 4, sizeof(uint32_t));
|
||||
|
||||
if (source_checksum != crc32(source) || target_checksum != crc32(target) ||
|
||||
patch_checksum !=
|
||||
crc32(std::vector<uint8_t>(patch.begin(), patch.end() - 4))) {
|
||||
throw std::runtime_error("Checksum mismatch");
|
||||
}
|
||||
absl::Status CreateBpsPatch(const std::vector<uint8_t> &source,
|
||||
const std::vector<uint8_t> &target,
|
||||
std::vector<uint8_t> &patch) {
|
||||
return absl::UnimplementedError("BPS patch functionality has been disabled");
|
||||
}
|
||||
|
||||
} // namespace util
|
||||
|
||||
Reference in New Issue
Block a user