Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 16:05:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Stop calling is_not_null.

Browse source 
It has been removed from Rust.
This commit is contained in:
Ms2ger 2015-01-20 13:08:49 +01:00
parent 2629445748
commit 7eb659371d
6 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/gfx/platform/freetype/font.rs
View file

@ -59,7 +59,7 @@ pub struct FontHandle {
#[unsafe_destructor]
impl Drop for FontHandle {
fn drop(&mut self) {
assert!(self.face.is_not_null());
assert!(!self.face.is_null());
unsafe {
if !FT_Done_Face(self.face).succeeded() {
panic!("FT_Done_Face failed");
@ -136,7 +136,7 @@ impl FontHandleMethods for FontHandle {
} else {
unsafe {
let os2 = FT_Get_Sfnt_Table(self.face, ft_sfnt_os2) as *mut TT_OS2;
let valid = os2.is_not_null() && (*os2).version != 0xffff;
let valid = !os2.is_null() && (*os2).version != 0xffff;
if valid {
let weight =(*os2).usWeightClass;
match weight {
@ -158,9 +158,8 @@ impl FontHandleMethods for FontHandle {
}
}
fn glyph_index(&self,
codepoint: char) -> Option<GlyphId> {
assert!(self.face.is_not_null());
fn glyph_index(&self, codepoint: char) -> Option<GlyphId> {
assert!(!self.face.is_null());
unsafe {
let idx = FT_Get_Char_Index(self.face, codepoint as FT_ULong);
return if idx != 0 as FT_UInt {
@ -173,8 +172,8 @@ impl FontHandleMethods for FontHandle {
}
fn glyph_h_kerning(&self, first_glyph: GlyphId, second_glyph: GlyphId)
-> FractionalPixel {
assert!(self.face.is_not_null());
-> FractionalPixel {
assert!(!self.face.is_null());
let mut delta = struct_FT_Vector_ { x: 0, y: 0 };
unsafe {
FT_Get_Kerning(self.face, first_glyph, second_glyph, FT_KERNING_DEFAULT, &mut delta);
@ -182,15 +181,14 @@ impl FontHandleMethods for FontHandle {
fixed_to_float_ft(delta.x as i32)
}
fn glyph_h_advance(&self,
glyph: GlyphId) -> Option<FractionalPixel> {
assert!(self.face.is_not_null());
fn glyph_h_advance(&self, glyph: GlyphId) -> Option<FractionalPixel> {
assert!(!self.face.is_null());
unsafe {
let res = FT_Load_Glyph(self.face, glyph as FT_UInt, 0);
if res.succeeded() {
let void_glyph = (*self.face).glyph;
let slot: FT_GlyphSlot = mem::transmute(void_glyph);
assert!(slot.is_not_null());
assert!(!slot.is_null());
let advance = (*slot).metrics.horiAdvance;
debug!("h_advance for {} is {}", glyph, advance);
let advance = advance as i32;
@ -227,7 +225,7 @@ impl FontHandleMethods for FontHandle {
let mut x_height = geometry::from_pt(0.0);
unsafe {
let os2 = FT_Get_Sfnt_Table(face, ft_sfnt_os2) as *mut TT_OS2;
let valid = os2.is_not_null() && (*os2).version != 0xffff;
let valid = !os2.is_null() && (*os2).version != 0xffff;
if valid {
strikeout_size = self.font_units_to_au((*os2).yStrikeoutSize as f64);
strikeout_offset = self.font_units_to_au((*os2).yStrikeoutPosition as f64);

2
components/gfx/platform/freetype/font_context.rs
View file

@ -49,7 +49,7 @@ pub struct FontContextHandle {
impl Drop for FreeTypeLibraryHandle {
fn drop(&mut self) {
assert!(self.ctx.is_not_null());
assert!(!self.ctx.is_null());
unsafe { FT_Done_FreeType(self.ctx) };
}
}

4
components/gfx/platform/freetype/font_list.rs
View file

@ -53,14 +53,14 @@ pub fn get_variations_for_family(family_name: &str, callback: |String|) {
let mut font_set = FcConfigGetFonts(config, FcSetSystem);
let font_set_array_ptr = &mut font_set;
let pattern = FcPatternCreate();
assert!(pattern.is_not_null());
assert!(!pattern.is_null());
let mut family_name_c = family_name.to_c_str();
let family_name = family_name_c.as_mut_ptr();
let ok = FcPatternAddString(pattern, FC_FAMILY.as_ptr() as *mut i8, family_name as *mut FcChar8);
assert!(ok != 0);
let object_set = FcObjectSetCreate();
assert!(object_set.is_not_null());
assert!(!object_set.is_null());
FcObjectSetAdd(object_set, FC_FILE.as_ptr() as *mut i8);
FcObjectSetAdd(object_set, FC_INDEX.as_ptr() as *mut i8);