Skip to content

Fix endianness assumptions in data handling #228

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

Open
llimeht wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix endianness assumptions in data handling #228

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
8 changes: 7 additions & 1 deletion sasdata/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,10 @@ def from_content(con):
"contents": contents,
"shape": shape,
}:
return np.frombuffer(base64.b64decode(contents), dtype=dtype).reshape(shape)
# ensure that the data is in native byte order once read
data = np.frombuffer(base64.b64decode(contents), dtype=dtype).reshape(shape)
data = np.asarray(data, dtype=data.dtype.newbyteorder('='))
return data
case {"value": value, "units": units}:
return from_json_quantity({"value": from_content(value), "units": from_content(units)})
case _:
Expand Down Expand Up @@ -598,6 +601,9 @@ def default(self, obj):
case Quantity():
return {"value": obj.value, "units": obj.units.ascii_symbol}
case ndarray():
# Ensure that the data is little-endian, no matter what the original format and
# data source; this standardises serialisation, as expected by the test suite
obj = np.asarray(obj, dtype=obj.dtype.newbyteorder('<'))
return {
"type": "ndarray",
"encoding": "base64",
Expand Down
Loading