From d03b6c90a7d652b8b8c6d84e9c230dc69c339d5d Mon Sep 17 00:00:00 2001 From: Anton Danilkin Date: Sat, 24 Apr 2021 14:57:47 +0200 Subject: [PATCH] Make the _cairo_operator_bounded family of functions consistent --- src/cairo-misc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/cairo-misc.c b/src/cairo-misc.c index 81f9325ca..d7af82147 100644 --- a/src/cairo-misc.c +++ b/src/cairo-misc.c @@ -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; } }