[cairo-commit] 3 commits - src/cairo-font-face-twin.c src/cairo-path-bounds.c util/cairo-trace

Chris Wilson ickle at kemper.freedesktop.org
Sat Dec 27 03:34:57 PST 2008


 src/cairo-font-face-twin.c      |    2 +-
 src/cairo-path-bounds.c         |    4 +++-
 util/cairo-trace/cairo-trace.in |    6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 078ebb01ba0b99ab4973ba479fe438f0674aa102
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Sat Dec 27 11:29:15 2008 +0000

    [path] Initialise spline from current point
    
    Joonas spotted that the breakage with the curve bounds was the result of
    initialising the spline using the original move to point and not the
    current point.
    
    Fixes: Bug 19256 Gnome Foot in gnome-games rendered incorrectly
    (https://bugs.freedesktop.org/show_bug.cgi?id=19256)

diff --git a/src/cairo-path-bounds.c b/src/cairo-path-bounds.c
index ec5bb21..4a736c6 100644
--- a/src/cairo-path-bounds.c
+++ b/src/cairo-path-bounds.c
@@ -40,6 +40,7 @@ typedef struct cairo_path_bounder {
     double tolerance;
 
     cairo_point_t move_to_point;
+    cairo_point_t current_point;
     cairo_bool_t has_move_to_point;
     cairo_bool_t has_point;
 
@@ -112,6 +113,7 @@ _cairo_path_bounder_line_to (void *closure,
     }
 
     _cairo_path_bounder_add_point (bounder, point);
+    bounder->current_point = *point;
 
     return CAIRO_STATUS_SUCCESS;
 }
@@ -132,7 +134,7 @@ _cairo_path_bounder_curve_to (void *closure,
      */
     if (! _cairo_spline_init (&spline,
 			      _cairo_path_bounder_line_to, bounder,
-			      &bounder->move_to_point, b, c, d))
+			      &bounder->current_point, b, c, d))
     {
 	return _cairo_path_bounder_line_to (bounder, d);
     }
commit 4320ea68875cc015dfecdf5ed40195e276efca07
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Fri Dec 26 00:01:01 2008 +0000

    [trace] Fix up positional arguments
    
    James Cloos pointed out that the correct form to use is "$@" when
    executing the command line.

diff --git a/util/cairo-trace/cairo-trace.in b/util/cairo-trace/cairo-trace.in
index cab4082..a9ff14e 100644
--- a/util/cairo-trace/cairo-trace.in
+++ b/util/cairo-trace/cairo-trace.in
@@ -89,10 +89,10 @@ if test -n "$flush"; then
 fi
 
 if test -z "$filename"; then
-  CAIRO_TRACE_FD=3 $* 3>&1 >/dev/null
+  CAIRO_TRACE_FD=3 "$@" 3>&1 >/dev/null
 elif test -z "$verbose"; then
   echo "Recording trace in $filename."
-  CAIRO_TRACE_OUTFILE_EXACT=$filename $*
+  CAIRO_TRACE_OUTFILE_EXACT=$filename "$@"
 else
-  CAIRO_TRACE_FD=3 $* 3>&1 >/dev/null | tee $filename
+  CAIRO_TRACE_FD=3 "$@" 3>&1 >/dev/null | tee $filename
 fi
commit e76a676c8f3d6dc9199cf0bc0856af0c659f4a16
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Thu Dec 25 09:51:51 2008 +0000

    [twin] Trivial spelling correction.
    
    This ain't no decadent descendent of the Hershey font...

diff --git a/src/cairo-font-face-twin.c b/src/cairo-font-face-twin.c
index 5d5bfb0..4fe6f89 100644
--- a/src/cairo-font-face-twin.c
+++ b/src/cairo-font-face-twin.c
@@ -39,7 +39,7 @@
 #include "cairoint.h"
 
 /*
- * This file implements a user-font rendering the decendant of the Hershey
+ * This file implements a user-font rendering the descendant of the Hershey
  * font coded by Keith Packard for use in the Twin window system.
  * The actual font data is in cairo-font-face-twin-data.c
  *


More information about the cairo-commit mailing list