[cairo-commit] AUTHORS boilerplate/cairo-boilerplate-win32-printing.c build/aclocal.float.m4 build/configure.ac.warnings NEWS perf/cairo-perf-trace.c src/cairo-array.c src/cairo-cogl-surface.c src/cairo-default-context.c src/cairo-ft-font.c src/cairo-gl-device.c src/cairo-gl-surface.c src/cairo-hash.c src/cairoint.h src/cairo-misc.c src/cairo-paginated-private.h src/cairo-paginated-surface.c src/cairo-pattern.c src/cairo-pdf-operators.c src/cairo-ps-surface.c src/cairo-script-surface.c src/cairo-tag-attributes.c src/cairo-toy-font-face.c src/cairo-traps.c src/win32 test/cairo-test.c test/copy-path.c test/degenerate-dash.c test/map-to-image.c test/pattern-getters.c test/pdiff test/svg-clip.c test/text-cache-crash.c util/cairo-api-update util/cairo-script

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Fri Feb 1 01:43:19 UTC 2019


 AUTHORS                                        |    8 ++++----
 NEWS                                           |   20 ++++++++++----------
 boilerplate/cairo-boilerplate-win32-printing.c |    2 +-
 build/aclocal.float.m4                         |    2 +-
 build/configure.ac.warnings                    |    2 +-
 perf/cairo-perf-trace.c                        |    2 +-
 src/cairo-array.c                              |    2 +-
 src/cairo-cogl-surface.c                       |    4 ++--
 src/cairo-default-context.c                    |    2 +-
 src/cairo-ft-font.c                            |    2 +-
 src/cairo-gl-device.c                          |    2 +-
 src/cairo-gl-surface.c                         |    2 +-
 src/cairo-hash.c                               |    2 +-
 src/cairo-misc.c                               |    2 +-
 src/cairo-paginated-private.h                  |    2 +-
 src/cairo-paginated-surface.c                  |    2 +-
 src/cairo-pattern.c                            |    8 ++++----
 src/cairo-pdf-operators.c                      |    4 ++--
 src/cairo-ps-surface.c                         |    2 +-
 src/cairo-script-surface.c                     |    2 +-
 src/cairo-tag-attributes.c                     |    2 +-
 src/cairo-toy-font-face.c                      |    4 ++--
 src/cairo-traps.c                              |    2 +-
 src/cairoint.h                                 |    2 +-
 src/win32/cairo-win32-printing-surface.c       |    2 +-
 test/cairo-test.c                              |    2 +-
 test/copy-path.c                               |    2 +-
 test/degenerate-dash.c                         |    2 +-
 test/map-to-image.c                            |    6 +++---
 test/pattern-getters.c                         |    2 +-
 test/pdiff/args.c                              |    2 +-
 test/pdiff/args.h                              |    2 +-
 test/svg-clip.c                                |    2 +-
 test/text-cache-crash.c                        |    2 +-
 util/cairo-api-update                          |    2 +-
 util/cairo-script/cairo-script-hash.c          |    2 +-
 36 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 6d93bddbd65a1a9723260f2b0406abae4dd63c7f
Author: luz.paz <luzpaz at users.noreply.github.com>
Date:   Sat Oct 20 14:11:30 2018 -0400

    Misc. typos
    
    Found via `codespell -i 3 -w -I ../cairo-word-whitelist.txt -L tim,ned,uint`
    Follow up of 12cb59be7da
    
    Reviewed-by: Bryce Harrington <bryce at bryceharrington.org>

diff --git a/AUTHORS b/AUTHORS
index d85696fa8..fe5a883e8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,7 +29,7 @@ Larry Ewing <lewing at novell.com> Test case for group-clip
 Brian Ewins <Brian.Ewins at gmail.com> ATSUI maintenance (first success at making it really work)
 Bertram Felgenhauer <int-e at gmx.de> Fixes for subtle arithmetic errors
 Damian Frank <damian.frank at gmail.com> Build system improvements for win32
-Bdale Garbee <bdale at gag.com> Provided essential support for cairo achitecture sessions
+Bdale Garbee <bdale at gag.com> Provided essential support for cairo architecture sessions
 Jens Granseuer <jensgr at gmx.net> Fixes to generate proper compiler flags
 Laxmi Harikumar <laxmi.harikumar at digital.com> Build fix
 J. Ali Harlow <ali at avrc.city.ac.uk> win32 backend updates
@@ -42,7 +42,7 @@ Thomas Hunger <info at teh-web.de> Initial version of cairo_in_stroke/fill
 Thomas Jaeger <ThJaeger at gmail.com> Extended repeat modes for X
 Björn Lindqvist <bjourne at gmail.com> Performance test cases
 Kristian Høgsberg <krh at redhat.com> PDF backend, PS backend with meta-surfaces
-Amaury Jacquot <sxpert at esitcom.org> Documentation review, appplication testing
+Amaury Jacquot <sxpert at esitcom.org> Documentation review, application testing
 Adrian Johnson <ajohnson at redneon.com> PDF backend improvement
 Michael Johnson <ahze at ahze.net> Bug fix for pre-C99 compilers
 Jonathon Jongsma <jonathon.jongsma at gmail.com> Fix documentation typos
@@ -61,7 +61,7 @@ Jordi Mas <jordi at ximian.com> Bug fix for cairo_show_text
 Nicholas Miell <nmiell at gmail.com> Fixes for linking bugs on AMD64
 Eugeniy Meshcheryakov <eugen at debian.org> PS/PDF font subsetting improvements
 Zakharov Mikhail <zmey20000 at yahoo.com> Build fix for HP-UX
-Christopher (Monty) Montgomery <xiphmont at gmail.com> Performnace fix (subimage_copy), multi-thread testing
+Christopher (Monty) Montgomery <xiphmont at gmail.com> Performance fix (subimage_copy), multi-thread testing
 Tim Mooney <enchanter at users.sourceforge.net> Fix test suite to compile with Solaris compiler
 Jeff Muizelaar <jeff at infidigm.net> Patient, painful, pixman code merge. Many fixes for intricacies of dashing.
 Yevgen Muntyan <muntyan at tamu.edu> win32 build fix
@@ -105,7 +105,7 @@ Sasha Vasko <sasha at aftercode.net> Build fix to compile without xlib backend
 Vladimir Vukicevic <vladimir at pobox.com> Quartz backend rewrite, win32/quartz maintenance
 Jonathan Watt <jwatt at jwatt.org> win32 fixes
 Peter Weilbacher <pmw at avila.aip.de> OS/2 backend
-Dan Williams <dcbw at redhat.com> Implemnt MMX function to help OLPC
+Dan Williams <dcbw at redhat.com> Implement MMX function to help OLPC
 Chris Wilson <chris at chris-wilson.co.uk> Large-scale robustness improvements, (warn_unsed_result and malloc failure injection)
 Carl Worth <cworth at isi.edu> Original library, support for paths, images
 Richard D. Worth <richard at theworths.org> Build fixes for cygwin
