Fix Raith data memory leak

Signed-off-by: Lucas Heitzmann Gabrielli <[email protected]>
heitzmann · Aug 31, 2024 · 69fbde1 · 69fbde1
1 parent 64083fd
commit 69fbde1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/include/gdstk/raithdata.hpp b/include/gdstk/raithdata.hpp
@@ -43,7 +43,7 @@ struct RaithData {
 
     void copy_from(const RaithData& raith_data);
 
-    PXXData to_pxxdata() const;
+    PXXData to_pxxdata(double scaling) const;
     void from_pxxdata(PXXData const& pxxdata);
 };
 

diff --git a/src/flexpath.cpp b/src/flexpath.cpp
@@ -827,7 +827,7 @@ ErrorCode FlexPath::to_gds(FILE* out, double scaling) {
                                    8,
                                    0x0F03};
 
-        PXXData pxxdata = raith_data.to_pxxdata();
+        PXXData pxxdata = raith_data.to_pxxdata(scaling);
         pxxdata.little_endian_swap();
 
         uint64_t len = raith_data.base_cell_name ? strlen(raith_data.base_cell_name) : 0;

diff --git a/src/raithdata.cpp b/src/raithdata.cpp
@@ -30,15 +30,16 @@ void RaithData::copy_from(const RaithData& raith_data) {
     dots_per_cycle = raith_data.dots_per_cycle;
     dwelltime_selection = raith_data.dwelltime_selection;
     if (base_cell_name) free_allocation(base_cell_name);
+    base_cell_name = NULL;
     if (raith_data.base_cell_name) base_cell_name = copy_string(raith_data.base_cell_name, NULL);
 }
 
-PXXData RaithData::to_pxxdata() const {
+PXXData RaithData::to_pxxdata(double scaling) const {
     PXXData pd{};
     pd.dwelltime_selection = dwelltime_selection;
-    pd.pitch_parallel_to_path = pitch_parallel_to_path;
-    pd.pitch_perpendicular_to_path = pitch_perpendicular_to_path;
-    pd.pitch_scale = pitch_scale;
+    pd.pitch_parallel_to_path = pitch_parallel_to_path * scaling;
+    pd.pitch_perpendicular_to_path = pitch_perpendicular_to_path * scaling;
+    pd.pitch_scale = pitch_scale * scaling;
     pd.periods = periods;
     pd.grating_type = grating_type;
     pd.dots_per_cycle = dots_per_cycle;