Split font opening/closing out of FT2Font constructor/destructor

This makes it easier to do later refactors.

Author: QuLogic

src/ft2font.cpp

@@ -7,7 +7,6 @@
 #include <cstdio>
 #include <iterator>
 #include <set>
-#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -207,32 +206,44 @@ FT2Font::get_path(std::vector<double> &vertices, std::vector<unsigned char> &cod
     codes.push_back(CLOSEPOLY);
 }
 
-FT2Font::FT2Font(FT_Open_Args &open_args,
-                 long hinting_factor_,
-                 std::vector<FT2Font *> &fallback_list,
+FT2Font::FT2Font(long hinting_factor_, std::vector<FT2Font *> &fallback_list,
                  FT2Font::WarnFunc warn, bool warn_if_used)
     : ft_glyph_warn(warn), warn_if_used(warn_if_used), image({1, 1}), face(nullptr),
       hinting_factor(hinting_factor_),
       // set default kerning factor to 0, i.e., no kerning manipulation
       kerning_factor(0)
 {
     clear();
+    // Set fallbacks
+    std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks));
+}
+
+FT2Font::~FT2Font()
+{
+    close();
+}
+
+void FT2Font::open(FT_Open_Args &open_args)
+{
     FT_CHECK(FT_Open_Face, _ft2Library, &open_args, 0, &face);
     if (open_args.stream != nullptr) {
         face->face_flags |= FT_FACE_FLAG_EXTERNAL_STREAM;
     }
-    // Set fallbacks
-    std::copy(fallback_list.begin(), fallback_list.end(), std::back_inserter(fallbacks));
 }
 
-FT2Font::~FT2Font()
+void FT2Font::close()
 {
+    // This should be idempotent, in case a user manually calls close before the
+    // destructor does.
+
     for (auto & glyph : glyphs) {
         FT_Done_Glyph(glyph);
     }
+    glyphs.clear();
 
     if (face) {
         FT_Done_Face(face);
+        face = nullptr;
     }
 }
 

src/ft2font.h

@@ -99,10 +99,11 @@ class FT2Font
     typedef void (*WarnFunc)(FT_ULong charcode, std::set<FT_String*> family_names);
 
   public:
-    FT2Font(FT_Open_Args &open_args, long hinting_factor,
-            std::vector<FT2Font *> &fallback_list,
+    FT2Font(long hinting_factor, std::vector<FT2Font *> &fallback_list,
             WarnFunc warn, bool warn_if_used);
     virtual ~FT2Font();
+    void open(FT_Open_Args &open_args);
+    void close();
     void clear();
     void set_size(double ptsize, double dpi);
     void set_charmap(int i);

src/ft2font_wrapper.cpp

@@ -499,10 +499,10 @@ PyFT2Font_init(py::object filename, long hinting_factor = 8,
         self->stream.close = nullptr;
     }
 
-    self->x = new FT2Font(open_args, hinting_factor, fallback_fonts, ft_glyph_warn,
+    self->x = new FT2Font(hinting_factor, fallback_fonts, ft_glyph_warn,
                           warn_if_used);
-
     self->x->set_kerning_factor(*kerning_factor);
+    self->x->open(open_args);
 
     return self;
 }