diff --git a/NEWS b/NEWS
index a50b0a001..62d1b4331 100644
--- a/NEWS
+++ b/NEWS
@@ -257,7 +257,7 @@ Bug Fixes
   (Bug #105084)
 * Fix multi-monitor virtual desktop with negative coords on Win32
   (Bug #100793)
-* Fix issues occuring with older FreeType versions.
+* Fix issues occurring with older FreeType versions.
 
 
 Release 1.15.10    (2017-12-07 Bryce Harrington <bryce at osg.samsung.com>)
@@ -552,7 +552,7 @@ Bug Fixes
 * Fix build issue when using non-GNU strings utility.  (Bug #88639)
 
 * Fix build of cairo modules as regular modules, not as versioned shared
-  libaries.  (Bug #29319)
+  libraries.  (Bug #29319)
 
 * Fix build on win32 using gcc 5.4.
 
@@ -1275,7 +1275,7 @@ reduction in rendering latency by reducing the number of copies
 required to upload image data - given hardware and driver support,
 cairo-xlib can now perform zero copy uploads onto the GPU. And as usual
 Adrian Johnson has been very busy fixing many different corner cases in
-cairo-pdf, impoving opacity groups and font subsetting. Last, but not
+cairo-pdf, improving opacity groups and font subsetting. Last, but not
 least, for cairo-image Søren Sandmann Pedersen added support for
 rendering glyphs to pixman and using that from within cairo. The new
 glyph rendering facility reduces the overhead for setting up the
@@ -1290,7 +1290,7 @@ Bug fixes
 ---------
 
  Interior boxes were being dropped when amalgamating regions during
- tesselation.
+ tessellation.
  https://bugs.freedesktop.org/show_bug.cgi?id=49446
 
  Allow building without gtk-doc installed
@@ -1310,7 +1310,7 @@ Bug fixes
  Upload the whole source for a repeating pattern.
  https://bugs.freedesktop.org/show_bug.cgi?id=51910
 
- Fix damage tracking to handle continuation chunks corectly and so
+ Fix damage tracking to handle continuation chunks correctly and so
  prevent crashes on win32.
  https://bugs.freedesktop.org/show_bug.cgi?id=53384
 
@@ -1375,7 +1375,7 @@ Bug fixes
 Release 1.12.0 (2012-03-23 Chris Wilson <chris at chris-wilson.co.uk>)
 ===================================================================
 It's taken over 18 months, but the wait is finally over. A new cairo release!
-We are pleased to annouce a new stable release of Cairo that brings many
+We are pleased to announce a new stable release of Cairo that brings many
 new features and performance improvements, all whilst maintaining
 compatibility with cairo-1.0 and all releases since. We recommend anyone
 using a previous release of Cairo to upgrade to 1.12.0.
@@ -2105,7 +2105,7 @@ Long standing bugs fixed:
     tessellator has been overhauled and tune, which handles the fallback
     for when we are unable to use the new span rasteriser on the stroke
     (e.g. when using the current RENDER protocol). The large number of
-    pixel artefacts that implementing self-intersection elimination
+    pixel artifacts that implementing self-intersection elimination
     removes is ample justification for the potential performance
     regression. If you unfortunately do suffer a substantial performance
     regression in your application, please consider obtaining a
@@ -5789,7 +5789,7 @@ Release 1.2.6 (2006-11-02 Behdad Esfahbod <behdad at behdad.org>)
 This is the third bug fix release in the 1.2 series, coming less than
 two months after the 1.2.4 release made on August 18.
 
-The 1.2.4 release turned out to be a pretty solid one, except for a crasher
+The 1.2.4 release turned out to be a pretty solid one, except for a crash
 bug when forwarding an X connection where the client and the server have
 varying byte orders, eg. from a PPC to an i686.  Other than that, various
 other small bugs have been fixed.
@@ -6099,7 +6099,7 @@ And at least the following bugs have been fixed:
  * Do device offset before float->fixed conversion
    https://bugzilla.gnome.org/show_bug.cgi?id=332266
  * PS: Fix source surfaces with transformations
- * PS: Fix to not draw BUTT-capped degnerate sub-paths
+ * PS: Fix to not draw BUTT-capped degenerate sub-paths
  * PS: Don't walk off end of array when printing "~>"
  * Fix some memory leaks in the test suite rig
  * SVG: Fix memory leak when using cairo_mask
@@ -6692,7 +6692,7 @@ Bug fixes
 
  * Negative dash offsets have been fixed to work correctly.
 
- * The stroking of paths with mutiple subpaths has now been fixed to
+ * The stroking of paths with multiple subpaths has now been fixed to
    apply caps to all subpaths rather than just the last one.
 
  * Many build fixes for better portability on various systems.
diff --git a/boilerplate/cairo-boilerplate-win32-printing.c b/boilerplate/cairo-boilerplate-win32-printing.c
index 625d52c53..5a630664b 100644
--- a/boilerplate/cairo-boilerplate-win32-printing.c
+++ b/boilerplate/cairo-boilerplate-win32-printing.c
@@ -153,7 +153,7 @@ create_printer_dc (win32_target_closure_t *ptc)
 
     /* The printer device units on win32 are 1 unit == 1 dot and the
      * origin is the start of the printable area. We transform the
-     * cordinate space to 1 unit is 1 point as expected by the
+     * coordinate space to 1 unit is 1 point as expected by the
      * tests. As the page size is larger than the test surface, the
      * origin is translated down so that the each test is drawn at the
      * bottom left corner of the page. This is because the bottom left
diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
index 85adf6d5f..f92db03e6 100644
--- a/build/aclocal.float.m4
+++ b/build/aclocal.float.m4
@@ -6,7 +6,7 @@
 # float word ordering can be different from the byte ordering. In a
 # multi-word float context, "big-endian" implies that the word containing
 # the sign bit is found in the memory location with the lowest address.
-# This implemenation was inspired by the AC_C_BIGENDIAN macro in autoconf.
+# This implementation was inspired by the AC_C_BIGENDIAN macro in autoconf.
 # -------------------------------------------------------------------------
 AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
   [AC_CACHE_CHECK(whether float word ordering is bigendian,
diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings
index 96c7f6f6d..85bc3878a 100644
--- a/build/configure.ac.warnings
+++ b/build/configure.ac.warnings
@@ -24,7 +24,7 @@ MAYBE_C_SPECIFIC_WARN="-Wold-style-definition \
 
 # New -Wno options should be added here
 # gcc-4.4 and later accept every -Wno- option but may complain later that this
-# option is unknow each time another warning happen.
+# option is unknown each time another warning happens.
 # -Wunused-but-set-variable is too noisy at present
 NO_WARN="unused-but-set-variable"
 
diff --git a/perf/cairo-perf-trace.c b/perf/cairo-perf-trace.c
index 02e0e29f9..6483631f4 100644
--- a/perf/cairo-perf-trace.c
+++ b/perf/cairo-perf-trace.c
@@ -377,7 +377,7 @@ usage (const char *argv0)
 "  -i	iterations; specify the number of iterations per test case\n"
 "  -l	list only; just list selected test case names without executing\n"
 "  -r	raw; display each time measurement instead of summary statistics\n"
-"  -s	sync; only sum the elapsed time of the indiviual operations\n"
+"  -s	sync; only sum the elapsed time of the individual operations\n"
 "  -t	tile size; draw to tiled surfaces\n"
 "  -v	verbose; in raw mode also show the summaries\n"
 "  -x	exclude; specify a file to read a list of traces to exclude\n"
diff --git a/src/cairo-array.c b/src/cairo-array.c
index 58c9a388f..c43ed2e12 100644
--- a/src/cairo-array.c
+++ b/src/cairo-array.c
@@ -300,7 +300,7 @@ _cairo_array_append_multiple (cairo_array_t	*array,
  *
  * Allocate space at the end of the array for @num_elements additional
  * elements, providing the address of the new memory chunk in
- * @elements. This memory will be unitialized, but will be accounted
+ * @elements. This memory will be uninitialized, but will be accounted
  * for in the return value of _cairo_array_num_elements().
  *
  * Return value: %CAIRO_STATUS_SUCCESS if successful or
diff --git a/src/cairo-cogl-surface.c b/src/cairo-cogl-surface.c
index 2f7ed58d3..0c32940e8 100644
--- a/src/cairo-cogl-surface.c
+++ b/src/cairo-cogl-surface.c
@@ -142,7 +142,7 @@ typedef struct _cairo_cogl_path_fill_meta {
     /* A cached path tessellation should be re-usable with different rotations
      * and translations but not for different scales.
      *
-     * one idea is to track the diagonal lenghts of a unit rectangle
+     * one idea is to track the diagonal lengths of a unit rectangle
      * transformed through the original ctm use to tessellate the geometry
      * so we can check what the lengths are for any new ctm to know if
      * this geometry is compatible.
@@ -166,7 +166,7 @@ typedef struct _cairo_cogl_path_stroke_meta {
     /* A cached path tessellation should be re-usable with different rotations
      * and translations but not for different scales.
      *
-     * one idea is to track the diagonal lenghts of a unit rectangle
+     * one idea is to track the diagonal lengths of a unit rectangle
      * transformed through the original ctm use to tessellate the geometry
      * so we can check what the lengths are for any new ctm to know if
      * this geometry is compatible.
diff --git a/src/cairo-default-context.c b/src/cairo-default-context.c
index 985215ff7..95b5f6b77 100644
--- a/src/cairo-default-context.c
+++ b/src/cairo-default-context.c
@@ -523,7 +523,7 @@ _cairo_default_context_get_tolerance (void *abstract_cr)
 }
 
 
-/* Current tranformation matrix */
+/* Current transformation matrix */
 
 static cairo_status_t
 _cairo_default_context_translate (void *abstract_cr,
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 4c70e1b58..fea489d01 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2895,7 +2895,7 @@ _cairo_index_to_glyph_name (void	         *abstract_font,
     cairo_ft_scaled_font_t *scaled_font = abstract_font;
     cairo_ft_unscaled_font_t *unscaled = scaled_font->unscaled;
     FT_Face face;
-    char buffer[256]; /* PLRM spcifies max name length of 127 */
+    char buffer[256]; /* PLRM specifies max name length of 127 */
     FT_Error error;
     int i;
 
diff --git a/src/cairo-gl-device.c b/src/cairo-gl-device.c
index 258b4c50d..6f4c852a4 100644
--- a/src/cairo-gl-device.c
+++ b/src/cairo-gl-device.c
@@ -606,7 +606,7 @@ _cairo_gl_ensure_stencil (cairo_gl_context_t *ctx,
  * glLoadIdentity()
  * gluOrtho2D()
  *
- * The calculation for the ortho tranformation was taken from the
+ * The calculation for the ortho transformation was taken from the
  * mesa source code.
  */
 static void
diff --git a/src/cairo-gl-surface.c b/src/cairo-gl-surface.c
index 12ea3ddc4..b0f42d6aa 100644
--- a/src/cairo-gl-surface.c
+++ b/src/cairo-gl-surface.c
@@ -1252,7 +1252,7 @@ _cairo_gl_surface_map_to_image (void      *abstract_surface,
 	return _cairo_image_surface_create_in_error (status);
     }
 
-    /* We must invert the image manualy if we lack GL_MESA_pack_invert */
+    /* We must invert the image manually if we lack GL_MESA_pack_invert */
     if (flipped && ! mesa_invert) {
 	uint8_t stack[1024], *row = stack;
 	uint8_t *top = image->data;
diff --git a/src/cairo-hash.c b/src/cairo-hash.c
index 5a789906f..151842eb6 100644
--- a/src/cairo-hash.c
+++ b/src/cairo-hash.c
@@ -204,7 +204,7 @@ _cairo_hash_table_create (cairo_hash_keys_equal_func_t keys_equal)
  * _cairo_hash_table_destroy is called. It is a fatal error otherwise,
  * and this function will halt. The rationale for this behavior is to
  * avoid memory leaks and to avoid needless complication of the API
- * with destroy notifiy callbacks.
+ * with destroy notify callbacks.
  *
  * WARNING: The hash_table must have no running iterators in it when
  * _cairo_hash_table_destroy is called. It is a fatal error otherwise,
diff --git a/src/cairo-misc.c b/src/cairo-misc.c
index 6e63bc7e6..2f551ee27 100644
--- a/src/cairo-misc.c
+++ b/src/cairo-misc.c
@@ -959,7 +959,7 @@ _cairo_fopen (const char *filename, const char *mode, FILE **file_out)
 /* tmpfile() replacement for Windows.
  *
  * On Windows tmpfile() creates the file in the root directory. This
- * may fail due to unsufficient privileges. However, this isn't a
+ * may fail due to insufficient privileges. However, this isn't a
  * problem on Windows CE so we don't use it there.
  */
 FILE *
diff --git a/src/cairo-paginated-private.h b/src/cairo-paginated-private.h
index b85a5db6b..89f1c99a2 100644
--- a/src/cairo-paginated-private.h
+++ b/src/cairo-paginated-private.h
@@ -80,7 +80,7 @@ struct _cairo_paginated_surface_backend {
     (*supports_fine_grained_fallbacks) (void	    *surface);
 
     /* Optional. Indicates whether the page requires a thumbnail image to be
-     * supplied. If a thumbnail is required, set width, heigh to size required
+     * supplied. If a thumbnail is required, set width, height to size required
      * and return TRUE.
      */
     cairo_bool_t
diff --git a/src/cairo-paginated-surface.c b/src/cairo-paginated-surface.c
index fc16f790b..612cb5dfb 100644
--- a/src/cairo-paginated-surface.c
+++ b/src/cairo-paginated-surface.c
@@ -780,7 +780,7 @@ static const cairo_surface_backend_t cairo_paginated_surface_backend = {
     _cairo_paginated_context_create,
 
     _cairo_paginated_surface_create_similar,
-    NULL, /* create simlar image */
+    NULL, /* create siimlar image */
     NULL, /* map to image */
     NULL, /* unmap image */
 
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index fde044a4d..32811af59 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -2331,7 +2331,7 @@ _cairo_radial_pattern_box_to_parameter (const cairo_radial_pattern_t *radial,
     maxx = x1 + DBL_EPSILON;
     maxy = y1 + DBL_EPSILON;
 
-    /* we dont' allow negative radiuses, so we will be checking that
+    /* we don't allow negative radiuses, so we will be checking that
      * t*dr >= mindr to consider t valid */
     mindr = -(cr + DBL_EPSILON);
 
@@ -3022,8 +3022,8 @@ _cairo_pattern_alpha_range (const cairo_pattern_t *pattern,
  *
  * This function cannot be used while the mesh is being constructed.
  *
- * The function returns TRUE and sets the output parametes to define
- * the coodrinate range if the mesh pattern contains at least one
+ * The function returns TRUE and sets the output parameters to define
+ * the coordinate range if the mesh pattern contains at least one
  * patch, otherwise it returns FALSE.
  **/
 cairo_bool_t
@@ -4760,7 +4760,7 @@ _cairo_debug_print_pattern (FILE *file, const cairo_pattern_t *pattern)
     case CAIRO_FILTER_BEST: s = "best"; break;
     case CAIRO_FILTER_NEAREST: s = "nearest"; break;
     case CAIRO_FILTER_BILINEAR: s = "bilinear"; break;
-    case CAIRO_FILTER_GAUSSIAN: s = "guassian"; break;
+    case CAIRO_FILTER_GAUSSIAN: s = "gaussian"; break;
     default: s = "invalid"; ASSERT_NOT_REACHED; break;
     }
     fprintf (file, "  filter: %s\n", s);
diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c
index 491ef8ca2..328e893d7 100644
--- a/src/cairo-pdf-operators.c
+++ b/src/cairo-pdf-operators.c
@@ -798,7 +798,7 @@ _cairo_pdf_operators_emit_stroke (cairo_pdf_operators_t		*pdf_operators,
     }
 
     /* The PDF CTM is transformed to the user space CTM when stroking
-     * so the corect pen shape will be used. This also requires that
+     * so the correct pen shape will be used. This also requires that
      * the path be transformed to user space when emitted. The
      * conversion of path coordinates to user space may cause rounding
      * errors. For example the device space point (1.234, 3.142) when
@@ -1326,7 +1326,7 @@ _cairo_pdf_operators_emit_glyph (cairo_pdf_operators_t             *pdf_operator
      * current position to the next glyph. We also use the Td
      * operator to move the current position if the horizontal
      * position changes by more than 10 (in text space
-     * units). This is becauses the horizontal glyph positioning
+     * units). This is because the horizontal glyph positioning
      * in the TJ operator is intended for kerning and there may be
      * PDF consumers that do not handle very large position
      * adjustments in TJ.
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index c4643f824..4adccad6b 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -3481,7 +3481,7 @@ _cairo_ps_surface_emit_solid_pattern (cairo_ps_surface_t    *surface,
  * @source: [in] the source for the form
  * @params: [in] source parameters
  * @test: [in] if TRUE, test if form will be used (excludes size check)
- * @ps_form [out] the new or exisiting entry int the hash table.
+ * @ps_form [out] the new or existing entry int the hash table.
  *                image or recording.
  */
 static cairo_int_status_t
diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c
index 0e6bc5e89..c31900aa2 100644
--- a/src/cairo-script-surface.c
+++ b/src/cairo-script-surface.c
@@ -3825,7 +3825,7 @@ cairo_script_create_for_stream (cairo_write_func_t	 write_func,
  * cairo_script_write_comment:
  * @script: the script (output device)
  * @comment: the string to emit
- * @len:the length of the sting to write, or -1 to use strlen()
+ * @len:the length of the string to write, or -1 to use strlen()
  *
  * Emit a string verbatim into the script.
  *
diff --git a/src/cairo-tag-attributes.c b/src/cairo-tag-attributes.c
index f4ad501d3..7977d87f4 100644
--- a/src/cairo-tag-attributes.c
+++ b/src/cairo-tag-attributes.c
@@ -149,7 +149,7 @@ static attribute_spec_t _ccitt_params_spec[] =
  *          lly - lower left y xoordinate
  *          urx - upper right x xoordinate
  *          ury - upper right y xoordinate
- *        all cordinates are in PostScript coordinates.
+ *        all coordinates are in PostScript coordinates.
  */
 static attribute_spec_t _eps_params_spec[] =
 {
diff --git a/src/cairo-toy-font-face.c b/src/cairo-toy-font-face.c
index 3d2217dae..f51dab5ab 100644
--- a/src/cairo-toy-font-face.c
+++ b/src/cairo-toy-font-face.c
@@ -208,7 +208,7 @@ static void
 _cairo_toy_font_face_fini (cairo_toy_font_face_t *font_face)
 {
     /* We assert here that we own font_face->family before casting
-     * away the const qualifer. */
+     * away the const qualifier. */
     assert (font_face->owns_family);
     free ((char*) font_face->family);
 
@@ -420,7 +420,7 @@ _cairo_font_face_is_toy (cairo_font_face_t *font_face)
  * cairo_toy_font_face_get_family:
  * @font_face: A toy font face
  *
- * Gets the familly name of a toy font.
+ * Gets the family name of a toy font.
  *
  * Return value: The family name.  This string is owned by the font face
  * and remains valid as long as the font face is alive (referenced).
diff --git a/src/cairo-traps.c b/src/cairo-traps.c
index 1b7484843..c54f6f2ef 100644
--- a/src/cairo-traps.c
+++ b/src/cairo-traps.c
@@ -284,7 +284,7 @@ _cairo_traps_tessellate_convex_quad (cairo_traps_t *traps,
      * cases to tessellate.
      *
      * First, we have to determine the Y-axis sort of the four
-     * vertices, (either abcd or abdc). After that we need to detemine
+     * vertices, (either abcd or abdc). After that we need to determine
      * which edges will be "left" and which will be "right" in the
      * resulting trapezoids. This can be determined by computing a
      * slope comparison of ab and ad to determine if b is left of d or
diff --git a/src/cairoint.h b/src/cairoint.h
index 331ab5357..29b844d3a 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1522,7 +1522,7 @@ _cairo_surface_release_device_reference (cairo_surface_t *surface);
  * visuals. This time we invented #cairo_internal_format_t instead,
  * (see it for more discussion).
  *
- * The punchline is that %CAIRO_FORMAT_VALID must not conside any
+ * The punchline is that %CAIRO_FORMAT_VALID must not consider any
  * internal format to be valid. Also we need to decide if the
  * RGB16_565 should be moved to instead be an internal format. If so,
  * this macro need not change for it. (We probably will need to leave
diff --git a/src/win32/cairo-win32-printing-surface.c b/src/win32/cairo-win32-printing-surface.c
index da7357caa..094068c15 100644
--- a/src/win32/cairo-win32-printing-surface.c
+++ b/src/win32/cairo-win32-printing-surface.c
@@ -2041,7 +2041,7 @@ _cairo_win32_printing_surface_start_page (void *abstract_surface)
      * coordinates.
      *
      * If the device context is an EMF file, using an identity
-     * transform often provides insufficent resolution. The workaround
+     * transform often provides insufficient resolution. The workaround
      * is to set the GDI CTM to a scale < 1 eg [1.0/16 0 0 1/0/16 0 0]
      * and scale the cairo CTM by [16 0 0 16 0 0]. The
      * SetWorldTransform function call to scale the GDI CTM by 1.0/16
diff --git a/test/cairo-test.c b/test/cairo-test.c
index d93468bdb..dbfbf7e34 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -1470,7 +1470,7 @@ UNWIND_STRINGS:
 #include <signal.h>
 #include <setjmp.h>
 /* Used to catch crashes in a test, so that we report it as such and
- * continue testing, although one crasher may already have corrupted memory in
+ * continue testing, although one crash may already have corrupted memory in
  * an nonrecoverable fashion. */
 static jmp_buf jmpbuf;
 
diff --git a/test/copy-path.c b/test/copy-path.c
index 25823b6b1..7d7a4f467 100644
--- a/test/copy-path.c
+++ b/test/copy-path.c
@@ -290,7 +290,7 @@ preamble (cairo_test_context_t *ctx)
 	return cairo_test_status_from_status (ctx, status);
     }
 
-    /* And test the degnerate case */
+    /* And test the degenerate case */
     CAIRO_CREATE ();
     path.num_data = 0;
     cairo_append_path (cr, &path);
diff --git a/test/degenerate-dash.c b/test/degenerate-dash.c
index 6e7bf6b37..56d2e7938 100644
--- a/test/degenerate-dash.c
+++ b/test/degenerate-dash.c
@@ -85,6 +85,6 @@ draw (cairo_t *cr, int width, int height)
 CAIRO_TEST (degenerate_dash,
 	    "Tests the behaviour of dashed segments that end on a off-on transition",
 	    "dash, degenerate", /* keywords */
-	    NULL, /* requirementts */
+	    NULL, /* requirements */
 	    210 + 2*PAD, 210 + 2*PAD,
 	    NULL, draw)
diff --git a/test/map-to-image.c b/test/map-to-image.c
index 2b1799f71..7fac9aa8a 100644
--- a/test/map-to-image.c
+++ b/test/map-to-image.c
@@ -139,19 +139,19 @@ fill (cairo_t *cr, int width, int height)
 }
 
 CAIRO_TEST (map_all_to_image,
-	    "Test maping a surface to an image and modifying it externally",
+	    "Test mapping a surface to an image and modifying it externally",
 	    "image", /* keywords */
 	    "target=raster", /* requirements */
 	    WIDTH, HEIGHT,
 	    NULL, all)
 CAIRO_TEST (map_bit_to_image,
-	    "Test maping a surface to an image and modifying it externally",
+	    "Test mapping a surface to an image and modifying it externally",
 	    "image", /* keywords */
 	    "target=raster", /* requirements */
 	    WIDTH, HEIGHT,
 	    NULL, bit)
 CAIRO_TEST (map_to_image_fill,
-	    "Test maping a surface to an image and modifying it externally",
+	    "Test mapping a surface to an image and modifying it externally",
 	    "image", /* keywords */
 	    "target=raster", /* requirements */
 	    WIDTH, HEIGHT,
diff --git a/test/pattern-getters.c b/test/pattern-getters.c
index 08508d7d4..e0ece398f 100644
--- a/test/pattern-getters.c
+++ b/test/pattern-getters.c
@@ -67,7 +67,7 @@ draw (cairo_t *cr, int width, int height)
 	    !CAIRO_TEST_DOUBLE_EQUALS(g,0.3) ||
 	    !CAIRO_TEST_DOUBLE_EQUALS(b,0.4) ||
 	    !CAIRO_TEST_DOUBLE_EQUALS(a,0.5)) {
-	    cairo_test_log (ctx, "Error: cairo_pattern_get_rgba returned unexepcted results: %g, %g, %g, %g\n",
+	    cairo_test_log (ctx, "Error: cairo_pattern_get_rgba returned unexpected results: %g, %g, %g, %g\n",
 			    r, g, b, a);
 	    cairo_pattern_destroy (pat);
 	    return CAIRO_TEST_FAILURE;
diff --git a/test/pdiff/args.c b/test/pdiff/args.c
index ac3aa83a9..64aef6fdb 100644
--- a/test/pdiff/args.c
+++ b/test/pdiff/args.c
@@ -1,5 +1,5 @@
 /*
-  Comapre Args
+  Compare Args
   Copyright (C) 2006 Yangli Hector Yee
 
   This program is free software; you can redistribute it and/or modify it under the terms of the
diff --git a/test/pdiff/args.h b/test/pdiff/args.h
index 502023915..338507f77 100644
--- a/test/pdiff/args.h
+++ b/test/pdiff/args.h
@@ -1,5 +1,5 @@
 /*
-  Comapre Args
+  Compare Args
   Copyright (C) 2006 Yangli Hector Yee
 
   This program is free software; you can redistribute it and/or modify it under the terms of the
diff --git a/test/svg-clip.c b/test/svg-clip.c
index dff65f7cc..d34144a9c 100644
--- a/test/svg-clip.c
+++ b/test/svg-clip.c
@@ -87,7 +87,7 @@ test_clip (cairo_t *cr, double width, double height)
     cairo_stroke (cr2);
 
     /* Using the first context, draw another black vertical line.
-     * This line should be clipped agaist the bezier clipping path set
+     * This line should be clipped against the bezier clipping path set
      * earlier. */
     cairo_set_source_rgb (cr, 0, 0, 0);
     cairo_move_to (cr, 400, 0);
diff --git a/test/text-cache-crash.c b/test/text-cache-crash.c
index 27fe8cb42..6b6fe361c 100644
--- a/test/text-cache-crash.c
+++ b/test/text-cache-crash.c
@@ -42,7 +42,7 @@
  *
  * 2004-11-04 Carl Worth <cworth at cworth.org>
  *
- *   I trimmed down Ned's example to the folllowing test while still
+ *   I trimmed down Ned's example to the following test while still
  *   maintaining the assertion.
  *
  *   Oh, actually, it looks like I may have triggered something
diff --git a/util/cairo-api-update b/util/cairo-api-update
index e16df43fd..cff33317b 100755
--- a/util/cairo-api-update
+++ b/util/cairo-api-update
@@ -3,7 +3,7 @@ set -e
 
 if [ $# -lt 1 ]; then
     argv0=`basename $0`
-    echo "$argv0: Update source code to the lastest Cairo API" >&2
+    echo "$argv0: Update source code to the latest Cairo API" >&2
     echo "" >&2
     echo "Usage: $argv0 file [...]" >&2
     exit 1
diff --git a/util/cairo-script/cairo-script-hash.c b/util/cairo-script/cairo-script-hash.c
index 58786fcd0..dbda407bc 100644
--- a/util/cairo-script/cairo-script-hash.c
+++ b/util/cairo-script/cairo-script-hash.c
@@ -153,7 +153,7 @@ _csi_hash_table_init (csi_hash_table_t *hash_table,
  * _csi_hash_table_destroy is called. It is a fatal error otherwise,
  * and this function will halt. The rationale for this behavior is to
  * avoid memory leaks and to avoid needless complication of the API
- * with destroy notifiy callbacks.
+ * with destroy notify callbacks.
  *
  * WARNING: The hash_table must have no running iterators in it when
  * _csi_hash_table_destroy is called. It is a fatal error otherwise,


More information about the cairo-commit mailing list