[cairo-commit] 4 commits - doc/public pixman/src src/cairoint.h
Behdad Esfahbod
behdad at kemper.freedesktop.org
Fri Dec 8 13:00:17 PST 2006
doc/public/cairo-docs.xml | 3
doc/public/tmpl/cairo-pattern.sgml | 76 ++++++++++++++++++++++
doc/public/tmpl/cairo-status.sgml | 50 +++++++-------
doc/public/tmpl/cairo-surface.sgml | 114 ++++++++++++++++-----------------
doc/public/tmpl/cairo-text.sgml | 1
doc/public/tmpl/cairo-win32-fonts.sgml | 18 +++++
doc/public/tmpl/cairo-win32.sgml | 21 ++++++
doc/public/tmpl/cairo.sgml | 69 +++++++++++++++++++
pixman/src/slim_internal.h | 103 -----------------------------
src/cairoint.h | 4 -
10 files changed, 272 insertions(+), 187 deletions(-)
New commits:
diff-tree beadc7da864c974558b8e98723e9d2533baab630 (from cdd79c104dd940077b1f3193c31272f9a4673bb5)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Fri Dec 8 15:42:24 2006 -0500
[docs] Update templates
diff --git a/doc/public/tmpl/cairo-pattern.sgml b/doc/public/tmpl/cairo-pattern.sgml
index 9ffbe8b..56b5a9d 100644
--- a/doc/public/tmpl/cairo-pattern.sgml
+++ b/doc/public/tmpl/cairo-pattern.sgml
@@ -48,6 +48,31 @@ Gradients and filtered sources
@alpha:
+<!-- ##### FUNCTION cairo_pattern_get_color_stop_count ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at count:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_pattern_get_color_stop_rgba ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at index:
+ at offset:
+ at red:
+ at green:
+ at blue:
+ at alpha:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_pattern_create_rgb ##### -->
<para>
@@ -71,6 +96,19 @@ Gradients and filtered sources
@Returns:
+<!-- ##### FUNCTION cairo_pattern_get_rgba ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at red:
+ at green:
+ at blue:
+ at alpha:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_pattern_create_for_surface ##### -->
<para>
@@ -80,6 +118,16 @@ Gradients and filtered sources
@Returns:
+<!-- ##### FUNCTION cairo_pattern_get_surface ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at surface:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_pattern_create_linear ##### -->
<para>
@@ -92,6 +140,19 @@ Gradients and filtered sources
@Returns:
+<!-- ##### FUNCTION cairo_pattern_get_linear_points ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at x0:
+ at y0:
+ at x1:
+ at y1:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_pattern_create_radial ##### -->
<para>
@@ -106,6 +167,21 @@ Gradients and filtered sources
@Returns:
+<!-- ##### FUNCTION cairo_pattern_get_radial_circles ##### -->
+<para>
+
+</para>
+
+ at pattern:
+ at x0:
+ at y0:
+ at r0:
+ at x1:
+ at y1:
+ at r1:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_pattern_destroy ##### -->
<para>
diff --git a/doc/public/tmpl/cairo-status.sgml b/doc/public/tmpl/cairo-status.sgml
index f943cac..0f34961 100644
--- a/doc/public/tmpl/cairo-status.sgml
+++ b/doc/public/tmpl/cairo-status.sgml
@@ -22,37 +22,37 @@ Decoding cairo's status
</para>
- at CAIRO_STATUS_SUCCESS:
- at CAIRO_STATUS_NO_MEMORY:
- at CAIRO_STATUS_INVALID_RESTORE:
- at CAIRO_STATUS_INVALID_POP_GROUP:
- at CAIRO_STATUS_NO_CURRENT_POINT:
- at CAIRO_STATUS_INVALID_MATRIX:
- at CAIRO_STATUS_INVALID_STATUS:
- at CAIRO_STATUS_NULL_POINTER:
- at CAIRO_STATUS_INVALID_STRING:
- at CAIRO_STATUS_INVALID_PATH_DATA:
- at CAIRO_STATUS_READ_ERROR:
- at CAIRO_STATUS_WRITE_ERROR:
- at CAIRO_STATUS_SURFACE_FINISHED:
- at CAIRO_STATUS_SURFACE_TYPE_MISMATCH:
- at CAIRO_STATUS_PATTERN_TYPE_MISMATCH:
- at CAIRO_STATUS_INVALID_CONTENT:
- at CAIRO_STATUS_INVALID_FORMAT:
- at CAIRO_STATUS_INVALID_VISUAL:
- at CAIRO_STATUS_FILE_NOT_FOUND:
- at CAIRO_STATUS_INVALID_DASH:
- at CAIRO_STATUS_INVALID_DSC_COMMENT:
- at CAIRO_STATUS_INVALID_INDEX:
- at CAIRO_STATUS_CLIP_NOT_REPRESENTABLE:
+ at CAIRO_STATUS_SUCCESS:
+ at CAIRO_STATUS_NO_MEMORY:
+ at CAIRO_STATUS_INVALID_RESTORE:
+ at CAIRO_STATUS_INVALID_POP_GROUP:
+ at CAIRO_STATUS_NO_CURRENT_POINT:
+ at CAIRO_STATUS_INVALID_MATRIX:
+ at CAIRO_STATUS_INVALID_STATUS:
+ at CAIRO_STATUS_NULL_POINTER:
+ at CAIRO_STATUS_INVALID_STRING:
+ at CAIRO_STATUS_INVALID_PATH_DATA:
+ at CAIRO_STATUS_READ_ERROR:
+ at CAIRO_STATUS_WRITE_ERROR:
+ at CAIRO_STATUS_SURFACE_FINISHED:
+ at CAIRO_STATUS_SURFACE_TYPE_MISMATCH:
+ at CAIRO_STATUS_PATTERN_TYPE_MISMATCH:
+ at CAIRO_STATUS_INVALID_CONTENT:
+ at CAIRO_STATUS_INVALID_FORMAT:
+ at CAIRO_STATUS_INVALID_VISUAL:
+ at CAIRO_STATUS_FILE_NOT_FOUND:
+ at CAIRO_STATUS_INVALID_DASH:
+ at CAIRO_STATUS_INVALID_DSC_COMMENT:
+ at CAIRO_STATUS_INVALID_INDEX:
+ at CAIRO_STATUS_CLIP_NOT_REPRESENTABLE:
<!-- ##### FUNCTION cairo_status_to_string ##### -->
<para>
</para>
- at status:
- at Returns:
+ at status:
+ at Returns:
<!-- ##### FUNCTION cairo_debug_reset_static_data ##### -->
diff --git a/doc/public/tmpl/cairo-surface.sgml b/doc/public/tmpl/cairo-surface.sgml
index d993636..2f7d49e 100644
--- a/doc/public/tmpl/cairo-surface.sgml
+++ b/doc/public/tmpl/cairo-surface.sgml
@@ -28,20 +28,20 @@ Base class for surfaces
</para>
- at CAIRO_CONTENT_COLOR:
- at CAIRO_CONTENT_ALPHA:
- at CAIRO_CONTENT_COLOR_ALPHA:
+ at CAIRO_CONTENT_COLOR:
+ at CAIRO_CONTENT_ALPHA:
+ at CAIRO_CONTENT_COLOR_ALPHA:
<!-- ##### FUNCTION cairo_surface_create_similar ##### -->
<para>
</para>
- at other:
- at content:
- at width:
- at height:
- at Returns:
+ at other:
+ at content:
+ at width:
+ at height:
+ at Returns:
<!-- ##### FUNCTION cairo_surface_destroy ##### -->
@@ -49,7 +49,7 @@ Base class for surfaces
</para>
- at surface:
+ at surface:
<!-- ##### FUNCTION cairo_surface_finish ##### -->
@@ -57,7 +57,7 @@ Base class for surfaces
</para>
- at surface:
+ at surface:
<!-- ##### FUNCTION cairo_surface_flush ##### -->
@@ -65,7 +65,7 @@ Base class for surfaces
</para>
- at surface:
+ at surface:
<!-- ##### FUNCTION cairo_surface_get_font_options ##### -->
@@ -73,8 +73,8 @@ Base class for surfaces
</para>
- at surface:
- at options:
+ at surface:
+ at options:
<!-- ##### FUNCTION cairo_surface_get_content ##### -->
@@ -82,8 +82,8 @@ Base class for surfaces
</para>
- at surface:
- at Returns:
+ at surface:
+ at Returns:
<!-- ##### FUNCTION cairo_surface_set_user_data ##### -->
@@ -91,11 +91,11 @@ Base class for surfaces
</para>
- at surface:
- at key:
- at user_data:
- at destroy:
- at Returns:
+ at surface:
+ at key:
+ at user_data:
+ at destroy:
+ at Returns:
<!-- ##### FUNCTION cairo_surface_get_user_data ##### -->
@@ -103,9 +103,9 @@ Base class for surfaces
</para>
- at surface:
- at key:
- at Returns:
+ at surface:
+ at key:
+ at Returns:
<!-- ##### FUNCTION cairo_surface_mark_dirty ##### -->
@@ -113,7 +113,7 @@ Base class for surfaces
</para>
- at surface:
+ at surface:
<!-- ##### FUNCTION cairo_surface_mark_dirty_rectangle ##### -->
@@ -121,11 +121,11 @@ Base class for surfaces
</para>
- at surface:
- at x:
- at y:
- at width:
- at height:
+ at surface:
+ at x:
+ at y:
+ at width:
+ at height:
<!-- ##### FUNCTION cairo_surface_reference ##### -->
@@ -133,8 +133,8 @@ Base class for surfaces
</para>
- at surface:
- at Returns:
+ at surface:
+ at Returns:
<!-- ##### FUNCTION cairo_surface_set_device_offset ##### -->
@@ -142,9 +142,9 @@ Base class for surfaces
</para>
- at surface:
- at x_offset:
- at y_offset:
+ at surface:
+ at x_offset:
+ at y_offset:
<!-- ##### FUNCTION cairo_surface_get_device_offset ##### -->
@@ -152,9 +152,9 @@ Base class for surfaces
</para>
- at surface:
- at x_offset:
- at y_offset:
+ at surface:
+ at x_offset:
+ at y_offset:
<!-- ##### FUNCTION cairo_surface_set_fallback_resolution ##### -->
@@ -162,9 +162,9 @@ Base class for surfaces
</para>
- at surface:
- at x_pixels_per_inch:
- at y_pixels_per_inch:
+ at surface:
+ at x_pixels_per_inch:
+ at y_pixels_per_inch:
<!-- ##### FUNCTION cairo_surface_status ##### -->
@@ -172,8 +172,8 @@ Base class for surfaces
</para>
- at surface:
- at Returns:
+ at surface:
+ at Returns:
<!-- ##### ENUM cairo_surface_type_t ##### -->
@@ -181,26 +181,26 @@ Base class for surfaces
</para>
- at CAIRO_SURFACE_TYPE_IMAGE:
- at CAIRO_SURFACE_TYPE_PDF:
- at CAIRO_SURFACE_TYPE_PS:
- at CAIRO_SURFACE_TYPE_XLIB:
- at CAIRO_SURFACE_TYPE_XCB:
- at CAIRO_SURFACE_TYPE_GLITZ:
- at CAIRO_SURFACE_TYPE_QUARTZ:
- at CAIRO_SURFACE_TYPE_WIN32:
- at CAIRO_SURFACE_TYPE_BEOS:
- at CAIRO_SURFACE_TYPE_DIRECTFB:
- at CAIRO_SURFACE_TYPE_SVG:
- at CAIRO_SURFACE_TYPE_NQUARTZ:
- at CAIRO_SURFACE_TYPE_OS2:
+ at CAIRO_SURFACE_TYPE_IMAGE:
+ at CAIRO_SURFACE_TYPE_PDF:
+ at CAIRO_SURFACE_TYPE_PS:
+ at CAIRO_SURFACE_TYPE_XLIB:
+ at CAIRO_SURFACE_TYPE_XCB:
+ at CAIRO_SURFACE_TYPE_GLITZ:
+ at CAIRO_SURFACE_TYPE_QUARTZ:
+ at CAIRO_SURFACE_TYPE_WIN32:
+ at CAIRO_SURFACE_TYPE_BEOS:
+ at CAIRO_SURFACE_TYPE_DIRECTFB:
+ at CAIRO_SURFACE_TYPE_SVG:
+ at CAIRO_SURFACE_TYPE_NQUARTZ:
+ at CAIRO_SURFACE_TYPE_OS2:
<!-- ##### FUNCTION cairo_surface_get_type ##### -->
<para>
</para>
- at surface:
- at Returns:
+ at surface:
+ at Returns:
diff --git a/doc/public/tmpl/cairo-text.sgml b/doc/public/tmpl/cairo-text.sgml
index 87f626c..3db6bfd 100644
--- a/doc/public/tmpl/cairo-text.sgml
+++ b/doc/public/tmpl/cairo-text.sgml
@@ -22,6 +22,7 @@ Rendering text and sets of glyphs
</para>
+ at index:
@x:
@y:
diff --git a/doc/public/tmpl/cairo-win32-fonts.sgml b/doc/public/tmpl/cairo-win32-fonts.sgml
index ab701c5..bc2aad8 100644
--- a/doc/public/tmpl/cairo-win32-fonts.sgml
+++ b/doc/public/tmpl/cairo-win32-fonts.sgml
@@ -62,3 +62,21 @@ Font support for Microsoft Windows
@Returns:
+<!-- ##### FUNCTION cairo_win32_scaled_font_get_logical_to_device ##### -->
+<para>
+
+</para>
+
+ at scaled_font:
+ at logical_to_device:
+
+
+<!-- ##### FUNCTION cairo_win32_scaled_font_get_device_to_logical ##### -->
+<para>
+
+</para>
+
+ at scaled_font:
+ at device_to_logical:
+
+
diff --git a/doc/public/tmpl/cairo-win32.sgml b/doc/public/tmpl/cairo-win32.sgml
index 91a8d04..4e5dd34 100644
--- a/doc/public/tmpl/cairo-win32.sgml
+++ b/doc/public/tmpl/cairo-win32.sgml
@@ -37,6 +37,18 @@ Microsoft Windows surface support
@Returns:
+<!-- ##### FUNCTION cairo_win32_surface_create_with_ddb ##### -->
+<para>
+
+</para>
+
+ at hdc:
+ at format:
+ at width:
+ at height:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_win32_surface_get_dc ##### -->
<para>
@@ -46,3 +58,12 @@ Microsoft Windows surface support
@Returns:
+<!-- ##### FUNCTION cairo_win32_surface_get_image ##### -->
+<para>
+
+</para>
+
+ at surface:
+ at Returns:
+
+
diff --git a/doc/public/tmpl/cairo.sgml b/doc/public/tmpl/cairo.sgml
index 3dc350e..739f74b 100644
--- a/doc/public/tmpl/cairo.sgml
+++ b/doc/public/tmpl/cairo.sgml
@@ -227,6 +227,27 @@ The cairo drawing context
@offset:
+<!-- ##### FUNCTION cairo_get_dash_count ##### -->
+<para>
+
+</para>
+
+ at cr:
+ at count:
+ at Returns:
+
+
+<!-- ##### FUNCTION cairo_get_dash ##### -->
+<para>
+
+</para>
+
+ at cr:
+ at dashes:
+ at offset:
+ at Returns:
+
+
<!-- ##### ENUM cairo_fill_rule_t ##### -->
<para>
@@ -415,6 +436,18 @@ The cairo drawing context
@cr:
+<!-- ##### FUNCTION cairo_clip_extents ##### -->
+<para>
+
+</para>
+
+ at cr:
+ at x1:
+ at y1:
+ at x2:
+ at y2:
+
+
<!-- ##### FUNCTION cairo_reset_clip ##### -->
<para>
@@ -423,6 +456,42 @@ The cairo drawing context
@cr:
+<!-- ##### STRUCT cairo_rectangle_t ##### -->
+<para>
+
+</para>
+
+ at x:
+ at y:
+ at width:
+ at height:
+
+<!-- ##### STRUCT cairo_rectangle_list_t ##### -->
+<para>
+
+</para>
+
+ at status:
+ at rectangles:
+ at num_rectangles:
+
+<!-- ##### FUNCTION cairo_rectangle_list_destroy ##### -->
+<para>
+
+</para>
+
+ at rectangle_list:
+
+
+<!-- ##### FUNCTION cairo_copy_clip_rectangles ##### -->
+<para>
+
+</para>
+
+ at cr:
+ at Returns:
+
+
<!-- ##### FUNCTION cairo_fill ##### -->
<para>
diff-tree cdd79c104dd940077b1f3193c31272f9a4673bb5 (from 16c7587f2dcab5abbbe62505e64c1ac9441dfb8e)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Fri Dec 8 15:41:52 2006 -0500
[docs] Generate index of new symbols in 1.4
diff --git a/doc/public/cairo-docs.xml b/doc/public/cairo-docs.xml
index fa5a40b..6c82328 100644
--- a/doc/public/cairo-docs.xml
+++ b/doc/public/cairo-docs.xml
@@ -59,5 +59,8 @@
<index role="1.2">
<title>Index of new symbols in 1.2</title>
</index>
+ <index role="1.4">
+ <title>Index of new symbols in 1.4</title>
+ </index>
<xi:include href="language-bindings.xml"/>
</book>
diff-tree 16c7587f2dcab5abbbe62505e64c1ac9441dfb8e (from 6122c30930525c0d672166eab8b05e0951c7b039)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Fri Dec 8 15:40:59 2006 -0500
[slim] Define slim macros to dummy prototypes for non-gcc compilers (#9150)
diff --git a/src/cairoint.h b/src/cairoint.h
index 1f74d62..e996a1c 100755
--- a/src/cairoint.h
+++ b/src/cairoint.h
@@ -89,8 +89,8 @@ CAIRO_BEGIN_DECLS
# define slim_hidden_asmname(name) slim_hidden_asmname1(name)
# define slim_hidden_asmname1(name) slim_hidden_ulp #name
#else
-# define slim_hidden_proto(name)
-# define slim_hidden_def(name)
+# define slim_hidden_proto(name) int _cairo_dummy_prototype(void)
+# define slim_hidden_def(name) int _cairo_dummy_prototype(void)
#endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
diff-tree 6122c30930525c0d672166eab8b05e0951c7b039 (from 734b321aab3df046716a54cfdcefbe42fa6b1a8b)
Author: Behdad Esfahbod <behdad at behdad.org>
Date: Fri Dec 8 15:38:34 2006 -0500
[pixman] Remove unused slim_internal.h
diff --git a/pixman/src/slim_internal.h b/pixman/src/slim_internal.h
deleted file mode 100644
index fc73cc3..0000000
--- a/pixman/src/slim_internal.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/* slim - Shared Library Interface Macros
- *
- * Copyright © 2003 Richard Henderson
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of Richard Henderson
- * not be used in advertising or publicity pertaining to distribution
- * of the software without specific, written prior permission.
- * Richard Henderson makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express
- * or implied warranty.
- *
- * RICHARD HENDERSON DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL RICHARD HENDERSON BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: Richard Henderson <rth at twiddle.net>
- */
-
-#ifndef _SLIM_INTERNAL_H_
-#define _SLIM_INTERNAL_H_ 1
-
-/* This macro marks a symbol as STV_HIDDEN, which prevents it from being
- added to the dynamic symbol table of the shared library. This prevents
- users of the library from knowingly or unknowingly accessing library
- internals that may change in future releases. It also allows the
- compiler to generate slightly more efficient code in some cases.
-
- The macro should be placed either immediately before the return type in
- a function declaration:
-
- pixman_private int
- somefunction(void);
-
- or before the type of a variable,
-
- extern pixman_private int somedata;
-
- The ELF visibility attribute did not exist before gcc 3.3. */
-/* ??? Not marked with "slim" because that makes it look too much
- like the function name instead of just an attribute. */
-
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
-#define pixman_private __attribute__((__visibility__("hidden")))
-#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-#define pixman_private __hidden
-#else /* not gcc >= 3.3 and not Sun Studio >= 8 */
-#define pixman_private
-#endif
-
-/* The following macros are used for PLT bypassing. First of all,
- you need to have the function prototyped somewhere, say in foo.h:
-
- int foo (int __bar);
-
- If calls to foo within libfoo.so should always go to foo defined
- in libfoo.so, then in fooint.h you add:
-
- slim_hidden_proto (foo)
-
- and after the foo function definition:
-
- int foo (int __bar)
- {
- return __bar;
- }
- slim_hidden_def (foo);
-
- This works by arranging for the C symbol "foo" to be renamed to
- "INT_foo" at the assembly level, which is marked pixman_private.
- We then create another symbol at the same address (an alias) with
- the C symbol "EXT_foo", which is renamed to "foo" at the assembly
- level. */
-
-#if __GNUC__ >= 3 && defined(__ELF__)
-# define slim_hidden_proto(name) slim_hidden_proto1(name, slim_hidden_int_name(name))
-# define slim_hidden_def(name) slim_hidden_def1(name, slim_hidden_int_name(name))
-# define slim_hidden_int_name(name) INT_##name
-# define slim_hidden_proto1(name, internal) \
- extern __typeof (name) name \
- __asm__ (slim_hidden_asmname (internal)) \
- pixman_private;
-# define slim_hidden_def1(name, internal) \
- extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name)) \
- __attribute__((__alias__(slim_hidden_asmname(internal))))
-# define slim_hidden_ulp slim_hidden_ulp1(__USER_LABEL_PREFIX__)
-# define slim_hidden_ulp1(x) slim_hidden_ulp2(x)
-# define slim_hidden_ulp2(x) #x
-# define slim_hidden_asmname(name) slim_hidden_asmname1(name)
-# define slim_hidden_asmname1(name) slim_hidden_ulp #name
-#else
-# define slim_hidden_proto(name)
-# define slim_hidden_def(name)
-#endif
-
-#endif /* _SLIM_INTERNAL_H_ */
More information about the cairo-commit
mailing list