[cairo-commit] 2 commits - src/cairo-bentley-ottmann.c src/cairo-line.c src/cairo-line-private.h src/cairo-traps.c

[GitLab Mirror]

 src/cairo-bentley-ottmann.c |    2 +-
 src/cairo-line-private.h    |    2 +-
 src/cairo-line.c            |    3 ++-
 src/cairo-traps.c           |    2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1904d7bf35099f775d68cb7203a34ac7a4e72514
Merge: 44f808fce d2a37ba60
Author: Uli Schlachter <psychon at znc.in>
Date:   Fri Apr 2 13:43:39 2021 +0000

    Merge branch 'fix-467' into 'master'
    
    Rename cairo_lines_compare_at_y into _cairo_lines_compare_at_y and fix syntax
    
    Closes #467
    
    See merge request cairo/cairo!150

commit d2a37ba60e042b72b3db0bf7e314a2774bc5a232
Author: Marc Jeanmougin <marc at jeanmougin.fr>
Date:   Mon Mar 29 12:20:31 2021 +0200

    Rename cairo_lines_compare_at_y into _cairo_lines_compare_at_y and fix syntax
    
    Fixes https://gitlab.freedesktop.org/cairo/cairo/-/issues/467

diff --git a/src/cairo-bentley-ottmann.c b/src/cairo-bentley-ottmann.c
index 2011e73bd..eb4cee430 100644
--- a/src/cairo-bentley-ottmann.c
+++ b/src/cairo-bentley-ottmann.c
@@ -368,7 +368,7 @@ _cairo_bo_sweep_line_compare_edges (const cairo_bo_sweep_line_t	*sweep_line,
 {
     int cmp;
 
-    cmp = cairo_lines_compare_at_y (&a->edge.line,
+    cmp = _cairo_lines_compare_at_y (&a->edge.line,
 				    &b->edge.line,
 				    sweep_line->current_y);
     if (cmp)
diff --git a/src/cairo-line-private.h b/src/cairo-line-private.h
index 08bf4b358..6ddcae18d 100644
--- a/src/cairo-line-private.h
+++ b/src/cairo-line-private.h
@@ -42,7 +42,7 @@
 CAIRO_BEGIN_DECLS
 
 cairo_private int
-cairo_lines_compare_at_y(const cairo_line_t *a,
+_cairo_lines_compare_at_y (const cairo_line_t *a,
 			 const cairo_line_t *b,
 			 int y);
 
diff --git a/src/cairo-line.c b/src/cairo-line.c
index dc00a9cb1..2c1768eeb 100644
--- a/src/cairo-line.c
+++ b/src/cairo-line.c
@@ -278,7 +278,8 @@ static int bbox_compare (const cairo_line_t *a,
     return 0;
 }
 
-int cairo_lines_compare_at_y (const cairo_line_t *a,
+int
+_cairo_lines_compare_at_y (const cairo_line_t *a,
 			      const cairo_line_t *b,
 			      int y)
 {
diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index c54f6f2ef..b59b96d43 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -404,7 +404,7 @@ static void add_tri (cairo_traps_t *traps,
 	y2 = tmp;
     }
 
-    if (cairo_lines_compare_at_y (left, right, y1) > 0) {
+    if (_cairo_lines_compare_at_y (left, right, y1) > 0) {
 	const cairo_line_t *tmp = left;
 	left = right;
 	right = tmp;