Purge cairo-test of all calls to round()

Although round() is in the C99 standard, it isn't available in all toolchains on which cairo is compiled (VC++, for example).
git-mirror · Dec 1, 2006 · d5fcbfc · d5fcbfc
1 parent cb9a3c2
commit d5fcbfc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/test/clip-operator.c b/test/clip-operator.c
@@ -76,8 +76,8 @@ draw_glyphs (cairo_t *cr, int x, int y)
 
     cairo_text_extents (cr, "FG", &extents);
     cairo_move_to (cr,
-		   x + round ((WIDTH - extents.width) / 2) - extents.x_bearing,
-		   y + round ((HEIGHT - extents.height) / 2) - extents.y_bearing);
+		   x + floor ((WIDTH - extents.width) / 2 + 0.5) - extents.x_bearing,
+		   y + floor ((HEIGHT - extents.height) / 2 + 0.5) - extents.y_bearing);
     cairo_show_text (cr, "FG");
 }
 

diff --git a/test/operator-clear.c b/test/operator-clear.c
@@ -89,8 +89,8 @@ draw_glyphs (cairo_t *cr, int x, int y)
 
     cairo_text_extents (cr, "FG", &extents);
     cairo_move_to (cr,
-		   x + round ((WIDTH - extents.width) / 2) - extents.x_bearing,
-		   y + round ((HEIGHT - extents.height) / 2) - extents.y_bearing);
+		   x + floor ((WIDTH - extents.width) / 2 + 0.5) - extents.x_bearing,
+		   y + floor ((HEIGHT - extents.height) / 2 + 0.5) - extents.y_bearing);
     cairo_show_text (cr, "FG");
 }
 

diff --git a/test/operator-source.c b/test/operator-source.c
@@ -126,8 +126,8 @@ draw_glyphs (cairo_t *cr, int x, int y)
 
     cairo_text_extents (cr, "FG", &extents);
     cairo_move_to (cr,
-		   x + round ((WIDTH - extents.width) / 2) - extents.x_bearing,
-		   y + round ((HEIGHT - extents.height) / 2) - extents.y_bearing);
+		   x + floor ((WIDTH - extents.width) / 2 + 0.5) - extents.x_bearing,
+		   y + floor ((HEIGHT - extents.height) / 2 + 0.5) - extents.y_bearing);
     cairo_show_text (cr, "FG");
 }
 

diff --git a/test/unbounded-operator.c b/test/unbounded-operator.c
@@ -75,8 +75,8 @@ draw_glyphs (cairo_t *cr, int x, int y)
 
     cairo_text_extents (cr, "FG", &extents);
     cairo_move_to (cr,
-		   x + round ((WIDTH - extents.width) / 2) - extents.x_bearing,
-		   y + round ((HEIGHT - extents.height) / 2) - extents.y_bearing);
+		   x + floor ((WIDTH - extents.width) / 2 + 0.5) - extents.x_bearing,
+		   y + floor ((HEIGHT - extents.height) / 2 + 0.5) - extents.y_bearing);
     cairo_show_text (cr, "FG");
 }