[cairo-commit] 2 commits - src/cairo-wideint.c src/cairo-xlib-display.c

[Bryce Harrington]

 src/cairo-wideint.c      |    8 ++++----
 src/cairo-xlib-display.c |    2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit e71b917bbfc881ddd6ae6ed4367efd328a95af93
Author: Bryce Harrington <b.harrington at samsung.com>
Date:   Thu Jul 24 18:41:03 2014 -0700

    xlib: Fix mispelling in a comment

diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c
index c7708c5..a2a3bc7 100644
--- a/src/cairo-xlib-display.c
+++ b/src/cairo-xlib-display.c
@@ -291,7 +291,7 @@ _cairo_xlib_device_create (Display *dpy)
      *
      *    1. The original bug that led to the buggy_repeat
      *    workaround. This was a bug that Owen Taylor investigated,
-     *    understood well, and characterized against carious X
+     *    understood well, and characterized against various X
      *    servers. Confirmed X servers with this bug include:
      *
      *		"XFree86" <= 40500000
commit 82b4781f18d4dc3d368b04a436f854a8f0cff1e1
Author: Bryce Harrington <b.harrington at samsung.com>
Date:   Mon Jul 21 15:05:14 2014 -0700

    cairo-wideint:  Fix typo in two cairo_uint128 functions
    
    _cairo_int128_negate and _cairo_int128_not are #defines of
    _cairo_uint128_negate and _cairo_uint128_not respectively.  The function
    implementations should use the actual function name not the aliases.  On
    systems without a uint128 type, these could lead to build issues.
    
    Credit for finding this go to Dr. Peter Barnes, LLNL.

diff --git a/src/cairo-wideint.c b/src/cairo-wideint.c
index bba266b..2e056fa 100644
--- a/src/cairo-wideint.c
+++ b/src/cairo-wideint.c
@@ -654,16 +654,16 @@ _cairo_uint128_divrem (cairo_uint128_t num, cairo_uint128_t den)
     return qr;
 }
 
-cairo_int128_t
-_cairo_int128_negate (cairo_int128_t a)
+cairo_uint128_t
+_cairo_uint128_negate (cairo_uint128_t a)
 {
     a.lo = _cairo_uint64_not (a.lo);
     a.hi = _cairo_uint64_not (a.hi);
     return _cairo_uint128_add (a, _cairo_uint32_to_uint128 (1));
 }
 
-cairo_int128_t
-_cairo_int128_not (cairo_int128_t a)
+cairo_uint128_t
+_cairo_uint128_not (cairo_uint128_t a)
 {
     a.lo = _cairo_uint64_not (a.lo);
     a.hi = _cairo_uint64_not (a.hi);