[cairo-commit] 3 commits - build/aclocal.float.m4 src/cairo.c src/cairo-device.c src/cairo-font-face.c src/cairo-pattern.c src/cairo-scaled-font.c src/cairo-surface.c

[Bryce Harrington]

 build/aclocal.float.m4  |    4 ++--
 src/cairo-device.c      |    4 ++--
 src/cairo-font-face.c   |    4 ++--
 src/cairo-pattern.c     |    8 ++++----
 src/cairo-scaled-font.c |    4 ++--
 src/cairo-surface.c     |    4 ++--
 src/cairo.c             |    4 ++--
 7 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit cd1040ed80b6ab886c019248544bede747cd3eb4
Author: Bryce Harrington <bryce at bryceharrington.org>
Date:   Mon Oct 10 14:05:32 2016 -0700

    build: Don't rely on non-POSIX 'strings -' behavior
    
    On systems using GNU's strings implementation, 'strings -' causes a scan
    of the whole file, which is equivalent to 'strings -a'.  However, in
    POSIX passing '-' as the first argument to 'strings' is declared
    unspecified, and thus may break the build on systems that use a
    different POSIX strings implementation.
    
    Patch from Jung-uk Kim
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88639
    Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/build/aclocal.float.m4 b/build/aclocal.float.m4
index 8f85f08..ca14ea3 100644
--- a/build/aclocal.float.m4
+++ b/build/aclocal.float.m4
@@ -31,10 +31,10 @@ int main() { return 0; }
 
 ]])], [
 
-if strings - conftest$ac_exeext | grep noonsees >/dev/null ; then
+if strings -a conftest$ac_exeext | grep noonsees >/dev/null ; then
   ax_cv_c_float_words_bigendian=yes
 fi
-if strings - conftest$ac_exeext | grep seesnoon >/dev/null ; then
+if strings -a conftest$ac_exeext | grep seesnoon >/dev/null ; then
   if test "$ax_cv_c_float_words_bigendian" = unknown; then
     ax_cv_c_float_words_bigendian=no
   else
commit b7b6803567fbe477e1ae42d2406744afaa3c0cbb
Author: Bryce Harrington <bryce at bryceharrington.org>
Date:   Fri Sep 16 15:05:55 2016 -0700

    pattern: Fix incorrect grammar in cairo_pattern_get_type.
    
    "This function returns the type a pattern." is obviously missing 'of',
    but this can be stated more succinctly with active voice.
    
    Signed-off-by: Bryce Harrington <bryce at bryceharrington.org>

diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index d73b31c..7c2d5d3 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1073,8 +1073,8 @@ slim_hidden_def (cairo_pattern_reference);
  * cairo_pattern_get_type:
  * @pattern: a #cairo_pattern_t
  *
- * This function returns the type a pattern.
- * See #cairo_pattern_type_t for available types.
+ * Get the pattern's type.  See #cairo_pattern_type_t for available
+ * types.
  *
  * Return value: The type of @pattern.
  *
commit 9d2983175e98433cf86fbfafa2954ce2cbf66dac
Author: Bryce Harrington <bryce at bryceharrington.org>
Date:   Fri Sep 16 14:54:19 2016 -0700

    Fix grammar in cairo_*_reference() function documentation.
    
    "can be get" is incorrect grammar; "can be gotten" would be better, but
    active voice is best.
    
    Signed-off-by: Bryce Harrington <bryce at bryceharrington.org>

diff --git a/src/cairo-device.c b/src/cairo-device.c
index 73e5040..965c84c 100644
--- a/src/cairo-device.c
+++ b/src/cairo-device.c
@@ -194,8 +194,8 @@ _cairo_device_init (cairo_device_t *device,
  * @device from being destroyed until a matching call to
  * cairo_device_destroy() is made.
  *
- * The number of references to a #cairo_device_t can be get using
- * cairo_device_get_reference_count().
+ * Use cairo_device_get_reference_count() to get the number of references
+ * to a #cairo_device_t.
  *
  * Return value: the referenced #cairo_device_t.
  *
diff --git a/src/cairo-font-face.c b/src/cairo-font-face.c
index 795951b..e10a6ea 100644
--- a/src/cairo-font-face.c
+++ b/src/cairo-font-face.c
@@ -111,8 +111,8 @@ _cairo_font_face_init (cairo_font_face_t               *font_face,
  * @font_face from being destroyed until a matching call to
  * cairo_font_face_destroy() is made.
  *
- * The number of references to a #cairo_font_face_t can be get using
- * cairo_font_face_get_reference_count().
+ * Use cairo_font_face_get_reference_count() to get the number of
+ * references to a #cairo_font_face_t.
  *
  * Return value: the referenced #cairo_font_face_t.
  *
diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c
index d3796e6..d73b31c 100644
--- a/src/cairo-pattern.c
+++ b/src/cairo-pattern.c
@@ -1047,8 +1047,8 @@ cairo_pattern_create_mesh (void)
  * @pattern from being destroyed until a matching call to
  * cairo_pattern_destroy() is made.
  *
- * The number of references to a #cairo_pattern_t can be get using
- * cairo_pattern_get_reference_count().
+ * Use cairo_pattern_get_reference_count() to get the number of
+ * references to a #cairo_pattern_t.
  *
  * Return value: the referenced #cairo_pattern_t.
  *
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 38f3efa..dff3053 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -1277,8 +1277,8 @@ _cairo_scaled_font_reset_static_data (void)
  * @scaled_font from being destroyed until a matching call to
  * cairo_scaled_font_destroy() is made.
  *
- * The number of references to a #cairo_scaled_font_t can be get using
- * cairo_scaled_font_get_reference_count().
+ * Use cairo_scaled_font_get_reference_count() to get the number of
+ * references to a #cairo_scaled_font_t.
  *
  * Returns: the referenced #cairo_scaled_font_t
  *
diff --git a/src/cairo-surface.c b/src/cairo-surface.c
index 8f05db8..6d3ac19 100644
--- a/src/cairo-surface.c
+++ b/src/cairo-surface.c
@@ -914,8 +914,8 @@ _cairo_surface_create_scratch (cairo_surface_t	 *other,
  * @surface from being destroyed until a matching call to
  * cairo_surface_destroy() is made.
  *
- * The number of references to a #cairo_surface_t can be get using
- * cairo_surface_get_reference_count().
+ * Use cairo_surface_get_reference_count() to get the number of
+ * references to a #cairo_surface_t.
  *
  * Return value: the referenced #cairo_surface_t.
  *
diff --git a/src/cairo.c b/src/cairo.c
index 02b9171..eb863ef 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -478,8 +478,8 @@ _cairo_init (cairo_t *cr,
  * @cr from being destroyed until a matching call to cairo_destroy()
  * is made.
  *
- * The number of references to a #cairo_t can be get using
- * cairo_get_reference_count().
+ * Use cairo_get_reference_count() to get the number of references to
+ * a #cairo_t.
  *
  * Return value: the referenced #cairo_t.
  *