fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-03 10:08:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/cairo.h doc/public/cairo-sections.txt src/cairo-matrix.c: Update.

Browse source 
Include cairo-font.xml
This commit is contained in:
Owen Taylor 2005-04-11 09:18:51 +00:00
parent df997b3f5b
commit cf9ea30078
14 changed files with 261 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2005-04-11 Owen Taylor <otaylor@redhat.com>
* src/cairo.h doc/public/cairo-sections.txt
src/cairo-matrix.c: Update.
* doc/public/cairo-docs.xml: Include cairo-font.xml
2005-04-08 Carl Worth <cworth@cworth.org>
* src/cairoint.h:

13
doc/public/Makefile.am
View file

@ -19,11 +19,14 @@ HFILE_GLOB=$(top_srcdir)/src/*.h
CFILE_GLOB=$(top_srcdir)/src/*.c $(top_srcdir)/src/*.h
# Headers to ignore
IGNORE_HFILES= \
cairo-features.h \
cairo-ft-private.h \
cairo-win32-private.h \
cairoint.h \
IGNORE_HFILES= \
cairo-features.h \
cairo-ft-private.h \
cairo-gstate-private.h \
cairo-path-fixed-private.h \
cairo-private.h \
cairo-win32-private.h \
cairoint.h \
cairo-wideint.h
# CFLAGS and LDFLAGS for compiling scan program. Only needed

1
doc/public/cairo-docs.xml
View file

@ -12,6 +12,7 @@
<xi:include href="xml/cairo-surface.xml"/>
<xi:include href="xml/cairo-pattern.xml"/>
<xi:include href="xml/cairo-matrix.xml"/>
<xi:include href="xml/cairo-font.xml"/>
<xi:include href="xml/cairo-atsui.xml"/>
<xi:include href="xml/cairo-ft.xml"/>
<xi:include href="xml/cairo-glitz.xml"/>

54
doc/public/cairo-sections.txt
View file

@ -24,16 +24,16 @@ cairo_glitz_surface_create
<FILE>cairo-pdf</FILE>
<TITLE>PDF Backend</TITLE>
cairo_set_target_pdf
cairo_set_target_pdf_as_file
cairo_set_target_pdf_for_callback
cairo_pdf_surface_create
cairo_pdf_surface_create_for_file
cairo_pdf_surface_create_for_callback
</SECTION>
<SECTION>
<FILE>cairo-png</FILE>
<TITLE>PNG Backend</TITLE>
cairo_set_target_png
cairo_png_surface_create
cairo_surface_write_png
cairo_image_surface_create_for_png
</SECTION>
<SECTION>
@ -65,6 +65,7 @@ cairo_win32_scaled_font_get_metrics_factor
<FILE>cairo-xcb</FILE>
<TITLE>XCB Backend</TITLE>
cairo_set_target_xcb
cairo_xcb_surface_create
</SECTION>
<SECTION>
@ -120,12 +121,11 @@ cairo_pattern_get_filter
<FILE>cairo-matrix</FILE>
<TITLE>cairo_matrix_t</TITLE>
cairo_matrix_t
cairo_matrix_create
cairo_matrix_destroy
cairo_matrix_copy
cairo_matrix_set_identity
cairo_matrix_set_affine
cairo_matrix_get_affine
cairo_matrix_init
cairo_matrix_init_identity
cairo_matrix_init_translate
cairo_matrix_init_scale
cairo_matrix_init_rotate
cairo_matrix_translate
cairo_matrix_scale
cairo_matrix_rotate
@ -133,6 +133,13 @@ cairo_matrix_invert
cairo_matrix_multiply
cairo_matrix_transform_distance
cairo_matrix_transform_point
<SUBSECTION Private>
cairo_matrix_create
cairo_matrix_destroy
cairo_matrix_copy
cairo_matrix_set_identity
cairo_matrix_set_affine
cairo_matrix_get_affine
</SECTION>
<SECTION>
@ -166,6 +173,7 @@ cairo_copy
cairo_set_target_surface
cairo_format_t
cairo_set_target_image
cairo_set_target_image_no_data
cairo_operator_t
cairo_set_operator
cairo_set_rgb_color
@ -184,14 +192,14 @@ cairo_set_miter_limit
cairo_translate
cairo_scale
cairo_rotate
cairo_concat_matrix
cairo_transform
cairo_set_matrix
cairo_default_matrix
cairo_identity_matrix
cairo_transform_point
cairo_transform_distance
cairo_inverse_transform_point
cairo_inverse_transform_distance
cairo_user_to_device
cairo_user_to_device_distance
cairo_device_to_user
cairo_device_to_user_distance
cairo_new_path
cairo_move_to
cairo_line_to
@ -212,8 +220,8 @@ cairo_in_fill
cairo_bool_t
cairo_stroke_extents
cairo_fill_extents
cairo_init_clip
cairo_clip
cairo_reset_clip
cairo_glyph_t
cairo_font_slant_t
cairo_font_weight_t
@ -246,9 +254,11 @@ cairo_get_matrix
cairo_get_target_surface
cairo_get_path
cairo_get_path_flat
cairo_copy_path_data
cairo_copy_path_data_flat
cairo_append_path_data
cairo_copy_path
cairo_copy_path_flat
cairo_append_path
cairo_path_t
cairo_path_destroy
cairo_status_t
cairo_status
cairo_status_string
@ -262,6 +272,7 @@ cairo_write_func_t
CAIRO_API_SHAKEUP_FLAG_DAY
CAIRO_BEGIN_DECLS
CAIRO_END_DECLS
cairo_concat_matrix
cairo_current_operator
cairo_current_rgb_color
cairo_current_alpha
@ -278,10 +289,15 @@ cairo_current_path
cairo_current_path_flat
cairo_current_font
cairo_current_font_extents
cairo_init_clip
cairo_inverse_transform_point
cairo_inverse_transform_distance
cairo_scale_font
cairo_select_font
cairo_transform_font
cairo_get_font_extents
cairo_get_status
cairo_get_status_string
cairo_transform_point
cairo_transform_distance
</SECTION>

12
doc/public/tmpl/cairo-font.sgml
View file

@ -17,6 +17,18 @@ Font Handling
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_font_face_t ##### -->
<para>
</para>
<!-- ##### TYPEDEF cairo_scaled_font_t ##### -->
<para>
</para>
<!-- ##### FUNCTION cairo_font_face_reference ##### -->
<para>

85
doc/public/tmpl/cairo-matrix.sgml
View file

@ -41,74 +41,75 @@ cairo_matrix_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_matrix_create ##### -->
<!-- ##### STRUCT cairo_matrix_t ##### -->
<para>
</para>
@Returns:
@xx:
@yx:
@xy:
@yy:
@x0:
@y0:
<!-- ##### FUNCTION cairo_matrix_destroy ##### -->
<!-- ##### FUNCTION cairo_matrix_init ##### -->
<para>
</para>
@matrix:
<!-- ##### FUNCTION cairo_matrix_copy ##### -->
<para>
</para>
@matrix:
@other:
@xx:
@yx:
@xy:
@yy:
@x0:
@y0:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### MACRO cairo_matrix_set_identity ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@matrix:
<!-- ##### MACRO cairo_matrix_set_affine ##### -->
<para>
</para>
@Returns:
<!-- # Unused Parameters # -->
@matrix:
@Param7:
@a:
@b:
@c:
@d:
@tx:
@ty:
@cr:
<!-- ##### FUNCTION cairo_matrix_get_affine ##### -->
<!-- ##### FUNCTION cairo_matrix_init_identity ##### -->
<para>
</para>
@matrix:
<!-- ##### FUNCTION cairo_matrix_init_translate ##### -->
<para>
</para>
@matrix:
@a:
@b:
@c:
@d:
@tx:
@ty:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_matrix_init_scale ##### -->
<para>
</para>
@matrix:
@sx:
@sy:
<!-- ##### FUNCTION cairo_matrix_init_rotate ##### -->
<para>
</para>
@matrix:
@radians:
<!-- ##### FUNCTION cairo_matrix_translate ##### -->

6
doc/public/tmpl/cairo-pattern.sgml
View file

@ -17,6 +17,12 @@ cairo_pattern_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_pattern_t ##### -->
<para>
</para>
<!-- ##### FUNCTION cairo_pattern_create_for_surface ##### -->
<para>

30
doc/public/tmpl/cairo-pdf.sgml
View file

@ -35,6 +35,21 @@ PDF Backend
@file:
<!-- ##### FUNCTION cairo_set_target_pdf_for_callback ##### -->
<para>
</para>
@cr:
@write_func:
@destroy_closure_func:
@closure:
@width_inches:
@height_inches:
@x_pixels_per_inch:
@y_pixels_per_inch:
<!-- ##### FUNCTION cairo_pdf_surface_create ##### -->
<para>
@ -53,3 +68,18 @@ PDF Backend
@file:
<!-- ##### FUNCTION cairo_pdf_surface_create_for_callback ##### -->
<para>
</para>
@write_func:
@destroy_closure_func:
@closure:
@width_inches:
@height_inches:
@x_pixels_per_inch:
@y_pixels_per_inch:
@Returns:

21
doc/public/tmpl/cairo-png.sgml
View file

@ -17,3 +17,24 @@ PNG Backend
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### FUNCTION cairo_surface_write_png ##### -->
<para>
</para>
@surface:
@file:
@Returns:
<!-- ##### FUNCTION cairo_image_surface_create_for_png ##### -->
<para>
</para>
@file:
@width:
@height:
@Returns:

6
doc/public/tmpl/cairo-surface.sgml
View file

@ -17,6 +17,12 @@ cairo_surface_t
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_surface_t ##### -->
<para>
</para>
<!-- ##### MACRO cairo_surface_create_for_image ##### -->
<para>

12
doc/public/tmpl/cairo-xcb.sgml
View file

@ -29,3 +29,15 @@ XCB Backend
@format:
<!-- ##### FUNCTION cairo_xcb_surface_create ##### -->
<para>
</para>
@dpy:
@drawable:
@visual:
@format:
@Returns:

91
doc/public/tmpl/cairo.sgml
View file

@ -27,6 +27,12 @@ Drawing contexts.
<!-- ##### SECTION Stability_Level ##### -->
<!-- ##### TYPEDEF cairo_t ##### -->
<para>
</para>
<!-- ##### FUNCTION cairo_create ##### -->
<para>
@ -108,6 +114,17 @@ Drawing contexts.
@stride:
<!-- ##### FUNCTION cairo_set_target_image_no_data ##### -->
<para>
</para>
@cr:
@format:
@width:
@height:
<!-- ##### ENUM cairo_operator_t ##### -->
<para>
@ -286,12 +303,11 @@ Drawing contexts.
@angle:
<!-- ##### MACRO cairo_concat_matrix ##### -->
<!-- ##### FUNCTION cairo_transform ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
@matrix:
@ -322,45 +338,41 @@ Drawing contexts.
@cr:
<!-- ##### MACRO cairo_transform_point ##### -->
<!-- ##### FUNCTION cairo_user_to_device ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
@x:
@y:
<!-- ##### MACRO cairo_transform_distance ##### -->
<!-- ##### FUNCTION cairo_user_to_device_distance ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
@dx:
@dy:
<!-- ##### MACRO cairo_inverse_transform_point ##### -->
<!-- ##### FUNCTION cairo_device_to_user ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
@x:
@y:
<!-- ##### MACRO cairo_inverse_transform_distance ##### -->
<!-- ##### FUNCTION cairo_device_to_user_distance ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
@dx:
@dy:
@ -572,16 +584,15 @@ Drawing contexts.
@y2:
<!-- ##### MACRO cairo_init_clip ##### -->
<!-- ##### FUNCTION cairo_clip ##### -->
<para>
</para>
<!-- # Unused Parameters # -->
@cr:
<!-- ##### FUNCTION cairo_clip ##### -->
<!-- ##### FUNCTION cairo_reset_clip ##### -->
<para>
</para>
@ -863,9 +874,9 @@ Drawing contexts.
</para>
@cr:
@Returns:
<!-- # Unused Parameters # -->
@matrix:
<!-- # Unused Parameters # -->
@Returns:
<!-- ##### FUNCTION cairo_get_target_surface ##### -->
@ -902,6 +913,49 @@ Drawing contexts.
@closure:
<!-- ##### FUNCTION cairo_copy_path ##### -->
<para>
</para>
@cr:
@Returns:
<!-- ##### FUNCTION cairo_copy_path_flat ##### -->
<para>
</para>
@cr:
@Returns:
<!-- ##### FUNCTION cairo_append_path ##### -->
<para>
</para>
@cr:
@path:
<!-- ##### STRUCT cairo_path_t ##### -->
<para>
</para>
@data:
@num_data:
<!-- ##### FUNCTION cairo_path_destroy ##### -->
<para>
</para>
@path:
<!-- ##### ENUM cairo_status_t ##### -->
<para>
@ -991,6 +1045,13 @@ End:
@data:
<!-- ##### STRUCT cairo_user_data_key_t ##### -->
<para>
</para>
@unused:
<!-- ##### USER_FUNCTION cairo_write_func_t ##### -->
<para>

2
src/cairo-matrix.c
View file

@ -264,8 +264,6 @@ slim_hidden_def(cairo_matrix_init_scale);
* Applies scaling by @tx, @ty to the transformation in @matrix. The
* effect of the new transformation is to first scale the coordinates
* by @sx and @sy, then apply the original transformation to the coordinates.
*
* Return value: %CAIRO_STATUS_SUCCESS, always.
**/
void
cairo_matrix_scale (cairo_matrix_t *matrix, double sx, double sy)

8
src/cairo.h
View file

@ -844,7 +844,7 @@ typedef union {
* A data structure for holding a path. This data structure serves as
* the return value for cairo_copy_path_data() and
* cairo_copy_path_data_flat() as well the input value for
* cairo_append_path_data().
* cairo_append_path().
*
* See #cairo_path_data_t for hints on how to iterate over the
* actual data within the path.
@ -1022,9 +1022,9 @@ cairo_matrix_copy (cairo_matrix_t *matrix, const cairo_matrix_t *other);
void
cairo_matrix_init (cairo_matrix_t *matrix,
double a, double b,
double c, double d,
double tx, double ty);
double xx, double yx,
double xy, double yy,
double x0, double y0);
void
cairo_matrix_init_identity (cairo_matrix_t *matrix);