fixed: Refactor code to use more inlines and less duplication of logic.

This also has the side-effect of fixing the types in the problematic
functions which hid Andrea's true fix for the unsigned FRAC_MASK.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/cairo-fixed-private.h b/src/cairo-fixed-private.h
index 8873056c..6cecc8dc 100644
--- a/src/cairo-fixed-private.h
+++ b/src/cairo-fixed-private.h
@@ -157,12 +157,24 @@ _cairo_fixed_is_integer (cairo_fixed_t f)
     return (f & CAIRO_FIXED_FRAC_MASK) == 0;
 }
 
-static inline int
+static inline cairo_fixed_t
 _cairo_fixed_floor (cairo_fixed_t f)
 {
     return f & ~CAIRO_FIXED_FRAC_MASK;
 }
 
+static inline cairo_fixed_t
+_cairo_fixed_round (cairo_fixed_t f)
+{
+    return _cairo_fixed_floor (f + (CAIRO_FIXED_FRAC_MASK+1)/2);
+}
+
+static inline cairo_fixed_t
+_cairo_fixed_round_down (cairo_fixed_t f)
+{
+    return _cairo_fixed_floor (f + CAIRO_FIXED_FRAC_MASK/2);
+}
+
 static inline int
 _cairo_fixed_integer_part (cairo_fixed_t f)
 {
@@ -172,13 +184,13 @@ _cairo_fixed_integer_part (cairo_fixed_t f)
 static inline int
 _cairo_fixed_integer_round (cairo_fixed_t f)
 {
-    return (f + (CAIRO_FIXED_FRAC_MASK+1)/2) >> CAIRO_FIXED_FRAC_BITS;
+    return _cairo_fixed_integer_part (f + (CAIRO_FIXED_FRAC_MASK+1)/2);
 }
 
 static inline int
 _cairo_fixed_integer_round_down (cairo_fixed_t f)
 {
-    return (f + CAIRO_FIXED_FRAC_MASK/2) >> CAIRO_FIXED_FRAC_BITS;
+    return _cairo_fixed_integer_part (f + CAIRO_FIXED_FRAC_MASK/2);
 }
 
 static inline int