vinzenz/redox
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix openlibm

Browse source
This commit is contained in:
Jeremy Soller 2016-09-22 16:57:26 -06:00
parent b0802162ea
commit e4490b06de
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -123,7 +123,7 @@ $(BUILD)/libcollections.rlib: rust/src/libcollections/lib.rs $(BUILD)/libcore.rl
$(RUSTC) $(RUSTCFLAGS) -o $@ $< $(RUSTC) $(RUSTCFLAGS) -o $@ $<
openlibm/libopenlibm.a: openlibm/libopenlibm.a:
make -C openlibm CFLAGS=-fno-stack-protector make -C openlibm
$(BUILD)/libopenlibm.a: openlibm/libopenlibm.a $(BUILD)/libopenlibm.a: openlibm/libopenlibm.a
mkdir -p $(BUILD) mkdir -p $(BUILD)

17
drivers/vesad/src/display.rs
View file

@ -87,24 +87,29 @@ impl Display {
let scale = Scale::uniform(16.0); let scale = Scale::uniform(16.0);
let v_metrics = font.v_metrics(scale); let v_metrics = font.v_metrics(scale);
let point = point(0.0, v_metrics.ascent); let point = point(0.0, v_metrics.ascent);
glyph.scaled(scale).positioned(point).draw(|off_x, off_y, v| { let glyph = glyph.scaled(scale).positioned(point);
let off_x = x + off_x as usize; if let Some(bb) = glyph.pixel_bounding_box() {
let off_y = y + off_y as usize; glyph.draw(|off_x, off_y, v| {
let off_x = x + (off_x as i32 + bb.min.x) as usize;
let off_y = y + (off_y as i32 + bb.min.y) as usize;
// There's still a possibility that the glyph clips the boundaries of the bitmap // There's still a possibility that the glyph clips the boundaries of the bitmap
if off_x < width && off_y < height { if off_x < width && off_y < height {
let v_u = (v * 255.0) as u32; let v_u = (v * 255.0) as u32;
let r = ((color >> 16) & 0xFF * v_u)/255; if v_u > 0 {
let g = ((color >> 8) & 0xFF * v_u)/255; let r = (((color >> 16) & 0xFF) * v_u)/255;
let b = (color & 0xFF * v_u)/255; let g = (((color >> 8) & 0xFF) * v_u)/255;
let b = ((color & 0xFF) * v_u)/255;
let c = (r << 16) | (g << 8) | b; let c = (r << 16) | (g << 8) | b;
let index = (off_y * width + off_x) as isize; let index = (off_y * width + off_x) as isize;
unsafe { *offscreen.offset(index) = c; } unsafe { *offscreen.offset(index) = c; }
unsafe { *onscreen.offset(index) = c; } unsafe { *onscreen.offset(index) = c; }
} }
}
}); });
} }
} }
}
/// Scroll display /// Scroll display
pub fn scroll(&mut self, rows: usize, color: u32) { pub fn scroll(&mut self, rows: usize, color: u32) {