[cairo-commit] src/cairo-cogl-context.c

[Andrea Canciani]

 src/cairo-cogl-context.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit f5c00042b03c96616b5ae16e294c8b5bb220cf15
Author: Andrea Canciani <ranma42 at gmail.com>
Date:   Wed Nov 9 12:28:31 2011 +0100

    cogl: Fix 'make check'
    
    'make check' reports:
    
    ./cairo-cogl-context.c: * cairo_path_fixed_t in user coordinates that we can use to create a
    ./cairo-cogl-context.c: * We use this hash to lookup a cairo_cogl_path_meta_t struct which
    ./cairo-cogl-context.c: * need to use the cairo_path_fixed_t api to describe a rectangle in terms of
    ./cairo-cogl-context.c: * passed the current cairo_t context we don't have a good way
    Error: some type names in the docs are not prefixed by hash sign,
    neither are the only token in the doc line followed by colon.
    Fix this by searching for the following regexp in the above files:
        '^[^:]*:[/ ][*]\( .*[^#']\| \|^\)\<cairo[0-9a-z_]*_t\>\($\|[^:]$\|[^:].\)'
    
    ./cairo-cogl-context.c: * cairo_path_fixed_t in user coordinates that we can use to create a
    ./cairo-cogl-context.c: * We use this hash to lookup a cairo_cogl_path_meta_t struct which
    ./cairo-cogl-context.c: * need to use the cairo_path_fixed_t api to describe a rectangle in terms of
    ./cairo-cogl-context.c: * passed the current cairo_t context we don't have a good way
    Error: some function names in the docs are not followed by parentheses.
    Fix this by searching for the following regexp in the above files:
        '^[^:]*:[/ ][*]\(\|[  ].*\)\([^#']\|^\)\<\(cairo_[][<>/0-9a-z_]*\>[^][<>(]\)'
    
    Checking that source files #include "cairoint.h" first (or none)
    cairo-cogl-context.c:#include "cairo-cogl-context-private.h"
    
    These are fixed trivially by this patch.

diff --git a/src/cairo-cogl-context.c b/src/cairo-cogl-context.c
index e203125..17e2d7e 100644
--- a/src/cairo-cogl-context.c
+++ b/src/cairo-cogl-context.c
@@ -31,7 +31,7 @@
 
 /* so long as we can verify that the ctm doesn't change multiple times
  * during the construction of a path we can build a shadow
- * cairo_path_fixed_t in user coordinates that we can use to create a
+ * #cairo_path_fixed_t in user coordinates that we can use to create a
  * hash value for caching tessellations of that path.
  *
  * We need to hook into all the points where the ctm can be changed
@@ -44,7 +44,7 @@
  * When a draw operation is hit we can then check that the
  * path_ctm_age == 0 and if so we create a hash of the path.
  *
- * We use this hash to lookup a cairo_cogl_path_meta_t struct which
+ * We use this hash to lookup a #cairo_cogl_path_meta_t struct which
  * may contain tessellated triangles for the path or may just contain
  * a count of how many times the path has been re-seen (we only cache
  * tessellated triangles if there is evidence that the path is being
@@ -52,6 +52,8 @@
  * a separate buffer for the triangles).
  */
 
+#include "cairoint.h"
+
 #include "cairo-cogl-context-private.h"
 #include "cairo-freed-pool-private.h"
 #include "cairo-arc-private.h"
@@ -88,7 +90,7 @@ _cairo_cogl_context_rectangle_real (cairo_cogl_context_t *cr,
  * because rectangles are perhaps the most common shape drawn with cairo.
  *
  * Basically we have a speculative store for a rectangle path that doesn't
- * need to use the cairo_path_fixed_t api to describe a rectangle in terms of
+ * need to use the #cairo_path_fixed_t api to describe a rectangle in terms of
  * (move_to,rel_line_to,rel_line_to,_rel_line_to,close) because if you profile
  * heavy rectangle drawing with Cairo that process can be overly expensive.
  *
@@ -590,7 +592,7 @@ _cairo_cogl_context_rectangle (void *abstract_cr,
 }
 
 /* Since the surface backend drawing operator functions don't get
- * passed the current cairo_t context we don't have a good way
+ * passed the current #cairo_t context we don't have a good way
  * to get our user-coordinates path into our surface operator
  * functions.
  *