summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUli Schlachter <psychon@znc.in>2023-02-05 15:00:05 +0000
committerUli Schlachter <psychon@znc.in>2023-02-05 15:00:05 +0000
commit23e2718bd72ad5cb43abb853ef46ac0a1427f121 (patch)
treeebe4e8f1ba09e692369994a930b6a87ab19466b3 /src
parent338eca43428d1956216362eeb8e1715bac99d876 (diff)
parent7980301fe472586bd9d9dd66daaf101f207f7619 (diff)
downloadcairo-23e2718bd72ad5cb43abb853ef46ac0a1427f121.tar.gz
Merge branch 'unused-code' into 'master'
Drop some unused or dead code See merge request cairo/cairo!443
Diffstat (limited to 'src')
-rw-r--r--src/cairo-shape-mask-compositor.c6
-rw-r--r--src/cairo.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/cairo-shape-mask-compositor.c b/src/cairo-shape-mask-compositor.c
index 3117267cc..0f4918603 100644
--- a/src/cairo-shape-mask-compositor.c
+++ b/src/cairo-shape-mask-compositor.c
@@ -116,7 +116,7 @@ _cairo_shape_mask_compositor_stroke (const cairo_compositor_t *_compositor,
&_cairo_pattern_white.base,
&pattern.base,
clip);
- if ((status == CAIRO_INT_STATUS_SUCCESS)) {
+ if (status == CAIRO_INT_STATUS_SUCCESS) {
status = _cairo_surface_mask (extents->surface,
CAIRO_OPERATOR_ADD,
&extents->source_pattern.base,
@@ -210,7 +210,7 @@ _cairo_shape_mask_compositor_fill (const cairo_compositor_t *_compositor,
&_cairo_pattern_white.base,
&pattern.base,
clip);
- if ((status == CAIRO_INT_STATUS_SUCCESS)) {
+ if (status == CAIRO_INT_STATUS_SUCCESS) {
status = _cairo_surface_mask (extents->surface,
CAIRO_OPERATOR_ADD,
&extents->source_pattern.base,
@@ -303,7 +303,7 @@ _cairo_shape_mask_compositor_glyphs (const cairo_compositor_t *_compositor,
&_cairo_pattern_white.base,
&pattern.base,
clip);
- if ((status == CAIRO_INT_STATUS_SUCCESS)) {
+ if (status == CAIRO_INT_STATUS_SUCCESS) {
status = _cairo_surface_mask (extents->surface,
CAIRO_OPERATOR_ADD,
&extents->source_pattern.base,
diff --git a/src/cairo.c b/src/cairo.c
index 55e7103ea..bff1b86af 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -3360,7 +3360,7 @@ cairo_set_scaled_font (cairo_t *cr,
if (unlikely (cr->status))
return;
- if ((scaled_font == NULL)) {
+ if (scaled_font == NULL) {
_cairo_set_error (cr, _cairo_error (CAIRO_STATUS_NULL_POINTER));
return;
}