Skip to content

🪅 Fix blosc loading #73

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

Merged
jasperdewinther merged 6 commits into from
Dec 8, 2024
Merged

🪅 Fix blosc loading #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1cb9e77
fix blosc loading
jasperdewinther Dec 8, 2024
4050869
move check to be performed at each compressed read
jasperdewinther Dec 8, 2024
299131c
clippy
jasperdewinther Dec 8, 2024
6a8f13d
more clippy
jasperdewinther Dec 8, 2024
8a2a7c3
even more clippy
jasperdewinther Dec 8, 2024
dfe4844
use Vec::new
jasperdewinther Dec 8, 2024
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
2 changes: 1 addition & 1 deletion src/data_structure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ pub struct GridIter<'a, ValueTy> {
node_3: Option<&'a Node3<ValueTy>>,
}

impl<'a, ValueTy> Iterator for GridIter<'a, ValueTy>
impl<ValueTy> Iterator for GridIter<'_, ValueTy>
where
ValueTy: Copy,
{
Expand Down
5 changes: 4 additions & 1 deletion src/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,9 @@ impl<R: Read + Seek> VdbReader<R> {
gd: &GridDescriptor,
count: usize,
) -> Result<Vec<T>, ParseError> {
if count == 0 {
return Ok(Vec::new());
}
Ok(if gd.compression.contains(Compression::BLOSC) {
let num_compressed_bytes = reader.read_i64::<LittleEndian>()?;
let compressed_count = num_compressed_bytes / std::mem::size_of::<T>() as i64;
Expand Down Expand Up @@ -276,7 +279,7 @@ impl<R: Read + Seek> VdbReader<R> {
"Skipping blosc decompression because of a {}-count read",
count
);
vec![T::zeroed(); 0]
Vec::new()
}
}
} else if gd.compression.contains(Compression::ZIP) {
Expand Down
Loading