callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cssimage: Make cross-fade code safe for non-integer sizes

Browse Source 
This includes sizes < 1px, which previously caused a SEGV.
This commit is contained in:
Benjamin Otte
2012-09-16 18:45:17 +02:00
parent f77f6f3322
commit ee6f886434
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkcssimagecrossfade.c
View File

@ -19,6 +19,7 @@
#include "config.h" #include "config.h"
#include <math.h>
#include <string.h> #include <string.h>
#include "gtkcssimagecrossfadeprivate.h" #include "gtkcssimagecrossfadeprivate.h"
@ -105,37 +106,33 @@ gtk_css_image_cross_fade_draw (GtkCssImage *image,
} }
else else
{ {
cairo_surface_t *surface;
if (cross_fade->start && cross_fade->end) if (cross_fade->start && cross_fade->end)
{ {
/* to reduce the group size */ /* to reduce the group size */
cairo_rectangle (cr, 0, 0, width, height); cairo_rectangle (cr, 0, 0, ceil (width), ceil (height));
cairo_clip (cr); cairo_clip (cr);
cairo_push_group (cr); cairo_push_group (cr);
_gtk_css_image_draw (cross_fade->start, cr, width, height); _gtk_css_image_draw (cross_fade->start, cr, width, height);
surface = _gtk_css_image_get_surface (cross_fade->end, cairo_push_group (cr);
cairo_get_target (cr), _gtk_css_image_draw (cross_fade->end, cr, width, height);
width, height); cairo_pop_group_to_source (cr);
cairo_set_source_surface (cr, surface, 0, 0);
cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
cairo_paint_with_alpha (cr, cross_fade->progress); cairo_paint_with_alpha (cr, cross_fade->progress);
cairo_surface_destroy (surface);
cairo_pop_group_to_source (cr); cairo_pop_group_to_source (cr);
cairo_paint (cr); cairo_paint (cr);
} }
else if (cross_fade->start || cross_fade->end) else if (cross_fade->start || cross_fade->end)
{ {
surface = _gtk_css_image_get_surface (cross_fade->start ? cross_fade->start : cross_fade->end, cairo_push_group (cr);
cairo_get_target (cr), _gtk_css_image_draw (cross_fade->start ? cross_fade->start : cross_fade->end, cr, width, height);
width, height); cairo_pop_group_to_source (cr);
cairo_set_source_surface (cr, surface, 0, 0);
cairo_paint_with_alpha (cr, cross_fade->start ? 1.0 - cross_fade->progress : cross_fade->progress); cairo_paint_with_alpha (cr, cross_fade->start ? 1.0 - cross_fade->progress : cross_fade->progress);
cairo_surface_destroy (surface);
} }
} }
} }