forked from AuroraMiddleware/gtk
testsuite: Don't use gdk_cairo_get_clip_rectangle()
I want to remove it.
This commit is contained in:
parent
9d8ceb0cb2
commit
16e38701b6
@ -27,20 +27,19 @@ get_surface_size (cairo_surface_t *surface,
|
||||
int *width,
|
||||
int *height)
|
||||
{
|
||||
GdkRectangle area;
|
||||
cairo_t *cr;
|
||||
double x1, x2, y1, y2;
|
||||
|
||||
cr = cairo_create (surface);
|
||||
if (!gdk_cairo_get_clip_rectangle (cr, &area))
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
cairo_clip_extents (cr, &x1, &y1, &x2, &y2);
|
||||
cairo_destroy (cr);
|
||||
|
||||
g_assert (area.x == 0 && area.y == 0);
|
||||
g_assert (area.width > 0 && area.height > 0);
|
||||
g_assert (x1 == 0 && y1 == 0);
|
||||
g_assert (x2 > 0 && y2 > 0);
|
||||
g_assert ((int) x2 == x2 && (int) y2 == y2);
|
||||
|
||||
*width = area.width;
|
||||
*height = area.height;
|
||||
*width = x2;
|
||||
*height = y2;
|
||||
}
|
||||
|
||||
static cairo_surface_t *
|
||||
|
@ -27,22 +27,22 @@ get_surface_size (cairo_surface_t *surface,
|
||||
int *width,
|
||||
int *height)
|
||||
{
|
||||
GdkRectangle area;
|
||||
cairo_t *cr;
|
||||
double x1, x2, y1, y2;
|
||||
|
||||
cr = cairo_create (surface);
|
||||
if (!gdk_cairo_get_clip_rectangle (cr, &area))
|
||||
{
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
cairo_clip_extents (cr, &x1, &y1, &x2, &y2);
|
||||
cairo_destroy (cr);
|
||||
|
||||
g_assert (area.x == 0 && area.y == 0);
|
||||
g_assert (area.width > 0 && area.height > 0);
|
||||
g_assert (x1 == 0 && y1 == 0);
|
||||
g_assert (x2 > 0 && y2 > 0);
|
||||
g_assert ((int) x2 == x2 && (int) y2 == y2);
|
||||
|
||||
*width = area.width;
|
||||
*height = area.height;
|
||||
*width = x2;
|
||||
*height = y2;
|
||||
}
|
||||
|
||||
|
||||
static cairo_surface_t *
|
||||
coerce_surface_for_comparison (cairo_surface_t *surface,
|
||||
int width,
|
||||
|
Loading…
Reference in New Issue
Block a user