Skip to content

[pull] master from JuliaIO:master #39

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 7, 2026
Merged

[pull] master from JuliaIO:master #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 9 additions & 6 deletions src/MAT_HDF5.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,11 @@ function matopen(filename::AbstractString, rd::Bool, wr::Bool, cr::Bool, tr::Boo
if rd && haskey(fid.plain, subsys_refs)
fid.subsystem.table_type = table
fid.subsystem.convert_opaque = convert_opaque
subsys_data = m_read(fid.plain[subsys_refs], fid.subsystem)
subsys_group::HDF5.Group = fid.plain[subsys_refs]
HDF5.name(subsys_group) == "/#subsystem#" || error("Invalid subsystem group name")
subsys_data = m_read(subsys_group, fid.subsystem, "#subsystem#")
MAT_subsys.load_subsys!(fid.subsystem, subsys_data, endian_indicator)
close(subsys_group)
elseif wr
MAT_subsys.init_save!(fid.subsystem)
end
Expand Down Expand Up @@ -318,11 +321,11 @@ end

# reading a struct, struct array, or sparse matrix
function m_read(g::HDF5.Group, subsys::Subsystem)
if HDF5.name(g) == "/#subsystem#"
mattype = "#subsystem#"
else
mattype = read_attribute(g, name_type_attr_matlab)
end
mattype = read_attribute(g, name_type_attr_matlab)
return m_read(g, subsys, mattype)
end

function m_read(g::HDF5.Group, subsys::Subsystem, mattype::String)
is_object = false
if mattype != "struct"
attr = attributes(g)
Expand Down
Loading