Add destructors for element and fingerprint

itsravenous · Sep 28, 2017 · b3ea83f · b3ea83f
1 parent 797afa5
commit b3ea83f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Sources/i3s-swift/i3s-swift.swift b/Sources/i3s-swift/i3s-swift.swift
@@ -7,7 +7,7 @@ public class Element {
     e = Element_new()
   }
   deinit {
-    // TODO Element_delete(e)
+    Element_delete(e)
   }
 }
 
@@ -29,7 +29,7 @@ public class FingerPrint {
     f = FingerPrint.do_init(ref: ref, data: data, nr: nr)
   } 
   deinit {
-    // TODO FingerPrint_delete(f)
+    FingerPrint_delete(f)
   }
 
   public func compare(_ unknown: FingerPrint) -> Double {

diff --git a/Sources/i3s/i3s.cc b/Sources/i3s/i3s.cc
@@ -9,11 +9,19 @@ extern "C" {
     return new Element();
   }
 
+  void Element_delete(Element *element) {
+    delete element;
+  }
+
   FingerPrint* FingerPrint_new(const double *ref, const double *data, int nr) {
     /* it's safe to cast away const: ref and data are not actually modified */
     return new FingerPrint((double *)ref, (double *)data, nr);
   }
 
+  void FingerPrint_delete(FingerPrint *fgp) {
+    delete fgp;
+  }
+
   double FingerPrint_getScore(FingerPrint *fgp) {
     return fgp->getScore();
   }

diff --git a/Sources/i3s/incl_pub/i3s.h b/Sources/i3s/incl_pub/i3s.h
@@ -10,7 +10,9 @@ typedef struct Element Element;
 typedef struct FingerPrint FingerPrint;
 
 Element* Element_new();
+void Element_delete(Element *element);
 FingerPrint* FingerPrint_new(const double *ref, const double *data, int nr);
+void FingerPrint_delete(FingerPrint* fgp);
 double FingerPrint_getScore(FingerPrint *fgp);
 double Compare_two(FingerPrint* unknown, FingerPrint* fp);