Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fslpy
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
fslpy
Commits
424d0e18
Commit
424d0e18
authored
5 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Plain Diff
Merge branch 'bf/makeWriteable' into 'master'
Bf/make writeable See merge request fsl/fslpy!129
parents
d6ba364b
c8c0b6b6
No related branches found
No related tags found
No related merge requests found
Pipeline
#3826
passed
5 years ago
Stage: test
Stage: style
Stage: doc
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+24
-0
24 additions, 0 deletions
CHANGELOG.rst
fsl/data/utils.py
+12
-0
12 additions, 0 deletions
fsl/data/utils.py
with
36 additions
and
0 deletions
CHANGELOG.rst
+
24
−
0
View file @
424d0e18
...
...
@@ -2,6 +2,30 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
2.3.0 (Under development)
-------------------------
Added
^^^^^
* New :meth:`.LabelAtlas.get` and :meth:`ProbabilisticAtlas.get` methods,
which return an :class:`.Image` for a specific region.
* The :meth:`.AtlasDescription.find` method also now a ``name`` parameter,
allowing labels to be looked up by name.
* New :meth:`.FileTree.defines` and :meth:`.FileTree.on_disk` methods, to
replace the :func:`.FileTree.exists` method.
Fixed
^^^^^
* The :func:`.makeWriteable` function will always create a copy of an
``array`` if its base is a ``bytes`` object.
2.2.0 (Wednesday May 8th 2019)
------------------------------
...
...
This diff is collapsed.
Click to expand it.
fsl/data/utils.py
+
12
−
0
View file @
424d0e18
...
...
@@ -84,7 +84,19 @@ def makeWriteable(array):
is not possible, a copy is created and returned.
"""
try
:
# Versions of numpy prior to 1.16 will
# happily mutate a bytes array, whcih
# is supposed to be immutable. So if
# is the case, let's force a copy.
if
isinstance
(
array
.
base
,
bytes
):
raise
ValueError
()
# In versions of numpy 1.16 and newer,
# setting the WRITEABLE flag on an
# immutable array will cause a
# ValueError to be raised
array
.
flags
[
'
WRITEABLE
'
]
=
True
except
ValueError
:
array
=
np
.
array
(
array
)
return
array
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment