Skip to content

Commit

Permalink
Fix linux build error.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jdm
jdm committed Oct 1, 2014
1 parent 7401cd0 commit be41c20
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion components/gfx/platform/freetype/font.rs
View file
Expand Up @@ -238,7 +238,7 @@ impl FontHandleMethods for FontHandle {
let average_advance = self.glyph_index('0')
.and_then(|idx| self.glyph_h_advance(idx))
.map(|advance| self.font_units_to_au(advance))
.unwrap_or(max_advance_width);
.unwrap_or(max_advance);

let metrics = FontMetrics {
underline_size: underline_size,
Expand Down

5 comments on commit be41c20

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from pcwalton
at jdm@be41c20

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jdm/servo/formcontrols = be41c20 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jdm/servo/formcontrols = be41c20 merged ok, testing candidate = f800960

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://build.servo.org/builders/linux/builds/121
success: http://build.servo.org/builders/mac/builds/124

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = f800960

Please sign in to comment.