aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2024-01-19 14:09:26 +0100
committerThomas White <taw@physics.org>2024-02-06 16:59:35 +0100
commit4e8625a7fd1a4a5b1c150cd388adae36757c1747 (patch)
treec4b36990fe9ee173b1d965d20542f11108975f29
parent93a6a827f115f27ed9e148aa635ec9400ffa700d (diff)
Julia: Fix stack overflow with image.peaklist
-rw-r--r--julia/CrystFEL/src/image.jl9
1 files changed, 5 insertions, 4 deletions
diff --git a/julia/CrystFEL/src/image.jl b/julia/CrystFEL/src/image.jl
index 5740dfaf..ce7b74d0 100644
--- a/julia/CrystFEL/src/image.jl
+++ b/julia/CrystFEL/src/image.jl
@@ -100,17 +100,18 @@ end
function getpeaklist(image)
idata = unsafe_load(image.internalptr)
- if (image.peaklist === nothing) || (idata.peaklist != image.peaklist.internalptr)
+ if (getfield(image, :peaklist) === nothing) ||
+ (idata.peaklist != getfield(image, :peaklist).internalptr)
if idata.peaklist != C_NULL
- image.peaklist = PeakList(idata.peaklist)
+ setfield!(image, :peaklist, PeakList(idata.peaklist))
# From now on, Julia is completely responsible for freeing the peaklist
idata.owns_peaklist = 0
unsafe_store!(image.internalptr, idata)
else
- image.peaklist = nothing
+ setfield!(image, :peaklist, nothing)
end
end
- return image.peaklist
+ return getfield(image, :peaklist)
end