Skip to content

bugfix/replacing-deprecated-size-function #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mbramwell1 wants to merge 4 commits into from
Closed

bugfix/replacing-deprecated-size-function #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca88525
Replacing the deprecated getDecompressedSize with the new getFrameCon…
mbramwell1 Mar 4, 2026
c699a23
Migrating to actually compile the c code instead of pointers
mbramwell1 Mar 12, 2026
72ae34b
Importing instead of symlink
mbramwell1 Mar 12, 2026
23d626d
Removing deprecated files, and removing the modulemap to rebuild one
mbramwell1 Mar 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions zstandard_android/lib/zstandard_android.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ class ZstandardAndroid extends ZstandardPlatform {

@override
Future<Uint8List?> decompress(Uint8List data) async {
const int contentSizeUnknown = -1;
const int contentSizeError = -2;

final int compressedSize = data.lengthInBytes;
final Pointer<Uint8> src = malloc.allocate<Uint8>(compressedSize);
src.asTypedList(compressedSize).setAll(0, data);

final int decompressedSizeExpected =
_bindings.ZSTD_getDecompressedSize(src.cast(), compressedSize);
final int dstCapacity = decompressedSizeExpected > 0
_bindings.ZSTD_getFrameContentSize(src.cast(), compressedSize);
final int dstCapacity = (decompressedSizeExpected != contentSizeUnknown &&
decompressedSizeExpected != contentSizeError &&
decompressedSizeExpected > 0)
? decompressedSizeExpected
: compressedSize * 20;
final Pointer<Uint8> dst = malloc.allocate<Uint8>(dstCapacity);
Expand Down
9 changes: 7 additions & 2 deletions zstandard_cli/lib/src/zstandard_cli_base.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,18 @@ class ZstandardCLI implements ZstandardInterface {
@override
Future<Uint8List?> decompress(Uint8List data) async {
if (data.isEmpty) return data;
const int contentSizeUnknown = -1;
const int contentSizeError = -2;

final int compressedSize = data.lengthInBytes;
final Pointer<Uint8> src = malloc.allocate<Uint8>(compressedSize);
src.asTypedList(compressedSize).setAll(0, data);

final int decompressedSizeExpected =
_bindings.ZSTD_getDecompressedSize(src.cast(), compressedSize);
final int dstCapacity = decompressedSizeExpected > 0
_bindings.ZSTD_getFrameContentSize(src.cast(), compressedSize);
final int dstCapacity = (decompressedSizeExpected != contentSizeUnknown &&
decompressedSizeExpected != contentSizeError &&
decompressedSizeExpected > 0)
? decompressedSizeExpected
: compressedSize * 20;
final Pointer<Uint8> dst = malloc.allocate<Uint8>(dstCapacity);
Expand Down
9 changes: 7 additions & 2 deletions zstandard_ios/lib/zstandard_ios.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ class ZstandardIOS extends ZstandardPlatform {

@override
Future<Uint8List?> decompress(Uint8List data) async {
const int contentSizeUnknown = -1;
const int contentSizeError = -2;

final int compressedSize = data.lengthInBytes;
final Pointer<Uint8> src = malloc.allocate<Uint8>(compressedSize);
src.asTypedList(compressedSize).setAll(0, data);

final int decompressedSizeExpected =
_bindings.ZSTD_getDecompressedSize(src.cast(), compressedSize);
final int dstCapacity = decompressedSizeExpected > 0
_bindings.ZSTD_getFrameContentSize(src.cast(), compressedSize);
final int dstCapacity = (decompressedSizeExpected != contentSizeUnknown &&
decompressedSizeExpected != contentSizeError &&
decompressedSizeExpected > 0)
? decompressedSizeExpected
: compressedSize * 20;
final Pointer<Uint8> dst = malloc.allocate<Uint8>(dstCapacity);
Expand Down
9 changes: 7 additions & 2 deletions zstandard_linux/lib/zstandard_linux.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ class ZstandardLinux extends ZstandardPlatform {

@override
Future<Uint8List?> decompress(Uint8List data) async {
const int contentSizeUnknown = -1;
const int contentSizeError = -2;

final int compressedSize = data.lengthInBytes;
final Pointer<Uint8> src = malloc.allocate<Uint8>(compressedSize);
src.asTypedList(compressedSize).setAll(0, data);

final int decompressedSizeExpected =
_bindings.ZSTD_getDecompressedSize(src.cast(), compressedSize);
final int dstCapacity = decompressedSizeExpected > 0
_bindings.ZSTD_getFrameContentSize(src.cast(), compressedSize);
final int dstCapacity = (decompressedSizeExpected != contentSizeUnknown &&
decompressedSizeExpected != contentSizeError &&
decompressedSizeExpected > 0)
? decompressedSizeExpected
: compressedSize * 20;
final Pointer<Uint8> dst = malloc.allocate<Uint8>(dstCapacity);
Expand Down
9 changes: 7 additions & 2 deletions zstandard_macos/lib/zstandard_macos.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,18 @@ class ZstandardMacOS extends ZstandardPlatform {

@override
Future<Uint8List?> decompress(Uint8List data) async {
const int contentSizeUnknown = -1;
const int contentSizeError = -2;

final int compressedSize = data.lengthInBytes;
final Pointer<Uint8> src = malloc.allocate<Uint8>(compressedSize);
src.asTypedList(compressedSize).setAll(0, data);

final int decompressedSizeExpected =
_bindings.ZSTD_getDecompressedSize(src.cast(), compressedSize);
final int dstCapacity = decompressedSizeExpected > 0
_bindings.ZSTD_getFrameContentSize(src.cast(), compressedSize);
final int dstCapacity = (decompressedSizeExpected != contentSizeUnknown &&
decompressedSizeExpected != contentSizeError &&
decompressedSizeExpected > 0)
? decompressedSizeExpected
: compressedSize * 20;
final Pointer<Uint8> dst = malloc.allocate<Uint8>(dstCapacity);
Expand Down
3 changes: 0 additions & 3 deletions zstandard_macos/macos/Classes/zstandard_macos.c
View file
Open in desktop

This file was deleted.

37 changes: 37 additions & 0 deletions zstandard_macos/macos/Classes/zstd/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# The Flutter tooling requires that developers have CMake 3.10 or later
# installed. You should not increase this version, as doing so will cause
# the plugin to fail to compile for some customers of the plugin.
cmake_minimum_required(VERSION 3.10)

project(zstandard_macos_library VERSION 0.0.1 LANGUAGES C)

# Encuentra los archivos C de Zstd
file(GLOB ZSTD_SRC
"zstd/common/*.c"
"zstd/compress/*.c"
"zstd/decompress/*.c"
)

# Agrega el ejecutable para el plugin
add_library(zstandard_macos SHARED
# "Classes/plugin_code.cpp"
${ZSTD_SRC}
)

add_library(zstandard_macos SHARED
"zstandard_macos.c"
)

target_include_directories(zstandard_macos PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/zstd"
"${CMAKE_CURRENT_SOURCE_DIR}/zstd/common"
"${CMAKE_CURRENT_SOURCE_DIR}/zstd/compress"
"${CMAKE_CURRENT_SOURCE_DIR}/zstd/decompress"
)

set_target_properties(zstandard_macos PROPERTIES
PUBLIC_HEADER zstandard_macos.h
OUTPUT_NAME "zstandard_macos"
)

target_compile_definitions(zstandard_macos PUBLIC DART_SHARED_LIB)
Loading