Merge pull request #1710 from g5t/issue-1709

[Fix] missing pointer dereferences
McStasMcXtrace · Sep 24, 2024 · 3c5bb8e · 3c5bb8e
2 parents 112eea5 + 2dda6ad
commit 3c5bb8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/mcstas-comps/optics/Derotator.comp b/mcstas-comps/optics/Derotator.comp
@@ -45,10 +45,11 @@ TRACE
   Rotation R;
 
   /* Name of Rotation uservar */
-  char* Rot_varptr = COMP_GETPAR3(Rotator, rotator, rot_var);
+  char* Rot_varptr = *COMP_GETPAR3(Rotator, rotator, rot_var);
 
   /* Invert rotation matrix for use in derotation */
-  rot_transpose((Rotation*)particle_getvar_void(_particle, Rot_varptr, NULL),R);
+  rot_transpose(*(Rotation *) particle_getvar_void(_particle, Rot_varptr, NULL), R);
+
   /* apply rotation to centered coordinates */
   Coords tmp = coords_set(x,y,z);
   coords_get(rot_apply(R, tmp), &x, &y, &z);

diff --git a/mcstas-comps/optics/Rotator.comp b/mcstas-comps/optics/Rotator.comp
@@ -107,6 +107,7 @@ if (nu != 0 || phase != 0) { /* rotate neutron w/r to position of component */
 
 %}
 
+
 MCDISPLAY
 %{
   int ih;
-Original file line number
+Diff line change
@@ Expand Up @@
     %}
     MCDISPLAY
     %{
       int ih;
@@ Expand Down @@