Merge branch 'fix-cairo-operator-bounded' into 'master'

Make the _cairo_operator_bounded family of functions consistent

See merge request cairo/cairo!163
This commit is contained in:
Uli Schlachter 2021-04-25 07:26:19 +00:00
commit f125a457ea

View file

@ -404,10 +404,9 @@ _cairo_operator_bounded_by_mask (cairo_operator_t op)
case CAIRO_OPERATOR_DEST_IN:
case CAIRO_OPERATOR_DEST_ATOP:
return FALSE;
default:
ASSERT_NOT_REACHED;
}
ASSERT_NOT_REACHED;
return FALSE;
}
/**
@ -459,18 +458,15 @@ _cairo_operator_bounded_by_source (cairo_operator_t op)
case CAIRO_OPERATOR_DEST_IN:
case CAIRO_OPERATOR_DEST_ATOP:
return FALSE;
default:
ASSERT_NOT_REACHED;
}
ASSERT_NOT_REACHED;
return FALSE;
}
uint32_t
_cairo_operator_bounded_by_either (cairo_operator_t op)
{
switch (op) {
default:
ASSERT_NOT_REACHED;
case CAIRO_OPERATOR_OVER:
case CAIRO_OPERATOR_ATOP:
case CAIRO_OPERATOR_DEST:
@ -503,6 +499,8 @@ _cairo_operator_bounded_by_either (cairo_operator_t op)
case CAIRO_OPERATOR_DEST_IN:
case CAIRO_OPERATOR_DEST_ATOP:
return 0;
default:
ASSERT_NOT_REACHED;
}
}