diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-20 00:43:29 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-20 00:43:29 +0000 |
| commit | e2d1a595b84ca31d89ae20734155e6d1de635502 (patch) | |
| tree | 51fdf2d97b85ef4a3e7c870389b92130c9b1a491 /pango/pango-matrix.c | |
| parent | 3940a1714e84b076d04d4638c88df3dba7d8014e (diff) | |
| parent | 7f04ed9259fd91cdb3dc61c5aa43d196ec6a965f (diff) | |
| download | pango-e2d1a595b84ca31d89ae20734155e6d1de635502.tar.gz | |
Merge branch 'docs-cleanup' into 'master'
introspection: Stop using allow-none
See merge request GNOME/pango!333
Diffstat (limited to 'pango/pango-matrix.c')
| -rw-r--r-- | pango/pango-matrix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pango/pango-matrix.c b/pango/pango-matrix.c index 731c3a26..471a5e51 100644 --- a/pango/pango-matrix.c +++ b/pango/pango-matrix.c @@ -188,7 +188,7 @@ pango_matrix_concat (PangoMatrix *matrix, /** * pango_matrix_get_font_scale_factor: - * @matrix: (allow-none): a `PangoMatrix`, may be %NULL + * @matrix: (nullable): a `PangoMatrix`, may be %NULL * * Returns the scale factor of a matrix on the height of the font. * @@ -212,8 +212,8 @@ pango_matrix_get_font_scale_factor (const PangoMatrix *matrix) /** * pango_matrix_get_font_scale_factors: * @matrix: (nullable): a `PangoMatrix`, or %NULL - * @xscale: (out) (allow-none): output scale factor in the x direction, or %NULL - * @yscale: (out) (allow-none): output scale factor perpendicular to the x direction, or %NULL + * @xscale: (out) (optional): output scale factor in the x direction, or %NULL + * @yscale: (out) (optional): output scale factor perpendicular to the x direction, or %NULL * * Calculates the scale factor of a matrix on the width and height of the font. * @@ -332,7 +332,7 @@ pango_matrix_transform_point (const PangoMatrix *matrix, /** * pango_matrix_transform_rectangle: * @matrix: (nullable): a `PangoMatrix`, or %NULL - * @rect: (inout) (allow-none): in/out bounding box in Pango units, or %NULL + * @rect: (inout) (optional): in/out bounding box in Pango units, or %NULL * * First transforms @rect using @matrix, then calculates the bounding box * of the transformed rectangle. @@ -412,7 +412,7 @@ pango_matrix_transform_rectangle (const PangoMatrix *matrix, /** * pango_matrix_transform_pixel_rectangle: * @matrix: (nullable): a `PangoMatrix`, or %NULL - * @rect: (inout) (allow-none): in/out bounding box in device units, or %NULL + * @rect: (inout) (optional): in/out bounding box in device units, or %NULL * * First transforms the @rect using @matrix, then calculates the bounding box * of the transformed rectangle. |