From 557bb11bde76b8ab86973422224b54bbb2e48dae Mon Sep 17 00:00:00 2001 From: Jinwoo Song Date: Wed, 27 May 2015 20:21:36 +0900 Subject: [PATCH] Use FT_Done_Library instead of FT_Done_Freetype It is recommended to use FT_Done_Library with FT_New_Library from freetype document. Fixes #6191. --- components/gfx/platform/freetype/font_context.rs | 4 ++-- components/servo/Cargo.lock | 2 +- ports/cef/Cargo.lock | 2 +- ports/gonk/Cargo.lock | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/gfx/platform/freetype/font_context.rs b/components/gfx/platform/freetype/font_context.rs index 1c58233f0f7..313e02f022e 100644 --- a/components/gfx/platform/freetype/font_context.rs +++ b/components/gfx/platform/freetype/font_context.rs @@ -4,7 +4,7 @@ use freetype::freetype::FTErrorMethods; use freetype::freetype::FT_Add_Default_Modules; -use freetype::freetype::FT_Done_FreeType; +use freetype::freetype::FT_Done_Library; use freetype::freetype::FT_Library; use freetype::freetype::FT_Memory; use freetype::freetype::FT_New_Library; @@ -50,7 +50,7 @@ pub struct FontContextHandle { impl Drop for FreeTypeLibraryHandle { fn drop(&mut self) { assert!(!self.ctx.is_null()); - unsafe { FT_Done_FreeType(self.ctx) }; + unsafe { FT_Done_Library(self.ctx) }; } } diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 598c279c7e9..058c07d2a3a 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -330,7 +330,7 @@ dependencies = [ [[package]] name = "freetype" version = "0.1.0" -source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b" +source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 9541567da8f..ec2ab404be4 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -338,7 +338,7 @@ dependencies = [ [[package]] name = "freetype" version = "0.1.0" -source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b" +source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index feb7ee7b413..9a839d32898 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -325,7 +325,7 @@ dependencies = [ [[package]] name = "freetype" version = "0.1.0" -source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b" +source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7" dependencies = [ "libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ]