[cairo-commit] 2 commits - src/cairo-misc.c

[GitLab Mirror]

 src/cairo-misc.c |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

New commits:
commit f125a457eab5e6a8b1428389448c954bcc7d6d52
Merge: 3c00a849f d03b6c90a
Author: Uli Schlachter <psychon at znc.in>
Date:   Sun Apr 25 07:26:19 2021 +0000

    Merge branch 'fix-cairo-operator-bounded' into 'master'
    
    Make the _cairo_operator_bounded family of functions consistent
    
    See merge request cairo/cairo!163

commit d03b6c90a7d652b8b8c6d84e9c230dc69c339d5d
Author: Anton Danilkin <afdw at yandex.ru>
Date:   Sat Apr 24 14:57:47 2021 +0200

    Make the _cairo_operator_bounded family of functions consistent

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;
     }
 
 }