mirror of
https://github.com/brl/mutter.git
synced 2024-12-24 12:02:04 +00:00
test-path: Fix the test when running against latest Cairo versions
Cairo has recently changed so that it no longer adds a final move-to command when the path ends with a close. This patch makes the test check the run-time version number of Cairo to avoid duplicating this behaviour when testing the conversion to and from a Cairo path.
This commit is contained in:
parent
e7519a149b
commit
1d7e223313
@ -466,12 +466,18 @@ path_test_convert_to_cairo_path (CallbackData *data)
|
|||||||
last_point = path_start;
|
last_point = path_start;
|
||||||
|
|
||||||
/* Cairo always adds a move to after every close so we need
|
/* Cairo always adds a move to after every close so we need
|
||||||
to insert one here */
|
to insert one here. Since Cairo commit 166453c1abf2 it
|
||||||
|
doesn't seem to do this anymore so will assume that if
|
||||||
|
Cairo's minor version is >= 11 then it includes that
|
||||||
|
commit */
|
||||||
|
if (cairo_version () < CAIRO_VERSION_ENCODE (1, 11, 0))
|
||||||
|
{
|
||||||
memmove (data->nodes + i + 2, data->nodes + i + 1,
|
memmove (data->nodes + i + 2, data->nodes + i + 1,
|
||||||
(data->n_nodes - i - 1) * sizeof (ClutterPathNode));
|
(data->n_nodes - i - 1) * sizeof (ClutterPathNode));
|
||||||
data->nodes[i + 1].type = CLUTTER_PATH_MOVE_TO;
|
data->nodes[i + 1].type = CLUTTER_PATH_MOVE_TO;
|
||||||
data->nodes[i + 1].points[0] = last_point;
|
data->nodes[i + 1].points[0] = last_point;
|
||||||
data->n_nodes++;
|
data->n_nodes++;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user