Permalink
Browse files

Update for language changes

  • Loading branch information...
1 parent e2e181d commit 37389b82bd5608b05b66edce7a4cce92c7edb3c6 @pcwalton pcwalton committed Dec 14, 2012
Showing with 8 additions and 10 deletions.
  1. +1 −3 azure_hl.rs
  2. +7 −7 scaled_font.rs
View
@@ -1,6 +1,4 @@
// High-level bindings to Azure.
-use cairo_hl = cairo::cairo_hl;
-
use bindgen::{AzCreateColorPattern, AzCreateDrawTarget, AzCreateDrawTargetForCairoSurface};
use bindgen::{AzCreateDrawTargetForData, AzDataSourceSurfaceGetData, AzDataSourceSurfaceGetStride};
use bindgen::AzDrawTargetClearRect;
@@ -11,7 +9,7 @@ use bindgen::{AzReleaseColorPattern, AzReleaseDrawTarget};
use bindgen::AzReleaseSourceSurface;
use bindgen::AzRetainDrawTarget;
use bindgen::{AzSourceSurfaceGetDataSurface, AzSourceSurfaceGetFormat, AzSourceSurfaceGetSize};
-pub use cairo_hl::ImageSurface;
+pub use cairo::cairo_hl::ImageSurface;
use core::cast::transmute;
use core::ptr::{null, to_unsafe_ptr};
View
@@ -9,24 +9,24 @@ use cairo::cairo::bindgen::{cairo_font_options_destroy, cairo_matrix_init_identi
use cairo::cairo::bindgen::{cairo_scaled_font_create};
#[cfg(target_os="macos")]
-priv mod macos {
+pub mod macos {
extern mod core_graphics;
extern mod core_text;
- use core_text::font::CTFontRef;
- use core_graphics::font::{CGFont, CGFontRef};
+ use scaled_font::macos::core_text::font::CTFontRef;
+ use scaled_font::macos::core_graphics::font::{CGFont, CGFontRef};
use cairo::cairo_quartz::bindgen::cairo_quartz_font_face_create_for_cgfont;
}
#[cfg(target_os="macos")]
-priv use macos::*;
+priv use scaled_font::macos::*;
#[cfg(target_os="linux")]
-priv mod linux {
+pub mod linux {
extern mod freetype;
use cairo::cairo_ft::bindgen::cairo_ft_font_face_create_for_ft_face;
- use freetype::freetype::{FT_Face, FT_LOAD_DEFAULT};
+ use scaled_font::linux::freetype::freetype::{FT_Face, FT_LOAD_DEFAULT};
}
#[cfg(target_os="linux")]
-priv use linux::*;
+priv use scaled_font::linux::*;
type SkTypeface = *c_void;

0 comments on commit 37389b8

Please sign in to comment.