Update submodules

This commit is contained in:
Brian Anderson 2012-10-08 15:45:39 -07:00
parent 14c0e540e3
commit 3b4beff064
19 changed files with 55 additions and 55 deletions

@ -1 +1 @@
Subproject commit 6eaf88a838f5c68e38c491b439b7464652647c25
Subproject commit e86543f5f41108b1765087dfa2b11bdc159facf4

@ -1 +1 @@
Subproject commit e34e5f67f3de6135865a99a4a545c1f78c2e67a3
Subproject commit 653d132c50f7f38b39515fba898b2f0a459c97df

@ -1 +1 @@
Subproject commit 21f20640bbc609a580f7a289b6407240ae98754a
Subproject commit af039dd4bdeaf56f42b443307c250a66255e9334

@ -1 +1 @@
Subproject commit a7985f7732da1fa3e87087863c041c5b49ef6a8d
Subproject commit 55674ee31bd6312482bb26a9c68a18a366f57c8c

@ -1 +1 @@
Subproject commit 5b57a6efee711ed399d9c0d158a86857d0b96060
Subproject commit 9331dc2047f88020df9fd9543a7115aa42b04a16

@ -1 +1 @@
Subproject commit e56e41dc94e8f8083d484866fcc22d44b7eb2efe
Subproject commit 381c2ff5853992f9146c9cb90e2f774c869b79f8

@ -1 +1 @@
Subproject commit 2886e54d6230050ee7a25e590faad969f95a7d16
Subproject commit e3de0827a4e18d5a650470f6947861d10e9be59c

@ -1 +1 @@
Subproject commit 8cab62f8095e7c99b858da256f4f7042d57d9712
Subproject commit 44099faab1a257f2163df07fb2f711d7f8b66d82

@ -1 +1 @@
Subproject commit 546e797384821679fe45f8fe549fc8735ba24617
Subproject commit 64ee4d0bd794ca73392fc4ad65aea47bbf313c27

@ -1 +1 @@
Subproject commit 4d916307330d5b7e5818c87d3aebda175477b9ae
Subproject commit df7170d88fd114f4c4aeb0a9d35e5f69ff8778e9

@ -1 +1 @@
Subproject commit 74a86cbf8616b34b4fce4891fad21a181a253545
Subproject commit 593cb2cf964eded5af750384409fc672881dc5f1

@ -1 +1 @@
Subproject commit 5907c48bf0e77562735b8a2fab286a6e5c33a20c
Subproject commit 992835bcc37a1bcc579412e2920aeaa99ded73d1

@ -1 +1 @@
Subproject commit c1a3cd94ee7ea21d27b9a90d1576417dc3d8edbf
Subproject commit 02c14417dd0b51f1e19ef5c63b50b3d6cd80455b

View file

