1 files changed, 20 insertions, 28 deletions

diff --git a/src/crepe/facade/FontFacade.cpp b/src/crepe/facade/FontFacade.cpp
index cec3507..87f95ab 100644
--- a/src/crepe/facade/FontFacade.cpp
+++ b/src/crepe/facade/FontFacade.cpp
@@ -1,51 +1,43 @@
 #include <fontconfig/fontconfig.h>
-#include <iostream>
+#include <functional>
+#include <memory>
 #include <stdexcept>
+#include <string>
 
 #include "FontFacade.h"
 
-using namespace crepe;
 using namespace std;
+using namespace crepe;
 
 FontFacade::FontFacade() {
-	if (!FcInit()) {
-		throw runtime_error("Failed to initialize Fontconfig.");
-	}
+	if (!FcInit()) throw runtime_error("Failed to initialize Fontconfig.");
 }
+
 FontFacade::~FontFacade() { FcFini(); }
+
 Asset FontFacade::get_font_asset(const string & font_family) {
+	FcPattern * raw_pattern
+		= FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
+	if (raw_pattern == NULL) throw runtime_error("Failed to create font pattern.");
 
-	// Create a pattern to search for the font family
-	FcPattern * pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_family.c_str()));
-	if (!pattern) {
-		throw runtime_error("Failed to create font pattern.");
-	}
+	unique_ptr<FcPattern, function<void(FcPattern *)>> pattern{
+		raw_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
 
-	// Default configuration
 	FcConfig * config = FcConfigGetCurrent();
-	if (config == NULL) {
-		// FcPatternDestroy(pattern);
-		throw runtime_error("Failed to get current Fontconfig configuration.");
-	}
+	if (config == NULL) throw runtime_error("Failed to get current Fontconfig configuration.");
 
-	// Match the font pattern
 	FcResult result;
-	FcPattern * matched_pattern = FcFontMatch(config, pattern, &result);
-	FcPatternDestroy(pattern);
+	FcPattern * raw_matched_pattern = FcFontMatch(config, pattern.get(), &result);
+	if (raw_matched_pattern == NULL) throw runtime_error("No matching font found.");
+
+	unique_ptr<FcPattern, function<void(FcPattern *)>> matched_pattern
+		= {raw_matched_pattern, [](FcPattern * p) { FcPatternDestroy(p); }};
 
-	if (!matched_pattern) {
-		throw runtime_error("No matching font found.");
-	}
-	// Extract the file path
 	FcChar8 * file_path = nullptr;
-	if (FcPatternGetString(matched_pattern, FC_FILE, 0, &file_path) != FcResultMatch
-		|| file_path == NULL) {
-		// FcPatternDestroy(matched_pattern);
+	FcResult res = FcPatternGetString(matched_pattern.get(), FC_FILE, 0, &file_path);
+	if (res != FcResultMatch || file_path == NULL)
 		throw runtime_error("Failed to get font file path.");
-	}
 
-	// Convert the file path to a string
 	string font_file_path = reinterpret_cast<const char *>(file_path);
-	FcPatternDestroy(matched_pattern);
 	return Asset(font_file_path);
 }