summaryrefslogtreecommitdiff
path: root/src/cairo-rectangle.c
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2006-06-06 16:54:03 -0700
committerCarl Worth <cworth@cworth.org>2006-06-06 16:54:03 -0700
commit746f66c3fce6de39ac9afa7be8bcf8f74c750e85 (patch)
treeddbb7133c6ca2a0d4e193bacb353bd40f2dc13ab /src/cairo-rectangle.c
parent5570bf0a9e99019ac24b2b856455afcf360c14fc (diff)
downloadcairo-746f66c3fce6de39ac9afa7be8bcf8f74c750e85.tar.gz
Fix bogus cairo_rectangle_fixed_t to be cairo_rectangle_int16_t.
This rectangle has regular integer values, not fixed-point values. So the old name was horribly wrong and misleading, (and yes I think it was even I that had suggested it).
Diffstat (limited to 'src/cairo-rectangle.c')
-rw-r--r--src/cairo-rectangle.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cairo-rectangle.c b/src/cairo-rectangle.c
index bf04978d9..fca4e426c 100644
--- a/src/cairo-rectangle.c
+++ b/src/cairo-rectangle.c
@@ -41,19 +41,19 @@
/* XXX We currently have a confusing mix of boxes and rectangles as
* exemplified by this function. A cairo_box_t is a rectangular area
* represented by the coordinates of the upper left and lower right
- * corners, expressed in fixed point numbers. A cairo_rectangle_fixed_t is
+ * corners, expressed in fixed point numbers. A cairo_rectangle_int16_t is
* also a rectangular area, but represented by the upper left corner
* and the width and the height, as integer numbers.
*
- * This function converts a cairo_box_t to a cairo_rectangle_fixed_t by
+ * This function converts a cairo_box_t to a cairo_rectangle_int16_t by
* increasing the area to the nearest integer coordinates. We should
- * standardize on cairo_rectangle_fixed_t and cairo_rectangle_fixed_t, and
+ * standardize on cairo_rectangle_int16_t and cairo_rectangle_int16_t, and
* this function could be renamed to the more reasonable
* _cairo_rectangle_fixed_round.
*/
void
-_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectangle)
+_cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_int16_t *rectangle)
{
rectangle->x = _cairo_fixed_integer_floor (box->p1.x);
rectangle->y = _cairo_fixed_integer_floor (box->p1.y);
@@ -62,7 +62,7 @@ _cairo_box_round_to_rectangle (cairo_box_t *box, cairo_rectangle_fixed_t *rectan
}
void
-_cairo_rectangle_intersect (cairo_rectangle_fixed_t *dest, cairo_rectangle_fixed_t *src)
+_cairo_rectangle_intersect (cairo_rectangle_int16_t *dest, cairo_rectangle_int16_t *src)
{
int x1, y1, x2, y2;