diff options
| author | Raph Levien <raph@src.gnome.org> | 2000-08-15 08:02:48 +0000 |
|---|---|---|
| committer | Raph Levien <raph@src.gnome.org> | 2000-08-15 08:02:48 +0000 |
| commit | 1c74bdde2f62d98191bc427a6d4801b21667ce33 (patch) | |
| tree | 57afafa3cf18e75d4ed78b5b15b3dbb8b9bd9f59 /librsvg | |
| parent | f951f6f3552762c020155273fa59e43fc1534869 (diff) | |
| download | nautilus-1c74bdde2f62d98191bc427a6d4801b21667ce33.tar.gz | |
Fixed a libart bug that triggers when rendering into an rgb buffer without
an alpha channel (ie if has_alpha=0 in rsvg_start_svg).
Diffstat (limited to 'librsvg')
| -rw-r--r-- | librsvg/art_render.c | 3 | ||||
| -rw-r--r-- | librsvg/test-ft-gtk.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/librsvg/art_render.c b/librsvg/art_render.c index 3f1b7ccf3..a4a624b07 100644 --- a/librsvg/art_render.c +++ b/librsvg/art_render.c @@ -1091,10 +1091,9 @@ art_render_image_solid_negotiate (ArtImageSource *self, ArtRender *render, if (render->clear) { render_cbk = art_render_image_solid_rgb8_opaq; - flags |= ART_IMAGE_SOURCE_CAN_CLEAR; + flags |= ART_IMAGE_SOURCE_CAN_CLEAR | ART_IMAGE_SOURCE_CAN_COMPOSITE; art_render_image_solid_rgb8_opaq_init (z, render); } - flags |= ART_IMAGE_SOURCE_CAN_COMPOSITE; } if (render_cbk == NULL) { diff --git a/librsvg/test-ft-gtk.c b/librsvg/test-ft-gtk.c index 89627d30d..5268b8cfb 100644 --- a/librsvg/test-ft-gtk.c +++ b/librsvg/test-ft-gtk.c @@ -319,7 +319,7 @@ static TestCtx *new_test_window (const char *fn, int width, int height) drawingarea = gtk_drawing_area_new (); gtk_drawing_area_size (GTK_DRAWING_AREA (drawingarea), width, height); - gtk_container_add (GTK_CONTAINER (vbox), drawingarea); + gtk_box_pack_start (GTK_BOX (vbox), drawingarea, TRUE, TRUE, 0); ctx->ctx = rsvg_ft_ctx_new (); ctx->fh = rsvg_ft_intern (ctx->ctx, fn); @@ -337,7 +337,7 @@ static TestCtx *new_test_window (const char *fn, int width, int height) (GtkSignalFunc) test_expose, ctx); buttonbar = gtk_hbox_new (FALSE, 5); - gtk_container_add (GTK_CONTAINER (vbox), buttonbar); + gtk_box_pack_start (GTK_BOX (vbox), buttonbar, FALSE, FALSE, 0); button = check_button ("Do drawing", &ctx->do_drawing); gtk_container_add (GTK_CONTAINER (buttonbar), button); @@ -354,7 +354,7 @@ static TestCtx *new_test_window (const char *fn, int width, int height) (GtkSignalFunc) start_scrolling, ctx); ctx->status = gtk_label_new (""); - gtk_container_add (GTK_CONTAINER (vbox), ctx->status); + gtk_box_pack_start (GTK_BOX (vbox), ctx->status, FALSE, FALSE, 2); gtk_widget_show_all (topwin); |