[cairo-commit] build/aclocal.float.m4 perf/cairo-perf-diff-files.c perf/micro src/cairo.c src/cairo-cogl-surface.c src/cairo.h src/cairoint.h src/cairo-pdf-operators.c src/cairo-pdf-surface.c src/cairo-pdf-surface-private.h src/cairo-ps-surface.c src/cairo-xlib-surface.c src/skia test/line-width-zero.c test/mime-data.c test/skew-extreme.c util/backtrace-symbols.c

Bryce Harrington bryce at kemper.freedesktop.org
Tue Apr 3 00:48:03 UTC 2018


 build/aclocal.float.m4          |    2 +-
 perf/cairo-perf-diff-files.c    |    2 +-
 perf/micro/long-lines.c         |    2 +-
 src/cairo-cogl-surface.c        |    2 +-
 src/cairo-pdf-operators.c       |    2 +-
 src/cairo-pdf-surface-private.h |    2 +-
 src/cairo-pdf-surface.c         |    2 +-
 src/cairo-ps-surface.c          |    2 +-
 src/cairo-xlib-surface.c        |    2 +-
 src/cairo.c                     |    6 +++---
 src/cairo.h                     |    2 +-
 src/cairoint.h                  |    2 +-
 src/skia/cairo-skia-context.cpp |    2 +-
 test/line-width-zero.c          |    2 +-
 test/mime-data.c                |    2 +-
 test/skew-extreme.c             |    2 +-
 util/backtrace-symbols.c        |    2 +-
 17 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 12cb59be7da83cf019933a163cef8d8b2601b7f4
Author: Unknown <kunda at scribus.net>
Date:   Thu Nov 9 09:43:02 2017 -0500

    Cairo trivial typos
    
    Found using `codespell -q 3 -I cairo-whitelist.txt`
    whereby whitelist contained:
    ```
    amin
    iff
    lod
    writen
    ```
    
    Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
