[PATCH 09/25] doc: fix a few typos found by codespell

Nis Martensen nis.martensen at web.de
Sat Mar 3 14:00:54 PST 2012


---
 perf/README                           |    4 ++--
 src/cairo-beos-surface.cpp            |    2 +-
 src/cairo-cogl-context.c              |    2 +-
 src/cairo-cogl-surface.c              |    4 ++--
 src/cairo-ft-font.c                   |    2 +-
 src/cairo-mesh-pattern-rasterizer.c   |    2 +-
 src/cairo-os2-surface.c               |    2 +-
 src/cairo-region.c                    |    2 +-
 src/cairo-types-private.h             |    2 +-
 src/cairo-wideint-private.h           |    2 +-
 src/cairo-xcb-shm.c                   |    2 +-
 src/cairo.c                           |    2 +-
 src/drm/cairo-drm-intel-brw-eu-emit.c |    2 +-
 src/win32/cairo-win32-font.c          |    2 +-
 test/Makefile.am                      |    2 +-
 test/README                           |    2 +-
 test/dash-offset.c                    |    2 +-
 test/glyph-cache-pressure.c           |    2 +-
 util/cairo-trace/cairo-trace.in       |    2 +-
 19 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/perf/README b/perf/README
index 42a6148..beca927 100644
--- a/perf/README
+++ b/perf/README
@@ -92,7 +92,7 @@ cairo-perf-diff:
 
 As a convenience, this common desire to measure a single commit is
 supported by passing a single revision to cairo-perf-diff, in which
-case it will compare it to the immediately preceeding commit. So for
+case it will compare it to the immediately preceding commit. So for
 example:
 
     # Measure the impact of the latest commit
@@ -117,7 +117,7 @@ what has been cached:
 
 And finally, the -f mode is most useful in conjunction with the --
 option to cairo-perf-diff which allows you to pass options to the
-underlying cairo-perf runs. This allows you to restrict the additonal
+underlying cairo-perf runs. This allows you to restrict the additional
 test runs to a limited subset of the tests.
 
 For example, a frequently used trick is to first generate a chart with
diff --git a/src/cairo-beos-surface.cpp b/src/cairo-beos-surface.cpp
index 2e0f42c..2d96778 100644
--- a/src/cairo-beos-surface.cpp
+++ b/src/cairo-beos-surface.cpp
@@ -318,7 +318,7 @@ _cairo_beos_surface_set_clip_region (cairo_beos_surface_t *surface,
 	cairo_rectangle_int_t rect;
 
 	cairo_region_get_rectangle (region, i, &rect);
-	// Have to substract one, because for pixman, the second coordinate
+	// Have to subtract one, because for pixman, the second coordinate
 	// lies outside the rectangle.
 	bregion.Include (_cairo_rectangle_to_brect (&rect));
     }
