fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-16 19:48:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/vega: polygon_array requires a deep free.

Browse source 
A polygon array is an array of pointers to polygons.  The polygons
should be freed with the array.
This commit is contained in:
Chia-I Wu 2010-12-02 17:53:42 +08:00
parent b950d6fa5d
commit cb2791213a
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gallium/state_trackers/vega/path.c
View file

@ -207,13 +207,29 @@ struct path * path_create(VGPathDatatype dt, VGfloat scale, VGfloat bias,
return path;
}
static void polygon_array_cleanup(struct polygon_array *polyarray)
{
if (polyarray->array) {
VGint i;
for (i = 0; i < polyarray->array->num_elements; i++) {
struct polygon *p = ((struct polygon **) polyarray->array->data)[i];
polygon_destroy(p);
}
array_destroy(polyarray->array);
polyarray->array = NULL;
}
}
void path_destroy(struct path *p)
{
vg_context_remove_object(vg_current_context(), VG_OBJECT_PATH, p);
array_destroy(p->segments);
array_destroy(p->control_points);
array_destroy(p->fill_polys.polygon_array.array);
polygon_array_cleanup(&p->fill_polys.polygon_array);
if (p->stroked.path)
path_destroy(p->stroked.path);
@ -302,7 +318,6 @@ static void convert_path(struct path *p,
}
}
static void polygon_array_calculate_bounds( struct polygon_array *polyarray )
{
struct array *polys = polyarray->array;
@ -361,12 +376,12 @@ static struct polygon_array * path_get_fill_polygons(struct path *p, struct matr
return &p->fill_polys.polygon_array;
}
else {
array_destroy( p->fill_polys.polygon_array.array );
p->fill_polys.polygon_array.array = NULL;
polygon_array_cleanup(&p->fill_polys.polygon_array);
}
}
array = array_create(sizeof(struct array*));
/* an array of pointers to polygons */
array = array_create(sizeof(struct polygon *));
sx = sy = px = py = ox = oy = 0.f;