@ -45,7 +45,7 @@ extern fn setTimeout(cx: *JSContext, argc: c_uint, vp: *jsval) -> JSBool unsafe
return 1;
}
extern fn close(cx: *JSContext, argc: c_uint, vp: *jsval) -> JSBool unsafe {
extern fn close(cx: *JSContext, _argc: c_uint, vp: *jsval) -> JSBool unsafe {
(*unwrap(JS_THIS_OBJECT(cx, vp))).payload.close();
JS_SET_RVAL(cx, vp, JSVAL_NULL);
return 1;

View file

@ -51,7 +51,7 @@ impl Chan<Msg> : Compositor {
pub fn PngCompositor(output: Chan<~[u8]>) -> PngCompositor {
do spawn_listener |po: Port<Msg>| {
let cairo_surface = ImageSurface(CAIRO_FORMAT_ARGB32, 800, 600);
let draw_target = Cell(DrawTarget(cairo_surface));
let draw_target = Cell(DrawTarget(&cairo_surface));
loop {
match po.recv() {

View file

@ -114,7 +114,7 @@ pub fn draw_solid_color(ctx: &RenderContext, bounds: &Rect<au>, r: u8, g: u8, b:
b.to_float() as AzFloat,
1f as AzFloat);
ctx.canvas.fill_rect(bounds.to_azure_rect(), ColorPattern(color));
ctx.canvas.fill_rect(&bounds.to_azure_rect(), &ColorPattern(color));
}
pub fn draw_image(ctx: &RenderContext, bounds: Rect<au>, image: ARC<~Image>) {
@ -263,5 +263,5 @@ fn get_cairo_font(font: &Font) -> *cairo_scaled_font_t {
fn clear(ctx: &RenderContext) {
let pattern = ColorPattern(Color(1f as AzFloat, 1f as AzFloat, 1f as AzFloat, 1f as AzFloat));
let rect = Rect(Point2D(0 as AzFloat, 0 as AzFloat), Size2D(800 as AzFloat, 600 as AzFloat));
ctx.canvas.fill_rect(rect, pattern);
ctx.canvas.fill_rect(&rect, &pattern);
}

View file

@ -82,9 +82,9 @@ fn mainloop(+mode: Mode, po: comm::Port<Msg>) {
let image = @layers::layers::Image(0, 0, layers::layers::RGB24Format, ~[]);
let image_layer = @layers::layers::ImageLayer(image);
image_layer.common.set_transform
(image_layer.common.transform.scale(800.0f32, 600.0f32, 1.0f32));
(image_layer.common.transform.scale(&800.0f32, &600.0f32, &1.0f32));
let scene = @mut layers::scene::Scene(layers::layers::ImageLayerKind(image_layer),
let scene = @layers::scene::Scene(layers::layers::ImageLayerKind(image_layer),
Size2D(800.0f32, 600.0f32));
let done = @mut false;
@ -119,46 +119,46 @@ fn mainloop(+mode: Mode, po: comm::Port<Msg>) {
}
};
match window {
GlutWindow(window) => {
do glut::reshape_func(window) |width, height| {
check_for_messages();
match window {
GlutWindow(window) => {
do glut::reshape_func(window) |width, height| {
check_for_messages();
#debug("osmain: window resized to %d,%d", width as int, height as int);
for event_listeners.each |event_listener| {
event_listener.send(ResizeEvent(width as int, height as int));
}
}
#debug("osmain: window resized to %d,%d", width as int, height as int);
for event_listeners.each |event_listener| {
event_listener.send(ResizeEvent(width as int, height as int));
}
}
do glut::display_func() {
check_for_messages();
do glut::display_func() {
check_for_messages();
#debug("osmain: drawing to screen");
#debug("osmain: drawing to screen");
do util::time::time(~"compositing") {
layers::rendergl::render_scene(context, *scene);
}
do util::time::time(~"compositing") {
layers::rendergl::render_scene(context, scene);
}
glut::swap_buffers();
glut::post_redisplay();
}
glut::swap_buffers();
glut::post_redisplay();
}
while !*done {
#debug("osmain: running GLUT check loop");
glut::check_loop();
}
}
ShareWindow(share_context) => {
loop {
check_for_messages();
do util::time::time(~"compositing") {
layers::rendergl::render_scene(context, *scene);
}
while !*done {
#debug("osmain: running GLUT check loop");
glut::check_loop();
}
}
ShareWindow(share_context) => {
loop {
check_for_messages();
do util::time::time(~"compositing") {
layers::rendergl::render_scene(context, scene);
}
share_context.flush();
}
}
}
share_context.flush();
}
}
}
}
#[doc = "
@ -222,7 +222,7 @@ struct Surface {
fn Surface() -> Surface {
let cairo_surface = ImageSurface(cairo::CAIRO_FORMAT_RGB24, 800, 600);
let draw_target = DrawTarget(cairo_surface);
let draw_target = DrawTarget(&cairo_surface);
Surface { cairo_surface: cairo_surface, draw_target: draw_target, have: true }
}

View file

@ -305,7 +305,7 @@ struct GlyphStore {
// Initializes the glyph store, but doesn't actually shape anything.
// Use the set_glyph, set_glyphs() methods to store glyph data.
// Use the get_glyph_data method to retrieve glyph data for a char..
fn GlyphStore(text: ~str) {
fn GlyphStore(_text: ~str) {
}

@ -1 +1 @@
Subproject commit 26ddabc20216428b66e182795dbcd5782d0e9d4f
Subproject commit f32389a766c6777ebb09fa61efffb6e4471e453a