From f666ce5a86847c672ad72c5ae615036f09dd7794 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Tue, 1 Jul 2014 12:37:21 +1000 Subject: [PATCH] Update submodule pointer and code to match interface change. --- src/components/gfx/font.rs | 6 +++++- src/support/azure/rust-azure | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/gfx/font.rs b/src/components/gfx/font.rs index 9548237d49b..34eaab7e49e 100644 --- a/src/components/gfx/font.rs +++ b/src/components/gfx/font.rs @@ -27,6 +27,10 @@ use text::glyph::{CharIndex, GlyphStore, GlyphId}; use text::shaping::ShaperMethods; use text::{Shaper, TextRun}; +#[cfg(target_os="linux")] +#[cfg(target_os="android")] +use azure::scaled_font::NativeFont; + // FontHandle encapsulates access to the platform's font API, // e.g. quartz, FreeType. It provides access to metrics and tables // needed by the text shaper as well as access to the underlying font @@ -305,7 +309,7 @@ impl<'a> Font { fn create_azure_font(&self) -> ScaledFont { let freetype_font = self.handle.face; let size = self.style.pt_size as AzFloat; - ScaledFont::new(self.backend, freetype_font, size) + ScaledFont::new(self.backend, NativeFont(freetype_font), size) } } diff --git a/src/support/azure/rust-azure b/src/support/azure/rust-azure index 2d00be47103..9c71deb6575 160000 --- a/src/support/azure/rust-azure +++ b/src/support/azure/rust-azure @@ -1 +1 @@ -Subproject commit 2d00be47103f654c4fe30a806ac358abe9754d3a +Subproject commit 9c71deb6575c1cf6664b19b415705af6c5f9b56f