зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #6198 - Use FT_Done_Library instead of FT_Done_Freetype (from Jinwoo-Song:freetype); r=metajack
It is recommended to use FT_Done_Library with FT_New_Library from freetype document. Fixes #6191. r? @jdm @nnethercote cc @yichoi Source-Repo: https://github.com/servo/servo Source-Revision: af81db54790efbeb86ee03e6ca63fb9046c6111a
This commit is contained in:
Родитель
abff7d2965
Коммит
aafaa7ed0d
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
use freetype::freetype::FTErrorMethods;
|
use freetype::freetype::FTErrorMethods;
|
||||||
use freetype::freetype::FT_Add_Default_Modules;
|
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_Library;
|
||||||
use freetype::freetype::FT_Memory;
|
use freetype::freetype::FT_Memory;
|
||||||
use freetype::freetype::FT_New_Library;
|
use freetype::freetype::FT_New_Library;
|
||||||
|
@ -50,7 +50,7 @@ pub struct FontContextHandle {
|
||||||
impl Drop for FreeTypeLibraryHandle {
|
impl Drop for FreeTypeLibraryHandle {
|
||||||
fn drop(&mut self) {
|
fn drop(&mut self) {
|
||||||
assert!(!self.ctx.is_null());
|
assert!(!self.ctx.is_null());
|
||||||
unsafe { FT_Done_FreeType(self.ctx) };
|
unsafe { FT_Done_Library(self.ctx) };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -331,7 +331,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "freetype"
|
name = "freetype"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b"
|
source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
|
@ -340,7 +340,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "freetype"
|
name = "freetype"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b"
|
source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
|
@ -327,7 +327,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "freetype"
|
name = "freetype"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/servo/rust-freetype#f256a9ac84893f0a183b8966de2a3a03d7552b8b"
|
source = "git+https://github.com/servo/rust-freetype#34db81810ae8be3bef57094c8a378dbe98d2d2c7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
Загрузка…
Ссылка в новой задаче