diff --git a/src/cairo-cogl-context.c b/src/cairo-cogl-context.c
index 17e2d7e..0116b0a 100644
--- a/src/cairo-cogl-context.c
+++ b/src/cairo-cogl-context.c
@@ -99,7 +99,7 @@ _cairo_cogl_context_rectangle_real (cairo_cogl_context_t *cr,
  * before continuing to append their operations.
  *
  * In addition to the speculative store cairo-cogl also has a fast-path
- * fill_rectangle drawing operation that futher aims to minimize the cost
+ * fill_rectangle drawing operation that further aims to minimize the cost
  * of drawing rectangles.
  */
 static cairo_status_t
diff --git a/src/cairo-cogl-surface.c b/src/cairo-cogl-surface.c
index 7326284..155dcbc 100644
--- a/src/cairo-cogl-surface.c
+++ b/src/cairo-cogl-surface.c
@@ -1117,7 +1117,7 @@ _cairo_cogl_surface_clear (cairo_cogl_surface_t *surface,
      *
      * The main concern is that we want to avoid re-loading an external z
      * buffer at the start of each frame, but also many gpu architectures have
-     * optmizations for how they handle the depth/stencil buffers and can get
+     * optimizations for how they handle the depth/stencil buffers and can get
      * upset if they aren't cleared together at the start of the frame.
      *
      * FIXME: we need a way to assert that the clip stack currently isn't
@@ -2425,7 +2425,7 @@ _cairo_cogl_surface_fill_rectangle (void		     *abstract_surface,
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     /* TODO:
-     * We need to aquire the textures here, look at the corresponding
+     * We need to acquire the textures here, look at the corresponding
      * attributes and see if this can be trivially handled by logging
      * a textured rectangle only needing simple scaling or translation
      * of texture coordinates.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index e744481..32a5870 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -3158,7 +3158,7 @@ FREE_PATTERN:
  * If the FC_FT_FACE element of @pattern is set, the user is responsible
  * for making sure that the referenced FT_Face remains valid for the life
  * time of the returned #cairo_font_face_t.  See
- * cairo_ft_font_face_create_for_ft_face() for an exmaple of how to couple
+ * cairo_ft_font_face_create_for_ft_face() for an example of how to couple
  * the life time of the FT_Face to that of the cairo font-face.
  *
  * Return value: a newly created #cairo_font_face_t. Free with
diff --git a/src/cairo-mesh-pattern-rasterizer.c b/src/cairo-mesh-pattern-rasterizer.c
index 82b16e7..6f0dd66 100644
--- a/src/cairo-mesh-pattern-rasterizer.c
+++ b/src/cairo-mesh-pattern-rasterizer.c
@@ -333,7 +333,7 @@ fd_fixed_fwd (int32_t f[4])
  *
  *  max(|B'(t)|) <= 3 max (|p1-p0|, |p2-p0|/2, |p3-p1|/2, |p3-p2|)
  *
- * So, to guarantee a maximum step lenght of 1/sqrt(2) we must do:
+ * So, to guarantee a maximum step length of 1/sqrt(2) we must do:
  *
  *   3 max (|p1-p0|, |p2-p0|/2, |p3-p1|/2, |p3-p2|) sqrt(2) steps
  */
diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index 3b83d0f..19646fb 100644
--- a/src/cairo-os2-surface.c
+++ b/src/cairo-os2-surface.c
@@ -786,7 +786,7 @@ cairo_os2_surface_create (HPS hps_client_window,
 
  error_exit:
 
-    /* This point will only be reached if an error occured */
+    /* This point will only be reached if an error occurred */
 
     if (local_os2_surface) {
         if (local_os2_surface->pixels)
diff --git a/src/cairo-region.c b/src/cairo-region.c
index a7ec50c..9e03272 100644
--- a/src/cairo-region.c
+++ b/src/cairo-region.c
@@ -516,7 +516,7 @@ slim_hidden_def (cairo_region_get_extents);
  * cairo_region_status:
  * @region: a #cairo_region_t
  *
- * Checks whether an error has previous occured for this
+ * Checks whether an error has previous occurred for this
  * region object.
  *
  * Return value: %CAIRO_STATUS_SUCCESS or %CAIRO_STATUS_NO_MEMORY
diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h
index 3a1882b..7fcdd1d 100644
--- a/src/cairo-types-private.h
+++ b/src/cairo-types-private.h
@@ -131,7 +131,7 @@ struct _cairo_observer {
  *
  *	_cairo_hash_table_insert (hash_table, &my_entry->base);
  *
- * IMPORTANT: The caller is reponsible for initializing
+ * IMPORTANT: The caller is responsible for initializing
  * my_entry->base.hash with a hash code derived from the key. The
  * essential property of the hash code is that keys_equal must never
  * return %TRUE for two keys that have different hashes. The best hash
diff --git a/src/cairo-wideint-private.h b/src/cairo-wideint-private.h
index 24c506a..4051a1d 100644
--- a/src/cairo-wideint-private.h
+++ b/src/cairo-wideint-private.h
@@ -161,7 +161,7 @@ static cairo_always_inline double I _cairo_int64_to_double (cairo_int64_t i) { r
 #endif
 
 /*
- * 64-bit comparisions derived from lt or eq
+ * 64-bit comparisons derived from lt or eq
  */
 #define			_cairo_uint64_le(a,b)	    (!_cairo_uint64_gt(a,b))
 #define			_cairo_uint64_ne(a,b)	    (!_cairo_uint64_eq(a,b))
diff --git a/src/cairo-xcb-shm.c b/src/cairo-xcb-shm.c
index 6972720..5244036 100644
--- a/src/cairo-xcb-shm.c
+++ b/src/cairo-xcb-shm.c
@@ -473,7 +473,7 @@ _cairo_xcb_shm_process_pending (cairo_xcb_connection_t *connection, shm_wait_typ
 				      info->sync.sequence,
 				      (void **) &reply, NULL))
 		/* We cannot be sure the server finished with this image yet, so
-		 * try again later. All other shm info are guranteed to have a
+		 * try again later. All other shm info are guaranteed to have a
 		 * larger sequence number and thus don't have to be checked. */
 		return;
 	    break;
diff --git a/src/cairo.c b/src/cairo.c
index cbc3974..002d199 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -63,7 +63,7 @@
  * draw shapes with cairo_stroke() or cairo_fill().
  *
  * #cairo_t<!-- -->'s can be pushed to a stack via cairo_save().
- * They may then safely be changed, without loosing the current state.
+ * They may then safely be changed, without losing the current state.
  * Use cairo_restore() to restore to the saved state.
  */
 
diff --git a/src/drm/cairo-drm-intel-brw-eu-emit.c b/src/drm/cairo-drm-intel-brw-eu-emit.c
index 05bac0a..f27b238 100644
--- a/src/drm/cairo-drm-intel-brw-eu-emit.c
+++ b/src/drm/cairo-drm-intel-brw-eu-emit.c
@@ -476,7 +476,7 @@ struct brw_instruction *brw_JMPI(struct brw_compile *p,
  *
  * When the matching 'else' instruction is reached (presumably by
  * countdown of the instruction count patched in by our ELSE/ENDIF
- * functions), the relevent flags are inverted.
+ * functions), the relevant flags are inverted.
  *
  * When the matching 'endif' instruction is reached, the flags are
  * popped off.  If the stack is now empty, normal execution resumes.
diff --git a/src/win32/cairo-win32-font.c b/src/win32/cairo-win32-font.c
index ed171c2..014f604 100644
--- a/src/win32/cairo-win32-font.c
+++ b/src/win32/cairo-win32-font.c
@@ -1647,7 +1647,7 @@ _cairo_win32_scaled_font_is_synthetic (void	       *abstract_font)
 					&bold,
 					&italic);
     /* If this doesn't work assume it is not synthetic to avoid
-     * unneccessary subsetting fallbacks. */
+     * unnecessary subsetting fallbacks. */
     if (status != CAIRO_STATUS_SUCCESS)
 	return FALSE;
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 0a36780..b5bdabf 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -164,7 +164,7 @@ reference
 #                         convert degenerate segments into circles/rectangles
 #                         as expected by cairo
 # device-offset-scale   - complication of pre-multiplying device_offset
-#                         into the pattern_matrix and then requiring futher
+#                         into the pattern_matrix and then requiring further
 #                         manipulation for SVG
 # extend-pad            - lacks implementation in pixman and consequently used
 #                         as an excuse for lack of support in other backends
diff --git a/test/README b/test/README
index 28f4747..b8effea 100644
--- a/test/README
+++ b/test/README
@@ -57,7 +57,7 @@ this is interfering with the results, you can clear the cached results using:
 
   make clean-caches
 
-Running tests under modified enviroments or tools
+Running tests under modified environments or tools
 -------------------------------------------------
 To run tests under a tool like gdb, one can use the run target and
 the TOOL variable.  For example:
diff --git a/test/dash-offset.c b/test/dash-offset.c
index 0e53687..f4269ee 100644
--- a/test/dash-offset.c
+++ b/test/dash-offset.c
@@ -37,7 +37,7 @@ static const double frac_offset[] = { 0, 2, 4, 6 };
  * This corresponds to the non-inverted part only if
  * the dash pattern has odd length, so the expected result
  * is the same for every int_offset if the pattern has
- * even lenght, and inverted each time (or shifted by half
+ * even length, and inverted each time (or shifted by half
  * period, which is the same) if the pattern has odd length. */
 static const double int_offset[] = { -2, -1, 0, 1, 2 };
 
diff --git a/test/glyph-cache-pressure.c b/test/glyph-cache-pressure.c
index 770b39f..eb4f7c5 100644
--- a/test/glyph-cache-pressure.c
+++ b/test/glyph-cache-pressure.c
@@ -38,7 +38,7 @@
  *	https://bugs.freedesktop.org/show_bug.cgi?id=6955
  *
  *   We replicate this bug by using the cairo_scaled_font_set_max_glyphs_per_font
- *   function to artifically induce cache pressure. (This function was added
+ *   function to artificially induce cache pressure. (This function was added
  *   for this very purpose.)
  *
  * 2006-06-22  Carl Worth  <cworth at cworth.org>
diff --git a/util/cairo-trace/cairo-trace.in b/util/cairo-trace/cairo-trace.in
index 1fc3de6..ece90d3 100644
--- a/util/cairo-trace/cairo-trace.in
+++ b/util/cairo-trace/cairo-trace.in
@@ -25,7 +25,7 @@ Whatever else happens is driven by its argument:
   --compress      - Compress the output with LZMA
   --profile       - Combine --no-callers and --no-mark-dirty and --compress
 
-Enviroment variables understood by cairo-trace:
+Environment variables understood by cairo-trace:
   CAIRO_TRACE_FLUSH - flush the output after every function call.
   CAIRO_TRACE_LINE_INFO - emit line information for most function calls.
 EOF
-- 
1.7.2.5


--------------090104080009020304000505
Content-Type: text/plain;
 name="0010-doc-preserve-whitespace-by-using-docbook-screen-tag.patch.txt"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0010-doc-preserve-whitespace-by-using-docbook-screen-tag.pat";
 filename*1="ch.txt"



More information about the cairo mailing list