index ca14ea377..85adf6d5f 100644
--- a/build/aclocal.float.m4
+++ b/build/aclocal.float.m4
@@ -12,7 +12,7 @@ AC_DEFUN([AX_C_FLOAT_WORDS_BIGENDIAN],
   [AC_CACHE_CHECK(whether float word ordering is bigendian,
                   ax_cv_c_float_words_bigendian, [
 
-# The endianess is detected by first compiling C code that contains a special
+# The endianness is detected by first compiling C code that contains a special
 # double float value, then grepping the resulting object file for certain
 # strings of ascii values. The double is specially crafted to have a
 # binary representation that corresponds with a simple string. In this
diff --git a/perf/cairo-perf-diff-files.c b/perf/cairo-perf-diff-files.c
index 36b80cda4..4d3ff7a67 100644
--- a/perf/cairo-perf-diff-files.c
+++ b/perf/cairo-perf-diff-files.c
@@ -355,7 +355,7 @@ cairo_perf_reports_compare (cairo_perf_report_t 	*reports,
 	diff = &diffs[i];
 
 	/* Discard as uninteresting a change which is less than the
-	 * minimum change required, (default may be overriden on
+	 * minimum change required, (default may be overridden on
 	 * command-line). */
 	if (fabs (diff->change) - 1.0 < options->min_change)
 	    continue;
diff --git a/perf/micro/long-lines.c b/perf/micro/long-lines.c
index a0d134c2d..7bfe624cb 100644
--- a/perf/micro/long-lines.c
+++ b/perf/micro/long-lines.c
@@ -29,7 +29,7 @@
 /* This test case is designed to illustrate a performance bug in
  * drawing very long lines, where most of the line is out of bounds of
  * the destination surface, (but some portion of the line is
- * visibile). These results are in the "long-lines-uncropped" report.
+ * visible). These results are in the "long-lines-uncropped" report.
  *
  * For comparison, this test also renders the visible portions of the
  * same lines, (this is the "long-lines-cropped" report).
diff --git a/src/cairo-cogl-surface.c b/src/cairo-cogl-surface.c
index f61e16c82..b46066c9b 100644
--- a/src/cairo-cogl-surface.c
+++ b/src/cairo-cogl-surface.c
@@ -517,7 +517,7 @@ _cairo_cogl_surface_allocate_buffer_space (cairo_cogl_surface_t *surface,
 					   void **pointer)
 {
     /* XXX: In the Cogl journal we found it more efficient to have a pool of
-     * buffers that we re-cycle but for now we simply thow away our stack
+     * buffers that we re-cycle but for now we simply throw away our stack
      * buffer each time we flush. */
     if (unlikely (surface->buffer_stack &&
 		  (surface->buffer_stack_size - surface->buffer_stack_offset) < size)) {
diff --git a/src/cairo-pdf-operators.c b/src/cairo-pdf-operators.c
index b4ac253e6..42f770940 100644
--- a/src/cairo-pdf-operators.c
+++ b/src/cairo-pdf-operators.c
@@ -140,7 +140,7 @@ _cairo_pdf_operators_flush (cairo_pdf_operators_t	 *pdf_operators)
  * assumptions will be made about the state. The next time a
  * particular graphics state is required (eg line width) the state
  * operator is always emitted and then remembered for subsequent
- * operatations.
+ * operations.
  *
  * This should be called when starting a new stream or after emitting
  * the 'Q' operator (where pdf-operators functions were called inside
diff --git a/src/cairo-pdf-surface-private.h b/src/cairo-pdf-surface-private.h
index 84fcf5f64..3793332ce 100644
--- a/src/cairo-pdf-surface-private.h
+++ b/src/cairo-pdf-surface-private.h
@@ -110,7 +110,7 @@ typedef struct _cairo_pdf_pattern {
 
     /* PDF pattern space is the pattern matrix concatenated with the
      * initial space of the parent object. If the parent object is the
-     * page, the intial space does not include the Y-axis flipping
+     * page, the initial space does not include the Y-axis flipping
      * matrix emitted at the start of the page content stream.  If the
      * parent object is not the page content stream, the initial space
      * will have a flipped Y-axis. The inverted_y_axis flag is true
diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index bf01fbaf6..81ff515c8 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -4194,7 +4194,7 @@ cairo_pdf_surface_emit_transparency_group (cairo_pdf_surface_t  *surface,
 
 	/* When emitting a shading operator we are in cairo pattern
 	 * coordinates. _cairo_pdf_surface_paint_gradient has set the
-	 * ctm to the pattern matrix (including the convertion from
+	 * ctm to the pattern matrix (including the conversion from
 	 * pdf to cairo coordinates) */
 	_cairo_box_from_rectangle (&box, &pdf_pattern->extents);
 	_cairo_box_to_doubles (&box, &x1, &y1, &x2, &y2);
diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index f01b7e704..27a51953e 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -3283,7 +3283,7 @@ _cairo_ps_surface_emit_eps (cairo_ps_surface_t          *surface,
 	params->approx_size = eps_data_len;
 	surface->contains_eps = TRUE;
 
-	/* Find number of occurences of SUBFILE_FILTER_EOD in the EPS data.
+	/* Find number of occurrences of SUBFILE_FILTER_EOD in the EPS data.
 	 * We will need it before emitting the data if a ReusableStream is used.
          */
 	params->eod_count = count_eod_strings (eps_data, eps_data_len);
diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index 908d76daf..bca0cc585 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -1886,7 +1886,7 @@ static cairo_bool_t valid_size (int width, int height)
     /* Note: the minimum surface size allowed in the X protocol is 1x1.
      * However, as we historically did not check the minimum size we
      * allowed applications to lie and set the correct size later (one hopes).
-     * To preserve compatability we must allow applications to use
+     * To preserve compatibility we must allow applications to use
      * 0x0 surfaces.
      */
     return (width  >= 0 && width  <= XLIB_COORD_MAX &&
diff --git a/src/cairo.c b/src/cairo.c
index 092d48c0d..92724a26b 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -256,7 +256,7 @@
  *                 no operations are enclosed, the y coordidate is 0.
  *
  * @internal: A boolean that if true, the destination name may be
- *            ommitted from PDF where possible. In this case, links
+ *            omitted from PDF where possible. In this case, links
  *            refer directly to the page and position instead of via
  *            the named destination table. Note that if this
  *            destination is referenced by another PDF (see [File Links][file-link]),
@@ -279,10 +279,10 @@
  * # Document Structure (PDF) # {#doc-struct}
  *
  * The document structure tags provide a means of specifying structural information
- * such as headers, paragraphs, tables, and figures. The inclusion of structural information faciliates:
+ * such as headers, paragraphs, tables, and figures. The inclusion of structural information facilitates:
  * * Extraction of text and graphics for copy and paste
  * * Reflow of text and graphics in the viewer
- * * Proccessing text eg searching and indexing
+ * * Processing text eg searching and indexing
  * * Conversion to other formats
  * * Accessability support
  *
diff --git a/src/cairo.h b/src/cairo.h
index c252c7141..b2386af5d 100644
--- a/src/cairo.h
+++ b/src/cairo.h
@@ -398,7 +398,7 @@ typedef enum _cairo_content {
  * @CAIRO_FORMAT_A1: each pixel is a 1-bit quantity holding
  *   an alpha value. Pixels are packed together into 32-bit
  *   quantities. The ordering of the bits matches the
- *   endianess of the platform. On a big-endian machine, the
+ *   endianness of the platform. On a big-endian machine, the
  *   first pixel is in the uppermost bit, on a little-endian
  *   machine the first pixel is in the least-significant bit. (Since 1.0)
  * @CAIRO_FORMAT_RGB16_565: each pixel is a 16-bit quantity
diff --git a/src/cairoint.h b/src/cairoint.h
index 11f2c1eaf..cfae18cf9 100644
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -1518,7 +1518,7 @@ _cairo_surface_release_device_reference (cairo_surface_t *surface);
  * for that, even without being considered "valid" for the sake of
  * things like cairo_image_surface_create().
  *
- * Since 1.2.0 we ran into the same situtation with X servers with BGR
+ * Since 1.2.0 we ran into the same situation with X servers with BGR
  * visuals. This time we invented #cairo_internal_format_t instead,
  * (see it for more discussion).
  *
diff --git a/src/skia/cairo-skia-context.cpp b/src/skia/cairo-skia-context.cpp
index 9ffb8f6a2..f1326fdb0 100644
--- a/src/skia/cairo-skia-context.cpp
+++ b/src/skia/cairo-skia-context.cpp
@@ -288,7 +288,7 @@ static SkShader::TileMode
 extend_to_sk (cairo_extend_t extend)
 {
     static const SkShader::TileMode modeMap[] = {
-	SkShader::kClamp_TileMode,  // NONE behaves like PAD, because noone wants NONE
+	SkShader::kClamp_TileMode,  // NONE behaves like PAD, because no one wants NONE
 	SkShader::kRepeat_TileMode,
 	SkShader::kMirror_TileMode,
 	SkShader::kClamp_TileMode
diff --git a/test/line-width-zero.c b/test/line-width-zero.c
index c7ac8a0fd..421b9d2c5 100644
--- a/test/line-width-zero.c
+++ b/test/line-width-zero.c
@@ -28,7 +28,7 @@
 
 /* This is a test case for the following bug:
  *
- *	Crash in cairo_stroke_extents whe line width is 0 and line cap is ROUND
+ *	Crash in cairo_stroke_extents when line width is 0 and line cap is ROUND
  *	(_cairo_pen_find_active_cw_vertex_index)
  *	https://bugs.freedesktop.org/show_bug.cgi?id=10231
  */
diff --git a/test/mime-data.c b/test/mime-data.c
index e6d1405bf..cea9d7caf 100644
--- a/test/mime-data.c
+++ b/test/mime-data.c
@@ -238,7 +238,7 @@ paint_ccitt_file (cairo_t *cr, int x, int y)
 	return cairo_test_status_from_status (ctx, status);
     }
 
-    /* Set the CCITT image paramaters */
+    /* Set the CCITT image parameters */
     status = cairo_surface_set_mime_data (image, CAIRO_MIME_TYPE_CCITT_FAX_PARAMS,
 					  (unsigned char *)ccitt_image_params,
 					  strlen (ccitt_image_params),
diff --git a/test/skew-extreme.c b/test/skew-extreme.c
index 69299a86c..e0ee1c4c2 100644
--- a/test/skew-extreme.c
+++ b/test/skew-extreme.c
@@ -43,7 +43,7 @@
  *      d\_\c
  *
  * and the bug is that _cairo_traps_tessellate_convex_quad is
- * comparing b.x as less then d.x and therfore determining that the bc
+ * comparing b.x as less then d.x and therefore determining that the bc
  * edge is left of the ad edge. The fix is simply to compare c.x to
  * d.x instead of b.x to d.x .
  */
diff --git a/util/backtrace-symbols.c b/util/backtrace-symbols.c
index 045ad7805..9931413de 100644
--- a/util/backtrace-symbols.c
+++ b/util/backtrace-symbols.c
@@ -196,7 +196,7 @@ static char** translate_addresses_buf(bfd * abfd, bfd_vma *addr, int naddr)
 	char *buf = &b;
 	int len = 0;
 	char **ret_buf = NULL;
-	/* iterate over the formating twice.
+	/* iterate over the formatting twice.
 	 * the first time we count how much space we need
 	 * the second time we do the actual printing */
 	for (state=Count; state<=Print; state++) {


More information about the cairo-commit mailing list