Fix memory leak related to freetype, bump v0.3.3

diff --git a/Cargo.lock b/Cargo.lock
index 33876cc3020ca05d12b3761f5968ad2cbe8d8a12..a935c45353a115f46ef95d62a55393a5e882ac10 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1668,7 +1668,7 @@ dependencies = [
 
 [[package]]
 name = "mpd_info_screen"
-version = "0.3.2"
+version = "0.3.3"
 dependencies = [
  "bindgen",
  "freetype",

diff --git a/Cargo.toml b/Cargo.toml
index 91f1ca5817108b169f5fcd645dabba66311d28b0..272c5365dd9b0ed8853079eadc25eac40e69cd98 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mpd_info_screen"
-version = "0.3.2"
+version = "0.3.3"
 edition = "2018"
 description = "Displays info on currently playing music from an MPD daemon"
 license = "MIT"

diff --git a/README.md b/README.md
index f778c20beb2c83ccd870aecbe83901f60fa75228..11456d143e2206e5bac404fa7b2e2f7127b26781 100644 (file)
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ installed already).
 # Usage
 
 
-    mpd_info_screen 0.3.2
+    mpd_info_screen 0.3.3
     
     USAGE:
         mpd_info_screen [FLAGS] [OPTIONS] <host> [port]

diff --git a/src/unicode_support/freetype.rs b/src/unicode_support/freetype.rs
index 8e324c09ea76315d320e9062748d06dae4c1d822..1bfe079a4a4a772f6d228fea7625d40b1e2dfdd8 100644 (file)
--- a/src/unicode_support/freetype.rs
+++ b/src/unicode_support/freetype.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 
 mod ffi {
     use freetype::freetype::{
-        FT_Done_Face, FT_Done_Library, FT_Face, FT_FaceRec_, FT_Get_Char_Index, FT_Init_FreeType,
+        FT_Done_Face, FT_Done_FreeType, FT_Face, FT_FaceRec_, FT_Get_Char_Index, FT_Init_FreeType,
         FT_Library, FT_ModuleRec_, FT_Open_Args, FT_Open_Face, FT_Parameter_, FT_StreamRec_,
         FT_OPEN_PATHNAME,
     };
@@ -17,7 +17,7 @@ mod ffi {
         fn drop(&mut self) {
             if !self.library.is_null() {
                 unsafe {
-                    FT_Done_Library(self.library);
+                    FT_Done_FreeType(self.library);
                 }
             }
         }
@@ -151,7 +151,7 @@ mod ffi {
 }
 
 pub fn font_has_char(c: char, font_path: &Path) -> Result<bool, String> {
-    let library = ffi::FTLibrary::new().ok_or(String::from("Failed to get FTLibrary"))?;
+    let library = ffi::FTLibrary::new().ok_or_else(|| String::from("Failed to get FTLibrary"))?;
     let mut args = ffi::FTOpenArgs::new_with_path(font_path);
     let faces = ffi::FTFaces::new(&library, &mut args)?;