[cairo-commit] 5 commits - src/cairo-boxes.c src/cairo.c src/cairo-clip-boxes.c src/cairo-ft.h src/cairo-image-surface-private.h src/cairo-pattern-private.h src/cairo-svg-surface.c src/win32
Bryce Harrington
bryce at kemper.freedesktop.org
Thu Dec 7 23:55:22 UTC 2017
src/cairo-boxes.c | 23 +++++++++++++----------
src/cairo-clip-boxes.c | 11 +++++------
src/cairo-ft.h | 4 ++--
src/cairo-image-surface-private.h | 1 +
src/cairo-pattern-private.h | 2 +-
src/cairo-svg-surface.c | 2 +-
src/cairo.c | 4 +---
src/win32/cairo-win32-display-surface.c | 2 +-
8 files changed, 25 insertions(+), 24 deletions(-)
New commits:
commit f723ce31920cf5d5fe0ba417bb4b50b62a3ac4e6
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Thu Dec 7 15:53:16 2017 -0800
pattern: Mark a private routine as cairo_private.
Fixes distcheck PLT error:
Checking .libs/libcairo.so for local PLT entries
000000000031f1d0 0000024200000007 R_X86_64_JUMP_SLOT
0000000000055de0 _cairo_pattern_is_constant_alpha + 0
diff --git a/src/cairo-pattern-private.h b/src/cairo-pattern-private.h
index 98f3be03..26d584e6 100644
--- a/src/cairo-pattern-private.h
+++ b/src/cairo-pattern-private.h
@@ -256,7 +256,7 @@ _cairo_gradient_pattern_is_solid (const cairo_gradient_pattern_t *gradient,
const cairo_rectangle_int_t *extents,
cairo_color_t *color);
-cairo_bool_t
+cairo_private cairo_bool_t
_cairo_pattern_is_constant_alpha (const cairo_pattern_t *abstract_pattern,
const cairo_rectangle_int_t *extents,
double *alpha);
commit c9a78ec9c21900f4418988ffe832b7e611a776c8
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Thu Dec 7 14:15:17 2017 -0800
Fix distcheck errors on use of #ifdef
Checking that feature conditionals are used with #if only (not #ifdef)
./cairo-ft.h:#ifdef CAIRO_HAS_FC_FONT
./cairo-ft.h:#ifdef CAIRO_HAS_FC_FONT
diff --git a/src/cairo-ft.h b/src/cairo-ft.h
index 3f775a88..29c43c96 100644
--- a/src/cairo-ft.h
+++ b/src/cairo-ft.h
@@ -46,7 +46,7 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#ifdef CAIRO_HAS_FC_FONT
+#if CAIRO_HAS_FC_FONT
#include <fontconfig/fontconfig.h>
#endif
@@ -98,7 +98,7 @@ cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font);
cairo_public void
cairo_ft_scaled_font_unlock_face (cairo_scaled_font_t *scaled_font);
-#ifdef CAIRO_HAS_FC_FONT
+#if CAIRO_HAS_FC_FONT
cairo_public cairo_font_face_t *
cairo_ft_font_face_create_for_pattern (FcPattern *pattern);
commit 04b4967586ac31763186d9894107b8c8403bcb34
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Thu Dec 7 14:00:21 2017 -0800
Fix various doxygen warnings found by check-doc-syntax.sh
./cairo-clip-boxes.c (268): ERROR: copy invalid doc id (should be 'cairo_...:')
./cairo-clip-boxes.c (274): ERROR: copy bad line: ' */'
./cairo-clip-boxes.c (274): ERROR: copy documentation comment not closed with **/
./cairo-boxes.c (106): ERROR: Computes invalid doc id (should be 'cairo_...:')
./cairo-boxes.c (114): ERROR: Computes bad line: ' */'
./cairo-boxes.c (114): ERROR: Computes documentation comment not closed with **/
./cairo-boxes.c (279): ERROR: Computes invalid doc id (should be 'cairo_...:')
./cairo-boxes.c (284): ERROR: Computes bad line: ' */'
./cairo-boxes.c (284): ERROR: Computes documentation comment not closed with **/
./cairo-boxes.c (338): ERROR: Linearize invalid doc id (should be 'cairo_...:')
./cairo-boxes.c (345): ERROR: Linearize documentation comment not closed with **/
./cairo.c (240): ERROR: SECTION:cairo-tag bad line: ''
./cairo.c (892): ERROR: cairo_set_source_rgb: Duplicate 'Since' field
diff --git a/src/cairo-boxes.c b/src/cairo-boxes.c
index 6ddf81a8..3c5d2a75 100644
--- a/src/cairo-boxes.c
+++ b/src/cairo-boxes.c
@@ -102,7 +102,8 @@ _cairo_boxes_init_for_array (cairo_boxes_t *boxes,
boxes->is_pixel_aligned = n == num_boxes;
}
-/**
+/** _cairo_boxes_limit:
+ *
* Computes the minimum bounding box of the given list of boxes and assign
* it to the given boxes set. It also assigns that list as the list of
* limiting boxes in the box set.
@@ -275,12 +276,13 @@ _cairo_boxes_add (cairo_boxes_t *boxes,
return boxes->status;
}
-/**
+/** _cairo_boxes_extents:
+ *
* Computes the minimum bounding box of the given box set and stores
* it in the given box.
*
- * @param boxes the box set whose minimum bounding is computed
- * @param box return buffer for the computed result
+ * @param boxes The box set whose minimum bounding is computed.
+ * @param box Return buffer for the computed result.
*/
void
_cairo_boxes_extents (const cairo_boxes_t *boxes,
@@ -334,15 +336,16 @@ _cairo_boxes_clear (cairo_boxes_t *boxes)
boxes->is_pixel_aligned = TRUE;
}
-/**
+/** _cairo_boxes_to_array:
+ *
* Linearize a box set of possibly multiple chunks into one big chunk
* and returns an array of boxes
*
- * @param boxes the box set to be converted
- * @param num_boxes return buffer for the number of boxes (array count)
- * @return pointer to the newly allocated array of boxes
- * (the number o elements is given in num_boxes)
- * */
+ * @param boxes The box set to be converted.
+ * @param num_boxes Return buffer for the number of boxes (array count).
+ * @return Pointer to the newly allocated array of boxes
+ * (the number o elements is given in num_boxes).
+ */
cairo_box_t *
_cairo_boxes_to_array (const cairo_boxes_t *boxes,
int *num_boxes)
diff --git a/src/cairo-clip-boxes.c b/src/cairo-clip-boxes.c
index 1d33cc89..aaddeb7f 100644
--- a/src/cairo-clip-boxes.c
+++ b/src/cairo-clip-boxes.c
@@ -264,13 +264,12 @@ _cairo_clip_intersect_box (cairo_clip_t *clip,
return _cairo_clip_intersect_rectangle_box (clip, &r, box);
}
-/**
- * copy a box set to an clip
+/* Copy a box set to a clip
*
- * @param box the box set to copy from
- * @param clip the clip to copy to (return buffer)
- * @result zero if the allocation failed - the clip will be set to all-clipped
- * otherwise non-zero
+ * @param boxes The box set to copy from.
+ * @param clip The clip to copy to (return buffer).
+ * @returns Zero if the allocation failed (the clip will be set to
+ * all-clipped), otherwise non-zero.
*/
static cairo_bool_t
_cairo_boxes_copy_to_clip (const cairo_boxes_t *boxes, cairo_clip_t *clip)
diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c
index 0853360a..1b568542 100644
--- a/src/cairo-svg-surface.c
+++ b/src/cairo-svg-surface.c
@@ -438,7 +438,7 @@ cairo_svg_version_to_string (cairo_svg_version_t version)
* The simplest way to do this is to call this function immediately after
* creating the SVG surface.
*
- * NOTE: if this function is never called, the default unit for SVG documents
+ * Note if this function is never called, the default unit for SVG documents
* generated by cairo will be "pt". This is for historical reasons.
*
* Since: 1.16
diff --git a/src/cairo.c b/src/cairo.c
index 21fad0d3..092d48c0 100644
--- a/src/cairo.c
+++ b/src/cairo.c
@@ -237,7 +237,7 @@
* </programlisting>
*
* # Destination Tags # {#dest}
-
+ *
* A destination is specified by enclosing the destination drawing
* operations with the %CAIRO_TAG_DEST tag.
*
@@ -854,8 +854,6 @@ slim_hidden_def (cairo_set_operator);
* using the alpha value.
*
* The default opacity is 1.
- *
- * Since: TBD
*/
void
cairo_set_opacity (cairo_t *cr, double opacity)
commit dbc1636a9b932fd81ace436a03c1992a6ac1cbcf
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Thu Dec 7 13:25:58 2017 -0800
win32: Fix since field version number
check-doc-syntax.sh expects since numbers to be MAJOR.MINOR without a
patch level number
diff --git a/src/win32/cairo-win32-display-surface.c b/src/win32/cairo-win32-display-surface.c
index 025b2c9e..92d1f6ce 100644
--- a/src/win32/cairo-win32-display-surface.c
+++ b/src/win32/cairo-win32-display-surface.c
@@ -936,7 +936,7 @@ static const cairo_surface_backend_t cairo_win32_display_surface_backend = {
*
* Return value: the newly created surface, NULL on failure
*
- * Since: 1.14.3
+ * Since: 1.14
**/
cairo_surface_t *
cairo_win32_surface_create_with_format (HDC hdc, cairo_format_t format)
commit bb0d616c4efe1015d17d41125f235a219ad14322
Author: Bryce Harrington <bryce at osg.samsung.com>
Date: Wed Dec 6 18:27:21 2017 -0800
image: Fix include for use of ptrdiff
Commit 38fbe621 added use of the ptrdiff_t type in a header file,
however `make distcheck` complains:
In file included from headers-standalone-tmp.c:1:0:
../../../src/cairo-image-surface-private.h:74:5: error: unknown type name ‘ptrdiff_t’
ptrdiff_t stride;
^
diff --git a/src/cairo-image-surface-private.h b/src/cairo-image-surface-private.h
index 7e78d615..2b792113 100644
--- a/src/cairo-image-surface-private.h
+++ b/src/cairo-image-surface-private.h
@@ -40,6 +40,7 @@
#include "cairo-surface-private.h"
+#include <stddef.h>
#include <pixman.h>
CAIRO_BEGIN_DECLS
More information about the cairo-commit
mailing list