training: Replace memfree by free

free also accepts a nullptr argument, so the code can be simplified. Signed-off-by: Stefan Weil <sw@weilnetz.de>
tesseract-ocr · May 1, 2017 · 1d6dd03 · 1d6dd03
1 parent ca89a11
commit 1d6dd03
Showing 1 changed file with 6 additions and 13 deletions.
diff --git a/training/commontraining.cpp b/training/commontraining.cpp
@@ -22,7 +22,6 @@
 #include "emalloc.h"
 #include "featdefs.h"
 #include "fontinfo.h"
-#include "freelist.h"
 #include "globals.h"
 #include "intfeaturespace.h"
 #include "mastertrainer.h"
@@ -579,18 +578,12 @@ void CleanUpUnusedData(
   iterate(ProtoList)
   {
     Prototype = (PROTOTYPE *) first_node (ProtoList);
-    if (Prototype->Variance.Elliptical != nullptr) {
-      memfree(Prototype->Variance.Elliptical);
-      Prototype->Variance.Elliptical = nullptr;
-    }
-    if (Prototype->Magnitude.Elliptical != nullptr) {
-      memfree(Prototype->Magnitude.Elliptical);
-      Prototype->Magnitude.Elliptical = nullptr;
-    }
-    if (Prototype->Weight.Elliptical != nullptr) {
-      memfree(Prototype->Weight.Elliptical);
-      Prototype->Weight.Elliptical = nullptr;
-    }
+    free(Prototype->Variance.Elliptical);
+    Prototype->Variance.Elliptical = nullptr;
+    free(Prototype->Magnitude.Elliptical);
+    Prototype->Magnitude.Elliptical = nullptr;
+    free(Prototype->Weight.Elliptical);
+    Prototype->Weight.Elliptical = nullptr;
   }
 }