diff options
| author | Loïc Minier <lool@dooz.org> | 2009-04-15 00:01:54 +0200 |
|---|---|---|
| committer | Loïc Minier <lool@dooz.org> | 2009-04-15 00:01:54 +0200 |
| commit | 7c8a91c96c3ad403e36f8b131c70b2b7c6f7a5c4 (patch) | |
| tree | 6aafdce4b4ca5e3597ccf0d7bb84119fc650a138 | |
| parent | 26457cd0008a85517fe0ce6ce25fbeb26baed0f7 (diff) | |
Imported Upstream version 1.4.12
155 files changed, 7476 insertions, 10416 deletions
diff --git a/CODING_STYLE b/CODING_STYLE index 2aef41c..73fe2a9 100644 --- a/CODING_STYLE +++ b/CODING_STYLE @@ -243,3 +243,28 @@ The return statement is often the best thing to use in a pattern like this. If it's not available due to additional nesting above which require some cleanup after the current block, then consider splitting the current block into a new function before using goto. + +Memory allocation +----------------- + +Because much of cairo's data consists of dynamically allocated arrays, +it's very easy to introduce integer overflow issues whenever malloc() +is called. Use the _cairo_malloc2(), _cairo_malloc3(), and +_cairo_malloc2_add1 macros to avoid these cases; these macros check +for overflow and will return NULL in that case. + + malloc (n * size) => _cairo_malloc_ab (n, size) + e.g. malloc (num_elts * sizeof(some_type)) => + _cairo_malloc2 (num_elts, sizeof(some_type)) + + malloc (a * b * size) => _cairo_malloc_abc (a, b, size) + e.g. malloc (width * height * 4) => + _cairo_malloc3 (width, height, 4) + + malloc (n * size + k) => _cairo_malloc_ab_plus_c (n, size, k) + e.g. malloc (num * sizeof(entry) + sizeof(header)) => + _cairo_malloc2k (num, sizeof(entry), sizeof(header)) + +In general, be wary of performing any arithmetic operations in an +argument to malloc. You should explicitly check for integer overflow +yourself in any more complex situations.
\ No newline at end of file @@ -1,3 +1,928 @@ +commit 442fa9a106b01f17699397dcc95298071a50fd6d +Author: Carl Worth <cworth@cworth.org> +Date: Mon Nov 26 22:31:32 2007 -0800 + + Increment version to 1.4.12 and 13:6:11 + + configure.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit b28c7a90fce099cc6e8879ba05358f6389948975 +Author: Carl Worth <cworth@cworth.org> +Date: Mon Nov 26 21:52:41 2007 -0800 + + NEWS: Add notes for cairo 1.4.12 + + NEWS | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 55 insertions(+), 0 deletions(-) + +commit 617d3f5738a8e9e6fccbbaa9a314f04383fbfc39 +Author: Carl Worth <cworth@cworth.org> +Date: Tue Nov 20 20:48:47 2007 -0800 + + Mark bitmap-font as XFAIL + + I don't know where the PDF failure is coming from, (it appears + to be using a too-small font in the rotate cairo_show_text + case), but I'm seeing the same behavior in 1.4.10 so this + is not a regression compared to that for the purpose of the + 1.4.12 release. + + test/Makefile.am | 1 + + test/bitmap-font.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletions(-) + +commit bc67e2a37b480e038e8215ae9093561f91090c76 +Author: Carl Worth <cworth@cworth.org> +Date: Tue Nov 20 20:45:42 2007 -0800 + + Update two PS reference images for mysterious single-pixel change + + It seems ft-vertical-layout-type1 and ft-vertical-layout-type3 + change rasterization slightly from time to time, (may be due + to changes in the system installation of ghostscript). + + ...ft-text-vertical-layout-type1-ps-argb32-ref.png | Bin 1877 -> 1879 bytes + ...ft-text-vertical-layout-type3-ps-argb32-ref.png | Bin 1879 -> 1882 bytes + 2 files changed, 0 insertions(+), 0 deletions(-) + +commit 476f888f4e38c63b535a06be77c49c2f4bdad010 +Author: Richard Hult <richard@imendio.com> +Date: Mon Nov 5 10:05:07 2007 +0000 + + [atsui] Use ascent+descent+leading to get the distance between baselines + + The height is currently mapped to the atsui metrics property capHeight, which + is documented as "The height of a capital letter in the font from the baseline + to the top of the letter". + + That doesn't match what height is in cairo, it should be the disctance between + baselines. This patch that fixes that (and makes webkit on GTK+ OS X + layout nicely). + (cherry picked from commit 4270cd3358fabf0d3e6ac4e866099b172082b592) + + src/cairo-atsui-font.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5c2ad5f69db5c685a3d5d9feeefb911df560bca3 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Nov 5 10:05:04 2007 +0000 + + [configure.in] fix atsui experimental warning + + The 'experimental' warning for atsui was appearing + for --enable-quartz not --enable-atsui as it should. + (cherry picked from commit 3141b21c0c581dabc09a6ec9cdf0a071701b0e42) + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e9de14eb4d841071c15e8aea7bc5d463ceb59622 +Author: Keith Packard <keithp@koto.keithp.com> +Date: Tue Oct 30 22:00:59 2007 -0700 + + Force non-AA text when using a bitmap strike with only scaling transform. + + When the current font size matches one of the available fixed sizes, and + the overall transform has only scaling components, FreeType will use the + fixed size bitmaps by default. For glyphs which do not have bitmaps, + force them to be rendered in monochrome instead of anti-aliased so + that they all match nicely. + (cherry picked from commit 06af5c2891b89da28581c30afcde06c5442884db) + + src/cairo-ft-font.c | 24 ++++++++++++++++++++++++ + 1 files changed, 24 insertions(+), 0 deletions(-) + +commit 19e29dfb80ee06b4a4a187ba40e2e0c6ecf0dab2 +Author: Carl Worth <cworth@cworth.org> +Date: Tue Oct 30 17:09:56 2007 -0700 + + Fix degenerate-pen test case by removing the triggering assertion + + Instead we choose either the first or last pen vertex as + appropriate. + + This makes the degenerate-pen pass stop failing on an + assertion, and passes for most backends. It's still failing + for the PDF backend, but that looks like a new, PDF-specific + bug. + (cherry picked from commit 448c9314252bba779194d2b01950b8738b26fd13) + + src/cairo-pen.c | 16 +++++++++++++++- + 1 files changed, 15 insertions(+), 1 deletions(-) + +commit efcaee8f838177c1d1766e48aaa5dbf8cb9cf1d8 +Author: Carl Worth <cworth@cworth.org> +Date: Mon Oct 29 17:55:28 2007 -0700 + + Limit miters for small angles + + This fixes the current failure get-path-extents, which is a + demonstration of the following bug: + + cairo_stroke_extents() gives wrong result for arcs in some cases + https://bugs.freedesktop.org/show_bug.cgi?id=7245 + + Many thanks to Michael Urman whose review of early versions of + this work found a fatal mistake in my algebra. + (cherry picked from commit 00d701ff7de68609aa8cec7871d93b27a108fd14) + + src/cairo-path-stroke.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++- + 1 files changed, 75 insertions(+), 1 deletions(-) + +commit b7baef143316566fee1478bfeb109141c805e79f +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Tue Oct 30 11:13:44 2007 +0000 + + [cairo-surface] Fix typo in doc. + + s/INVALUE_FORMAT/INVALID_FORMAT/ + (cherry picked from commit 0d42af2427d1de27845cb8a6b3d290a562c28fc6) + + src/cairo-surface.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 7c70113149a25e2b0278a5e7ca9bbc330dc66e8a +Author: Carl Worth <cworth@cworth.org> +Date: Fri Oct 26 22:58:57 2007 -0700 + + Fix typo in _cairo_gstate_fini + + Obrigado a Luiz Americo Pereira Camara <luizmed@oi.com.br> + (cherry picked from commit a69d4731300b430b802222d317698c313c75a31a) + + src/cairo-gstate.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 0ec9e1b4fa06ea456fe596f423aad12be5ec5e1a +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sat Oct 20 23:41:46 2007 +0100 + + [quartz] return status instead of CGPatternRef + + Returning status improves error handling, since + returning NULL doesn't let us distinguish different + types of error. + (cherry picked from commit 8f6abdbc26ee15451b5a386610f7d5a7a9114d63) + + src/cairo-quartz-surface.c | 20 +++++++++++--------- + 1 files changed, 11 insertions(+), 9 deletions(-) + +commit a83e5462533f54d0c0105300b1e8687d120b8686 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sat Oct 20 23:41:32 2007 +0100 + + [quartz] return status instead of cairo_quartz_surface_t + + Returning status improves error handling, since + returning NULL doesn't let us distinguish different + types of error. + (cherry picked from commit cfb26fdf0f490b4902106b50d02628cffd53a0eb) + + src/cairo-quartz-surface.c | 26 ++++++++++++++------------ + 1 files changed, 14 insertions(+), 12 deletions(-) + +commit 0951d2a9ab22f7fe7839629a8a02057536c75c45 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sat Oct 20 22:45:30 2007 +0100 + + [quartz] return status instead of CGShadingRef + + Returning status improves error handling, since + returning NULL doesn't let us distinguish different + types of error. Suggested by Chris Wilson. + (cherry picked from commit dec3099585eeb184ed51b5c720eb891314d7ea51) + + src/cairo-quartz-surface.c | 30 ++++++++++++++++-------------- + 1 files changed, 16 insertions(+), 14 deletions(-) + +commit 044de7fa7aa0da19ead348094697b2227e882417 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sun Jun 24 23:53:47 2007 +0100 + + fix dash-zero-length test + + Quartz was failing the dash-zero-length test for odd numbers + of dashes; it seems cairo wants 3 dashes to be on-off-on, + off-on-off, wheras quartz uses on-off-on, on-off-on. Fixed + by doubling the number of dashes used. + (cherry picked from commit b9c065df74027b06e15e105fee5e4a4d350e0abf) + + src/cairo-quartz-surface.c | 16 +++++++++++----- + 1 files changed, 11 insertions(+), 5 deletions(-) + +commit 5a3aa313d4a96944bd9feaea77b8457d7e4e9499 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sun Jun 24 01:17:58 2007 +0100 + + Implement EXTEND_NONE for gradients. + + Fixes linear and radial gradients, which were displaying with + extend_pad when extend_none was requested. Makes the + radial-gradient test pass. + (cherry picked from commit f334ee0397963e12c9efcb2690792aac83734661) + + src/cairo-quartz-surface.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +commit 977ba306f90618a20fda16b16229c664bad15112 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sat Jun 23 23:36:32 2007 +0100 + + call _cairo_error on failure + + Call _cairo_error to enable setting a breakpoint on quartz errors. + (cherry picked from commit 0eeec372c0e7849d81bde8c8c5bf491919f51a6e) + + src/cairo-quartz-surface.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 4fdc3a69fdb17acf6a394d12351b19cd61e17516 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sat Jun 23 12:34:24 2007 +0100 + + do not return a cairo_status_t of UNSUPPORTED + + We had a bug which converted cairo_int_status_t to cairo_status_t, + causing an assertion; reported at http://developer.imendio.com/node/128. + Return the generic out of memory error instead. + (cherry picked from commit 8c8ec63903f8ad67a88394eff1359607bb93cf88) + + src/cairo-quartz-surface.c | 15 ++++++++++++--- + 1 files changed, 12 insertions(+), 3 deletions(-) + +commit 6e4ff01d0ba40576943c76da638fe0026baab62b +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Jun 18 00:07:33 2007 +0100 + + do not ignore errors, return NULL instead (moz#874315) + + In the quartz backend there are occasional errors where returning NULL + can be used to signal that an error has occured. + + Mozilla bug #874315. + (cherry picked from commit 6fec51990e90901ebafbb872a9e618cb70d17911) + + src/cairo-quartz-surface.c | 37 ++++++++++++++++++++++++++++--------- + 1 files changed, 28 insertions(+), 9 deletions(-) + +commit ca132774c463f75b11b297c5b2b034ee669115ac +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Jun 18 00:07:33 2007 +0100 + + do not ignore errors in setup_source + + In setup_source we were ignoring a return value, but we can't relay + it to the caller. This patch treats the error as an unsupported + operation. + (cherry picked from commit 07fd091e3e6b925c588b9a16f6f10efcd46615c2) + + src/cairo-quartz-surface.c | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit f27164c89910430385d21fc8904cedd884f21894 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Tue Jun 19 21:13:39 2007 +0100 + + do not ignore errors when creating styles. + + This fixes statuses being ignored when calling + CreateSizedCopyOfStyle. As a side effect, it cleans up + two other bugs - the font object was sometimes not + freed, and a the scaled font mutex was aquired recursively, + causing a hang in the invalid-matrix test. + (cherry picked from commit b6b9cef7136453f97543173bcb2ade46b1c46b77) + + src/cairo-atsui-font.c | 37 ++++++++++++++++++++++++++----------- + 1 files changed, 26 insertions(+), 11 deletions(-) + +commit c00bf48648e27b4bed66edb5054cc6a8545bb2f4 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Jun 18 00:07:33 2007 +0100 + + do not ignore ATSUI errors. + + This fixes multiple instances where the return value of an ATSUI + call was ignored and converts them into CAIRO_STATUS_NO_MEMORY. + As a side effect it fixes a utf8 array not being freed. + (cherry picked from commit 4885a12c6863321a566e7103bf6dccdd5d13a986) + + src/cairo-atsui-font.c | 83 +++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 76 insertions(+), 7 deletions(-) + +commit 23b6c2fe9d8223f6b389dff49f99b5ae86706032 +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Mon Jun 18 00:07:33 2007 +0100 + + do not ignore errors in glyph paths + + When interpreting glyph paths in ATSUI callbacks we were ignoring + the cairo status. We need to return this to the caller. In order + to do this we introduce a custom OSStatus code in the range that + Apple reccommend. + (cherry picked from commit b498c928be73635614596243d17a922e9d5ff008) + + src/cairo-atsui-font.c | 30 ++++++++++++++++++++++++------ + 1 files changed, 24 insertions(+), 6 deletions(-) + +commit b7af909c8247642d2ec4dd0b96f20348be6e971a +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Fri Oct 19 22:45:15 2007 +0100 + + [cairo-xlib] Check source for XRender support. + + Do not rely on the assumption that if the destination has render support + then the source has it as well - breaks when the boilerplate disables + render support for a surface. + + Similarly do not set the XRender attributes on the source surface + unless it actually has a xrender_format. + (cherry picked from commit 3211d810d31a6607c8d78a50f577a8ca8eb705e6) + + src/cairo-xlib-surface.c | 17 +++++++++-------- + 1 files changed, 9 insertions(+), 8 deletions(-) + +commit a81ff21d53caa436732a479c2b91c4f3dfe35c93 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Fri Oct 19 15:02:03 2007 -0400 + + [cairo-xlib] Release glyph surfaces if we made them to be generated + + The reasoning is that right now, applications render glyphs to images, + upload it to the X server, and keep a local copy in the cache. The X + server works hard to reuse glyph renderings, by hashing glyph images and + reusing them. So we are wasting memory in cairo apps that don't use the + glyph surface after uploading to the server, which is the case if you + don't use the glyph in an image surface. The patch does not release the + glyph surface if it already existed in the cache, so, worst case + scenario is that we render the glyph twice, if you first use it with + xlib, then with image surface. That effect should be negligible. + (cherry picked from commit 76e3b3cdc3dda986d420637cfc2445aca481a863) + + src/cairo-xlib-surface.c | 83 +++++++++++++++++++++++++++++++++++----------- + 1 files changed, 63 insertions(+), 20 deletions(-) + +commit c1464e04c4ae41cb8b353c5a0d18bd5e23ceef39 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Oct 18 20:07:12 2007 +0100 + + [cairo-xlib-surface] Match content to xrender_format using the channel masks. + + _xrender_format_to_content() was using the channel offset to determine + whether the format supported a content type. + For example, the XRenderPictFormat for the A8 format looks like: + direct.alpha = 0; direct.alphaMask = 0xff; + direct.red = 0; direct.redMask = 0x00; + direct.green = 0; direct.greenMask = 0x00; + direct.blue = 0; direct.blueMask = 0x00; + which _xrender_format_to_content() matched as CAIRO_CONTENT_COLOR. + + Switch to using the channel masks for deducing content type. + (cherry picked from commit 8ae778273799ee9f6d3c13e9c41730daeda2c743) + + src/cairo-xlib-surface.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 2e76f8b617dfad13e16a8bad70db9ff2f8e43db4 +Author: Chris Heath <chris@heathens.co.nz> +Date: Mon Oct 15 17:31:50 2007 -0400 + + [autogen.sh] Tolerate tput failure (#12757) + (cherry picked from commit 189feaf352f59b0a049202552024578715ef8cc7) + + autogen.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 198dc3573f2a80accd1ba0c188ea5378f5f99bc5 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Tue Oct 2 10:54:44 2007 -0700 + + [win32] return a nil surface, not NULL + + Missed an error return + (cherry picked from commit c99d33b10e84883ade1402c3c1d1efdb4b46f66e) + + src/cairo-win32-surface.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit bf67f28746044b6d5a712921c617ba52d31d33e3 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Tue Oct 2 10:48:59 2007 -0700 + + [win32] report error correctly if CreateCompatibleBitmap fails + + These errors were being dropped on the floor, leading to + rendering errors in out of video memory conditions. + (cherry picked from commit 4dbf495515d6de933de7f567b935c5fdceed5f6f) + + src/cairo-win32-surface.c | 20 +++++++++++++++++++- + 1 files changed, 19 insertions(+), 1 deletions(-) + +commit 0368f0d2081b58feea0489e0d29ad413dca6a007 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Tue Oct 9 15:54:58 2007 -0400 + + [ChangeLog.mk] Fix changelog generation rules + + Previously it was trying to get logs of 1.2.0..1.4 while I really meant + was 1.2.0..1.4.0. It was a simple typo. + (cherry picked from commit b12ed375cf7ad02a30324616e121a1e9ab8998cb) + + ChangeLog.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 03906e1d81b1adace7e5a4668fb449a487812d70 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Oct 4 16:04:49 2007 +0100 + + [cairo-scaled-font] Acquire mutex around _cairo_scaled_font_glyph_path(). + + All calls that manipulate the scaled_font->cache must hold its mutex. + (cherry picked from commit 6e93941a7605a3958269de195dc16f255dda7bfd) + + src/cairo-gstate.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit 886bd8ee9b594478522ebf315f5bc809d837509f +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Oct 4 09:08:46 2007 +0100 + + [cairo-path] Check for an empty path in cairo_append_path(). + + As we now generate empty paths, we must be able to handle empty paths + in the user facing API. cairo_append_path() has an explicit check, and + raises an error, for a NULL path->data, so we need to check the + path->num_data first for empty paths. + (cherry picked from commit ef5f460eb1f86a73e016c1150723ae1e70b3b037) + + src/cairo.c | 3 +++ + test/copy-path.c | 15 +++++++++++++++ + 2 files changed, 18 insertions(+), 0 deletions(-) + +commit 3454ef0984299d19e79ceb705a84c4a706704e29 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Oct 3 23:25:10 2007 +0100 + + [malloc] Take advantage of calloc() argument checking. + + calloc() will check its arguments for integer overflows so it is safer + not to pre-multiply them. + (cherry picked from commit 66664596559c55913fb0b9c8784fe8ab862c217b) + + src/cairo-ft-font.c | 4 ++-- + src/cairo-glitz-surface.c | 2 +- + src/cairo-image-surface.c | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +commit a5b74da68bcebaecaa4cbb252bc15b6bec32f847 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Oct 3 23:19:10 2007 +0100 + + [malloc] Check for integer overflow when realloc'ing. + + Perform similar sanity checks to Vlad's _cairo_malloc_ab() but on the + arguments to realloc instead. + (cherry picked from commit e49bcde27f88e21d5b8037a0089a226096f6514b) + + src/cairo-array.c | 4 ++-- + src/cairo-lzw.c | 6 +++++- + src/cairo-malloc-private.h | 30 ++++++++++++++++++++++++++---- + src/cairo-path-stroke.c | 3 ++- + src/cairo-pattern.c | 4 +++- + src/cairo-pen.c | 3 ++- + src/cairo-polygon.c | 3 ++- + src/cairo-spline.c | 3 ++- + src/cairo-traps.c | 3 ++- + 9 files changed, 46 insertions(+), 13 deletions(-) + +commit 96d0c44ac859727315fc31cadeafdf5bb1b770b8 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Mon Oct 1 17:59:57 2007 +0100 + + [cairo-path] Don't raise an error when attempting to create an empty path. + + Generate a real empty path structure instead of returning + _cairo_path_nil, if we have been asked to create an empty path. + + (Also add a couple of missing _cairo_error()s and an appropriate test + case.) + + Spotted by Fred Kiefer. + (cherry picked from commit b4f86638cc4b87bfaf10568ae9beb89626e26613) + + src/cairo-path.c | 36 ++++++++++++++++++++++++------------ + test/copy-path.c | 17 +++++++++++++++++ + 2 files changed, 41 insertions(+), 12 deletions(-) + +commit fb62103c7bff66761780ecae6c501ceab3f64c38 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sat Sep 29 07:55:48 2007 +0930 + + CFF Subetting: Fix for #10849 + + This fixes the problem Apple Preview has with viewing PDFs with CFF + font subsets. + (cherry picked from commit 042c382c094d1ea6f9a5a162d4d1d9ac83413233) + + src/cairo-cff-subset.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 9457131f8bf9ffe2a4a9178c049d02876f719671 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Sun Sep 23 11:37:02 2007 +0930 + + Truetype Subsetting: Avoid failing when fonts are missing optional tables + + Previously, the TrueType subsetting would fail if any of the "cvt", + "fpgm", or "prep" tables were missing from the source font. However + these tables are optional and not required in the subsetted font if + they do not appear in the source font. + + The "name" table has been removed from the subsetted font as the + Type42 specification does not require this table. + (cherry picked from commit b20e08999e2f6e7a72ee75a7c3fd865bf0368794) + + src/cairo-truetype-subset.c | 153 +++++++++++++++++++++++++++++++------------ + 1 files changed, 110 insertions(+), 43 deletions(-) + +commit 4e2a11e0f10702abd5c5144410530e10d1e20a5d +Author: Brian Ewins <Brian.Ewins@gmail.com> +Date: Sun Sep 23 02:52:01 2007 +0100 + + [type1-subset] only subset ft fonts + + If atsui and ft were both enabled, the code crashed trying to subset + type-1 fonts; fixed by checking if fonts really are ft before using + them as ft fonts. This is a temporary fix until we support subsetting + across all font backends. + (cherry picked from commit 8132b8b417c75388ce4c4671fffddaa44a5d1be0) + + src/cairo-type1-subset.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit d672c26396f6bde7a771beb5d35b3b786c4574b4 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Fri Sep 21 11:02:42 2007 -0700 + + Avoid divide-by-zero when trying to allocate a 0-sized array + + Fix up the _cairo_malloc_* wrappers to avoid blindly dividing by zero; + any attempt to allocate a zero-sized chunk of memory will result in + NULL. + (cherry picked from commit 6020f67f1a49cfe3844c4938d4af24c63c8424cc) + + src/cairo-malloc-private.h | 35 +++++++++++++++++++++++++---------- + 1 files changed, 25 insertions(+), 10 deletions(-) + +commit d5bdb91809bd69e6ed3068d1dc79aac669780e0b +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Wed Aug 29 16:30:49 2007 -0700 + + Make NO_MUTEX really mean no mutexes + (cherry picked from commit e3c16e15e39d98f96e2ce20e397d88214f5a821e) + + src/cairo-mutex-type-private.h | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 1ea1fadf7ec53fcd27b8ed8acd655d913e72e091 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Sep 12 17:45:11 2007 -0400 + + [cairo-ft-font] Ignore FT_Load_Glyph errors other than out-of-memory + Same for FT_Render_Glyph. + + When the user asks us to render a glyph that is not available in the font, + it's mostly an unavoidable kind of error for them, as in, they can't + avoid such a call. So it's not nice to put cairo_t in an error state and + refuse any further drawying. + + Many PDF files are created using buggy software and cause such glpyh-not-found + errors for CID 0 for example. + + Eventually we should propagate these kind of errors up and return it from + the function call causing it, but that needs API change to add return value + to all text functions, so for now we just ignore these errors. + (cherry picked from commit 79d975f84bcc32e91db517d71a7312e2e1d653d4) + + src/cairo-ft-font.c | 14 +++++++++----- + 1 files changed, 9 insertions(+), 5 deletions(-) + +commit 57bc62a61e6f2dd36c5680d3f486791a968f33ac +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Mon Sep 17 16:41:52 2007 -0400 + + =?utf-8?q?[ChangeLog.mk]=20Make=20make=20rule=20depend=20on=20.git/HEAD,=20not=20.git + + =20That=20is=20exactly=20what=20we=20want.=20=20Kristian=20H=C3=B8gsberg=20suggested=20it. + =20(cherry=20picked=20from=20commit=2021ab44f11d3d20eead5d988c7a6cf48eebff08c7)?= + MIME-Version: 1.0 + Content-Type: text/plain; charset=utf-8 + Content-Transfer-Encoding: 8bit + + ChangeLog.mk | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 709292419564ad14025b8b718324d79dd1b7255a +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Wed Sep 5 08:07:41 2007 +0100 + + [cairo-ft-font] Early detection of a zero sized bitmap. + + Under rare circumstances we may need to extract a surface that + represents a bitmap with width==0 and rows==0. Detect this case at the + start and simply return a zero-sized surface. + + Fixes https://bugs.freedesktop.org/show_bug.cgi?id=12284. + (cherry picked from commit d62f8861689d8b9a9a837043fb78813f0407abd4) + + src/cairo-ft-font.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit 9b0a093547aa4b51381baeafd7fcc3029fb140d2 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Sep 5 22:53:43 2007 +0930 + + Create meta-surface source image with same content type as the + meta-surface + (cherry picked from commit 1e21220f0e2540e3befa66e4764f75589d0eef82) + + src/cairo-meta-surface.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit fce1a3fdd412128bad9efa75f3565d73e9355e99 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Wed Sep 5 22:51:13 2007 +0930 + + Eliminate unclipped CLEAR from meta-surface playback + + The optimization that avoids replaying commands prior to an unclipped + CLEAR operation now starts playback from the first command after the + CLEAR. This avoids the need to handle the unclipped CLEAR in the PDF + surface. + (cherry picked from commit 875e32178e5d990a09f3c41262d890888035f04f) + + src/cairo-meta-surface.c | 12 ++++++------ + 1 files changed, 6 insertions(+), 6 deletions(-) + +commit 11d83334ceb063d4b771f6ea47002985d844e244 +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Sep 5 00:26:56 2007 -0400 + + [configure.in] Fix non-pkgconfig Xrender detection path (#4724) + (cherry picked from commit b85032584b32af968dc8d8a0fcfc9f3e1d2770a0) + + configure.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit c92dae41445303a4f109dc8a1f69e54b6ca958b7 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Tue Aug 28 23:40:18 2007 +0930 + + Fix PDF gradients bug + + The PDF surface was adding extra stops at the 0.0 and 1.0 offset when + there was not already stops at these offsets. This has been replaced + with code to move the coordinates of the linear gradient line in to + the position of the first and last offset. + (cherry picked from commit 3216275fd9a9cd8d51b1c3a8671393912d50d899) + + src/cairo-pdf-surface.c | 63 ++++++++++++++++++++++++++++++---------------- + 1 files changed, 41 insertions(+), 22 deletions(-) + +commit 66add99fb643b1d23642f3115e410c7570702dbb +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Wed Aug 29 12:52:00 2007 -0700 + + [win32] call scaled_font_fini in create before returning NULL + (cherry picked from commit bdc70d1fc2a31aa829571244c54f98210e97a2cf) + + src/cairo-win32-font.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) + +commit 003dc9edabcf181884c3c2cf00c8f81ea9996f4b +Author: Behdad Esfahbod <behdad@behdad.org> +Date: Wed Aug 29 12:18:16 2007 -0400 + + [configure.in] Make PS backend require zlib too (#12210) + + The PS backend uses zlib these days. Make it depend on zlib being available + like PDF has been doing. + (cherry picked from commit 114b07881e8b09f97394dd4fe8f2900ee9f4c348) + + configure.in | 6 +++++- + 1 files changed, 5 insertions(+), 1 deletions(-) + +commit e544c75f6acf64449d63c2e6bbff70556899317d +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Tue Aug 28 16:47:24 2007 -0700 + + Fix previous create_similar fallback patch + + We can't use composite, as some backends don't implement it. + Use paint() instead. + (cherry picked from commit 93aee43690c329f43be9e7b840851267ceb17956) + + src/cairo-pattern.c | 32 ------------------------ + src/cairo-surface-fallback.c | 28 ++++++++++++--------- + src/cairo-surface.c | 55 ++++++++++++++++++++++------------------- + 3 files changed, 45 insertions(+), 70 deletions(-) + +commit 23278efcdb8ef9307fadccf876819b747d999958 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Tue Aug 28 10:47:52 2007 -0700 + + [win32] call free() and not scaled_font_destroy() if scaled init fails + + If scaled_font_destroy() is called, a deadlock can result; there's no + reason to call destroy since the initialization failed (and, indeed, + it might not be valid to do so anyway). + (cherry picked from commit 6525d4debb6df67126b04609bb04d23d9c9bd7a6) + + src/cairo-win32-font.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1432c9232f5cf6906240fef07968b108bd0a3ef9 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Mon Aug 27 16:30:52 2007 -0700 + + Implement fallback for clone_similar + (cherry picked from commit 69dae7ee4ace8a92226140ce5ccb690e7f62e35c) + + src/cairo-surface-fallback-private.h | 10 ++++++++ + src/cairo-surface-fallback.c | 41 ++++++++++++++++++++++++++++++++++ + src/cairo-surface.c | 6 ++++- + 3 files changed, 56 insertions(+), 1 deletions(-) + +commit ce3744f79678f6949af736e40d0d4462da007908 +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Mon Aug 27 14:26:19 2007 -0700 + + [win32] check correct surface for BitBlt support in get_subimage + (cherry picked from commit f4a8633fce5262c09b323eef212fd6efe57d8f10) + + src/cairo-win32-surface.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit c8aff910c417e09d774780ca91877e8b9e409b71 +Author: Carl Worth <cworth@cworth.org> +Date: Tue Aug 21 10:03:00 2007 -0700 + + Ensure the Render extension is initialized before calling XESetCloseDisplay + + This avoids a potential crash from the Render extension being cleaned + up during XCloseDisplay before the cairo CloseDisplay hook goes on to + call into XRenderFreePicture. + (cherry picked from commit 9f4e6436496fe561aa124bb2b89e1c6711684d98) + + src/cairo-xlib-display.c | 9 +++++++++ + 1 files changed, 9 insertions(+), 0 deletions(-) + +commit 578e38eaa794130de1e57b80b60a9bf2e964e9c5 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Aug 16 12:21:49 2007 +0100 + + [cairo-ft-font] Decrement lock count on error. + + As noted in http://bugs.freedesktop.org/show_bug.cgi?id=12026 the error + path of _cairo_ft_unscaled_font_lock_face() failed to reset the + unscaled->lock_count before releasing the mutex and returning NULL. + (cherry picked from commit bc635da45a32eb9b7aff6fa5f7f560ebf99092a8) + + src/cairo-ft-font.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit 849f402b85a2ee7750b8eb767d6722a2489a8b74 +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Fri Aug 10 20:10:29 2007 +0930 + + PDF: Fix regression in pdf_surface_set_size() + (cherry picked from commit 8881265cca73790a49068b3bab5362cb73f8deb6) + + src/cairo-pdf-surface.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +commit afda1179721b96e7786260e613a66ffea783ab9b +Author: Carl Worth <cworth@cworth.org> +Date: Mon Aug 6 11:06:47 2007 -0700 + + Ensure that a copied pattern gets its own user_data array + + This fixes the bug reported here: + + Segfault with cairo_pattern_set_user_data + https://bugs.freedesktop.org/show_bug.cgi?id=11855 + (cherry picked from commit 13cae8b5e6d3fc93c4eb1853b91ba356b572b551) + + src/cairo-pattern.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit a76f8653d6877134a1d3acbb0fcb4f68ebfbcb8f +Author: Adrian Johnson <ajohnson@redneon.com> +Date: Thu Aug 2 21:25:46 2007 +0930 + + CFF Subsetting: fix integer encoding bug + + Bug report at https://bugzilla.mozilla.org/show_bug.cgi?id=368668 + (cherry picked from commit f52aa4c13e91339e575ca2c52c9e3a1f4d95b106) + + src/cairo-cff-subset.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 553d8a9319cdb2f6d9378b5fb304f0e4c2e81f25 +Author: Chris Wilson <chris@chris-wilson.co.uk> +Date: Thu Oct 11 17:54:55 2007 +0100 + + [Makefile.am] Add missing headers and reference images. + + Andrew Jorgensen spotted that make dist was missing a few headers needed + for compilation and running make distcheck had spurious failures. Add + the missing files to the distribution and a silly one-liner to check for + missing reference images. + (cherry picked from commit e5b01e67975578797b4f7875a9ba02121ff935b5) + + [With some edits after cherry-picking to elide files that don't exist + in the 1.4 branch.] + + src/Makefile.am | 1 + + test/Makefile.am | 9 ++++++++- + 2 files changed, 9 insertions(+), 1 deletions(-) + +commit 33b1e9ad8bd560e8a0119b2fc0b38bc4d9b03f8f +Author: Carl Worth <cworth@cworth.org> +Date: Wed Nov 21 10:43:21 2007 -0800 + + Add missing definition of INT32_MAX + + Some win32 builds were broken without this. + + pixman/src/pixman.h | 13 ++++++++++++- + 1 files changed, 12 insertions(+), 1 deletions(-) + +commit 1786c05f6e4fb86ccf0360b6c5ed54ec0e2c1baa +Author: Vladimir Vukicevic <vladimir@pobox.com> +Date: Tue Jun 19 13:15:21 2007 -0700 + + [fix] Avoid int overflow when allocating large buffers + + This patch introduces three macros: _cairo_malloc_ab, + _cairo_malloc_abc, _cairo_malloc_ab_plus_c and replaces various calls + to malloc(a*b), malloc(a*b*c), and malloc(a*b+c) with them. The macros + return NULL if int overflow would occur during the allocation. See + CODING_STYLE for more information. + (cherry picked from commit 5c7d2d14d78e4dfb1ef6d2c40f0910f177e07360) + + CODING_STYLE | 25 +++++++++ + pixman/src/fbcompose.c | 4 +- + pixman/src/icimage.c | 8 ++-- + pixman/src/pixman.h | 7 +++ + pixman/src/pixmanint.h | 17 ++++++ + pixman/src/pixregion.c | 59 ++++++++++++++++++---- + pixman/src/pixregionint.h | 1 - + src/cairo-atsui-font.c | 2 +- + src/cairo-bentley-ottmann.c | 6 +- + src/cairo-beos-surface.cpp | 4 +- + src/cairo-clip.c | 10 +++- + src/cairo-directfb-surface.c | 2 +- + src/cairo-ft-font.c | 4 +- + src/cairo-glitz-surface.c | 34 +++++++++++-- + src/cairo-gstate.c | 6 +- + src/cairo-hull.c | 2 +- + src/cairo-malloc-private.h | 104 +++++++++++++++++++++++++++++++++++++++ + src/cairo-meta-surface.c | 4 +- + src/cairo-os2-surface.c | 9 ++-- + src/cairo-path.c | 2 +- + src/cairo-pattern.c | 6 +- + src/cairo-pdf-surface.c | 6 +- + src/cairo-pen.c | 4 +- + src/cairo-png.c | 6 +- + src/cairo-polygon.c | 2 +- + src/cairo-ps-surface.c | 4 +- + src/cairo-quartz-surface.c | 8 ++-- + src/cairo-scaled-font-subsets.c | 4 +- + src/cairo-scaled-font.c | 2 +- + src/cairo-spline.c | 2 +- + src/cairo-stroke-style.c | 2 +- + src/cairo-surface-fallback.c | 4 +- + src/cairo-surface.c | 2 +- + src/cairo-svg-surface.c | 2 +- + src/cairo-traps.c | 2 +- + src/cairo-unicode.c | 4 +- + src/cairo-win32-font.c | 6 +- + src/cairo-win32-surface.c | 6 +- + src/cairo-xcb-surface.c | 8 ++-- + src/cairo-xlib-surface.c | 6 +- + src/cairoint.h | 1 + + 41 files changed, 308 insertions(+), 89 deletions(-) + +commit cf0e1b8e8917224a5d546109685efacb9529e5b8 +Author: Carl Worth <cworth@cworth.org> +Date: Tue Nov 20 19:41:31 2007 -0800 + + Update version to 1.4.11 after the 1.4.10 release + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 107a74885a25e585b467c7841c6929a12aa62565 Author: Carl Worth <cworth@cworth.org> Date: Wed Jun 27 14:05:56 2007 -0700 diff --git a/ChangeLog.mk b/ChangeLog.mk index 99f5ed6..1158fb2 100644 --- a/ChangeLog.mk +++ b/ChangeLog.mk @@ -51,7 +51,7 @@ $(srcdir)/ChangeLog: DISTCLEANFILES += ChangeLog.cache-* -ChangeLog.cache-*..: .git +ChangeLog.cache-*..: .git/HEAD ChangeLog%: $(srcdir)/ChangeLog% @@ -66,7 +66,7 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%: to=$$version; \ test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \ from=$(PREV_CHANGELOG_VERSION); \ - test "x$$to" = x || version=$$version.0; \ + test "x$$to" = x || to=$$to.0; \ test "x$$from" = xinitial || from=$$from.0; \ spec=$$from..$$to; \ fi; \ diff --git a/ChangeLog.pre-1.0 b/ChangeLog.pre-1.0 index 9f0a0d5..04b4050 100644 --- a/ChangeLog.pre-1.0 +++ b/ChangeLog.pre-1.0 @@ -1,1175 +1,3 @@ -commit 71e9372bbdc5c85e14dfc1156269ae6f74802f4d -Author: Carl Worth <cworth@cworth.org> -Date: Wed Jul 26 13:04:25 2006 -0700 - - Fix text disappearing after space (bug #6617) - - What happened here is that when fixing bug #5734 we cahnged the - glyph image cache lookup to never return a NULL pointer, but to - instead return a 0x0 image surface. We didn't also update code - that was looking for a NULL pointer here, and as such we were - calling XRenderAddGlyphs with a 0x0 image which apparently - tickles a bug in some X servers. - - src/cairo-xlib-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e94251861565ed154e15ca3a7198ffe3828536fe -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 15:17:26 2006 -0500 - - Clarify that git tag -s does GPG signing. - - RELEASING | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 98facc6c2d0f57f05de7b98c2aaa592c895d1a09 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 14:19:08 2006 -0500 - - Add a release-publish-message target to only get the message. - - Makefile.am | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 75b0ab0d66c4065c6cd6cd9b1ccddffd7c581dee -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 14:18:40 2006 -0500 - - Increment version to 1.0.5 after release. - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8c188e45eed41a2a2ee38cdbce834ba139190eda -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 14:04:00 2006 -0500 - - Cairo-1.0.4 released. - Increment CAIRO_VERSION to 1.0.4 and libtool versioning to 4:4:2. - Add notes for the 1.0.4 release. - - NEWS | 11 +++++++++++ - configure.in | 4 ++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -commit d3ff5228a205ffb29e85907830d5fc72e2ef5358 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 14:02:14 2006 -0500 - - WIN32: Define SHADEBLENDCAPS and SB_NONE if they are not defined. (from Tor Lillqvist) - - src/cairo-win32-private.h | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit b3886d1968fdffb52a805952790ef25391be3e99 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 12:16:59 2006 -0500 - - Add CAIRO_TEST_TARGET environment variable for limiting backends to test. - - test/cairo-test.c | 44 +++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 39 insertions(+), 5 deletions(-) - -commit ba5b30117b076193f5f113be468eec0d951fd919 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Feb 27 17:07:22 2006 -0800 - - Remove unused RCS $Id:$ tags. - (cherry picked from f2245a7932b857ff70dc0476490090d906ae61f8 commit) - - src/cairo-wideint.c | 3 +-- - src/cairo-wideint.h | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit 9acc981e440bdf370aee25cc5ea2b836db0886b1 -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Fri Feb 17 23:37:54 2006 -0800 - - Win32: Handle BitBlt in get_image failure and AlphaBlend not being supported - - If the BitBlt in get_image fails, we pretty much can't do anything -- so - fill the destination with white and hope for the best. This enables - somewhat accurate printing of complex operations. Also, check the - destination device caps before calling AlphaBlend; return UNSUPPORTED if - the destination DC can't do AlphaBlend. - (cherry picked from 9831de538e347a624af5b0ca38242b198b64bd45 commit) - (cherry picked from 1a1441912604c89e2912ec764fe26b7a9db995a3 commit) - - src/cairo-win32-surface.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -commit ec4b006c162292ea3b2719dc18a4a3bd40a971ab -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Fri Feb 17 23:34:51 2006 -0800 - - Win32: Set surface format based on device caps - - If the DC is a display DC, inspect its depth and set out local format - appropriately. If it's not a display DC, assume RGB24. - (cherry picked from 6dd0a70d271f93df95f4bcaff5073b9bf90cecb6 commit) - (cherry picked from 2d784815ffac1ca8c10dac12525f2e8d0b412c1a commit) - - src/cairo-win32-surface.c | 27 +++++++++++++++++++++++++-- - 1 files changed, 25 insertions(+), 2 deletions(-) - -commit d7b280a3add4ec84670e56a85b2a256225b21d0d -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Fri Feb 17 23:24:06 2006 -0800 - - Win32: Fix up src coords before calling AlphaBlend/BitBlt to avoid invalid calls - - Fixes up src coords and width/height before calling AlphaBlend/BitBlt; it's - an error to try to use a region that extents outside of the source surface - as a source DC. - - Doesn't repair the extra region relative to the operator -- e.g. regions - outside of an ARGB source surface with SOURCE operator should be cleared - to fully transparent black in the destination. - (cherry picked from bc19c5b64b0e38e9d20045907d7b47d79f6afc60 commit) - (cherry picked from 68ed40b6da242816a43cd68cc2c7feb779cf0acf commit) - - src/cairo-win32-surface.c | 31 +++++++++++++++++++++++++++++-- - 1 files changed, 29 insertions(+), 2 deletions(-) - -commit b07f042861602812ca02e01f566026256ba075db -Author: Vladimir Vukicevic <vladimir@h\-216.office.mozilla.org> -Date: Wed Feb 15 12:43:01 2006 -0800 - - Win32: Rework clip and extents handling - - - Save extents at surface creation and always return these - - Simplify clipping paths - (cherry picked from a67722b3d7280e6c2375778c2d46556cca261bfc commit) - (cherry picked from 7ce09732a978749a4da814feb77f50161dc42c91 commit) - (cherry picked from e0f4eecb91c8f7f09ef4977703d4ca21b06797a9 commit) - - src/cairo-win32-private.h | 2 +- - src/cairo-win32-surface.c | 92 +++++++++++++++++---------------------------- - 2 files changed, 36 insertions(+), 58 deletions(-) - -commit 5cbf914770cc01060fae1abe8cdda9b915352845 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:49:37 2006 -0500 - - Misc compilation fixes (C++-style comments, M_PI decls, etc.) - (cherry picked from d0cc56b9a24fa59febc15ac5de073da0e785e1cc commit) - (cherry picked from a6a054abe45287eb950c294e20366594313138f5 commit) - (cherry picked from f6b4fabaf59227d6cafcdd7e27cf0d8e26b4eeb8 commit) - - pixman/src/fbcompose.c | 10 ++++++++++ - pixman/src/pixregion.c | 6 +++--- - src/cairoint.h | 4 ++++ - 3 files changed, 17 insertions(+), 3 deletions(-) - -commit e78c945b6149a5b209be775d8b240467fbb4cc02 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:32:41 2006 -0500 - - Check font_face->status and return a nil scaled font if it is in an error state. (Thanks to Christian Biesinger and sunmoon1997 who pointed this out as part of bug #4674) - Cherry-picked from head's cairo-scaled-font.c - - ChangeLog |11172 ------------------------------------------------------ - src/cairo-font.c | 3 + - 2 files changed, 3 insertions(+), 11172 deletions(-) - -commit 44e7c120a7dcd7c52a5ea185a650cc5ea1db74dc -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:27:15 2006 -0500 - - Fix test to use fontconfig properly so that the test no longer fails. Fixes bug #4674. (Thnks to sunmoon1997 for the fix). - (cherry picked from a6ad853ee1a78585859ed77d5d8707fcfd448eab commit) - - ChangeLog |11172 +++++++++++++++++++++++++++++++++++++ - test/ft-font-create-for-ft-face.c | 24 +- - 2 files changed, 11191 insertions(+), 5 deletions(-) - -commit a1621eadb655806de8bb47c2e701de6eaa9d2090 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:25:02 2006 -0500 - - Note using "git diff" instead of "git status" as the latter is a bit tricky when it says nothing to commit... - - RELEASING | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 508b0be5f2023dabe9561f4ca62481d6a4c8c5ae -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:18:40 2006 -0500 - - Update release infra to reflect git transition. - - INSTALL | 2 +- - Makefile.am | 4 ++-- - RELEASING | 21 +++++++++------------ - configure.in | 2 +- - 4 files changed, 13 insertions(+), 16 deletions(-) - -commit 9cfa638ba0c959204bd65bfb43dd9d7caed5154f -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 11:04:56 2006 -0500 - - Add new ref images. - - test/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 393000021c2e082d4b3c235939009a90035b0daf -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:59:59 2006 -0500 - - Add make bits to autogenerate ChangeLog - - .gitignore | 1 + - Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+), 0 deletions(-) - -commit d415ea9b6026b3f8597201604bbcdab124705faf -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:33:36 2006 -0500 - - Shhhh..... - - doc/public/.gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 286cfe2c9ea308a99ff48dcd33708f686e0fc7b8 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Feb 24 09:18:17 2006 -0800 - - autogen.sh: Pass --foreign option to automake so that it doesn't - complain that ChangeLog does not exist. - (cherry picked from d0e02a948e83e3b1b330c9cb0aa4930b42bf485c commit) - - autogen.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 35d7810f7bb43dd72675207a2f4d379a76c34e5f -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:31:43 2006 -0500 - - Remove ChangeLog here too. We'll generate it using git log. - - ChangeLog |11320 ------------------------------------------------------------- - 1 files changed, 0 insertions(+), 11320 deletions(-) - -commit ff33ddb8f864a48c17c45746fb6bbbcf70216288 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:23:21 2006 -0500 - - Remove duplicate definitions of pixman_color_to_pixel and pixman_composite. - (cherry picked from 9e7076fd27b69b4de21a617a9cb0fa74f91f6bec commit) - - ChangeLog | 10 ++++++++++ - doc/public/tmpl/cairo-font-options.sgml | 12 ------------ - doc/public/tmpl/cairo-font.sgml | 3 --- - doc/public/tmpl/cairo-ft.sgml | 3 --- - doc/public/tmpl/cairo-glitz.sgml | 3 --- - doc/public/tmpl/cairo-image.sgml | 3 --- - doc/public/tmpl/cairo-matrix.sgml | 3 --- - doc/public/tmpl/cairo-paths.sgml | 3 --- - doc/public/tmpl/cairo-pattern.sgml | 3 --- - doc/public/tmpl/cairo-pdf.sgml | 3 --- - doc/public/tmpl/cairo-png.sgml | 3 --- - doc/public/tmpl/cairo-ps.sgml | 3 --- - doc/public/tmpl/cairo-quartz.sgml | 3 --- - doc/public/tmpl/cairo-scaled-font.sgml | 3 --- - doc/public/tmpl/cairo-status.sgml | 3 --- - doc/public/tmpl/cairo-surface.sgml | 3 --- - doc/public/tmpl/cairo-text.sgml | 3 --- - doc/public/tmpl/cairo-transforms.sgml | 3 --- - doc/public/tmpl/cairo-types.sgml | 3 --- - doc/public/tmpl/cairo-version.sgml | 3 --- - doc/public/tmpl/cairo-win32-fonts.sgml | 3 --- - doc/public/tmpl/cairo-win32.sgml | 3 --- - doc/public/tmpl/cairo-xcb-xrender.sgml | 3 --- - doc/public/tmpl/cairo-xcb.sgml | 3 --- - doc/public/tmpl/cairo-xlib-xrender.sgml | 3 --- - doc/public/tmpl/cairo-xlib.sgml | 3 --- - doc/public/tmpl/cairo.sgml | 3 --- - 27 files changed, 10 insertions(+), 87 deletions(-) - -commit af0cbe2aed0b19613b90e171a2c252e8c8327efd -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:15:47 2006 -0500 - - Allow _get_bitmap_surface to work for 0x0 glyphs, (fix for bug #5734). - - Patch from: Behdad Esfahbod <freedesktop@behdad.org> - Reviewed by: Carl Worth <cworth@cworth.org> - (cherry picked from 0152bd3a562442853ab930eaea316c08b34f6ba6 commit) - - src/cairo-ft-font.c | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit 6da5947efa6fbd0da85352974c2eb762bd42ffa7 -Author: Behdad Esfahbod <behdad@home.(none)> -Date: Wed Mar 15 10:07:58 2006 -0500 - - Bug #4260, Reviewed by B. Biggs - Use & not && for bitwise AND. - src/fbpict.c src/fbmmx.c: Take 'dest' as an argument, if pict and dest don't match for RGB, BGR, swap result. - (cherry picked from a1bca924b9296d769d735d8abaf1353143770def commit) - - pixman/ChangeLog | 11 +++++++++++ - pixman/src/fbpict.c | 2 +- - pixman/src/fbpict.h | 2 +- - 3 files changed, 13 insertions(+), 2 deletions(-) - -commit a5d13b472936b040755dd30624528cb7c6f52c73 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Mar 13 13:20:29 2006 -0800 - - fbCompositeTrans_0888xnx0888: Fix suspicious logical negation of pointer value. - - Surely, the ! instead of ~ here was just a typo. I'd feel better if I - had a failing test case for this though, (time to break out gcov - again). - - Fixes bug #6185: - - Strange pointer operations in fbCompositeTrans_0888xnx0888 (pixman/src/fbpict.c) - https://bugs.freedesktop.org/show_bug.cgi?id=6185 - (cherry picked from 5d89faf6b37bb0367c8ba8f8637fc80bd745c888 commit) - - pixman/src/fbpict.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 440bb68ef207b9101f355b2d1ccbaa5d1b166c4a -Author: Carl Worth <cworth@cworth.org> -Date: Mon Mar 13 12:30:00 2006 -0800 - - _clip_and_composite_trapezoids: Avoid NULL pointer dereference due to OOM. - - This closes bug #6197: - - Null pointer dereference on OOM in _clip_and_composite_trapezoids() - https://bugs.freedesktop.org/show_bug.cgi?id=6197 - (cherry picked from 6f0d8eedc504e8af2224c502be25dc82b5df70f4 commit) - - src/cairo-gstate.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5e399f87785ce87b2b236b199a96efc99236167f -Author: Carl Worth <cworth@cworth.org> -Date: Mon Mar 13 12:20:23 2006 -0800 - - cairo-clip: Fix memory leak during OOM handling. - - This closes bug #6196: - - Memory leak in _cairo_clip_intersect_path (src/cairo-clip.c) - https://bugs.freedesktop.org/show_bug.cgi?id=6196 - (cherry picked from 79075b2cb1ce1397506fc10572df96f6fd00ecc3 commit) - - src/cairo-clip.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 13b919f126427f8038cd9e76d6195494167ba503 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Mar 13 12:05:13 2006 -0800 - - cairo-output-stream: Don't dereference a NULL pointer due to OOM. - - This close bug #6176: - - Null pointer dereference on OOM in _cairo_output_stream_create_for_file() - https://bugs.freedesktop.org/show_bug.cgi?id=6176 - (cherry picked from c780f4a5624f27a6cbf7829e10e8cd3544ae4f38 commit) - - src/cairo-output-stream.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 46646cf2b1e392caced989a9adb65b50eac86ba3 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Mar 8 08:16:49 2006 -0800 - - cairo_show_glyphs: Do nothing if num_glyphs == 0 - (cherry picked from 1cffb39ff04bbb29bb070e42c51aa1ae6aaf5a4c commit) - - src/cairo.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 30d4aa863124075c59e8ebf2ce2c085d64290347 -Author: Christian Biesinger <cbiesinger@web.de> -Date: Sat Mar 4 15:43:15 2006 +0100 - - Use C-style comments rather than C++-style in C files - - pixman/src/fbcompose.c | 6 +++--- - pixman/src/pixman-xserver-compat.h | 2 +- - src/cairo-atsui-font.c | 31 +++++++++++++++++-------------- - src/cairo-quartz-surface.c | 11 ++++++----- - 4 files changed, 27 insertions(+), 23 deletions(-) - -commit 7d498ca91279a4e793d704c5b878f070be4c878f -Author: Carl Worth <cworth@cworth.org> -Date: Fri Mar 3 11:13:36 2006 -0800 - - _cairo_xlib_surface_show_glyphs: Break up rendering into chunks to fit - into X max request length protocol limits. - - This fixes bug #5528: - - _XError from XRenderCompositeText8 - https://bugs.freedesktop.org/show_bug.cgi?id=5528 - - src/cairo-xlib-surface.c | 61 +++++++++++++++++++++++++++++++-------------- - 1 files changed, 42 insertions(+), 19 deletions(-) - -commit 3aac0bf670facd6523e64b3585a93f29da7ffba2 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Mar 2 10:32:38 2006 -0800 - - test/show-glyphs-many: New test case to demonstrate bug #5528 - - This demonstrates an Xlib crash when rendering many glyphs. See: - - _XError from XRenderCompositeText8 - https://bugs.freedesktop.org/show_bug.cgi?id=5528 - - for more details. - (cherry picked from 34a4ad1e5bca8db34933718db245a232ebe30ce2 commit) - - test/.gitignore | 1 + - test/Makefile.am | 2 + - test/show-glyphs-many-ref.png | Bin - test/show-glyphs-many-rgb24-ref.png | Bin - test/show-glyphs-many.c | 127 +++++++++++++++++++++++++++++++++++ - 5 files changed, 130 insertions(+), 0 deletions(-) - -commit d8d8694ac424f1c9b1ef57a5a08c6f4ad1a208ce -Author: Frederic Crozat <fcrozat@mandriva.com> -Date: Thu Feb 23 17:09:47 2006 -0800 - - Fix usage of freetype to match Xft and follow David Turner's recommendations. - - Change a little the logic in hinting to follow the same - logic as Xft and doesn't try to mix FT_LOAD_TARGET which should not be - mixed (based on David Turner comments) - - src/cairo-ft-font.c | 103 +++++++++++++++++++++++++-------------------------- - 1 files changed, 51 insertions(+), 52 deletions(-) - -commit 65c32ae36fe90d69131435a25e6b15a05339df47 -Author: Frederic Crozat <fcrozat@mandriva.com> -Date: Thu Feb 23 16:44:44 2006 -0800 - - Fix for sub-pixel BGR and vRGB - - src/cairo-ft-font.c | 36 +++++++++++++++++++++++++----------- - 1 files changed, 25 insertions(+), 11 deletions(-) - -commit 540c10f3fb529ad7650065a8b11735027d60b28c -Author: Frederic Crozat <fcrozat@mandriva.com> -Date: Thu Feb 23 16:44:19 2006 -0800 - - test/text-antialias-subpixel: Modify to demonstrate problem with subpixel BGR and VRGB - - test/text-antialias-subpixel-ref.png | Bin - test/text-antialias-subpixel.c | 38 +++++++++++++++++++-------------- - 2 files changed, 22 insertions(+), 16 deletions(-) - -commit 886bc4ddb0cc9bf0c187919d03446d05e44c6714 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Feb 21 13:53:57 2006 -0800 - - Rename .cvsignore to .gitignore. Add *~ and *.o. - (cherry picked from d88c19071f6748b190cb17e6724b67705863a9b0 commit) - - .gitignore | 24 ++++++++ - doc/.gitignore | 3 + - doc/public/.gitignore | 17 ++++++ - doc/public/tmpl/.gitignore | 3 + - doc/tutorial/slides/.gitignore | 7 +++ - doc/tutorial/src/.gitignore | 8 +++ - pixman/.gitignore | 20 +++++++ - pixman/src/.gitignore | 10 ++++ - src/.gitignore | 13 +++++ - test/.gitignore | 116 ++++++++++++++++++++++++++++++++++++++++ - 10 files changed, 221 insertions(+), 0 deletions(-) - -commit 4dbb1500f91680cccf4be3be5e91a5128261731a -Author: Carl Worth <cworth@cworth.org> -Date: Wed Dec 7 11:45:15 2005 +0000 - - Use more portable shell syntax, ('test =' rather than 'test =='). Thanks to Richard Lloyd and Klaus Heinz. Closes bug #4823. - - ChangeLog | 6 ++++++ - configure.in | 12 ++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -commit 3d3af95489b7e382f41880f67d2c7c45eba76743 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Nov 21 11:49:34 2005 +0000 - - Remove duplicate definitions of pixman_color_to_pixel and pixman_composite. - - ChangeLog | 5 +++++ - pixman/ChangeLog | 5 +++++ - pixman/src/pixman-remap.h | 2 -- - 3 files changed, 10 insertions(+), 2 deletions(-) - -commit 36f8345a70f5a11de817b258ead23cb2379a58c0 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Nov 18 10:17:29 2005 +0000 - - Remove spurios INT_ prefixes which break the build with very recent binutils. - - ChangeLog | 5 +++++ - pixman/ChangeLog | 5 +++++ - pixman/src/pixman-remap.h | 4 ++-- - 3 files changed, 12 insertions(+), 2 deletions(-) - -commit d08cabcb4c53f59e84d62cacd21d269f15c97c8a -Author: Tor Lillqvist <tml@novell.com> -Date: Wed Oct 12 15:06:44 2005 +0000 - - Intersect clip region with target surface so we don't waste time and memory. - Reviewed by: cworth - - ChangeLog | 7 +++++++ - src/cairo-clip.c | 9 ++++++++- - 2 files changed, 15 insertions(+), 1 deletions(-) - -commit e1c07e99b9b851845e80139b5f4163284ec3e278 -Author: Tor Lillqvist <tml@novell.com> -Date: Mon Oct 10 11:33:18 2005 +0000 - - Apply proper transform to generated paths. - - ChangeLog | 5 +++++ - src/cairo-atsui-font.c | 10 ++++------ - 2 files changed, 9 insertions(+), 6 deletions(-) - -commit fe254b0ebc99bcc813b8a9d5714e936991fa435a -Author: Carl Worth <cworth@cworth.org> -Date: Sat Oct 8 10:58:11 2005 +0000 - - Fix typo leading to truncated error message (Christian Biesinger <cbiesinger@web.de>). - - ChangeLog | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 4ac391f861410c7b72bfae48ffd93e7abdf84fe2 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Oct 6 11:34:46 2005 +0000 - - Add missing initialization for ximage.xoffset. - - ChangeLog | 5 +++++ - src/cairo-xlib-surface.c | 1 + - 2 files changed, 6 insertions(+), 0 deletions(-) - -commit 167c3b430fd85006a5bd1e732def809b5c1f4a46 -Author: Anders Carlsson <andersca@imendio.com> -Date: Tue Oct 4 13:49:33 2005 +0000 - - Invoke PKG_PROG_PKG_CONFIG so $PKG_CONFIG will be set early on. - - ChangeLog | 5 +++++ - configure.in | 4 ++++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit cff8f831488ee781bf6738f35ba5dd061b69632a -Author: Carl Worth <cworth@cworth.org> -Date: Mon Oct 3 21:59:01 2005 +0000 - - Add missing initialization for _global_image_glyph_cache_mutex (Vladimir Vukicevic <vladimirv@gmail.com>). - - ChangeLog | 6 ++++++ - src/cairo-win32-surface.c | 3 +++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit 588ccdb5f24ff71c835b416aaee86971e3417637 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Oct 3 21:56:24 2005 +0000 - - Increment CAIRO_VERSION to 1.0.3 after tagging RELEASE_1_0_2. - - ChangeLog | 7 ++++++- - configure.in | 2 +- - 2 files changed, 7 insertions(+), 2 deletions(-) - -commit 169e72d6b973a91747c642c5b6f799e6a2af879b -Author: Carl Worth <cworth@cworth.org> -Date: Mon Oct 3 17:48:04 2005 +0000 - - Increment CAIRO_VERSION to 1.0.2 and libtool versioning to 4:3:2. - Add notes for the 1.0.2 release. - - ChangeLog | 7 +++++ - NEWS | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.in | 4 +- - 3 files changed, 91 insertions(+), 2 deletions(-) - -commit d290a19263aea9b28e40eafdffe2235d2b05fbd4 -Author: Bertram Felgenhauer <int-e@gmx.de> -Date: Thu Sep 29 20:03:15 2005 +0000 - - simplify id initialisation of last patch - reviewed by: keithp - - ChangeLog | 5 +++++ - src/cairo-hull.c | 13 +++++++------ - 2 files changed, 12 insertions(+), 6 deletions(-) - -commit 1f515c6e6cf7d654ebd70086e52b60fd16b606e6 -Author: Bertram Felgenhauer <int-e@gmx.de> -Date: Thu Sep 29 17:35:34 2005 +0000 - - ChangeLog cosmetics. - - ChangeLog | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7e5bdaeb62d0dfb2ac622f05a2c6ab9228cb53f6 -Author: Bertram Felgenhauer <int-e@gmx.de> -Date: Thu Sep 29 17:28:54 2005 +0000 - - Using a pointer comparison as the fallback total order was wrong - these pointers are not stable. So we introduce our own total order instead. - reviewed by: cworth - - ChangeLog | 9 +++++++++ - src/cairo-hull.c | 14 +++++++++----- - 2 files changed, 18 insertions(+), 5 deletions(-) - -commit 9b27a73020354cc40f829dd6f83769979c640a36 -Author: Tor Lillqvist <tml@novell.com> -Date: Wed Sep 28 10:37:40 2005 +0000 - - Use _cairo_utf8_to_utf16 for character conversion. - - ChangeLog | 5 +++++ - src/cairo-atsui-font.c | 24 ++++++------------------ - 2 files changed, 11 insertions(+), 18 deletions(-) - -commit 0cb8ee21b55cb2b935905c9bf05e076ff84b8522 -Author: Tor Lillqvist <tml@novell.com> -Date: Wed Sep 28 10:27:39 2005 +0000 - - Bug #4612, reviewed by cworth. - Add cast so that sign conversion doesn't alter comparison. - - ChangeLog | 7 +++++++ - src/cairo-win32-font.c | 8 ++++---- - 2 files changed, 11 insertions(+), 4 deletions(-) - -commit b8a08fbea6b287563653ba935fabdb5f8c1f329b -Author: Tor Lillqvist <tml@novell.com> -Date: Tue Sep 27 13:25:06 2005 +0000 - - Bug #4602, reviewed by cworth. - Avoid creating size-0 bitmap, which fails. - - ChangeLog | 7 +++++++ - src/cairo-win32-surface.c | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -commit 4b1fca82a877df391b47638b3f00f1c44873c82c -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 12:51:00 2005 +0000 - - Note that bug #4409 (Dashes are missing initial caps) is now fixed. - Move face-flipping from inside _cairo_stroker_add_caps to new _cairo_stroker_add_leading_cap variant of _cairo_stoker_add_cap. - Change to call _cairo_stroker_add_leading_cap or _cairo_stroker_add_trailing_cap as appropriate. - Remove dash-caps-joins from the XFAIL list and add reference image. - - ChangeLog | 21 +++++++++ - src/cairo-path-stroke.c | 51 +++++++++++++++------- - test/Makefile.am | 1 - - test/caps-joins-ref.png | Bin - test/caps-joins.c | 85 ++++++++++++++++++++++++++++++++++++++ - test/dash-caps-joins-ref.png | Bin - test/dash-caps-joins.c | 94 ++++++++++++++++++++++++++++++++++++++++++ - 7 files changed, 235 insertions(+), 17 deletions(-) - -commit 031943b4e4553c4fcdf5ccd2eb2f8674fc385e83 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 12:44:32 2005 +0000 - - file dash-caps-joins.c was added on branch BRANCH_1_0 on 2005-09-27 19:51:00 +0000 - -commit e26ebe1053788c884ebbf9c7aaf0121477d9ad01 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 12:44:32 2005 +0000 - - file dash-caps-joins-ref.png was added on branch BRANCH_1_0 on 2005-09-27 19:51:00 +0000 - -commit 6cf8e5b58b905d6b51b2b9c367ad76735e6a8bee -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 11:35:48 2005 +0000 - - Add two test cases. One for caps and joins (passes), and one for dashed caps and joins, (fails, see bug #4409). - - ChangeLog | 10 ++++++++++ - test/.cvsignore | 2 ++ - test/Makefile.am | 7 +++++++ - 3 files changed, 19 insertions(+), 0 deletions(-) - -commit effdcbb5acb3ef16770e9961e7ebcaf7b42ed808 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 11:35:18 2005 +0000 - - file caps-joins.c was added on branch BRANCH_1_0 on 2005-09-27 19:51:00 +0000 - -commit 2fb549133e09ad4f1ecb3e7ce588c32813e6f1c9 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 27 11:35:18 2005 +0000 - - file caps-joins-ref.png was added on branch BRANCH_1_0 on 2005-09-27 19:51:00 +0000 - -commit 8b4d49921db1b77da8814ed59ba50a53b716a59b -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 26 15:48:06 2005 +0000 - - Backported from HEAD: - Portability improvements for win32 thanks to Hans Breuer <hans@breuer.org>: - Defined sized-integer types when under the influence of _MSC_VER and without stdint.h. - Use #error which is more portable than #warning, (and more indicative of where we want to be before the next release). - - ChangeLog | 15 +++++++++++++++ - pixman/src/pixman.h | 19 +++++++++++++------ - src/cairoint.h | 3 ++- - 3 files changed, 30 insertions(+), 7 deletions(-) - -commit ae40e31976c462a56701322345ca8f14a3c82dd5 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 26 15:43:17 2005 +0000 - - Backported from HEAD: - Protect inclusion of fontconfig.h with HAVE_FCFINI. - Remove stray cairo-ft.h include. - Include stddef.h for NULL. - Open the file rb. - - ChangeLog | 14 ++++++++++++++ - test/cairo-test.c | 2 ++ - test/create-from-png-stream.c | 6 +++--- - test/nil-surface.c | 2 +- - 4 files changed, 20 insertions(+), 4 deletions(-) - -commit 975bfe373057462fcb15d03bd2db4531a0fcff19 -Author: Tor Lillqvist <tml@novell.com> -Date: Mon Sep 26 09:09:37 2005 +0000 - - If GetGlyphOutlineW() fails, set metrics to zero. (#3927, Hans Breuer) (Don't print error message, as this might occur frequently with a misconfigured Pango 1.10.0.) - - ChangeLog | 4 ++++ - src/cairo-win32-font.c | 12 ++++++++---- - 2 files changed, 12 insertions(+), 4 deletions(-) - -commit 80b2fae5f13d7eaa5bec7093becc69791ad26d51 -Author: Tor Lillqvist <tml@novell.com> -Date: Mon Sep 26 09:05:14 2005 +0000 - - Set LOGFONT::lfHeight negative. A negative lfHeight means "em height" which is what we want, and matches how other toolkits interpret font sizes on Win32. (Positive lfHeight means "cell height".) (#4593) - - ChangeLog | 8 ++++++++ - src/cairo-win32-font.c | 4 ++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit 4974affc3f64cb1d1f0ef270051e9415e643cfaa -Author: Tor Lillqvist <tml@novell.com> -Date: Tue Sep 20 08:23:20 2005 +0000 - - Pass scratch space instead of NULL for image_extra to acquire/release_dest_image. - - ChangeLog | 6 ++++++ - src/cairo-atsui-font.c | 5 +++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -commit e54787b78d414d1f0ec5c139ac3c29904a5e3610 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 19 17:27:22 2005 +0000 - - Avoid attempting to create a size-0 Pixmap, (to prevent the associated X error). This actually showed up when the clip region is empty. Thanks to Radek Doulík for the bug report. - Remove clip-all from the XFAIL list since it works now. - - ChangeLog | 11 +++++++++++ - src/cairo-xlib-surface.c | 3 ++- - test/Makefile.am | 1 - - test/clip-all.c | 3 +-- - 4 files changed, 14 insertions(+), 4 deletions(-) - -commit e39b2391717a04ccaab3367450bb01c2722736cc -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 19 14:28:39 2005 +0000 - - Originally: 2005-09-19 Hans Breuer <hans@breuer.org> - src/cairoint.h : win32 specific definitions for CAIRO_MUTEX_DECLARE, CAIRO_MUTEX_LOCK etc. [not based on win32 mutex but critical sections] - src/cairo-win32-surface.c : add DllMain() to do global, single-threaded 'mutex' (de)initialization. No ifdefs needed, some variables would simply not be used when the respective backend would not be compiled in. - - ChangeLog | 13 +++++++++++++ - src/cairo-win32-surface.c | 34 ++++++++++++++++++++++++++++++++++ - src/cairoint.h | 10 ++++++++++ - 3 files changed, 57 insertions(+), 0 deletions(-) - -commit dbe0552ed39a39133d89975ac3ba9359a766c52f -Author: Billy Biggs <vektor@dumbterm.net> -Date: Sun Sep 18 19:56:32 2005 +0000 - - Bug #4414, reviewed by otaylor, cworth. - Remove -msse from the MMX CFLAGS as it causes gcc to emit SSE instructions, however the detection code only checks for processors supporting MMX and does not require SSE. Fix the MMX test to only check for MMX intrinsics and not the SSE intrinsics. - - ChangeLog | 10 ++++++++++ - configure.in | 6 +++--- - 2 files changed, 13 insertions(+), 3 deletions(-) - -commit 178909580f357f190fd26b437cdd962ce6fc59d0 -Author: Billy Biggs <vektor@dumbterm.net> -Date: Sun Sep 18 19:55:54 2005 +0000 - - Bug #4414, reviewed by otaylor, cworth. - Remove CPU detection code, only include xmmintrin.h if USE_SSE is defined. - Move CPU detection code out of the MMX file and into the generic code to avoid compiling it with -mmmx and -msse. Using these options causes gcc to use MMX and SSE instructions in the CPU detection code which causes SIGILLs on older processors. - - pixman/ChangeLog | 12 +++++ - pixman/src/fbmmx.c | 115 +------------------------------------------------ - pixman/src/fbpict.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++- - 3 files changed, 132 insertions(+), 114 deletions(-) - -commit 4ea8d8544ee254c46a6d20fa4f05a3b6a7c0bf6e -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 16 10:25:40 2005 +0000 - - Tested by: John Ellson Closes bug #4408 https://bugs.freedesktop.org/show_bug.cgi?id=4408 - Add support for dashed splines. (The antialiasing quality isn't perfect, but at least the curves are dashed now). - - ChangeLog | 11 +++++++ - src/cairo-path-stroke.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 86 insertions(+), 1 deletions(-) - -commit a9b89bf8984fdc6ada9275b0e414964ea0d52d57 -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Sep 16 06:43:41 2005 +0000 - - Bug #4260, Reviewed by B. Biggs - Use & not && for bitwise AND. - src/fbpict.c src/fbmmx.c: Take 'dest' as an argument, if pict and dest don't match for RGB, BGR, swap result. - - pixman/ChangeLog | 11 +++++++++++ - pixman/src/fbcompose.c | 4 ++-- - pixman/src/fbmmx.c | 14 +++++++------- - pixman/src/fbpict.c | 20 ++++++++++---------- - pixman/src/fbpict.h | 12 ++++++++++-- - 5 files changed, 40 insertions(+), 21 deletions(-) - -commit a85f9916a9743d83c8a71586dfa1d64f85f52ea7 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 13 15:41:16 2005 +0000 - - Expand locking to include all modification of cairo_scaled_font and related objects. - - ChangeLog | 6 ++++++ - src/cairo-ft-font.c | 31 +++++++++++++++---------------- - 2 files changed, 21 insertions(+), 16 deletions(-) - -commit 4a078039192a57df54f258fe6ff7c1e9a9bbb613 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 13 12:38:06 2005 +0000 - - Adjust parameters to stress things a bit more, (better exposing another locking bug). - - ChangeLog | 5 +++++ - test/pthread-show-text.c | 10 +++++----- - 2 files changed, 10 insertions(+), 5 deletions(-) - -commit 36f4bb98371a3a81ccc6ccf6f3295b9e48e8c8c9 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 13 12:28:00 2005 +0000 - - Expand locking to encapsulate any modification to the reference count of a scaled font, rather than just modifcations of the scaled_font_map, since scaled fonts are shared between threads. - - ChangeLog | 8 +++++ - src/cairo-font.c | 85 ++++++++++++++++++++++++++++++----------------------- - 2 files changed, 56 insertions(+), 37 deletions(-) - -commit 33820b04759582334fb725962aa3fff8bdd44584 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 13 12:20:15 2005 +0000 - - Add documentation for cairo_test functions. - Abstract log fie creation into cairo_test_init for use by tests that don't use cairo_test(). - Add new test for bug #4299 as reported by Alexey Shabalin. - - ChangeLog | 13 +++++ - test/.cvsignore | 3 +- - test/Makefile.am | 7 +++- - test/cairo-test.c | 30 ++++++++---- - test/cairo-test.h | 48 ++++++++++++++++++-- - test/pthread-show-text.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 195 insertions(+), 16 deletions(-) - -commit 95557db5cf8bad464e171d58148b2fcf3d579f2d -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 13 12:11:32 2005 +0000 - - file pthread-show-text.c was added on branch BRANCH_1_0 on 2005-09-13 19:22:45 +0000 - -commit ec413ca3a4fc3c76fd2a395f2c0f4867efb0522f -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 12 11:11:48 2005 +0000 - - Fix for bug #4401 as reported by Tim Mooney: - Don't bother checking for sincos function. - Don't use sincos function since it is apparently buggy on some platforms, (Tru64 at least). - - ChangeLog | 10 ++++++++++ - configure.in | 4 +--- - src/cairo-matrix.c | 6 ++---- - 3 files changed, 13 insertions(+), 7 deletions(-) - -commit b9809741dd1eaf8ca1f1dbc09fb3938b5ccf471f -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 1 02:17:37 2005 +0000 - - Add includes to get sized-integers types such as uint32_t. - Fix declaration of image data array to be uint32_t rather than unsigned long. Fixes four out of the remaining five failures in bug #4245. - - ChangeLog | 17 +++++++++++++++++ - test/cairo-test.h | 26 ++++++++++++++++++++++++++ - test/filter-nearest-offset.c | 2 +- - test/mask-ctm.c | 2 +- - test/mask-surface-ctm.c | 2 +- - test/move-to-show-surface.c | 2 +- - test/paint-with-alpha.c | 2 +- - test/scale-source-surface-paint.c | 2 +- - test/set-source.c | 2 +- - test/source-surface-scale-paint.c | 2 +- - test/translate-show-surface.c | 2 +- - 11 files changed, 52 insertions(+), 9 deletions(-) - -commit 267f272ab0715fd590d8d8f0b0bae52900db3250 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 31 16:15:53 2005 +0000 - - Add call to XSynchronize, (the expected clip-all failure isn't occuring without it for some reason). - Note reason for expected failure. - - ChangeLog | 8 ++++++++ - test/cairo-test.c | 2 ++ - test/clip-all.c | 3 ++- - 3 files changed, 12 insertions(+), 1 deletions(-) - -commit d521fa3a759457b1b5ce18f8853507798071b599 -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Aug 31 15:09:43 2005 +0000 - - Handle displays which don't match the local endianness by byteswapping on GetImage/PutImage. (#4321, reported by Sjoerd Simons) - - ChangeLog | 8 ++- - src/cairo-xlib-surface.c | 170 ++++++++++++++++++++++++++++++++++++++-------- - 2 files changed, 145 insertions(+), 33 deletions(-) - -commit 568ce860264e63f86ae45258eb106fb7a74a33a3 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 31 14:43:31 2005 +0000 - - Increment CAIRO_VERSION to 1.1.1 after making branch tag BRANCH_1_0. - - ChangeLog | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 41c321fffaaa035b71aa8d149e748e1aae6d2317 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 31 13:52:19 2005 +0000 - - Add note to use ./autogen.sh instead of ./configure when working with source from cvs. - - ChangeLog | 5 +++++ - INSTALL | 4 ++++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit eb2316ecc7dfe2f7a87153c0094bda8754f6d36f -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 31 13:33:42 2005 +0000 - - Fix test to not try to set a non-invertible matrix. (We'd gotten away with this due to round-off error on many systems). Fixes one out of six failures in bug #4245. - - ChangeLog | 6 ++++++ - test/get-and-set.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit 464c6dffcf251d4b0089e50b716979da5e3b9a5a -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 31 09:00:01 2005 +0000 - - Add Radek Doulík. - Add test exposing a BadValue (0-size pixmap) bug in cairo-xlib-surface when everything is clipped away (thanks to Radek Doulík <rodo@novell.com>). - - AUTHORS | 1 + - ChangeLog | 10 +++++++ - test/.cvsignore | 1 + - test/Makefile.am | 4 +++ - test/clip-all-ref.png | Bin - test/clip-all.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 85 insertions(+), 0 deletions(-) - -commit 44d6afc8a82c2ede19ccc1e27a123b241be6dc67 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Aug 30 10:50:27 2005 +0000 - - Liberalize the ServerVendor check so that we can handle the Mandriva vendor string. (#4298, Frederic Crozat) - - ChangeLog | 6 ++++++ - src/cairo-xlib-surface.c | 2 +- - 2 files changed, 7 insertions(+), 1 deletions(-) - -commit a4418a63d7b837f0f7c20f5ce6a0e8b31edd97d7 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Aug 30 10:42:17 2005 +0000 - - Use a 8xN rather than a 1xN strip for a vertical gradient. This is much more tolerant of slow compositing code, and is worth some extra expense computing the gradient. (#4263, found in test case from Richard Stellingwerff) - - ChangeLog | 8 ++++++++ - src/cairo-pattern.c | 11 +++++++++-- - 2 files changed, 17 insertions(+), 2 deletions(-) - -commit 2120864edfb1bc51251dca3aeefbfadffb442ad0 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Aug 28 12:52:10 2005 +0000 - - Use local labels rather than global labels in the assembly, to be robust if the code is inlined in multiple places. (#4283, Reported by Marco Manfredini) - - pixman/ChangeLog | 6 ++++++ - pixman/src/fbmmx.c | 8 ++++---- - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit a83537fe02d29fc36a78be0f5599421edf75dc62 -Author: Billy Biggs <vektor@dumbterm.net> -Date: Sat Aug 27 19:32:57 2005 +0000 - - Some fixes for warnings from sparse (Part of bug #4208, Kjartan Maraas) - Use NULL not 0. - - pixman/ChangeLog | 15 +++++++++++ - pixman/src/fbcompose.c | 66 ++++++++++++++++++++++++------------------------ - pixman/src/fbpict.c | 4 +- - pixman/src/icbltone.c | 6 ++-- - pixman/src/icimage.c | 10 +++--- - pixman/src/icrect.c | 2 +- - pixman/src/ictrap.c | 6 ++-- - 7 files changed, 62 insertions(+), 47 deletions(-) - -commit 96342fe7beee1d0c2084cb6e0f44969d5b05b100 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Aug 27 18:54:03 2005 +0000 - - Make the check for rectangular trapezoids simpler and more accurate. (#4220, found using test case from Richard Stellingwerff) - reviewed by: cworth - - ChangeLog | 8 ++++++++ - src/cairo-traps.c | 16 +++++----------- - 2 files changed, 13 insertions(+), 11 deletions(-) - -commit 30e3d538dfbd763872117760ec473481e2c5926d -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Aug 27 18:49:06 2005 +0000 - - Make the vendor string check for XFree86 more liberal, to deal with older versions of gentoo that modified it in a different way. (#4231, fix from Billy Biggs) - - ChangeLog | 7 +++++++ - src/cairo-xlib-surface.c | 2 +- - 2 files changed, 8 insertions(+), 1 deletions(-) - -commit a6acc962f76c1eba9dec3ee1646413f6c82ac6e0 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Aug 27 18:46:34 2005 +0000 - - Undef MIN/MAX before defining them in case some system header happens to define them. (#4196, Christian Biesinger) - - ChangeLog | 8 +++++++- - src/cairoint.h | 3 +++ - 2 files changed, 10 insertions(+), 1 deletions(-) - -commit 3c53414cf34d2027284bdbd4836d10a2c0d998c0 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Aug 27 18:40:46 2005 +0000 - - Fix docs not to talk about %NULL returns. #4271, Duncan Coutts. - - ChangeLog | 6 ++++++ - src/cairo-image-surface.c | 18 ++++++++++++++---- - 2 files changed, 20 insertions(+), 4 deletions(-) - -commit c0da73e1b8e5933ca117512499ccac4e208bd8e0 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Aug 27 18:36:09 2005 +0000 - - Make the code work with - -fomit-frame-pointer by making sure that %esp isn't modified at the point where we access output operands. (#4269, Patch from Ronald Wahl) - - pixman/ChangeLog | 7 +++++++ - pixman/src/fbmmx.c | 24 +++++++++++++++++------- - 2 files changed, 24 insertions(+), 7 deletions(-) - -commit 03c3935471ad69e8e2d0e6543b7667f972ef1f0c -Author: Tor Lillqvist <tml@novell.com> -Date: Thu Aug 25 02:59:40 2005 +0000 - - Include the documentation, too. - - ChangeLog | 4 ++++ - Makefile.am | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit 1f975f4e82f3090b5f677241c1ca4d344788d27c -Author: Billy Biggs <vektor@dumbterm.net> -Date: Wed Aug 24 19:20:08 2005 +0000 - - Update formatting of the title and short description, as this actually changes how the TOC appears in devhelp. - - ChangeLog | 30 ++++++++++++++++++++++++++++++ - doc/public/tmpl/cairo-font-options.sgml | 6 ++---- - doc/public/tmpl/cairo-font.sgml | 6 ++---- - doc/public/tmpl/cairo-ft.sgml | 6 ++---- - doc/public/tmpl/cairo-glitz.sgml | 6 ++---- - doc/public/tmpl/cairo-image.sgml | 6 ++---- - doc/public/tmpl/cairo-matrix.sgml | 6 ++---- - doc/public/tmpl/cairo-paths.sgml | 6 ++---- - doc/public/tmpl/cairo-pattern.sgml | 6 ++---- - doc/public/tmpl/cairo-pdf.sgml | 6 ++---- - doc/public/tmpl/cairo-png.sgml | 6 ++---- - doc/public/tmpl/cairo-ps.sgml | 6 ++---- - doc/public/tmpl/cairo-quartz.sgml | 6 ++---- - doc/public/tmpl/cairo-scaled-font.sgml | 6 ++---- - doc/public/tmpl/cairo-status.sgml | 6 ++---- - doc/public/tmpl/cairo-surface.sgml | 6 ++---- - doc/public/tmpl/cairo-text.sgml | 6 ++---- - doc/public/tmpl/cairo-transforms.sgml | 6 ++---- - doc/public/tmpl/cairo-types.sgml | 6 ++---- - doc/public/tmpl/cairo-version.sgml | 6 ++---- - doc/public/tmpl/cairo-win32-fonts.sgml | 6 ++---- - doc/public/tmpl/cairo-win32.sgml | 6 ++---- - doc/public/tmpl/cairo-xcb-xrender.sgml | 6 ++---- - doc/public/tmpl/cairo-xcb.sgml | 6 ++---- - doc/public/tmpl/cairo-xlib.sgml | 6 ++---- - doc/public/tmpl/cairo.sgml | 6 ++---- - 26 files changed, 80 insertions(+), 100 deletions(-) - -commit 241a4eb8f76fcd1e6ca7db127410fcca8adf907e -Author: Bertram Felgenhauer <int-e@gmx.de> -Date: Wed Aug 24 17:44:16 2005 +0000 - - add docs-publish as a phony target - - ChangeLog | 4 ++++ - Makefile.am | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit 0bcad6002a62cb5ba2eb733fe1863ac045db1c86 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 24 10:16:14 2005 +0000 - - Increment CAIRO_VERSION to 1.0.1 after tagging RELEASE_1_0_0. - - ChangeLog | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - commit 995ed33726ac1e840ea1d6a28f48d6883a4bad59 Author: Carl Worth <cworth@cworth.org> Date: Wed Aug 24 09:29:39 2005 +0000 @@ -1442,7 +270,7 @@ Date: Wed Aug 24 01:13:36 2005 +0000 src/cairo.c | 54 +++++++++++++++++++++++--- test/.cvsignore | 1 + test/Makefile.am | 3 + - test/show-text-current-point-ref.png | Bin + test/show-text-current-point-ref.png | Bin 0 -> 1606 bytes test/show-text-current-point.c | 68 ++++++++++++++++++++++++++++++++++ 7 files changed, 134 insertions(+), 11 deletions(-) @@ -1719,11 +547,11 @@ Date: Tue Aug 23 13:34:14 2005 +0000 ChangeLog | 15 +++++++++++++++ src/cairo-ft-font.c | 10 ++++++---- test/Makefile.am | 1 - - test/text-antialias-gray-ref.png | Bin + test/text-antialias-gray-ref.png | Bin 723 -> 727 bytes test/text-antialias-gray.c | 1 - - test/text-antialias-none-ref.png | Bin + test/text-antialias-none-ref.png | Bin 277 -> 278 bytes test/text-antialias-none.c | 1 - - test/text-antialias-subpixel-ref.png | Bin + test/text-antialias-subpixel-ref.png | Bin 1079 -> 1081 bytes test/text-antialias-subpixel.c | 4 +--- 9 files changed, 22 insertions(+), 10 deletions(-) @@ -1743,7 +571,7 @@ Date: Tue Aug 23 10:55:00 2005 +0000 Fix inadvertent commit of incorrect reference image - test/text-antialias-subpixel-ref.png | Bin + test/text-antialias-subpixel-ref.png | Bin 970 -> 1079 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 9aa1f4d868c7fdad6412205538697899fe760dca @@ -1755,7 +583,7 @@ Date: Tue Aug 23 10:39:27 2005 +0000 ChangeLog | 9 +++++++++ test/Makefile.am | 1 + - test/text-antialias-subpixel-ref.png | Bin + test/text-antialias-subpixel-ref.png | Bin 0 -> 970 bytes test/text-antialias-subpixel.c | 5 ++++- 4 files changed, 14 insertions(+), 1 deletions(-) @@ -1766,7 +594,7 @@ Date: Tue Aug 23 10:11:16 2005 +0000 Add more comments on the improved state of this bug. Commit a reference image generated with cairo_text_path; cairo_fill. (We may not require getting this exact result, but I think it is worth examining the differences closely.) ChangeLog | 9 +++++++++ - test/text-rotate-ref.png | Bin + test/text-rotate-ref.png | Bin 0 -> 12446 bytes test/text-rotate.c | 39 +++++++++++++++++++++++++++++++++++++-- 3 files changed, 46 insertions(+), 2 deletions(-) @@ -1866,7 +694,7 @@ Date: Tue Aug 23 01:02:16 2005 +0000 ChangeLog | 9 ++++++ test/.cvsignore | 1 + test/Makefile.am | 4 +++ - test/caps-sub-paths-ref.png | Bin + test/caps-sub-paths-ref.png | Bin 0 -> 164 bytes test/caps-sub-paths.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 0 deletions(-) @@ -2142,9 +970,9 @@ Date: Sun Aug 21 14:10:39 2005 +0000 ChangeLog | 17 +++++++++++++++++ src/cairo-pattern.c | 8 ++++---- - test/gradient-alpha-ref.png | Bin - test/linear-gradient-ref.png | Bin - test/text-pattern-ref.png | Bin + test/gradient-alpha-ref.png | Bin 153 -> 154 bytes + test/linear-gradient-ref.png | Bin 12744 -> 12719 bytes + test/text-pattern-ref.png | Bin 2728 -> 2731 bytes 5 files changed, 21 insertions(+), 4 deletions(-) commit e3e7046cd7ee629fe085cf081fd3aa2581782bf5 @@ -2167,12 +995,12 @@ Date: Sun Aug 21 11:41:44 2005 +0000 ChangeLog | 18 ++++++++++++++++++ src/cairo-hull.c | 7 ++++++- - test/clip-operator-ref.png | Bin - test/linear-gradient-ref.png | Bin - test/operator-clear-ref.png | Bin - test/operator-source-ref.png | Bin - test/unantialiased-shapes-ref.png | Bin - test/unbounded-operator-ref.png | Bin + test/clip-operator-ref.png | Bin 37330 -> 37330 bytes + test/linear-gradient-ref.png | Bin 12724 -> 12744 bytes + test/operator-clear-ref.png | Bin 4992 -> 4988 bytes + test/operator-source-ref.png | Bin 19957 -> 19958 bytes + test/unantialiased-shapes-ref.png | Bin 4450 -> 4449 bytes + test/unbounded-operator-ref.png | Bin 11937 -> 11929 bytes 8 files changed, 24 insertions(+), 1 deletions(-) commit d93d56caeffb80ac92a0432ad1ebdecee5c0e2b6 @@ -2305,7 +1133,7 @@ Date: Fri Aug 19 16:37:56 2005 +0000 ChangeLog | 10 +++++ test/.cvsignore | 1 + test/Makefile.am | 3 + - test/rectangle-rounding-error-ref.png | Bin + test/rectangle-rounding-error-ref.png | Bin 0 -> 298 bytes test/rectangle-rounding-error.c | 69 +++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 0 deletions(-) @@ -2394,7 +1222,7 @@ Date: Fri Aug 19 12:02:14 2005 +0000 src/cairo.h | 9 +++- test/.cvsignore | 1 + test/Makefile.am | 4 ++ - test/dash-offset-negative-ref.png | Bin + test/dash-offset-negative-ref.png | Bin 0 -> 155 bytes test/dash-offset-negative.c | 99 +++++++++++++++++++++++++++++++++++++ 9 files changed, 203 insertions(+), 15 deletions(-) @@ -2447,7 +1275,7 @@ Date: Thu Aug 18 23:10:37 2005 +0000 src/cairoint.h | 2 +- test/.cvsignore | 1 + test/Makefile.am | 2 + - test/nil-surface-ref.png | Bin + test/nil-surface-ref.png | Bin 0 -> 107 bytes test/nil-surface.c | 73 +++++++++++++++++++++++++++++ 8 files changed, 184 insertions(+), 57 deletions(-) @@ -2516,7 +1344,7 @@ Date: Thu Aug 18 17:19:54 2005 +0000 ChangeLog | 7 +++++++ src/cairo-xlib-surface.c | 18 +++++++++--------- test/.cvsignore | 1 + - test/text-pattern-ref.png | Bin + test/text-pattern-ref.png | Bin 2869 -> 2728 bytes test/text-pattern.c | 9 ++++++--- 5 files changed, 23 insertions(+), 12 deletions(-) @@ -2538,7 +1366,7 @@ Date: Thu Aug 18 16:22:23 2005 +0000 ChangeLog | 4 ++ test/Makefile.am | 3 ++ - test/text-pattern-ref.png | Bin + test/text-pattern-ref.png | Bin 0 -> 2869 bytes test/text-pattern.c | 74 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 0 deletions(-) @@ -2565,12 +1393,12 @@ Date: Thu Aug 18 15:50:36 2005 +0000 src/cairo-xlib-surface.c | 6 +- test/.cvsignore | 2 + test/Makefile.am | 6 + - test/clip-operator-ref.png | Bin - test/operator-clear-ref.png | Bin + test/clip-operator-ref.png | Bin 38336 -> 37330 bytes + test/operator-clear-ref.png | Bin 0 -> 4992 bytes test/operator-clear.c | 214 +++++++++++++++++++++++++++++++++ - test/operator-source-ref.png | Bin + test/operator-source-ref.png | Bin 0 -> 19957 bytes test/operator-source.c | 253 +++++++++++++++++++++++++++++++++++++++ - test/unbounded-operator-ref.png | Bin + test/unbounded-operator-ref.png | Bin 14178 -> 11937 bytes test/unbounded-operator.c | 4 +- 16 files changed, 706 insertions(+), 63 deletions(-) @@ -3071,7 +1899,7 @@ Date: Wed Aug 10 21:12:10 2005 +0000 Update to match the output from libpixman. ChangeLog | 5 +++++ - test/clip-operator-ref.png | Bin + test/clip-operator-ref.png | Bin 37486 -> 38336 bytes 2 files changed, 5 insertions(+), 0 deletions(-) commit 910d824b3df8cc72a52c44b1177045d91b83051b @@ -3374,7 +2202,7 @@ Date: Mon Aug 8 18:35:22 2005 +0000 src/cairo.h | 46 +++++++++------- src/cairoint.h | 18 +++++- test/Makefile.am | 3 + - test/unantialiased-shapes-ref.png | Bin + test/unantialiased-shapes-ref.png | Bin 0 -> 4450 bytes test/unantialiased-shapes.c | 103 +++++++++++++++++++++++++++++++++++++ 24 files changed, 450 insertions(+), 100 deletions(-) @@ -3444,8 +2272,8 @@ Date: Mon Aug 8 13:50:02 2005 +0000 Add reference images - test/clip-operator-ref.png | Bin - test/unbounded-operator-ref.png | Bin + test/clip-operator-ref.png | Bin 0 -> 37486 bytes + test/unbounded-operator-ref.png | Bin 0 -> 14178 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit 8f19aaf9a8a60aa2eb86e25946d04f293ed703db @@ -3754,7 +2582,7 @@ Date: Fri Aug 5 15:07:45 2005 +0000 ChangeLog | 8 +++++ test/Makefile.am | 4 +++ - test/a8-mask-ref.png | Bin + test/a8-mask-ref.png | Bin 0 -> 128 bytes test/a8-mask.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 0 deletions(-) @@ -4064,7 +2892,7 @@ Date: Mon Aug 1 14:39:01 2005 +0000 src/cairo-gstate-private.h | 1 + src/cairo-gstate.c | 119 +++++++++++++++++-------------- test/Makefile.am | 1 - - test/source-surface-scale-paint-ref.png | Bin + test/source-surface-scale-paint-ref.png | Bin 147 -> 139 bytes test/source-surface-scale-paint.c | 5 +- 6 files changed, 91 insertions(+), 58 deletions(-) @@ -4256,9 +3084,9 @@ Date: Thu Jul 28 15:55:00 2005 +0000 ChangeLog | 13 ++++++ test/.cvsignore | 2 + test/Makefile.am | 6 +++ - test/mask-ctm-ref.png | Bin + test/mask-ctm-ref.png | Bin 0 -> 129 bytes test/mask-ctm.c | 82 +++++++++++++++++++++++++++++++++++++++++ - test/mask-surface-ctm-ref.png | Bin + test/mask-surface-ctm-ref.png | Bin 0 -> 129 bytes test/mask-surface-ctm.c | 75 +++++++++++++++++++++++++++++++++++++ 7 files changed, 178 insertions(+), 0 deletions(-) @@ -4640,9 +3468,9 @@ Date: Wed Jul 27 13:28:15 2005 +0000 ROADMAP | 4 ++ test/.cvsignore | 3 + test/Makefile.am | 8 ++++ - test/text-antialias-gray-ref.png | Bin + test/text-antialias-gray-ref.png | Bin 0 -> 723 bytes test/text-antialias-gray.c | 77 +++++++++++++++++++++++++++++++++++ - test/text-antialias-none-ref.png | Bin + test/text-antialias-none-ref.png | Bin 0 -> 277 bytes test/text-antialias-none.c | 78 ++++++++++++++++++++++++++++++++++++ test/text-antialias-subpixel.c | 82 ++++++++++++++++++++++++++++++++++++++ 9 files changed, 267 insertions(+), 0 deletions(-) @@ -4658,7 +3486,7 @@ Date: Wed Jul 27 09:23:29 2005 +0000 src/cairo-png.c | 2 +- test/.cvsignore | 1 + test/Makefile.am | 3 + - test/create-from-png-stream-ref.png | Bin + test/create-from-png-stream-ref.png | Bin 0 -> 100 bytes test/create-from-png-stream.c | 95 +++++++++++++++++++++++++++++++++++ test/create-from-png.c | 4 +- 7 files changed, 116 insertions(+), 2 deletions(-) @@ -4823,14 +3651,14 @@ Date: Fri Jul 22 06:20:53 2005 +0000 doc/tutorial/slides/cairo-separator.svg | 491 +++++++++++++++++++++++++ doc/tutorial/slides/cairo-title.svg | 373 +++++++++++++++++++ doc/tutorial/slides/cairo.svg | 508 ++++++++++++++++++++++++++ - doc/tutorial/slides/circle-cairo-large.png | Bin - doc/tutorial/slides/circle-cairo.png | Bin - doc/tutorial/slides/circle-ooo-large.png | Bin - doc/tutorial/slides/circle-ooo.png | Bin - doc/tutorial/slides/expander-fuzzy-large.png | Bin - doc/tutorial/slides/expander-fuzzy.png | Bin - doc/tutorial/slides/expander-sharp-large.png | Bin - doc/tutorial/slides/expander-sharp.png | Bin + doc/tutorial/slides/circle-cairo-large.png | Bin 0 -> 3362 bytes + doc/tutorial/slides/circle-cairo.png | Bin 0 -> 1429 bytes + doc/tutorial/slides/circle-ooo-large.png | Bin 0 -> 1491 bytes + doc/tutorial/slides/circle-ooo.png | Bin 0 -> 383 bytes + doc/tutorial/slides/expander-fuzzy-large.png | Bin 0 -> 1300 bytes + doc/tutorial/slides/expander-fuzzy.png | Bin 0 -> 296 bytes + doc/tutorial/slides/expander-sharp-large.png | Bin 0 -> 929 bytes + doc/tutorial/slides/expander-sharp.png | Bin 0 -> 183 bytes doc/tutorial/slides/fuzzies.svg | 11 + doc/tutorial/slides/jaggies.svg | 11 + doc/tutorial/slides/tutorial.xml | 468 ++++++++++++++++++++++++ @@ -5168,11 +3996,11 @@ Date: Fri Jul 15 13:45:19 2005 +0000 src/cairo-xlib-surface.c | 117 ++++++++++++++----- test/.cvsignore | 3 + test/Makefile.am | 11 ++- - test/composite-integer-translate-over-ref.png | Bin - ...composite-integer-translate-over-repeat-ref.png | Bin + test/composite-integer-translate-over-ref.png | Bin 0 -> 15397 bytes + ...composite-integer-translate-over-repeat-ref.png | Bin 0 -> 401 bytes test/composite-integer-translate-over-repeat.c | 61 ++++++++++ test/composite-integer-translate-over.c | 42 +++++++ - test/composite-integer-translate-source-ref.png | Bin + test/composite-integer-translate-source-ref.png | Bin 0 -> 16385 bytes test/composite-integer-translate-source.c | 42 +++++++ 11 files changed, 255 insertions(+), 33 deletions(-) @@ -5377,7 +4205,7 @@ Date: Thu Jul 14 11:17:12 2005 +0000 ChangeLog | 10 ++++++ test/.cvsignore | 2 +- test/Makefile.am | 6 ++-- - test/create-for-png-ref.png | Bin + test/create-for-png-ref.png | Bin 100 -> 0 bytes test/create-for-png.c | 69 ------------------------------------------- test/create-from-png.c | 4 +- 6 files changed, 16 insertions(+), 75 deletions(-) @@ -6654,7 +5482,7 @@ Date: Fri Jun 3 16:40:15 2005 +0000 ChangeLog | 6 ++++ src/cairo-gstate.c | 75 +++++++++++++++++++++++++++++++++++++--------- - test/clip-twice-ref.png | Bin + test/clip-twice-ref.png | Bin 751 -> 1191 bytes test/clip-twice.c | 6 ++++ 4 files changed, 72 insertions(+), 15 deletions(-) @@ -6838,7 +5666,7 @@ Date: Wed Jun 1 11:03:50 2005 +0000 ChangeLog | 9 ++++ test/.cvsignore | 1 + test/Makefile.am | 3 + - test/self-intersecting-ref.png | Bin + test/self-intersecting-ref.png | Bin 0 -> 242 bytes test/self-intersecting.c | 89 ++++++++++++++++++++++++++++++++++++++++ 5 files changed, 102 insertions(+), 0 deletions(-) @@ -7481,7 +6309,7 @@ Date: Thu May 12 11:02:35 2005 +0000 src/cairo-gstate.c | 6 +++- test/.cvsignore | 1 + test/Makefile.am | 3 ++ - test/paint-with-alpha-ref.png | Bin + test/paint-with-alpha-ref.png | Bin 0 -> 164 bytes test/paint-with-alpha.c | 64 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 86 insertions(+), 1 deletions(-) @@ -7943,9 +6771,9 @@ Date: Fri May 6 12:00:22 2005 +0000 src/cairo.c | 31 +++++++ src/cairo.h | 4 + test/Makefile.am | 4 - - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 25904 -> 0 bytes test/coverage.c | 185 ----------------------------------------- - test/mask-ref.png | Bin + test/mask-ref.png | Bin 58954 -> 87846 bytes test/mask.c | 7 ++ 13 files changed, 83 insertions(+), 209 deletions(-) @@ -7998,13 +6826,13 @@ Date: Tue May 3 08:33:32 2005 +0000 test/cairo-test.c | 2 +- test/create-for-png.c | 6 +- test/create-from-png.c | 6 +- - test/filter-nearest-offset-ref.png | Bin + test/filter-nearest-offset-ref.png | Bin 0 -> 254 bytes test/filter-nearest-offset.c | 107 ++++++++++++++++++ test/move-to-show-surface.c | 5 +- test/pixman-rotate.c | 3 +- - test/scale-source-surface-paint-ref.png | Bin + test/scale-source-surface-paint-ref.png | Bin 0 -> 147 bytes test/scale-source-surface-paint.c | 65 +++++++++++ - test/source-surface-scale-paint-ref.png | Bin + test/source-surface-scale-paint-ref.png | Bin 0 -> 147 bytes test/source-surface-scale-paint.c | 65 +++++++++++ test/translate-show-surface.c | 3 +- 19 files changed, 399 insertions(+), 300 deletions(-) @@ -8056,11 +6884,11 @@ Date: Mon May 2 13:39:30 2005 +0000 src/cairo.h | 29 +++++++- src/cairoint.h | 21 ++++- test/Makefile.am | 11 +++ - test/clip-nesting-ref.png | Bin + test/clip-nesting-ref.png | Bin 0 -> 1050 bytes test/clip-nesting.c | 101 ++++++++++++++++++++++++ - test/self-copy-ref.png | Bin + test/self-copy-ref.png | Bin 0 -> 291 bytes test/self-copy.c | 90 ++++++++++++++++++++++ - test/source-clip-ref.png | Bin + test/source-clip-ref.png | Bin 0 -> 180 bytes test/source-clip.c | 85 +++++++++++++++++++++ 16 files changed, 649 insertions(+), 77 deletions(-) @@ -8075,7 +6903,7 @@ Date: Mon May 2 12:36:20 2005 +0000 ChangeLog | 12 ++++++++++ src/cairo-path.c | 8 +++--- test/Makefile.am | 7 ++++- - test/rel-path-ref.png | Bin + test/rel-path-ref.png | Bin 0 -> 212 bytes test/rel-path.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 77 insertions(+), 6 deletions(-) @@ -8105,7 +6933,7 @@ Date: Mon May 2 11:01:18 2005 +0000 src/cairo.h | 10 ++ src/cairoint.h | 4 + test/Makefile.am | 3 + - test/mask-ref.png | Bin + test/mask-ref.png | Bin 0 -> 58954 bytes test/mask.c | 241 ++++++++++++++++++++++++++++++++++++++ 10 files changed, 544 insertions(+), 67 deletions(-) @@ -8221,7 +7049,7 @@ Date: Tue Apr 26 18:56:37 2005 +0000 ChangeLog | 8 +++++++ test/.cvsignore | 2 + test/Makefile.am | 3 ++ - test/paint-ref.png | Bin + test/paint-ref.png | Bin 0 -> 116 bytes test/paint.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 0 deletions(-) @@ -8438,7 +7266,7 @@ Date: Mon Apr 18 16:26:14 2005 +0000 ChangeLog | 8 ++++ test/.cvsignore | 1 + test/Makefile.am | 3 ++ - test/surface-pattern-ref.png | Bin + test/surface-pattern-ref.png | Bin 0 -> 194 bytes test/surface-pattern.c | 75 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 87 insertions(+), 0 deletions(-) @@ -8453,7 +7281,7 @@ Date: Mon Apr 18 05:25:57 2005 +0000 ROADMAP | 14 ++++---- test/.cvsignore | 1 + test/Makefile.am | 3 ++ - test/fill-and-stroke-ref.png | Bin + test/fill-and-stroke-ref.png | Bin 0 -> 279 bytes test/fill-and-stroke.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 89 insertions(+), 7 deletions(-) @@ -8527,7 +7355,7 @@ Date: Thu Apr 14 14:02:03 2005 +0000 Make gradient change color in addition to just changing alpha in order to highlight distinction between interpolating in premultiplied vs. non-premultiplied space. ChangeLog | 8 ++++++++ - test/gradient-alpha-ref.png | Bin + test/gradient-alpha-ref.png | Bin 146 -> 153 bytes test/gradient-alpha.c | 8 ++++---- 3 files changed, 12 insertions(+), 4 deletions(-) @@ -8555,7 +7383,7 @@ Date: Thu Apr 14 09:31:21 2005 +0000 ChangeLog | 8 +++++ test/.cvsignore | 1 + test/Makefile.am | 3 ++ - test/gradient-alpha-ref.png | Bin + test/gradient-alpha-ref.png | Bin 0 -> 146 bytes test/gradient-alpha.c | 62 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 74 insertions(+), 0 deletions(-) @@ -8568,7 +7396,7 @@ Date: Thu Apr 14 09:13:48 2005 +0000 ChangeLog | 8 ++++ test/.cvsignore | 3 +- test/Makefile.am | 7 +++- - test/set-source-ref.png | Bin + test/set-source-ref.png | Bin 0 -> 120 bytes test/set-source.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 104 insertions(+), 3 deletions(-) @@ -8631,7 +7459,7 @@ Date: Wed Apr 13 14:24:20 2005 +0000 Temporarily remove all text from this test case until we come up with an approach for drawing the same text with different freetype configurations. ChangeLog | 7 +++++++ - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 44324 -> 25904 bytes test/coverage.c | 6 ++++++ 3 files changed, 13 insertions(+), 0 deletions(-) @@ -8688,7 +7516,7 @@ Date: Wed Apr 13 11:23:43 2005 +0000 src/cairo-traps.c | 55 +++++ src/cairoint.h | 4 + test/Makefile.am | 5 +- - test/trap-clip-ref.png | Bin + test/trap-clip-ref.png | Bin 0 -> 71701 bytes test/trap-clip.c | 213 ++++++++++++++++ 8 files changed, 688 insertions(+), 196 deletions(-) @@ -8756,7 +7584,7 @@ Date: Mon Apr 11 14:04:56 2005 +0000 ChangeLog | 9 ++++ test/.cvsignore | 1 + test/Makefile.am | 5 ++- - test/translate-show-surface-ref.png | Bin + test/translate-show-surface-ref.png | Bin 0 -> 100 bytes test/translate-show-surface.c | 77 +++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 1 deletions(-) @@ -9100,7 +7928,7 @@ Date: Thu Apr 7 10:01:49 2005 +0000 src/cairoint.h | 38 ++---- test/.cvsignore | 1 + test/Makefile.am | 5 +- - test/transforms-ref.png | Bin + test/transforms-ref.png | Bin 0 -> 302 bytes test/transforms.c | 111 ++++++++++++++ 20 files changed, 502 insertions(+), 307 deletions(-) @@ -9160,9 +7988,9 @@ Date: Mon Apr 4 09:47:12 2005 +0000 test/buffer-diff.h | 4 ++- test/cairo-test.c | 14 ++++--- test/cairo-test.h | 2 + - test/create-for-png-ref.png | Bin + test/create-for-png-ref.png | Bin 0 -> 100 bytes test/create-for-png.c | 74 ++++++++++++++++++++++++++++++++++++++++++ - test/create-from-png-ref.png | Bin + test/create-from-png-ref.png | Bin 0 -> 100 bytes test/create-from-png.c | 74 ++++++++++++++++++++++++++++++++++++++++++ test/write-png.c | 2 +- test/write-png.h | 2 +- @@ -9366,32 +8194,32 @@ Date: Tue Mar 29 00:02:19 2005 +0000 test/cairo_test.c | 263 ------------------------------------- test/cairo_test.h | 55 -------- test/clip-twice.c | 4 +- - test/clip_twice-ref.png | Bin + test/clip_twice-ref.png | Bin 751 -> 0 bytes test/clip_twice.c | 74 ----------- test/coverage.c | 2 +- test/fill-rule.c | 4 +- - test/fill_rule-ref.png | Bin + test/fill_rule-ref.png | Bin 1979 -> 0 bytes test/fill_rule.c | 132 ------------------- test/get-and-set.c | 4 +- test/get_and_set.c | 151 --------------------- test/imagediff.c | 6 +- test/leaky-polygon.c | 4 +- - test/leaky_polygon-ref.png | Bin + test/leaky_polygon-ref.png | Bin 255 -> 0 bytes test/leaky_polygon.c | 84 ------------ test/line-width.c | 4 +- - test/line_width-ref.png | Bin + test/line_width-ref.png | Bin 171 -> 0 bytes test/line_width.c | 65 --------- test/linear-gradient.c | 4 +- - test/linear_gradient-ref.png | Bin + test/linear_gradient-ref.png | Bin 12724 -> 0 bytes test/linear_gradient.c | 143 -------------------- test/move-to-show-surface.c | 4 +- - test/move_to_show_surface-ref.png | Bin + test/move_to_show_surface-ref.png | Bin 100 -> 0 bytes test/move_to_show_surface.c | 71 ---------- test/path-data.c | 4 +- - test/path_data-ref.png | Bin + test/path_data-ref.png | Bin 387 -> 0 bytes test/path_data.c | 179 ------------------------- test/pixman-rotate.c | 4 +- - test/pixman_rotate-ref.png | Bin + test/pixman_rotate-ref.png | Bin 260 -> 0 bytes test/pixman_rotate.c | 80 ----------- test/read-png.c | 2 +- test/read_png.c | 166 ----------------------- @@ -9890,8 +8718,8 @@ Date: Mon Mar 14 11:49:12 2005 +0000 Add reference image. ChangeLog | 4 ++++ - test/path-data-ref.png | Bin - test/path_data-ref.png | Bin + test/path-data-ref.png | Bin 0 -> 387 bytes + test/path_data-ref.png | Bin 0 -> 387 bytes 3 files changed, 4 insertions(+), 0 deletions(-) commit f385e5f3e47dec22aa48df02f3f19b06fe0b8780 @@ -10165,7 +8993,7 @@ Date: Tue Mar 8 14:30:14 2005 +0000 Fix accidental commit of diff, rather than ref image. - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 2148 -> 44324 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit c05059f62fc70e94ed864559212a223debe30915 @@ -10174,7 +9002,7 @@ Date: Tue Mar 8 14:25:54 2005 +0000 Update coverage-ref.png due to seemingly harmless, though not entirely understood changes. - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 44331 -> 2148 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 246a07022aa97614c8961526cf3e2b06e8d5774b @@ -10275,9 +9103,9 @@ Date: Sun Mar 6 12:05:23 2005 +0000 src/cairo-pattern.c | 119 +++++++++++++++++++++++++++++------ src/cairo_pattern.c | 119 +++++++++++++++++++++++++++++------ test/Makefile.am | 3 + - test/linear-gradient-ref.png | Bin + test/linear-gradient-ref.png | Bin 0 -> 12724 bytes test/linear-gradient.c | 141 ++++++++++++++++++++++++++++++++++++++++++ - test/linear_gradient-ref.png | Bin + test/linear_gradient-ref.png | Bin 0 -> 12724 bytes test/linear_gradient.c | 141 ++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 497 insertions(+), 38 deletions(-) @@ -11065,9 +9893,9 @@ Date: Mon Feb 7 09:38:43 2005 +0000 ChangeLog | 6 +++ test/Makefile.am | 7 +++- - test/pixman-rotate-ref.png | Bin + test/pixman-rotate-ref.png | Bin 0 -> 260 bytes test/pixman-rotate.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ - test/pixman_rotate-ref.png | Bin + test/pixman_rotate-ref.png | Bin 0 -> 260 bytes test/pixman_rotate.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 167 insertions(+), 2 deletions(-) @@ -11605,9 +10433,9 @@ Date: Thu Jan 27 12:28:17 2005 +0000 Update these two once again, this time generated using libpixman-0.1.3 without leaky circles. ChangeLog | 7 +++++++ - test/clip-twice-ref.png | Bin - test/clip_twice-ref.png | Bin - test/coverage-ref.png | Bin + test/clip-twice-ref.png | Bin 793 -> 751 bytes + test/clip_twice-ref.png | Bin 793 -> 751 bytes + test/coverage-ref.png | Bin 44373 -> 44331 bytes 4 files changed, 7 insertions(+), 0 deletions(-) commit 73cdfa0b2ba3222958483245a48daf483f3c74f6 @@ -11634,9 +10462,9 @@ Date: Thu Jan 27 11:40:29 2005 +0000 test/.cvsignore | 2 ++ test/Makefile.am | 3 +-- - test/clip-twice-ref.png | Bin - test/clip_twice-ref.png | Bin - test/coverage-ref.png | Bin + test/clip-twice-ref.png | Bin 869 -> 793 bytes + test/clip_twice-ref.png | Bin 869 -> 793 bytes + test/coverage-ref.png | Bin 44332 -> 44373 bytes test/read-png.c | 6 +++--- test/read_png.c | 6 +++--- test/write-png.c | 6 +++--- @@ -11722,7 +10550,7 @@ Date: Thu Jan 27 10:46:20 2005 +0000 src/cairo_surface.c | 142 ++------- src/cairo_xlib_surface.c | 102 +++++-- src/cairoint.h | 102 ++++-- - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 43819 -> 44332 bytes 24 files changed, 1960 insertions(+), 1915 deletions(-) commit 2654df6afb424e41d7cc3752a9d7b9c27c3efc92 @@ -11733,9 +10561,9 @@ Date: Wed Jan 26 21:46:01 2005 +0000 ChangeLog | 4 ++ test/Makefile.am | 21 +++++++++---- - test/clip-twice-ref.png | Bin + test/clip-twice-ref.png | Bin 0 -> 869 bytes test/clip-twice.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - test/clip_twice-ref.png | Bin + test/clip_twice-ref.png | Bin 0 -> 869 bytes test/clip_twice.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 162 insertions(+), 7 deletions(-) @@ -11747,7 +10575,7 @@ Date: Wed Jan 26 14:21:53 2005 +0000 Added the right reference PNG. Running test against stock 0.3.0 gives the expected results. ChangeLog | 5 +++++ - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 629 -> 43819 bytes test/coverage.c | 1 + 3 files changed, 6 insertions(+), 0 deletions(-) @@ -11765,9 +10593,9 @@ Date: Wed Jan 26 13:41:55 2005 +0000 test/cairo-test.h | 4 + test/cairo_test.c | 23 ++++++ test/cairo_test.h | 4 + - test/coverage-ref.png | Bin + test/coverage-ref.png | Bin 0 -> 629 bytes test/coverage.c | 181 +++++++++++++++++++++++++++++++++++++++++++++++++ - test/romedalen.png | Bin + test/romedalen.png | Bin 0 -> 80944 bytes 9 files changed, 253 insertions(+), 2 deletions(-) commit 6dce601fd3cd7f6c8ebe72240e6be7c223ccbdcb @@ -12051,12 +10879,12 @@ Date: Fri Jan 21 11:27:56 2005 +0000 Update reference images for new rasterization in libpixman 0.1.3. ChangeLog | 5 +++++ - test/fill-rule-ref.png | Bin - test/fill_rule-ref.png | Bin - test/leaky-polygon-ref.png | Bin - test/leaky_polygon-ref.png | Bin - test/line-width-ref.png | Bin - test/line_width-ref.png | Bin + test/fill-rule-ref.png | Bin 1983 -> 1979 bytes + test/fill_rule-ref.png | Bin 1983 -> 1979 bytes + test/leaky-polygon-ref.png | Bin 264 -> 255 bytes + test/leaky_polygon-ref.png | Bin 264 -> 255 bytes + test/line-width-ref.png | Bin 167 -> 171 bytes + test/line_width-ref.png | Bin 167 -> 171 bytes 7 files changed, 5 insertions(+), 0 deletions(-) commit 1463fbb6c90a9a6faff0d4d1b65d375e416dafd4 @@ -12470,9 +11298,9 @@ Date: Thu Jan 13 14:50:35 2005 +0000 ChangeLog | 5 +++ test/.cvsignore | 1 + test/Makefile.am | 3 ++ - test/leaky-polygon-ref.png | Bin + test/leaky-polygon-ref.png | Bin 0 -> 264 bytes test/leaky-polygon.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ - test/leaky_polygon-ref.png | Bin + test/leaky_polygon-ref.png | Bin 0 -> 264 bytes test/leaky_polygon.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 173 insertions(+), 0 deletions(-) @@ -12528,9 +11356,9 @@ Date: Wed Jan 12 14:38:22 2005 +0000 Add big_star_path which shows we still have fill bugs, (even now that little_star_path is working). - test/fill-rule-ref.png | Bin + test/fill-rule-ref.png | Bin 408 -> 1983 bytes test/fill-rule.c | 58 ++++++++++++++++++++++++++++++++++++++++------- - test/fill_rule-ref.png | Bin + test/fill_rule-ref.png | Bin 408 -> 1983 bytes test/fill_rule.c | 58 ++++++++++++++++++++++++++++++++++++++++------- 4 files changed, 98 insertions(+), 18 deletions(-) @@ -13294,9 +12122,9 @@ Date: Wed Oct 27 10:48:58 2004 +0000 ChangeLog | 6 +++ test/.cvsignore | 1 + test/Makefile.am | 26 +++++++++----- - test/fill-rule-ref.png | Bin + test/fill-rule-ref.png | Bin 0 -> 408 bytes test/fill-rule.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ - test/fill_rule-ref.png | Bin + test/fill_rule-ref.png | Bin 0 -> 408 bytes test/fill_rule.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 204 insertions(+), 9 deletions(-) @@ -13394,13 +12222,13 @@ Date: Tue Oct 26 14:38:43 2004 +0000 test/cairo-test.h | 50 ++++++++++ test/cairo_test.c | 191 +++++++++++++++++++++++++++++++++++++ test/cairo_test.h | 50 ++++++++++ - test/line-width-ref.png | Bin + test/line-width-ref.png | Bin 0 -> 167 bytes test/line-width.c | 63 ++++++++++++ - test/line_width-ref.png | Bin + test/line_width-ref.png | Bin 0 -> 167 bytes test/line_width.c | 63 ++++++++++++ - test/move-to-show-surface-ref.png | Bin + test/move-to-show-surface-ref.png | Bin 0 -> 100 bytes test/move-to-show-surface.c | 69 +++++++++++++ - test/move_to_show_surface-ref.png | Bin + test/move_to_show_surface-ref.png | Bin 0 -> 100 bytes test/move_to_show_surface.c | 69 +++++++++++++ test/read-png.c | 166 ++++++++++++++++++++++++++++++++ test/read-png.h | 45 +++++++++ diff --git a/ChangeLog.pre-1.2 b/ChangeLog.pre-1.2 index e5b845d..b356078 100644 --- a/ChangeLog.pre-1.2 +++ b/ChangeLog.pre-1.2 @@ -1,4244 +1,3 @@ -commit 7cac87c8041f63fac2e0a2f5a29e36ed80d8d51a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 21:15:41 2006 -0500 - - [Makefile.am] Pass tag message to git-tag in release-publish - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 953332d128120e7c4f4197390984be11a80a368b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 21:13:49 2006 -0500 - - [Makefile.am] Minor fixes in release-publish output - - Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 5cb556b5e9f29195cc5df62b3f65c6b6c1e4305c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 20:11:25 2006 -0500 - - [configure.in] Increase version to 1.2.7 post release - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8878bbc549a01868853ff6270b986e57c6474d88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 19:59:50 2006 -0500 - - Released cairo-1.2.6. - Update version to 1.2.6 and libtool version to 11:3:9 - - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f9f5db06188db527d485f3a9b2589ddb84a7d7bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 19:59:27 2006 -0500 - - [doc] Update templates prior to release - - doc/public/tmpl/cairo-text.sgml | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 79d4d97658c71fb18c5973153b301f9010e04a6e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 19:58:40 2006 -0500 - - Makefile.am: Remove boilerplate out of DIST_SUBDIRS - - Bad bad different changes in the same commit. - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dbdb28252b497a84933b74ae8ce124a7528931fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 19:52:03 2006 -0500 - - Add notes for the 1.2.6 release. - - NEWS | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 60 insertions(+), 0 deletions(-) - -commit 76cc6af100ca5588a36a42eaddeacbdfc288bb82 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Oct 26 15:52:21 2006 -0700 - - Make xlib and xcb backends tolerant of single-bit errors in the test suite output. - - Manually "cherry picked" from 61bf9b009b47312c20d54198790542cd20fc5576 - (the cherry-pick command cannot handle the file renames and - indentation changes involved here). - - test/cairo-test.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit ad4f0ba2d59cb417498408606ec1466dae723715 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 5 22:25:21 2006 -0700 - - Move target tolerance to cairo_test_target structure (should let single-pixel SVG errors pass) - - Previously we were setting the target tolerance based on the surface - type. But that doesn't work as multiple backends will provide a surface - of type meta. So instead we put the tolerance as a value in the - cairo_test_target data structure. - - With this change, some single-pixel errors of 1 in the SVG backend - should now be ignored. - - Manually "cherry picked" from bcb7863f00b4cfdf0985993067fc32d07b81540b - (the regular cherry-pick command cannot handle the file renames and - indentation changes involved here). - - test/cairo-test.c | 109 +++++++++++++++++++--------------------------------- - 1 files changed, 40 insertions(+), 69 deletions(-) - -commit 02497b39c86e451cd12cf21f860fbdacc59afe38 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 31 04:01:10 2006 -0700 - - test: Ignore single-bit errors for SVG backend. - - The interface of the various buffer/image_diff functions is improved to - provide the maximum pixel difference in addition to the number of pixels - that differ. This value can then be used to compare against a per-backend - tolerance. - - Currently I've set the SVG backend's tolerance to 1 to handle some issues - we're currently seeing of single-bit differences on different systems, (but - we're not exactly sure why yet). - - Also I improved the image_diff routines to properly report a status value - on failure rather than the bogus value of -1 for pixels_changed. - - Cherry-picked from d1834cca192fe6f8e429be0461fab6914e04024d - (and fixed ever so slightly to actually compile). - - Makefile.am | 2 +- - test/buffer-diff.c | 96 +++++++++++++++++++++++++++---------------- - test/buffer-diff.h | 63 +++++++++++++++++++++------- - test/cairo-test.c | 111 ++++++++++++++++++++++++++++++++++++-------------- - test/imagediff.c | 19 ++++++-- - test/xlib-surface.c | 75 +++++++++++++++++++--------------- - 6 files changed, 244 insertions(+), 122 deletions(-) - -commit 11127fc21009cfa55312fcab8aed43470f7e4cc0 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 30 23:41:48 2006 -0700 - - test: Remove custom read/write-png code in favor of using cairo surfaces - - Also combine image_diff and image_diff_flattened into a single function - - This was manually taken from 95475218858792ccb20ac6ad28db22e233c783d7 - (It would have been a cherry-pick, but that doesn't yet handle file - renames.) - - test/Makefile.am | 4 - - test/buffer-diff.c | 260 ++++++++++++++++++++++------------------------------ - test/cairo-test.c | 4 +- - test/cairo-test.h | 7 ++ - test/imagediff.c | 2 - - test/read-png.c | 196 --------------------------------------- - test/read-png.h | 45 --------- - test/write-png.c | 99 -------------------- - test/write-png.h | 35 ------- - 9 files changed, 117 insertions(+), 535 deletions(-) - -commit 37dcbe61cf8881aa4b3101d96235ad9abe7ef1bb -Author: Tor Lillqvist <tml@iki.fi> -Date: Thu Nov 2 17:17:44 2006 -0500 - - [win32] Use CAIRO_FORMAT_RGB24 for BITSPIXEL==32 surfaces too - - From: - - http://lists.freedesktop.org/archives/cairo/2006-October/008122.html - - src/cairo-win32-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 892a050007eafddced21c03d9f10397dacabfd2b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 2 12:19:10 2006 -0500 - - [win32] Remove _cairo_win32_surface_show_glyphs() - The one copied from master didn't compile, needed a lot more code to be - backported. Lets just use the fallback paths. - - src/cairo-win32-surface.c | 107 +-------------------------------------------- - 1 files changed, 1 insertions(+), 106 deletions(-) - -commit 48d54e8a323adbbc725d9639ddbef2d99c495b0d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 1 19:00:26 2006 -0500 - - [slim] hide cairo_pattern_status() #8551 - (cherry picked from a13d58ff3af5ed85313b5af651c1d69f5e38fa06 commit) - - src/cairo-pattern.c | 1 + - src/cairoint.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 76026c89c24c97abfa455854e1c045c64af0b87c -Author: Jamey Sharp <jamey@minilop.net> -Date: Wed Nov 1 18:59:24 2006 -0500 - - [slim] hide cairo_version_string() - - Adrian's recent commits broke PLT hiding by calling cairo_version_string - from inside cairo. Add slim_hidden_def and slim_hidden_proto for it. - (cherry picked from 445251cc79d87b73a2ccd7891f9a5a33b89927a4 commit) - - src/cairo.c | 1 + - src/cairoint.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 510aae20005acf4ed1d91edcb07df688f6ce1fed -Author: Miklós Erdélyi <erdelyim@gmail.com> -Date: Wed Nov 1 16:08:30 2006 -0500 - - Pass correct surface to create_similar in _cairo_clip_init_deep_copy() - - This is already done in master as part of other changes. - Submitted here: - http://lists.freedesktop.org/archives/cairo/2006-August/007698.html - - src/cairo-clip.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b20171cf303cd4404fee31da77128a57c3ad4a8d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 25 21:40:08 2006 -0400 - - [PDF] Set CTM before path construction - - The previous order is undefined according to the PDF spec. The resulting PDF - was being misrendered using OS X Preview viewer. This was reported in this - thread: - - http://lists.freedesktop.org/archives/cairo/2006-October/008271.html - (cherry picked from e1ded5b1e042c8cefa7f136228d5a63a7bdf84b5 commit) - - src/cairo-pdf-surface.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit cc8dd91ac2bdbd5d366ab29872f71a9a3a7a25a0 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Oct 23 11:57:16 2006 -0700 - - test: Update reference images due to previous change to _cairo_color_compute_shorts - - The previous change was in b62710d4f8602203d848daf2d444865b611fff09 - We just forgot to update the reference images at the time so there - have been false failure results in the test suite until now. - (cherry picked from 670b3ce2432154cc0611a31c5b5e37c8a3ddf1f5 commit) - - test/caps-joins-alpha-ref.png | Bin - test/fill-and-stroke-alpha-add-ref.png | Bin - test/fill-and-stroke-alpha-ref.png | Bin - test/linear-gradient-ref.png | Bin - test/mask-ref.png | Bin - test/mask-rgb24-ref.png | Bin - test/operator-source-ref.png | Bin - test/operator-source-rgb24-ref.png | Bin - test/paint-source-alpha-pdf-argb32-ref.png | Bin - test/paint-source-alpha-ref.png | Bin - test/paint-with-alpha-ref.png | Bin - test/push-group-ref.png | Bin - test/push-group-rgb24-ref.png | Bin - test/set-source-ref.png | Bin - test/set-source.c | 4 +--- - test/trap-clip-ref.png | Bin - 16 files changed, 1 insertions(+), 3 deletions(-) - -commit 28fec29345e6e115d14fbdabe91f82100191c3d7 -Author: Christian Biesinger <cbiesinger@web.de> -Date: Sun Oct 22 12:47:43 2006 +0200 - - Add missing ) in comment - (cherry picked from d6ebe07be214461b6d456ebdbdc5acfd432e0178 commit) - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 60d65de1593d349d545516e360c5fb04cbdbbc71 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Oct 18 15:18:11 2006 -0700 - - Add neglected reference images for infinite-join test - (cherry picked from 40e1c0246da1e79b70d4b89b7735e6fec329c56e commit) - - test/.gitignore | 1 + - test/Makefile.am | 2 ++ - test/infinite-join-ps-argb32-ref.png | Bin - test/infinite-join-ref.png | Bin - 4 files changed, 3 insertions(+), 0 deletions(-) - -commit d0bca72499c7fc54ab2beff57b7985b56633f50b -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 21 15:17:59 2006 -0700 - - Fix infinite-join test case (bug #8379) - - The trick for this was to carefully ensure that the pen always has - at least 4 vertices. There was a previous attempt at this in the - code already but the test case had a combination of matrix and radius - that resulted in a value that was just able to sneak past the previous - check. - (cherry picked from 10cd23d51fbfc99d6e3e401440eebb56df3b3327 commit) - - src/cairo-pen.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 137ced1dd7a8d6a161be8f3b7e186cf60ce59d91 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Oct 18 15:01:58 2006 -0700 - - test/infinite-join: Modify to draw something visible, and make the output a more reasonable size. - - The modification was performed with care to ensure that the bug - is still exercised. Also, reference images are added. - (cherry picked from 5b7a7f39ad8b726e9ee582bcd10500a1e5b16554 commit) - - test/infinite-join.c | 15 +++++++++++---- - 1 files changed, 11 insertions(+), 4 deletions(-) - -commit 75b6d21ed5af7bb25d760423f6de2610bbbc24f0 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 21 15:15:02 2006 -0700 - - Add assert statement so the infinite-join test simply exits rather than looping infinitely. - (cherry picked from 5492a7c7618a747130b844a509fb79b886f1bc54 commit) - - src/cairo-pen.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 16a08ff1b03a7fc110dc3359f030ea6ff8af03a7 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 21 15:13:47 2006 -0700 - - Add test case from bug #8379 demonstrating infinite loop during round join - (cherry picked from 8744929030ed8d42c271d9abb202975f62de166c commit) - - test/Makefile.am | 1 + - test/infinite-join.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 74 insertions(+), 0 deletions(-) - -commit 459223945e0e974e4de7ae158d0a218c67434add -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 18 10:59:10 2006 -0400 - - [configure.in] Require pkg-config 0.19. (#8686) - (cherry picked from 157663e1fdf120a71c6cc8222b88d2915a5a73eb commit) - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d2ab45fed7bd38cde000a158294784bd2292ca26 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 30 14:43:21 2006 -0700 - - Bug #7497: Change _cairo_color_compute_shorts to not rely on any particular floating-point epsilon value. - (cherry picked from b62710d4f8602203d848daf2d444865b611fff09 commit) - - src/cairo-color.c | 24 ++++++++++++++++-------- - 1 files changed, 16 insertions(+), 8 deletions(-) - -commit 97a712ce4e8a237c0dd55a1ba7ed8fce1f7e78d9 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Sun Oct 15 23:11:30 2006 +0930 - - PDF: Add cairo version to document info dictionary - (cherry picked from 830804c7aec0334953bdc6f4704da6d404fc030a commit) - - src/cairo-pdf-surface.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 916ccab198546c3d32daa3f79071ded83bd5809a -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Sun Oct 15 23:11:01 2006 +0930 - - PS: Add cairo version to PS header - (cherry picked from 5aaa1988c7e27ed7acd002ee0fb8d344444b46dd commit) - - src/cairo-ps-surface.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit d883217773913f3f6fc67e8ce97737ddd53b0d28 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Sun Oct 15 23:09:35 2006 +0930 - - Type1 subsetting: Don't put .notdef in Encoding when there are 256 glyphs - - Type1 subsetting adds the .notdef glyph to the subset because the Type 1 - spec requires that it be defined. However if the subset already has - 256 glyphs, this will cause the Encoding vector to have 257 entries - which ghostscript does not like. - (cherry picked from 753763ff258760688ef5a594a204fa8f2be7e4a4 commit) - - src/cairo-type1-subset.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit df7faeff4e4bbb66c0651a066b694581c4165ad3 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Sun Oct 15 23:02:20 2006 +0930 - - Correct an unsigned to signed conversion problem in truetype subsetting bbox - (cherry picked from d1fb02b5b93c9a456411e9eb56f3ee136b33d9e7 commit) - - src/cairo-truetype-subset.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 3f519f672a22626f97118d96051bc793a2c4cd6b -Author: Christian Biesinger <cbiesinger@web.de> -Date: Tue Oct 10 12:38:33 2006 -0700 - - fix comment: pixman_private needs to be before the type of a variable - - Makes the documentation match the code. - Compare also commit 34d11aa3c45ba672b34d0a17f672f907305f3893 - (cherry picked from 38dcddd79ef95b04bf8d6ff8336cb997875df41b commit) - - pixman/src/slim_internal.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 07009ab72f1205680a5661dbea1681c9ad8f68c4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 8 17:07:17 2006 -0400 - - [slim] hide cairo_glitz_surface_create() (#8551) - (cherry picked from f6a2811c87def7b1bc70a2014d93df8feab2e2f4 commit) - - src/Makefile.am | 2 +- - src/cairo-glitz-private.h | 41 +++++++++++++++++++++++++++++++++++++++++ - src/cairo-glitz-surface.c | 2 ++ - 3 files changed, 44 insertions(+), 1 deletions(-) - -commit 2734968e2999eb7693f2bf6fb62446e593db749c -Author: Carl Worth <cworth@cworth.org> -Date: Wed Oct 4 18:34:09 2006 -0700 - - Fix typo that was resulting in device glyph_extents of INT16_MAX in some cases. - (cherry picked from f1db0135476a039ea43dfd67c56763b05aea2ec4 commit) - - src/cairo-scaled-font.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c6beeda701b24e5056615a261f21da12a42636ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 5 11:51:25 2006 -0400 - - [Makefile.am] Pass srcdir down to the tests - (cherry picked from 2041db91968c7c06cdb2e454f572c50d75144d29 commit) - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 405d5b7dcabb33c94b648460c7196bd188690cea -Author: Carl Worth <cworth@cworth.org> -Date: Wed Oct 4 14:58:06 2006 -0700 - - Add new _cairo_pattern_create_for_status so that patterns properly propagate errors. - - In particular, many possible error values on a surface provided - to cairo_pattern_create_for_surface were previously being swallowed - and a nil pattern was returned that erroneously reported - CAIRO_STATUS_NO_MEMORY. - (cherry picked from 01502471e31aa28a910039a918ff2aec3810d3c1 commit) - - src/cairo-pattern.c | 52 +++++++++++++++----------------------------------- - 1 files changed, 16 insertions(+), 36 deletions(-) - -commit 20d7a556cef03405f57d1380370682a3579eb729 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Oct 4 14:56:33 2006 -0700 - - Fix cairo_image_surface_create to report INVALID_FORMAT errors. - - This adds a new nil cairo_image_surface to hold CAIRO_STATUS_INVALID_FORMAT. - Previously the detected error was being lost and a nil surface was - returned that erroneously reported CAIRO_STATUS_NO_MEMORY. - (cherry picked from 4d2b54a271f722de9802ca68246ce6afba89f830 commit) - - src/cairo-image-surface.c | 52 +++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 50 insertions(+), 2 deletions(-) - -commit e4ff87ea596ce6316b1cad8008cb5436eef9a86b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 2 14:35:35 2006 -0400 - - [check-headers.sh] Don't use '\>' regexp syntax - (cherry picked from 1e0e2075090c181dcd9f431833a8a9c2665d763e commit) - - src/check-headers.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 372e631a833c3d61b03804c3184359002b1861f3 -Author: Alfred Peng <alfred.peng@sun.com> -Date: Fri Sep 29 17:17:27 2006 -0700 - - Use pixman_private consistently as prefix not suffix - (cherry picked from 34d11aa3c45ba672b34d0a17f672f907305f3893 commit) - - pixman/src/icint.h | 2 +- - pixman/src/icrop.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit a3ac198b0ab380225f8998f20e5423036f0dadcb -Author: Alfred Peng <alfred.peng@sun.com> -Date: Fri Sep 29 17:16:47 2006 -0700 - - Add Sun Pro C definition of pixman_private - (cherry picked from c1495742f76ce380aaa48389bc331723b7a3a141 commit) - - pixman/src/slim_internal.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit ba8b0c0268e7f2cfcc32b7918730d0b10eadcf61 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 29 17:08:53 2006 -0700 - - Fix dependency of 'make doc' so that necessary header files are built first. - (cherry picked from 28cc64aa20cd15f78109f4481bd1c08627c87e46 commit) - - Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 4c838dddd1912562042db3fe1b9f078ec583d63a -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 29 16:59:27 2006 -0700 - - Rename docs-publish target to doc-publish in order to be consistent with the doc target. - (cherry picked from deef1a667536ec67ff1d7b42a1f8179e1eac4715 commit) - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d65a8fd422effc4a943bae8d82e5531e7924f12b -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 29 16:58:51 2006 -0700 - - Fix Makefile bug preventing 'make doc' from succeeding - (cherry picked from e6575fb3c76ec2cda742e05c24958a7000d488dd commit) - - doc/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0a59ab7d553a3307bf1fb86487ef9cc0823fe625 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 29 16:46:39 2006 -0700 - - Fix typo in documentation of cairo_in_fill (thanks to Jonathan Watt) and clarify a bit. - (cherry picked from b99d41a0b075ec405d14ea8b6bbcaa50aa35e890 commit) - - src/cairo.c | 24 +++++++++++++++--------- - 1 files changed, 15 insertions(+), 9 deletions(-) - -commit 57bca39e08f003ee4685d1cfb9fc88901dd1b520 -Author: Robert O'Callahan <rocallahan@novell.com> -Date: Mon Sep 25 16:24:33 2006 -0700 - - Remove redundant call to _cairo_surface_get_extents - - We called it just above with the same parameters. - (cherry picked from 17eeacfba844ea5f9592dff4621e6f721c27d6c5 commit) - - src/cairo-surface-fallback.c | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit b586c0456ee8ea96bcf91b24a5d0b80aed91db44 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 25 16:16:35 2006 -0700 - - Rename test from stale path-data name to copy-path - (cherry picked from e4dc73ab1cafeb8dd77d3ee3dc92d9a92be69542 commit) - - test/Makefile.am | 6 +- - test/copy-path-ps-argb32-ref.png | Bin - test/copy-path-ref.png | Bin - test/copy-path.c | 234 ++++++++++++++++++++++++++++++++++++++ - test/path-data-ps-argb32-ref.png | Bin - test/path-data-ref.png | Bin - test/path-data.c | 234 -------------------------------------- - 7 files changed, 237 insertions(+), 237 deletions(-) - -commit cfffc5022e4d40f0e7a4d179bcd5daf7107b18c8 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Sep 25 16:03:02 2006 -0700 - - Fix cairo_copy_path and cairo_copy_path_flat to propagate errors. - - One of these functions was already documented to be doing this, and - the other one should have been. Now the documentation and behavior - for both are consistent, (and the path-data test case verifies this). - (cherry picked from 5f833c134bd002853b9d1458b58350cfb1d40a94 commit) - - src/cairo-path-data-private.h | 3 +++ - src/cairo-path-data.c | 16 ++++++++++++++++ - src/cairo.c | 16 ++++++++++------ - test/path-data.c | 28 +++++++++++++++++++++++++++- - 4 files changed, 56 insertions(+), 7 deletions(-) - -commit b74b14ad45bf78679bf480e3080d088c15371533 -Author: Kristian Høgsberg <krh@redhat.com> -Date: Tue Sep 26 17:33:29 2006 -0400 - - Compute right index when looking up left side bearing. - - When looking up the short entries in the second part of - the hmtx table, compute the size of the first part correctly. - - Fix from Adrian, see: - - https://bugs.freedesktop.org/show_bug.cgi?id=8180#c12 - (cherry picked from f9165638bf485591abae52b759fba82caf048dc5 commit) - - src/cairo-truetype-subset.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit bdff62a4b61dac260d815ae0cdaa5b34d909c814 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 26 13:54:03 2006 -0400 - - [configure] Print out whether SVG and PDF surfaces can be tested - (cherry picked from 7c3062240ac036c8091ee9f0acce0aa3ea9df8ea commit) - - configure.in | 8 ++++++-- - src/check-def.sh | 2 +- - 2 files changed, 7 insertions(+), 3 deletions(-) - -commit 4085afc75d0b2e85011e05b8d79f8d2a3ebef6ce -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 19 10:13:36 2006 -0700 - - Add missing pixman_private to _FbOnes when a function. - - This was thanks to a report from crucible (run #2113) since it tested - with older versions of gcc (3.3.6) than most of the cairo developers - use, (so we had been getting the _FbOnes macro not the function). - (cherry picked from 82b710ebc214c46df6666ede486c0174b335bfdb commit) - - pixman/src/icint.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6e7610cc1f7f2431aa4b2455d4327d9de8b3a5dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 19 13:05:29 2006 -0400 - - check-def.sh: Only allow _cairo_.*_test_.* symbols, not all _cairo.* ones - (cherry picked from 42a0c6bd59e41c22a88386b389af36f37418de82 commit) - - src/check-def.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 73e7dff756df30ef064a4a9f36119ba72c4f3728 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 18 13:32:19 2006 -0400 - - cairo-directfb.h: Add missing cairo_public decorators - (cherry picked from 6c01b2ffb3c7a023f3932328b8067f4f5b83936c commit) - - src/cairo-directfb.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit ba76564270339ad9b3fca7ebd680aa94ed79b215 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 18 13:32:00 2006 -0400 - - cairo-pdf.h: Add missing cairo_public decorators - (cherry picked from 7bb72f645325960e0bef4595ed7e9f1bb391796c commit) - - src/cairo-pdf.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8a1d9ca2ddb3da8338d2d9f9f1c7cc29718cc78c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 18 13:28:29 2006 -0400 - - check-headers.sh: Add a test for cairo_public decorators in public headers - Test fails currently because of bug 8313 and similar issues. - (cherry picked from 01f10fb27a675ff26bb0c0ca6748479215e6d6bd commit) - - src/Makefile.am | 2 +- - src/check-headers.sh | 21 +++++++++++++++++++++ - 2 files changed, 22 insertions(+), 1 deletions(-) - -commit cb46125b5f6676f15fef9091c7912d6ec369b626 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Sep 13 15:25:07 2006 -0700 - - Fix typo in error message (enhacement -> enhancement) - (cherry picked from edfceea853dd6ae189843f138478c7d43fb98367 commit) - - src/cairo-image-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 87569840412698599e324482f6117522f9ae58f4 -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Sat Sep 9 19:52:48 2006 -0700 - - Correctly acquire/release mutex in _cairo_scaled_font_map_destroy - - _cairo_scaled_font_map_destroy needs to both lock/unlock the mutex, - not just unlock it. - (cherry picked from 5ab72579ef2a9fce1aedf3068825ccba683b6e79 commit) - - src/cairo-scaled-font.c | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit 48e0509f932dde5c847dfc0e9f5ef92d69abe2fc -Author: Carl Worth <cworth@cworth.org> -Date: Sat Sep 9 16:04:19 2006 -0700 - - test/bitmap-font: Fix arguments to FcFreeTypeQuery to avoid warnings. - (cherry picked from 416e94532b1584b2ff23dd270c70ab900d55c326 commit) - - test/bitmap-font.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit baca4a50ac3485c190baf909c31465cdcfc20c03 -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Sat Sep 9 17:06:21 2006 -0700 - - [win32] Misc win32 compilation fixes - - Fix win32/MSVC defines for snprintf, inline, and M_PI - (cherry picked from 3c5a02c3edf300494cebfe746292b1eeeea08595 commit) - - src/cairoint.h | 5 +++++ - test/cairo-test.h | 7 ++++++- - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 387499c650430b389d0af81e4c0e14a347f8266d -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Sat Sep 9 17:05:00 2006 -0700 - - [win32] Make cairo as a win32 static library possible - - This adds a win32 initialization function that is called from all - surface creation and font creation functions to ensure that the win32 - mutexes are initialized. - (cherry picked from dbd0fa193c77a6cb112b4862c72c3a18209a755e commit) - - src/cairo-win32-font.c | 10 ++++++++++ - src/cairo-win32-private.h | 3 +++ - src/cairo-win32-surface.c | 29 ++++++++++++++++++++++++----- - 3 files changed, 37 insertions(+), 5 deletions(-) - -commit 2be2b112310ec1dff8e0adae25ec84812e807d9b -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 7 16:10:40 2006 -0700 - - Use new return value from _cairo_output_stream_destroy - - This is a little simpler than the old idiom of calling - _cairo_output_stream_get_status just before calling - _cairo_output_stream_destroy. - - I had hoped this technique would apply in more cases, but - many cases want to separate the two actions anyway to do - conditional assignment of the status value, (in order to - not overwrite an earlier error value). - (cherry picked from 179f7defdffb254936592a02208c338c13466253 commit) - - src/cairo-pdf-surface.c | 3 +-- - src/cairo-svg-surface.c | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit d0657f65dd03415a83d0b56585d6f4116e806b9c -Author: Carl Worth <cworth@cworth.org> -Date: Thu Sep 7 16:01:07 2006 -0700 - - Make _cairo_output_stream_destroy return the stream's status as a last gasp. - (cherry picked from 89e7d5d4208bd943c884d4261dc7484ac654132c commit) - - src/cairo-output-stream-private.h | 12 +++++++++--- - src/cairo-output-stream.c | 26 ++++++++++++++++---------- - 2 files changed, 25 insertions(+), 13 deletions(-) - -commit 13612ac7a876e4969304713a346a0ef3bf7eaece -Author: Nicholas Miell <nmiell@gmail.com> -Date: Wed Sep 6 14:43:44 2006 -0700 - - Make the SLIM macros robust in the face of macro-renamed symbols - - This doesn't actually fix the AMD64 link failure, but it does make the - foo/EXT_foo/INT_foo symbol names generated by the slim_hidden_proto() - and slim_hidden_def() macros consistent in the face of the meddling of - pixman-remap.h. - - Signed-off-by: Nicholas Miell <nmiell@gmail.com> - (cherry picked from 203d70a562ce3ffca51069aecda01a9f2bb61ff5 commit) - - pixman/src/slim_internal.h | 5 +++-- - src/cairoint.h | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit d4793cb997865789f90692a53e2bf3a77e8d5aee -Author: Nicholas Miell <nmiell@gmail.com> -Date: Wed Sep 6 15:45:00 2006 -0700 - - Fix the AMD64 final link by removing SLIM from pixman - - In order for SLIM's PLT indirection avoidance to work, everything in - the library that makes internal function calls needs to see the - relevant slim_hidden_proto() macro in addition to the function's - prototype. However, external headers used by clients of the shared - library should not use the SLIM macros at all. - - Pixman is a rather odd case -- it's mostly independent from cairo, so - it has it's own public interface, but it's built as a part of cairo - instead of its own shared library. This means that cairo would need to - see all of pixman's slim_hidden_proto() macros in order to function - and it doesn't currently, which results in a link failure on AMD64 - systems and on i386 systems (I think, I haven't actually verified - this) it produces a shared object that isn't actally sharable. - - I have no idea why exactly the link failure only showed up as a result - of commit e06246b9b1015eb89112f628d5820fcb350a7335. I think it has - something to do with the pixman functions no longer having PLT entries - at all, but the exact interaction isn't clear to me. - - However, all of these pixman functions aren't part of the cairo ABI - (which is why they were marked pixman_private in the first place), - which means that the SLIMification of pixman is largely pointless -- - they aren't externally visible, so they don't need PLT entries at - all. Furthermore, while pixman may eventually be shared among cairo - and X, I'm told that this sharing will be source-level only, which - means it won't ever be an actual shared library and thus won't ever - need SLIM at all. - - So, I just removed all use of SLIM in pixman (leaving behind - slim_internal.h for the future edification of anyone who cares).This - fixes the AMD64 link failure and passes the check-plt & check-def - parts of make check. - - Signed-off-by: Nicholas Miell <nmiell@gmail.com> - (cherry picked from d598cd8d61863ff91f505241a773595aec7e8445 commit) - - pixman/src/fbpict.c | 1 - - pixman/src/iccolor.c | 1 - - pixman/src/icformat.c | 1 - - pixman/src/icimage.c | 4 ---- - pixman/src/icint.h | 13 ------------- - pixman/src/icrect.c | 1 - - pixman/src/pixregion.c | 8 -------- - 7 files changed, 0 insertions(+), 29 deletions(-) - -commit bd8790bbc502df2d446d68ca1cad523220b1c0d3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 6 16:39:18 2006 -0400 - - [x86-64] check-plt.sh: match on JU?MP_SLO as on x86-64 "SLOT" is truncated - (cherry picked from b5a64138bb9be97b96e6bf248c559e8d3c6d4ac1 commit) - - src/check-plt.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e46d73951d81fbc18baaf6649c0442637724b19a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 6 13:54:12 2006 -0400 - - Add scripts to sanity check the shared object for exported and PLT symbols - - src/check-def.sh checks that the list of symbols exported is the same as the - list of symbols in cairo.def, ie. symbols in public header files. (except for - symbols starting with _cairo) - - src/check-plt.sh checks that no PLT entries exist for local function calls. - This makes sure we keep the 'slim' annotations uptodate. - - These two are defined as tests in src/ and will be run during "make distcheck". - However, they are skipped if the commands 'nm' and 'readelf' are not found. - (We don't really rely on any functionality of eu-readelf, so using readelf - proper which should be more commonlly installed.) - (cherry picked from cd1b6650648b5a688b4b6c2d696d9434c824a13f commit) - - RELEASING | 36 +++++++----------------------------- - src/Makefile.am | 3 +++ - src/check-def.sh | 31 +++++++++++++++++++++++++++++++ - src/check-plt.sh | 17 +++++++++++++++++ - 4 files changed, 58 insertions(+), 29 deletions(-) - -commit b0c18ef2e8695a22ed3a1d0db8d91198b535bb9e -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 5 17:12:43 2006 -0700 - - RELEASING: Add note on checking for local symbol PLT entries. - (cherry picked from 4620b929ae84dfa08c1c9a4072e114f6b38e1bd9 commit) - - RELEASING | 30 ++++++++++++++++++++++++++++++ - 1 files changed, 30 insertions(+), 0 deletions(-) - -commit e14a7b0786ff778b813899bcc91b4f76c2287d36 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 5 16:52:34 2006 -0700 - - slim_hidden_proto: Move smeicolon from definition to use for consistency and legibility - (cherry picked from 60c4add26abe6b624d7569f35fa846d529ccea18 commit) - - src/cairo-ft-private.h | 6 +- - src/cairo-xlib-private.h | 2 +- - src/cairoint.h | 166 +++++++++++++++++++++--------------------- - src/test-fallback-surface.c | 2 +- - 4 files changed, 88 insertions(+), 88 deletions(-) - -commit 94ef526d4b1ad2b421971dcb95420b0d21a5a8fe -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 5 16:48:49 2006 -0700 - - Add many missing slim_hidden calls to bypass PLT entries for local use of public functions - (cherry picked from d7f08794ef194d0b86a749381472bfeb0a32d993 commit) - - src/cairo-font-options.c | 9 +++++ - src/cairo-font.c | 2 + - src/cairo-ft-font.c | 3 ++ - src/cairo-ft-private.h | 7 +++- - src/cairo-image-surface.c | 4 ++ - src/cairo-matrix.c | 1 + - src/cairo-pattern.c | 8 ++++ - src/cairo-png.c | 1 + - src/cairo-scaled-font.c | 9 +++++ - src/cairo-surface.c | 10 +++++ - src/cairo-xlib-private.h | 7 ++++ - src/cairo-xlib-surface.c | 1 + - src/cairo.c | 12 ++++++ - src/cairoint.h | 84 +++++++++++++++++++++++++++++++++++------- - src/test-fallback-surface.c | 3 ++ - 15 files changed, 145 insertions(+), 16 deletions(-) - -commit bbc0f3f87d281e19c6038a7b51c8247f5861658f -Author: Carl Worth <cworth@cworth.org> -Date: Tue Sep 5 16:45:01 2006 -0700 - - pixman: Add pixman_private decorations to hide pixman symbols from public interface - (cherry picked from e06246b9b1015eb89112f628d5820fcb350a7335 commit) - - pixman/src/fbmmx.h | 21 +++++++++ - pixman/src/icimage.h | 2 +- - pixman/src/pixman.h | 108 +++++++++++++++++++++++++---------------------- - pixman/src/renderedge.h | 10 ++-- - 4 files changed, 85 insertions(+), 56 deletions(-) - -commit 63b28849c622fe36b65100a5bc61832d3dd66481 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Tue Sep 5 14:53:33 2006 -0400 - - Improve error checking in TrueType subsetting - - TrueType subsetting will SEGV when using OpenType fonts with CFF outlines. - (cherry picked from ad78eb7692f6d080430bceb7b358403f6e91a637 commit) - - src/cairo-truetype-subset.c | 36 ++++++++++++++++++++++++------------ - 1 files changed, 24 insertions(+), 12 deletions(-) - -commit e194c9cdbe692f4e0b1b95fcdc41fd6e8dc8f07d -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Tue Sep 5 14:19:48 2006 -0400 - - Correct the value of /LastChar in the PDF Type 1 font dictionary. - (cherry picked from 49fa8d353b2926760fa92684546b2fc79985c782 commit) - - src/cairo-pdf-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 25e46ac93539fac9916bb537b5bb1a0f9fea9950 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Tue Sep 5 14:19:26 2006 -0400 - - Fix Type 1 embedding in PDF - - PDF Files with Type 1 fonts fail to open in any version of - ghostscript prior to 8.54. The problem is the hex encoding of the - encrypted portion of the font. The PDF reference says this should - only be in binary. - (cherry picked from d81de15804f210afe9905a4163a5e34ff2be5b5b commit) - - src/cairo-pdf-surface.c | 2 +- - src/cairo-ps-surface.c | 2 +- - src/cairo-scaled-font-subsets-private.h | 4 +++- - src/cairo-type1-subset.c | 11 ++++++----- - 4 files changed, 11 insertions(+), 8 deletions(-) - -commit ab1c334c7ea6c93cb9f998c499c2e160346c042f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 2 19:51:54 2006 -0400 - - [configure] Invalidate cached warning flags if list of flags changes - - such that one doesn't need to remove config.cache when when we add - new warning flags to be checked. - (cherry picked from e5a9c2330867ae11befa8a966aa0a50c31c82a32 commit) - - configure.in | 34 ++++++++++++++++++++++++---------- - 1 files changed, 24 insertions(+), 10 deletions(-) - -commit 80d8e695ff6f6ae0a282d720009d1ec6a982865b -Author: Carl Worth <cworth@cworth.org> -Date: Fri Sep 1 16:10:25 2006 -0700 - - bug 8104: Eliminate unused variables. Replicate assert statement to identify branch of interest. - (cherry picked from 7c97a787ebce4880d6b9fe47a13ad018ff2ecd31 commit) - - src/cairo-ft-font.c | 9 ++------- - 1 files changed, 2 insertions(+), 7 deletions(-) - -commit 4d7b341a7eb9d0f8ddd9f025867dcea7178c1a56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 31 14:21:51 2006 -0400 - - [test] Use FcFreeTypeQuery - (cherry picked from 7ad6e941017e070bf7d93afba4de5c49cd1ff533 commit) - - test/bitmap-font.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit eb388ca4cbd508cf329b96c5be58d7695832ba9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 31 13:18:37 2006 -0400 - - [test] Use $(srcdir) to find valgrind supressions - (cherry picked from 851dd63719d51f9b839784ba2761a1e2b2ecfbe5 commit) - - test/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1ae5dc7e78bbd926378d9d47714f885b60d7ca63 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 31 08:35:39 2006 -0700 - - Require librsvg >= 2.14.0 to test SVG backend - (cherry picked from 8d834c3a34a17de0e03841501ea107dee7b373d0 commit) - - configure.in | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit c55f71bdab977010cab1366f2ee2258999d8b7d5 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 30 15:38:15 2006 -0700 - - test: Add link to test log file in HTML output - (cherry picked from 5ef4c991f6ad00a37fc0645a38ba2cb9f832d9f1 commit) - - test/make-html.pl | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a08c0b43e2c2fd1a5070911edef448940fcab35a -Author: Christian Biesinger <cbiesinger@web.de> -Date: Thu Oct 26 21:40:35 2006 +0200 - - [beos] Fix build error - - Rename cairo_rectangle_fixed_t to cairo_rectangle_int16_t - as needed per commit 746f66c3fce6de39ac9afa7be8bcf8f74c750e85. - (cherry picked from 05a259d49368fb128b99d99f3776f8783df9d4ed commit) - - src/cairo-beos-surface.cpp | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit a5f068e10d72c20a55d20ca9f79508361d13fb80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 30 13:17:08 2006 -0400 - - [test] Add 128 to any diff component such that differences are visible - - test/buffer-diff.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 3252ad5ca630fe292babc061c01b8759ef49cde4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 28 22:44:15 2006 -0400 - - [PNG] Mark status volatile to fix gcc warning - - src/cairo-png.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b6e5f2b0fef00352930dfcc47a13f330a13b1d68 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 28 22:30:38 2006 -0400 - - [xlib] Bug 7593: rewrite loop to be more readable, and fix warnings - - Basically, it's evil to write a loop like: - - while ((c -= 4) > 0) { - ... - } - - for one reason that doesn't work if c is unsigned. And when c is signed, if - for some reason c is about -MAXINT, then it will overflow and not work as - expected. - - It's much safer (and more gcc warning friendly) to rewrite it as: - - unsigned int c; - - while (c >= 4) { - ... - c -= 4; - } - - src/cairo-xlib-surface.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 06a962886806be5e68061e24223c617980ac8248 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 28 19:00:48 2006 -0700 - - Eliminate conditions checking for unsigned or enum values less than 0. - - src/cairo-array.c | 2 +- - src/cairo-svg-surface.c | 4 ++-- - src/cairoint.h | 3 +-- - 3 files changed, 4 insertions(+), 5 deletions(-) - -commit 7d1399a4bb0d8d74a4294700e6040accccefff2a -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 28 18:58:27 2006 -0700 - - Put static first to avoid compiler warning. - - src/cairo-type1-subset.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1b7ced6614d809262cca08e7c5141b7ce740bfca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 28 18:47:37 2006 -0700 - - Bug #7593: Avoid unsigned loop control variable to eliminate infinite, memory-scribbling loop. - - Behdad chased this bug down when looking into bug #7593. This - bug is what finally motivated us to figure out how to get -Wextra - (for the "always true" comparisons of unsigned variables against - negative values). - - src/cairo-xlib-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 50003615f28862f68b609aa290ebffee24d5d643 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 28 18:54:35 2006 -0700 - - Add -Wextra (as well as -Wno-missing-field-initializers -Wno-unused-parameter) - - We'd been wanting some of the warnings in -Wextra for a long time, - but we had failed in tryingto squelch some of the undesired warnings. - We finally figured out how to do this correctly by simply ordering - the warnings correctly. - - configure.in | 20 ++++++++++++++++---- - 1 files changed, 16 insertions(+), 4 deletions(-) - -commit 5492946b0ced9b3e97f94ef097ee745c8a59df42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 23 12:29:49 2006 -0400 - - [image] Print out cairo version in the unsupported-format message - - src/cairo-image-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 96c8f92883322a785fa9fa55de93b8eb56afab64 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 22 22:00:58 2006 -0400 - - [test] bufferdiff: take abs of the pixel diffs. Oops! - - test/buffer-diff.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 988b5dcb7e50d9e08ff94cb98f6d9c91915bb9b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 21 23:27:17 2006 -0400 - - [ROADMAP] Remove 1.2.4 stuff out of the way - - ROADMAP | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -commit edf6f24e1b9673655f2b1c6e2060f9f2e46833e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 21 23:25:40 2006 -0400 - - [TODO] Add cairo_get_scaled_font - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3d6aec7334881168277877e7d69514568d08c322 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 21 23:24:49 2006 -0400 - - [ROADMAP] Add glyph cache inspection to 1.4 roadmap - - ROADMAP | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 782e3eb65b143a6e658eda69ba15da3ac432c711 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Mon Aug 21 12:52:56 2006 -0400 - - Get correct unhinted outlines on win32. - - The documentation for GetGlyphOutline() states that outline returned is grid - fitted and if an application requires an unmodified outline it can request an - outline for a font whose size is equal to the font's em unit. - - This seems to suggest that the solution to this bug would be to obtain the - unmodified outline data and scale it to the required size. - - https://bugs.freedesktop.org/show_bug.cgi?id=7603 - - src/cairo-win32-font.c | 86 ++++++++++++++++++++++++++++++++++-------------- - 1 files changed, 61 insertions(+), 25 deletions(-) - -commit 6de226be0e879709c4068cb7836d485e75928287 -Author: Yevgen Muntyan <muntyan@tamu.edu> -Date: Mon Aug 21 03:52:40 2006 -0400 - - Define WINVER if it's not defined. (bug 6456) - - src/cairoint.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 6ed1613b5175ea9c431fff2df2cd1cf2e2edbf93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 20 13:44:56 2006 -0400 - - [Makefile.am] Remove unnecessary parantheses that were causing trouble with old bash - Reported by Tor Lillqvist - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 047251db4337583075f6888fceecfb0c383d658a -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 18:30:31 2006 -0700 - - Increment version to 1.2.5 after making the 1.2.4 release - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 54755b2d9891981d813384bccde84998def96abf -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 18:19:10 2006 -0700 - - Remove stray ] that was breaking RELEASE_OR_PUBLISH and many make targets (release-publish, etc.) - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fadde879fbf8547aaa55e80d21611e7674cd5f8f -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 17:36:42 2006 -0700 - - Update version to 1.2.4 and libtool version to 11:2:9. - - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 43a25b818749d31268a60e2fcdaa11a73e41f7fd -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 17:35:33 2006 -0700 - - NEWS: Add notes for the 1.2.4 release. - - NEWS | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 68 insertions(+), 0 deletions(-) - -commit 790a359f89303875d58ff514d62ecff981836c86 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 16:46:57 2006 -0700 - - EXTRA_DIST: Add missing source-clip-scale-svg-ref.png - - test/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4f5bb53032d6d0509ef86bcc152ce2b52be49d38 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 16:35:58 2006 -0700 - - Ignore ChangeLog* in addition to ChangeLog - - .gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2860af3ce230cde87cc4623d1eb4a920b71bc0d6 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 16:35:27 2006 -0700 - - bitmap-font: Add missing pdf-specific reference image - - test/Makefile.am | 3 +-- - test/bitmap-font-pdf-argb32-ref.png | Bin - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit b8b507c0920ddef35363ba1d75e4ba0ca141a028 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 16:12:43 2006 -0700 - - Use &image->base as appropriate to avoid warnings. - - src/cairo-pdf-surface.c | 4 ++-- - src/cairo-ps-surface.c | 4 ++-- - src/cairo-svg-surface.c | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit 5f94275a4b667d8b1f41f87f1a6b84b3fa3f0616 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 16:09:53 2006 -0700 - - Update .gitignore due to recent rename. - - test/.gitignore | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d04b8148c2ccf714eb3f31855ca8b61d518423c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 18:55:52 2006 -0400 - - [TODO] Add some items from memory - - TODO | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 33b62f47a451cb3ee70e7343976f5d1f06adb443 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 15:08:58 2006 -0700 - - Move unscheduled features and bugs from ROADMAP to TODO - - ROADMAP | 101 +------------------------------------------ - TODO | 146 +++++++++++++++++++++++++++++++++++++++++++-------------------- - 2 files changed, 103 insertions(+), 144 deletions(-) - -commit d1be19e1604f77a0a156bea6d40914aa672c6d81 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 15:02:24 2006 -0700 - - Add notes on reporting bugs to BUGS file and move bugs listed there to ROADMAP instead. - - BUGS | 101 ++++++++++++++++++++++++++++++++++++++++---------------------- - ROADMAP | 51 ++++++++++++++++++++++++++++++++ - 2 files changed, 116 insertions(+), 36 deletions(-) - -commit 76fca1898c395a576dadffb35de0253b79b669c5 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 14:30:01 2006 -0700 - - EXTRA_DIST: Add several files to the tar file releases, (BUGS, CODING_STYLE, ROADMAP, etc. - - Makefile.am | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit ab092a9a5db70ac16e782cf0d7d3629cc902cc1e -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 14:25:53 2006 -0700 - - ROADMAP: Remove stray conflict marker - - ROADMAP | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 328024cc25cba67c939cf51da6ab6409635fa227 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 14:23:14 2006 -0700 - - ROADMAP: Punt the AIX -lpthread bug off of the 1.2.4 roadmap. - - ROADMAP | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 3cf3d4343b6f403b55014f2d259483e1fb688741 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 14:22:08 2006 -0700 - - Mark ft-text-vertical-layout tests as XFAIL since we'repunting these from the 1.2.4 release. - - ROADMAP | 6 +++++- - test/Makefile.am | 2 ++ - 2 files changed, 7 insertions(+), 1 deletions(-) - -commit ccdaaf7b950ea68c1149e2649e8379e564b636d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 17:18:34 2006 -0400 - - [ROADMAP] Mark xlib detection problem as fixed - - ROADMAP | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0e78e7144353703cbd28aae6a67cd9ca261f1d68 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 17:17:28 2006 -0400 - - [configure] Check for x11 pkg-config module before using AC_PATH_XTRA - Fixes bug 7491. - - configure.in | 19 +++++++++++-------- - 1 files changed, 11 insertions(+), 8 deletions(-) - -commit 0c6c0a9e0b3e8cd1caa25a2ee65b8384840295b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 17:02:24 2006 -0400 - - [configure] Use _NONPKGCONFIG_LIBS if no xrender pkg-config modele is found - - configure.in | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 84a9ca1835998a11b78f5989ce927166c2baa00f -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 13:07:08 2006 -0700 - - Rename ft-text-vertical-layout-truetype to ft-text-vertical-layout-type3 - - test/Makefile.am | 8 +- - test/ft-text-vertical-layout-truetype-ref.png | Bin - test/ft-text-vertical-layout-truetype-svg-ref.png | Bin - test/ft-text-vertical-layout-truetype.c | 154 --------------------- - test/ft-text-vertical-layout-type3-ref.png | Bin - test/ft-text-vertical-layout-type3-svg-ref.png | Bin - test/ft-text-vertical-layout-type3.c | 154 +++++++++++++++++++++ - 7 files changed, 157 insertions(+), 159 deletions(-) - -commit aa2260cfbbf5fd5c923409962814c6795e5ecc41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 15:49:38 2006 -0400 - - [ROADMAP] Add using alloca - - ROADMAP | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9c2d9d590b218db7edd74cb1ab7e24799bbb62eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 18 12:04:16 2006 -0400 - - [test] text-rotate: Update ref images to make image pass again - after the font_options change we made in the test suite a while back. - - test/text-rotate-ref.png | Bin - test/text-rotate-rgb24-ref.png | Bin - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit 861f1cb4f70cdbd7702eaf642b999a21ad01037d -Merge: c2d92d4... fbb1758... -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 07:56:52 2006 -0700 - - Merge branch 'jrmuizel-stroking-fixes' into cairo - - Conflicts: - - test/dash-caps-joins-ps-argb32-ref.png - test/degenerate-path-ps-argb32-ref.png - test/degenerate-path.c - -commit c2d92d4397f7ed7a8b7fdfa24a4e339ecb0d6d69 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 06:32:43 2006 -0700 - - ROADMAP: Mark the close path bug as fixed. - - ROADMAP | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c78c0110179f8f832e9096ad5e26f5887100cd59 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 06:31:15 2006 -0700 - - Don't set current point to (0,0) in close_path. - - The setting of current point to (0,0) is actually harmless, but it - definitely looks like a bug, (since after close_path the current point - is really the last move point). - - We don't keep track of last move point here, nor do we even need to. - So we can be consistent with _cairo_path_fixed_close_path by not - adjusting current point at all, (the subsequent move_to coming right - behind the close_path will fix up the current point). - - src/cairo-path-data.c | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 53f74e59faf1af78f2f0741ccf1f23aa5dad4efc -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 06:27:45 2006 -0700 - - Fix close-path failure by adding explicit move_to after close_path. - - Besides the bug fix, this is a user-visible change since the new - move_to element after the close_path element can be seen in the - results of cairo_copy_path, so we document that here. - - We are also careful to fix up _cairo_path_fixed_line_to to defer to - _cairo_path_fixed_move_to to avoid letting the last_move_point state - get stale. This avoids introducing the second bug that is also tested - by the close-path test case. - - src/cairo-path.c | 15 +++++++++++---- - src/cairo.c | 8 ++++++++ - 2 files changed, 19 insertions(+), 4 deletions(-) - -commit 200a2d811efab2e48d6b584b9da202effaddf99f -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 18 06:15:02 2006 -0700 - - close-path: New test case to demonstrate corner case discovered by Tim Rowley - - The bug shows up when doing cairo_copy_path_flat for a path that has - a curve_to immediately after a close_path. When the curve is flattened - the flattener is using (0,0) as the initial point rather than the proper - close_to point. - - This test also serves to ensure a similar bug doesn't crop up when - closing a path that begins with an implicit move_to, (as from cairo_arc). - In that bug the path state may have no last-move-point and the path - is closed to (0,0). This bug is not present currently, but did appear - during the development of a fix for the bug above. - - test/.gitignore | 1 + - test/Makefile.am | 3 + - test/close-path-ps-argb32-ref.png | Bin - test/close-path-ref.png | Bin - test/close-path.c | 84 +++++++++++++++++++++++++++++++++++++ - 5 files changed, 88 insertions(+), 0 deletions(-) - -commit 8330f4dbd123da57850756a194ba9f7558e6f9cc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 22:12:21 2006 -0400 - - [ROADMAP] Mark Type1 on win32 as done - - ROADMAP | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 64dd7a8203b6e393d9f763d49eea6dfb7bd13e0d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 22:10:27 2006 -0400 - - [SVG] Make dependent on --enable-png (and increase cache-version to 2) - - ROADMAP | 2 +- - configure.in | 5 ++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -commit 6f8cf53b1e1ccdbe1ab6a275656b19c6e5120e40 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 22:02:02 2006 -0400 - - [test] Don't use signals if signal.h is not available - - configure.in | 2 +- - test/cairo-test.c | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 474daa449325850b6427fb0d3fe511ca6d7c12ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 22:01:33 2006 -0400 - - [PNG] Include png.h after cairoint.h to avoid macro problems (bug 7744) - - src/cairo-png.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit da1019c9138695cb838a54f8b871bbfd0e8996d7 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Thu Aug 17 21:46:38 2006 -0400 - - Only use GGO_GLYPH_INDEX for truetype and opentype fonts on win32. - - src/cairo-win32-font.c | 52 +++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 43 insertions(+), 9 deletions(-) - -commit 9878a033531e6b96b5f27e69e10e90dee7440cd9 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 17:48:40 2006 -0700 - - Add (primitive) bitmap glyph tracing to fix bug #7889 - - ROADMAP | 4 +- - src/cairo-scaled-font.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 96 insertions(+), 4 deletions(-) - -commit e4e5002c48ec9cea37b4347689f193b54439383e -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 17:45:14 2006 -0700 - - bitmap-font: Add cairo_text_path;fill to demonstrate bug #7889 - - test/bitmap-font.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit 0bfa6d4f33b8ddb5dc55bbe419c15df4af856ff9 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 15:23:32 2006 -0700 - - Fix assertion failures in bitmap-font test by coercing A8 images to A1 - - There are still some problems in the resulting output: - - PDF: Rotated font ends up being blurry in final PNG (not too important) - PS and SVG: There's an incorrect offset being applied somewhere. - - src/cairo-image-surface.c | 26 ++++++++++++++++++++++++++ - src/cairo-pdf-surface.c | 9 ++++++++- - src/cairo-ps-surface.c | 9 ++++++++- - src/cairo-svg-surface.c | 10 +++++++++- - src/cairoint.h | 4 ++++ - 5 files changed, 55 insertions(+), 3 deletions(-) - -commit e8e7ccf602fdaa2f2e98743f96589f5b7b3faf17 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 13:54:06 2006 -0700 - - Add rotation to bitmap-font to demonstrate failure of bug #7888 - - test/bitmap-font-ref.png | Bin - test/bitmap-font-rgb24-ref.png | Bin - test/bitmap-font.c | 11 ++++++++++- - 3 files changed, 10 insertions(+), 1 deletions(-) - -commit 751ff78ff2acba36614bae17744427c385413264 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 20:50:24 2006 -0400 - - [ROADMAP] Add close_path behavior to 1.2.4. - - ROADMAP | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d7b52a8f448e39518a03b92acdf5db10c5527669 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 16:14:21 2006 -0700 - - Add long-lines to the XFAIL list, (we're not fixing it before 1.2.4) - - test/Makefile.am | 1 + - test/long-lines.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 74f6afcdd694d679535d28835740469a08f8ef72 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 16:11:58 2006 -0700 - - ROADMAP: Add fix of EXTEND_PAD and deprecation of FORMAT_RGB16_565 to 1.4 roadmap. - - ROADMAP | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 75b9395d0744ff77da588a101271ff765a177b27 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 13:47:32 2006 -0700 - - ROADMAP: Note that source-clip-scale is fixed - - ROADMAP | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ccf60202d32aa6ade83231e7255ca20e38f216be -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 13:34:26 2006 -0700 - - Add SVG-specific reference image for source-clip-scale test - - The difference here is that the SVG backend uses a meta-surface for - its similar surface, so there are no rasterization/filtering - artefacts when scaling the source surface. - - test/source-clip-scale-svg-ref.png | Bin - 1 files changed, 0 insertions(+), 0 deletions(-) - -commit 72e25648c4c4bc82ddd938aa4e05887a293f0d8b -Author: Vladimir Vukicevic <vladimirv@gmail.com> -Date: Thu Aug 17 13:28:58 2006 -0700 - - pixman: Use pSourceClip rather than pCompositeClip when fetching - - This fixes the source-clip-scale test failures for most backends. - - pixman/src/fbcompose.c | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) - -commit 64d2feb9f62d32f8189ea6a43420782e0c4a9373 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 17 10:37:46 2006 -0700 - - Harmonize implementations of source-clip and source-clip-scale to make similarities more evident. - - test/.gitignore | 1 + - test/source-clip-ref.png | Bin - test/source-clip-scale-ref.png | Bin - test/source-clip-scale.c | 56 ++++++++++++++++----------------------- - test/source-clip.c | 38 +++++++++++++-------------- - 5 files changed, 42 insertions(+), 53 deletions(-) - -commit 524507c39f2f495af426a8c41c6311efe3eb633f -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 16 16:18:18 2006 -0700 - - Rename src-clip test to source-clip-scale - - test/Makefile.am | 3 +- - test/source-clip-scale-ref.png | Bin - test/source-clip-scale.c | 100 ++++++++++++++++++++++++++++++++++++++++ - test/src-clip-ref.png | Bin - test/src-clip.c | 100 ---------------------------------------- - 5 files changed, 102 insertions(+), 101 deletions(-) - -commit afb50580ce0eaefe466ff63a2e0e597f35317f6b -Author: Vladimir Vukicevic <vladimirv@gmail.com> -Date: Wed Aug 16 16:04:24 2006 -0700 - - Add src-clip test case to demonstrate bug with clipping applying to a source surface. - - test/Makefile.am | 1 + - test/src-clip-ref.png | Bin - test/src-clip.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 101 insertions(+), 0 deletions(-) - -commit 540db69aefd9874d71af6102c5f9572288de09be -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 17 15:28:47 2006 -0400 - - [ROADMAP] Add more entries for 1.2.4. - - ROADMAP | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 6122cc85c8f71b1ba2df3ab86907768edebe1781 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 16 20:07:06 2006 -0400 - - [test] Add $(LDADD) to svg2png_LDADD, to link to correct cairo - Previously it was using the cairo found in system. - - test/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 30cd66fe9a017af9ab2e5b25a13ff70b66b62d17 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 16 19:43:55 2006 -0400 - - [test] Add ft-text-vertical-layout-truetype. - - test/ft-text-vertical-layout-truetype-ref.png | Bin - test/ft-text-vertical-layout-truetype-svg-ref.png | Bin - test/ft-text-vertical-layout-truetype.c | 154 +++++++++++++++++++++ - 3 files changed, 154 insertions(+), 0 deletions(-) - -commit 158e1602119d6cb1169a15b41c4fcac7edf735ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 16 19:43:41 2006 -0400 - - [.gitignore] Add truetype-tables - - test/.gitignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cbcf1ddd646cfe9a9f7b993d2b69ca1faa353f45 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 16 14:27:40 2006 -0400 - - [test] New torture tests ft-text-vertical-layout-truetype/type1 - that combine vertical layout with font_matrix rotation and translation. - Currently Type3 and Type1 font paths both show broken behavior. - The type1 test uses "Nimbus Sans L" as the font. - - test/.gitignore | 5 +- - test/Makefile.am | 15 ++- - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-ref.png | Bin - test/ft-text-vertical-layout-type1-ref.png | Bin - test/ft-text-vertical-layout-type1-svg-ref.png | Bin - test/ft-text-vertical-layout-type1.c | 154 +++++++++++++++++++++++ - test/ft-text-vertical-layout.c | 136 -------------------- - 10 files changed, 167 insertions(+), 143 deletions(-) - -commit c385922c198012c46f0c7638ce0ac36a41b9a014 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 14:15:47 2006 -0400 - - [ROADMAP] Add two assertion failures to 1.2.4 plans - - ROADMAP | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 89008ad1c7dc7539d1b41315f18910af7e638b75 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 13:53:08 2006 -0400 - - [FreeType] Use _cairo_ft_scaled_font_is_vertical where appropriate - instead of poking at the loadflags. - - src/cairo-ft-font.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b7bc263842a798d657a95e539e1693372448837f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 08:33:20 2006 -0400 - - [FreeType] Fix vertical metrics adjustment to work with non-identity shapes - - src/cairo-ft-font.c | 29 ++++++++++++++++++----------- - 1 files changed, 18 insertions(+), 11 deletions(-) - -commit d47388ad759b0a1a0869655a87d9b5eb6ae2445d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 07:29:18 2006 -0400 - - [PS] Set correct ImageMatrix in _cairo_ps_surface_emit_bitmap_glyph_data - which should be set to device_transform_inverse, not device_transform. - Moreover, no negation is needed anymore, as that has been working around - the inverse matrix :-). - - src/cairo-ps-surface.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 91eb56998c416cc21a1bbe2a6e66e85316ef4ddb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 05:49:21 2006 -0400 - - [test] ft-text-vertical-layout: Update ref images - - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-ref.png | Bin - 4 files changed, 0 insertions(+), 0 deletions(-) - -commit 4b3fadefc835cf627c3887a72d8cbb117d7ad5f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 05:48:12 2006 -0400 - - [FreeType] Fix comment about font coordinate - - src/cairo-ft-font.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit db779b5121ae548753b4559bd59b269e489c6567 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 05:27:59 2006 -0400 - - [test] ft-text-vertical-layout: Use the string "i-W" to better show vertical metrics - - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-ref.png | Bin - test/ft-text-vertical-layout.c | 12 ++++++------ - 5 files changed, 6 insertions(+), 6 deletions(-) - -commit f183b835b111d23e838889178aa8106ec84663b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 15 04:59:48 2006 -0400 - - Respect font_matrix translation in _cairo_gstate_glyph_path - - src/cairo-gstate.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 17ec33aa4f33919377d241bce01e2c395b2aa1b8 -Author: Emmanuel Pacaud <emmanuel.pacaud@free.fr> -Date: Mon Aug 14 20:19:15 2006 +0200 - - New test for long line bug. - - This shows at least an issue in cairo_fixed_from_double where values - > 32767 are converted to -32768, instead of being clamped to 32767. - - test/.gitignore | 1 + - test/Makefile.am | 2 + - test/long-lines-ref.png | Bin - test/long-lines.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 95 insertions(+), 0 deletions(-) - -commit 09e1eb04ca06aa5c188dc3bdad0dadadaa9fe31f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 14 00:15:44 2006 -0400 - - [ROADMAP] Update. Adding 1.2.4 milestone and a few other items - - ROADMAP | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -commit c802cd2d62be5fd0b11d6da10360788f20b721c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 13 20:16:22 2006 -0400 - - [Type1] Synch comments in the encoding table - - src/cairo-type1-subset.c | 126 +++++++++++++++++++++++++++++----------------- - 1 files changed, 80 insertions(+), 46 deletions(-) - -commit e5f36a54daf376f34596a285402a3e30ee0a6a64 -Author: Pavel Roskin <proski@gnu.org> -Date: Sun Aug 13 05:09:28 2006 -0400 - - [Type1] Use NULL instead of 0 - - Using NULL is encouraged for pointers. While fixing that, it turned out - that the comments indicating the current index were wrong, so I'm fixing - them too. - - src/cairo-type1-subset.c | 33 ++++++++++++++++++++------------- - 1 files changed, 20 insertions(+), 13 deletions(-) - -commit fdd7518b8be1975ae8f804eba7cf4738bd957e4a -Author: Pavel Roskin <proski@gnu.org> -Date: Sun Aug 13 05:02:46 2006 -0400 - - Update nil surface structs to the surface struct - - Quite a few fields were missing, but all zero, so didn't matter - practically, but comments were out of synch. - - src/cairo-surface.c | 30 +++++++++++++++++++++++++++--- - 1 files changed, 27 insertions(+), 3 deletions(-) - -commit a06af40c35ba8b5d9a0688cefc7eb8bd2e31e92d -Author: Pavel Roskin <proski@gnu.org> -Date: Sun Aug 13 04:47:11 2006 -0400 - - [test] Fix warnings in tests on 64-bit systems - - Cast argiments from size_t to int. size_t is 64-bit on 64-bit systems, - which causes a warning. The actual data should fit 32 bit comfortably. - - test/cairo-test.c | 2 +- - test/clip-operator.c | 4 ++-- - test/operator-clear.c | 4 ++-- - test/operator-source.c | 4 ++-- - test/trap-clip.c | 4 ++-- - test/truetype-tables.c | 2 +- - test/unbounded-operator.c | 4 ++-- - 7 files changed, 12 insertions(+), 12 deletions(-) - -commit 58963a2bf962559d579a84edde9af13d9f51d014 -Author: Pavel Roskin <proski@gnu.org> -Date: Sun Aug 13 04:44:39 2006 -0400 - - [test] Allow overriding Valgrind flags on the command line - - Don't hardcode Valgrind flags in tests/Makefile.am so that - tests/Makefile doesn't need to be rebuilt to use different flags. Not - everybody is looking for memory leaks. - - test/Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit b29cc61facbe75ff3afea58308e93b86d25cb03d -Author: Pavel Roskin <proski@gnu.org> -Date: Sun Aug 13 04:41:43 2006 -0400 - - [pixman] Don't cast pointers to integers - - This causes warnings on 64-bit platforms that may indicate very serious - problems. Fortunately, not in this case. - - pixman/src/fbmmx.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit abd16e47d6331bd3811c908e524b4dcb6bd23bf0 -Author: Jens Granseuer <jensgr@gmx.net> -Date: Fri Aug 11 13:06:37 2006 -0400 - - [configure] Let env-vars override backend CFLAGS/LIBS (bug 7838) - In particular, $png_REQUIRES can be used now to set the name of the pkg-config - module that contains libpng. - - configure.in | 31 ++++++++++++++++++------------- - 1 files changed, 18 insertions(+), 13 deletions(-) - -commit 97524a8fdb899de1ae4a3e920fb7bda6d76c5571 -Author: Jens Granseuer <jensgr@gmx.net> -Date: Fri Aug 11 11:51:10 2006 -0400 - - [warnings] Only use supported compiler warning flags - Also cache the result. - - configure.in | 53 +++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 37 insertions(+), 16 deletions(-) - -commit 22eee1db000ac03a8cbd0b0bdb689b6d3a127737 -Author: Kjartan Maraas <kmaraas@gnome.org> -Date: Fri Aug 11 11:18:24 2006 -0400 - - [warnings] Fixes for sparse. This fixes a lot of instances of 0 vs NULL - - pixman/src/fbcompose.c | 20 ++++++++++---------- - pixman/src/icimage.c | 22 +++++++++++----------- - pixman/src/icutil.c | 2 +- - 3 files changed, 22 insertions(+), 22 deletions(-) - -commit ab3b400bda61a8fc48bb74dc3134237ddce4a81f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 11 00:43:24 2006 -0400 - - [Makefile.am] Move ChangeLog creation voodoo to ChangeLog.mk - - ChangeLog.mk | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 83 +--------------------------------------------------------- - 2 files changed, 83 insertions(+), 82 deletions(-) - -commit affc9c71acc1ea206dee0a4056c4f5b307fc7f38 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 11 00:24:01 2006 -0400 - - [Makefile.am] Add $(AM_MAKEFLAGS) to recursive make invocations - - Makefile.am | 21 ++++++++++----------- - doc/Makefile.am | 2 +- - test/Makefile.am | 14 +++++++------- - 3 files changed, 18 insertions(+), 19 deletions(-) - -commit c04ccc95fa3cd4272889b1e66e4de5e1bef53ae0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 23:49:50 2006 -0400 - - [ChangeLog] Make ChangeLog creation faster by caching partial results - The ChangeLog.pre-* files once generated, cannot be outdated and don't need - update anymore, but the main ChangeLog needs update everytime a git operation - is performed (commit, checkout, etc.) Previously, we were forcing a ChangeLog - recreation by making it a phony target. Now, we break it into two parts: One - up to the latest tag (as returned by git-describe), and another from there. - The former is, again, up-to-date when it exists. The latter, we make it - depend on .git. And since the latter is pretty short anyway, you get a very - first regeneration of it when you change your repo (and that only happens - during 'make dist' by the way.) - - Makefile.am | 41 ++++++++++++++++++++++++++++++++--------- - 1 files changed, 32 insertions(+), 9 deletions(-) - -commit 9b5c5b75701e8f8d5270d248c0eaac07aa5eb52a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 20:41:05 2006 -0400 - - [ChangeLog] Remove 'fmt' formatting of the ChangeLogs - We assume that people write wrapped commit messages, which is true these days - but was not back in the CVS days. - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 91a59251806c3836cbc58b009aae8b016feab5a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 20:36:16 2006 -0400 - - Create multiple ChangeLog files segmented around major releases - For an imaginary cairo-3.6.4 version, we now will generate the following - ChangeLog files: - - ChangeLog - ChangeLog.pre-3.4 - ChangeLog.pre-3.2 - ChangeLog.pre-3.0 - ChangeLog.pre-2.0 - ChangeLog.pre-1.0 - - Makefile.am | 64 ++++++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 50 insertions(+), 14 deletions(-) - -commit ee885c76af0c715ffd316d4c7cc1b61db46af1ae -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 18:54:18 2006 -0400 - - [test] Update EXTRA_DIST after beos_bitmap -> beos-bitmap change - - test/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 915448e50f18d518c065dbde6d8857e4c91d2a51 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 15:35:36 2006 -0400 - - [test] Add target check-ref-dups that lists reference images having duplicate sha1sum hash - This is useful to review every once in a while to drop duplicate images that - can be dropped. For example, if there are two identical images one named - some-test-svg-rgb24-ref.png and other some-test-svg-argb32-ref.png, those two - can be replaced with some-test-svg-ref.png. - - test/.gitignore | 1 + - test/Makefile.am | 14 +++++++------- - 2 files changed, 8 insertions(+), 7 deletions(-) - -commit cecf396f6fe8424ec80f6f143df3622b92a5522e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 15:11:46 2006 -0400 - - [test] Point out to the test log file on failures - - test/cairo-test.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 15074cbb04498b59af4f3d9d3f2e99a2113e6730 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 14:58:33 2006 -0400 - - [test] Behave better if no ref image was found for a test - - test/cairo-test.c | 30 ++++++++++++++++++++---------- - 1 files changed, 20 insertions(+), 10 deletions(-) - -commit 67ff765e30af538a7955267c046af446dd8844ed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 13:53:24 2006 -0400 - - [test] Rename beos_bitmap target to beos-bitmap. Same for directfb-bitmap. - - test/cairo-test.c | 6 +++--- - test/mask-beos-bitmap-argb32-ref.png | Bin - test/mask-beos-bitmap-rgb24-ref.png | Bin - test/mask-beos_bitmap-argb32-ref.png | Bin - test/mask-beos_bitmap-rgb24-ref.png | Bin - test/set-source-beos-bitmap-rgb24-ref.png | Bin - test/set-source-beos_bitmap-rgb24-ref.png | Bin - test/trap-clip-beos-bitmap-rgb24-ref.png | Bin - test/trap-clip-beos_bitmap-rgb24-ref.png | Bin - 9 files changed, 3 insertions(+), 3 deletions(-) - -commit c6869b741578be8d93053c8313f71e87061d0202 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 13:21:57 2006 -0400 - - [ROADMAP] Add generating EPS. - - ROADMAP | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 1af80b70c08654faeb9c6d041d37ca10d6008fe5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 13:10:24 2006 -0400 - - Test for libz only once and reuse result for PS and PDF - This causes configure to check for libz even if PS/PDF are disabled - or their results is already cached. But that's not much of a problem - as if the cache is enabled, libz results are cached too. - - configure.in | 16 +++++++--------- - 1 files changed, 7 insertions(+), 9 deletions(-) - -commit d1520a99d4f9be9206cfcb5febb606eaeb4ccaa9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 13:05:26 2006 -0400 - - Remove the ft_load_sfnt_table check from PS/PDF/SVG backends - and make sure that _cairo_ft_load_truetype_table returns UNSUPPORTED - if the version of FreeType used doesn't support FT_Load_Sfnt_Table. - - configure.in | 16 +--------------- - src/cairo-ft-font.c | 3 +++ - 2 files changed, 4 insertions(+), 15 deletions(-) - -commit aea83b908d020e26732753830bb3056e6702a774 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 12:47:47 2006 -0400 - - Fix typos in configure.in for PS/PDF/SVG backends - - configure.in | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit dc8da1ca06971677e203718db1429f82fe3f05bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 12:47:11 2006 -0400 - - Save configure cache after checking all backends - This makes sure that backend enabling results are cached even - if a later test in configure fails. - - configure.in | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 6d0e3260444a2d5b6fb0cb223ac79f1c0e7b3a6e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 12:45:35 2006 -0400 - - Don't link to -lm unconditionally in cairo.pc - Reuse $LIBM results. - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 24374ad61379273945cda913884b562513d86ed2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 10 12:44:35 2006 -0400 - - Implement configure cache versioning for backend enabling results - such that removing config.cache is not needed as frequently as it - is currently. We just detect and stale the cache results for our - own backends. If the user installs missing libraries, they still - need to remove the cache manually. - - Note that everytime a change is made to configure.in and may change - the results of at least one CAIRO_BACKEND_ENABLE call, the - cairo_cache_version number should be increased. - - configure.in | 16 +++++++++++++--- - 1 files changed, 13 insertions(+), 3 deletions(-) - -commit c3c706873ef6a0e1318b1d4b4d4b6841758ea18d -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:56:20 2006 -0700 - - ROADMAP: Remove 1.2.2 stuff now that that release is out the door - - ROADMAP | 29 +---------------------------- - 1 files changed, 1 insertions(+), 28 deletions(-) - -commit 27842ff06f0f4cb764516e91ad51c8a92078e0fa -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:51:48 2006 -0700 - - NEWS: Fix some misspellings - - NEWS | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit c96e1b6d8ff06eba7b09b5ff3c60fe09d56eb80c -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:32:26 2006 -0700 - - README: Update backend list. - - PDF, PS, and SVG are no longer experimental. And DirectFB and BeOS now exist as well. - - README | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 38b42c50252198afac2480a24085f01722d1b471 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:23:07 2006 -0700 - - Increment CAIRO_VERSION to 1.2.3 after making the 1.2.2 release - - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ac1c748868bdf4ca6fd195b184ec90827f6e8c94 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:06:57 2006 -0700 - - Update version to 1.2.2 and libtool version to 11:1:9. - - configure.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6b3e674211f12e1a30a23c2698f314f6317bd54a -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 16:04:54 2006 -0700 - - NEWS: Add notes for cairo 1.2.2 - - NEWS | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 157 insertions(+), 0 deletions(-) - -commit 5b2c84549f72d449d5c44034e15babbd29d290e8 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 14:30:20 2006 -0700 - - RELEASING: Add --stat option to recommended git-log command - - RELEASING | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e3c7840d2283a8e30242c9749e991f02e93b878a -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 14:29:29 2006 -0700 - - Fix EXTRA_DIST so that 'make distcheck' works again - - test/Makefile.am | 56 ++++++++++++----------------------------------------- - 1 files changed, 13 insertions(+), 43 deletions(-) - -commit d5d529c0f349962f8c96e2005d67e0c3dd57fbc9 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 14:28:48 2006 -0700 - - gtk-doc template file churn - - doc/public/tmpl/cairo-font-options.sgml | 134 +++++++++ - doc/public/tmpl/cairo-font.sgml | 67 +++++ - doc/public/tmpl/cairo-ft.sgml | 45 +++ - doc/public/tmpl/cairo-image.sgml | 69 +++++ - doc/public/tmpl/cairo-matrix.sgml | 119 ++++++++ - doc/public/tmpl/cairo-paths.sgml | 194 +++++++++++++ - doc/public/tmpl/cairo-pattern.sgml | 182 ++++++++++++ - doc/public/tmpl/cairo-pdf.sgml | 28 ++- - doc/public/tmpl/cairo-png.sgml | 40 +++ - doc/public/tmpl/cairo-ps.sgml | 53 ++++- - doc/public/tmpl/cairo-scaled-font.sgml | 113 ++++++++ - doc/public/tmpl/cairo-status.sgml | 16 + - doc/public/tmpl/cairo-surface.sgml | 170 +++++++++++ - doc/public/tmpl/cairo-svg.sgml | 53 ++++- - doc/public/tmpl/cairo-text.sgml | 133 +++++++++- - doc/public/tmpl/cairo-transforms.sgml | 104 +++++++ - doc/public/tmpl/cairo-version.sgml | 37 +++ - doc/public/tmpl/cairo-win32-fonts.sgml | 45 +++ - doc/public/tmpl/cairo-win32.sgml | 29 ++ - doc/public/tmpl/cairo-xlib-xrender.sgml | 14 + - doc/public/tmpl/cairo-xlib.sgml | 110 ++++++++ - doc/public/tmpl/cairo.sgml | 465 +++++++++++++++++++++++++++++++ - 22 files changed, 2216 insertions(+), 4 deletions(-) - -commit ca99478d4309ee66bfd0196d3d53991a46fa8367 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 12:48:56 2006 -0700 - - Fix some memory leaks in a few of the tests. - - test/push-group.c | 2 ++ - test/text-antialias-gray.c | 2 ++ - test/text-antialias-none.c | 2 ++ - test/zero-alpha.c | 2 ++ - 4 files changed, 8 insertions(+), 0 deletions(-) - -commit d6e204b9d58069ba34969e6f23cf0bdb4c73b9e1 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 12:48:20 2006 -0700 - - Add a variation of an existing valgrind suppression - - test/.valgrind-suppressions | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit 16c18aea52f668caf9cd0b9774f8fa209468662f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 15:30:56 2006 -0400 - - [PDF] Fix leak: free glyphs - - src/cairo-pdf-surface.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ac4922bd07db7a513b6dbe5443e95221d7827f79 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 15:27:21 2006 -0400 - - [TrueType] Zero out padding memory in generated TrueType subset - to make the output deterministic and fix valgrind errors. - - src/cairo-truetype-subset.c | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 356e646dc66f3df0d97e2c26e9328650df745c1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 13:39:17 2006 -0400 - - [FreeType] Unset and set to FC_RGBA_NONE the FC_RGBA attribute on pattern - - if we don't want it. This stuff is tricky, but I hope to explain: In your - fontconfig configuration, you may match on "font", or on "pattern". Turning - subpixel on typically looks like: - - <match target="font"> - <test qual="all" name="rgba"> - <const>unknown</const> - </test> - <edit name="rgba" mode="assign"><const>rgb</const></edit> - </match> - - This works good enough, and if you set to ANTIALIAS_GRAY, this will not - override that. Now one may forget to match on "font" target, or intentionally - match on the pattern. That happens before cairo font options are substituted - in the pattern. So, to give a hint of subpixel in your config file, you can - write: - - <match target="pattern"> - <edit name="rgba" mode="assign"><const>rgb</const></edit> - </match> - - You don't really need to check for current values, as FcConfigSubstitute is - run before merging cairo_font_options_t in. What this patch does, is to reset - pattern's rgba property if the font options explicitly ask for ANTIALIAS_GRAY. - This is the only place in cairo-ft-font.c that we use FcPatternDel, so I - thought some explanation is needed. - - src/cairo-ft-font.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit db06681b487873788b51a6766894fc619eb8d8f2 -Author: Alfred Peng <alfred.peng@sun.com> -Date: Tue Aug 8 10:57:33 2006 -0700 - - Fix leaks in failure paths in pixman gradient creation - - pixman/src/icimage.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6ff531c1823421ff60d084f94e7221cfb1d3c9b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 13:13:18 2006 -0400 - - [TrueType] Add comment block describing why we only use int16_t - - src/cairo-truetype-subset-private.h | 27 +++++++++++++++++++-------- - 1 files changed, 19 insertions(+), 8 deletions(-) - -commit 23f388861803ca18746da2573424014c333fb63b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 07:38:34 2006 -0400 - - [TrueType] More leak fixes - - src/cairo-truetype-subset.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 519bd3d3e972a88adea5bcf6ea7f582fe69c305c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 07:24:01 2006 -0400 - - [TrueType] Fix leaks. - - src/cairo-truetype-subset.c | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) - -commit 501e5cc8839e104ec21a5aba61cff3580d34f26b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 06:12:13 2006 -0400 - - Restructure subpixel_order handling such that the code doesn't look suspicious! - Shouldn't make /any/ difference at all in any case. - - src/cairo-ft-font.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit 89fc22de871d61517a4955875f12326b4dc3389a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 06:08:53 2006 -0400 - - [fontconfig] Set FC_RGBA_NONE on the pattern if we don't want subpixel. - - otherwise, it looks like "I don't care" and fontconfig configuration is - allowed to decide to turn subpixel on. This fixes the bug that subpixel - colors where showing up in fallback images in PS/PDF/SVG backends, observed - in the test fallback-resolution. - - src/cairo-ft-font.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 1f854fcf32e6909e4c52779f093132d8c749c285 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 06:04:01 2006 -0400 - - Set antialiasing to gray in default font options for PS/PDF/SVG - - This only affects the image fallback in those backends, and avoids getting - colored pixels there if user's fontconfig configuration turns subpixel on. - This doesn't quite fix that problem though, more changes are needed/coming. - - src/cairo-pdf-surface.c | 1 + - src/cairo-ps-surface.c | 1 + - src/cairo-svg-surface.c | 7 ++++--- - 3 files changed, 6 insertions(+), 3 deletions(-) - -commit 2d483e0785b18a8bb51f5b1c1a0267029f68a64a -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 02:24:48 2006 -0700 - - test-paginated: Fix memory leak within _test_paginated_surface_create_for_data - - src/test-paginated-surface.c | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit cb5edb6c35f7c80d1f91172b98f25ee33f21bce9 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 01:38:24 2006 -0700 - - Eliminate warning due to the test suite's private 'FLATTENEND' format value - - test/cairo-test.c | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit f089a07679535959fe7b12acb0550ff16d560788 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 04:36:13 2006 -0400 - - Fix misplaced volatile keyword - - test/cairo-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9d542a29cba71fe4b4067fa9a9c0fe98a7d8a7a8 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 01:30:40 2006 -0700 - - Disable warning options that are not available in gcc 3.3.5 at least. - - We'll want to turn these back on eventually with a nice conditional check on the - appropriate version of gcc. - - configure.in | 13 +++++++++---- - 1 files changed, 9 insertions(+), 4 deletions(-) - -commit c3b912d7db34c5881cf14725b7d29266cbf24877 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 01:16:49 2006 -0700 - - Eliminate most compiler warnings from the test suite - - src/cairo-paginated-surface.c | 2 +- - test/bitmap-font.c | 2 +- - test/buffer-diff.c | 2 +- - test/cairo-test.c | 16 ++++++++++------ - test/cairo-test.h | 3 ++- - test/clip-operator.c | 2 +- - test/create-for-stream.c | 4 +++- - test/degenerate-path.c | 2 +- - test/fallback-resolution.c | 2 +- - test/mask.c | 2 +- - test/multi-page.c | 2 +- - test/operator-clear.c | 2 +- - test/operator-source.c | 2 +- - test/pdf-features.c | 4 ++-- - test/ps-features.c | 4 ++-- - test/push-group.c | 1 - - test/read-png.c | 4 ++-- - test/svg-surface.c | 2 ++ - test/trap-clip.c | 2 +- - test/unbounded-operator.c | 2 +- - test/write-png.c | 2 +- - 21 files changed, 36 insertions(+), 28 deletions(-) - -commit c7d11ad2b4778cb7399eae990a410cb72568af11 -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 00:43:09 2006 -0700 - - Remove stale SVG-specific reference images for pixman-rotate test - - test/pixman-rotate-svg-argb32-ref.png | Bin - test/pixman-rotate-svg-rgb24-ref.png | Bin - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit 401f0ce3c444e263f03055174791e993e6270c39 -Merge: 77fd0ef... 02b54ca... -Author: Carl Worth <cworth@cworth.org> -Date: Tue Aug 8 00:19:51 2006 -0700 - - Merge branch 'surface-font-options' into cairo - -commit 77fd0efa9a055c13e685f4c6b01597ae67a36fb7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 02:58:50 2006 -0400 - - Fix few remaining compiler warnings, revealed by -O3 - - pixman/src/ictri.c | 6 +++--- - src/cairo-lzw.c | 11 +++++------ - src/cairo-type1-subset.c | 8 ++++---- - 3 files changed, 12 insertions(+), 13 deletions(-) - -commit 02b54ca6200b3e5a914b293dd4a0d56f432a5a9b -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 2 11:18:14 2006 -0400 - - Improve docs for cairo_surface_create_similar() - - src/cairo-surface.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit 9136c217703d1d6aab1742f522aa0279517fb36a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 20:40:54 2006 -0400 - - Update reference images, mostly PDF and SVG - Also replace some SVG ref images for rgb24 and argb32 with a single - one where the two have been similar. - - test/caps-joins-alpha-svg-argb32-ref.png | Bin - test/caps-joins-alpha-svg-ref.png | Bin - test/caps-joins-alpha-svg-rgb24-ref.png | Bin - ...osite-integer-translate-over-svg-argb32-ref.png | Bin - test/composite-integer-translate-over-svg-ref.png | Bin - ...posite-integer-translate-over-svg-rgb24-ref.png | Bin - test/fill-and-stroke-alpha-svg-argb32-ref.png | Bin - test/fill-and-stroke-alpha-svg-ref.png | Bin - test/fill-and-stroke-alpha-svg-rgb24-ref.png | Bin - test/font-matrix-translation-svg-ref.png | Bin - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-argb32-ref.png | Bin - test/ft-text-vertical-layout-svg-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin - test/glyph-cache-pressure-pdf-argb32-ref.png | Bin - test/glyph-cache-pressure-svg-argb32-ref.png | Bin - test/glyph-cache-pressure-svg-ref.png | Bin - test/glyph-cache-pressure-svg-rgb24-ref.png | Bin - test/linear-gradient-svg-argb32-ref.png | Bin - test/linear-gradient-svg-ref.png | Bin - test/linear-gradient-svg-rgb24-ref.png | Bin - test/paint-source-alpha-svg-argb32-ref.png | Bin - test/paint-source-alpha-svg-ref.png | Bin - test/paint-source-alpha-svg-rgb24-ref.png | Bin - test/paint-with-alpha-svg-argb32-ref.png | Bin - test/paint-with-alpha-svg-ref.png | Bin - test/paint-with-alpha-svg-rgb24-ref.png | Bin - test/pixman-rotate-svg-argb32-ref.png | Bin - test/pixman-rotate-svg-rgb24-ref.png | Bin - test/rectangle-rounding-error-ps-argb32-ref.png | Bin - test/select-font-face-pdf-argb32-ref.png | Bin - test/select-font-face-ps-argb32-ref.png | Bin - test/select-font-face-ref.png | Bin - test/select-font-face-svg-argb32-ref.png | Bin - test/select-font-face-svg-ref.png | Bin - test/select-font-face-svg-rgb24-ref.png | Bin - test/show-text-current-point-pdf-argb32-ref.png | Bin - test/show-text-current-point-svg-argb32-ref.png | Bin - test/show-text-current-point-svg-ref.png | Bin - test/show-text-current-point-svg-rgb24-ref.png | Bin - test/text-antialias-gray-pdf-argb32-ref.png | Bin - test/text-antialias-gray-ps-argb32-ref.png | Bin - test/text-antialias-gray-svg-argb32-ref.png | Bin - test/text-antialias-gray-svg-rgb24-ref.png | Bin - test/text-antialias-none-pdf-argb32-ref.png | Bin - test/text-antialias-none-ps-argb32-ref.png | Bin - test/text-antialias-none-svg-argb32-ref.png | Bin - test/text-antialias-none-svg-rgb24-ref.png | Bin - test/text-antialias-subpixel-pdf-argb32-ref.png | Bin - test/text-antialias-subpixel-ps-argb32-ref.png | Bin - test/text-antialias-subpixel-svg-argb32-ref.png | Bin - test/text-antialias-subpixel-svg-rgb24-ref.png | Bin - test/text-pattern-pdf-argb32-ref.png | Bin - test/text-pattern-ps-argb32-ref.png | Bin - test/text-pattern-svg-argb32-ref.png | Bin - test/unantialiased-shapes-ps-argb32-ref.png | Bin - test/unantialiased-shapes-svg-argb32-ref.png | Bin - test/unantialiased-shapes-svg-rgb24-ref.png | Bin - 59 files changed, 0 insertions(+), 0 deletions(-) - -commit 56791ab31d484452cd1ddefd653590095d9f6191 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 02:46:38 2006 -0400 - - Make "make html" not trigger test reruns - "make index.html" can still be used to force up-to-date test results, - causing test reruns if necessary. - - test/Makefile.am | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -commit caba7f6bda9ba7c1a0738f3b34996c50bde60697 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 8 02:17:43 2006 -0400 - - Document a few more functions - - cairo_show_page - cairo_copy_page - cairo_in_stroke - cairo_in_fill - - src/cairo.c | 42 ++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 42 insertions(+), 0 deletions(-) - -commit 789785cd357de14af23a4d2ae8ca49c4838426b9 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 7 11:58:35 2006 -0700 - - Document CAIRO_FORMAT_RGB16_565 as deprecated. - - src/cairo.h | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit fdc805a52949bf3b040bfef57d170025010816c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 22:28:59 2006 -0400 - - More doc syntax update - - src/cairo-scaled-font.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bbc9a1290a964edf50f571be8766b38df10adac7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 22:27:15 2006 -0400 - - Update doc syntax - Annoying, but a function doc should have a body, not only "Returns", or - gtk-doc will not pick it up. - - src/cairo-font.c | 5 ++++- - src/cairo-pattern.c | 5 ++++- - src/cairo-scaled-font.c | 5 ++++- - src/cairo-surface.c | 5 ++++- - 4 files changed, 16 insertions(+), 4 deletions(-) - -commit fef0251d15814ce9f135b548579e51c6e4a0653d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 22:15:15 2006 -0400 - - Add cairo-truetype-subset-private.h to list of ignored headers - - doc/public/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c2ea56e5e075f9e75350b3c54956a70e6fb9a58c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 21:37:16 2006 -0400 - - Add test truetype-tables that checks sizeof truetype tables - - test/Makefile.am | 1 + - test/truetype-tables.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 60 insertions(+), 0 deletions(-) - -commit 50be7951c981468a3a2acf2cd77931a46ca1e824 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 21:23:08 2006 -0400 - - Split the TrueType table definitions into a private header file - such that we can test the struct sizes in a test. - - src/Makefile.am | 1 + - src/cairo-truetype-subset-private.h | 159 +++++++++++++++++++++++++++++++++++ - src/cairo-truetype-subset.c | 126 +-------------------------- - 3 files changed, 165 insertions(+), 121 deletions(-) - -commit ec895202e008356492ae0c9e40c9f40c6bf8cbb3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 21:13:48 2006 -0400 - - Remove the __attribute__ ((packed)) and the need for it - as it's not portable and lack of it could seriously break the truetype - subsetting code. Now, instead of using int32_t and int64_t, we use - multiple int16_t items, to avoid any alignments. Fortunately, we are - not using any of the fields involved, so no code changes necessary. - - src/cairo-truetype-subset.c | 58 +++++++++++++++++++++++++----------------- - 1 files changed, 34 insertions(+), 24 deletions(-) - -commit 20c3ff96de05365ee65301ccd3c43e7bcb19f49b -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 7 15:18:38 2006 -0700 - - Fix some signed/unsigned comparison warnings that cropped up during the warnings-cleanup branch - - src/cairo-meta-surface-private.h | 2 +- - src/cairo-pdf-surface.c | 6 +++--- - src/cairo-ps-surface.c | 5 ++--- - src/cairo-scaled-font-subsets-private.h | 2 +- - src/cairo-svg-surface.c | 2 +- - src/cairo-truetype-subset.c | 14 +++++++------- - src/cairo-type1-subset.c | 4 ++-- - 7 files changed, 17 insertions(+), 18 deletions(-) - -commit 959b85e98c8a0f546c9117da83f84c99ed00370f -Merge: f1c70a0... 7ee94c0... -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 7 15:06:47 2006 -0700 - - Merge branch 'warnings-cleanup' into cairo - - Conflicts: - - src/cairo-font-subset.c - -commit f1c70a01391705a22dd882f2a88c6dffbc08f0fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 17:32:02 2006 -0400 - - Mark x86_64 subsetting as fixed in ROADMAP. - - ROADMAP | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7ee94c0285b0f7352506622d16aff9339ba65d0c -Author: Carl Worth <cworth@cworth.org> -Date: Mon Jul 31 12:03:40 2006 -0700 - - Squelch an annoying -Wswitch-enum warning by not using switch - - src/cairo-pattern.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 43b579d757ded66f71da8a0e215abd7bccdfd695 -Author: Carl Worth <cworth@cworth.org> -Date: Mon Jul 31 11:47:45 2006 -0700 - - Add -Wswitch-enum compiler flag and fix all trivial warnings - - configure.in | 2 +- - pixman/src/fbpict.c | 11 +++++++++++ - src/cairo-ft-font.c | 5 +++++ - src/cairo-image-surface.c | 9 +++++++++ - src/cairo-pattern.c | 2 +- - src/cairo-pdf-surface.c | 6 +++++- - src/cairo-xlib-surface.c | 12 ++++++++++++ - 7 files changed, 44 insertions(+), 3 deletions(-) - -commit d1f9bef30ea7268fee74af50c0e9325e1ec0929c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 14:24:32 2006 -0700 - - Add -Wunsafe-loop-optimizations compiler flag and fix all warnings - - configure.in | 1 + - pixman/src/fbmmx.c | 8 ++++---- - src/cairo-xlib-surface.c | 2 +- - 3 files changed, 6 insertions(+), 5 deletions(-) - -commit 744ef3bf698f9109e82244c5889d0d809b2df70c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 13:47:01 2006 -0700 - - Add several compiler warning flags (no code changes needed) - - The flags added here are as follows: - - -Werror-implicit-function-declaration Wstrict-aliasing=2 - -Wwrite-strings Winit-self Wpacked Wmissing-format-attribute - -Wdeclaration-after-statement - - configure.in | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 00711022089936e08b8651591629ca344a3fa71e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 7 13:13:33 2006 -0700 - - Add -Wwrite-strings compiler flag and fix all warnings - - configure.in | 2 +- - src/cairo-ps-surface.c | 2 +- - src/cairo-xlib-surface.c | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit 9ae66174e774b57f16ad791452ed44efc2770a59 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 4 16:06:59 2006 -0700 - - Fix bug 7294 by adding pixman BGR formats and internal cairo BGR formats. - - This approach to fixing the bug is valid since there is code in pixman - for rendering to BGR images, (which is why cairo 1.0 worked with BGR X - servers for example). But, since we don't want to advertise additional - image formats we implement this through a new cairo_internal_format_t. - - This is rather fragile since we don't want to leak any internal formats - nor do we ever want an internal format to be used somewhere a real - format is expected, (and trigger a CAIRO_FORMAT_VALID assertion failure). - More comments than code are added here to help compensate for the - fragility and to give some guidance in fixing this mess in a better way - in the future. - - pixman/src/icformat.c | 12 +++++++++ - pixman/src/pixman.h | 4 ++- - src/cairo-image-surface.c | 48 ++++++++++++++++++++++++++++-------- - src/cairo-xlib-surface.c | 3 ++ - src/cairoint.h | 59 +++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 114 insertions(+), 12 deletions(-) - -commit f4b12e497b7ac282b2f6831b8fb68deebc412e60 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Mon Aug 7 11:07:08 2006 -0700 - - Make truetype subsetting work on x86_64 - - This fixes the bug reported against GTK+ here: - http://bugzilla.gnome.org/show_bug.cgi?id=349826 - - ROADMAP | 2 +- - src/cairo-truetype-subset.c | 195 ++++++++++++++++++++++--------------------- - 2 files changed, 99 insertions(+), 98 deletions(-) - -commit 7724c575b028140fd671d4ef853096a24112146f -Author: Declan Naughton <piratepenguin@gmail.com> -Date: Mon Aug 7 10:33:15 2006 -0700 - - Fix typos in internal documentation. - - src/cairo-arc.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit caa9abc9ee33b660f158ac9f5d420bb39c0b47cb -Author: Carl Worth <cworth@cworth.org> -Date: Mon Aug 7 10:28:40 2006 -0700 - - Fix file handle leak in failure path (bug 7616) - - src/cairo-output-stream.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 04757a3aa8deeff3265719ebe01b021638990ec6 -Author: Alfred Peng <alfred.peng@sun.com> -Date: Mon Aug 7 08:41:13 2006 -0700 - - Add definition of cairo_private for some Sun compilers. - - In addition to helping us preserve a sharp line between which symbols are - part of the public API and which are private parts of the implementation, - this can also help mozilla avoid clashes between its modified, internal - copy of cairo and the system version of cairo. See the mozilla bug here: - - https://bugzilla.mozilla.org/show_bug.cgi?id=341874 - - src/cairoint.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit e2fddcccb43d06486d3680a19cfdd5a54963fcbd -Author: Chris Wilson <cpwilson@taz.qinetiq.com> -Date: Fri Aug 4 17:16:35 2006 -0700 - - Fix memory leak in _cairo_surface_show_glyphs (bug 7766) - - src/cairo-surface.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit aec39338033196f2942e9ff0ef6beffd6612030e -Author: Carl Worth <cworth@cworth.org> -Date: Fri Aug 4 16:54:25 2006 -0700 - - ROADMAP: Mark 7533 as fixed and add broken truetype subsetting on x86_64 - - ROADMAP | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 761b30792d56f635fe1fb8641fdee21587505475 -Author: Dominic Lachowicz <domlachowicz@gmail.com> -Date: Fri Aug 4 16:39:40 2006 -0700 - - Add binary garbage to PDF header as recommended in section 3.4.1 of PDF Reference v1.6 - - src/cairo-pdf-surface.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2815d9ad38f2df45c58fbeb38591afba28b4917b -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 3 19:28:11 2006 -0700 - - Use base pointer to avoid compiler warning. - - src/cairo-ft-font.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1feb4291cf7813494355459bb547eec604c54ffb -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 3 19:25:53 2006 -0700 - - Apply device_transform during meta-surface replay to fix bug 7533 - - src/cairo-meta-surface.c | 86 +++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 77 insertions(+), 9 deletions(-) - -commit 8c953167ba045ffdfc25ac4f19faff83720f2473 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Aug 3 17:48:25 2006 -0700 - - Simplify common set_clip operation in meta-surface replay. - - src/cairo-meta-surface.c | 32 ++++++++------------------------ - 1 files changed, 8 insertions(+), 24 deletions(-) - -commit 34a0b728fb0e19a4d03152318a002362791c30d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 3 00:20:35 2006 -0400 - - Fail FreeType load_truetype_table on vertical fonts as we don't do it - right now. Failing disables the subsetting for vertical fonts, like - it was being done before the recent changes to the TrueType subsetter. - - src/cairo-ft-font.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 2c0959141ae89bde6c773933b41f4d965d6a1ae7 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Aug 2 16:40:23 2006 -0700 - - Update ROADMAP now that several of the 1.2.2-targeted bugs are fixed - - ROADMAP | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 30f004d55ad7c426e979964a49e7a8c8d8db31f3 -Author: Kristian Høgsberg <krh@redhat.com> -Date: Wed Aug 2 19:29:17 2006 -0400 - - Rename truetype subset function to _cairo_truetype_*. - - Used to be _cairo_pdf_ft_*, a left over from when this code was - specific to the PDF backend. - - src/cairo-truetype-subset.c | 256 ++++++++++++++++++++++--------------------- - 1 files changed, 133 insertions(+), 123 deletions(-) - -commit f664a3b7a087272a27eb893b7ee5a1775eb92c4d -Author: Kristian Høgsberg <krh@redhat.com> -Date: Wed Aug 2 19:14:19 2006 -0400 - - Renamed cairo-font-subset.c to cairo-truetype-subset.c - - src/Makefile.am | 2 +- - src/cairo-font-subset.c | 957 ------------------------------------------- - src/cairo-truetype-subset.c | 957 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 958 insertions(+), 958 deletions(-) - -commit a0989f427be87c60415963dd6822b3c5c3781691 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Wed Aug 2 19:12:51 2006 -0400 - - Remove freetype dependency for truetype subsetting code. - - Add a load_truetype_table function to cairo_scaled_font_backend_t and - use it to load the truetype sfnt tables. Implement this with freetype - for the freetype font backend and use GetFontData for win32. Atsui - remains unimplemented, and still falls back to type3 fonts. - - src/Makefile.am | 4 +- - src/cairo-atsui-font.c | 1 + - src/cairo-font-subset.c | 451 ++++++++++++++++++++++++++++------------------ - src/cairo-ft-font.c | 26 +++ - src/cairo-pdf-surface.c | 5 +- - src/cairo-ps-surface.c | 6 +- - src/cairo-svg-surface.c | 1 - - src/cairo-win32-font.c | 28 +++ - src/cairoint.h | 6 + - 9 files changed, 347 insertions(+), 181 deletions(-) - -commit c05dd48ac1afe0e4f3ec0c24797a9fbc3f98ce85 -Merge: e0bec64... 0da4b93... -Author: Michael Emmel <memmel@debian.localdomain> -Date: Wed Aug 2 14:32:50 2006 -0700 - - Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo - -commit e0bec64c98f98fb2d4b460e8641b1b09f808d233 -Author: Michael Emmel <memmel@debian.localdomain> -Date: Wed Aug 2 14:32:24 2006 -0700 - - Fixed debug statement that broke compile - - src/cairo-directfb-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0da4b9319f53379e0ae61b90337f49bd0f0fc9c5 -Author: Kristian Høgsberg <krh@redhat.com> -Date: Wed Aug 2 15:18:56 2006 -0400 - - Drop unused src/cairo-font-subset-private.h. - - src/Makefile.am | 1 - - src/cairo-font-subset-private.h | 68 --------------------------------------- - 2 files changed, 0 insertions(+), 69 deletions(-) - -commit 067d97eb1793a6b0d0dddfbd0b54117844511a94 -Author: Adrian Johnson <ajohnson@redneon.com> -Date: Wed Aug 2 15:17:09 2006 -0400 - - This patch fixes the problem where the postscript output - does not print when the size of the embedded truetype font - exceeds 64k. - - src/cairo-font-subset-private.h | 3 +- - src/cairo-font-subset.c | 60 +++++++++++++++++++++++++++--- - src/cairo-ps-surface.c | 27 ++++++++++---- - src/cairo-scaled-font-subsets-private.h | 2 + - 4 files changed, 77 insertions(+), 15 deletions(-) - -commit 127704c225d4b9f2a4c72749f59a8dfcaecfddc6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 20:39:56 2006 -0400 - - Look for per-target reference image too - - test/cairo-test.c | 96 ++++++++++++++++++++++++++++++++++++++-------------- - 1 files changed, 70 insertions(+), 26 deletions(-) - -commit fc715ffd80f5ec9ac57e3b110dd20298029a6350 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 18:21:27 2006 -0400 - - New PS ref images, matching the recent png16m->pngalpha driver change - - test/caps-joins-ps-argb32-ref.png | Bin - test/caps-sub-paths-ps-argb32-ref.png | Bin - test/clip-fill-rule-ps-argb32-ref.png | Bin - test/clip-nesting-ps-argb32-ref.png | Bin - test/clip-twice-ps-argb32-ref.png | Bin - test/dash-caps-joins-ps-argb32-ref.png | Bin - test/dash-offset-negative-ps-argb32-ref.png | Bin - test/dash-scale-ps-argb32-ref.png | Bin - test/dash-zero-length-ps-argb32-ref.png | Bin - test/degenerate-path-ps-argb32-ref.png | Bin - test/fill-and-stroke-ps-argb32-ref.png | Bin - test/fill-rule-ps-argb32-ref.png | Bin - test/font-matrix-translation-ps-argb32-ref.png | Bin - test/ft-text-antialias-none-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/glyph-cache-pressure-ps-argb32-ref.png | Bin - test/leaky-polygon-ps-argb32-ref.png | Bin - test/line-width-ps-argb32-ref.png | Bin - test/line-width-scale-ps-argb32-ref.png | Bin - test/new-sub-path-ps-argb32-ref.png | Bin - test/path-data-ps-argb32-ref.png | Bin - test/select-font-face-ps-argb32-ref.png | Bin - test/show-text-current-point-ps-argb32-ref.png | Bin - test/transforms-ps-argb32-ref.png | Bin - 24 files changed, 0 insertions(+), 0 deletions(-) - -commit 3e24f516a2f5435306ee8491e7955177b960a797 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 16:13:29 2006 -0400 - - Change the text string "cd" to "AB" in test to match the other string - that is drawn. The reason, one is draw using show_text, the other - using text_path. The difference is more emphasized when rendering the - same string. - - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout.c | 2 +- - 2 files changed, 1 insertions(+), 1 deletions(-) - -commit 3d95919fab2e47dea9e7b266849db7a4c05eb9a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 15:27:11 2006 -0400 - - Switch from ghostscript's png16m driver to pngalpha for PS->PNG again. - We have switched back and forth quite a few times. This time I'm switching - because with pngalpha we get gray antialiased text and graphics while with - png16m all we get is no antialiasing. This is definitely a bug in the png16m - driver, but I won't wait until it gets fixed upstream. - - Previously Carl Worth switched to pngalpha and reverted it immediately in - commit c4fc7b06b53c811ddc20def91aaccd756c28a924. I've now fixed image-diff to - work with the output of pngalpha, so we can switch. It requires lots of - reference image updates, but still doesn't help with reducing the number of - PS-specific reference images we need. - - test/cairo-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5a23fd70a0af5c2b0cb990b89ebc5ed7a01aae82 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 15:20:39 2006 -0400 - - Change the way diff images highlight differences. - Previously it was using the equation 128+diff/3, which results in - lots of gray and de-emphasized difference. Now it's using - MIN(255,diff*4) which more emphasizes the real difference. - - test/buffer-diff.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit d85f30e789c74cc8f1d83ba609d8b02886686440 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 15:18:19 2006 -0400 - - Make image_diff_flattened flatten the first image too. - This is useful to use the ghostscript pngalpha driver for example. - - test/buffer-diff.c | 34 ++++++++++++++++++++++++++-------- - 1 files changed, 26 insertions(+), 8 deletions(-) - -commit 556a4d8405a4f53e465425ccc1f6506e51b29344 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 1 15:16:10 2006 -0400 - - Add vector_ignored_tests that is tests ignored for ps/pdf/svg - that includes all tests depending on CAIRO_ANTIALIAS_NONE and - CAIRO_ANTIALIAS_SUBPIXEL. - This removes separate pdf_ignored_tests and svg_ignored_tests - arrays that were out of synch and otherwise the same. - - test/cairo-test.c | 43 ++++++++++++++++++++++--------------------- - 1 files changed, 22 insertions(+), 21 deletions(-) - -commit 226178539ad72ffa414925e094297e12c566083d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 16:05:34 2006 -0400 - - Add comments about CAIRO_ENABLE_BACKEND. - - configure.in | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 2fa709d6af58713f7b362748a728a6f8c983d2ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 15:17:15 2006 -0400 - - Set font options in the test context and make tests not do that - This should help with not requiring many backend-specific reference - images, and some should be removed now. - - test/cairo-test.c | 10 ++++++++++ - test/clip-operator.c | 9 --------- - test/font-matrix-translation.c | 9 --------- - test/ft-font-create-for-ft-face.c | 2 ++ - test/ft-text-antialias-none.c | 3 +-- - test/ft-text-vertical-layout.c | 5 +---- - test/glyph-cache-pressure.c | 10 ---------- - test/operator-clear.c | 9 --------- - test/operator-source.c | 9 --------- - test/select-font-face.c | 11 ----------- - test/show-glyphs-many.c | 9 --------- - test/show-text-current-point.c | 10 ---------- - test/text-antialias-gray.c | 5 +---- - test/text-antialias-none.c | 5 +---- - test/text-antialias-subpixel.c | 8 ++------ - test/text-pattern.c | 9 --------- - test/text-rotate.c | 3 +-- - test/unbounded-operator.c | 9 --------- - 18 files changed, 19 insertions(+), 116 deletions(-) - -commit 9fcb3c32c1f16fe6ab913e27eb54d18b7d9a06b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 14:50:50 2006 -0400 - - Set fallback resolution in create_similar. Update docs to reflect that. - - src/cairo-surface.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit a61ac1aeedca3a032b9d53715afb5d52c06efec0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 14:47:10 2006 -0400 - - Set font_options on image surfaces we create. - This may not be really necessary as we only create image surfaces as - temporary surfaces and their font options should not be sampled normally. - - src/cairo-paginated-surface.c | 37 ++++++++++++++++++++++++++++--------- - 1 files changed, 28 insertions(+), 9 deletions(-) - -commit b3341b4eda274036a74eea3187d47ef257688828 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 14:45:54 2006 -0400 - - Let backends return NULL in create_similar to take the fallback path. - Make xlib backend use it. - - src/cairo-surface.c | 5 +++-- - src/cairo-xlib-surface.c | 5 +++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit bdb4e1edadb78a2118ff70b28163f8bd4317f1ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 14:44:42 2006 -0400 - - Implement per-surface font options. - New internal function _cairo_surface_set_font_options is used to set them. - cairo_surface_create_similar propagates the font options of the other - surface into the newly created surface. Fixes bugs with font options in - fallback images and bug 4106. - - src/cairo-surface.c | 55 +++++++++++++++++++++++++++++++++++++++++++++----- - src/cairoint.h | 12 +++++++++++ - 2 files changed, 61 insertions(+), 6 deletions(-) - -commit a8a0082c53d060e07c10c6efda9bb808e354fd59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 14:41:27 2006 -0400 - - Remove dummy create_similar in PS/PDF and let fallback do the same - which is simply creating an image surface. - - src/cairo-pdf-surface.c | 15 +-------------- - src/cairo-ps-surface.c | 15 +-------------- - 2 files changed, 2 insertions(+), 28 deletions(-) - -commit 72b51b6f0c49f9eac7d8ef4caff59733312b1ca6 -Author: Ian Osgood <iano@quirkster.com> -Date: Wed Jun 21 07:06:20 2006 -0700 - - XCB: implement set_clip_region - - src/cairo-xcb-surface.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 93 insertions(+), 1 deletions(-) - -commit 2eeb338590957a90bdebfc6a00fc05323e76f9ee -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Jun 12 17:47:55 2006 -0700 - - XCB: Use xcb-renderutil where cairo-xlib used libXrender. - - configure.in | 2 +- - src/cairo-xcb-surface.c | 199 ++++++++++------------------------------------- - 2 files changed, 41 insertions(+), 160 deletions(-) - -commit 6b0d3433b7073ece1f7959475e6058911dc382ad -Author: Jamey Sharp <jamey@minilop.net> -Date: Mon Jul 31 08:53:57 2006 -0700 - - XCB: XCBRenderTRAP was renamed to XCBRenderTRAPEZOID. - - src/cairo-xcb-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 88675958efbe57c7cc5135d6fb73e99f42d848d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 31 01:03:15 2006 -0400 - - Remove config.cache in autogen.sh. - - autogen.sh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit eb9caf083353f3430f786da717b6c56b13f82ecb -Author: Carl Worth <cworth@cworth.org> -Date: Fri Jul 28 16:59:54 2006 -0700 - - Add -Wsign-compare compiler flag and fix all warnings - - configure.in | 2 +- - pixman/src/fbpict.c | 2 +- - pixman/src/icformat.c | 12 ++++++------ - pixman/src/pixman.h | 10 +++++----- - src/cairo-array.c | 6 +++--- - src/cairo-font-subset.c | 2 +- - src/cairo-gstate.c | 2 +- - src/cairo-hash.c | 2 +- - src/cairo-image-surface.c | 2 +- - src/cairo-output-stream.c | 2 +- - src/cairo-path-stroke.c | 4 ++-- - src/cairo-pattern.c | 4 ++-- - src/cairo-pdf-surface.c | 7 +++---- - src/cairo-png.c | 8 ++++---- - src/cairo-ps-surface.c | 2 +- - src/cairo-scaled-font-subsets.c | 6 +++--- - src/cairo-scaled-font.c | 2 +- - src/cairo-svg-surface.c | 6 +++--- - src/cairo-xlib-surface.c | 2 +- - src/cairoint.h | 16 ++++++++-------- - 20 files changed, 49 insertions(+), 50 deletions(-) - -commit 5e0f46cdebb5e086b344cc09b4537982a07e45cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 28 15:41:11 2006 -0700 - - Standardize on unsigned for ref_count type and add CAIRO_REF_COUNT_INVALID - - The CAIRO_REF_COUNT_INVALID macro simply hides the ((unsigned int)-1) cast - to avoid warnings about comparison between signed and unsigned values. - - src/cairo-font.c | 8 ++++---- - src/cairo-pattern.c | 12 ++++++------ - src/cairo-scaled-font.c | 6 +++--- - src/cairo-surface.c | 12 ++++++------ - src/cairo.c | 6 +++--- - src/cairoint.h | 8 +++++--- - 6 files changed, 27 insertions(+), 25 deletions(-) - -commit 84b37568e1485c461df663f875ba5546b44e5c5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 28 15:13:00 2006 -0700 - - Add -Wold-style-definition compiler falg and fix all warnings. - - configure.in | 2 +- - pixman/src/pixregion.c | 53 +++++++++++++++++++---------------------------- - 2 files changed, 23 insertions(+), 32 deletions(-) - -commit 811f7af1b2cf659b3a3c9b0749c65742207cb946 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 28 18:18:50 2006 -0400 - - s/dist-hook/dist-hook-local/ - Should drop spurious make warning. - - gtk-doc.make | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 84114949488c7b9a2ae60edb33903b541ce1dadf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 28 15:12:10 2006 -0400 - - Move font-matrix translation and device transform from surface to gstate - - Fixes the bug that paginated backends had font-matrix translation - applied twice, AND removes a second copy of the glyphs. It's - essentially similar to what cworth did for stroke/fill/clip in - this commit: bd92eb7f3c58fdcbe05f67b9a879798246c616bc - - Reviewed by: Carl Worth - - src/cairo-gstate.c | 10 +++++--- - src/cairo-surface.c | 54 ++++++++++++++++---------------------------------- - 2 files changed, 23 insertions(+), 41 deletions(-) - -commit 2f7da1aafb5ca050446fe3645eac3f95b9636b19 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Jul 28 10:51:24 2006 -0700 - - INSTALL: Mention DYLD_LIBRARY_PATH for mac OS X - - INSTALL | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e5f4b922618ca2e56d6a66e20761e78d42211ec9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 27 15:20:14 2006 -0400 - - Make "double *dash" argument const in cairo_set_dash - - src/cairo-gstate.c | 2 +- - src/cairo.c | 8 ++++---- - src/cairo.h | 8 ++++---- - src/cairoint.h | 2 +- - 4 files changed, 10 insertions(+), 10 deletions(-) - -commit e92d693e073dc5fba871b615909206f0049ead41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 27 14:58:46 2006 -0400 - - Make "CAIRO_TEST_TARGET=... make check" work again - - Do a funny transition of CAIRO_TEST_TARGET through TARGETS such that - one can limit tested targets both through CAIRO_TEST_TARGET env var - and TARGETS make var on the command line. - - test/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 6ced3edb69f5f5a25a5c40c0bad7dc638cc216cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 21 18:46:16 2006 -0400 - - Don't make doc upon make install. - - gtk-doc.make | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 280823173dce520a43eb54c0b18d2e2eae6a55a0 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 27 00:57:53 2006 -0700 - - Update ROADMAP with 1.2.2 and 1.4 plans now that 1.2.0 is out - - ROADMAP | 209 ++++++++++++++++++--------------------------------------------- - 1 files changed, 59 insertions(+), 150 deletions(-) - -commit 456cdb3058f3b416109a9600167cd8842300ae14 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Jul 26 15:48:56 2006 -0700 - - Elide size-zero glyphs from calls to XRender functions. - - There appears to be a bug in some X servers which is triggered by - rendering 1-bit glyphs with zero size via the functions - XRenderAddGlyphs and XRenderCompositeText8 (and likely its variants). - - We avoid this bug by making a copy of the glyphs array which does not - include any of the size-zero glyphs so that the X server never sees them. - - src/cairo-xlib-surface.c | 28 ++++++++++++++++++++++------ - 1 files changed, 22 insertions(+), 6 deletions(-) - -commit 8601c2c68306c956744399099a941363d446b906 -Merge: cd2f50e... b719188... -Author: Michael Emmel <memmel@debian.localdomain> -Date: Thu Jul 20 23:04:37 2006 -0700 - - Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo - -commit cd2f50e6c421d35c3d5b0d76ed0fdd03a033b2c2 -Author: Michael Emmel <memmel@debian.localdomain> -Date: Thu Jul 20 23:01:06 2006 -0700 - - Check for zero before freeing region - - src/cairo-directfb-surface.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit b7191885c88068dad57d68ced69a752d1162b12c -Author: Vladimir Vukicevic <vladimir@pobox.com> -Date: Mon Jul 17 11:33:47 2006 -0700 - - [xlib] Remove XSync implementation of surface_flush - - Remove the xlib implementation of surface_flush which just called XSync - before. - - src/cairo-xlib-surface.c | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) - -commit fbb1758ba8384650157b2bbbc93d161b0c2a05f0 -Author: Jeff Muizelaar <jeff@infidigm.net> -Date: Sun Jun 25 16:12:38 2006 +0200 - - Fix degenerate-path stroking with dashed lines. - - This draws dashed degenerate-paths if the dash is on at the point of the - path and otherwise draws nothing. - - src/cairo-path-stroke.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fdebc369d28f70ceba228d3131753225b2dbf844 -Author: Jeff Muizelaar <jeff@infidigm.net> -Date: Sun Jun 25 15:48:48 2006 +0200 - - Modify degenerate-path test case to test dashed degenerate paths. - - test/degenerate-path-ps-argb32-ref.png | Bin - test/degenerate-path-ref.png | Bin - test/degenerate-path-rgb24-ref.png | Bin - test/degenerate-path.c | 54 ++++++++++++++++++++++++++------ - 4 files changed, 44 insertions(+), 10 deletions(-) - -commit b607cdff98e621a6650bccef20f9877a0e7aa1d9 -Author: Jeff Muizelaar <jeff@freiheit.infidigm.net> -Date: Sat Jul 15 14:39:26 2006 -0400 - - Test closed dashed paths where the first and last sub-path do not join. - - This tests the situation reported by Keith Wells where the start point of a - closed dashed path was not being properly capped. - - test/dash-caps-joins-ps-argb32-ref.png | Bin - test/dash-caps-joins-ref.png | Bin - test/dash-caps-joins.c | 45 +++++++++++++++++++------------ - 3 files changed, 27 insertions(+), 18 deletions(-) - -commit 84840e6bba6e72aa88fad7a0ee929e8955ba9051 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 14 21:42:41 2006 -0400 - - Use font matrix offset to reposition glyph origin instead of adjusting advance - - As the font matrix includes translation, which is otherwise unused for glyph - transformation, the interpretation of translation is fairly arbitrary. For - 1.2.0, we choose to have this translation affect the glyph advance with the - thought that it could be used to do letter spacing/kerning. That is fairly - useless in practice, and a far more useful interpretation is to relocate - the origin of each glyph. - - This patch uses the translation in the font matrix as an offset for the - glyph origin in user space. It turns out glyph extents were already correctly - shifted. - - The end result with this patch is to have cairo match the 1.0 behaviour for - font matrix translations, but now we know why :-) - - Explanation above courtesy of Keith Packard. - - src/cairo-scaled-font.c | 6 +++--- - src/cairo-surface.c | 12 +++++++----- - 2 files changed, 10 insertions(+), 8 deletions(-) - -commit 47d3c5a2c63478288345235f26533f2d6059e815 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 14 20:06:34 2006 -0400 - - Flush stdout after writing \r, to remove artifacts. - - test/cairo-test.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c70edff0842bc6f7238e17a5fe92dddceec283d3 -Author: Carl Worth <cworth@cworth.org> -Date: Fri Jul 14 12:45:48 2006 -0700 - - Add font-matrix-translation test case. - - test/.gitignore | 1 + - test/Makefile.am | 1 + - test/font-matrix-translation-ref.png | Bin - test/font-matrix-translation.c | 113 ++++++++++++++++++++++++++++++++++ - 4 files changed, 115 insertions(+), 0 deletions(-) - -commit b390e2c45632a4974b85a6a5ea414e249adb62a3 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 16:01:57 2006 -0700 - - pixman-rotate: remove stale svg backend reference images - - test/pixman-rotate-svg-argb32-ref.png | Bin - test/pixman-rotate-svg-rgb24-ref.png | Bin - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit 2b30f85cade33653afddf536aa7e775dd360f501 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 15:56:12 2006 -0700 - - ft-text-vertical-layout: Update stale reference images - - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin - 2 files changed, 0 insertions(+), 0 deletions(-) - -commit 5d64efdbb8fc4e17d4fa44d21068870cd2aea7ce -Merge: 9907813... 6a5d66f... -Author: Michael Emmel <memmel@debian.localdomain> -Date: Fri Jul 14 09:37:22 2006 -0700 - - Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo - -commit 9907813d575cefdda20c77d69ad911fa70d2cf4c -Author: Michael Emmel <memmel@debian.localdomain> -Date: Fri Jul 14 09:36:35 2006 -0700 - - Fixed debug message to use new member name - - src/cairo-directfb-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6a5d66f651b7fe94e74ee803a452bac5b54c95ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 18:53:25 2006 -0400 - - Go back to "!!!CRASHED!!!" message now that there's no confusion. - - test/cairo-test.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6c7099b0ccc926b4f427c3cceb1fed5534c693ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 18:49:52 2006 -0400 - - Only generate HTML for log files passed on the command line. - - With the make bits already in place, this means that make retest - creates HTML for only the retested tests. - - test/make-html.pl | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 4b22cb41a9c1fbfc310ae7fd024ceffdb4bf3947 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 15:23:06 2006 -0700 - - Use 'FAIL' instead of 'UNEXPECTED FAILURE' in test output. - - There's no ambiguity anymore due to duplicated printing, so go - back to the classic, and easier to read wording. - - test/cairo-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b2d04d7f1a14c961ea10b76581436ae07dfe6ef5 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 15:21:02 2006 -0700 - - Rename no_fail_on_stdout to eliminate confusing negative inside a Boolean variable name - - test/cairo-test.c | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit ff1280ce98ecc9ddee7b63e21eaec3d47ed3df8b -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 15:08:19 2006 -0700 - - cairo-test.c: Prefer FALSE and TRUE for cairo_bool_t values. - - test/cairo-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit ebc736730615021b07b851b41c6de79248ca00e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 18:17:39 2006 -0400 - - Fix test result formatting. - - test/cairo-test.c | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit 3f7593612f52f88eabb87de0c1efbf86bf31e8c2 -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 15:00:16 2006 -0700 - - Make the various test and check targets depend on all as well. - - Makefile.am | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 307a17f78cd2adda8a59ef16385df3be5786d2bd -Merge: 5ed64e3... 1409b8b... -Author: Michael Emmel <memmel@debian.localdomain> -Date: Thu Jul 13 12:17:25 2006 -0700 - - Merge branch 'master' of ssh+git://git.cairographics.org/git/cairo - -commit 5ed64e3915a45785696fd741b69a03cc5050be88 -Author: Michael Emmel <memmel@debian.localdomain> -Date: Thu Jul 13 12:15:42 2006 -0700 - - Rewrote to remove intermediate surfaces - - src/cairo-directfb-surface.c | 402 +++++++++++++++++++----------------------- - 1 files changed, 178 insertions(+), 224 deletions(-) - -commit 1409b8be0ca00a0904b1732661915d3eba753a51 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 14:33:41 2006 -0400 - - Fix Name tag in backend .pc files to include "cairo-". - - src/cairo-backend.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b2668e944d1819f2b8f9973f1f42b1ca36bb193d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 14:02:58 2006 -0400 - - Use cairo_bool_t. - - test/cairo-test.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 510d23acef9fc75eb968795191091cbc1d33bc09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 13:39:04 2006 -0400 - - Fix doc typo. - - src/cairo.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 601c0503f7906151698929051852d13c377cfef1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 13:30:52 2006 -0400 - - Send grep errors to hell^Wnull. - - test/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 09dfae5fbf34fb19b283973df7112b14638d6466 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 13:22:49 2006 -0400 - - Don't write FAIL messages on stdout if both stdout/err are going to screen. - - test/cairo-test.c | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit 778c4730a86296bf0a71080cf7008d7291792256 -Author: Kent Worsnop <kworsnop@accesswave.ca> -Date: Thu Jul 13 10:20:12 2006 -0700 - - PDF: Fix for dash-no-dash test case, (so that dashing can be turned off) - - src/cairo-pdf-surface.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d2d9a74c77d6bbc51502cee2288fd7d76c30f926 -Author: Carl Worth <cworth@cworth.org> -Date: Wed Jul 12 14:49:14 2006 -0700 - - Add dash-no-dash test case to demonstrate PDF failure to turn off dashing. - - test/.gitignore | 3 +- - test/Makefile.am | 8 ++- - test/dash-no-dash-ref.png | Bin - test/dash-no-dash.c | 95 +++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 102 insertions(+), 4 deletions(-) - -commit f3d45d17902cb109dacf30d826ea8f93408473ba -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 10:04:55 2006 -0700 - - Eliminate a few simple compiler warnings - - test/cairo-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 65d0431b98e7e8d966bbcb43a542a86a9c95e0dc -Author: Carl Worth <cworth@cworth.org> -Date: Thu Jul 13 10:04:19 2006 -0700 - - Add retest and recheck targets to the top-level Makefile - - Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit da0f348350c3ca28d40601aefbca12903632cc18 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 13:16:10 2006 -0400 - - ***cworth finds them [the background colors] a bit too bright - - test/make-html.pl | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit cf1b23a4c57d436098619443068611a48b88187e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 12:58:24 2006 -0400 - - Add prototype for draw in each test file and remove it from the header. - - test/a8-mask.c | 2 ++ - test/bitmap-font.c | 2 ++ - test/cairo-test.h | 1 - - test/caps-joins-alpha.c | 2 ++ - test/caps-joins.c | 2 ++ - test/caps-sub-paths.c | 2 ++ - test/clip-all.c | 2 ++ - test/clip-fill-rule-pixel-aligned.c | 2 ++ - test/clip-fill-rule.c | 2 ++ - test/clip-nesting.c | 2 ++ - test/clip-operator.c | 2 ++ - test/clip-twice.c | 2 ++ - test/composite-integer-translate-over-repeat.c | 2 ++ - test/composite-integer-translate-over.c | 2 ++ - test/composite-integer-translate-source.c | 2 ++ - test/create-from-png-stream.c | 2 ++ - test/create-from-png.c | 2 ++ - test/dash-caps-joins.c | 2 ++ - test/dash-offset-negative.c | 2 ++ - test/dash-scale.c | 2 ++ - test/dash-zero-length.c | 2 ++ - test/degenerate-path.c | 2 ++ - test/device-offset-positive.c | 2 ++ - test/device-offset.c | 2 ++ - test/extend-reflect.c | 2 ++ - test/fill-and-stroke-alpha-add.c | 2 ++ - test/fill-and-stroke-alpha.c | 2 ++ - test/fill-and-stroke.c | 2 ++ - test/fill-rule.c | 2 ++ - test/filter-nearest-offset.c | 2 ++ - test/ft-font-create-for-ft-face.c | 2 ++ - test/ft-text-antialias-none.c | 2 ++ - test/ft-text-vertical-layout.c | 2 ++ - test/get-and-set.c | 2 ++ - test/get-group-target.c | 2 ++ - test/glyph-cache-pressure.c | 2 ++ - test/gradient-alpha.c | 2 ++ - test/leaky-dash.c | 2 ++ - test/leaky-polygon.c | 2 ++ - test/line-width-scale.c | 2 ++ - test/line-width.c | 2 ++ - test/linear-gradient.c | 2 ++ - test/mask-ctm.c | 2 ++ - test/mask-surface-ctm.c | 2 ++ - test/mask.c | 2 ++ - test/move-to-show-surface.c | 2 ++ - test/new-sub-path.c | 2 ++ - test/nil-surface.c | 2 ++ - test/operator-clear.c | 2 ++ - test/operator-source.c | 2 ++ - test/paint-source-alpha.c | 2 ++ - test/paint-with-alpha.c | 2 ++ - test/paint.c | 2 ++ - test/path-data.c | 2 ++ - test/pixman-rotate.c | 2 ++ - test/push-group.c | 2 ++ - test/rectangle-rounding-error.c | 2 ++ - test/rel-path.c | 2 ++ - test/scale-source-surface-paint.c | 2 ++ - test/select-font-face.c | 2 ++ - test/select-font-no-show-text.c | 2 ++ - test/self-copy.c | 2 ++ - test/self-intersecting.c | 2 ++ - test/set-source.c | 2 ++ - test/show-glyphs-many.c | 2 ++ - test/show-text-current-point.c | 2 ++ - test/source-clip.c | 2 ++ - test/source-surface-scale-paint.c | 2 ++ - test/surface-finish-twice.c | 2 ++ - test/surface-pattern.c | 2 ++ - test/text-antialias-gray.c | 2 ++ - test/text-antialias-none.c | 2 ++ - test/text-antialias-subpixel.c | 2 ++ - test/text-cache-crash.c | 2 ++ - test/text-pattern.c | 2 ++ - test/text-rotate.c | 2 ++ - test/transforms.c | 2 ++ - test/translate-show-surface.c | 2 ++ - test/trap-clip.c | 2 ++ - test/unantialiased-shapes.c | 2 ++ - test/unbounded-operator.c | 2 ++ - test/zero-alpha.c | 2 ++ - 82 files changed, 162 insertions(+), 1 deletions(-) - -commit f8eeca97684f7c8eba7b918c34fe5ccbf32e2f5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 11:48:42 2006 -0400 - - Tiny doc typo fix. - - src/cairo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0ac2bbbf52737b2e368de269651c56dab90c928a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 13 11:27:05 2006 -0400 - - Improve test HTML generation: - - Make "make retest" not generate all .log files. - - Format improvements in the generated HTML file. - - test/Makefile.am | 27 +++++++++++++++++++-------- - test/cairo-test.c | 16 ++++++++-------- - test/make-html.pl | 49 ++++++++++++++++++++++++++++--------------------- - 3 files changed, 55 insertions(+), 37 deletions(-) - -commit f79a9f5a5259f33284d5e63ef2ddac0be4ea7d41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 12 04:27:55 2006 -0400 - - Improve backend .pc files generation: - - Add all non-pkgconfig libs to Libs.private in cairo.pc - - Make cairo-xlib-xrender.pc Require cairo-xlib.pc - - configure.in | 56 ++++++++++++++++++++++++++++------------------ - src/Makefile.am | 2 +- - src/cairo-backend.pc.in | 2 +- - src/cairo.pc.in | 5 ++- - 4 files changed, 39 insertions(+), 26 deletions(-) - -commit 973d3a3d1466830dcaa94e9fe39fa6fdf510fbbc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 22:19:39 2006 -0400 - - More test suite infrastructure improvements: - - Remove cairo_test_expect_failure. cairo-test.c now checks - env var CAIRO_XFAIL_TESTS to see if the running test is - expected to fail. The reason for expected failure is - appended to the test description. - - Test description is written out. - - Failed/crashed tests also write a line out to stderr (in red), - so one can now redirect stdout to /dev/null to only see failures. - - cairo_test() has been changed to not take the draw function - anymore, instead, draw function is now part of the test struct. - - "make check" doesn't allow limiting backends to test using env - var anymore. To limit backends to test, one should use the - TARGETS variable on the make command line. - - "make check-valgrind" now writes its log to valgrind-log instead - of valgrind.log, to not interfere with test log file processing. - - test/.gitignore | 1 + - test/Makefile.am | 9 ++- - test/README | 6 +- - test/a8-mask.c | 9 +- - test/bitmap-font.c | 5 +- - test/cairo-test.c | 98 +++++++++++++++++------- - test/cairo-test.h | 24 ++---- - test/caps-joins-alpha.c | 5 +- - test/caps-joins.c | 5 +- - test/caps-sub-paths.c | 5 +- - test/clip-all.c | 5 +- - test/clip-fill-rule-pixel-aligned.c | 5 +- - test/clip-fill-rule.c | 5 +- - test/clip-nesting.c | 5 +- - test/clip-operator.c | 7 +- - test/clip-twice.c | 5 +- - test/composite-integer-translate-over-repeat.c | 5 +- - test/composite-integer-translate-over.c | 5 +- - test/composite-integer-translate-source.c | 5 +- - test/create-for-stream.c | 29 +++++--- - test/create-from-png-stream.c | 5 +- - test/create-from-png.c | 5 +- - test/dash-caps-joins.c | 5 +- - test/dash-offset-negative.c | 5 +- - test/dash-scale.c | 5 +- - test/dash-zero-length.c | 5 +- - test/degenerate-path.c | 5 +- - test/device-offset-positive.c | 5 +- - test/device-offset.c | 5 +- - test/extend-reflect.c | 9 +- - test/fallback-resolution.c | 6 +- - test/fill-and-stroke-alpha-add.c | 5 +- - test/fill-and-stroke-alpha.c | 5 +- - test/fill-and-stroke.c | 5 +- - test/fill-rule.c | 5 +- - test/filter-nearest-offset.c | 9 +- - test/ft-font-create-for-ft-face.c | 5 +- - test/ft-text-antialias-none.c | 5 +- - test/ft-text-vertical-layout.c | 5 +- - test/get-and-set.c | 7 +- - test/get-group-target.c | 5 +- - test/glyph-cache-pressure.c | 5 +- - test/gradient-alpha.c | 5 +- - test/leaky-dash.c | 9 +- - test/leaky-polygon.c | 5 +- - test/line-width-scale.c | 5 +- - test/line-width.c | 5 +- - test/linear-gradient.c | 5 +- - test/mask-ctm.c | 5 +- - test/mask-surface-ctm.c | 5 +- - test/mask.c | 7 +- - test/move-to-show-surface.c | 5 +- - test/multi-page.c | 8 +- - test/new-sub-path.c | 5 +- - test/nil-surface.c | 5 +- - test/operator-clear.c | 7 +- - test/operator-source.c | 7 +- - test/paint-source-alpha.c | 5 +- - test/paint-with-alpha.c | 5 +- - test/paint.c | 5 +- - test/path-data.c | 5 +- - test/pdf-features.c | 2 +- - test/pixman-rotate.c | 5 +- - test/ps-features.c | 2 +- - test/push-group.c | 5 +- - test/rectangle-rounding-error.c | 5 +- - test/rel-path.c | 5 +- - test/scale-source-surface-paint.c | 5 +- - test/select-font-face.c | 5 +- - test/select-font-no-show-text.c | 7 +- - test/self-copy.c | 5 +- - test/self-intersecting.c | 9 +- - test/set-source.c | 5 +- - test/show-glyphs-many.c | 5 +- - test/show-text-current-point.c | 5 +- - test/source-clip.c | 5 +- - test/source-surface-scale-paint.c | 5 +- - test/surface-finish-twice.c | 5 +- - test/surface-pattern.c | 5 +- - test/svg-clip.c | 2 +- - test/svg-surface.c | 10 +- - test/text-antialias-gray.c | 5 +- - test/text-antialias-none.c | 5 +- - test/text-antialias-subpixel.c | 5 +- - test/text-cache-crash.c | 7 +- - test/text-pattern.c | 5 +- - test/text-rotate.c | 9 +- - test/transforms.c | 5 +- - test/translate-show-surface.c | 5 +- - test/trap-clip.c | 7 +- - test/unantialiased-shapes.c | 5 +- - test/unbounded-operator.c | 7 +- - test/xlib-surface.c | 2 +- - test/zero-alpha.c | 5 +- - 94 files changed, 386 insertions(+), 260 deletions(-) - -commit 94bdbc15f79308269f1bcd74b3d8899f8458babc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 17:27:08 2006 -0400 - - Improve test suite build infrastructure - - Add new target recheck, that checks only failed tests - - Add targets test and retest, and make html after (re)checking - - Make targets html and index.html lazy, only update if any tests changed - - Improve build system such that checking one test (using TESTS=...) doesn't - build all tests - - Remove pixman-rotate from XFAIL - - Makefile.am | 4 ++- - test/Makefile.am | 69 ++++++++++++++++++++++++++++++++++++++++++-------- - test/cairo-test.c | 7 +++-- - test/pixman-rotate.c | 3 +- - 4 files changed, 66 insertions(+), 17 deletions(-) - -commit c45a9321759e5cc0fcf6eda85f91d09ebb4db0d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 16:07:13 2006 -0400 - - Use Bitstream Vera Sans and Latin text in ft-text-vertical. - We don't really rely on the Japanese text and font, as FreeType - synthesizes vertical metrics for all fonts. - - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-argb32-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin - test/ft-text-vertical-layout.c | 4 ++-- - 5 files changed, 2 insertions(+), 2 deletions(-) - -commit fe647ca42b24ff844dd0d94642adaf46ea7a28dd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 15:18:14 2006 -0400 - - Oops. Fix doc format. - - src/cairo.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 90a46affe626c9afafd687ac2d71a57f4583e216 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 13:36:52 2006 -0400 - - Add note to docs for some enums about possible future additions. - - src/cairo.h | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit d27a00874bc044b4c9aefacbc850d5f7ee106b6f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 11 09:23:18 2006 -0400 - - Disable PDF backend if zlib not found. - Explicitly add -lm to CAIRO_LIBS - - configure.in | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit e0ad1aa995bcec4246c0b8ab0d5a5a79871ce235 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 10 13:45:51 2006 -0400 - - Change version number of Sun's Xorg server with buggy repeat from 60800000 to - 60900000. (#7483, pointed by Brian Cameron) - - src/cairo-xlib-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b006bf9d2c7d39c413527017fc792a38b598555a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 10 11:52:58 2006 -0400 - - Add change stat to ChangeLog. - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ccb54b35ed2252ae9ece95204a5ad7b43cde936e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 10 10:35:42 2006 -0400 - - Small doc fix. - - src/cairo.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit defa23206cfa83ad4460a868f78289ba7f7c1c53 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 10 10:26:19 2006 -0400 - - Fix nil surface initializations for surface type. (#7322) - - src/cairo-surface.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit a1143d120fbc142fc6ae15f394cfbe400a4a0b3e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 8 21:04:21 2006 -0400 - - Generate index of new symbols in 1.2. - - doc/public/cairo-docs.xml | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 6efd145882155971be85b23807bd5c52d1025cc3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 8 17:52:24 2006 -0400 - - Better creation rules for cairo.def. - - src/Makefile.am | 39 +++++++++++++-------------------------- - 1 files changed, 13 insertions(+), 26 deletions(-) - -commit f3f374fb8066e09da1948674decadc6c764f2a1b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 8 16:39:52 2006 -0400 - - Include cairo-svg.h in cairo_win32_api_headers. (bug 7462) - - src/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a443a4215869b3556d9d703c80061879020064ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 6 23:06:14 2006 -0400 - - Fix doc typo. - - src/cairo-matrix.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 731925f00a7391755cabb9253c9a9f2b2dccbdb8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 6 23:05:13 2006 -0400 - - Fix doc syntax. - - src/cairo-matrix.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 9c37cac22b071f9fb00f9000779bb988df6e010c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 6 17:52:13 2006 -0400 - - Fix typo when printing error for unsupported X formats. It was mistakenly - marking Green and Blue swapped. - - src/cairo-image-surface.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 807cb2fd8e4867d5aab7bd2c887e17160cf9a22f -Author: David Reveman <davidr@novell.com> -Date: Thu Jul 6 13:50:41 2006 -0400 - - Ignore color for CAIRO_OPERATOR_CLEAR in glitz backend. - - src/cairo-glitz-surface.c | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) - -commit 95016b3274f4eedf6bd917a5b8bf8f6745c54581 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 6 13:48:18 2006 -0400 - - Make CAIRO_TEST_TARGET="" make check pass tests. - - test/cairo-test.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit f90182fe2ad383bf240e2b02003fd7cd0a7e90ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 6 13:42:25 2006 -0400 - - Update test/README - - test/README | 50 +++++++++++++++++++++++++++++++++++++------------- - 1 files changed, 37 insertions(+), 13 deletions(-) - -commit 83dcbe05b5bce6619e650d63be58a35fcb1609c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 5 04:29:54 2006 +0200 - - For check-valgrind, call the version of libtool in our source distribution, - not the one found in PATH. - - test/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1cb0bc40a3ab9373d19c186d98059007f288fa13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 5 04:22:32 2006 +0200 - - Do not use sighandler_t. Bug 7401. - - test/cairo-test.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 91ad3ae78400d2d942354b8cde514480dffc5090 -Author: Jonathon Jongsma <jonathon.jongsma@gmail.com> -Date: Tue Jul 4 16:23:24 2006 -0500 - - Fix documentation typo in cairo_scaled_font_get_font_options() - - src/cairo-scaled-font.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 94c5537924da3a6b00b106eda80e61a6f4a9a1f0 -Author: Jonathon Jongsma <jonathon.jongsma@gmail.com> -Date: Tue Jul 4 14:58:58 2006 -0500 - - Fix a typo in cairo_font_extents_t documentation - - src/cairo.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 57a644fb04bfd4831aa1ec1e5f82c989bbf90c8c -Author: Carl Worth <cworth@cworth.org> -Date: Sat Jul 1 05:06:11 2006 +0200 - - RELEASING: Mention README as the source for blurbs - - RELEASING | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 7bff2eb81905b2d1d01f087612fe8c1354166a94 -Author: Carl Worth <cworth@cworth.org> -Date: Sat Jul 1 04:37:50 2006 +0200 - - Increment CAIRO_VERSION to 1.2.1 after making the 1.2.0 release - - RELEASING | 2 +- - configure.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - commit 61404bd5022b913f58ecda8dc9e8922b4fc6f80b Author: Carl Worth <cworth@cworth.org> Date: Tue Jun 27 15:44:52 2006 +0200 @@ -4402,7 +161,7 @@ Date: Fri Jun 30 17:07:42 2006 +0200 Add ps-specific reference image for test/degenerate-path - test/degenerate-path-ps-argb32-ref.png | Bin + test/degenerate-path-ps-argb32-ref.png | Bin 0 -> 197 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit e0db22c6bc40d4576d9c1131d3192f1df3b942ca @@ -4440,7 +199,7 @@ Date: Thu Jun 29 23:34:29 2006 +0200 Update PDF-specific reference image for scale-source-surface-paint - test/scale-source-surface-paint-pdf-argb32-ref.png | Bin + test/scale-source-surface-paint-pdf-argb32-ref.png | Bin 152 -> 182 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit a6fc321d1793e97e4601429a98c36bed9af365a0 @@ -4449,7 +208,7 @@ Date: Thu Jun 29 23:28:48 2006 +0200 Add PDF-specific reference image for paint-source-alpha - test/paint-source-alpha-pdf-argb32-ref.png | Bin + test/paint-source-alpha-pdf-argb32-ref.png | Bin 0 -> 475 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit aaef92f8307fedd864fca66054b06c8bfe7ae40d @@ -4458,7 +217,7 @@ Date: Thu Jun 29 23:27:05 2006 +0200 Add PDF-specific reference image for composite-integer-translate-over - ...osite-integer-translate-over-pdf-argb32-ref.png | Bin + ...osite-integer-translate-over-pdf-argb32-ref.png | Bin 0 -> 12946 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 45ebf2d1f3c6cb4588c3bebf6acf1818eb723515 @@ -4636,8 +395,8 @@ Date: Thu Jun 29 06:25:24 2006 +0200 Update PDF and PS reference images for test/text-pattern. - test/text-pattern-pdf-argb32-ref.png | Bin - test/text-pattern-ps-argb32-ref.png | Bin + test/text-pattern-pdf-argb32-ref.png | Bin 0 -> 1632 bytes + test/text-pattern-ps-argb32-ref.png | Bin 0 -> 1681 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit a64b946ee0512d85d3c790c67aad8a882c5c3533 @@ -4656,9 +415,9 @@ Date: Thu Jun 29 06:12:48 2006 +0200 Add several more stress tests to test/dash-zero-length - test/dash-zero-length-ps-argb32-ref.png | Bin - test/dash-zero-length-ref.png | Bin - test/dash-zero-length-rgb24-ref.png | Bin + test/dash-zero-length-ps-argb32-ref.png | Bin 214 -> 272 bytes + test/dash-zero-length-ref.png | Bin 235 -> 238 bytes + test/dash-zero-length-rgb24-ref.png | Bin 222 -> 218 bytes test/dash-zero-length.c | 85 ++++++++++++++++++++----------- 4 files changed, 56 insertions(+), 29 deletions(-) @@ -4697,10 +456,10 @@ Date: Thu Jun 29 04:10:35 2006 +0200 src/cairo-font-subset.c | 3 +++ src/cairo-ft-font.c | 16 +++++++++++++++- src/cairo-ft-private.h | 3 +++ - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-pdf-rgb24-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-rgb24-ref.png | Bin + test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin 1018 -> 956 bytes + test/ft-text-vertical-layout-pdf-rgb24-ref.png | Bin 1037 -> 0 bytes + test/ft-text-vertical-layout-ps-argb32-ref.png | Bin 351 -> 349 bytes + test/ft-text-vertical-layout-ps-rgb24-ref.png | Bin 1086 -> 0 bytes 8 files changed, 28 insertions(+), 1 deletions(-) commit 2e2799d4f921b22030eb63585dcec2ed4503fd5b @@ -4718,8 +477,8 @@ Date: Thu Jun 29 02:41:17 2006 +0200 Update reference images for ft-text-vertical-layout - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin + test/ft-text-vertical-layout-ref.png | Bin 1130 -> 1130 bytes + test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin 1100 -> 1098 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit 92021d169fea48eed9349e5821353f976df56be1 @@ -4907,8 +666,8 @@ Date: Sun Jun 25 15:48:48 2006 +0200 Add new test case degenerate-path to show current 'bug' test/Makefile.am | 4 ++ - test/degenerate-path-ref.png | Bin - test/degenerate-path-rgb24-ref.png | Bin + test/degenerate-path-ref.png | Bin 0 -> 193 bytes + test/degenerate-path-rgb24-ref.png | Bin 0 -> 174 bytes test/degenerate-path.c | 68 ++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 0 deletions(-) @@ -4959,7 +718,7 @@ Date: Sun Jun 25 11:48:32 2006 +0200 Note in ROADMAP that bug 6759 is fixed now. test/cairo-test.c | 2 ++ - test/ft-text-antialias-none-ps-argb32-ref.png | Bin + test/ft-text-antialias-none-ps-argb32-ref.png | Bin 0 -> 335 bytes 2 files changed, 2 insertions(+), 0 deletions(-) commit 7e0e503fba80767dc68556054e937123fdcea359 @@ -5096,11 +855,11 @@ Date: Thu Jun 22 22:05:20 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 2 + - test/glyph-cache-pressure-pdf-argb32-ref.png | Bin - test/glyph-cache-pressure-ps-argb32-ref.png | Bin - test/glyph-cache-pressure-ref.png | Bin - test/glyph-cache-pressure-svg-argb32-ref.png | Bin - test/glyph-cache-pressure-svg-rgb24-ref.png | Bin + test/glyph-cache-pressure-pdf-argb32-ref.png | Bin 0 -> 2879 bytes + test/glyph-cache-pressure-ps-argb32-ref.png | Bin 0 -> 591 bytes + test/glyph-cache-pressure-ref.png | Bin 0 -> 3223 bytes + test/glyph-cache-pressure-svg-argb32-ref.png | Bin 0 -> 3635 bytes + test/glyph-cache-pressure-svg-rgb24-ref.png | Bin 0 -> 3165 bytes test/glyph-cache-pressure.c | 89 ++++++++++++++++++++++++++ 8 files changed, 92 insertions(+), 0 deletions(-) @@ -5219,10 +978,10 @@ Date: Tue Jun 20 17:48:06 2006 -0700 distribution. test/.gitignore | 1 + - test/6x13.pcf | Bin + test/6x13.pcf | Bin 10560 -> 5239 bytes test/Makefile.am | 3 + - test/bitmap-font-ref.png | Bin - test/bitmap-font-rgb24-ref.png | Bin + test/bitmap-font-ref.png | Bin 0 -> 552 bytes + test/bitmap-font-rgb24-ref.png | Bin 0 -> 513 bytes test/bitmap-font.c | 106 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 110 insertions(+), 0 deletions(-) @@ -5237,7 +996,7 @@ Date: Tue Jun 20 17:15:07 2006 -0700 but the crash is at least eliminated. src/cairo-svg-surface.c | 87 ++++++++++++++++++++++++++++++++++------------- - test/6x13.pcf | Bin + test/6x13.pcf | Bin 0 -> 10560 bytes 2 files changed, 63 insertions(+), 24 deletions(-) commit 2f43a79e4e87341dd0df49fc6c11fd17a21350c2 @@ -5365,8 +1124,8 @@ Date: Mon Jun 19 04:10:19 2006 -0400 Reference images for new test... - test/device-offset-positive-ref.png | Bin - test/device-offset-positive-rgb24-ref.png | Bin + test/device-offset-positive-ref.png | Bin 0 -> 139 bytes + test/device-offset-positive-rgb24-ref.png | Bin 0 -> 130 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit 2f59dd4a5e9f4ce3853b055620bbada4526e3f58 @@ -5375,10 +1134,10 @@ Date: Mon Jun 19 15:52:36 2006 +0800 Turn hinting off to get consistent results for ft-text-vertical-layout test case. - test/ft-text-vertical-layout-ref.png | Bin - test/ft-text-vertical-layout-rgb24-ref.png | Bin - test/ft-text-vertical-layout-svg-argb32-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin + test/ft-text-vertical-layout-ref.png | Bin 1145 -> 1130 bytes + test/ft-text-vertical-layout-rgb24-ref.png | Bin 1059 -> 0 bytes + test/ft-text-vertical-layout-svg-argb32-ref.png | Bin 1106 -> 1021 bytes + test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin 1106 -> 1100 bytes test/ft-text-vertical-layout.c | 5 +++++ 5 files changed, 5 insertions(+), 0 deletions(-) @@ -5388,7 +1147,7 @@ Date: Mon Jun 19 15:51:43 2006 +0800 Turn hinting off to get consistent results for ft-text-antialias-none test case. - test/ft-text-antialias-none-ref.png | Bin + test/ft-text-antialias-none-ref.png | Bin 332 -> 336 bytes test/ft-text-antialias-none.c | 3 +++ 2 files changed, 3 insertions(+), 0 deletions(-) @@ -5486,7 +1245,7 @@ Date: Sat Jun 17 16:29:54 2006 +0800 test/.gitignore | 1 + test/Makefile.am | 1 + - test/ft-text-antialias-none-ref.png | Bin + test/ft-text-antialias-none-ref.png | Bin 0 -> 332 bytes test/ft-text-antialias-none.c | 128 +++++++++++++++++++++++++++++++++++ 4 files changed, 130 insertions(+), 0 deletions(-) @@ -5685,22 +1444,22 @@ Date: Wed Jun 14 20:57:42 2006 +0200 SVG: Update of reference images. - test/linear-gradient-svg-argb32-ref.png | Bin - test/linear-gradient-svg-rgb24-ref.png | Bin - test/mask-svg-argb32-ref.png | Bin - test/mask-svg-rgb24-ref.png | Bin - test/paint-source-alpha-svg-argb32-ref.png | Bin - test/paint-source-alpha-svg-rgb24-ref.png | Bin - test/paint-with-alpha-svg-argb32-ref.png | Bin - test/paint-with-alpha-svg-rgb24-ref.png | Bin - test/push-group-svg-argb32-ref.png | Bin - test/push-group-svg-rgb24-ref.png | Bin - test/scale-source-surface-paint-svg-argb32-ref.png | Bin - test/scale-source-surface-paint-svg-rgb24-ref.png | Bin - test/text-pattern-svg-argb32-ref.png | Bin - test/text-pattern-svg-rgb24-ref.png | Bin - test/trap-clip-svg-argb32-ref.png | Bin - test/trap-clip-svg-rgb24-ref.png | Bin + test/linear-gradient-svg-argb32-ref.png | Bin 947 -> 1000 bytes + test/linear-gradient-svg-rgb24-ref.png | Bin 947 -> 1000 bytes + test/mask-svg-argb32-ref.png | Bin 87715 -> 87728 bytes + test/mask-svg-rgb24-ref.png | Bin 81874 -> 81753 bytes + test/paint-source-alpha-svg-argb32-ref.png | Bin 353 -> 505 bytes + test/paint-source-alpha-svg-rgb24-ref.png | Bin 353 -> 505 bytes + test/paint-with-alpha-svg-argb32-ref.png | Bin 420 -> 516 bytes + test/paint-with-alpha-svg-rgb24-ref.png | Bin 420 -> 516 bytes + test/push-group-svg-argb32-ref.png | Bin 2945 -> 2935 bytes + test/push-group-svg-rgb24-ref.png | Bin 2901 -> 2887 bytes + test/scale-source-surface-paint-svg-argb32-ref.png | Bin 146 -> 182 bytes + test/scale-source-surface-paint-svg-rgb24-ref.png | Bin 158 -> 192 bytes + test/text-pattern-svg-argb32-ref.png | Bin 1720 -> 1708 bytes + test/text-pattern-svg-rgb24-ref.png | Bin 1567 -> 1563 bytes + test/trap-clip-svg-argb32-ref.png | Bin 71765 -> 71728 bytes + test/trap-clip-svg-rgb24-ref.png | Bin 73066 -> 73082 bytes 16 files changed, 0 insertions(+), 0 deletions(-) commit 2cea3a2710cd4c6eb68e25eadaaf96cdc921ef14 @@ -5763,19 +1522,19 @@ Date: Wed Jun 14 06:39:23 2006 -0700 Patch to fix pixman samping location bug (#2488). - test/gradient-alpha-ref.png | Bin - test/gradient-alpha-rgb24-ref.png | Bin - test/linear-gradient-ref.png | Bin - test/mask-ref.png | Bin - test/mask-rgb24-ref.png | Bin - test/operator-source-ref.png | Bin - test/operator-source-rgb24-ref.png | Bin - test/push-group-ref.png | Bin - test/push-group-rgb24-ref.png | Bin - test/text-pattern-ref.png | Bin - test/text-pattern-rgb24-ref.png | Bin - test/trap-clip-ref.png | Bin - test/trap-clip-rgb24-ref.png | Bin + test/gradient-alpha-ref.png | Bin 155 -> 147 bytes + test/gradient-alpha-rgb24-ref.png | Bin 142 -> 142 bytes + test/linear-gradient-ref.png | Bin 972 -> 1023 bytes + test/mask-ref.png | Bin 87837 -> 87890 bytes + test/mask-rgb24-ref.png | Bin 71069 -> 70978 bytes + test/operator-source-ref.png | Bin 19684 -> 19726 bytes + test/operator-source-rgb24-ref.png | Bin 14699 -> 14701 bytes + test/push-group-ref.png | Bin 3012 -> 2996 bytes + test/push-group-rgb24-ref.png | Bin 2858 -> 2840 bytes + test/text-pattern-ref.png | Bin 1721 -> 1721 bytes + test/text-pattern-rgb24-ref.png | Bin 1423 -> 1418 bytes + test/trap-clip-ref.png | Bin 71785 -> 71753 bytes + test/trap-clip-rgb24-ref.png | Bin 63087 -> 63049 bytes 13 files changed, 0 insertions(+), 0 deletions(-) commit 4bdfff477a1d7fa19890f0a5c4f3cc6533e39149 @@ -5784,16 +1543,16 @@ Date: Wed Jun 14 06:00:11 2006 -0700 PS PDF: Update reference images due to truetype subsetting - test/select-font-face-pdf-argb32-ref.png | Bin - test/select-font-face-ps-argb32-ref.png | Bin - test/show-text-current-point-pdf-argb32-ref.png | Bin - test/show-text-current-point-ps-argb32-ref.png | Bin - test/text-antialias-gray-pdf-argb32-ref.png | Bin - test/text-antialias-gray-ps-argb32-ref.png | Bin - test/text-antialias-none-pdf-argb32-ref.png | Bin - test/text-antialias-none-ps-argb32-ref.png | Bin - test/text-antialias-subpixel-pdf-argb32-ref.png | Bin - test/text-antialias-subpixel-ps-argb32-ref.png | Bin + test/select-font-face-pdf-argb32-ref.png | Bin 2782 -> 2237 bytes + test/select-font-face-ps-argb32-ref.png | Bin 528 -> 481 bytes + test/show-text-current-point-pdf-argb32-ref.png | Bin 3838 -> 2157 bytes + test/show-text-current-point-ps-argb32-ref.png | Bin 645 -> 602 bytes + test/text-antialias-gray-pdf-argb32-ref.png | Bin 1004 -> 950 bytes + test/text-antialias-gray-ps-argb32-ref.png | Bin 306 -> 310 bytes + test/text-antialias-none-pdf-argb32-ref.png | Bin 1004 -> 950 bytes + test/text-antialias-none-ps-argb32-ref.png | Bin 306 -> 310 bytes + test/text-antialias-subpixel-pdf-argb32-ref.png | Bin 1004 -> 950 bytes + test/text-antialias-subpixel-ps-argb32-ref.png | Bin 306 -> 310 bytes 10 files changed, 0 insertions(+), 0 deletions(-) commit 7e0be461b595c3561fa75472fdfd5954e4666cfc @@ -5926,9 +1685,9 @@ Date: Tue Jun 13 20:07:28 2006 -0400 Patch to fix pixman samping location bug (#2488). pixman/src/fbcompose.c | 21 +++++++++++++++------ - test/pixman-rotate-rgb24-ref.png | Bin - test/pixman-rotate-svg-argb32-ref.png | Bin - test/pixman-rotate-svg-rgb24-ref.png | Bin + test/pixman-rotate-rgb24-ref.png | Bin 385 -> 244 bytes + test/pixman-rotate-svg-argb32-ref.png | Bin 0 -> 258 bytes + test/pixman-rotate-svg-rgb24-ref.png | Bin 0 -> 358 bytes 4 files changed, 15 insertions(+), 6 deletions(-) commit 0ee64b84689c22bba1d9bb2758170bbc104f5cf1 @@ -5960,7 +1719,7 @@ Date: Tue Jun 13 16:13:23 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 3 +- - test/zero-alpha-ref.png | Bin + test/zero-alpha-ref.png | Bin 0 -> 115 bytes test/zero-alpha.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 100 insertions(+), 1 deletions(-) @@ -6470,8 +2229,8 @@ Date: Wed Jun 7 17:38:09 2006 -0700 historical). So let's be consist and rename: test/ft-text-vertical-layout-argb32-ref.png -> test/ft-text-vertical-layout-ref.png - test/ft-text-vertical-layout-argb32-ref.png | Bin - test/ft-text-vertical-layout-ref.png | Bin + test/ft-text-vertical-layout-argb32-ref.png | Bin 1145 -> 0 bytes + test/ft-text-vertical-layout-ref.png | Bin 0 -> 1145 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit b7b3d05d78f22b6b45c6a54f2647dbdaeb034d37 @@ -6489,10 +2248,10 @@ Date: Thu Jun 8 04:06:30 2006 +0800 Make image-*-ref.png image as reference image. - test/ft-text-vertical-layout-argb32-ref.png | Bin - test/ft-text-vertical-layout-image-argb32-ref.png | Bin - test/ft-text-vertical-layout-image-rgb24-ref.png | Bin - test/ft-text-vertical-layout-rgb24-ref.png | Bin + test/ft-text-vertical-layout-argb32-ref.png | Bin 0 -> 1145 bytes + test/ft-text-vertical-layout-image-argb32-ref.png | Bin 1145 -> 0 bytes + test/ft-text-vertical-layout-image-rgb24-ref.png | Bin 1059 -> 0 bytes + test/ft-text-vertical-layout-rgb24-ref.png | Bin 0 -> 1059 bytes 4 files changed, 0 insertions(+), 0 deletions(-) commit 5ae2a78a297730cd9d2f45be9f23fbf6e2bffe7d @@ -6514,14 +2273,14 @@ Date: Thu Jun 8 03:33:38 2006 +0800 Add ft-text-vertical-layout test case for vertical layout. test/Makefile.am | 1 + - test/ft-text-vertical-layout-image-argb32-ref.png | Bin - test/ft-text-vertical-layout-image-rgb24-ref.png | Bin - test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin - test/ft-text-vertical-layout-pdf-rgb24-ref.png | Bin - test/ft-text-vertical-layout-ps-argb32-ref.png | Bin - test/ft-text-vertical-layout-ps-rgb24-ref.png | Bin - test/ft-text-vertical-layout-svg-argb32-ref.png | Bin - test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin + test/ft-text-vertical-layout-image-argb32-ref.png | Bin 0 -> 1145 bytes + test/ft-text-vertical-layout-image-rgb24-ref.png | Bin 0 -> 1059 bytes + test/ft-text-vertical-layout-pdf-argb32-ref.png | Bin 0 -> 1018 bytes + test/ft-text-vertical-layout-pdf-rgb24-ref.png | Bin 0 -> 1037 bytes + test/ft-text-vertical-layout-ps-argb32-ref.png | Bin 0 -> 351 bytes + test/ft-text-vertical-layout-ps-rgb24-ref.png | Bin 0 -> 1086 bytes + test/ft-text-vertical-layout-svg-argb32-ref.png | Bin 0 -> 1106 bytes + test/ft-text-vertical-layout-svg-rgb24-ref.png | Bin 0 -> 1106 bytes test/ft-text-vertical-layout.c | 131 +++++++++++++++++++++ 10 files changed, 132 insertions(+), 0 deletions(-) @@ -6554,7 +2313,7 @@ Date: Wed Jun 7 10:37:29 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 2 + - test/get-group-target-ref.png | Bin + test/get-group-target-ref.png | Bin 0 -> 134 bytes test/get-group-target.c | 80 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 83 insertions(+), 0 deletions(-) @@ -7183,8 +2942,8 @@ Date: Wed May 24 17:24:52 2006 -0700 src/cairo-surface.c | 4 +- test/.gitignore | 1 + test/Makefile.am | 1 + - test/device-offset-ref.png | Bin - test/device-offset-rgb24-ref.png | Bin + test/device-offset-ref.png | Bin 0 -> 137 bytes + test/device-offset-rgb24-ref.png | Bin 0 -> 130 bytes test/device-offset.c | 93 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 97 insertions(+), 2 deletions(-) @@ -7327,8 +3086,8 @@ Date: Tue May 23 11:12:09 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 2 + - test/dash-scale-ps-argb32-ref.png | Bin - test/dash-scale-ref.png | Bin + test/dash-scale-ps-argb32-ref.png | Bin 0 -> 2950 bytes + test/dash-scale-ref.png | Bin 0 -> 7791 bytes test/dash-scale.c | 125 +++++++++++++++++++++++++++++++++++++ 5 files changed, 128 insertions(+), 0 deletions(-) @@ -7359,8 +3118,8 @@ Date: Tue May 23 10:45:18 2006 -0700 reference images for that test to match. src/cairo.c | 25 +++++++++++++++++++------ - test/line-width-scale-ps-argb32-ref.png | Bin - test/line-width-scale-ref.png | Bin + test/line-width-scale-ps-argb32-ref.png | Bin 1470 -> 1599 bytes + test/line-width-scale-ref.png | Bin 4884 -> 6445 bytes test/line-width-scale.c | 28 +++++++++++++++------------- 4 files changed, 34 insertions(+), 19 deletions(-) @@ -7874,7 +3633,7 @@ Date: Mon May 15 10:04:53 2006 -0700 style very similar to what the PS surface does. src/cairo-pdf-surface.c | 242 ++++++++++++++++++++++++++++-- - test/select-font-face-pdf-argb32-ref.png | Bin + test/select-font-face-pdf-argb32-ref.png | Bin 2781 -> 2782 bytes 2 files changed, 231 insertions(+), 11 deletions(-) commit 6f417fed51672ccca305b7fcc8b1bc3af7609534 @@ -8097,11 +3856,11 @@ Date: Tue May 9 14:39:08 2006 -0700 Fix typo in select-font-face.c and update reference images - test/select-font-face-pdf-argb32-ref.png | Bin - test/select-font-face-ps-argb32-ref.png | Bin - test/select-font-face-ref.png | Bin - test/select-font-face-svg-argb32-ref.png | Bin - test/select-font-face-svg-rgb24-ref.png | Bin + test/select-font-face-pdf-argb32-ref.png | Bin 0 -> 2781 bytes + test/select-font-face-ps-argb32-ref.png | Bin 0 -> 528 bytes + test/select-font-face-ref.png | Bin 2460 -> 2481 bytes + test/select-font-face-svg-argb32-ref.png | Bin 0 -> 3064 bytes + test/select-font-face-svg-rgb24-ref.png | Bin 0 -> 3064 bytes test/select-font-face.c | 4 ++-- 6 files changed, 2 insertions(+), 2 deletions(-) @@ -8113,7 +3872,7 @@ Date: Tue May 9 14:15:27 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 2 + - test/select-font-face-ref.png | Bin + test/select-font-face-ref.png | Bin 0 -> 2460 bytes test/select-font-face.c | 83 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 86 insertions(+), 0 deletions(-) @@ -8156,8 +3915,8 @@ Date: Fri May 5 20:31:48 2006 +0200 It fails on a one digit color error. - test/fill-and-stroke-alpha-svg-argb32-ref.png | Bin - test/fill-and-stroke-alpha-svg-rgb24-ref.png | Bin + test/fill-and-stroke-alpha-svg-argb32-ref.png | Bin 0 -> 509 bytes + test/fill-and-stroke-alpha-svg-rgb24-ref.png | Bin 0 -> 509 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit ac470b02384528f9fda3ee7c80b64d27825b927a @@ -8288,9 +4047,9 @@ Date: Thu May 4 21:35:23 2006 -0700 test/.gitignore | 2 + test/Makefile.am | 4 + - test/fill-and-stroke-alpha-add-ref.png | Bin + test/fill-and-stroke-alpha-add-ref.png | Bin 0 -> 588 bytes test/fill-and-stroke-alpha-add.c | 112 ++++++++++++++++++++++++++++++++ - test/fill-and-stroke-alpha-ref.png | Bin + test/fill-and-stroke-alpha-ref.png | Bin 0 -> 532 bytes test/fill-and-stroke-alpha.c | 106 ++++++++++++++++++++++++++++++ 6 files changed, 224 insertions(+), 0 deletions(-) @@ -8367,14 +4126,14 @@ Date: Thu May 4 21:40:17 2006 +0200 There's a bug in librsvg/cairo that offsets composited images by half a pixel. http://bugzilla.gnome.org/show_bug.cgi?id=330055 - ...osite-integer-translate-over-svg-argb32-ref.png | Bin - ...posite-integer-translate-over-svg-rgb24-ref.png | Bin - test/paint-source-alpha-svg-argb32-ref.png | Bin - test/paint-source-alpha-svg-rgb24-ref.png | Bin - test/paint-with-alpha-svg-argb32-ref.png | Bin - test/paint-with-alpha-svg-rgb24-ref.png | Bin - test/scale-source-surface-paint-svg-argb32-ref.png | Bin - test/scale-source-surface-paint-svg-rgb24-ref.png | Bin + ...osite-integer-translate-over-svg-argb32-ref.png | Bin 0 -> 15465 bytes + ...posite-integer-translate-over-svg-rgb24-ref.png | Bin 0 -> 15465 bytes + test/paint-source-alpha-svg-argb32-ref.png | Bin 0 -> 353 bytes + test/paint-source-alpha-svg-rgb24-ref.png | Bin 0 -> 353 bytes + test/paint-with-alpha-svg-argb32-ref.png | Bin 0 -> 420 bytes + test/paint-with-alpha-svg-rgb24-ref.png | Bin 0 -> 420 bytes + test/scale-source-surface-paint-svg-argb32-ref.png | Bin 0 -> 146 bytes + test/scale-source-surface-paint-svg-rgb24-ref.png | Bin 0 -> 158 bytes 8 files changed, 0 insertions(+), 0 deletions(-) commit 720edfe865fde9dff49198edaa9029a989045334 @@ -8385,8 +4144,8 @@ Date: Thu May 4 18:53:51 2006 +0200 Tests just fail for a one digit color on error. - test/push-group-svg-argb32-ref.png | Bin - test/push-group-svg-rgb24-ref.png | Bin + test/push-group-svg-argb32-ref.png | Bin 0 -> 2945 bytes + test/push-group-svg-rgb24-ref.png | Bin 0 -> 2901 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit a3997501fad548988135e1aff6b906e96a9b744c @@ -8395,10 +4154,10 @@ Date: Thu May 4 18:40:37 2006 +0200 SVG: Update reference images for shrinked tests. - test/linear-gradient-svg-argb32-ref.png | Bin - test/linear-gradient-svg-rgb24-ref.png | Bin - test/text-pattern-svg-argb32-ref.png | Bin - test/text-pattern-svg-rgb24-ref.png | Bin + test/linear-gradient-svg-argb32-ref.png | Bin 12707 -> 947 bytes + test/linear-gradient-svg-rgb24-ref.png | Bin 12707 -> 947 bytes + test/text-pattern-svg-argb32-ref.png | Bin 2643 -> 1720 bytes + test/text-pattern-svg-rgb24-ref.png | Bin 2490 -> 1567 bytes 4 files changed, 0 insertions(+), 0 deletions(-) commit 135449ae03e74910c9ac359772d4ad790f6b7bed @@ -8558,8 +4317,8 @@ Date: Wed Mar 1 17:19:45 2006 +0100 Add push-group test and reference images - test/push-group-ref.png | Bin - test/push-group-rgb24-ref.png | Bin + test/push-group-ref.png | Bin 0 -> 3012 bytes + test/push-group-rgb24-ref.png | Bin 0 -> 2858 bytes test/push-group.c | 119 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 0 deletions(-) @@ -8896,10 +4655,10 @@ Date: Fri Mar 10 16:37:50 2006 -0800 values, but that's not the designed purpose of the tests so I don't feel bad about losing that characteristic. - test/linear-gradient-ref.png | Bin + test/linear-gradient-ref.png | Bin 12750 -> 972 bytes test/linear-gradient.c | 6 +++--- - test/text-pattern-ref.png | Bin - test/text-pattern-rgb24-ref.png | Bin + test/text-pattern-ref.png | Bin 2725 -> 1721 bytes + test/text-pattern-rgb24-ref.png | Bin 2339 -> 1423 bytes test/text-pattern.c | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) @@ -9295,20 +5054,20 @@ Date: Mon May 1 23:23:02 2006 +0200 SVG: Add reference images for tests failing on 1 digit error on color. - test/caps-joins-alpha-svg-argb32-ref.png | Bin - test/caps-joins-alpha-svg-rgb24-ref.png | Bin - test/linear-gradient-svg-argb32-ref.png | Bin - test/linear-gradient-svg-rgb24-ref.png | Bin - test/mask-ctm-svg-argb32-ref.png | Bin - test/mask-ctm-svg-rgb24-ref.png | Bin - test/mask-surface-ctm-svg-argb32-ref.png | Bin - test/mask-surface-ctm-svg-rgb24-ref.png | Bin - test/mask-svg-argb32-ref.png | Bin - test/mask-svg-rgb24-ref.png | Bin - test/set-source-svg-argb32-ref.png | Bin - test/set-source-svg-rgb24-ref.png | Bin - test/trap-clip-svg-argb32-ref.png | Bin - test/trap-clip-svg-rgb24-ref.png | Bin + test/caps-joins-alpha-svg-argb32-ref.png | Bin 0 -> 2454 bytes + test/caps-joins-alpha-svg-rgb24-ref.png | Bin 0 -> 2454 bytes + test/linear-gradient-svg-argb32-ref.png | Bin 0 -> 12707 bytes + test/linear-gradient-svg-rgb24-ref.png | Bin 0 -> 12707 bytes + test/mask-ctm-svg-argb32-ref.png | Bin 0 -> 108 bytes + test/mask-ctm-svg-rgb24-ref.png | Bin 0 -> 118 bytes + test/mask-surface-ctm-svg-argb32-ref.png | Bin 0 -> 108 bytes + test/mask-surface-ctm-svg-rgb24-ref.png | Bin 0 -> 118 bytes + test/mask-svg-argb32-ref.png | Bin 0 -> 87715 bytes + test/mask-svg-rgb24-ref.png | Bin 0 -> 81874 bytes + test/set-source-svg-argb32-ref.png | Bin 0 -> 104 bytes + test/set-source-svg-rgb24-ref.png | Bin 0 -> 104 bytes + test/trap-clip-svg-argb32-ref.png | Bin 0 -> 71765 bytes + test/trap-clip-svg-rgb24-ref.png | Bin 0 -> 73066 bytes 14 files changed, 0 insertions(+), 0 deletions(-) commit e3b3402eb82786c4b1faf0d25b6ed322bf5545aa @@ -9440,11 +5199,11 @@ Date: Tue Apr 25 22:48:21 2006 +0200 SVG: Update rgb24 reference files. (cherry picked from 7173951535f4b95da37cbf3d51143deeec95e47a commit) - test/show-text-current-point-svg-rgb24-ref.png | Bin - test/text-antialias-gray-svg-rgb24-ref.png | Bin - test/text-antialias-none-svg-rgb24-ref.png | Bin - test/text-antialias-subpixel-svg-rgb24-ref.png | Bin - test/text-pattern-svg-rgb24-ref.png | Bin + test/show-text-current-point-svg-rgb24-ref.png | Bin 4236 -> 2398 bytes + test/text-antialias-gray-svg-rgb24-ref.png | Bin 1077 -> 1033 bytes + test/text-antialias-none-svg-rgb24-ref.png | Bin 1077 -> 1033 bytes + test/text-antialias-subpixel-svg-rgb24-ref.png | Bin 1077 -> 1033 bytes + test/text-pattern-svg-rgb24-ref.png | Bin 2428 -> 2490 bytes 5 files changed, 0 insertions(+), 0 deletions(-) commit bdc1c1ac783f1d2bda742ea7150de2c4b0751a29 @@ -9478,7 +5237,7 @@ Date: Sat Apr 29 14:28:21 2006 -0700 Add missing file leaky-dash-ref.png - test/leaky-dash-ref.png | Bin + test/leaky-dash-ref.png | Bin 0 -> 241 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 516ac16de1ac0cab8e2972e2ac1443fd58c39746 @@ -9501,8 +5260,8 @@ Date: Thu Apr 27 09:54:58 2006 -0700 test/.gitignore | 1 + test/Makefile.am | 2 + - test/line-width-scale-ps-argb32-ref.png | Bin - test/line-width-scale-ref.png | Bin + test/line-width-scale-ps-argb32-ref.png | Bin 0 -> 1470 bytes + test/line-width-scale-ref.png | Bin 0 -> 4884 bytes test/line-width-scale.c | 184 +++++++++++++++++++++++++++++++ 5 files changed, 187 insertions(+), 0 deletions(-) @@ -9683,41 +5442,41 @@ Date: Wed Apr 26 12:36:22 2006 -0700 So we change the logic to find the latter if the former doesn't exist, and then we remove the redundant images. - test/a8-mask-rgb24-ref.png | Bin + test/a8-mask-rgb24-ref.png | Bin 128 -> 0 bytes test/cairo-test.c | 20 +++++++++++++------- - test/caps-joins-alpha-rgb24-ref.png | Bin - test/caps-joins-rgb24-ref.png | Bin - test/caps-sub-paths-rgb24-ref.png | Bin - test/clip-all-rgb24-ref.png | Bin - ...ite-integer-translate-over-repeat-rgb24-ref.png | Bin - .../composite-integer-translate-over-rgb24-ref.png | Bin - ...omposite-integer-translate-source-rgb24-ref.png | Bin - test/create-from-png-rgb24-ref.png | Bin - test/create-from-png-stream-rgb24-ref.png | Bin - test/dash-caps-joins-rgb24-ref.png | Bin - test/dash-offset-negative-rgb24-ref.png | Bin - test/filter-nearest-offset-rgb24-ref.png | Bin + test/caps-joins-alpha-rgb24-ref.png | Bin 2283 -> 0 bytes + test/caps-joins-rgb24-ref.png | Bin 1398 -> 0 bytes + test/caps-sub-paths-rgb24-ref.png | Bin 186 -> 0 bytes + test/clip-all-rgb24-ref.png | Bin 114 -> 0 bytes + ...ite-integer-translate-over-repeat-rgb24-ref.png | Bin 353 -> 0 bytes + .../composite-integer-translate-over-rgb24-ref.png | Bin 13041 -> 0 bytes + ...omposite-integer-translate-source-rgb24-ref.png | Bin 14017 -> 0 bytes + test/create-from-png-rgb24-ref.png | Bin 115 -> 0 bytes + test/create-from-png-stream-rgb24-ref.png | Bin 115 -> 0 bytes + test/dash-caps-joins-rgb24-ref.png | Bin 2465 -> 0 bytes + test/dash-offset-negative-rgb24-ref.png | Bin 170 -> 0 bytes + test/filter-nearest-offset-rgb24-ref.png | Bin 254 -> 0 bytes test/imagediff.c | 15 +++++++++------ - test/leaky-polygon-rgb24-ref.png | Bin - test/line-width-rgb24-ref.png | Bin - test/linear-gradient-rgb24-ref.png | Bin - test/move-to-show-surface-rgb24-ref.png | Bin - test/paint-rgb24-ref.png | Bin - test/paint-source-alpha-rgb24-ref.png | Bin - test/paint-with-alpha-rgb24-ref.png | Bin - test/path-data-rgb24-ref.png | Bin - test/rectangle-rounding-error-rgb24-ref.png | Bin - test/self-copy-rgb24-ref.png | Bin - test/show-glyphs-many-rgb24-ref.png | Bin - test/show-text-current-point-rgb24-ref.png | Bin - test/source-clip-rgb24-ref.png | Bin - test/surface-pattern-rgb24-ref.png | Bin - test/text-antialias-gray-rgb24-ref.png | Bin - test/text-antialias-none-rgb24-ref.png | Bin - test/text-antialias-subpixel-rgb24-ref.png | Bin - test/transforms-rgb24-ref.png | Bin - test/translate-show-surface-rgb24-ref.png | Bin - test/unantialiased-shapes-rgb24-ref.png | Bin + test/leaky-polygon-rgb24-ref.png | Bin 344 -> 0 bytes + test/line-width-rgb24-ref.png | Bin 199 -> 0 bytes + test/linear-gradient-rgb24-ref.png | Bin 11700 -> 0 bytes + test/move-to-show-surface-rgb24-ref.png | Bin 115 -> 0 bytes + test/paint-rgb24-ref.png | Bin 116 -> 0 bytes + test/paint-source-alpha-rgb24-ref.png | Bin 248 -> 0 bytes + test/paint-with-alpha-rgb24-ref.png | Bin 255 -> 0 bytes + test/path-data-rgb24-ref.png | Bin 523 -> 0 bytes + test/rectangle-rounding-error-rgb24-ref.png | Bin 298 -> 0 bytes + test/self-copy-rgb24-ref.png | Bin 291 -> 0 bytes + test/show-glyphs-many-rgb24-ref.png | Bin 115 -> 0 bytes + test/show-text-current-point-rgb24-ref.png | Bin 2173 -> 0 bytes + test/source-clip-rgb24-ref.png | Bin 180 -> 0 bytes + test/surface-pattern-rgb24-ref.png | Bin 194 -> 0 bytes + test/text-antialias-gray-rgb24-ref.png | Bin 995 -> 0 bytes + test/text-antialias-none-rgb24-ref.png | Bin 284 -> 0 bytes + test/text-antialias-subpixel-rgb24-ref.png | Bin 1121 -> 0 bytes + test/transforms-rgb24-ref.png | Bin 318 -> 0 bytes + test/translate-show-surface-rgb24-ref.png | Bin 115 -> 0 bytes + test/unantialiased-shapes-rgb24-ref.png | Bin 4449 -> 0 bytes 35 files changed, 22 insertions(+), 13 deletions(-) commit fe8bf47afc11b12034fd2c92caf424c8911d630b @@ -9794,14 +5553,14 @@ Date: Tue Apr 25 07:07:48 2006 -0700 Update PS and PDF reference images for change in font options - test/show-text-current-point-pdf-argb32-ref.png | Bin - test/show-text-current-point-ps-argb32-ref.png | Bin - test/text-antialias-gray-pdf-argb32-ref.png | Bin - test/text-antialias-gray-ps-argb32-ref.png | Bin - test/text-antialias-none-pdf-argb32-ref.png | Bin - test/text-antialias-none-ps-argb32-ref.png | Bin - test/text-antialias-subpixel-pdf-argb32-ref.png | Bin - test/text-antialias-subpixel-ps-argb32-ref.png | Bin + test/show-text-current-point-pdf-argb32-ref.png | Bin 2143 -> 3838 bytes + test/show-text-current-point-ps-argb32-ref.png | Bin 638 -> 645 bytes + test/text-antialias-gray-pdf-argb32-ref.png | Bin 945 -> 1004 bytes + test/text-antialias-gray-ps-argb32-ref.png | Bin 305 -> 306 bytes + test/text-antialias-none-pdf-argb32-ref.png | Bin 945 -> 1004 bytes + test/text-antialias-none-ps-argb32-ref.png | Bin 305 -> 306 bytes + test/text-antialias-subpixel-pdf-argb32-ref.png | Bin 945 -> 1004 bytes + test/text-antialias-subpixel-ps-argb32-ref.png | Bin 305 -> 306 bytes 8 files changed, 0 insertions(+), 0 deletions(-) commit 6237437f412d9d007e1c49c33f6e81117b612d39 @@ -9935,14 +5694,14 @@ Date: Tue Apr 25 01:56:51 2006 -0700 test/Makefile.am | 8 +++ test/cairo-test.c | 45 ++++++++++++++++ test/cairo-test.h | 3 + - test/caps-joins-alpha-ref.png | Bin - test/caps-joins-alpha-rgb24-ref.png | Bin + test/caps-joins-alpha-ref.png | Bin 0 -> 2434 bytes + test/caps-joins-alpha-rgb24-ref.png | Bin 0 -> 2283 bytes test/caps-joins-alpha.c | 94 +++++++++++++++++++++++++++++++++ - test/paint-source-alpha-ref.png | Bin - test/paint-source-alpha-rgb24-ref.png | Bin + test/paint-source-alpha-ref.png | Bin 0 -> 258 bytes + test/paint-source-alpha-rgb24-ref.png | Bin 0 -> 248 bytes test/paint-source-alpha.c | 67 +++++++++++++++++++++++ - test/paint-with-alpha-ref.png | Bin - test/paint-with-alpha-rgb24-ref.png | Bin + test/paint-with-alpha-ref.png | Bin 164 -> 268 bytes + test/paint-with-alpha-rgb24-ref.png | Bin 142 -> 255 bytes test/paint-with-alpha.c | 9 ++- 13 files changed, 225 insertions(+), 3 deletions(-) @@ -9956,7 +5715,7 @@ Date: Mon Apr 24 16:16:19 2006 -0700 There might be a way to get something like this in the PDF, but it's not the point of the test. - test/scale-source-surface-paint-pdf-argb32-ref.png | Bin + test/scale-source-surface-paint-pdf-argb32-ref.png | Bin 0 -> 152 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 32a7edc42dae507678e4eed98fcb41802b8ee69c @@ -10037,9 +5796,9 @@ Date: Thu Apr 20 10:54:01 2006 -0700 PDF: Fix reference images inadvertently committed as PDF not PNG - test/text-antialias-gray-pdf-argb32-ref.png | Bin - test/text-antialias-none-pdf-argb32-ref.png | Bin - test/text-antialias-subpixel-pdf-argb32-ref.png | Bin + test/text-antialias-gray-pdf-argb32-ref.png | Bin 7264 -> 945 bytes + test/text-antialias-none-pdf-argb32-ref.png | Bin 7264 -> 945 bytes + test/text-antialias-subpixel-pdf-argb32-ref.png | Bin 7264 -> 945 bytes 3 files changed, 0 insertions(+), 0 deletions(-) commit 7fa8bfd738f939c06480c40162e347a2ecadd4d6 @@ -10076,7 +5835,7 @@ Date: Wed Apr 19 11:04:37 2006 -0700 those tests so that the suite continues to report PASS. src/cairo-pdf-surface.c | 27 +++++++- - test/show-text-current-point-pdf-argb32-ref.png | Bin + test/show-text-current-point-pdf-argb32-ref.png | Bin 0 -> 2143 bytes test/text-antialias-gray-pdf-argb32-ref.png | 80 +++++++++++++++++++++++ test/text-antialias-none-pdf-argb32-ref.png | 80 +++++++++++++++++++++++ test/text-antialias-subpixel-pdf-argb32-ref.png | 80 +++++++++++++++++++++++ @@ -10202,7 +5961,7 @@ Date: Tue Apr 18 15:19:36 2006 -0700 Add new PS-specific reference image for new-sub-path. - test/new-sub-path-ps-argb32-ref.png | Bin + test/new-sub-path-ps-argb32-ref.png | Bin 0 -> 316 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 448e904b2a64769aa9cfd8ea011c2b5fb6ec883b @@ -10245,12 +6004,12 @@ Date: Tue Apr 18 21:22:58 2006 +0200 Antialias property is not directly supported by SVG, and probably not the most wanted feature. In the future, we could use an image fallback in order to emulate it, or try to use text-rendering, shape-rendering and image-rendering properties (http://www.w3.org/TR/SVG/painting.html#RenderingProperties). - test/text-antialias-none-svg-argb32-ref.png | Bin - test/text-antialias-none-svg-rgb24-ref.png | Bin - test/text-antialias-subpixel-svg-argb32-ref.png | Bin - test/text-antialias-subpixel-svg-rgb24-ref.png | Bin - test/unantialiased-shapes-svg-argb32-ref.png | Bin - test/unantialiased-shapes-svg-rgb24-ref.png | Bin + test/text-antialias-none-svg-argb32-ref.png | Bin 0 -> 1077 bytes + test/text-antialias-none-svg-rgb24-ref.png | Bin 0 -> 1077 bytes + test/text-antialias-subpixel-svg-argb32-ref.png | Bin 0 -> 1077 bytes + test/text-antialias-subpixel-svg-rgb24-ref.png | Bin 0 -> 1077 bytes + test/unantialiased-shapes-svg-argb32-ref.png | Bin 0 -> 19689 bytes + test/unantialiased-shapes-svg-rgb24-ref.png | Bin 0 -> 19689 bytes 6 files changed, 0 insertions(+), 0 deletions(-) commit 3f84df97ddd639c9e1d3706be7c9c86eba22c5bb @@ -10321,12 +6080,12 @@ Date: Sun Apr 16 16:00:27 2006 +0200 Currently, text are rendered as paths in SVG files, so, when rendered to png through librsvg, they don't match general reference images. - test/show-text-current-point-svg-argb32-ref.png | Bin - test/show-text-current-point-svg-rgb24-ref.png | Bin - test/text-antialias-gray-svg-argb32-ref.png | Bin - test/text-antialias-gray-svg-rgb24-ref.png | Bin - test/text-pattern-svg-argb32-ref.png | Bin - test/text-pattern-svg-rgb24-ref.png | Bin + test/show-text-current-point-svg-argb32-ref.png | Bin 0 -> 4236 bytes + test/show-text-current-point-svg-rgb24-ref.png | Bin 0 -> 4236 bytes + test/text-antialias-gray-svg-argb32-ref.png | Bin 0 -> 1077 bytes + test/text-antialias-gray-svg-rgb24-ref.png | Bin 0 -> 1077 bytes + test/text-pattern-svg-argb32-ref.png | Bin 0 -> 2643 bytes + test/text-pattern-svg-rgb24-ref.png | Bin 0 -> 2428 bytes 6 files changed, 0 insertions(+), 0 deletions(-) commit 714bb88832f0e6324cd4737aaa37a4ba39f8d14e @@ -10644,7 +6403,7 @@ Date: Fri Apr 14 10:08:31 2006 -0700 This reference image demonstrates the bug that occurs when we emit zero-length dash segments into a PostScript file with butt caps. - test/dash-zero-length-ps-argb32-ref.png | Bin + test/dash-zero-length-ps-argb32-ref.png | Bin 222 -> 214 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 11b4d24671a0527a45971e9fdf245ac28facc822 @@ -10720,9 +6479,9 @@ Date: Sun Apr 9 23:11:47 2006 -0400 The new test case tests a variety of circumstances involved with zero length dashing. test/Makefile.am | 4 ++ - test/dash-zero-length-ps-argb32-ref.png | Bin - test/dash-zero-length-ref.png | Bin - test/dash-zero-length-rgb24-ref.png | Bin + test/dash-zero-length-ps-argb32-ref.png | Bin 0 -> 222 bytes + test/dash-zero-length-ref.png | Bin 0 -> 235 bytes + test/dash-zero-length-rgb24-ref.png | Bin 0 -> 222 bytes test/dash-zero-length.c | 88 +++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 0 deletions(-) @@ -10948,7 +6707,7 @@ Date: Mon Apr 10 11:00:26 2006 -0700 ghostscript output as the new reference image against which the ps output should be tested. - test/dash-caps-joins-ps-argb32-ref.png | Bin + test/dash-caps-joins-ps-argb32-ref.png | Bin 0 -> 1247 bytes 1 files changed, 0 insertions(+), 0 deletions(-) commit 65e706ee14b9bfbc2ce0e83b35a813d51d97592f @@ -10982,8 +6741,8 @@ Date: Mon Apr 10 10:54:24 2006 -0700 With this change, this test now fails for most backends for which it previously passed. - test/dash-caps-joins-ref.png | Bin - test/dash-caps-joins-rgb24-ref.png | Bin + test/dash-caps-joins-ref.png | Bin 3219 -> 2583 bytes + test/dash-caps-joins-rgb24-ref.png | Bin 2946 -> 2465 bytes 2 files changed, 0 insertions(+), 0 deletions(-) commit 807f64d57c616e2ce8a61202cd9b59ac7a6a26cb @@ -11081,24 +6840,24 @@ Date: Thu Apr 6 09:43:39 2006 -0700 src/cairo-ps-surface.c | 69 ++++++++++++++++------- test/cairo-test.c | 3 +- - test/caps-joins-ps-argb32-ref.png | Bin - test/caps-sub-paths-ps-argb32-ref.png | Bin - test/clip-fill-rule-ps-argb32-ref.png | Bin - test/clip-nesting-ps-argb32-ref.png | Bin - test/clip-twice-ps-argb32-ref.png | Bin - test/dash-offset-negative-ps-argb32-ref.png | Bin - test/fill-and-stroke-ps-argb32-ref.png | Bin - test/fill-rule-ps-argb32-ref.png | Bin - test/leaky-polygon-ps-argb32-ref.png | Bin - test/line-width-ps-argb32-ref.png | Bin - test/path-data-ps-argb32-ref.png | Bin - test/rectangle-rounding-error-ps-argb32-ref.png | Bin - test/show-text-current-point-ps-argb32-ref.png | Bin - test/text-antialias-gray-ps-argb32-ref.png | Bin - test/text-antialias-none-ps-argb32-ref.png | Bin - test/text-antialias-subpixel-ps-argb32-ref.png | Bin - test/transforms-ps-argb32-ref.png | Bin - test/unantialiased-shapes-ps-argb32-ref.png | Bin + test/caps-joins-ps-argb32-ref.png | Bin 0 -> 995 bytes + test/caps-sub-paths-ps-argb32-ref.png | Bin 0 -> 170 bytes + test/clip-fill-rule-ps-argb32-ref.png | Bin 0 -> 280 bytes + test/clip-nesting-ps-argb32-ref.png | Bin 0 -> 488 bytes + test/clip-twice-ps-argb32-ref.png | Bin 0 -> 460 bytes + test/dash-offset-negative-ps-argb32-ref.png | Bin 0 -> 170 bytes + test/fill-and-stroke-ps-argb32-ref.png | Bin 0 -> 243 bytes + test/fill-rule-ps-argb32-ref.png | Bin 0 -> 1078 bytes + test/leaky-polygon-ps-argb32-ref.png | Bin 0 -> 233 bytes + test/line-width-ps-argb32-ref.png | Bin 0 -> 201 bytes + test/path-data-ps-argb32-ref.png | Bin 0 -> 322 bytes + test/rectangle-rounding-error-ps-argb32-ref.png | Bin 0 -> 258 bytes + test/show-text-current-point-ps-argb32-ref.png | Bin 0 -> 638 bytes + test/text-antialias-gray-ps-argb32-ref.png | Bin 0 -> 305 bytes + test/text-antialias-none-ps-argb32-ref.png | Bin 0 -> 305 bytes + test/text-antialias-subpixel-ps-argb32-ref.png | Bin 0 -> 305 bytes + test/transforms-ps-argb32-ref.png | Bin 0 -> 287 bytes + test/unantialiased-shapes-ps-argb32-ref.png | Bin 0 -> 4076 bytes 20 files changed, 50 insertions(+), 22 deletions(-) commit c4fc7b06b53c811ddc20def91aaccd756c28a924 @@ -11794,8 +7553,8 @@ Date: Thu Mar 2 10:32:38 2006 -0800 test/.gitignore | 1 + test/Makefile.am | 2 + - test/show-glyphs-many-ref.png | Bin - test/show-glyphs-many-rgb24-ref.png | Bin + test/show-glyphs-many-ref.png | Bin 0 -> 118 bytes + test/show-glyphs-many-rgb24-ref.png | Bin 0 -> 115 bytes test/show-glyphs-many.c | 127 +++++++++++++++++++++++++++++++++++ 5 files changed, 130 insertions(+), 0 deletions(-) @@ -12414,8 +8173,8 @@ Date: Thu Feb 23 22:01:07 2006 -0800 src/cairoint.h | 3 + test/.gitignore | 1 + test/Makefile.am | 4 ++ - test/new-sub-path-ref.png | Bin - test/new-sub-path-rgb24-ref.png | Bin + test/new-sub-path-ref.png | Bin 0 -> 386 bytes + test/new-sub-path-rgb24-ref.png | Bin 0 -> 355 bytes test/new-sub-path.c | 79 +++++++++++++++++++++++++++++++++++++++ 14 files changed, 209 insertions(+), 124 deletions(-) @@ -12721,7 +8480,7 @@ Date: Wed Jan 25 07:33:56 2006 +0000 doc/tutorial/slides/cairo-code.svg | 367 ++++++++++++++++++++++++++++++- doc/tutorial/slides/cairo-separator.svg | 367 ++++++++++++++++++++++++++++++- doc/tutorial/slides/cairo.svg | 368 ++++++++++++++++++++++++++++++- - doc/tutorial/slides/rendering-model.png | Bin + doc/tutorial/slides/rendering-model.png | Bin 0 -> 63917 bytes doc/tutorial/slides/tutorial.xml | 105 +++++++-- doc/tutorial/src/Makefile | 2 +- 8 files changed, 1200 insertions(+), 29 deletions(-) @@ -12766,13 +8525,13 @@ Date: Sat Jan 21 11:54:17 2006 +0000 Updating BeOS reference images, the tests use a black background now. ChangeLog | 13 +++++++++++++ - test/mask-beos-rgb24-ref.png | Bin - test/mask-beos_bitmap-argb32-ref.png | Bin - test/mask-beos_bitmap-rgb24-ref.png | Bin - test/set-source-beos-rgb24-ref.png | Bin - test/set-source-beos_bitmap-rgb24-ref.png | Bin - test/trap-clip-beos-rgb24-ref.png | Bin - test/trap-clip-beos_bitmap-rgb24-ref.png | Bin + test/mask-beos-rgb24-ref.png | Bin 73512 -> 71028 bytes + test/mask-beos_bitmap-argb32-ref.png | Bin 87641 -> 87641 bytes + test/mask-beos_bitmap-rgb24-ref.png | Bin 73512 -> 71028 bytes + test/set-source-beos-rgb24-ref.png | Bin 124 -> 124 bytes + test/set-source-beos_bitmap-rgb24-ref.png | Bin 124 -> 124 bytes + test/trap-clip-beos-rgb24-ref.png | Bin 64729 -> 63088 bytes + test/trap-clip-beos_bitmap-rgb24-ref.png | Bin 64729 -> 63088 bytes 8 files changed, 13 insertions(+), 0 deletions(-) commit 9fe49346354e1785ff83be69bc1b775a41b7960a @@ -12940,52 +8699,52 @@ Date: Tue Jan 17 16:59:08 2006 +0000 test/buffer-diff.c | 94 ++++++++ test/buffer-diff.h | 7 + test/cairo-test.c | 287 ++++++++++++++--------- - test/caps-joins-ref.png | Bin + test/caps-joins-ref.png | Bin 1262 -> 1488 bytes test/caps-joins.c | 6 + - test/caps-sub-paths-ref.png | Bin + test/caps-sub-paths-ref.png | Bin 164 -> 197 bytes test/caps-sub-paths.c | 6 + - test/clip-fill-rule-pixel-aligned-rgb24-ref.png | Bin - test/clip-fill-rule-rgb24-ref.png | Bin - test/clip-nesting-rgb24-ref.png | Bin - test/clip-operator-rgb24-ref.png | Bin - test/clip-twice-rgb24-ref.png | Bin - test/dash-caps-joins-ref.png | Bin + test/clip-fill-rule-pixel-aligned-rgb24-ref.png | Bin 194 -> 184 bytes + test/clip-fill-rule-rgb24-ref.png | Bin 495 -> 380 bytes + test/clip-nesting-rgb24-ref.png | Bin 846 -> 955 bytes + test/clip-operator-rgb24-ref.png | Bin 20991 -> 16507 bytes + test/clip-twice-rgb24-ref.png | Bin 1278 -> 1120 bytes + test/dash-caps-joins-ref.png | Bin 2347 -> 3219 bytes test/dash-caps-joins.c | 6 + - test/dash-offset-negative-ref.png | Bin + test/dash-offset-negative-ref.png | Bin 155 -> 171 bytes test/dash-offset-negative.c | 6 + - test/fill-and-stroke-rgb24-ref.png | Bin - test/fill-rule-rgb24-ref.png | Bin - test/gradient-alpha-rgb24-ref.png | Bin - test/leaky-polygon-ref.png | Bin + test/fill-and-stroke-rgb24-ref.png | Bin 299 -> 257 bytes + test/fill-rule-rgb24-ref.png | Bin 2320 -> 1722 bytes + test/gradient-alpha-rgb24-ref.png | Bin 152 -> 142 bytes + test/leaky-polygon-ref.png | Bin 255 -> 368 bytes test/leaky-polygon.c | 6 + - test/line-width-ref.png | Bin + test/line-width-ref.png | Bin 171 -> 201 bytes test/line-width.c | 4 + - test/mask-ctm-rgb24-ref.png | Bin - test/mask-rgb24-ref.png | Bin - test/mask-surface-ctm-rgb24-ref.png | Bin + test/mask-ctm-rgb24-ref.png | Bin 140 -> 124 bytes + test/mask-rgb24-ref.png | Bin 73292 -> 71069 bytes + test/mask-surface-ctm-rgb24-ref.png | Bin 140 -> 124 bytes test/multi-page.c | 2 +- - test/nil-surface-rgb24-ref.png | Bin - test/operator-clear-rgb24-ref.png | Bin - test/operator-source-rgb24-ref.png | Bin - test/paint-with-alpha-rgb24-ref.png | Bin - test/path-data-ref.png | Bin + test/nil-surface-rgb24-ref.png | Bin 106 -> 106 bytes + test/operator-clear-rgb24-ref.png | Bin 5677 -> 4218 bytes + test/operator-source-rgb24-ref.png | Bin 16746 -> 14699 bytes + test/paint-with-alpha-rgb24-ref.png | Bin 146 -> 142 bytes + test/path-data-ref.png | Bin 387 -> 579 bytes test/path-data.c | 6 + test/png-flatten.c | 77 ++++++ - test/rel-path-rgb24-ref.png | Bin - test/scale-source-surface-paint-rgb24-ref.png | Bin - test/set-source-rgb24-ref.png | Bin - test/show-text-current-point-ref.png | Bin + test/rel-path-rgb24-ref.png | Bin 115 -> 228 bytes + test/scale-source-surface-paint-rgb24-ref.png | Bin 146 -> 136 bytes + test/set-source-rgb24-ref.png | Bin 114 -> 120 bytes + test/show-text-current-point-ref.png | Bin 1606 -> 2411 bytes test/show-text-current-point.c | 6 + - test/source-surface-scale-paint-rgb24-ref.png | Bin - test/text-antialias-gray-ref.png | Bin + test/source-surface-scale-paint-rgb24-ref.png | Bin 136 -> 133 bytes + test/text-antialias-gray-ref.png | Bin 740 -> 1084 bytes test/text-antialias-gray.c | 6 + - test/text-antialias-none-ref.png | Bin + test/text-antialias-none-ref.png | Bin 276 -> 298 bytes test/text-antialias-none.c | 6 + - test/text-pattern-rgb24-ref.png | Bin - test/transforms-ref.png | Bin + test/text-pattern-rgb24-ref.png | Bin 2704 -> 2339 bytes + test/transforms-ref.png | Bin 302 -> 361 bytes test/transforms.c | 6 + - test/trap-clip-rgb24-ref.png | Bin - test/unbounded-operator-rgb24-ref.png | Bin + test/trap-clip-rgb24-ref.png | Bin 64728 -> 63087 bytes + test/unbounded-operator-rgb24-ref.png | Bin 7555 -> 6047 bytes 68 files changed, 756 insertions(+), 174 deletions(-) commit 0b48d620f11a1efb611d2ad6888c8e5d8f64db03 @@ -12995,11 +8754,11 @@ Date: Sun Jan 15 04:44:45 2006 +0000 Update BeOS reference images per the recent gradient changes ChangeLog | 9 +++++++++ - test/mask-beos-rgb24-ref.png | Bin - test/mask-beos_bitmap-argb32-ref.png | Bin - test/mask-beos_bitmap-rgb24-ref.png | Bin - test/trap-clip-beos-rgb24-ref.png | Bin - test/trap-clip-beos_bitmap-rgb24-ref.png | Bin + test/mask-beos-rgb24-ref.png | Bin 73554 -> 73512 bytes + test/mask-beos_bitmap-argb32-ref.png | Bin 87543 -> 87641 bytes + test/mask-beos_bitmap-rgb24-ref.png | Bin 73554 -> 73512 bytes + test/trap-clip-beos-rgb24-ref.png | Bin 64724 -> 64729 bytes + test/trap-clip-beos_bitmap-rgb24-ref.png | Bin 64724 -> 64729 bytes 6 files changed, 9 insertions(+), 0 deletions(-) commit c79cda6150a71846ce546b27f243d858ec5fd037 @@ -13254,24 +9013,24 @@ Date: Wed Jan 4 17:59:03 2006 +0000 src/cairo-matrix.c | 17 + src/cairo-pattern.c | 594 ++++++++------------------------- src/cairoint.h | 29 +- - test/clip-operator-ref.png | Bin - test/clip-operator-rgb24-ref.png | Bin - test/gradient-alpha-ref.png | Bin - test/gradient-alpha-rgb24-ref.png | Bin - test/linear-gradient-ref.png | Bin - test/linear-gradient-rgb24-ref.png | Bin - test/mask-ref.png | Bin - test/mask-rgb24-ref.png | Bin - test/operator-clear-ref.png | Bin - test/operator-clear-rgb24-ref.png | Bin - test/operator-source-ref.png | Bin - test/operator-source-rgb24-ref.png | Bin - test/text-pattern-ref.png | Bin - test/text-pattern-rgb24-ref.png | Bin - test/trap-clip-ref.png | Bin - test/trap-clip-rgb24-ref.png | Bin - test/unbounded-operator-ref.png | Bin - test/unbounded-operator-rgb24-ref.png | Bin + test/clip-operator-ref.png | Bin 37134 -> 36956 bytes + test/clip-operator-rgb24-ref.png | Bin 21014 -> 20991 bytes + test/gradient-alpha-ref.png | Bin 154 -> 155 bytes + test/gradient-alpha-rgb24-ref.png | Bin 147 -> 152 bytes + test/linear-gradient-ref.png | Bin 12719 -> 12750 bytes + test/linear-gradient-rgb24-ref.png | Bin 12719 -> 11700 bytes + test/mask-ref.png | Bin 87846 -> 87837 bytes + test/mask-rgb24-ref.png | Bin 73124 -> 73292 bytes + test/operator-clear-ref.png | Bin 4971 -> 4933 bytes + test/operator-clear-rgb24-ref.png | Bin 5704 -> 5677 bytes + test/operator-source-ref.png | Bin 19982 -> 19684 bytes + test/operator-source-rgb24-ref.png | Bin 16909 -> 16746 bytes + test/text-pattern-ref.png | Bin 2731 -> 2725 bytes + test/text-pattern-rgb24-ref.png | Bin 2686 -> 2704 bytes + test/trap-clip-ref.png | Bin 71701 -> 71785 bytes + test/trap-clip-rgb24-ref.png | Bin 64724 -> 64728 bytes + test/unbounded-operator-ref.png | Bin 11994 -> 11964 bytes + test/unbounded-operator-rgb24-ref.png | Bin 7581 -> 7555 bytes 23 files changed, 221 insertions(+), 473 deletions(-) commit 19441311e471b661b6b2a6854f030aafa7715d5d @@ -13374,13 +9133,13 @@ Date: Tue Dec 27 09:47:58 2005 +0000 Add BeOS-specific reference images for tests where the maximum color difference is 1. ChangeLog | 13 +++++++++++++ - test/mask-beos-rgb24-ref.png | Bin - test/mask-beos_bitmap-argb32-ref.png | Bin - test/mask-beos_bitmap-rgb24-ref.png | Bin - test/set-source-beos-rgb24-ref.png | Bin - test/set-source-beos_bitmap-rgb24-ref.png | Bin - test/trap-clip-beos-rgb24-ref.png | Bin - test/trap-clip-beos_bitmap-rgb24-ref.png | Bin + test/mask-beos-rgb24-ref.png | Bin 0 -> 73554 bytes + test/mask-beos_bitmap-argb32-ref.png | Bin 0 -> 87543 bytes + test/mask-beos_bitmap-rgb24-ref.png | Bin 0 -> 73554 bytes + test/set-source-beos-rgb24-ref.png | Bin 0 -> 124 bytes + test/set-source-beos_bitmap-rgb24-ref.png | Bin 0 -> 124 bytes + test/trap-clip-beos-rgb24-ref.png | Bin 0 -> 64724 bytes + test/trap-clip-beos_bitmap-rgb24-ref.png | Bin 0 -> 64724 bytes 8 files changed, 13 insertions(+), 0 deletions(-) commit f036c28fa3aa7f9d18cd47b4b5dc7f728af04d5f @@ -14079,26 +9838,26 @@ Date: Tue Nov 8 17:43:13 2005 +0000 src/cairo-ps-surface.c | 196 +++++++++++++++++++++--- src/cairoint.h | 2 +- test/cairo-test.c | 2 +- - test/caps-joins-ps-rgb24-ref.png | Bin - test/caps-sub-paths-ps-rgb24-ref.png | Bin - test/clip-fill-rule-ps-rgb24-ref.png | Bin - test/clip-nesting-ps-rgb24-ref.png | Bin + test/caps-joins-ps-rgb24-ref.png | Bin 1420 -> 0 bytes + test/caps-sub-paths-ps-rgb24-ref.png | Bin 237 -> 0 bytes + test/clip-fill-rule-ps-rgb24-ref.png | Bin 309 -> 0 bytes + test/clip-nesting-ps-rgb24-ref.png | Bin 517 -> 0 bytes test/clip-operator.c | 2 +- - test/clip-twice-ps-rgb24-ref.png | Bin - test/dash-caps-joins-ps-rgb24-ref.png | Bin - test/dash-offset-negative-ps-rgb24-ref.png | Bin - test/fill-and-stroke-ps-rgb24-ref.png | Bin - test/fill-rule-ps-rgb24-ref.png | Bin - test/leaky-polygon-ps-rgb24-ref.png | Bin - test/line-width-ps-rgb24-ref.png | Bin - test/path-data-ps-rgb24-ref.png | Bin - test/rectangle-rounding-error-ps-rgb24-ref.png | Bin - test/show-text-current-point-ps-rgb24-ref.png | Bin - test/text-antialias-gray-ps-rgb24-ref.png | Bin - test/text-antialias-none-ps-rgb24-ref.png | Bin - test/text-antialias-subpixel-ps-rgb24-ref.png | Bin - test/transforms-ps-rgb24-ref.png | Bin - test/unantialiased-shapes-ps-rgb24-ref.png | Bin + test/clip-twice-ps-rgb24-ref.png | Bin 605 -> 0 bytes + test/dash-caps-joins-ps-rgb24-ref.png | Bin 2362 -> 0 bytes + test/dash-offset-negative-ps-rgb24-ref.png | Bin 202 -> 0 bytes + test/fill-and-stroke-ps-rgb24-ref.png | Bin 328 -> 0 bytes + test/fill-rule-ps-rgb24-ref.png | Bin 2167 -> 0 bytes + test/leaky-polygon-ps-rgb24-ref.png | Bin 353 -> 0 bytes + test/line-width-ps-rgb24-ref.png | Bin 242 -> 0 bytes + test/path-data-ps-rgb24-ref.png | Bin 440 -> 0 bytes + test/rectangle-rounding-error-ps-rgb24-ref.png | Bin 365 -> 0 bytes + test/show-text-current-point-ps-rgb24-ref.png | Bin 1477 -> 0 bytes + test/text-antialias-gray-ps-rgb24-ref.png | Bin 714 -> 0 bytes + test/text-antialias-none-ps-rgb24-ref.png | Bin 714 -> 0 bytes + test/text-antialias-subpixel-ps-rgb24-ref.png | Bin 714 -> 0 bytes + test/transforms-ps-rgb24-ref.png | Bin 418 -> 0 bytes + test/unantialiased-shapes-ps-rgb24-ref.png | Bin 9899 -> 0 bytes 25 files changed, 231 insertions(+), 27 deletions(-) commit 48218fec48d1bfa2a93cc21f8f9df569e40ca79e @@ -14542,8 +10301,8 @@ Date: Tue Oct 18 12:04:41 2005 +0000 Add reference images for antialiasing modes which are basically not applicable to the PS output. ChangeLog | 7 +++++++ - test/text-antialias-none-ps-rgb24-ref.png | Bin - test/text-antialias-subpixel-ps-rgb24-ref.png | Bin + test/text-antialias-none-ps-rgb24-ref.png | Bin 0 -> 714 bytes + test/text-antialias-subpixel-ps-rgb24-ref.png | Bin 0 -> 714 bytes 3 files changed, 7 insertions(+), 0 deletions(-) commit 99d02f2adc24c98b6f2e2d49f4cb909ff35d7926 @@ -14554,7 +10313,7 @@ Date: Thu Oct 13 21:04:28 2005 +0000 ChangeLog | 6 ++++++ test/Makefile.am | 1 + - test/dash-offset-negative-ps-rgb24-ref.png | Bin + test/dash-offset-negative-ps-rgb24-ref.png | Bin 0 -> 202 bytes 3 files changed, 7 insertions(+), 0 deletions(-) commit 4f97b2edb533c9b0329a8d7ec8e4f16447a04f12 @@ -14662,12 +10421,12 @@ Date: Wed Oct 12 13:37:00 2005 +0000 ChangeLog | 14 ++++ test/.cvsignore | 2 + test/Makefile.am | 6 ++ - test/clip-fill-rule-pixel-aligned-ref.png | Bin - test/clip-fill-rule-pixel-aligned-rgb24-ref.png | Bin + test/clip-fill-rule-pixel-aligned-ref.png | Bin 0 -> 195 bytes + test/clip-fill-rule-pixel-aligned-rgb24-ref.png | Bin 0 -> 194 bytes test/clip-fill-rule-pixel-aligned.c | 95 +++++++++++++++++++++++ - test/clip-fill-rule-ps-rgb24-ref.png | Bin - test/clip-fill-rule-ref.png | Bin - test/clip-fill-rule-rgb24-ref.png | Bin + test/clip-fill-rule-ps-rgb24-ref.png | Bin 0 -> 309 bytes + test/clip-fill-rule-ref.png | Bin 0 -> 431 bytes + test/clip-fill-rule-rgb24-ref.png | Bin 0 -> 495 bytes test/clip-fill-rule.c | 79 +++++++++++++++++++ 10 files changed, 196 insertions(+), 0 deletions(-) @@ -14884,17 +10643,17 @@ Date: Sat Oct 8 13:04:18 2005 +0000 Add ps-backend-specific reference images for test for which the current output is fine, but just happens to not be identical to the existing reference images, (ie. just minor differences shape-boundary pixels). ChangeLog | 17 +++++++++++++++++ - test/caps-sub-paths-ps-rgb24-ref.png | Bin - test/dash-caps-joins-ps-rgb24-ref.png | Bin - test/fill-and-stroke-ps-rgb24-ref.png | Bin - test/fill-rule-ps-rgb24-ref.png | Bin - test/leaky-polygon-ps-rgb24-ref.png | Bin - test/line-width-ps-rgb24-ref.png | Bin - test/path-data-ps-rgb24-ref.png | Bin - test/rectangle-rounding-error-ps-rgb24-ref.png | Bin - test/show-text-current-point-ps-rgb24-ref.png | Bin - test/text-antialias-gray-ps-rgb24-ref.png | Bin - test/transforms-ps-rgb24-ref.png | Bin + test/caps-sub-paths-ps-rgb24-ref.png | Bin 0 -> 237 bytes + test/dash-caps-joins-ps-rgb24-ref.png | Bin 0 -> 2362 bytes + test/fill-and-stroke-ps-rgb24-ref.png | Bin 0 -> 328 bytes + test/fill-rule-ps-rgb24-ref.png | Bin 0 -> 2167 bytes + test/leaky-polygon-ps-rgb24-ref.png | Bin 0 -> 353 bytes + test/line-width-ps-rgb24-ref.png | Bin 0 -> 242 bytes + test/path-data-ps-rgb24-ref.png | Bin 0 -> 440 bytes + test/rectangle-rounding-error-ps-rgb24-ref.png | Bin 0 -> 365 bytes + test/show-text-current-point-ps-rgb24-ref.png | Bin 0 -> 1477 bytes + test/text-antialias-gray-ps-rgb24-ref.png | Bin 0 -> 714 bytes + test/transforms-ps-rgb24-ref.png | Bin 0 -> 418 bytes 12 files changed, 17 insertions(+), 0 deletions(-) commit 94dece56a5dca2f10b9c8d2914ff62177a88410b @@ -15045,63 +10804,63 @@ Date: Thu Sep 29 14:31:08 2005 +0000 ChangeLog | 69 ++++++++ test/Makefile.am | 159 ++++++++++++------ - test/a8-mask-rgb24-ref.png | Bin + test/a8-mask-rgb24-ref.png | Bin 0 -> 128 bytes test/cairo-test.c | 176 +++++++++++++++++--- - test/caps-joins-ps-rgb24-ref.png | Bin - test/caps-joins-rgb24-ref.png | Bin - test/caps-sub-paths-rgb24-ref.png | Bin - test/clip-all-rgb24-ref.png | Bin - test/clip-nesting-ps-rgb24-ref.png | Bin - test/clip-nesting-rgb24-ref.png | Bin - test/clip-operator-rgb24-ref.png | Bin - test/clip-twice-ps-rgb24-ref.png | Bin - test/clip-twice-rgb24-ref.png | Bin - ...ite-integer-translate-over-repeat-rgb24-ref.png | Bin - .../composite-integer-translate-over-rgb24-ref.png | Bin - ...omposite-integer-translate-source-rgb24-ref.png | Bin - test/create-from-png-rgb24-ref.png | Bin - test/create-from-png-stream-rgb24-ref.png | Bin - test/dash-caps-joins-rgb24-ref.png | Bin - test/dash-offset-negative-rgb24-ref.png | Bin - test/fill-and-stroke-rgb24-ref.png | Bin - test/fill-rule-rgb24-ref.png | Bin - test/filter-nearest-offset-rgb24-ref.png | Bin - test/gradient-alpha-rgb24-ref.png | Bin - test/leaky-polygon-rgb24-ref.png | Bin - test/line-width-rgb24-ref.png | Bin - test/linear-gradient-rgb24-ref.png | Bin - test/mask-ctm-rgb24-ref.png | Bin - test/mask-rgb24-ref.png | Bin - test/mask-surface-ctm-rgb24-ref.png | Bin - test/move-to-show-surface-rgb24-ref.png | Bin - test/nil-surface-rgb24-ref.png | Bin - test/operator-clear-rgb24-ref.png | Bin - test/operator-source-rgb24-ref.png | Bin - test/paint-rgb24-ref.png | Bin - test/paint-with-alpha-rgb24-ref.png | Bin - test/path-data-rgb24-ref.png | Bin - test/pixman-rotate-rgb24-ref.png | Bin - test/rectangle-rounding-error-rgb24-ref.png | Bin - test/rel-path-rgb24-ref.png | Bin - test/scale-source-surface-paint-rgb24-ref.png | Bin - test/self-copy-rgb24-ref.png | Bin - test/self-intersecting-rgb24-ref.png | Bin - test/set-source-rgb24-ref.png | Bin - test/show-text-current-point-rgb24-ref.png | Bin - test/source-clip-rgb24-ref.png | Bin - test/source-surface-scale-paint-rgb24-ref.png | Bin - test/surface-pattern-rgb24-ref.png | Bin - test/text-antialias-gray-rgb24-ref.png | Bin - test/text-antialias-none-rgb24-ref.png | Bin - test/text-antialias-subpixel-rgb24-ref.png | Bin - test/text-pattern-rgb24-ref.png | Bin - test/text-rotate-rgb24-ref.png | Bin - test/transforms-rgb24-ref.png | Bin - test/translate-show-surface-rgb24-ref.png | Bin - test/trap-clip-rgb24-ref.png | Bin - test/unantialiased-shapes-ps-rgb24-ref.png | Bin - test/unantialiased-shapes-rgb24-ref.png | Bin - test/unbounded-operator-rgb24-ref.png | Bin + test/caps-joins-ps-rgb24-ref.png | Bin 0 -> 1420 bytes + test/caps-joins-rgb24-ref.png | Bin 0 -> 1398 bytes + test/caps-sub-paths-rgb24-ref.png | Bin 0 -> 186 bytes + test/clip-all-rgb24-ref.png | Bin 0 -> 114 bytes + test/clip-nesting-ps-rgb24-ref.png | Bin 0 -> 517 bytes + test/clip-nesting-rgb24-ref.png | Bin 0 -> 846 bytes + test/clip-operator-rgb24-ref.png | Bin 0 -> 21014 bytes + test/clip-twice-ps-rgb24-ref.png | Bin 0 -> 605 bytes + test/clip-twice-rgb24-ref.png | Bin 0 -> 1278 bytes + ...ite-integer-translate-over-repeat-rgb24-ref.png | Bin 0 -> 353 bytes + .../composite-integer-translate-over-rgb24-ref.png | Bin 0 -> 13041 bytes + ...omposite-integer-translate-source-rgb24-ref.png | Bin 0 -> 14017 bytes + test/create-from-png-rgb24-ref.png | Bin 0 -> 115 bytes + test/create-from-png-stream-rgb24-ref.png | Bin 0 -> 115 bytes + test/dash-caps-joins-rgb24-ref.png | Bin 0 -> 2946 bytes + test/dash-offset-negative-rgb24-ref.png | Bin 0 -> 170 bytes + test/fill-and-stroke-rgb24-ref.png | Bin 0 -> 299 bytes + test/fill-rule-rgb24-ref.png | Bin 0 -> 2320 bytes + test/filter-nearest-offset-rgb24-ref.png | Bin 0 -> 254 bytes + test/gradient-alpha-rgb24-ref.png | Bin 0 -> 147 bytes + test/leaky-polygon-rgb24-ref.png | Bin 0 -> 344 bytes + test/line-width-rgb24-ref.png | Bin 0 -> 199 bytes + test/linear-gradient-rgb24-ref.png | Bin 0 -> 12719 bytes + test/mask-ctm-rgb24-ref.png | Bin 0 -> 140 bytes + test/mask-rgb24-ref.png | Bin 0 -> 73124 bytes + test/mask-surface-ctm-rgb24-ref.png | Bin 0 -> 140 bytes + test/move-to-show-surface-rgb24-ref.png | Bin 0 -> 115 bytes + test/nil-surface-rgb24-ref.png | Bin 0 -> 106 bytes + test/operator-clear-rgb24-ref.png | Bin 0 -> 5704 bytes + test/operator-source-rgb24-ref.png | Bin 0 -> 16909 bytes + test/paint-rgb24-ref.png | Bin 0 -> 116 bytes + test/paint-with-alpha-rgb24-ref.png | Bin 0 -> 146 bytes + test/path-data-rgb24-ref.png | Bin 0 -> 523 bytes + test/pixman-rotate-rgb24-ref.png | Bin 0 -> 385 bytes + test/rectangle-rounding-error-rgb24-ref.png | Bin 0 -> 298 bytes + test/rel-path-rgb24-ref.png | Bin 0 -> 115 bytes + test/scale-source-surface-paint-rgb24-ref.png | Bin 0 -> 146 bytes + test/self-copy-rgb24-ref.png | Bin 0 -> 291 bytes + test/self-intersecting-rgb24-ref.png | Bin 0 -> 304 bytes + test/set-source-rgb24-ref.png | Bin 0 -> 114 bytes + test/show-text-current-point-rgb24-ref.png | Bin 0 -> 2173 bytes + test/source-clip-rgb24-ref.png | Bin 0 -> 180 bytes + test/source-surface-scale-paint-rgb24-ref.png | Bin 0 -> 136 bytes + test/surface-pattern-rgb24-ref.png | Bin 0 -> 194 bytes + test/text-antialias-gray-rgb24-ref.png | Bin 0 -> 995 bytes + test/text-antialias-none-rgb24-ref.png | Bin 0 -> 284 bytes + test/text-antialias-subpixel-rgb24-ref.png | Bin 0 -> 1121 bytes + test/text-pattern-rgb24-ref.png | Bin 0 -> 2686 bytes + test/text-rotate-rgb24-ref.png | Bin 0 -> 16508 bytes + test/transforms-rgb24-ref.png | Bin 0 -> 318 bytes + test/translate-show-surface-rgb24-ref.png | Bin 0 -> 115 bytes + test/trap-clip-rgb24-ref.png | Bin 0 -> 64724 bytes + test/unantialiased-shapes-ps-rgb24-ref.png | Bin 0 -> 9899 bytes + test/unantialiased-shapes-rgb24-ref.png | Bin 0 -> 4449 bytes + test/unbounded-operator-rgb24-ref.png | Bin 0 -> 7581 bytes 59 files changed, 330 insertions(+), 74 deletions(-) commit 76634781e20b1854e4b49a70b98d9f6900c3aedf @@ -15182,7 +10941,7 @@ Date: Tue Sep 27 12:44:32 2005 +0000 ROADMAP | 2 +- src/cairo-path-stroke.c | 51 ++++++++++++++++++++++++++++------------- test/Makefile.am | 1 - - test/dash-caps-joins-ref.png | Bin + test/dash-caps-joins-ref.png | Bin 0 -> 2347 bytes test/dash-caps-joins.c | 3 +- 6 files changed, 58 insertions(+), 20 deletions(-) @@ -15195,7 +10954,7 @@ Date: Tue Sep 27 11:35:18 2005 +0000 ChangeLog | 10 +++++ test/.cvsignore | 2 + test/Makefile.am | 7 +++ - test/caps-joins-ref.png | Bin + test/caps-joins-ref.png | Bin 0 -> 1262 bytes test/caps-joins.c | 85 ++++++++++++++++++++++++++++++++++++++++++ test/dash-caps-joins.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 199 insertions(+), 0 deletions(-) @@ -15767,16 +11526,16 @@ Date: Wed Aug 31 15:08:02 2005 +0000 src/cairo-scaled-font.c | 1165 ++++++++++++++++++++++++++++++++++ src/cairo-xlib-surface.c | 801 +++++++----------------- src/cairoint.h | 391 +++++------- - test/clip-operator-ref.png | Bin - test/operator-clear-ref.png | Bin - test/operator-source-ref.png | Bin - test/text-antialias-gray-ref.png | Bin + test/clip-operator-ref.png | Bin 37330 -> 37134 bytes + test/operator-clear-ref.png | Bin 4988 -> 4971 bytes + test/operator-source-ref.png | Bin 19958 -> 19982 bytes + test/text-antialias-gray-ref.png | Bin 727 -> 740 bytes test/text-antialias-gray.c | 2 +- - test/text-antialias-none-ref.png | Bin + test/text-antialias-none-ref.png | Bin 278 -> 276 bytes test/text-antialias-none.c | 2 +- - test/text-antialias-subpixel-ref.png | Bin + test/text-antialias-subpixel-ref.png | Bin 1081 -> 1121 bytes test/text-antialias-subpixel.c | 2 +- - test/unbounded-operator-ref.png | Bin + test/unbounded-operator-ref.png | Bin 11929 -> 11994 bytes 22 files changed, 2460 insertions(+), 2833 deletions(-) commit 568ce860264e63f86ae45258eb106fb7a74a33a3 @@ -15820,7 +11579,7 @@ Date: Wed Aug 31 09:00:01 2005 +0000 ChangeLog | 10 +++++++ test/.cvsignore | 1 + test/Makefile.am | 4 +++ - test/clip-all-ref.png | Bin + test/clip-all-ref.png | Bin 0 -> 118 bytes test/clip-all.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 85 insertions(+), 0 deletions(-) diff --git a/Makefile.in b/Makefile.in index 325b95b..cf3f17e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -47,8 +47,8 @@ host_triplet = @host@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/ChangeLog.mk \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/config.h.in $(top_srcdir)/configure AUTHORS COPYING \ - ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ - depcomp install-sh ltmain.sh missing + INSTALL NEWS TODO compile config.guess config.sub depcomp \ + install-sh ltmain.sh missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -228,6 +228,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ @@ -856,7 +857,7 @@ $(srcdir)/ChangeLog: echo A git checkout is required to generate this file >> $@); \ fi -ChangeLog.cache-*..: .git +ChangeLog.cache-*..: .git/HEAD ChangeLog%: $(srcdir)/ChangeLog% @@ -871,7 +872,7 @@ $(srcdir)/ChangeLog.cache-% $(srcdir)/ChangeLog.pre-%: to=$$version; \ test "x$$version" = x && version=$(CURR_CHANGELOG_VERSION); \ from=$(PREV_CHANGELOG_VERSION); \ - test "x$$to" = x || version=$$version.0; \ + test "x$$to" = x || to=$$to.0; \ test "x$$from" = xinitial || from=$$from.0; \ spec=$$from..$$to; \ fi; \ @@ -1,3 +1,58 @@ +Release 1.4.12 (2007-11-26 Carl Worth <cworth@cworth.org>) +========================================================== +This is the sixth update in cairo's stable 1.4 series. It comes five +months after the 1.4.10 release. This fix includes various bug fixes +originally developed during the 1.5.x development and backported to +1.4. + +Some of the most significant bug fixes prevent crashes: + + * Avoid overflow when allocating large buffers (Vladimir Vukicevic) + + * Fix crash with cairo_pattern_set_user_data (Carl Worth) + + * Fix broken locking in cairo-ft error path (Chris Wilson) + + * Avoid crash when cleaning up after Render extension (Carl Worth) + + * Avoid crash for zero-sized bitmap glyph (Chris Wilson) + + * Avoid crash with type-1 fonts and ft and atsui enabled (Brian Ewins) + + * Fix many error-handling cases in the Quartz/ATSUI code (Brian Ewins) + + * Eliminate cairo_stroke crash with scaling near zero (Carl Worth) + +Other fixes address rendering problems: + + * Fix PDF linear gradients without stops at 0.0 and 1.0 (Adrian Johnson) + + * Fix PDF CFF subsetting to work with Apple Preview (Adrian Johnson) + + * Report proper errors on out-of-memory on win32 (Vladimir Vukicevic) + + * Fix EXTEND_NONE gradients for cairo-quartz (Brian Ewins) + + * Fix odd-number-of-dashes dashing for cairo-quartz (Brian Ewins) + + * Fix erroneous results from cairo_stroke_extents (Carl Worth) + + * Force non-AA text when bitmap strikes are available (Keith Packard) + + * Fix cairo-atsui font metrics (Richard Hult) + +And some avoid raising cairo errors for innocent problems: + + * Avoid drawing shutdown for glyph-not-found in font (Behdad Esfahbod) + + * Don't raise an error for creating an empty path (Chris Wilson) + +At least one optimization managed to sneak in: + + * Free glyph surfaces after uploading to X server cache (Behdad Esfahbod) + +And there are a few very minor fixes, (such as build fixes). + Release 1.4.10 (2007-06-27 Carl Worth <cworth@cworth.org>) ========================================================== This is the fifth update in cairo's stable 1.4 series. It comes @@ -13,7 +13,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL +# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -176,7 +176,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -263,8 +263,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` # Check for compiler boilerplate output or warnings with # the simple compiler test code. AC_DEFUN([_LT_COMPILER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* @@ -276,8 +277,9 @@ $rm conftest* # Check for linker boilerplate output or warnings with # the simple link test code. AC_DEFUN([_LT_LINKER_BOILERPLATE], -[ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +[AC_REQUIRE([LT_AC_PROG_SED])dnl +ac_outfile=conftest.$ac_objext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -293,12 +295,20 @@ $rm conftest* # If we don't find anything, use the default library path according # to the aix ld manual. AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ])# _LT_AC_SYS_LIBPATH_AIX @@ -529,13 +539,17 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -552,6 +566,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -623,7 +640,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], AC_CACHE_CHECK([$1], [$2], [$2=no ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$3" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -664,11 +681,12 @@ fi # ------------------------------------------------------------ # Check whether the given compiler option works AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_CACHE_CHECK([$1], [$2], [$2=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $3" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -782,24 +800,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac ]) @@ -1026,7 +1047,8 @@ fi # --------------------------------- # Check to see if options -c and -o are simultaneously supported by compiler AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no @@ -1034,7 +1056,7 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -1174,6 +1196,7 @@ else darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) @@ -1191,7 +1214,8 @@ fi # ----------------------------- # PORTME Fill in your ld.so characteristics AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([dynamic linker characteristics]) library_names_spec= libname_spec='lib$name' soname_spec= @@ -1205,20 +1229,58 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" +m4_if($1,[],[ if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[[lt_foo]]++; } + if (lt_freq[[lt_foo]] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi +fi]) need_lib_prefix=unknown hardcode_into_libs=no @@ -1375,12 +1437,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + m4_if([$1], [],[ + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -1434,7 +1492,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -1497,7 +1555,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[[3-9]]*) version_type=linux need_lib_prefix=no need_version=no @@ -1568,7 +1626,7 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -1674,6 +1732,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -1779,7 +1841,8 @@ fi # _LT_AC_TAGCONFIG # ---------------- AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_ARG_WITH([tags], [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], [include additional configurations @<:@automatic@:>@])], [tagnames="$withval"]) @@ -2040,7 +2103,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], # AC_PATH_TOOL_PREFIX # ------------------- -# find a file program which can recognise shared library +# find a file program which can recognize shared library AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl AC_MSG_CHECKING([for $1]) @@ -2103,7 +2166,7 @@ fi # AC_PATH_MAGIC # ------------- -# find a file program which can recognise a shared library +# find a file program which can recognize a shared library AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) if test -z "$lt_cv_path_MAGIC_CMD"; then @@ -2250,7 +2313,7 @@ esac # how to check for library dependencies # -- PORTME fill in with the dynamic library characteristics AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], -[AC_CACHE_CHECK([how to recognise dependent libraries], +[AC_CACHE_CHECK([how to recognize dependent libraries], lt_cv_deplibs_check_method, [lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -2289,9 +2352,15 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) @@ -2336,7 +2405,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[[3-9]]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ;; @@ -2386,6 +2455,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -2438,7 +2511,7 @@ AC_DEFUN([AC_PROG_NM], lt_cv_path_NM="$NM" else lt_nm_to_check="${ac_tool_prefix}nm" - if test -n "$ac_tool_prefix" && test "$build" = "$host"; then + if test -n "$ac_tool_prefix" && test "$build" = "$host"; then lt_nm_to_check="$lt_nm_to_check nm" fi for lt_tmp_nm in $lt_nm_to_check; do @@ -2654,10 +2727,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' _LT_AC_SYS_COMPILER @@ -2759,10 +2832,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -2908,7 +2981,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -3067,10 +3140,10 @@ case $host_os in case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -3153,9 +3226,7 @@ case $host_os in _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: case $host_cpu in - hppa*64*|ia64*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ;; @@ -3223,7 +3294,7 @@ case $host_os in ;; esac ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -3343,6 +3414,29 @@ case $host_os in # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -3381,16 +3475,20 @@ case $host_os in _LT_AC_TAGVAR(ld_shlibs, $1)=no ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -3552,15 +3650,10 @@ case $host_os in case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes @@ -3607,6 +3700,12 @@ case $host_os in fi _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' + case $host_os in + solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; + *) + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -3850,7 +3949,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken ifelse([$1],[CXX], [case $host_os in -interix3*) +interix[[3-9]]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. _LT_AC_TAGVAR(predep_objects,$1)= @@ -3858,13 +3957,46 @@ interix3*) _LT_AC_TAGVAR(postdeps,$1)= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -3913,10 +4045,17 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -3995,10 +4134,10 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. _LT_AC_SYS_COMPILER @@ -4051,7 +4190,7 @@ objext=o _LT_AC_TAGVAR(objext, $1)=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -4140,6 +4279,7 @@ if test -f "$ltmain"; then _LT_AC_TAGVAR(module_cmds, $1) \ _LT_AC_TAGVAR(module_expsym_cmds, $1) \ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \ + _LT_AC_TAGVAR(fix_srcfile_path, $1) \ _LT_AC_TAGVAR(exclude_expsyms, $1) \ _LT_AC_TAGVAR(include_expsyms, $1); do @@ -4186,7 +4326,7 @@ ifelse([$1], [], # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -4511,7 +4651,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) @@ -4594,6 +4734,7 @@ fi # --------------------------------- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST]) +AC_REQUIRE([LT_AC_PROG_SED]) AC_REQUIRE([AC_PROG_NM]) AC_REQUIRE([AC_OBJEXT]) # Check for command to grab the raw symbol name followed by C symbol from nm. @@ -4820,12 +4961,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # like `-m68040'. _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -4837,7 +4980,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # DJGPP does not support shared libraries at all _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -4973,6 +5116,14 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; + esac ;; esac ;; @@ -5093,13 +5244,15 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' ;; @@ -5109,7 +5262,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ;; - interix3*) + interix[[3-9]]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -5167,7 +5320,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' @@ -5219,6 +5372,22 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) # All Alpha code is PIC. _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='' + ;; + esac + ;; esac ;; @@ -5228,6 +5397,10 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ;; + rdos*) + _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' + ;; + solaris*) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -5322,7 +5495,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], # ------------------------------------ # See if the linker supports building shared libraries. AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) +[AC_REQUIRE([LT_AC_PROG_SED])dnl +AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -5339,7 +5513,7 @@ ifelse([$1],[CXX],[ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ;; cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; linux* | k*bsd*-gnu) _LT_AC_TAGVAR(link_all_deplibs, $1)=no @@ -5481,7 +5655,7 @@ EOF _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_AC_TAGVAR(always_export_symbols, $1)=no _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' + _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -5499,7 +5673,7 @@ EOF fi ;; - interix3*) + interix[[3-9]]*) _LT_AC_TAGVAR(hardcode_direct, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' @@ -5514,7 +5688,7 @@ EOF _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux* | k*bsd*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -5532,13 +5706,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi _LT_AC_TAGVAR(link_all_deplibs, $1)=no else @@ -5579,7 +5762,7 @@ EOF sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in - *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) + *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_AC_TAGVAR(ld_shlibs, $1)=no cat <<_LT_EOF 1>&2 @@ -5698,7 +5881,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes + : else # We have old collect2 _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported @@ -5791,7 +5974,7 @@ _LT_EOF # The linker will automatically build a .lib file if we build a DLL. _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' + _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ;; @@ -5833,10 +6016,10 @@ _LT_EOF case $cc_basename in xlc*) output_verbose_link_cmd='echo' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -5998,24 +6181,28 @@ _LT_EOF ;; openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + if test -f /usr/libexec/ld.so; then + _LT_AC_TAGVAR(hardcode_direct, $1)=yes + _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' + else + case $host_os in + openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) + _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' + ;; + *) + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac + _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; @@ -6074,17 +6261,16 @@ _LT_EOF case $host_os in solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - *) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' + fi + ;; esac _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; @@ -6141,7 +6327,7 @@ _LT_EOF fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6216,7 +6402,7 @@ x|xyes) # to ld, don't add -lc before -lgcc. AC_MSG_CHECKING([whether -lc should be explicitly linked in]) $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if AC_TRY_EVAL(ac_compile) 2>conftest.err; then soname=conftest @@ -6319,6 +6505,30 @@ AC_DEFUN([LT_AC_PROG_RC], [AC_CHECK_TOOL(RC, windres, no) ]) + +# Cheap backport of AS_EXECUTABLE_P and required macros +# from Autoconf 2.59; we should not use $as_executable_p directly. + +# _AS_TEST_PREPARE +# ---------------- +m4_ifndef([_AS_TEST_PREPARE], +[m4_defun([_AS_TEST_PREPARE], +[if test -x / >/dev/null 2>&1; then + as_executable_p='test -x' +else + as_executable_p='test -f' +fi +])])# _AS_TEST_PREPARE + +# AS_EXECUTABLE_P +# --------------- +# Check whether a file is executable. +m4_ifndef([AS_EXECUTABLE_P], +[m4_defun([AS_EXECUTABLE_P], +[AS_REQUIRE([_AS_TEST_PREPARE])dnl +$as_executable_p $1[]dnl +])])# AS_EXECUTABLE_P + # NOTE: This macro has been submitted for inclusion into # # GNU Autoconf as AC_PROG_SED. When it is available in # # a released version of Autoconf we should remove this # @@ -6339,12 +6549,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -6377,6 +6588,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do done ]) SED=$lt_cv_path_SED +AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) @@ -6528,7 +6740,7 @@ path to pkg-config. _PKG_TEXT -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])], [$4]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS diff --git a/boilerplate/Makefile.in b/boilerplate/Makefile.in index 6f01fab..c80cf21 100644 --- a/boilerplate/Makefile.in +++ b/boilerplate/Makefile.in @@ -298,6 +298,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/config.guess b/config.guess index 0f0fe71..278f9e9 100755 --- a/config.guess +++ b/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-03-06' +timestamp='2007-07-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -330,7 +330,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; - i86pc:SunOS:5.*:*) + i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; sun4*:SunOS:6*:*) @@ -793,7 +793,7 @@ EOF exit ;; *:Interix*:[3456]*) case ${UNAME_MACHINE} in - x86) + x86) echo i586-pc-interix${UNAME_RELEASE} exit ;; EM64T | authenticamd) @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, # Inc. -timestamp='2007-01-18' +timestamp='2007-06-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -475,8 +475,8 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16c) - basic_machine=cr16c-unknown + cr16) + basic_machine=cr16-unknown os=-elf ;; crds | unos) @@ -683,6 +683,10 @@ case $basic_machine in basic_machine=i386-pc os=-mingw32 ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) basic_machine=m68000-convergent ;; @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for cairo 1.4.10. +# Generated by GNU Autoconf 2.61 for cairo 1.4.12. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=cairo>. # @@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='cairo' PACKAGE_TARNAME='cairo' -PACKAGE_VERSION='1.4.10' -PACKAGE_STRING='cairo 1.4.10' +PACKAGE_VERSION='1.4.12' +PACKAGE_STRING='cairo 1.4.12' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=cairo' ac_unique_file="src/cairo.h" @@ -859,6 +859,7 @@ host host_cpu host_vendor host_os +SED GREP EGREP LN_S @@ -1540,7 +1541,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures cairo 1.4.10 to adapt to many kinds of systems. +\`configure' configures cairo 1.4.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1614,7 +1615,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cairo 1.4.10:";; + short | recursive ) echo "Configuration of cairo 1.4.12:";; esac cat <<\_ACEOF @@ -1816,7 +1817,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cairo configure 1.4.10 +cairo configure 1.4.12 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1830,7 +1831,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by cairo $as_me 1.4.10, which was +It was created by cairo $as_me 1.4.12, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2504,7 +2505,7 @@ fi # Define the identity of the package. PACKAGE='cairo' - VERSION='1.4.10' + VERSION='1.4.12' cat >>confdefs.h <<_ACEOF @@ -2659,7 +2660,7 @@ LT_CURRENT=13 # Increment any time the source changes; set to # 0 if you increment CURRENT -LT_REVISION=5 +LT_REVISION=6 # Increment if any interfaces have been added; set to 0 # if any interfaces have been removed. removal has @@ -2675,7 +2676,7 @@ LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` CAIRO_VERSION_MAJOR=1 CAIRO_VERSION_MINOR=4 -CAIRO_VERSION_MICRO=10 +CAIRO_VERSION_MICRO=12 @@ -4257,12 +4258,13 @@ do test -z "$as_dir" && as_dir=. for lt_ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then + if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" fi done done done +IFS=$as_save_IFS lt_ac_max=0 lt_ac_count=0 # Add /usr/xpg4/bin/sed as it is typically found on Solaris @@ -4297,6 +4299,7 @@ done fi SED=$lt_cv_path_SED + { echo "$as_me:$LINENO: result: $SED" >&5 echo "${ECHO_T}$SED" >&6; } @@ -4658,8 +4661,8 @@ else echo "${ECHO_T}no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -4700,9 +4703,15 @@ cygwin*) mingw* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' + # func_win32_libid shell function, so use a weaker test based on 'objdump', + # unless we find 'file', for example because we are cross-compiling. + if ( file / ) >/dev/null 2>&1; then + lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' + lt_cv_file_magic_cmd='func_win32_libid' + else + lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' + lt_cv_file_magic_cmd='$OBJDUMP -f' + fi ;; darwin* | rhapsody*) @@ -4747,7 +4756,7 @@ hpux10.20* | hpux11*) esac ;; -interix3*) +interix[3-9]*) # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$' ;; @@ -4797,6 +4806,10 @@ osf3* | osf4* | osf5*) lt_cv_deplibs_check_method=pass_all ;; +rdos*) + lt_cv_deplibs_check_method=pass_all + ;; + solaris*) lt_cv_deplibs_check_method=pass_all ;; @@ -4884,7 +4897,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4887 "configure"' > conftest.$ac_ext + echo '#line 4900 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4919,7 +4932,8 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 @@ -4930,6 +4944,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) case `/usr/bin/file conftest.o` in *32-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_i386_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_i386" ;; @@ -4946,6 +4963,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) ;; *64-bit*) case $host in + x86_64-*kfreebsd*-gnu) + LD="${LD-ld} -m elf_x86_64_fbsd" + ;; x86_64-*linux*) LD="${LD-ld} -m elf_x86_64" ;; @@ -6799,24 +6819,27 @@ else fi ;; *) - # If test is not a shell built-in, we'll probably end up computing a - # maximum length that is only half of the actual maximum length, but - # we can't tell. - SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} - while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ + lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` + if test -n "$lt_cv_sys_max_cmd_len"; then + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` + else + SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} + while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \ = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + new_result=`expr "X$teststring" : ".*" 2>&1` && + lt_cv_sys_max_cmd_len=$new_result && + test $i != 17 # 1/2 MB should be enough + do + i=`expr $i + 1` + teststring=$teststring$teststring + done + teststring= + # Add a significant safety factor because C++ compilers can tack on massive + # amounts of additional arguments before passing them to the linker. + # It appears as though 1/2 is a usable value. + lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` + fi ;; esac @@ -6833,6 +6856,7 @@ fi + # Check for command to grab the raw symbol name followed by C symbol from nm. { echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } @@ -7421,7 +7445,7 @@ test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o # Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= @@ -7621,10 +7645,10 @@ objext=o objext=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' +lt_simple_link_test_code='int main(){return(0);}' # If no C compiler was specified, use CC. @@ -7639,13 +7663,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -7665,7 +7689,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7676,11 +7700,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7679: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7703: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7683: \$? = $ac_status" >&5 + echo "$as_me:7707: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7731,13 +7755,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic='-DDLL_EXPORT' ;; @@ -7747,7 +7773,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -7805,7 +7831,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic='-DDLL_EXPORT' @@ -7857,6 +7883,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # All Alpha code is PIC. lt_prog_compiler_static='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='' + ;; + esac + ;; esac ;; @@ -7866,6 +7908,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static='-non_shared' ;; + rdos*) + lt_prog_compiler_static='-non_shared' + ;; + solaris*) lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' @@ -7933,7 +7979,7 @@ if test "${lt_prog_compiler_pic_works+set}" = set; then else lt_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -7944,11 +7990,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7947: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7993: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7951: \$? = $ac_status" >&5 + echo "$as_me:7997: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7997,7 +8043,7 @@ else lt_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -8037,7 +8083,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -8048,11 +8094,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8051: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8097: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8055: \$? = $ac_status" >&5 + echo "$as_me:8101: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8244,7 +8290,7 @@ EOF allow_undefined_flag=unsupported always_export_symbols=no enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -8262,7 +8308,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_shlibpath_var=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' @@ -8277,7 +8323,7 @@ EOF archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux* | k*bsd*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -8295,13 +8341,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs=no else @@ -8461,7 +8516,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -8535,11 +8590,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8594,11 +8656,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -8652,7 +8721,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes=yes ;; @@ -8694,10 +8763,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -8859,24 +8928,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + hardcode_shlibpath_var=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + export_dynamic_flag_spec='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; @@ -8935,17 +9008,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs=yes ;; @@ -9002,7 +9074,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag='${wl}-z,text' archive_cmds_need_lc=no hardcode_shlibpath_var=no @@ -9079,7 +9151,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -9137,17 +9209,55 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" + if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then + case $host_os in + darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; + *) lt_awk_arg="/^libraries:/" ;; + esac + lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` + if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then # if the path contains ";" then we assume it to be the separator # otherwise default to the standard path separator (i.e. ":") - it is # assumed that no part of a normal pathname contains ";" but that should # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` + lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` fi + # Ok, now we have the path, separated by spaces, we can step through it + # and add multilib dir if necessary. + lt_tmp_lt_search_path_spec= + lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` + for lt_sys_path in $lt_search_path_spec; do + if test -d "$lt_sys_path/$lt_multi_os_dir"; then + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" + else + test -d "$lt_sys_path" && \ + lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" + fi + done + lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' +BEGIN {RS=" "; FS="/|\n";} { + lt_foo=""; + lt_count=0; + for (lt_i = NF; lt_i > 0; lt_i--) { + if ($lt_i != "" && $lt_i != ".") { + if ($lt_i == "..") { + lt_count++; + } else { + if (lt_count == 0) { + lt_foo="/" $lt_i lt_foo; + } else { + lt_count--; + } + } + } + } + if (lt_foo != "") { lt_freq[lt_foo]++; } + if (lt_freq[lt_foo] == 1) { print lt_foo; } +}'` + sys_lib_search_path_spec=`echo $lt_search_path_spec` else sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" fi @@ -9307,12 +9417,8 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + + sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib" sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -9366,7 +9472,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -9429,7 +9535,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -9500,7 +9606,7 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -9606,6 +9712,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -9759,6 +9869,7 @@ else darwin*) if test -n "$STRIP" ; then striplib="$STRIP -x" + old_striplib="$STRIP -S" { echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6; } else @@ -10345,7 +10456,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10348 "configure" +#line 10459 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10445,7 +10556,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<EOF -#line 10448 "configure" +#line 10559 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10643,6 +10754,7 @@ if test -f "$ltmain"; then module_cmds \ module_expsym_cmds \ lt_cv_prog_compiler_c_o \ + fix_srcfile_path \ exclude_expsyms \ include_expsyms; do @@ -10687,7 +10799,7 @@ echo "$as_me: creating $ofile" >&6;} # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is part of GNU Libtool: @@ -11011,7 +11123,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols @@ -11180,10 +11292,10 @@ objext=o objext_CXX=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" +lt_simple_compile_test_code="int some_variable = 0;" # Code to be used in simple link tests -lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n' +lt_simple_link_test_code='int main(int, char *[]) { return(0); }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -11199,13 +11311,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -11464,7 +11576,7 @@ case $host_os in strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_CXX=yes + : else # We have old collect2 hardcode_direct_CXX=unsupported @@ -11538,11 +11650,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11598,11 +11717,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -11721,10 +11847,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -11807,9 +11933,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi hardcode_libdir_separator_CXX=: case $host_cpu in - hppa*64*|ia64*) - hardcode_libdir_flag_spec_ld_CXX='+b $libdir' - ;; + hppa*64*|ia64*) ;; *) export_dynamic_flag_spec_CXX='${wl}-E' ;; @@ -11877,7 +12001,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - interix3*) + interix[3-9]*) hardcode_direct_CXX=no hardcode_shlibpath_var_CXX=no hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' @@ -11997,6 +12121,29 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # dependencies. output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + no_undefined_flag_CXX=' -zdefs' + archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' + archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + hardcode_libdir_flag_spec_CXX='-R$libdir' + whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + + # Not sure whether something based on + # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 + # would be better. + output_verbose_link_cmd='echo' + + # Archives containing C++ object files must be created using + # "CC -xar", where "CC" is the Sun C++ compiler. This is + # necessary to make sure instantiated templates are included + # in the archive. + old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' + ;; + esac + ;; esac ;; lynxos*) @@ -12035,16 +12182,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; openbsd*) - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' - export_dynamic_flag_spec_CXX='${wl}-E' - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + if test -f /usr/libexec/ld.so; then + hardcode_direct_CXX=yes + hardcode_shlibpath_var_CXX=no + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' + hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + export_dynamic_flag_spec_CXX='${wl}-E' + whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' + fi + output_verbose_link_cmd='echo' + else + ld_shlibs_CXX=no fi - output_verbose_link_cmd='echo' ;; osf3*) case $cc_basename in @@ -12206,15 +12357,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. We must also pass each convience library through - # to the system linker between allextract/defaultextract. - # The C++ compiler will combine linker options so we - # cannot just pass the convience library names through - # without $wl. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' + whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract' ;; esac link_all_deplibs_CXX=yes @@ -12261,6 +12407,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' + case $host_os in + solaris2.[0-5] | solaris2.[0-5].*) ;; + *) + whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + ;; + esac fi ;; esac @@ -12452,7 +12604,7 @@ $rm -f confest.$objext # PORTME: override above test on systems where it is broken case $host_os in -interix3*) +interix[3-9]*) # Interix 3.5 installs completely hosed .la files for C++, so rather than # hack all around it, let's just trust "g++" to DTRT. predep_objects_CXX= @@ -12460,13 +12612,46 @@ interix3*) postdeps_CXX= ;; +linux*) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + # + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi + ;; + esac + ;; + solaris*) case $cc_basename in CC*) + # The more standards-conforming stlport4 library is + # incompatible with the Cstd library. Avoid specifying + # it if it's in CXXFLAGS. Ignore libCrun as + # -library=stlport4 depends on it. + case " $CXX $CXXFLAGS " in + *" -library=stlport4 "*) + solaris_use_stlport4=yes + ;; + esac + # Adding this requires a known-good setup of shared libraries for # Sun compiler versions before 5.6, else PIC objects from an old # archive will be linked into the output, leading to subtle bugs. - postdeps_CXX='-lCstd -lCrun' + if test "$solaris_use_stlport4" != yes; then + postdeps_CXX='-library=Cstd -library=Crun' + fi ;; esac ;; @@ -12503,12 +12688,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # like `-m68040'. lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | os2* | pw32*) + mingw* | cygwin* | os2* | pw32*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_CXX='-DDLL_EXPORT' ;; darwin* | rhapsody*) @@ -12520,7 +12707,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # DJGPP does not support shared libraries at all lt_prog_compiler_pic_CXX= ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -12656,6 +12843,14 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_CXX='-non_shared' ;; *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C++ 5.9 + lt_prog_compiler_pic_CXX='-KPIC' + lt_prog_compiler_static_CXX='-Bstatic' + lt_prog_compiler_wl_CXX='-Qoption ld ' + ;; + esac ;; esac ;; @@ -12770,7 +12965,7 @@ if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then else lt_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -12781,11 +12976,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12784: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12979: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12788: \$? = $ac_status" >&5 + echo "$as_me:12983: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12834,7 +13029,7 @@ else lt_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -12874,7 +13069,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -12885,11 +13080,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12888: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13083: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12892: \$? = $ac_status" >&5 + echo "$as_me:13087: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12955,7 +13150,7 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar export_symbols_cmds_CXX="$ltdll_cmds" ;; cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; linux* | k*bsd*-gnu) link_all_deplibs_CXX=no @@ -12989,7 +13184,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -13047,20 +13242,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -13217,12 +13399,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -13276,7 +13453,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -13339,7 +13516,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -13410,7 +13587,7 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -13516,6 +13693,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -13710,6 +13891,7 @@ if test -f "$ltmain"; then module_cmds_CXX \ module_expsym_cmds_CXX \ lt_cv_prog_compiler_c_o_CXX \ + fix_srcfile_path_CXX \ exclude_expsyms_CXX \ include_expsyms_CXX; do @@ -14030,7 +14212,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_CXX" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_CXX @@ -14121,10 +14303,17 @@ objext=o objext_F77=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" +lt_simple_compile_test_code="\ + subroutine t + return + end +" # Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\n" +lt_simple_link_test_code="\ + program t + end +" # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -14140,13 +14329,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -14233,13 +14422,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_F77='-DDLL_EXPORT' ;; @@ -14249,7 +14440,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_F77='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -14307,7 +14498,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic_F77='-DDLL_EXPORT' @@ -14359,6 +14550,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # All Alpha code is PIC. lt_prog_compiler_static_F77='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_F77='-KPIC' + lt_prog_compiler_static_F77='-Bstatic' + lt_prog_compiler_wl_F77='' + ;; + esac + ;; esac ;; @@ -14368,6 +14575,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_F77='-non_shared' ;; + rdos*) + lt_prog_compiler_static_F77='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_F77='-KPIC' lt_prog_compiler_static_F77='-Bstatic' @@ -14435,7 +14646,7 @@ if test "${lt_prog_compiler_pic_works_F77+set}" = set; then else lt_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_F77" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -14446,11 +14657,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14449: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14660: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14453: \$? = $ac_status" >&5 + echo "$as_me:14664: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14499,7 +14710,7 @@ else lt_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -14539,7 +14750,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -14550,11 +14761,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14553: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14764: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14557: \$? = $ac_status" >&5 + echo "$as_me:14768: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14746,7 +14957,7 @@ EOF allow_undefined_flag_F77=unsupported always_export_symbols_F77=no enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -14764,7 +14975,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_F77=no hardcode_shlibpath_var_F77=no hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' @@ -14779,7 +14990,7 @@ EOF archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux* | k*bsd*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -14797,13 +15008,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs_F77=no else @@ -14963,7 +15183,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_F77=yes + : else # We have old collect2 hardcode_direct_F77=unsupported @@ -15027,11 +15247,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15076,11 +15303,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -15134,7 +15368,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_F77='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_F77='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_F77=yes ;; @@ -15176,10 +15410,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -15341,24 +15575,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_F77=yes + hardcode_shlibpath_var_F77=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + export_dynamic_flag_spec_F77='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_F77='-R$libdir' + ;; + *) + archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_F77=no fi ;; @@ -15417,17 +15655,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_F77=yes ;; @@ -15484,7 +15721,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_F77='${wl}-z,text' archive_cmds_need_lc_F77=no hardcode_shlibpath_var_F77=no @@ -15561,7 +15798,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -15619,20 +15856,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -15789,12 +16013,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -15848,7 +16067,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -15911,7 +16130,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -15982,7 +16201,7 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -16088,6 +16307,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -16282,6 +16505,7 @@ if test -f "$ltmain"; then module_cmds_F77 \ module_expsym_cmds_F77 \ lt_cv_prog_compiler_c_o_F77 \ + fix_srcfile_path_F77 \ exclude_expsyms_F77 \ include_expsyms_F77; do @@ -16602,7 +16826,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_F77" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_F77 @@ -16660,10 +16884,10 @@ objext=o objext_GCJ=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code="class foo {}\n" +lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' # ltmain only uses $CC for tagged configurations so make sure $CC is set. @@ -16679,13 +16903,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -16726,7 +16950,7 @@ if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-fno-rtti -fno-exceptions" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -16737,11 +16961,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16964: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16744: \$? = $ac_status" >&5 + echo "$as_me:16968: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16792,13 +17016,15 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) + beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). + # Although the cygwin gcc ignores -fPIC, still need this for old-style + # (--disable-auto-import) libraries lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' ;; @@ -16808,7 +17034,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_pic_GCJ='-fno-common' ;; - interix3*) + interix[3-9]*) # Interix 3.x gcc -fpic/-fPIC options generate broken code. # Instead, we relocate shared libraries at runtime. ;; @@ -16866,7 +17092,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' @@ -16918,6 +17144,22 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } # All Alpha code is PIC. lt_prog_compiler_static_GCJ='-non_shared' ;; + *) + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) + # Sun C 5.9 + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='-Wl,' + ;; + *Sun\ F*) + # Sun Fortran 8.3 passes all unrecognized flags to the linker + lt_prog_compiler_pic_GCJ='-KPIC' + lt_prog_compiler_static_GCJ='-Bstatic' + lt_prog_compiler_wl_GCJ='' + ;; + esac + ;; esac ;; @@ -16927,6 +17169,10 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } lt_prog_compiler_static_GCJ='-non_shared' ;; + rdos*) + lt_prog_compiler_static_GCJ='-non_shared' + ;; + solaris*) lt_prog_compiler_pic_GCJ='-KPIC' lt_prog_compiler_static_GCJ='-Bstatic' @@ -16994,7 +17240,7 @@ if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then else lt_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="$lt_prog_compiler_pic_GCJ" # Insert the option either (1) after the last *FLAGS variable, or # (2) before a word containing "conftest.", or (3) at the end. @@ -17005,11 +17251,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17008: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17254: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17012: \$? = $ac_status" >&5 + echo "$as_me:17258: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17058,7 +17304,7 @@ else lt_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS $lt_tmp_static_flag" - printf "$lt_simple_link_test_code" > conftest.$ac_ext + echo "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then # The linker can only warn and ignore the option if not recognized # So say no if there are warnings @@ -17098,7 +17344,7 @@ else mkdir conftest cd conftest mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext lt_compiler_flag="-o out/conftest2.$ac_objext" # Insert the option either (1) after the last *FLAGS variable, or @@ -17109,11 +17355,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17112: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17358: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17116: \$? = $ac_status" >&5 + echo "$as_me:17362: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17305,7 +17551,7 @@ EOF allow_undefined_flag_GCJ=unsupported always_export_symbols_GCJ=no enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' + export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' @@ -17323,7 +17569,7 @@ EOF fi ;; - interix3*) + interix[3-9]*) hardcode_direct_GCJ=no hardcode_shlibpath_var_GCJ=no hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' @@ -17338,7 +17584,7 @@ EOF archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; - linux* | k*bsd*-gnu) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then tmp_addflag= case $cc_basename,$host_cpu in @@ -17356,13 +17602,22 @@ EOF ifc* | ifort*) # Intel Fortran compiler tmp_addflag=' -nofor_main' ;; esac - archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' + case `$CC -V 2>&1 | sed 5q` in + *Sun\ C*) # Sun C 5.9 + whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + tmp_sharedflag='-G' ;; + *Sun\ F*) # Sun Fortran 8.3 + tmp_sharedflag='-G' ;; + *) + tmp_sharedflag='-shared' ;; + esac + archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ - $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' + $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi link_all_deplibs_GCJ=no else @@ -17522,7 +17777,7 @@ _LT_EOF strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct_GCJ=yes + : else # We have old collect2 hardcode_direct_GCJ=unsupported @@ -17596,11 +17851,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17655,11 +17917,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 } && test -s conftest$ac_exeext && $as_test_x conftest$ac_exeext; then -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` +lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { + /^0/ { + s/^0 *\(.*\)$/\1/ + p + } + }' +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi +if test -z "$aix_libpath"; then + aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +fi else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -17713,7 +17982,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi # The linker will automatically build a .lib file if we build a DLL. old_archive_From_new_cmds_GCJ='true' # FIXME: Should let the user specify the lib program. - old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs' + old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs' fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`' enable_shared_with_static_runtimes_GCJ=yes ;; @@ -17755,10 +18024,10 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $cc_basename in xlc*) output_verbose_link_cmd='echo' - archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring' + archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring' module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags' # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds - archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' + archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}' ;; *) @@ -17920,24 +18189,28 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' + if test -f /usr/libexec/ld.so; then + hardcode_direct_GCJ=yes + hardcode_shlibpath_var_GCJ=no + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + export_dynamic_flag_spec_GCJ='${wl}-E' + else + case $host_os in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' + hardcode_libdir_flag_spec_GCJ='-R$libdir' + ;; + *) + archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' + ;; + esac + fi else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs_GCJ=no fi ;; @@ -17996,17 +18269,16 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi case $host_os in solaris2.[0-5] | solaris2.[0-5].*) ;; *) - # The compiler driver will combine linker options so we - # cannot just pass the convience library names through - # without $wl, iff we do not link with $LD. - # Luckily, gcc supports the same syntax we need for Sun Studio. + # The compiler driver will combine and reorder linker options, + # but understands `-z linker_flag'. GCC discards it without `$wl', + # but is careful enough not to reorder. # Supported since Solaris 2.6 (maybe 2.5.1?) - case $wlarc in - '') - whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;; - *) - whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;; - esac ;; + if test "$GCC" = yes; then + whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' + else + whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' + fi + ;; esac link_all_deplibs_GCJ=yes ;; @@ -18063,7 +18335,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) no_undefined_flag_GCJ='${wl}-z,text' archive_cmds_need_lc_GCJ=no hardcode_shlibpath_var_GCJ=no @@ -18140,7 +18412,7 @@ x|xyes) { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext + echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 @@ -18198,20 +18470,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` - else - sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi + need_lib_prefix=unknown hardcode_into_libs=no @@ -18368,12 +18627,7 @@ darwin* | rhapsody*) shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' - # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same. - if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"` - else - sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib' - fi + sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ;; @@ -18427,7 +18681,7 @@ freebsd* | dragonfly*) shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; - freebsd*) # from 4.6 on + *) # from 4.6 on, and DragonFly shlibpath_overrides_runpath=yes hardcode_into_libs=yes ;; @@ -18490,7 +18744,7 @@ hpux9* | hpux10* | hpux11*) postinstall_cmds='chmod 555 $lib' ;; -interix3*) +interix[3-9]*) version_type=linux need_lib_prefix=no need_version=no @@ -18561,7 +18815,7 @@ linux* | k*bsd*-gnu) # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi @@ -18667,6 +18921,10 @@ osf3* | osf4* | osf5*) sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ;; +rdos*) + dynamic_linker=no + ;; + solaris*) version_type=linux need_lib_prefix=no @@ -18861,6 +19119,7 @@ if test -f "$ltmain"; then module_cmds_GCJ \ module_expsym_cmds_GCJ \ lt_cv_prog_compiler_c_o_GCJ \ + fix_srcfile_path_GCJ \ exclude_expsyms_GCJ \ include_expsyms_GCJ; do @@ -19181,7 +19440,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_GCJ @@ -19238,7 +19497,7 @@ objext=o objext_RC=$objext # Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' +lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' # Code to be used in simple link tests lt_simple_link_test_code="$lt_simple_compile_test_code" @@ -19257,13 +19516,13 @@ compiler=$CC # save warnings/boilerplate of simple test code ac_outfile=conftest.$ac_objext -printf "$lt_simple_compile_test_code" >conftest.$ac_ext +echo "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` $rm conftest* ac_outfile=conftest.$ac_objext -printf "$lt_simple_link_test_code" >conftest.$ac_ext +echo "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` $rm conftest* @@ -19341,6 +19600,7 @@ if test -f "$ltmain"; then module_cmds_RC \ module_expsym_cmds_RC \ lt_cv_prog_compiler_c_o_RC \ + fix_srcfile_path_RC \ exclude_expsyms_RC \ include_expsyms_RC; do @@ -19661,7 +19921,7 @@ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec # Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" +fix_srcfile_path=$lt_fix_srcfile_path # Set to yes if exported symbols are required. always_export_symbols=$always_export_symbols_RC @@ -23694,6 +23954,8 @@ echo "${ECHO_T}no" >&6; } { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } xlib_xrender_REQUIRES="" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $xlib_CFLAGS $xlib_NONPKGCONFIG_CFLAGS" if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } @@ -23831,10 +24093,14 @@ else fi + CPPFLAGS=$old_CPPFLAGS + elif test $pkg_failed = untried; then { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } xlib_xrender_REQUIRES="" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $xlib_CFLAGS $xlib_NONPKGCONFIG_CFLAGS" if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then { echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6; } @@ -23972,6 +24238,8 @@ else fi + CPPFLAGS=$old_CPPFLAGS + else xlib_xrender_CFLAGS=$pkg_cv_xlib_xrender_CFLAGS xlib_xrender_LIBS=$pkg_cv_xlib_xrender_LIBS @@ -27749,7 +28017,11 @@ else ps_NONPKGCONFIG_CFLAGS=$ac_env_ps_NONPKGCONFIG_CFLAGS_value ps_NONPKGCONFIG_LIBS=$ac_env_ps_NONPKGCONFIG_LIBS_value ps_BASE=cairo - use_ps=yes + + # The ps backend requires zlib. + use_ps=$have_libz + ps_NONPKGCONFIG_LIBS=-lz + cairo_cv_backend_ps_use=$use_ps cairo_cv_backend_ps_cache_version=4 cairo_cv_backend_ps_requires=$ps_REQUIRES @@ -30715,7 +30987,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by cairo $as_me 1.4.10, which was +This file was extended by cairo $as_me 1.4.12, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30768,7 +31040,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -cairo config.status 1.4.10 +cairo config.status 1.4.12 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -31055,13 +31327,13 @@ host!$host$ac_delim host_cpu!$host_cpu$ac_delim host_vendor!$host_vendor$ac_delim host_os!$host_os$ac_delim +SED!$SED$ac_delim GREP!$GREP$ac_delim EGREP!$EGREP$ac_delim LN_S!$LN_S$ac_delim ECHO!$ECHO$ac_delim AR!$AR$ac_delim RANLIB!$RANLIB$ac_delim -DLLTOOL!$DLLTOOL$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31103,6 +31375,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +DLLTOOL!$DLLTOOL$ac_delim AS!$AS$ac_delim OBJDUMP!$OBJDUMP$ac_delim CXX!$CXX$ac_delim @@ -31199,7 +31472,6 @@ CAIRO_HAS_SVG_SURFACE_FALSE!$CAIRO_HAS_SVG_SURFACE_FALSE$ac_delim LIBRSVG_CFLAGS!$LIBRSVG_CFLAGS$ac_delim LIBRSVG_LIBS!$LIBRSVG_LIBS$ac_delim CAIRO_CAN_TEST_SVG_SURFACE_TRUE!$CAIRO_CAN_TEST_SVG_SURFACE_TRUE$ac_delim -CAIRO_CAN_TEST_SVG_SURFACE_FALSE!$CAIRO_CAN_TEST_SVG_SURFACE_FALSE$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -31241,6 +31513,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +CAIRO_CAN_TEST_SVG_SURFACE_FALSE!$CAIRO_CAN_TEST_SVG_SURFACE_FALSE$ac_delim CAIRO_HAS_ATSUI_FONT_TRUE!$CAIRO_HAS_ATSUI_FONT_TRUE$ac_delim CAIRO_HAS_ATSUI_FONT_FALSE!$CAIRO_HAS_ATSUI_FONT_FALSE$ac_delim CAIRO_REQUIRES!$CAIRO_REQUIRES$ac_delim @@ -31271,7 +31544,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 28; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -31976,7 +32249,7 @@ if test x"$use_quartz" = "xyes" ; then echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Quartz/' fi -if test x"$use_quartz" = "xyes" ; then +if test x"$use_atsui" = "xyes" ; then echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/ATSUI/' fi diff --git a/configure.in b/configure.in index ea5e2e8..2cda71e 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl An odd micro number indicates in-progress development, (eg. from git/cvs) dnl An even micro number indicates a released version. m4_define(cairo_version_major, 1) m4_define(cairo_version_minor, 4) -m4_define(cairo_version_micro, 10) +m4_define(cairo_version_micro, 12) AC_INIT([cairo], cairo_version_major.cairo_version_minor.cairo_version_micro, @@ -26,7 +26,7 @@ LT_CURRENT=13 # Increment any time the source changes; set to # 0 if you increment CURRENT -LT_REVISION=5 +LT_REVISION=6 # Increment if any interfaces have been added; set to 0 # if any interfaces have been removed. removal has @@ -261,9 +261,13 @@ CAIRO_BACKEND_ENABLE(xlib_xrender, Xlib Xrender, xlib-xrender, XLIB_XRENDER_SURF PKG_CHECK_MODULES(xlib_xrender, $xlib_xrender_REQUIRES, , [AC_MSG_RESULT(no) xlib_xrender_REQUIRES="" + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $xlib_CFLAGS $xlib_NONPKGCONFIG_CFLAGS" AC_CHECK_HEADER(X11/extensions/Xrender.h, [xlib_xrender_NONPKGCONFIG_LIBS="-lXrender"], - [use_xlib_xrender="no (requires Xrender http://freedesktop.org/Software/xlibs)"])]) + [use_xlib_xrender="no (requires Xrender http://freedesktop.org/Software/xlibs)"]) + CPPFLAGS=$old_CPPFLAGS + ]) fi ]) @@ -522,7 +526,11 @@ fi dnl =========================================================================== -CAIRO_BACKEND_ENABLE(ps, PostScript, ps, PS_SURFACE, auto, [use_ps=yes]) +CAIRO_BACKEND_ENABLE(ps, PostScript, ps, PS_SURFACE, auto, [ + # The ps backend requires zlib. + use_ps=$have_libz + ps_NONPKGCONFIG_LIBS=-lz +]) dnl =========================================================================== @@ -999,7 +1007,7 @@ if test x"$use_quartz" = "xyes" ; then echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/Quartz/' fi -if test x"$use_quartz" = "xyes" ; then +if test x"$use_atsui" = "xyes" ; then echo "$WARNING_MESSAGE" | sed 's/@BACKEND@/ATSUI/' fi diff --git a/doc/Makefile.in b/doc/Makefile.in index b07c384..648b874 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -204,6 +204,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/doc/public/Makefile.in b/doc/public/Makefile.in index 7dd738b..1ad2786 100644 --- a/doc/public/Makefile.in +++ b/doc/public/Makefile.in @@ -203,6 +203,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/doc/public/html/Drawing.html b/doc/public/html/Drawing.html index 52f7724..2024a80 100644 --- a/doc/public/html/Drawing.html +++ b/doc/public/html/Drawing.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Drawing</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="pt02.html" title="Part II. Reference"> <link rel="prev" href="pt02.html" title="Part II. Reference"> <link rel="next" href="cairo-cairo-t.html" title="cairo_t"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/Fonts.html b/doc/public/html/Fonts.html index c72b2a6..24419c5 100644 --- a/doc/public/html/Fonts.html +++ b/doc/public/html/Fonts.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Fonts</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="pt02.html" title="Part II. Reference"> <link rel="prev" href="cairo-Text.html" title="Text"> <link rel="next" href="cairo-cairo-font-face-t.html" title="cairo_font_face_t"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/Support.html b/doc/public/html/Support.html index 0ee4844..318d1b8 100644 --- a/doc/public/html/Support.html +++ b/doc/public/html/Support.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Utilities</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="pt02.html" title="Part II. Reference"> <link rel="prev" href="cairo-XLib-Surfaces.html" title="XLib Surfaces"> <link rel="next" href="cairo-cairo-matrix-t.html" title="cairo_matrix_t"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/Surfaces.html b/doc/public/html/Surfaces.html index 7ef9a34..96724d6 100644 --- a/doc/public/html/Surfaces.html +++ b/doc/public/html/Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="pt02.html" title="Part II. Reference"> <link rel="prev" href="cairo-Win32-Fonts.html" title="Win32 Fonts"> <link rel="next" href="cairo-cairo-surface-t.html" title="cairo_surface_t"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/bindings-errors.html b/doc/public/html/bindings-errors.html index 1e731d7..e233580 100644 --- a/doc/public/html/bindings-errors.html +++ b/doc/public/html/bindings-errors.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Error handling</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-streams.html" title="Streams and File I/O"> <link rel="next" href="bindings-patterns.html" title="Patterns"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -41,7 +41,7 @@ When a method on an object fails, the object is put into an error state. Subsequent operations on the object do nothing. The status of the object can be queried with - a function like <a href="cairo-cairo-t.html#cairo-status"><code class="function">status()</code></a>. + a function like <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">status()</code></a>. </p></li> <li> <p> @@ -119,7 +119,7 @@ CAIRO_STATUS_WRITE_ERROR perhaps.) And <code class="constant">CAIRO_STATUS_READ_ERROR</code>, and <code class="constant">CAIRO_STATUS_WRITE_ERROR</code> can occur only in very specific places. (In fact, as described - in <a href="bindings-streams.html" title="Streams and File I/O">the section called “Streams and File I/O”</a>, these errors may be + in <a class="xref" href="bindings-streams.html" title="Streams and File I/O">the section called “Streams and File I/O”</a>, these errors may be mapped into the language's native I/O error types.) So, there really aren't exceptions that the programmer must handle at most points in the Cairo API. diff --git a/doc/public/html/bindings-fonts.html b/doc/public/html/bindings-fonts.html index dfa21c7..05598f2 100644 --- a/doc/public/html/bindings-fonts.html +++ b/doc/public/html/bindings-fonts.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Fonts</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-surfaces.html" title="Surfaces"> <link rel="next" href="bindings-path.html" title="cairo_path_t"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -50,8 +50,8 @@ cairo_scaled_font_t types. </p> <p> - The <a href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"><code class="function">cairo_font_face_set_user_data()</code></a>, - and <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data"><code class="function">cairo_font_face_get_user_data()</code></a> + The <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"><code class="function">cairo_font_face_set_user_data()</code></a>, + and <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data"><code class="function">cairo_font_face_get_user_data()</code></a> methods are provided for use in language bindings, and should not be directly exposed to applications. </p> diff --git a/doc/public/html/bindings-memory.html b/doc/public/html/bindings-memory.html index 8caa44d..4222300 100644 --- a/doc/public/html/bindings-memory.html +++ b/doc/public/html/bindings-memory.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Memory management</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="next" href="bindings-return-values.html" title="Multiple return values"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -35,12 +35,12 @@ <p> The objects in cairo can roughly be divided into two types: reference-counted, opaque types like - <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> and plain structures like - <a href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a>. - <a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> + <a class="link" href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a>. + <a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> and - <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> + <a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> are special cases and are treated separately in this appendix. </p> <p> @@ -68,7 +68,7 @@ uniquifying via a <em class="firstterm">pin table</em> (a hash table that goes from cairo object to language object). For <span class="type">cairo_surface_t</span> you can use also - <a href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a> + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a> instead of a separate pin table. </p></li> <li> diff --git a/doc/public/html/bindings-overloading.html b/doc/public/html/bindings-overloading.html index 81d91fe..d78fe90 100644 --- a/doc/public/html/bindings-overloading.html +++ b/doc/public/html/bindings-overloading.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Overloading and optional arguments</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-return-values.html" title="Multiple return values"> <link rel="next" href="bindings-streams.html" title="Streams and File I/O"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -43,7 +43,7 @@ overloading. What may seem like an obvious overload now may turn out to be strange with future additions to cairo. It might seem logical to make - <a href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a> + <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a> an overload of <code class="function">cairo_set_source()</code>, but future plans to add <code class="function">cairo_set_source_rgb_premultiplied()</code>, which will also take three doubles make this a bad idea. For @@ -100,9 +100,9 @@ cairo_image_surface_create_from_png_stream (cairo_read_func_t read_func, <p> Note that there are cases where all constructors for a type aren't overloaded together. For example - <a href="cairo-PNG-Support.html#cairo-image-surface-create-from-png"><code class="function">cairo_image_surface_create_from_png()</code></a> + <a class="link" href="cairo-PNG-Support.html#cairo-image-surface-create-from-png"><code class="function">cairo_image_surface_create_from_png()</code></a> should <span class="emphasis"><em>not</em></span> be overloaded together with - <a href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a>. + <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a>. In such cases, the remaining constructors will typically need to be bound as static methods. In Java, for example, we might have: </p> diff --git a/doc/public/html/bindings-path.html b/doc/public/html/bindings-path.html index d6a4f82..2a1913d 100644 --- a/doc/public/html/bindings-path.html +++ b/doc/public/html/bindings-path.html @@ -3,11 +3,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>cairo_path_t</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-fonts.html" title="Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -32,7 +32,7 @@ <div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="bindings-path"></a>cairo_path_t</h2></div></div></div> <p> - The <a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> type is one + The <a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> type is one area in which most language bindings will differ significantly from the C API. The C API for <span class="type">cairo_path_t</span> is designed for efficiency and to avoid auxiliary objects that @@ -114,10 +114,10 @@ for element in cr.copy_path(): <span class="type">cairo_path_t</span> objects. In the future, these guidelines may be extended to present an API for creating a <span class="type">cairo_path_t</span> from scratch for use with - <a href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a> + <a class="link" href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a> but the current expectation is that <code class="function">cairo_append_path()</code> will mostly be used with paths from - <a href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_copy_path()</code></a>. + <a class="link" href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_copy_path()</code></a>. </p> </div> </body> diff --git a/doc/public/html/bindings-patterns.html b/doc/public/html/bindings-patterns.html index 8e2710d..c11cea8 100644 --- a/doc/public/html/bindings-patterns.html +++ b/doc/public/html/bindings-patterns.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Patterns</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-errors.html" title="Error handling"> <link rel="next" href="bindings-surfaces.html" title="Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -35,7 +35,7 @@ <p> The cairo C API allows for creating a number of different types of patterns. All of these different types of patterns map to - <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> in C, but in an object oriented language, there should instead be a hierarchy of types. (The functions that should map to constructors for the various types are listed after the type, @@ -43,19 +43,19 @@ </p> <pre class="programlisting"> cairo_pattern_t - <a href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a> - <a href="cairo-Patterns.html#cairo-pattern-get-matrix"><code class="function">cairo_pattern_get_matrix()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-get-matrix"><code class="function">cairo_pattern_get_matrix()</code></a> cairo_solid_pattern_t - cairo_surface_pattern_t (<a href="cairo-Patterns.html#cairo-pattern-create-for-surface"><code class="function">cairo_pattern_create_for_surface()</code></a>) - <a href="cairo-Patterns.html#cairo-pattern-set-extend"><code class="function">cairo_pattern_set_extend()</code></a> - <a href="cairo-Patterns.html#cairo-pattern-get-extend"><code class="function">cairo_pattern_get_extend()</code></a> - <a href="cairo-Patterns.html#cairo-pattern-set-filter"><code class="function">cairo_pattern_set_filter()</code></a> - <a href="cairo-Patterns.html#cairo-pattern-get-filter"><code class="function">cairo_pattern_get_filter()</code></a> + cairo_surface_pattern_t (<a class="link" href="cairo-Patterns.html#cairo-pattern-create-for-surface"><code class="function">cairo_pattern_create_for_surface()</code></a>) + <a class="link" href="cairo-Patterns.html#cairo-pattern-set-extend"><code class="function">cairo_pattern_set_extend()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-get-extend"><code class="function">cairo_pattern_get_extend()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-set-filter"><code class="function">cairo_pattern_set_filter()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-get-filter"><code class="function">cairo_pattern_get_filter()</code></a> cairo_gradient_t - <a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> - <a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a> - cairo_linear_gradient_t (<a href="cairo-Patterns.html#cairo-pattern-create-linear"><code class="function">cairo_pattern_create_linear()</code></a>) - cairo_radial_gradient_t (<a href="cairo-Patterns.html#cairo-pattern-create-radial"><code class="function">cairo_pattern_create_radial()</code></a>) + <a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> + <a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a> + cairo_linear_gradient_t (<a class="link" href="cairo-Patterns.html#cairo-pattern-create-linear"><code class="function">cairo_pattern_create_linear()</code></a>) + cairo_radial_gradient_t (<a class="link" href="cairo-Patterns.html#cairo-pattern-create-radial"><code class="function">cairo_pattern_create_radial()</code></a>) </pre> <p> </p> diff --git a/doc/public/html/bindings-return-values.html b/doc/public/html/bindings-return-values.html index b0c67cf..bc42c39 100644 --- a/doc/public/html/bindings-return-values.html +++ b/doc/public/html/bindings-return-values.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Multiple return values</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-memory.html" title="Memory management"> <link rel="next" href="bindings-overloading.html" title="Overloading and optional arguments"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/bindings-streams.html b/doc/public/html/bindings-streams.html index fc799e9..d40a0fd 100644 --- a/doc/public/html/bindings-streams.html +++ b/doc/public/html/bindings-streams.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Streams and File I/O</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-overloading.html" title="Overloading and optional arguments"> <link rel="next" href="bindings-errors.html" title="Error handling"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> diff --git a/doc/public/html/bindings-surfaces.html b/doc/public/html/bindings-surfaces.html index 2f24e19..8f29f9a 100644 --- a/doc/public/html/bindings-surfaces.html +++ b/doc/public/html/bindings-surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> <link rel="prev" href="bindings-patterns.html" title="Patterns"> <link rel="next" href="bindings-fonts.html" title="Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -34,7 +34,7 @@ <a name="bindings-surfaces"></a>Surfaces</h2></div></div></div> <p> Like patterns, surfaces, which use only the - <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> type in the C API should be broken up into a hierarchy of types in a language binding. </p> @@ -61,20 +61,20 @@ cairo_surface_t be used in a language binding that doesn't bind the constructor. A very common situation is to use a cairo language binding in combination with a binding for a higher level system like - the <a href="http://www.gtk.org/" target="_top">GTK+</a> widget + the <a class="ulink" href="http://www.gtk.org/" target="_top">GTK+</a> widget toolkit. In such a situation, the higher level toolkit provides ways to get references to platform specific surfaces. </p> <p> - The <a href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a>, - and <a href="cairo-cairo-surface-t.html#cairo-surface-get-user-data"><code class="function">cairo_surface_get_user_data()</code></a> + The <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a>, + and <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-user-data"><code class="function">cairo_surface_get_user_data()</code></a> methods are provided for use in language bindings, and should not be directly exposed to applications. One example of the use of these functions in a language binding is creating a binding for: </p> <pre class="programlisting"> cairo_surface_t * -<a href="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data"><code class="function">cairo_image_surface_create_for_data</code></a> (unsigned char *data, +<a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data"><code class="function">cairo_image_surface_create_for_data</code></a> (unsigned char *data, cairo_format_t format, int width, int height, diff --git a/doc/public/html/cairo-Error-Handling.html b/doc/public/html/cairo-Error-Handling.html index 5aa311f..3ed991c 100644 --- a/doc/public/html/cairo-Error-Handling.html +++ b/doc/public/html/cairo-Error-Handling.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Error handling</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Support.html" title="Utilities"> <link rel="prev" href="cairo-cairo-matrix-t.html" title="cairo_matrix_t"> <link rel="next" href="cairo-Version-Information.html" title="Version Information"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Version-Information.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2605543" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2618626" class="shortcut">Top</a>  |  - <a href="#id2574694" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2665438" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Error-Handling"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2605543"></a><span class="refentrytitle">Error handling</span> +<a name="id2618626"></a><span class="refentrytitle">Error handling</span> </h2> <p>Error handling — Decoding cairo's status</p> </td> @@ -51,23 +51,23 @@ -enum <a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a>; -const char* <a href="cairo-Error-Handling.html#cairo-status-to-string">cairo_status_to_string</a> (<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> status); -void <a href="cairo-Error-Handling.html#cairo-debug-reset-static-data">cairo_debug_reset_static_data</a> (void); +enum <a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a>; +const char* <a class="link" href="cairo-Error-Handling.html#cairo-status-to-string">cairo_status_to_string</a> (<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> status); +void <a class="link" href="cairo-Error-Handling.html#cairo-debug-reset-static-data">cairo_debug_reset_static_data</a> (void); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2574694"></a><h2>Description</h2> +<a name="id2665438"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2605802"></a><h2>Details</h2> +<a name="id2665454"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2589634"></a><h3> +<a name="id2665464"></a><h3> <a name="cairo-status-t"></a>enum cairo_status_t</h3> -<a class="indexterm" name="id2646424"></a><pre class="programlisting">typedef enum _cairo_status { +<a class="indexterm" name="id2665476"></a><pre class="programlisting">typedef enum _cairo_status { CAIRO_STATUS_SUCCESS = 0, CAIRO_STATUS_NO_MEMORY, CAIRO_STATUS_INVALID_RESTORE, @@ -94,13 +94,13 @@ void <a href="cairo-Error-Handling.html#cairo-debug-reset-static- } cairo_status_t; </pre> <p> -<a href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a> is used to indicate errors that can occur when +<a class="link" href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a> is used to indicate errors that can occur when using Cairo. In some cases it is returned directly by functions. -but when using <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, the last error, if any, is stored in -the context and can be retrieved with <a href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>. +but when using <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, the last error, if any, is stored in +the context and can be retrieved with <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>. </p> <p> -New entries may be added in future versions. Use <a href="cairo-Error-Handling.html#cairo-status-to-string"><code class="function">cairo_status_to_string()</code></a> +New entries may be added in future versions. Use <a class="link" href="cairo-Error-Handling.html#cairo-status-to-string"><code class="function">cairo_status_to_string()</code></a> to get a human-readable representation of an error message.</p> <p> @@ -109,117 +109,117 @@ to get a human-readable representation of an error message.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-STATUS-SUCCESS:CAPS"></a><code class="literal">CAIRO_STATUS_SUCCESS</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-SUCCESS:CAPS"></a><code class="literal">CAIRO_STATUS_SUCCESS</code></span></p></td> <td> no error has occurred </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-NO-MEMORY:CAPS"></a><code class="literal">CAIRO_STATUS_NO_MEMORY</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-NO-MEMORY:CAPS"></a><code class="literal">CAIRO_STATUS_NO_MEMORY</code></span></p></td> <td> out of memory </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-RESTORE:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_RESTORE</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-RESTORE:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_RESTORE</code></span></p></td> <td> cairo_restore without matching cairo_save </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-POP-GROUP:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_POP_GROUP</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-POP-GROUP:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_POP_GROUP</code></span></p></td> <td> no saved group to pop </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-NO-CURRENT-POINT:CAPS"></a><code class="literal">CAIRO_STATUS_NO_CURRENT_POINT</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-NO-CURRENT-POINT:CAPS"></a><code class="literal">CAIRO_STATUS_NO_CURRENT_POINT</code></span></p></td> <td> no current point defined </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-MATRIX:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_MATRIX</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-MATRIX:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_MATRIX</code></span></p></td> <td> invalid matrix (not invertible) </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-STATUS:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_STATUS</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-STATUS:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_STATUS</code></span></p></td> <td> invalid value for an input cairo_status_t </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-NULL-POINTER:CAPS"></a><code class="literal">CAIRO_STATUS_NULL_POINTER</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-NULL-POINTER:CAPS"></a><code class="literal">CAIRO_STATUS_NULL_POINTER</code></span></p></td> <td> NULL pointer </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-STRING:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_STRING</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-STRING:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_STRING</code></span></p></td> <td> input string not valid UTF-8 </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-PATH-DATA:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_PATH_DATA</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-PATH-DATA:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_PATH_DATA</code></span></p></td> <td> input path data not valid </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-READ-ERROR:CAPS"></a><code class="literal">CAIRO_STATUS_READ_ERROR</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-READ-ERROR:CAPS"></a><code class="literal">CAIRO_STATUS_READ_ERROR</code></span></p></td> <td> error while reading from input stream </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-WRITE-ERROR:CAPS"></a><code class="literal">CAIRO_STATUS_WRITE_ERROR</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-WRITE-ERROR:CAPS"></a><code class="literal">CAIRO_STATUS_WRITE_ERROR</code></span></p></td> <td> error while writing to output stream </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-SURFACE-FINISHED:CAPS"></a><code class="literal">CAIRO_STATUS_SURFACE_FINISHED</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-SURFACE-FINISHED:CAPS"></a><code class="literal">CAIRO_STATUS_SURFACE_FINISHED</code></span></p></td> <td> target surface has been finished </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-SURFACE-TYPE-MISMATCH:CAPS"></a><code class="literal">CAIRO_STATUS_SURFACE_TYPE_MISMATCH</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-SURFACE-TYPE-MISMATCH:CAPS"></a><code class="literal">CAIRO_STATUS_SURFACE_TYPE_MISMATCH</code></span></p></td> <td> the surface type is not appropriate for the operation </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"></a><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"></a><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></span></p></td> <td> the pattern type is not appropriate for the operation </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-CONTENT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_CONTENT</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-CONTENT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_CONTENT</code></span></p></td> <td> invalid value for an input cairo_content_t </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-FORMAT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_FORMAT</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-FORMAT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_FORMAT</code></span></p></td> <td> invalid value for an input cairo_format_t </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-VISUAL:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_VISUAL</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-VISUAL:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_VISUAL</code></span></p></td> <td> invalid value for an input Visual* </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-FILE-NOT-FOUND:CAPS"></a><code class="literal">CAIRO_STATUS_FILE_NOT_FOUND</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-FILE-NOT-FOUND:CAPS"></a><code class="literal">CAIRO_STATUS_FILE_NOT_FOUND</code></span></p></td> <td> file not found </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-DASH:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_DASH</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-DASH:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_DASH</code></span></p></td> <td> invalid value for a dash setting </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-DSC-COMMENT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_DSC_COMMENT</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-DSC-COMMENT:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_DSC_COMMENT</code></span></p></td> <td> invalid value for a DSC comment (Since 1.2) </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-INVALID-INDEX:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_INDEX</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-INVALID-INDEX:CAPS"></a><code class="literal">CAIRO_STATUS_INVALID_INDEX</code></span></p></td> <td> invalid index passed to getter (Since 1.4) </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-STATUS-CLIP-NOT-REPRESENTABLE:CAPS"></a><code class="literal">CAIRO_STATUS_CLIP_NOT_REPRESENTABLE</code></span></td> +<td><p><span class="term"><a name="CAIRO-STATUS-CLIP-NOT-REPRESENTABLE:CAPS"></a><code class="literal">CAIRO_STATUS_CLIP_NOT_REPRESENTABLE</code></span></p></td> <td> clip region not representable in desired format (Since 1.4) </td> </tr> @@ -228,11 +228,11 @@ to get a human-readable representation of an error message.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2650964"></a><h3> +<a name="id2665606"></a><h3> <a name="cairo-status-to-string"></a>cairo_status_to_string ()</h3> -<a class="indexterm" name="id2650975"></a><pre class="programlisting">const char* cairo_status_to_string (<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> status);</pre> +<a class="indexterm" name="id2665617"></a><pre class="programlisting">const char* cairo_status_to_string (<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> status);</pre> <p> -Provides a human-readable description of a <a href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a>.</p> +Provides a human-readable description of a <a class="link" href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a>.</p> <p> </p> @@ -240,12 +240,12 @@ Provides a human-readable description of a <a href="cairo-Error-Handling.html#ca <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>status</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>status</code></em> :</span></p></td> <td> a cairo status </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td>a string representation of the status </td> </tr> @@ -254,9 +254,9 @@ Provides a human-readable description of a <a href="cairo-Error-Handling.html#ca </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649377"></a><h3> +<a name="id2665684"></a><h3> <a name="cairo-debug-reset-static-data"></a>cairo_debug_reset_static_data ()</h3> -<a class="indexterm" name="id2649390"></a><pre class="programlisting">void cairo_debug_reset_static_data (void);</pre> +<a class="indexterm" name="id2665697"></a><pre class="programlisting">void cairo_debug_reset_static_data (void);</pre> <p> Resets all static data within cairo to its original state, (ie. identical to the state at the time of program invocation). For @@ -282,6 +282,11 @@ failure due to a hash table being destroyed when non-empty).</p> </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2665746"></a><div class="refsect2" lang="en"><a name="id2665747"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2665748"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Font-Options.html b/doc/public/html/cairo-Font-Options.html index 516e8d2..af1225e 100644 --- a/doc/public/html/cairo-Font-Options.html +++ b/doc/public/html/cairo-Font-Options.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Font Options</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Fonts.html" title="Fonts"> <link rel="prev" href="cairo-Scaled-Fonts.html" title="Scaled Fonts"> <link rel="next" href="cairo-FreeType-Fonts.html" title="FreeType Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-FreeType-Fonts.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2584602" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2591519" class="shortcut">Top</a>  |  - <a href="#id2560362" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2649030" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Font-Options"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2584602"></a><span class="refentrytitle">Font Options</span> +<a name="id2591519"></a><span class="refentrytitle">Font Options</span> </h2> <p>Font Options — How a font should be rendered</p> </td> @@ -51,77 +51,77 @@ -typedef <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>; -<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* <a href="cairo-Font-Options.html#cairo-font-options-create">cairo_font_options_create</a> (void); -<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* <a href="cairo-Font-Options.html#cairo-font-options-copy">cairo_font_options_copy</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *original); -void <a href="cairo-Font-Options.html#cairo-font-options-destroy">cairo_font_options_destroy</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Font-Options.html#cairo-font-options-status">cairo_font_options_status</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -void <a href="cairo-Font-Options.html#cairo-font-options-merge">cairo_font_options_merge</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other); -unsigned long <a href="cairo-Font-Options.html#cairo-font-options-hash">cairo_font_options_hash</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -<a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a href="cairo-Font-Options.html#cairo-font-options-equal">cairo_font_options_equal</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other); -void <a href="cairo-Font-Options.html#cairo-font-options-set-antialias">cairo_font_options_set_antialias</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias); -<a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> <a href="cairo-Font-Options.html#cairo-font-options-get-antialias">cairo_font_options_get_antialias</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -enum <a href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a>; -void <a href="cairo-Font-Options.html#cairo-font-options-set-subpixel-order">cairo_font_options_set_subpixel_order</a> - (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> subpixel_order); -<a href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> <a href="cairo-Font-Options.html#cairo-font-options-get-subpixel-order">cairo_font_options_get_subpixel_order</a> - (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -enum <a href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a>; -void <a href="cairo-Font-Options.html#cairo-font-options-set-hint-style">cairo_font_options_set_hint_style</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> hint_style); -<a href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> <a href="cairo-Font-Options.html#cairo-font-options-get-hint-style">cairo_font_options_get_hint_style</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -enum <a href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a>; -void <a href="cairo-Font-Options.html#cairo-font-options-set-hint-metrics">cairo_font_options_set_hint_metrics</a> (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> hint_metrics); -<a href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> <a href="cairo-Font-Options.html#cairo-font-options-get-hint-metrics">cairo_font_options_get_hint_metrics</a> - (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +typedef <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>; +<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* <a class="link" href="cairo-Font-Options.html#cairo-font-options-create">cairo_font_options_create</a> (void); +<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* <a class="link" href="cairo-Font-Options.html#cairo-font-options-copy">cairo_font_options_copy</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *original); +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-destroy">cairo_font_options_destroy</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-status">cairo_font_options_status</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-merge">cairo_font_options_merge</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other); +unsigned long <a class="link" href="cairo-Font-Options.html#cairo-font-options-hash">cairo_font_options_hash</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +<a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-equal">cairo_font_options_equal</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other); +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-set-antialias">cairo_font_options_set_antialias</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias); +<a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-get-antialias">cairo_font_options_get_antialias</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +enum <a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a>; +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-set-subpixel-order">cairo_font_options_set_subpixel_order</a> + (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> subpixel_order); +<a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-get-subpixel-order">cairo_font_options_get_subpixel_order</a> + (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +enum <a class="link" href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a>; +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-set-hint-style">cairo_font_options_set_hint_style</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> hint_style); +<a class="link" href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-get-hint-style">cairo_font_options_get_hint_style</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +enum <a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a>; +void <a class="link" href="cairo-Font-Options.html#cairo-font-options-set-hint-metrics">cairo_font_options_set_hint_metrics</a> (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> hint_metrics); +<a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> <a class="link" href="cairo-Font-Options.html#cairo-font-options-get-hint-metrics">cairo_font_options_get_hint_metrics</a> + (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2560362"></a><h2>Description</h2> +<a name="id2649030"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2631611"></a><h2>Details</h2> +<a name="id2649045"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2631622"></a><h3> +<a name="id2649056"></a><h3> <a name="cairo-font-options-t"></a>cairo_font_options_t</h3> -<a class="indexterm" name="id2631633"></a><pre class="programlisting">typedef struct _cairo_font_options cairo_font_options_t; +<a class="indexterm" name="id2649067"></a><pre class="programlisting">typedef struct _cairo_font_options cairo_font_options_t; </pre> <p> An opaque structure holding all options that are used when rendering fonts. </p> <p> -Individual features of a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> can be set or +Individual features of a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> can be set or accessed using functions named cairo_font_options_set_<span class="emphasis"><em>feature_name</em></span> and cairo_font_options_get_<span class="emphasis"><em>feature_name</em></span>, like -<a href="cairo-Font-Options.html#cairo-font-options-set-antialias"><code class="function">cairo_font_options_set_antialias()</code></a> and -<a href="cairo-Font-Options.html#cairo-font-options-get-antialias"><code class="function">cairo_font_options_get_antialias()</code></a>. +<a class="link" href="cairo-Font-Options.html#cairo-font-options-set-antialias"><code class="function">cairo_font_options_set_antialias()</code></a> and +<a class="link" href="cairo-Font-Options.html#cairo-font-options-get-antialias"><code class="function">cairo_font_options_get_antialias()</code></a>. </p> <p> -New features may be added to a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> in the -future. For this reason, <a href="cairo-Font-Options.html#cairo-font-options-copy"><code class="function">cairo_font_options_copy()</code></a>, -<a href="cairo-Font-Options.html#cairo-font-options-equal"><code class="function">cairo_font_options_equal()</code></a>, <a href="cairo-Font-Options.html#cairo-font-options-merge"><code class="function">cairo_font_options_merge()</code></a>, and -<a href="cairo-Font-Options.html#cairo-font-options-hash"><code class="function">cairo_font_options_hash()</code></a> should be used to copy, check +New features may be added to a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> in the +future. For this reason, <a class="link" href="cairo-Font-Options.html#cairo-font-options-copy"><code class="function">cairo_font_options_copy()</code></a>, +<a class="link" href="cairo-Font-Options.html#cairo-font-options-equal"><code class="function">cairo_font_options_equal()</code></a>, <a class="link" href="cairo-Font-Options.html#cairo-font-options-merge"><code class="function">cairo_font_options_merge()</code></a>, and +<a class="link" href="cairo-Font-Options.html#cairo-font-options-hash"><code class="function">cairo_font_options_hash()</code></a> should be used to copy, check for equality, merge, or compute a hash value of -<a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> objects.</p> +<a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> objects.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2631744"></a><h3> +<a name="id2638983"></a><h3> <a name="cairo-font-options-create"></a>cairo_font_options_create ()</h3> -<a class="indexterm" name="id2631756"></a><pre class="programlisting"><a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* cairo_font_options_create (void);</pre> +<a class="indexterm" name="id2638995"></a><pre class="programlisting"><a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* cairo_font_options_create (void);</pre> <p> Allocates a new font options object with all options initialized to default values.</p> @@ -131,21 +131,21 @@ Allocates a new font options object with all options initialized <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly allocated <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>. Free with - <a href="cairo-Font-Options.html#cairo-font-options-destroy"><code class="function">cairo_font_options_destroy()</code></a>. This function always returns a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly allocated <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>. Free with + <a class="link" href="cairo-Font-Options.html#cairo-font-options-destroy"><code class="function">cairo_font_options_destroy()</code></a>. This function always returns a valid pointer; if memory cannot be allocated, then a special error object is returned where all operations on the object do nothing. - You can check for this with <a href="cairo-Font-Options.html#cairo-font-options-status"><code class="function">cairo_font_options_status()</code></a>. + You can check for this with <a class="link" href="cairo-Font-Options.html#cairo-font-options-status"><code class="function">cairo_font_options_status()</code></a>. </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2631823"></a><h3> +<a name="id2639063"></a><h3> <a name="cairo-font-options-copy"></a>cairo_font_options_copy ()</h3> -<a class="indexterm" name="id2631835"></a><pre class="programlisting"><a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* cairo_font_options_copy (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *original);</pre> +<a class="indexterm" name="id2639074"></a><pre class="programlisting"><a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a>* cairo_font_options_copy (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *original);</pre> <p> Allocates a new font options object copying the option values from <em class="parameter"><code>original</code></em>.</p> @@ -156,17 +156,17 @@ Allocates a new font options object copying the option values from <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>original</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>original</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly allocated <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>. Free with - <a href="cairo-Font-Options.html#cairo-font-options-destroy"><code class="function">cairo_font_options_destroy()</code></a>. This function always returns a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly allocated <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>. Free with + <a class="link" href="cairo-Font-Options.html#cairo-font-options-destroy"><code class="function">cairo_font_options_destroy()</code></a>. This function always returns a valid pointer; if memory cannot be allocated, then a special error object is returned where all operations on the object do nothing. - You can check for this with <a href="cairo-Font-Options.html#cairo-font-options-status"><code class="function">cairo_font_options_status()</code></a>. + You can check for this with <a class="link" href="cairo-Font-Options.html#cairo-font-options-status"><code class="function">cairo_font_options_status()</code></a>. </td> </tr> </tbody> @@ -174,29 +174,29 @@ Allocates a new font options object copying the option values from </div> <hr> <div class="refsect2" lang="en"> -<a name="id2610082"></a><h3> +<a name="id2639175"></a><h3> <a name="cairo-font-options-destroy"></a>cairo_font_options_destroy ()</h3> -<a class="indexterm" name="id2610094"></a><pre class="programlisting">void cairo_font_options_destroy (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2639187"></a><pre class="programlisting">void cairo_font_options_destroy (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> -Destroys a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object created with with -<a href="cairo-Font-Options.html#cairo-font-options-create"><code class="function">cairo_font_options_create()</code></a> or <a href="cairo-Font-Options.html#cairo-font-options-copy"><code class="function">cairo_font_options_copy()</code></a>.</p> +Destroys a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object created with with +<a class="link" href="cairo-Font-Options.html#cairo-font-options-create"><code class="function">cairo_font_options_create()</code></a> or <a class="link" href="cairo-Font-Options.html#cairo-font-options-copy"><code class="function">cairo_font_options_copy()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2610173"></a><h3> +<a name="id2639266"></a><h3> <a name="cairo-font-options-status"></a>cairo_font_options_status ()</h3> -<a class="indexterm" name="id2610185"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_options_status (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2639278"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_options_status (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Checks whether an error has previously occurred for this font options object</p> @@ -207,13 +207,13 @@ font options object</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> </td> </tr> </tbody> @@ -221,10 +221,10 @@ font options object</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2610270"></a><h3> +<a name="id2639363"></a><h3> <a name="cairo-font-options-merge"></a>cairo_font_options_merge ()</h3> -<a class="indexterm" name="id2610281"></a><pre class="programlisting">void cairo_font_options_merge (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other);</pre> +<a class="indexterm" name="id2652175"></a><pre class="programlisting">void cairo_font_options_merge (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other);</pre> <p> Merges non-default options from <em class="parameter"><code>other</code></em> into <em class="parameter"><code>options</code></em>, replacing existing values. This operation can be thought of as somewhat @@ -237,13 +237,13 @@ of <code class="literal">CAIRO_OPERATION_OVER</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>other</code></em> :</span></td> -<td> another <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td> +<td> another <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> </tbody> @@ -251,9 +251,9 @@ of <code class="literal">CAIRO_OPERATION_OVER</code>.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2634807"></a><h3> +<a name="id2652281"></a><h3> <a name="cairo-font-options-hash"></a>cairo_font_options_hash ()</h3> -<a class="indexterm" name="id2634818"></a><pre class="programlisting">unsigned long cairo_font_options_hash (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2652292"></a><pre class="programlisting">unsigned long cairo_font_options_hash (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Compute a hash for the font options object; this value will be useful when storing an object containing a cairo_font_options_t @@ -265,12 +265,12 @@ in a hash table.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the hash value for the font options object. The return value can be cast to a 32-bit type if a 32-bit hash value is needed. @@ -281,10 +281,10 @@ in a hash table.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2634884"></a><h3> +<a name="id2652358"></a><h3> <a name="cairo-font-options-equal"></a>cairo_font_options_equal ()</h3> -<a class="indexterm" name="id2634896"></a><pre class="programlisting"><a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_font_options_equal (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other);</pre> +<a class="indexterm" name="id2652369"></a><pre class="programlisting"><a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_font_options_equal (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *other);</pre> <p> Compares two font options objects for equality.</p> <p> @@ -294,17 +294,17 @@ Compares two font options objects for equality.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>other</code></em> :</span></td> -<td> another <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td> +<td> another <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> <code class="literal">TRUE</code> if all fields of the two font options objects match </td> </tr> @@ -313,10 +313,10 @@ Compares two font options objects for equality.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635000"></a><h3> +<a name="id2652474"></a><h3> <a name="cairo-font-options-set-antialias"></a>cairo_font_options_set_antialias ()</h3> -<a class="indexterm" name="id2635013"></a><pre class="programlisting">void cairo_font_options_set_antialias (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias);</pre> +<a class="indexterm" name="id2652487"></a><pre class="programlisting">void cairo_font_options_set_antialias (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias);</pre> <p> Sets the antialiasing mode for the font options object. This specifies the type of antialiasing to do when rendering text.</p> @@ -327,12 +327,12 @@ specifies the type of antialiasing to do when rendering text.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>antialias</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>antialias</code></em> :</span></p></td> <td> the new antialiasing mode </td> </tr> @@ -341,9 +341,9 @@ specifies the type of antialiasing to do when rendering text.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635093"></a><h3> +<a name="id2652566"></a><h3> <a name="cairo-font-options-get-antialias"></a>cairo_font_options_get_antialias ()</h3> -<a class="indexterm" name="id2635106"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> cairo_font_options_get_antialias (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2652580"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> cairo_font_options_get_antialias (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Gets the antialiasing mode for the font options object.</p> <p> @@ -353,12 +353,12 @@ Gets the antialiasing mode for the font options object.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the antialiasing mode </td> </tr> @@ -367,9 +367,9 @@ Gets the antialiasing mode for the font options object.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635173"></a><h3> +<a name="id2652647"></a><h3> <a name="cairo-subpixel-order-t"></a>enum cairo_subpixel_order_t</h3> -<a class="indexterm" name="id2635185"></a><pre class="programlisting">typedef enum _cairo_subpixel_order { +<a class="indexterm" name="id2652658"></a><pre class="programlisting">typedef enum _cairo_subpixel_order { CAIRO_SUBPIXEL_ORDER_DEFAULT, CAIRO_SUBPIXEL_ORDER_RGB, CAIRO_SUBPIXEL_ORDER_BGR, @@ -380,7 +380,7 @@ Gets the antialiasing mode for the font options object.</p> <p> The subpixel order specifies the order of color elements within each pixel on the display device when rendering with an -antialiasing mode of <a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a>.</p> +antialiasing mode of <a class="link" href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a>.</p> <p> </p> @@ -388,31 +388,31 @@ antialiasing mode of <a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-DEFAULT:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_DEFAULT</code></span></td> +<td><p><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-DEFAULT:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_DEFAULT</code></span></p></td> <td> Use the default subpixel order for for the target device </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-RGB:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_RGB</code></span></td> +<td><p><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-RGB:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_RGB</code></span></p></td> <td> Subpixel elements are arranged horizontally with red at the left </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-BGR:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_BGR</code></span></td> +<td><p><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-BGR:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_BGR</code></span></p></td> <td> Subpixel elements are arranged horizontally with blue at the left </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-VRGB:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_VRGB</code></span></td> +<td><p><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-VRGB:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_VRGB</code></span></p></td> <td> Subpixel elements are arranged vertically with red at the top </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-VBGR:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_VBGR</code></span></td> +<td><p><span class="term"><a name="CAIRO-SUBPIXEL-ORDER-VBGR:CAPS"></a><code class="literal">CAIRO_SUBPIXEL_ORDER_VBGR</code></span></p></td> <td> Subpixel elements are arranged vertically with blue at the top </td> @@ -422,17 +422,17 @@ antialiasing mode of <a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635318"></a><h3> +<a name="id2652814"></a><h3> <a name="cairo-font-options-set-subpixel-order"></a>cairo_font_options_set_subpixel_order ()</h3> -<a class="indexterm" name="id2635331"></a><pre class="programlisting">void cairo_font_options_set_subpixel_order - (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> subpixel_order);</pre> +<a class="indexterm" name="id2652827"></a><pre class="programlisting">void cairo_font_options_set_subpixel_order + (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> subpixel_order);</pre> <p> Sets the subpixel order for the font options object. The subpixel order specifies the order of color elements within each pixel on the display device when rendering with an antialiasing mode of -<a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a>. See the documentation for -<a href="cairo-Font-Options.html#cairo-subpixel-order-t"><span class="type">cairo_subpixel_order_t</span></a> for full details.</p> +<a class="link" href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a>. See the documentation for +<a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t"><span class="type">cairo_subpixel_order_t</span></a> for full details.</p> <p> </p> @@ -440,12 +440,12 @@ the display device when rendering with an antialiasing mode of <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>subpixel_order</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>subpixel_order</code></em> :</span></p></td> <td> the new subpixel order </td> </tr> @@ -454,13 +454,13 @@ the display device when rendering with an antialiasing mode of </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635421"></a><h3> +<a name="id2652924"></a><h3> <a name="cairo-font-options-get-subpixel-order"></a>cairo_font_options_get_subpixel_order ()</h3> -<a class="indexterm" name="id2635434"></a><pre class="programlisting"><a href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> cairo_font_options_get_subpixel_order - (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2652938"></a><pre class="programlisting"><a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t">cairo_subpixel_order_t</a> cairo_font_options_get_subpixel_order + (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Gets the subpixel order for the font options object. -See the documentation for <a href="cairo-Font-Options.html#cairo-subpixel-order-t"><span class="type">cairo_subpixel_order_t</span></a> for full details.</p> +See the documentation for <a class="link" href="cairo-Font-Options.html#cairo-subpixel-order-t"><span class="type">cairo_subpixel_order_t</span></a> for full details.</p> <p> </p> @@ -468,12 +468,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-subpixel-order- <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the subpixel order for the font options object </td> </tr> @@ -482,9 +482,9 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-subpixel-order- </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635504"></a><h3> +<a name="id2652998"></a><h3> <a name="cairo-hint-style-t"></a>enum cairo_hint_style_t</h3> -<a class="indexterm" name="id2635514"></a><pre class="programlisting">typedef enum _cairo_hint_style { +<a class="indexterm" name="id2653008"></a><pre class="programlisting">typedef enum _cairo_hint_style { CAIRO_HINT_STYLE_DEFAULT, CAIRO_HINT_STYLE_NONE, CAIRO_HINT_STYLE_SLIGHT, @@ -509,32 +509,32 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-HINT-STYLE-DEFAULT:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_DEFAULT</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-STYLE-DEFAULT:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_DEFAULT</code></span></p></td> <td> Use the default hint style for font backend and target device </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-STYLE-NONE:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_NONE</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-STYLE-NONE:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_NONE</code></span></p></td> <td> Do not hint outlines </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-STYLE-SLIGHT:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_SLIGHT</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-STYLE-SLIGHT:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_SLIGHT</code></span></p></td> <td> Hint outlines slightly to improve contrast while retaining good fidelity to the original shapes. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-STYLE-MEDIUM:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_MEDIUM</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-STYLE-MEDIUM:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_MEDIUM</code></span></p></td> <td> Hint outlines with medium strength giving a compromise between fidelity to the original shapes and contrast </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-STYLE-FULL:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_FULL</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-STYLE-FULL:CAPS"></a><code class="literal">CAIRO_HINT_STYLE_FULL</code></span></p></td> <td> Hint outlines to maximize contrast </td> </tr> @@ -543,15 +543,15 @@ New entries may be added in future versions.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635653"></a><h3> +<a name="id2653147"></a><h3> <a name="cairo-font-options-set-hint-style"></a>cairo_font_options_set_hint_style ()</h3> -<a class="indexterm" name="id2635666"></a><pre class="programlisting">void cairo_font_options_set_hint_style (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> hint_style);</pre> +<a class="indexterm" name="id2653160"></a><pre class="programlisting">void cairo_font_options_set_hint_style (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> hint_style);</pre> <p> Sets the hint style for font outlines for the font options object. This controls whether to fit font outlines to the pixel grid, and if so, whether to optimize for fidelity or contrast. -See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t"><span class="type">cairo_hint_style_t</span></a> for full details.</p> +See the documentation for <a class="link" href="cairo-Font-Options.html#cairo-hint-style-t"><span class="type">cairo_hint_style_t</span></a> for full details.</p> <p> </p> @@ -559,12 +559,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t">< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>hint_style</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>hint_style</code></em> :</span></p></td> <td> the new hint style </td> </tr> @@ -573,12 +573,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635745"></a><h3> +<a name="id2653239"></a><h3> <a name="cairo-font-options-get-hint-style"></a>cairo_font_options_get_hint_style ()</h3> -<a class="indexterm" name="id2635758"></a><pre class="programlisting"><a href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> cairo_font_options_get_hint_style (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2653252"></a><pre class="programlisting"><a class="link" href="cairo-Font-Options.html#cairo-hint-style-t">cairo_hint_style_t</a> cairo_font_options_get_hint_style (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Gets the hint style for font outlines for the font options object. -See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t"><span class="type">cairo_hint_style_t</span></a> for full details.</p> +See the documentation for <a class="link" href="cairo-Font-Options.html#cairo-hint-style-t"><span class="type">cairo_hint_style_t</span></a> for full details.</p> <p> </p> @@ -586,12 +586,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t">< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the hint style for the font options object </td> </tr> @@ -600,9 +600,9 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-style-t">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635827"></a><h3> +<a name="id2653321"></a><h3> <a name="cairo-hint-metrics-t"></a>enum cairo_hint_metrics_t</h3> -<a class="indexterm" name="id2635838"></a><pre class="programlisting">typedef enum _cairo_hint_metrics { +<a class="indexterm" name="id2653331"></a><pre class="programlisting">typedef enum _cairo_hint_metrics { CAIRO_HINT_METRICS_DEFAULT, CAIRO_HINT_METRICS_OFF, CAIRO_HINT_METRICS_ON @@ -621,18 +621,18 @@ will be laid out differently at different zoom factors.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-HINT-METRICS-DEFAULT:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_DEFAULT</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-METRICS-DEFAULT:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_DEFAULT</code></span></p></td> <td> Hint metrics in the default manner for the font backend and target device </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-METRICS-OFF:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_OFF</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-METRICS-OFF:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_OFF</code></span></p></td> <td> Do not hint font metrics </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-HINT-METRICS-ON:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_ON</code></span></td> +<td><p><span class="term"><a name="CAIRO-HINT-METRICS-ON:CAPS"></a><code class="literal">CAIRO_HINT_METRICS_ON</code></span></p></td> <td> Hint font metrics </td> </tr> @@ -641,15 +641,15 @@ will be laid out differently at different zoom factors.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2635926"></a><h3> +<a name="id2653420"></a><h3> <a name="cairo-font-options-set-hint-metrics"></a>cairo_font_options_set_hint_metrics ()</h3> -<a class="indexterm" name="id2635938"></a><pre class="programlisting">void cairo_font_options_set_hint_metrics (<a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, - <a href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> hint_metrics);</pre> +<a class="indexterm" name="id2653432"></a><pre class="programlisting">void cairo_font_options_set_hint_metrics (<a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, + <a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> hint_metrics);</pre> <p> Sets the metrics hinting mode for the font options object. This controls whether metrics are quantized to integer values in device units. -See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t"><span class="type">cairo_hint_metrics_t</span></a> for full details.</p> +See the documentation for <a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t"><span class="type">cairo_hint_metrics_t</span></a> for full details.</p> <p> </p> @@ -657,12 +657,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>hint_metrics</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>hint_metrics</code></em> :</span></p></td> <td> the new metrics hinting mode </td> </tr> @@ -671,13 +671,13 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t" </div> <hr> <div class="refsect2" lang="en"> -<a name="id2636018"></a><h3> +<a name="id2653511"></a><h3> <a name="cairo-font-options-get-hint-metrics"></a>cairo_font_options_get_hint_metrics ()</h3> -<a class="indexterm" name="id2636031"></a><pre class="programlisting"><a href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> cairo_font_options_get_hint_metrics - (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2653525"></a><pre class="programlisting"><a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t">cairo_hint_metrics_t</a> cairo_font_options_get_hint_metrics + (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Gets the metrics hinting mode for the font options object. -See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t"><span class="type">cairo_hint_metrics_t</span></a> for full details.</p> +See the documentation for <a class="link" href="cairo-Font-Options.html#cairo-hint-metrics-t"><span class="type">cairo_hint_metrics_t</span></a> for full details.</p> <p> </p> @@ -685,12 +685,12 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the metrics hinting mode for the font options object </td> </tr> @@ -698,6 +698,11 @@ See the documentation for <a href="cairo-Font-Options.html#cairo-hint-metrics-t" </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2653595"></a><div class="refsect2" lang="en"><a name="id2653596"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2653597"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-FreeType-Fonts.html b/doc/public/html/cairo-FreeType-Fonts.html index 12ee476..fc943e7 100644 --- a/doc/public/html/cairo-FreeType-Fonts.html +++ b/doc/public/html/cairo-FreeType-Fonts.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>FreeType Fonts</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Fonts.html" title="Fonts"> <link rel="prev" href="cairo-Font-Options.html" title="Font Options"> <link rel="next" href="cairo-Win32-Fonts.html" title="Win32 Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Win32-Fonts.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2607542" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2597033" class="shortcut">Top</a>  |  - <a href="#id2631471" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2651708" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-FreeType-Fonts"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2607542"></a><span class="refentrytitle">FreeType Fonts</span> +<a name="id2597033"></a><span class="refentrytitle">FreeType Fonts</span> </h2> <p>FreeType Fonts — Font support for FreeType</p> </td> @@ -51,36 +51,36 @@ -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face">cairo_ft_font_face_create_for_ft_face</a> +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face">cairo_ft_font_face_create_for_ft_face</a> (FT_Face face, int load_flags); -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern">cairo_ft_font_face_create_for_pattern</a> +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern">cairo_ft_font_face_create_for_pattern</a> (FcPattern *pattern); -void <a href="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute">cairo_ft_font_options_substitute</a> (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, +void <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute">cairo_ft_font_options_substitute</a> (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, FcPattern *pattern); -FT_Face <a href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face">cairo_ft_scaled_font_lock_face</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -void <a href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-unlock-face">cairo_ft_scaled_font_unlock_face</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +FT_Face <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face">cairo_ft_scaled_font_lock_face</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +void <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-unlock-face">cairo_ft_scaled_font_unlock_face</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2631471"></a><h2>Description</h2> +<a name="id2651708"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2631486"></a><h2>Details</h2> +<a name="id2651724"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2631497"></a><h3> +<a name="id2651735"></a><h3> <a name="cairo-ft-font-face-create-for-ft-face"></a>cairo_ft_font_face_create_for_ft_face ()</h3> -<a class="indexterm" name="id2631509"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_ft_font_face_create_for_ft_face +<a class="indexterm" name="id2651747"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_ft_font_face_create_for_ft_face (FT_Face face, int load_flags);</pre> <p> Creates a new font face for the FreeType font backend from a pre-opened FreeType face. This font can then be used with -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. The -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> returned from <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. The +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> returned from <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the FreeType backend and can be used with functions such as <code class="function">cairo_ft_font_lock_face()</code>.</p> <p> @@ -90,30 +90,30 @@ as <code class="function">cairo_ft_font_lock_face()</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>face</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>face</code></em> :</span></p></td> <td> A FreeType face object, already opened. This must be kept around until the face's ref_count drops to zero and it is freed. Since the face may be referenced internally to Cairo, the best way to determine when it is safe to free the face is to pass a - <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> to <a href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"><code class="function">cairo_font_face_set_user_data()</code></a> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> to <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"><code class="function">cairo_font_face_set_user_data()</code></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>load_flags</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>load_flags</code></em> :</span></p></td> <td> flags to pass to FT_Load_Glyph when loading glyphs from the font. These flags are OR'ed together with - the flags derived from the <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> passed - to <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>, so only a few values such + the flags derived from the <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> passed + to <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>, so only a few values such as <code class="literal">FT_LOAD_VERTICAL_LAYOUT</code>, and <code class="literal">FT_LOAD_FORCE_AUTOHINT</code> are useful. You should not pass any of the flags affecting the load target, such as <code class="literal">FT_LOAD_TARGET_LIGHT</code>. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly created <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with - <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly created <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. </td> </tr> </tbody> @@ -121,24 +121,24 @@ as <code class="function">cairo_ft_font_lock_face()</code>.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2631127"></a><h3> +<a name="id2649300"></a><h3> <a name="cairo-ft-font-face-create-for-pattern"></a>cairo_ft_font_face_create_for_pattern ()</h3> -<a class="indexterm" name="id2631140"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_ft_font_face_create_for_pattern +<a class="indexterm" name="id2649313"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_ft_font_face_create_for_pattern (FcPattern *pattern);</pre> <p> Creates a new font face for the FreeType font backend based on a fontconfig pattern. This font can then be used with -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. The -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> returned from <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. The +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> returned from <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the FreeType backend and can be used with functions such as <code class="function">cairo_ft_font_lock_face()</code>. </p> <p> Font rendering options are represented both here and when you -call <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. Font options that have a representation +call <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. Font options that have a representation in a <span class="type">FcPattern</span> must be passed in here; to modify <span class="type">FcPattern</span> -appropriately to reflect the options in a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>, call -<a href="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute"><code class="function">cairo_ft_font_options_substitute()</code></a>.</p> +appropriately to reflect the options in a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a>, call +<a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute"><code class="function">cairo_ft_font_options_substitute()</code></a>.</p> <p> </p> @@ -146,7 +146,7 @@ appropriately to reflect the options in a <a href="cairo-Font-Options.html#cairo <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> <td> A fully resolved fontconfig pattern. A pattern can be resolved, by, among other things, calling <code class="function">FcConfigSubstitute()</code>, <code class="function">FcDefaultSubstitute()</code>, then @@ -157,9 +157,9 @@ appropriately to reflect the options in a <a href="cairo-Font-Options.html#cairo </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly created <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with - <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly created <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. </td> </tr> </tbody> @@ -167,12 +167,12 @@ appropriately to reflect the options in a <a href="cairo-Font-Options.html#cairo </div> <hr> <div class="refsect2" lang="en"> -<a name="id2630565"></a><h3> +<a name="id2649532"></a><h3> <a name="cairo-ft-font-options-substitute"></a>cairo_ft_font_options_substitute ()</h3> -<a class="indexterm" name="id2630576"></a><pre class="programlisting">void cairo_ft_font_options_substitute (const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, +<a class="indexterm" name="id2646857"></a><pre class="programlisting">void cairo_ft_font_options_substitute (const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options, FcPattern *pattern);</pre> <p> -Add options to a <span class="type">FcPattern</span> based on a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> font +Add options to a <span class="type">FcPattern</span> based on a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> font options object. Options that are already in the pattern, are not overridden, so you should call this function after calling <code class="function">FcConfigSubstitute()</code> (the user's settings should override options based on the surface type), but @@ -184,12 +184,12 @@ before calling <code class="function">FcDefaultSubstitute()</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> <td> an existing <span class="type">FcPattern</span> </td> </tr> @@ -198,15 +198,15 @@ before calling <code class="function">FcDefaultSubstitute()</code>.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2630697"></a><h3> +<a name="id2646977"></a><h3> <a name="cairo-ft-scaled-font-lock-face"></a>cairo_ft_scaled_font_lock_face ()</h3> -<a class="indexterm" name="id2630710"></a><pre class="programlisting">FT_Face cairo_ft_scaled_font_lock_face (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2646988"></a><pre class="programlisting">FT_Face cairo_ft_scaled_font_lock_face (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> <code class="function">cairo_ft_font_lock_face()</code> gets the <span class="type">FT_Face</span> object from a FreeType backend font and scales it appropriately for the font. You must release the face with <code class="function">cairo_ft_font_unlock_face()</code> when you are done using it. Since the <span class="type">FT_Face</span> object can be -shared between multiple <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> objects, you must not +shared between multiple <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> objects, you must not lock any other font objects until you unlock this one. A count is kept of the number of times <code class="function">cairo_ft_font_lock_face()</code> is called. <code class="function">cairo_ft_font_unlock_face()</code> must be called the same number @@ -228,18 +228,18 @@ might result in a call into the freetype library).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> A <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the FreeType font backend. Such an - object can be created by calling <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> on a - FreeType backend font face (see <a href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"><code class="function">cairo_ft_font_face_create_for_pattern()</code></a>, +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> A <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the FreeType font backend. Such an + object can be created by calling <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> on a + FreeType backend font face (see <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"><code class="function">cairo_ft_font_face_create_for_pattern()</code></a>, <code class="function">cairo_ft_font_face_create_for_face()</code>). </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The <span class="type">FT_Face</span> object for <em class="parameter"><code>font</code></em>, scaled appropriately, or <code class="literal">NULL</code> if <em class="parameter"><code>scaled_font</code></em> is in an error state (see -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-status"><code class="function">cairo_scaled_font_status()</code></a>) or there is insufficient memory. +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-status"><code class="function">cairo_scaled_font_status()</code></a>) or there is insufficient memory. </td> </tr> </tbody> @@ -247,27 +247,32 @@ or <code class="literal">NULL</code> if <em class="parameter"><code>scaled_font< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2634289"></a><h3> +<a name="id2576304"></a><h3> <a name="cairo-ft-scaled-font-unlock-face"></a>cairo_ft_scaled_font_unlock_face ()</h3> -<a class="indexterm" name="id2634302"></a><pre class="programlisting">void cairo_ft_scaled_font_unlock_face (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2576316"></a><pre class="programlisting">void cairo_ft_scaled_font_unlock_face (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> -Releases a face obtained with <a href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face"><code class="function">cairo_ft_scaled_font_lock_face()</code></a>.</p> +Releases a face obtained with <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face"><code class="function">cairo_ft_scaled_font_lock_face()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> A <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the FreeType font backend. Such an - object can be created by calling <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> on a - FreeType backend font face (see <a href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"><code class="function">cairo_ft_font_face_create_for_pattern()</code></a>, - <a href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face"><code class="function">cairo_ft_font_face_create_for_ft_face()</code></a>). +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> A <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the FreeType font backend. Such an + object can be created by calling <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> on a + FreeType backend font face (see <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"><code class="function">cairo_ft_font_face_create_for_pattern()</code></a>, + <a class="link" href="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face"><code class="function">cairo_ft_font_face_create_for_ft_face()</code></a>). </td> </tr></tbody> </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2576416"></a><div class="refsect2" lang="en"><a name="id2576417"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2576418"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Image-Surfaces.html b/doc/public/html/cairo-Image-Surfaces.html index fc88f49..79a8e50 100644 --- a/doc/public/html/cairo-Image-Surfaces.html +++ b/doc/public/html/cairo-Image-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Image Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-cairo-surface-t.html" title="cairo_surface_t"> <link rel="next" href="cairo-PDF-Surfaces.html" title="PDF Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-PDF-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2559056" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2607596" class="shortcut">Top</a>  |  - <a href="#id2640007" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2648715" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Image-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2559056"></a><span class="refentrytitle">Image Surfaces</span> +<a name="id2607596"></a><span class="refentrytitle">Image Surfaces</span> </h2> <p>Image Surfaces — Rendering to memory buffers</p> </td> @@ -51,36 +51,36 @@ -enum <a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a>; -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Image-Surfaces.html#cairo-image-surface-create">cairo_image_surface_create</a> (<a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +enum <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a>; +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create">cairo_image_surface_create</a> (<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data">cairo_image_surface_create_for_data</a> (unsigned char *data, - <a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data">cairo_image_surface_create_for_data</a> (unsigned char *data, + <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height, int stride); -unsigned char* <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-data">cairo_image_surface_get_data</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -<a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-format">cairo_image_surface_get_format</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-width">cairo_image_surface_get_width</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-height">cairo_image_surface_get_height</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-stride">cairo_image_surface_get_stride</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +unsigned char* <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-data">cairo_image_surface_get_data</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-format">cairo_image_surface_get_format</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-width">cairo_image_surface_get_width</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-height">cairo_image_surface_get_height</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-stride">cairo_image_surface_get_stride</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2640007"></a><h2>Description</h2> +<a name="id2648715"></a><h2>Description</h2> <p> Image surfaces provide the ability to render to memory buffers either allocated by cairo or by the calling code. The supported - image formats are those defined in <a href="cairo-Image-Surfaces.html#cairo-format-t"><span class="type">cairo_format_t</span></a>. + image formats are those defined in <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t"><span class="type">cairo_format_t</span></a>. </p> </div> <div class="refsect1" lang="en"> -<a name="id2640033"></a><h2>Details</h2> +<a name="id2648741"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2640044"></a><h3> +<a name="id2648751"></a><h3> <a name="cairo-format-t"></a>enum cairo_format_t</h3> -<a class="indexterm" name="id2640056"></a><pre class="programlisting">typedef enum _cairo_format { +<a class="indexterm" name="id2648764"></a><pre class="programlisting">typedef enum _cairo_format { CAIRO_FORMAT_ARGB32, CAIRO_FORMAT_RGB24, CAIRO_FORMAT_A8, @@ -92,7 +92,7 @@ int <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-s } cairo_format_t; </pre> <p> -<a href="cairo-Image-Surfaces.html#cairo-format-t"><span class="type">cairo_format_t</span></a> is used to identify the memory format of +<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t"><span class="type">cairo_format_t</span></a> is used to identify the memory format of image data. </p> <p> @@ -104,7 +104,7 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-FORMAT-ARGB32:CAPS"></a><code class="literal">CAIRO_FORMAT_ARGB32</code></span></td> +<td><p><span class="term"><a name="CAIRO-FORMAT-ARGB32:CAPS"></a><code class="literal">CAIRO_FORMAT_ARGB32</code></span></p></td> <td> each pixel is a 32-bit quantity, with alpha in the upper 8 bits, then red, then green, then blue. The 32-bit quantities are stored native-endian. Pre-multiplied @@ -113,20 +113,20 @@ New entries may be added in future versions.</p> </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FORMAT-RGB24:CAPS"></a><code class="literal">CAIRO_FORMAT_RGB24</code></span></td> +<td><p><span class="term"><a name="CAIRO-FORMAT-RGB24:CAPS"></a><code class="literal">CAIRO_FORMAT_RGB24</code></span></p></td> <td> each pixel is a 32-bit quantity, with the upper 8 bits unused. Red, Green, and Blue are stored in the remaining 24 bits in that order. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FORMAT-A8:CAPS"></a><code class="literal">CAIRO_FORMAT_A8</code></span></td> +<td><p><span class="term"><a name="CAIRO-FORMAT-A8:CAPS"></a><code class="literal">CAIRO_FORMAT_A8</code></span></p></td> <td> each pixel is a 8-bit quantity holding an alpha value. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FORMAT-A1:CAPS"></a><code class="literal">CAIRO_FORMAT_A1</code></span></td> +<td><p><span class="term"><a name="CAIRO-FORMAT-A1:CAPS"></a><code class="literal">CAIRO_FORMAT_A1</code></span></p></td> <td> each pixel is a 1-bit quantity holding an alpha value. Pixels are packed together into 32-bit quantities. The ordering of the bits matches the @@ -140,9 +140,9 @@ New entries may be added in future versions.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2640322"></a><h3> +<a name="id2655841"></a><h3> <a name="cairo-image-surface-create"></a>cairo_image_surface_create ()</h3> -<a class="indexterm" name="id2640333"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create (<a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="indexterm" name="id2655852"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create (<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height);</pre> <p> @@ -158,29 +158,29 @@ but not belonging to the given format are undefined).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>format</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>format</code></em> :</span></p></td> <td> format of pixels in the surface to create </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> width of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> height of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> </tbody> @@ -188,20 +188,20 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2640452"></a><h3> +<a name="id2655972"></a><h3> <a name="cairo-image-surface-create-for-data"></a>cairo_image_surface_create_for_data ()</h3> -<a class="indexterm" name="id2640463"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_for_data (unsigned char *data, - <a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="indexterm" name="id2655985"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_for_data (unsigned char *data, + <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height, int stride);</pre> <p> Creates an image surface for the provided pixel data. The output -buffer must be kept around until the <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> is destroyed -or <a href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> is called on the surface. The initial +buffer must be kept around until the <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> is destroyed +or <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> is called on the surface. The initial contents of <em class="parameter"><code>buffer</code></em> will be used as the initial image contents; you must explicitly clear the buffer, using, for example, -<a href="cairo-Paths.html#cairo-rectangle"><code class="function">cairo_rectangle()</code></a> and <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> if you want it cleared.</p> +<a class="link" href="cairo-Paths.html#cairo-rectangle"><code class="function">cairo_rectangle()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> if you want it cleared.</p> <p> </p> @@ -209,28 +209,28 @@ must explicitly clear the buffer, using, for example, <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> <td> a pointer to a buffer supplied by the application in which to write contents. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>format</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>format</code></em> :</span></p></td> <td> the format of pixels in the buffer </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the width of the image to be stored in the buffer </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the height of the image to be stored in the buffer </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>stride</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>stride</code></em> :</span></p></td> <td> the number of bytes between the start of rows in the buffer. Having this be specified separate from <em class="parameter"><code>width</code></em> allows for padding at the end of rows, or for writing @@ -238,16 +238,16 @@ must explicitly clear the buffer, using, for example, </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. -See <a href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a> for a means of attaching a +See <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-user-data"><code class="function">cairo_surface_set_user_data()</code></a> for a means of attaching a destroy-notification fallback to the surface if necessary. </td> </tr> @@ -256,9 +256,9 @@ destroy-notification fallback to the surface if necessary. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2638481"></a><h3> +<a name="id2657901"></a><h3> <a name="cairo-image-surface-get-data"></a>cairo_image_surface_get_data ()</h3> -<a class="indexterm" name="id2638494"></a><pre class="programlisting">unsigned char* cairo_image_surface_get_data (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2657916"></a><pre class="programlisting">unsigned char* cairo_image_surface_get_data (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get a pointer to the data of the image surface, for direct inspection or modification.</p> @@ -269,12 +269,12 @@ inspection or modification.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_image_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the image data of this surface or NULL if <em class="parameter"><code>surface</code></em> is not an image surface. @@ -287,9 +287,9 @@ if <em class="parameter"><code>surface</code></em> is not an image surface. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2638577"></a><h3> +<a name="id2658000"></a><h3> <a name="cairo-image-surface-get-format"></a>cairo_image_surface_get_format ()</h3> -<a class="indexterm" name="id2636108"></a><pre class="programlisting"><a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> cairo_image_surface_get_format (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2653604"></a><pre class="programlisting"><a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> cairo_image_surface_get_format (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the format of the surface.</p> <p> @@ -299,12 +299,12 @@ Get the format of the surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_image_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the format of the surface </td> @@ -316,9 +316,9 @@ Get the format of the surface.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2636181"></a><h3> +<a name="id2653678"></a><h3> <a name="cairo-image-surface-get-width"></a>cairo_image_surface_get_width ()</h3> -<a class="indexterm" name="id2636195"></a><pre class="programlisting">int cairo_image_surface_get_width (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2653691"></a><pre class="programlisting">int cairo_image_surface_get_width (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the width of the image surface in pixels.</p> <p> @@ -328,12 +328,12 @@ Get the width of the image surface in pixels.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_image_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the width of the surface in pixels. </td> </tr> @@ -342,9 +342,9 @@ Get the width of the image surface in pixels.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2636263"></a><h3> +<a name="id2653759"></a><h3> <a name="cairo-image-surface-get-height"></a>cairo_image_surface_get_height ()</h3> -<a class="indexterm" name="id2636276"></a><pre class="programlisting">int cairo_image_surface_get_height (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2653772"></a><pre class="programlisting">int cairo_image_surface_get_height (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the height of the image surface in pixels.</p> <p> @@ -354,12 +354,12 @@ Get the height of the image surface in pixels.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_image_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the height of the surface in pixels. </td> </tr> @@ -368,9 +368,9 @@ Get the height of the image surface in pixels.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2636344"></a><h3> +<a name="id2653841"></a><h3> <a name="cairo-image-surface-get-stride"></a>cairo_image_surface_get_stride ()</h3> -<a class="indexterm" name="id2636359"></a><pre class="programlisting">int cairo_image_surface_get_stride (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2653857"></a><pre class="programlisting">int cairo_image_surface_get_stride (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the stride of the image surface in bytes</p> <p> @@ -380,12 +380,12 @@ Get the stride of the image surface in bytes</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_image_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the stride of the image surface in bytes (or 0 if <em class="parameter"><code>surface</code></em> is not an image surface). The stride is the distance in bytes from the beginning of one row of the image data to the @@ -399,6 +399,11 @@ beginning of the next row. </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2656543"></a><div class="refsect2" lang="en"><a name="id2656544"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2656545"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-PDF-Surfaces.html b/doc/public/html/cairo-PDF-Surfaces.html index 1b083bf..3b07ab2 100644 --- a/doc/public/html/cairo-PDF-Surfaces.html +++ b/doc/public/html/cairo-PDF-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>PDF Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-Image-Surfaces.html" title="Image Surfaces"> <link rel="next" href="cairo-PNG-Support.html" title="PNG Support"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-PNG-Support.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2595338" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2606267" class="shortcut">Top</a>  |  - <a href="#id2610726" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2596592" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-PDF-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2595338"></a><span class="refentrytitle">PDF Surfaces</span> +<a name="id2606267"></a><span class="refentrytitle">PDF Surfaces</span> </h2> <p>PDF Surfaces — Rendering PDF documents</p> </td> @@ -51,30 +51,30 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PDF-Surfaces.html#cairo-pdf-surface-create">cairo_pdf_surface_create</a> (const char *filename, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-surface-create">cairo_pdf_surface_create</a> (const char *filename, double width_in_points, double height_in_points); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PDF-Surfaces.html#cairo-pdf-surface-create-for-stream">cairo_pdf_surface_create_for_stream</a> (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-surface-create-for-stream">cairo_pdf_surface_create_for_stream</a> (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points); -void <a href="cairo-PDF-Surfaces.html#cairo-pdf-surface-set-size">cairo_pdf_surface_set_size</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-PDF-Surfaces.html#cairo-pdf-surface-set-size">cairo_pdf_surface_set_size</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double width_in_points, double height_in_points); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2610726"></a><h2>Description</h2> +<a name="id2596592"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2640167"></a><h2>Details</h2> +<a name="id2596607"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2640178"></a><h3> +<a name="id2596618"></a><h3> <a name="cairo-pdf-surface-create"></a>cairo_pdf_surface_create ()</h3> -<a class="indexterm" name="id2640191"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_pdf_surface_create (const char *filename, +<a class="indexterm" name="id2596631"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_pdf_surface_create (const char *filename, double width_in_points, double height_in_points);</pre> <p> @@ -87,29 +87,29 @@ to <em class="parameter"><code>filename</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> <td> a filename for the PDF output (must be writable) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -120,9 +120,9 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2638626"></a><h3> +<a name="id2657687"></a><h3> <a name="cairo-pdf-surface-create-for-stream"></a>cairo_pdf_surface_create_for_stream ()</h3> -<a class="indexterm" name="id2638639"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_pdf_surface_create_for_stream (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="indexterm" name="id2657700"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_pdf_surface_create_for_stream (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points);</pre> @@ -136,34 +136,34 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>write_func</code></em> :</span></td> -<td> a <a href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data +<td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> the closure argument for <em class="parameter"><code>write_func</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -174,9 +174,9 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2639157"></a><h3> +<a name="id2656183"></a><h3> <a name="cairo-pdf-surface-set-size"></a>cairo_pdf_surface_set_size ()</h3> -<a class="indexterm" name="id2639171"></a><pre class="programlisting">void cairo_pdf_surface_set_size (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2656196"></a><pre class="programlisting">void cairo_pdf_surface_set_size (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double width_in_points, double height_in_points);</pre> <p> @@ -188,7 +188,7 @@ This function should only be called before any drawing operations have been performed on the current page. The simplest way to do this is to call this function immediately after creating the surface or immediately after completing a page with either -<a href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>.</p> +<a class="link" href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>.</p> <p> </p> @@ -196,17 +196,17 @@ surface or immediately after completing a page with either <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a PDF cairo_surface_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> new surface width, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> new surface height, in points (1 point == 1/72.0 inch) </td> </tr> @@ -216,6 +216,11 @@ surface or immediately after completing a page with either </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2656675"></a><div class="refsect2" lang="en"><a name="id2656676"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2656677"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-PNG-Support.html b/doc/public/html/cairo-PNG-Support.html index 7b90eb7..208d136 100644 --- a/doc/public/html/cairo-PNG-Support.html +++ b/doc/public/html/cairo-PNG-Support.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>PNG Support</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-PDF-Surfaces.html" title="PDF Surfaces"> <link rel="next" href="cairo-PostScript-Surfaces.html" title="PostScript Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-PostScript-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2565470" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2600990" class="shortcut">Top</a>  |  - <a href="#id2636691" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2654175" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-PNG-Support"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2565470"></a><span class="refentrytitle">PNG Support</span> +<a name="id2600990"></a><span class="refentrytitle">PNG Support</span> </h2> <p>PNG Support — Reading and writing PNG images</p> </td> @@ -51,35 +51,35 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PNG-Support.html#cairo-image-surface-create-from-png">cairo_image_surface_create_from_png</a> (const char *filename); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (<a href="cairo-PNG-Support.html#cairo-read-func-t">*cairo_read_func_t</a>) (void *closure, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PNG-Support.html#cairo-image-surface-create-from-png">cairo_image_surface_create_from_png</a> (const char *filename); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (<a class="link" href="cairo-PNG-Support.html#cairo-read-func-t">*cairo_read_func_t</a>) (void *closure, unsigned char *data, unsigned int length); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PNG-Support.html#cairo-image-surface-create-from-png-stream">cairo_image_surface_create_from_png_stream</a> - (<a href="cairo-PNG-Support.html#cairo-read-func-t">cairo_read_func_t</a> read_func, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PNG-Support.html#cairo-image-surface-create-from-png-stream">cairo_image_surface_create_from_png_stream</a> + (<a class="link" href="cairo-PNG-Support.html#cairo-read-func-t">cairo_read_func_t</a> read_func, void *closure); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-PNG-Support.html#cairo-surface-write-to-png">cairo_surface_write_to_png</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-PNG-Support.html#cairo-surface-write-to-png">cairo_surface_write_to_png</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, const char *filename); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (<a href="cairo-PNG-Support.html#cairo-write-func-t">*cairo_write_func_t</a>) (void *closure, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">*cairo_write_func_t</a>) (void *closure, unsigned char *data, unsigned int length); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-PNG-Support.html#cairo-surface-write-to-png-stream">cairo_surface_write_to_png_stream</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-PNG-Support.html#cairo-surface-write-to-png-stream">cairo_surface_write_to_png_stream</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2636691"></a><h2>Description</h2> +<a name="id2654175"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2636706"></a><h2>Details</h2> +<a name="id2654191"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2636717"></a><h3> +<a name="id2654202"></a><h3> <a name="cairo-image-surface-create-from-png"></a>cairo_image_surface_create_from_png ()</h3> -<a class="indexterm" name="id2639326"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_from_png (const char *filename);</pre> +<a class="indexterm" name="id2656704"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_from_png (const char *filename);</pre> <p> Creates a new image surface and initializes the contents to the given PNG file.</p> @@ -90,13 +90,13 @@ given PNG file.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> <td> name of PNG file to load </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a new <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> initialized with the contents +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a new <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> initialized with the contents of the PNG file, or a "nil" surface if any error occurred. A nil surface can be checked for with cairo_surface_status(surface) which may return one of the following values: @@ -111,13 +111,13 @@ CAIRO_STATUS_READ_ERROR </div> <hr> <div class="refsect2" lang="en"> -<a name="id2639400"></a><h3> +<a name="id2656777"></a><h3> <a name="cairo-read-func-t"></a>cairo_read_func_t ()</h3> -<a class="indexterm" name="id2639412"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (*cairo_read_func_t) (void *closure, +<a class="indexterm" name="id2656790"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (*cairo_read_func_t) (void *closure, unsigned char *data, unsigned int length);</pre> <p> -<a href="cairo-PNG-Support.html#cairo-read-func-t"><span class="type">cairo_read_func_t</span></a> is the type of function which is called when a +<a class="link" href="cairo-PNG-Support.html#cairo-read-func-t"><span class="type">cairo_read_func_t</span></a> is the type of function which is called when a backend needs to read data from an intput stream. It is passed the closure which was specified by the user at the time the read function was registered, the buffer to read the data into and the @@ -131,22 +131,22 @@ CAIRO_STATUS_READ_ERROR otherwise.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> the input closure </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> <td> the buffer into which to read the data </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>length</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td> <td> the amount of data to read </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the status code of the read operation </td> </tr> @@ -155,10 +155,10 @@ CAIRO_STATUS_READ_ERROR otherwise.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2639527"></a><h3> +<a name="id2656905"></a><h3> <a name="cairo-image-surface-create-from-png-stream"></a>cairo_image_surface_create_from_png_stream ()</h3> -<a class="indexterm" name="id2639539"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_from_png_stream - (<a href="cairo-PNG-Support.html#cairo-read-func-t">cairo_read_func_t</a> read_func, +<a class="indexterm" name="id2656917"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_image_surface_create_from_png_stream + (<a class="link" href="cairo-PNG-Support.html#cairo-read-func-t">cairo_read_func_t</a> read_func, void *closure);</pre> <p> Creates a new image surface from PNG data read incrementally @@ -170,18 +170,18 @@ via the <em class="parameter"><code>read_func</code></em> function.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>read_func</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>read_func</code></em> :</span></p></td> <td> function called to read the data of the file </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> data to pass to <em class="parameter"><code>read_func</code></em>. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a new <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> initialized with the contents +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a new <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> initialized with the contents of the PNG file or <code class="literal">NULL</code> if the data read is not a valid PNG image or memory could not be allocated for the operation. </td> @@ -191,9 +191,9 @@ memory could not be allocated for the operation. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2639655"></a><h3> +<a name="id2657033"></a><h3> <a name="cairo-surface-write-to-png"></a>cairo_surface_write_to_png ()</h3> -<a class="indexterm" name="id2639666"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_write_to_png (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2657044"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_write_to_png (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, const char *filename);</pre> <p> Writes the contents of <em class="parameter"><code>surface</code></em> to a new file <em class="parameter"><code>filename</code></em> as a PNG @@ -205,17 +205,17 @@ image.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> with pixel contents +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> with pixel contents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> <td> the name of a file to write to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> CAIRO_STATUS_SUCCESS if the PNG file was written successfully. Otherwise, CAIRO_STATUS_NO_MEMORY if memory could not be allocated for the operation or @@ -229,13 +229,13 @@ while attempting to write the file. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2636973"></a><h3> +<a name="id2654460"></a><h3> <a name="cairo-write-func-t"></a>cairo_write_func_t ()</h3> -<a class="indexterm" name="id2636985"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (*cairo_write_func_t) (void *closure, +<a class="indexterm" name="id2654472"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> (*cairo_write_func_t) (void *closure, unsigned char *data, unsigned int length);</pre> <p> -<a href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> is the type of function which is called when a +<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> is the type of function which is called when a backend needs to write data to an output stream. It is passed the closure which was specified by the user at the time the write function was registered, the data to write and the length of the @@ -249,22 +249,22 @@ CAIRO_STATUS_WRITE_ERROR otherwise.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> the output closure </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> <td> the buffer containing the data to write </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>length</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>length</code></em> :</span></p></td> <td> the amount of data to write </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the status code of the write operation </td> </tr> @@ -273,10 +273,10 @@ CAIRO_STATUS_WRITE_ERROR otherwise.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2637100"></a><h3> +<a name="id2654588"></a><h3> <a name="cairo-surface-write-to-png-stream"></a>cairo_surface_write_to_png_stream ()</h3> -<a class="indexterm" name="id2637112"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_write_to_png_stream (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="indexterm" name="id2654600"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_write_to_png_stream (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure);</pre> <p> Writes the image surface to the write function.</p> @@ -287,22 +287,22 @@ Writes the image surface to the write function.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> with pixel contents +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> with pixel contents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>write_func</code></em> :</span></td> -<td> a <a href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> +<td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> closure data for the write function </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> CAIRO_STATUS_SUCCESS if the PNG file was written successfully. Otherwise, CAIRO_STATUS_NO_MEMORY is returned if memory could not be allocated for the operation, @@ -314,6 +314,11 @@ pixel contents. </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2654724"></a><div class="refsect2" lang="en"><a name="id2654725"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2654726"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Paths.html b/doc/public/html/cairo-Paths.html index 535067f..7ed1fc4 100644 --- a/doc/public/html/cairo-Paths.html +++ b/doc/public/html/cairo-Paths.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Paths</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Drawing.html" title="Drawing"> <link rel="prev" href="cairo-cairo-t.html" title="cairo_t"> <link rel="next" href="cairo-Patterns.html" title="Patterns"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Patterns.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589767" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2601740" class="shortcut">Top</a>  |  - <a href="#id2607245" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2624667" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Paths"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2589767"></a><span class="refentrytitle">Paths</span> +<a name="id2601740"></a><span class="refentrytitle">Paths</span> </h2> <p>Paths — Creating paths and manipulating path data</p> </td> @@ -51,82 +51,82 @@ - <a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>; -union <a href="cairo-Paths.html#cairo-path-data-t">cairo_path_data_t</a>; -enum <a href="cairo-Paths.html#cairo-path-data-type-t">cairo_path_data_type_t</a>; -<a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* <a href="cairo-Paths.html#cairo-copy-path">cairo_copy_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -<a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* <a href="cairo-Paths.html#cairo-copy-path-flat">cairo_copy_path_flat</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Paths.html#cairo-path-destroy">cairo_path_destroy</a> (<a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path); -void <a href="cairo-Paths.html#cairo-append-path">cairo_append_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path); -void <a href="cairo-Paths.html#cairo-get-current-point">cairo_get_current_point</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>; +union <a class="link" href="cairo-Paths.html#cairo-path-data-t">cairo_path_data_t</a>; +enum <a class="link" href="cairo-Paths.html#cairo-path-data-type-t">cairo_path_data_type_t</a>; +<a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* <a class="link" href="cairo-Paths.html#cairo-copy-path">cairo_copy_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +<a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* <a class="link" href="cairo-Paths.html#cairo-copy-path-flat">cairo_copy_path_flat</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Paths.html#cairo-path-destroy">cairo_path_destroy</a> (<a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path); +void <a class="link" href="cairo-Paths.html#cairo-append-path">cairo_append_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path); +void <a class="link" href="cairo-Paths.html#cairo-get-current-point">cairo_get_current_point</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y); -void <a href="cairo-Paths.html#cairo-new-path">cairo_new_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Paths.html#cairo-new-sub-path">cairo_new_sub_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Paths.html#cairo-close-path">cairo_close_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Paths.html#cairo-arc">cairo_arc</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-new-path">cairo_new_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Paths.html#cairo-new-sub-path">cairo_new_sub_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Paths.html#cairo-close-path">cairo_close_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Paths.html#cairo-arc">cairo_arc</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double xc, double yc, double radius, double angle1, double angle2); -void <a href="cairo-Paths.html#cairo-arc-negative">cairo_arc_negative</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-arc-negative">cairo_arc_negative</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double xc, double yc, double radius, double angle1, double angle2); -void <a href="cairo-Paths.html#cairo-curve-to">cairo_curve_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-curve-to">cairo_curve_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x1, double y1, double x2, double y2, double x3, double y3); -void <a href="cairo-Paths.html#cairo-line-to">cairo_line_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-line-to">cairo_line_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y); -void <a href="cairo-Paths.html#cairo-move-to">cairo_move_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-move-to">cairo_move_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y); -void <a href="cairo-Paths.html#cairo-rectangle">cairo_rectangle</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-rectangle">cairo_rectangle</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y, double width, double height); -void <a href="cairo-Paths.html#cairo-glyph-path">cairo_glyph_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +void <a class="link" href="cairo-Paths.html#cairo-glyph-path">cairo_glyph_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs); -void <a href="cairo-Paths.html#cairo-text-path">cairo_text_path</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-text-path">cairo_text_path</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8); -void <a href="cairo-Paths.html#cairo-rel-curve-to">cairo_rel_curve_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-rel-curve-to">cairo_rel_curve_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx1, double dy1, double dx2, double dy2, double dx3, double dy3); -void <a href="cairo-Paths.html#cairo-rel-line-to">cairo_rel_line_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-rel-line-to">cairo_rel_line_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx, double dy); -void <a href="cairo-Paths.html#cairo-rel-move-to">cairo_rel_move_to</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Paths.html#cairo-rel-move-to">cairo_rel_move_to</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx, double dy); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2607245"></a><h2>Description</h2> +<a name="id2624667"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2607261"></a><h2>Details</h2> +<a name="id2624683"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2607272"></a><h3> +<a name="id2624694"></a><h3> <a name="cairo-path-t"></a>cairo_path_t</h3> -<a class="indexterm" name="id2607284"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2624706"></a><pre class="programlisting">typedef struct { cairo_status_t status; cairo_path_data_t *data; int num_data; @@ -134,18 +134,18 @@ void <a href="cairo-Paths.html#cairo-rel-move-to">cairo_rel_move_ </pre> <p> A data structure for holding a path. This data structure serves as -the return value for <a href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> and -<a href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a> as well the input value for -<a href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a>. +the return value for <a class="link" href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> and +<a class="link" href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a> as well the input value for +<a class="link" href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a>. </p> <p> -See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on how to iterate over the +See <a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on how to iterate over the actual data within the path. </p> <p> The num_data member gives the number of elements in the data array. This number is larger than the number of independent path -portions (defined in <a href="cairo-Paths.html#cairo-path-data-type-t"><span class="type">cairo_path_data_type_t</span></a>), since the data +portions (defined in <a class="link" href="cairo-Paths.html#cairo-path-data-type-t"><span class="type">cairo_path_data_type_t</span></a>), since the data includes both headers and coordinates for each portion.</p> <p> @@ -154,17 +154,17 @@ includes both headers and coordinates for each portion.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <em class="structfield"><code>status</code></em>;</span></td> +<td><p><span class="term"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <em class="structfield"><code>status</code></em>;</span></p></td> <td> the current error status </td> </tr> <tr> -<td><span class="term"><a href="cairo-Paths.html#cairo-path-data-t">cairo_path_data_t</a> *<em class="structfield"><code>data</code></em>;</span></td> +<td><p><span class="term"><a class="link" href="cairo-Paths.html#cairo-path-data-t">cairo_path_data_t</a> *<em class="structfield"><code>data</code></em>;</span></p></td> <td> the elements in the path </td> </tr> <tr> -<td><span class="term">int <em class="structfield"><code>num_data</code></em>;</span></td> +<td><p><span class="term">int <em class="structfield"><code>num_data</code></em>;</span></p></td> <td> the number of elements in the data array </td> </tr> @@ -173,9 +173,9 @@ includes both headers and coordinates for each portion.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2607426"></a><h3> +<a name="id2624848"></a><h3> <a name="cairo-path-data-t"></a>union cairo_path_data_t</h3> -<a class="indexterm" name="id2607439"></a><pre class="programlisting">union cairo_path_data_t { +<a class="indexterm" name="id2624861"></a><pre class="programlisting">union cairo_path_data_t { struct { cairo_path_data_type_t type; int length; @@ -186,13 +186,13 @@ includes both headers and coordinates for each portion.</p> }; </pre> <p> -<a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> is used to represent the path data inside a -<a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. +<a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> is used to represent the path data inside a +<a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. </p> <p> The data structure is designed to try to balance the demands of efficiency and ease-of-use. A path is represented as an array of -<a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a>, which is a union of headers and points. +<a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a>, which is a union of headers and points. </p> <p> Each portion of the path is represented by one or more elements in @@ -213,11 +213,11 @@ where the number of points for each element type is as follows: </p> <p> The semantics and ordering of the coordinate values are consistent -with <a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>, <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, <a href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>, and -<a href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a>. +with <a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>, and +<a class="link" href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a>. </p> <p> -Here is sample code for iterating through a <span class="type">cairo_path_t:</span> +Here is sample code for iterating through a <span class="type">""</span> </p> <p> </p> @@ -265,9 +265,9 @@ elements for each element type.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2609327"></a><h3> +<a name="id2626694"></a><h3> <a name="cairo-path-data-type-t"></a>enum cairo_path_data_type_t</h3> -<a class="indexterm" name="id2609338"></a><pre class="programlisting">typedef enum _cairo_path_data_type { +<a class="indexterm" name="id2626705"></a><pre class="programlisting">typedef enum _cairo_path_data_type { CAIRO_PATH_MOVE_TO, CAIRO_PATH_LINE_TO, CAIRO_PATH_CURVE_TO, @@ -275,9 +275,9 @@ elements for each element type.</p> } cairo_path_data_type_t; </pre> <p> -<a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> is used to describe the type of one portion -of a path when represented as a <a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. -See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for details.</p> +<a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> is used to describe the type of one portion +of a path when represented as a <a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. +See <a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for details.</p> <p> </p> @@ -285,22 +285,22 @@ See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_d <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-PATH-MOVE-TO:CAPS"></a><code class="literal">CAIRO_PATH_MOVE_TO</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATH-MOVE-TO:CAPS"></a><code class="literal">CAIRO_PATH_MOVE_TO</code></span></p></td> <td> A move-to operation </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATH-LINE-TO:CAPS"></a><code class="literal">CAIRO_PATH_LINE_TO</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATH-LINE-TO:CAPS"></a><code class="literal">CAIRO_PATH_LINE_TO</code></span></p></td> <td> A line-to operation </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATH-CURVE-TO:CAPS"></a><code class="literal">CAIRO_PATH_CURVE_TO</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATH-CURVE-TO:CAPS"></a><code class="literal">CAIRO_PATH_CURVE_TO</code></span></p></td> <td> A curve-to operation </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATH-CLOSE-PATH:CAPS"></a><code class="literal">CAIRO_PATH_CLOSE_PATH</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATH-CLOSE-PATH:CAPS"></a><code class="literal">CAIRO_PATH_CLOSE_PATH</code></span></p></td> <td> A close-path operation </td> </tr> @@ -309,12 +309,12 @@ See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_d </div> <hr> <div class="refsect2" lang="en"> -<a name="id2609471"></a><h3> +<a name="id2626837"></a><h3> <a name="cairo-copy-path"></a>cairo_copy_path ()</h3> -<a class="indexterm" name="id2609483"></a><pre class="programlisting"><a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* cairo_copy_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2626850"></a><pre class="programlisting"><a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* cairo_copy_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Creates a copy of the current path and returns it to the user as a -<a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on how to iterate +<a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. See <a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on how to iterate over the returned data structure. </p> <p> @@ -328,16 +328,16 @@ conditions hold: <div class="orderedlist"><ol type="1"> <li>If there is insufficient memory to copy the path. In this case <code class="literal">path->status</code> will be set to - <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>.</li> + <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>.</li> <li>If <em class="parameter"><code>cr</code></em> is already in an error state. In this case <code class="literal">path->status</code> will contain the same status that - would be returned by <a href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>.</li> + would be returned by <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>.</li> </ol></div> <p> </p> <p> In either case, <code class="literal">path->status</code> will be set to -<a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> (regardless of what the error status in +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> (regardless of what the error status in <em class="parameter"><code>cr</code></em> might have been).</p> <p> @@ -346,14 +346,14 @@ In either case, <code class="literal">path->status</code> will be set to <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the copy of the current path. The caller owns the -returned object and should call <a href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> when finished +returned object and should call <a class="link" href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> when finished with it. </td> </tr> @@ -362,21 +362,21 @@ with it. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561006"></a><h3> +<a name="id2578373"></a><h3> <a name="cairo-copy-path-flat"></a>cairo_copy_path_flat ()</h3> -<a class="indexterm" name="id2561018"></a><pre class="programlisting"><a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* cairo_copy_path_flat (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2578384"></a><pre class="programlisting"><a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a>* cairo_copy_path_flat (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets a flattened copy of the current path and returns it to the -user as a <a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. See <a href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on +user as a <a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a>. See <a class="link" href="cairo-Paths.html#cairo-path-data-t"><span class="type">cairo_path_data_t</span></a> for hints on how to iterate over the returned data structure. </p> <p> -This function is like <a href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> except that any curves +This function is like <a class="link" href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> except that any curves in the path will be approximated with piecewise-linear approximations, (accurate to within the current tolerance value). That is, the result is guaranteed to not have any elements -of type <a href="cairo-Paths.html#CAIRO-PATH-CURVE-TO:CAPS"><code class="literal">CAIRO_PATH_CURVE_TO</code></a> which will instead be replaced by a -series of <a href="cairo-Paths.html#CAIRO-PATH-LINE-TO:CAPS"><code class="literal">CAIRO_PATH_LINE_TO</code></a> elements. +of type <a class="link" href="cairo-Paths.html#CAIRO-PATH-CURVE-TO:CAPS"><code class="literal">CAIRO_PATH_CURVE_TO</code></a> which will instead be replaced by a +series of <a class="link" href="cairo-Paths.html#CAIRO-PATH-LINE-TO:CAPS"><code class="literal">CAIRO_PATH_LINE_TO</code></a> elements. </p> <p> This function will always return a valid pointer, but the result @@ -389,10 +389,10 @@ conditions hold: <div class="orderedlist"><ol type="1"> <li>If there is insufficient memory to copy the path. In this case <code class="literal">path->status</code> will be set to - <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>.</li> + <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>.</li> <li>If <em class="parameter"><code>cr</code></em> is already in an error state. In this case <code class="literal">path->status</code> will contain the same status that - would be returned by <a href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>.</li> + would be returned by <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a>.</li> </ol></div> <p> @@ -401,14 +401,14 @@ conditions hold: <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the copy of the current path. The caller owns the -returned object and should call <a href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> when finished +returned object and should call <a class="link" href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> when finished with it. </td> </tr> @@ -417,17 +417,17 @@ with it. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561215"></a><h3> +<a name="id2578582"></a><h3> <a name="cairo-path-destroy"></a>cairo_path_destroy ()</h3> -<a class="indexterm" name="id2561228"></a><pre class="programlisting">void cairo_path_destroy (<a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path);</pre> +<a class="indexterm" name="id2578594"></a><pre class="programlisting">void cairo_path_destroy (<a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path);</pre> <p> Immediately releases all memory associated with <em class="parameter"><code>path</code></em>. After a call -to <a href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> the <em class="parameter"><code>path</code></em> pointer is no longer valid and +to <a class="link" href="cairo-Paths.html#cairo-path-destroy"><code class="function">cairo_path_destroy()</code></a> the <em class="parameter"><code>path</code></em> pointer is no longer valid and should not be used further. </p> <p> NOTE: cairo_path_destroy function should only be called with a -pointer to a <a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> returned by a cairo function. Any path +pointer to a <a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> returned by a cairo function. Any path that is created manually (ie. outside of cairo) should be destroyed manually as well.</p> <p> @@ -436,26 +436,26 @@ manually as well.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>path</code></em> :</span></td> -<td> a path previously returned by either <a href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> or -<a href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a>. +<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td> +<td> a path previously returned by either <a class="link" href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> or +<a class="link" href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a>. </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561333"></a><h3> +<a name="id2578699"></a><h3> <a name="cairo-append-path"></a>cairo_append_path ()</h3> -<a class="indexterm" name="id2561345"></a><pre class="programlisting">void cairo_append_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path);</pre> +<a class="indexterm" name="id2578711"></a><pre class="programlisting">void cairo_append_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Paths.html#cairo-path-t">cairo_path_t</a> *path);</pre> <p> Append the <em class="parameter"><code>path</code></em> onto the current path. The <em class="parameter"><code>path</code></em> may be either the -return value from one of <a href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> or -<a href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a> or it may be constructed manually. See -<a href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> for details on how the path data structure should be +return value from one of <a class="link" href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> or +<a class="link" href="cairo-Paths.html#cairo-copy-path-flat"><code class="function">cairo_copy_path_flat()</code></a> or it may be constructed manually. See +<a class="link" href="cairo-Paths.html#cairo-path-t"><span class="type">cairo_path_t</span></a> for details on how the path data structure should be initialized, and note that <code class="literal">path->status</code> must be -initialized to <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>.</p> +initialized to <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>.</p> <p> </p> @@ -463,12 +463,12 @@ initialized to <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><co <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>path</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>path</code></em> :</span></p></td> <td> path to be appended </td> </tr> @@ -477,9 +477,9 @@ initialized to <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><co </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561470"></a><h3> +<a name="id2578836"></a><h3> <a name="cairo-get-current-point"></a>cairo_get_current_point ()</h3> -<a class="indexterm" name="id2561481"></a><pre class="programlisting">void cairo_get_current_point (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2578847"></a><pre class="programlisting">void cairo_get_current_point (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y);</pre> <p> @@ -494,21 +494,21 @@ both be set to 0.0. <p> Most path construction functions alter the current point. See the following for details on how they affect the current point: -<a href="cairo-Paths.html#cairo-new-path"><code class="function">cairo_new_path()</code></a>, <a href="cairo-Paths.html#cairo-new-sub-path"><code class="function">cairo_new_sub_path()</code></a>, -<a href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a>, <a href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a>, -<a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>, <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, <a href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>, -<a href="cairo-Paths.html#cairo-rel-move-to"><code class="function">cairo_rel_move_to()</code></a>, <a href="cairo-Paths.html#cairo-rel-line-to"><code class="function">cairo_rel_line_to()</code></a>, <a href="cairo-Paths.html#cairo-rel-curve-to"><code class="function">cairo_rel_curve_to()</code></a>, -<a href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a>, <a href="cairo-Paths.html#cairo-arc-negative"><code class="function">cairo_arc_negative()</code></a>, <a href="cairo-Paths.html#cairo-rectangle"><code class="function">cairo_rectangle()</code></a>, -<a href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a>, <a href="cairo-Paths.html#cairo-glyph-path"><code class="function">cairo_glyph_path()</code></a>, <code class="function">cairo_stroke_to_path()</code> +<a class="link" href="cairo-Paths.html#cairo-new-path"><code class="function">cairo_new_path()</code></a>, <a class="link" href="cairo-Paths.html#cairo-new-sub-path"><code class="function">cairo_new_sub_path()</code></a>, +<a class="link" href="cairo-Paths.html#cairo-append-path"><code class="function">cairo_append_path()</code></a>, <a class="link" href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a>, +<a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>, +<a class="link" href="cairo-Paths.html#cairo-rel-move-to"><code class="function">cairo_rel_move_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-rel-line-to"><code class="function">cairo_rel_line_to()</code></a>, <a class="link" href="cairo-Paths.html#cairo-rel-curve-to"><code class="function">cairo_rel_curve_to()</code></a>, +<a class="link" href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a>, <a class="link" href="cairo-Paths.html#cairo-arc-negative"><code class="function">cairo_arc_negative()</code></a>, <a class="link" href="cairo-Paths.html#cairo-rectangle"><code class="function">cairo_rectangle()</code></a>, +<a class="link" href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a>, <a class="link" href="cairo-Paths.html#cairo-glyph-path"><code class="function">cairo_glyph_path()</code></a>, <code class="function">cairo_stroke_to_path()</code> </p> <p> Some functions use and alter the current point but do not otherwise change current path: -<a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>, <a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>. +<a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>, <a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>. </p> <p> Some functions unset the current path and as a result, current point: -<a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>.</p> +<a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>.</p> <p> </p> @@ -516,17 +516,17 @@ Some functions unset the current path and as a result, current point: <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> return value for X coordinate of the current point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> return value for Y coordinate of the current point </td> </tr> @@ -535,9 +535,9 @@ Some functions unset the current path and as a result, current point: </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561799"></a><h3> +<a name="id2579165"></a><h3> <a name="cairo-new-path"></a>cairo_new_path ()</h3> -<a class="indexterm" name="id2561811"></a><pre class="programlisting">void cairo_new_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2579178"></a><pre class="programlisting">void cairo_new_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Clears the current path. After this call there will be no path and no current point.</p> @@ -547,7 +547,7 @@ no current point.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -555,30 +555,30 @@ no current point.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561862"></a><h3> +<a name="id2579229"></a><h3> <a name="cairo-new-sub-path"></a>cairo_new_sub_path ()</h3> -<a class="indexterm" name="id2561877"></a><pre class="programlisting">void cairo_new_sub_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2579244"></a><pre class="programlisting">void cairo_new_sub_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Begin a new sub-path. Note that the existing path is not affected. After this call there will be no current point. </p> <p> In many cases, this call is not needed since new sub-paths are -frequently started with <a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>. +frequently started with <a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>. </p> <p> -A call to <a href="cairo-Paths.html#cairo-new-sub-path"><code class="function">cairo_new_sub_path()</code></a> is particularly useful when -beginning a new sub-path with one of the <a href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a> calls. This +A call to <a class="link" href="cairo-Paths.html#cairo-new-sub-path"><code class="function">cairo_new_sub_path()</code></a> is particularly useful when +beginning a new sub-path with one of the <a class="link" href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a> calls. This makes things easier as it is no longer necessary to manually compute the arc's initial coordinates for a call to -<a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>.</p> +<a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -588,18 +588,18 @@ compute the arc's initial coordinates for a call to </div> <hr> <div class="refsect2" lang="en"> -<a name="id2561985"></a><h3> +<a name="id2579352"></a><h3> <a name="cairo-close-path"></a>cairo_close_path ()</h3> -<a class="indexterm" name="id2561998"></a><pre class="programlisting">void cairo_close_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2579364"></a><pre class="programlisting">void cairo_close_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Adds a line segment to the path from the current point to the beginning of the current sub-path, (the most recent point passed to -<a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>), and closes this sub-path. After this call the +<a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>), and closes this sub-path. After this call the current point will be at the joined endpoint of the sub-path. </p> <p> -The behavior of <a href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a> is distinct from simply calling -<a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> with the equivalent coordinate in the case of +The behavior of <a class="link" href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a> is distinct from simply calling +<a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> with the equivalent coordinate in the case of stroking. When a closed sub-path is stroked, there are no caps on the ends of the sub-path. Instead, there is a line join connecting the final and initial segments of the sub-path. @@ -611,7 +611,7 @@ this function will have no effect. <p> Note: As of cairo version 1.2.4 any call to cairo_close_path will place an explicit MOVE_TO element into the path immediately after -the CLOSE_PATH element, (which can be seen in <a href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> for +the CLOSE_PATH element, (which can be seen in <a class="link" href="cairo-Paths.html#cairo-copy-path"><code class="function">cairo_copy_path()</code></a> for example). This can simplify path processing in some cases as it may not be necessary to save the "last move_to point" during processing as the MOVE_TO immediately after the CLOSE_PATH will provide that @@ -622,7 +622,7 @@ point.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -630,9 +630,9 @@ point.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2562112"></a><h3> +<a name="id2579479"></a><h3> <a name="cairo-arc"></a>cairo_arc ()</h3> -<a class="indexterm" name="id2562124"></a><pre class="programlisting">void cairo_arc (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2579491"></a><pre class="programlisting">void cairo_arc (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double xc, double yc, double radius, @@ -664,7 +664,7 @@ matrix, angles increase in a clockwise direction. </p> <p> This function gives the arc in the direction of increasing angles; -see <a href="cairo-Paths.html#cairo-arc-negative"><code class="function">cairo_arc_negative()</code></a> to get the arc in the direction of +see <a class="link" href="cairo-Paths.html#cairo-arc-negative"><code class="function">cairo_arc_negative()</code></a> to get the arc in the direction of decreasing angles. </p> <p> @@ -689,32 +689,32 @@ cairo_restore (cr); <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>xc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>xc</code></em> :</span></p></td> <td> X position of the center of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>yc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>yc</code></em> :</span></p></td> <td> Y position of the center of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radius</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radius</code></em> :</span></p></td> <td> the radius of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>angle1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>angle1</code></em> :</span></p></td> <td> the start angle, in radians </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>angle2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>angle2</code></em> :</span></p></td> <td> the end angle, in radians </td> </tr> @@ -723,9 +723,9 @@ cairo_restore (cr); </div> <hr> <div class="refsect2" lang="en"> -<a name="id2562422"></a><h3> +<a name="id2579789"></a><h3> <a name="cairo-arc-negative"></a>cairo_arc_negative ()</h3> -<a class="indexterm" name="id2562435"></a><pre class="programlisting">void cairo_arc_negative (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2579801"></a><pre class="programlisting">void cairo_arc_negative (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double xc, double yc, double radius, @@ -739,7 +739,7 @@ greater than <em class="parameter"><code>angle1</code></em> it will be progressi until it is less than <em class="parameter"><code>angle1</code></em>. </p> <p> -See <a href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a> for more details. This function differs only in the +See <a class="link" href="cairo-Paths.html#cairo-arc"><code class="function">cairo_arc()</code></a> for more details. This function differs only in the direction of the arc between the two angles.</p> <p> @@ -748,32 +748,32 @@ direction of the arc between the two angles.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>xc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>xc</code></em> :</span></p></td> <td> X position of the center of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>yc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>yc</code></em> :</span></p></td> <td> Y position of the center of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radius</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radius</code></em> :</span></p></td> <td> the radius of the arc </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>angle1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>angle1</code></em> :</span></p></td> <td> the start angle, in radians </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>angle2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>angle2</code></em> :</span></p></td> <td> the end angle, in radians </td> </tr> @@ -782,9 +782,9 @@ direction of the arc between the two angles.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2562654"></a><h3> +<a name="id2580020"></a><h3> <a name="cairo-curve-to"></a>cairo_curve_to ()</h3> -<a class="indexterm" name="id2562666"></a><pre class="programlisting">void cairo_curve_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2580033"></a><pre class="programlisting">void cairo_curve_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x1, double y1, double x2, @@ -798,7 +798,7 @@ position (<em class="parameter"><code>x3</code></em>, <em class="parameter"><cod will be (<em class="parameter"><code>x3</code></em>, <em class="parameter"><code>y3</code></em>). </p> <p> -If there is no current point before the call to <a href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a> +If there is no current point before the call to <a class="link" href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a> this function will behave as if preceded by a call to cairo_move_to (<em class="parameter"><code>cr</code></em>, <em class="parameter"><code>x1</code></em>, <em class="parameter"><code>y1</code></em>).</p> <p> @@ -808,37 +808,37 @@ cairo_move_to (<em class="parameter"><code>cr</code></em>, <em class="parameter" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> the X coordinate of the first control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> the Y coordinate of the first control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x2</code></em> :</span></p></td> <td> the X coordinate of the second control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y2</code></em> :</span></p></td> <td> the Y coordinate of the second control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x3</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x3</code></em> :</span></p></td> <td> the X coordinate of the end of the curve </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y3</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y3</code></em> :</span></p></td> <td> the Y coordinate of the end of the curve </td> </tr> @@ -847,9 +847,9 @@ cairo_move_to (<em class="parameter"><code>cr</code></em>, <em class="parameter" </div> <hr> <div class="refsect2" lang="en"> -<a name="id2562929"></a><h3> +<a name="id2580295"></a><h3> <a name="cairo-line-to"></a>cairo_line_to ()</h3> -<a class="indexterm" name="id2562941"></a><pre class="programlisting">void cairo_line_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2580308"></a><pre class="programlisting">void cairo_line_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y);</pre> <p> @@ -858,7 +858,7 @@ in user-space coordinates. After this call the current point will be (<em class="parameter"><code>x</code></em>, <em class="parameter"><code>y</code></em>). </p> <p> -If there is no current point before the call to <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> +If there is no current point before the call to <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> this function will behave as cairo_move_to (<em class="parameter"><code>cr</code></em>, <em class="parameter"><code>x</code></em>, <em class="parameter"><code>y</code></em>).</p> <p> @@ -867,17 +867,17 @@ this function will behave as cairo_move_to (<em class="parameter"><code>cr</code <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> the X coordinate of the end of the new line </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> the Y coordinate of the end of the new line </td> </tr> @@ -886,9 +886,9 @@ this function will behave as cairo_move_to (<em class="parameter"><code>cr</code </div> <hr> <div class="refsect2" lang="en"> -<a name="id2563094"></a><h3> +<a name="id2580460"></a><h3> <a name="cairo-move-to"></a>cairo_move_to ()</h3> -<a class="indexterm" name="id2563106"></a><pre class="programlisting">void cairo_move_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2580472"></a><pre class="programlisting">void cairo_move_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y);</pre> <p> @@ -901,17 +901,17 @@ Begin a new sub-path. After this call the current point will be (<em class="para <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> the X coordinate of the new position </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> the Y coordinate of the new position </td> </tr> @@ -920,9 +920,9 @@ Begin a new sub-path. After this call the current point will be (<em class="para </div> <hr> <div class="refsect2" lang="en"> -<a name="id2563212"></a><h3> +<a name="id2580577"></a><h3> <a name="cairo-rectangle"></a>cairo_rectangle ()</h3> -<a class="indexterm" name="id2563224"></a><pre class="programlisting">void cairo_rectangle (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2580590"></a><pre class="programlisting">void cairo_rectangle (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y, double width, @@ -948,27 +948,27 @@ cairo_close_path (cr); <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> the X coordinate of the top left corner of the rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> the Y coordinate to the top left corner of the rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the width of the rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the height of the rectangle </td> </tr> @@ -977,15 +977,15 @@ cairo_close_path (cr); </div> <hr> <div class="refsect2" lang="en"> -<a name="id2563386"></a><h3> +<a name="id2580751"></a><h3> <a name="cairo-glyph-path"></a>cairo_glyph_path ()</h3> -<a class="indexterm" name="id2563398"></a><pre class="programlisting">void cairo_glyph_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +<a class="indexterm" name="id2580764"></a><pre class="programlisting">void cairo_glyph_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs);</pre> <p> Adds closed paths for the glyphs to the current path. The generated path if filled, achieves an effect similar to that of -<a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>.</p> +<a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>.</p> <p> </p> @@ -993,17 +993,17 @@ path if filled, achieves an effect similar to that of <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td> <td> array of glyphs to show </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></p></td> <td> number of glyphs to show </td> </tr> @@ -1012,31 +1012,31 @@ path if filled, achieves an effect similar to that of </div> <hr> <div class="refsect2" lang="en"> -<a name="id2563502"></a><h3> +<a name="id2580868"></a><h3> <a name="cairo-text-path"></a>cairo_text_path ()</h3> -<a class="indexterm" name="id2563514"></a><pre class="programlisting">void cairo_text_path (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2580880"></a><pre class="programlisting">void cairo_text_path (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8);</pre> <p> Adds closed paths for text to the current path. The generated path if filled, achieves an effect similar to that of -<a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. +<a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. </p> <p> -Text conversion and positioning is done similar to <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. +Text conversion and positioning is done similar to <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. </p> <p> -Like <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>, After this call the current point is +Like <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>, After this call the current point is moved to the origin of where the next glyph would be placed in this same progression. That is, the current point will be at the origin of the final glyph offset by its advance values. -This allows for chaining multiple calls to to <a href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a> +This allows for chaining multiple calls to to <a class="link" href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a> without having to set current point in between. </p> <p> -NOTE: The <a href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a> function call is part of what the cairo +NOTE: The <a class="link" href="cairo-Paths.html#cairo-text-path"><code class="function">cairo_text_path()</code></a> function call is part of what the cairo designers call the "toy" text API. It is convenient for short demos and simple programs, but it is not expected to be adequate for -serious text-using applications. See <a href="cairo-Paths.html#cairo-glyph-path"><code class="function">cairo_glyph_path()</code></a> for the +serious text-using applications. See <a class="link" href="cairo-Paths.html#cairo-glyph-path"><code class="function">cairo_glyph_path()</code></a> for the "real" text path API in cairo.</p> <p> @@ -1045,12 +1045,12 @@ serious text-using applications. See <a href="cairo-Paths.html#cairo-glyph-path" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>utf8</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> <td> a string of text encoded in UTF-8 </td> </tr> @@ -1059,9 +1059,9 @@ serious text-using applications. See <a href="cairo-Paths.html#cairo-glyph-path" </div> <hr> <div class="refsect2" lang="en"> -<a name="id2563666"></a><h3> +<a name="id2581031"></a><h3> <a name="cairo-rel-curve-to"></a>cairo_rel_curve_to ()</h3> -<a class="indexterm" name="id2563678"></a><pre class="programlisting">void cairo_rel_curve_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2581044"></a><pre class="programlisting">void cairo_rel_curve_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx1, double dy1, double dx2, @@ -1069,7 +1069,7 @@ serious text-using applications. See <a href="cairo-Paths.html#cairo-glyph-path" double dx3, double dy3);</pre> <p> -Relative-coordinate version of <a href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>. All offsets are +Relative-coordinate version of <a class="link" href="cairo-Paths.html#cairo-curve-to"><code class="function">cairo_curve_to()</code></a>. All offsets are relative to the current point. Adds a cubic Bézier spline to the path from the current point to a point offset from the current point by (<em class="parameter"><code>dx3</code></em>, <em class="parameter"><code>dy3</code></em>), using points offset by (<em class="parameter"><code>dx1</code></em>, <em class="parameter"><code>dy1</code></em>) and @@ -1093,37 +1093,37 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx1</code></em> :</span></p></td> <td> the X offset to the first control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy1</code></em> :</span></p></td> <td> the Y offset to the first control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx2</code></em> :</span></p></td> <td> the X offset to the second control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy2</code></em> :</span></p></td> <td> the Y offset to the second control point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx3</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx3</code></em> :</span></p></td> <td> the X offset to the end of the curve </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy3</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy3</code></em> :</span></p></td> <td> the Y offset to the end of the curve </td> </tr> @@ -1132,13 +1132,13 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2564020"></a><h3> +<a name="id2581386"></a><h3> <a name="cairo-rel-line-to"></a>cairo_rel_line_to ()</h3> -<a class="indexterm" name="id2564032"></a><pre class="programlisting">void cairo_rel_line_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2581398"></a><pre class="programlisting">void cairo_rel_line_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx, double dy);</pre> <p> -Relative-coordinate version of <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>. Adds a line to the +Relative-coordinate version of <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>. Adds a line to the path from the current point to a point that is offset from the current point by (<em class="parameter"><code>dx</code></em>, <em class="parameter"><code>dy</code></em>) in user space. After this call the current point will be offset by (<em class="parameter"><code>dx</code></em>, <em class="parameter"><code>dy</code></em>). @@ -1158,17 +1158,17 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td> <td> the X offset to the end of the new line </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td> <td> the Y offset to the end of the new line </td> </tr> @@ -1177,9 +1177,9 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2564215"></a><h3> +<a name="id2581581"></a><h3> <a name="cairo-rel-move-to"></a>cairo_rel_move_to ()</h3> -<a class="indexterm" name="id2564227"></a><pre class="programlisting">void cairo_rel_move_to (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2581593"></a><pre class="programlisting">void cairo_rel_move_to (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double dx, double dy);</pre> <p> @@ -1201,17 +1201,17 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td> <td> the X offset </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td> <td> the Y offset </td> </tr> @@ -1219,6 +1219,11 @@ CAIRO_STATUS_NO_CURRENT_POINT.</p> </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2581753"></a><div class="refsect2" lang="en"><a name="id2581754"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2581755"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Patterns.html b/doc/public/html/cairo-Patterns.html index 703cc73..900bca1 100644 --- a/doc/public/html/cairo-Patterns.html +++ b/doc/public/html/cairo-Patterns.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Patterns</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Drawing.html" title="Drawing"> <link rel="prev" href="cairo-Paths.html" title="Paths"> <link rel="next" href="cairo-Transformations.html" title="Transformations"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Transformations.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2581342" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2620270" class="shortcut">Top</a>  |  - <a href="#id2623080" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2640516" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Patterns"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2581342"></a><span class="refentrytitle">Patterns</span> +<a name="id2620270"></a><span class="refentrytitle">Patterns</span> </h2> <p>Patterns — Gradients and filtered sources</p> </td> @@ -51,131 +51,131 @@ -typedef <a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>; -void <a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb">cairo_pattern_add_color_stop_rgb</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +typedef <a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>; +void <a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb">cairo_pattern_add_color_stop_rgb</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double offset, double red, double green, double blue); -void <a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba">cairo_pattern_add_color_stop_rgba</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +void <a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba">cairo_pattern_add_color_stop_rgba</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double offset, double red, double green, double blue, double alpha); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-color-stop-count">cairo_pattern_get_color_stop_count</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-color-stop-count">cairo_pattern_get_color_stop_count</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, int *count); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-color-stop-rgba">cairo_pattern_get_color_stop_rgba</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-color-stop-rgba">cairo_pattern_get_color_stop_rgba</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, int index, double *offset, double *red, double *green, double *blue, double *alpha); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-create-rgb">cairo_pattern_create_rgb</a> (double red, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-create-rgb">cairo_pattern_create_rgb</a> (double red, double green, double blue); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-create-rgba">cairo_pattern_create_rgba</a> (double red, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-create-rgba">cairo_pattern_create_rgba</a> (double red, double green, double blue, double alpha); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-rgba">cairo_pattern_get_rgba</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-rgba">cairo_pattern_get_rgba</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *red, double *green, double *blue, double *alpha); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-create-for-surface">cairo_pattern_create_for_surface</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-surface">cairo_pattern_get_surface</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> **surface); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-create-linear">cairo_pattern_create_linear</a> (double x0, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-create-for-surface">cairo_pattern_create_for_surface</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-surface">cairo_pattern_get_surface</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> **surface); +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-create-linear">cairo_pattern_create_linear</a> (double x0, double y0, double x1, double y1); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-linear-points">cairo_pattern_get_linear_points</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-linear-points">cairo_pattern_get_linear_points</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *x0, double *y0, double *x1, double *y1); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-create-radial">cairo_pattern_create_radial</a> (double cx0, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-create-radial">cairo_pattern_create_radial</a> (double cx0, double cy0, double radius0, double cx1, double cy1, double radius1); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-radial-circles">cairo_pattern_get_radial_circles</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-radial-circles">cairo_pattern_get_radial_circles</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *x0, double *y0, double *r0, double *x1, double *y1, double *r1); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-Patterns.html#cairo-pattern-reference">cairo_pattern_reference</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -void <a href="cairo-Patterns.html#cairo-pattern-destroy">cairo_pattern_destroy</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-status">cairo_pattern_status</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -enum <a href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a>; -void <a href="cairo-Patterns.html#cairo-pattern-set-extend">cairo_pattern_set_extend</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> extend); -<a href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-extend">cairo_pattern_get_extend</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -enum <a href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a>; -void <a href="cairo-Patterns.html#cairo-pattern-set-filter">cairo_pattern_set_filter</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> filter); -<a href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-filter">cairo_pattern_get_filter</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -void <a href="cairo-Patterns.html#cairo-pattern-set-matrix">cairo_pattern_set_matrix</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Patterns.html#cairo-pattern-get-matrix">cairo_pattern_get_matrix</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -enum <a href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a>; -<a href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a> <a href="cairo-Patterns.html#cairo-pattern-get-type">cairo_pattern_get_type</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -unsigned int <a href="cairo-Patterns.html#cairo-pattern-get-reference-count">cairo_pattern_get_reference_count</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Patterns.html#cairo-pattern-set-user-data">cairo_pattern_set_user_data</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-Patterns.html#cairo-pattern-reference">cairo_pattern_reference</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +void <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy">cairo_pattern_destroy</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-status">cairo_pattern_status</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +enum <a class="link" href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a>; +void <a class="link" href="cairo-Patterns.html#cairo-pattern-set-extend">cairo_pattern_set_extend</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> extend); +<a class="link" href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-extend">cairo_pattern_get_extend</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +enum <a class="link" href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a>; +void <a class="link" href="cairo-Patterns.html#cairo-pattern-set-filter">cairo_pattern_set_filter</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> filter); +<a class="link" href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-filter">cairo_pattern_get_filter</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +void <a class="link" href="cairo-Patterns.html#cairo-pattern-set-matrix">cairo_pattern_set_matrix</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Patterns.html#cairo-pattern-get-matrix">cairo_pattern_get_matrix</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +enum <a class="link" href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a>; +<a class="link" href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-get-type">cairo_pattern_get_type</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +unsigned int <a class="link" href="cairo-Patterns.html#cairo-pattern-get-reference-count">cairo_pattern_get_reference_count</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Patterns.html#cairo-pattern-set-user-data">cairo_pattern_set_user_data</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); -void* <a href="cairo-Patterns.html#cairo-pattern-get-user-data">cairo_pattern_get_user_data</a> (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); +void* <a class="link" href="cairo-Patterns.html#cairo-pattern-get-user-data">cairo_pattern_get_user_data</a> (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2623080"></a><h2>Description</h2> +<a name="id2640516"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2623094"></a><h2>Details</h2> +<a name="id2640530"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2623103"></a><h3> +<a name="id2640539"></a><h3> <a name="cairo-pattern-t"></a>cairo_pattern_t</h3> -<a class="indexterm" name="id2623114"></a><pre class="programlisting">typedef struct _cairo_pattern cairo_pattern_t; +<a class="indexterm" name="id2640549"></a><pre class="programlisting">typedef struct _cairo_pattern cairo_pattern_t; </pre> <p> -A <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> represents a source when drawing onto a -surface. There are different subtypes of <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a>, +A <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> represents a source when drawing onto a +surface. There are different subtypes of <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a>, for different types of sources; for example, -<a href="cairo-Patterns.html#cairo-pattern-create-rgb"><code class="function">cairo_pattern_create_rgb()</code></a> creates a pattern for a solid +<a class="link" href="cairo-Patterns.html#cairo-pattern-create-rgb"><code class="function">cairo_pattern_create_rgb()</code></a> creates a pattern for a solid opaque color. </p> <p> Other than various cairo_pattern_create_<span class="emphasis"><em>type</em></span> functions, some of the pattern types can be implicitly created using vairous cairo_set_source_<span class="emphasis"><em>type</em></span> functions; -for example <a href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a>. +for example <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a>. </p> <p> -The type of a pattern can be queried with <a href="cairo-Patterns.html#cairo-pattern-get-type"><code class="function">cairo_pattern_get_type()</code></a>. +The type of a pattern can be queried with <a class="link" href="cairo-Patterns.html#cairo-pattern-get-type"><code class="function">cairo_pattern_get_type()</code></a>. </p> <p> -Memory management of <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> is done with -<a href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a> and <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a>.</p> +Memory management of <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> is done with +<a class="link" href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a> and <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a>.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2623213"></a><h3> +<a name="id2640648"></a><h3> <a name="cairo-pattern-add-color-stop-rgb"></a>cairo_pattern_add_color_stop_rgb ()</h3> -<a class="indexterm" name="id2623226"></a><pre class="programlisting">void cairo_pattern_add_color_stop_rgb (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2640662"></a><pre class="programlisting">void cairo_pattern_add_color_stop_rgb (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double offset, double red, double green, @@ -188,7 +188,7 @@ example, a linear gradient's control vector is from (x0,y0) to on the start circle to the corresponding point on the end circle. </p> <p> -The color is specified in the same way as in <a href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a>. +The color is specified in the same way as in <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgb"><code class="function">cairo_set_source_rgb()</code></a>. </p> <p> If two (or more) stops are specified with identical offset values, @@ -200,7 +200,7 @@ transitions instead of the typical blend. <p> Note: If the pattern is not a gradient pattern, (eg. a linear or radial pattern), then the pattern will be put into an error status -with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>.</p> +with a status of <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>.</p> <p> </p> @@ -208,27 +208,27 @@ with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MI <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> <td> an offset in the range [0.0 .. 1.0] </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of color </td> </tr> @@ -237,9 +237,9 @@ with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MI </div> <hr> <div class="refsect2" lang="en"> -<a name="id2623411"></a><h3> +<a name="id2640846"></a><h3> <a name="cairo-pattern-add-color-stop-rgba"></a>cairo_pattern_add_color_stop_rgba ()</h3> -<a class="indexterm" name="id2623425"></a><pre class="programlisting">void cairo_pattern_add_color_stop_rgba (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2640860"></a><pre class="programlisting">void cairo_pattern_add_color_stop_rgba (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double offset, double red, double green, @@ -253,7 +253,7 @@ example, a linear gradient's control vector is from (x0,y0) to on the start circle to the corresponding point on the end circle. </p> <p> -The color is specified in the same way as in <a href="cairo-cairo-t.html#cairo-set-source-rgba"><code class="function">cairo_set_source_rgba()</code></a>. +The color is specified in the same way as in <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgba"><code class="function">cairo_set_source_rgba()</code></a>. </p> <p> If two (or more) stops are specified with identical offset values, @@ -265,7 +265,7 @@ transitions instead of the typical blend. <p> Note: If the pattern is not a gradient pattern, (eg. a linear or radial pattern), then the pattern will be put into an error status -with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>.</p> +with a status of <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>.</p> <p> </p> @@ -273,32 +273,32 @@ with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MI <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> <td> an offset in the range [0.0 .. 1.0] </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> alpha component of color </td> </tr> @@ -307,9 +307,9 @@ with a status of <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MI </div> <hr> <div class="refsect2" lang="en"> -<a name="id2623599"></a><h3> +<a name="id2641038"></a><h3> <a name="cairo-pattern-get-color-stop-count"></a>cairo_pattern_get_color_stop_count ()</h3> -<a class="indexterm" name="id2623614"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_color_stop_count (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2641053"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_color_stop_count (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, int *count);</pre> <p> Gets the number of color stops specified in the given gradient @@ -321,19 +321,19 @@ pattern.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>count</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>count</code></em> :</span></p></td> <td> return value for the number of color stops, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a gradient +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a gradient pattern. </td> @@ -345,9 +345,9 @@ pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2623733"></a><h3> +<a name="id2641173"></a><h3> <a name="cairo-pattern-get-color-stop-rgba"></a>cairo_pattern_get_color_stop_rgba ()</h3> -<a class="indexterm" name="id2623749"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_color_stop_rgba (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2641188"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_color_stop_rgba (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, int index, double *offset, double *red, @@ -357,7 +357,7 @@ pattern. <p> Gets the color and offset information at the given <em class="parameter"><code>index</code></em> for a gradient pattern. Values of <em class="parameter"><code>index</code></em> are 0 to 1 less than the number -returned by <a href="cairo-Patterns.html#cairo-pattern-get-color-stop-count"><code class="function">cairo_pattern_get_color_stop_count()</code></a>.</p> +returned by <a class="link" href="cairo-Patterns.html#cairo-pattern-get-color-stop-count"><code class="function">cairo_pattern_get_color_stop_count()</code></a>.</p> <p> </p> @@ -365,45 +365,45 @@ returned by <a href="cairo-Patterns.html#cairo-pattern-get-color-stop-count"><co <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>index</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>index</code></em> :</span></p></td> <td> index of the stop to return data for </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> <td> return value for the offset of the stop, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> return value for red component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> return value for green component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> return value for blue component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> return value for alpha component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or <a href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-INDEX:CAPS"><code class="literal">CAIRO_STATUS_INVALID_INDEX</code></a> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-INDEX:CAPS"><code class="literal">CAIRO_STATUS_INVALID_INDEX</code></a> if <em class="parameter"><code>index</code></em> is not valid for the given pattern. If the pattern is -not a gradient pattern, <a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> is +not a gradient pattern, <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> is returned. </td> @@ -415,9 +415,9 @@ returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624032"></a><h3> +<a name="id2641472"></a><h3> <a name="cairo-pattern-create-rgb"></a>cairo_pattern_create_rgb ()</h3> -<a class="indexterm" name="id2624043"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_rgb (double red, +<a class="indexterm" name="id2641482"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_rgb (double red, double green, double blue);</pre> <p> @@ -432,30 +432,30 @@ clamped.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of the color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of the color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of the color </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the newly created <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the newly created <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or an error pattern in case of no memory. The caller owns the -returned object and should call <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when +returned object and should call <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. This function will always return a valid pointer, but if an error occurred the pattern status will be set to an error. To inspect -the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. +the status of a pattern use <a class="link" href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. </td> </tr> </tbody> @@ -463,9 +463,9 @@ the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624168"></a><h3> +<a name="id2641607"></a><h3> <a name="cairo-pattern-create-rgba"></a>cairo_pattern_create_rgba ()</h3> -<a class="indexterm" name="id2624179"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_rgba (double red, +<a class="indexterm" name="id2641618"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_rgba (double red, double green, double blue, double alpha);</pre> @@ -481,35 +481,35 @@ clamped.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of the color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of the color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of the color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> alpha component of the color </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the newly created <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the newly created <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or an error pattern in case of no memory. The caller owns the -returned object and should call <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when +returned object and should call <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. This function will always return a valid pointer, but if an error occurred the pattern status will be set to an error. To inspect -the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. +the status of a pattern use <a class="link" href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. </td> </tr> </tbody> @@ -517,9 +517,9 @@ the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624324"></a><h3> +<a name="id2641763"></a><h3> <a name="cairo-pattern-get-rgba"></a>cairo_pattern_get_rgba ()</h3> -<a class="indexterm" name="id2624336"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_rgba (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2641775"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_rgba (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *red, double *green, double *blue, @@ -533,34 +533,34 @@ Gets the solid color for a solid color pattern.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> return value for red component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> return value for green component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> return value for blue component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> return value for alpha component of color, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if the pattern is not a solid +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if the pattern is not a solid color pattern. </td> @@ -572,9 +572,9 @@ color pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624535"></a><h3> +<a name="id2641974"></a><h3> <a name="cairo-pattern-create-for-surface"></a>cairo_pattern_create_for_surface ()</h3> -<a class="indexterm" name="id2624547"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_for_surface (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2641986"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_for_surface (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Create a new cairo_pattern_t for the given surface.</p> <p> @@ -584,20 +584,20 @@ Create a new cairo_pattern_t for the given surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> the surface </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the newly created <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the newly created <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or an error pattern in case of no memory. The caller owns the -returned object and should call <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when +returned object and should call <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. This function will always return a valid pointer, but if an error occurred the pattern status will be set to an error. To inspect -the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. +the status of a pattern use <a class="link" href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. </td> </tr> </tbody> @@ -605,14 +605,14 @@ the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624630"></a><h3> +<a name="id2642070"></a><h3> <a name="cairo-pattern-get-surface"></a>cairo_pattern_get_surface ()</h3> -<a class="indexterm" name="id2624643"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_surface (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> **surface);</pre> +<a class="indexterm" name="id2642083"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_surface (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> **surface);</pre> <p> Gets the surface of a surface pattern. The reference returned in <em class="parameter"><code>surface</code></em> is owned by the pattern; the caller should call -<a href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a> if the surface is to be retained.</p> +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a> if the surface is to be retained.</p> <p> </p> @@ -620,19 +620,19 @@ Gets the surface of a surface pattern. The reference returned in <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> return value for surface of pattern, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if the pattern is not a surface +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if the pattern is not a surface pattern. </td> @@ -644,9 +644,9 @@ pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624772"></a><h3> +<a name="id2642212"></a><h3> <a name="cairo-pattern-create-linear"></a>cairo_pattern_create_linear ()</h3> -<a class="indexterm" name="id2624783"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_linear (double x0, +<a class="indexterm" name="id2642223"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_linear (double x0, double y0, double x1, double y1);</pre> @@ -654,13 +654,13 @@ pattern. Create a new linear gradient cairo_pattern_t along the line defined by (x0, y0) and (x1, y1). Before using the gradient pattern, a number of color stops should be defined using -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> or -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a>. +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> or +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a>. </p> <p> Note: The coordinates here are in pattern space. For a new pattern, pattern space is identical to user space, but the relationship -between the spaces can be changed with <a href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>.</p> +between the spaces can be changed with <a class="link" href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>.</p> <p> </p> @@ -668,35 +668,35 @@ between the spaces can be changed with <a href="cairo-Patterns.html#cairo-patter <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>x0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> <td> x coordinate of the start point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> <td> y coordinate of the start point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> x coordinate of the end point </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> y coordinate of the end point </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the newly created <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the newly created <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or an error pattern in case of no memory. The caller owns the -returned object and should call <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when +returned object and should call <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. This function will always return a valid pointer, but if an error occurred the pattern status will be set to an error. To inspect -the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. +the status of a pattern use <a class="link" href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. </td> </tr> </tbody> @@ -704,9 +704,9 @@ the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2624961"></a><h3> +<a name="id2642401"></a><h3> <a name="cairo-pattern-get-linear-points"></a>cairo_pattern_get_linear_points ()</h3> -<a class="indexterm" name="id2624976"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_linear_points (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2642415"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_linear_points (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *x0, double *y0, double *x1, @@ -720,34 +720,34 @@ Gets the gradient endpoints for a linear gradient.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> <td> return value for the x coordinate of the first point, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> <td> return value for the y coordinate of the first point, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> return value for the x coordinate of the second point, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> return value for the y coordinate of the second point, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a linear +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a linear gradient pattern. </td> @@ -759,9 +759,9 @@ gradient pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625181"></a><h3> +<a name="id2642620"></a><h3> <a name="cairo-pattern-create-radial"></a>cairo_pattern_create_radial ()</h3> -<a class="indexterm" name="id2625192"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_radial (double cx0, +<a class="indexterm" name="id2642631"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_create_radial (double cx0, double cy0, double radius0, double cx1, @@ -771,13 +771,13 @@ gradient pattern. Creates a new radial gradient cairo_pattern_t between the two circles defined by (cx0, cy0, radius0) and (cx1, cy1, radius1). Before using the gradient pattern, a number of color stops should be defined using -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> or -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a>. +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> or +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a>. </p> <p> Note: The coordinates here are in pattern space. For a new pattern, pattern space is identical to user space, but the relationship -between the spaces can be changed with <a href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>.</p> +between the spaces can be changed with <a class="link" href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>.</p> <p> </p> @@ -785,45 +785,45 @@ between the spaces can be changed with <a href="cairo-Patterns.html#cairo-patter <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cx0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cx0</code></em> :</span></p></td> <td> x coordinate for the center of the start circle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>cy0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cy0</code></em> :</span></p></td> <td> y coordinate for the center of the start circle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radius0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radius0</code></em> :</span></p></td> <td> radius of the start circle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>cx1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cx1</code></em> :</span></p></td> <td> x coordinate for the center of the end circle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>cy1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cy1</code></em> :</span></p></td> <td> y coordinate for the center of the end circle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radius1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radius1</code></em> :</span></p></td> <td> radius of the end circle </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the newly created <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the newly created <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> if successful, or an error pattern in case of no memory. The caller owns the -returned object and should call <a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when +returned object and should call <a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. This function will always return a valid pointer, but if an error occurred the pattern status will be set to an error. To inspect -the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. +the status of a pattern use <a class="link" href="cairo-Patterns.html#cairo-pattern-status"><code class="function">cairo_pattern_status()</code></a>. </td> </tr> </tbody> @@ -831,9 +831,9 @@ the status of a pattern use <a href="cairo-Patterns.html#cairo-pattern-status">< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625410"></a><h3> +<a name="id2642849"></a><h3> <a name="cairo-pattern-get-radial-circles"></a>cairo_pattern_get_radial_circles ()</h3> -<a class="indexterm" name="id2625424"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_radial_circles (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, +<a class="indexterm" name="id2642864"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_get_radial_circles (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, double *x0, double *y0, double *r0, @@ -850,44 +850,44 @@ specified as a center coordinate and a radius.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> <td> return value for the x coordinate of the center of the first circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> <td> return value for the y coordinate of the center of the first circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>r0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>r0</code></em> :</span></p></td> <td> return value for the radius of the first circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> return value for the x coordinate of the center of the second circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> return value for the y coordinate of the center of the second circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>r1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>r1</code></em> :</span></p></td> <td> return value for the radius of the second circle, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a radial +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a> if <em class="parameter"><code>pattern</code></em> is not a radial gradient pattern. </td> @@ -899,17 +899,17 @@ gradient pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625688"></a><h3> +<a name="id2643128"></a><h3> <a name="cairo-pattern-reference"></a>cairo_pattern_reference ()</h3> -<a class="indexterm" name="id2625699"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_reference (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2643138"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pattern_reference (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> Increases the reference count on <em class="parameter"><code>pattern</code></em> by one. This prevents <em class="parameter"><code>pattern</code></em> from being destroyed until a matching call to -<a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> is made. +<a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> is made. </p> <p> -The number of references to a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> can be get using -<a href="cairo-Patterns.html#cairo-pattern-get-reference-count"><code class="function">cairo_pattern_get_reference_count()</code></a>.</p> +The number of references to a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> can be get using +<a class="link" href="cairo-Patterns.html#cairo-pattern-get-reference-count"><code class="function">cairo_pattern_get_reference_count()</code></a>.</p> <p> </p> @@ -917,13 +917,13 @@ The number of references to a <a href="cairo-Patterns.html#cairo-pattern-t"><spa <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the referenced <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the referenced <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a>. </td> </tr> </tbody> @@ -931,30 +931,30 @@ The number of references to a <a href="cairo-Patterns.html#cairo-pattern-t"><spa </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625805"></a><h3> +<a name="id2643244"></a><h3> <a name="cairo-pattern-destroy"></a>cairo_pattern_destroy ()</h3> -<a class="indexterm" name="id2625815"></a><pre class="programlisting">void cairo_pattern_destroy (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2643254"></a><pre class="programlisting">void cairo_pattern_destroy (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> Decreases the reference count on <em class="parameter"><code>pattern</code></em> by one. If the result is zero, then <em class="parameter"><code>pattern</code></em> and all associated resources are freed. See -<a href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a>.</p> +<a class="link" href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625886"></a><h3> +<a name="id2643326"></a><h3> <a name="cairo-pattern-status"></a>cairo_pattern_status ()</h3> -<a class="indexterm" name="id2625897"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_status (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2643336"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_status (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> Checks whether an error has previously occurred for this pattern.</p> @@ -965,14 +965,14 @@ pattern.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-PATTERN-TYPE-MISMATCH:CAPS"><code class="literal">CAIRO_STATUS_PATTERN_TYPE_MISMATCH</code></a>. </td> </tr> </tbody> @@ -980,9 +980,9 @@ pattern.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2625984"></a><h3> +<a name="id2643423"></a><h3> <a name="cairo-extend-t"></a>enum cairo_extend_t</h3> -<a class="indexterm" name="id2625994"></a><pre class="programlisting">typedef enum _cairo_extend { +<a class="indexterm" name="id2643434"></a><pre class="programlisting">typedef enum _cairo_extend { CAIRO_EXTEND_NONE, CAIRO_EXTEND_REPEAT, CAIRO_EXTEND_REFLECT, @@ -990,7 +990,7 @@ pattern.</p> } cairo_extend_t; </pre> <p> -<a href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> is used to describe how the area outside +<a class="link" href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> is used to describe how the area outside of a pattern will be drawn. </p> <p> @@ -1002,24 +1002,24 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-EXTEND-NONE:CAPS"></a><code class="literal">CAIRO_EXTEND_NONE</code></span></td> +<td><p><span class="term"><a name="CAIRO-EXTEND-NONE:CAPS"></a><code class="literal">CAIRO_EXTEND_NONE</code></span></p></td> <td> pixels outside of the source pattern are fully transparent </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-EXTEND-REPEAT:CAPS"></a><code class="literal">CAIRO_EXTEND_REPEAT</code></span></td> +<td><p><span class="term"><a name="CAIRO-EXTEND-REPEAT:CAPS"></a><code class="literal">CAIRO_EXTEND_REPEAT</code></span></p></td> <td> the pattern is tiled by repeating </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-EXTEND-REFLECT:CAPS"></a><code class="literal">CAIRO_EXTEND_REFLECT</code></span></td> +<td><p><span class="term"><a name="CAIRO-EXTEND-REFLECT:CAPS"></a><code class="literal">CAIRO_EXTEND_REFLECT</code></span></p></td> <td> the pattern is tiled by reflecting at the edges (not implemented for surface patterns currently) </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-EXTEND-PAD:CAPS"></a><code class="literal">CAIRO_EXTEND_PAD</code></span></td> +<td><p><span class="term"><a name="CAIRO-EXTEND-PAD:CAPS"></a><code class="literal">CAIRO_EXTEND_PAD</code></span></p></td> <td> pixels outside of the pattern copy the closest pixel from the source (Since 1.2; not implemented for surface patterns currently) @@ -1030,13 +1030,13 @@ New entries may be added in future versions.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626111"></a><h3> +<a name="id2643550"></a><h3> <a name="cairo-pattern-set-extend"></a>cairo_pattern_set_extend ()</h3> -<a class="indexterm" name="id2626121"></a><pre class="programlisting">void cairo_pattern_set_extend (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> extend);</pre> +<a class="indexterm" name="id2643561"></a><pre class="programlisting">void cairo_pattern_set_extend (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> extend);</pre> <p> Sets the mode to be used for drawing outside the area of a pattern. -See <a href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> for details on the semantics of each extend +See <a class="link" href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> for details on the semantics of each extend strategy.</p> <p> @@ -1045,13 +1045,13 @@ strategy.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extend</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> describing how the area outside of the +<td><p><span class="term"><em class="parameter"><code>extend</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> describing how the area outside of the pattern will be drawn </td> </tr> @@ -1060,11 +1060,11 @@ pattern will be drawn </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626207"></a><h3> +<a name="id2643646"></a><h3> <a name="cairo-pattern-get-extend"></a>cairo_pattern_get_extend ()</h3> -<a class="indexterm" name="id2626217"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> cairo_pattern_get_extend (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2643657"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-extend-t">cairo_extend_t</a> cairo_pattern_get_extend (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> -Gets the current extend mode for a pattern. See <a href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> +Gets the current extend mode for a pattern. See <a class="link" href="cairo-Patterns.html#cairo-extend-t"><span class="type">cairo_extend_t</span></a> for details on the semantics of each extend strategy.</p> <p> @@ -1073,12 +1073,12 @@ for details on the semantics of each extend strategy.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current extend strategy used for drawing the pattern. </td> @@ -1088,9 +1088,9 @@ pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626291"></a><h3> +<a name="id2643727"></a><h3> <a name="cairo-filter-t"></a>enum cairo_filter_t</h3> -<a class="indexterm" name="id2626305"></a><pre class="programlisting">typedef enum _cairo_filter { +<a class="indexterm" name="id2643740"></a><pre class="programlisting">typedef enum _cairo_filter { CAIRO_FILTER_FAST, CAIRO_FILTER_GOOD, CAIRO_FILTER_BEST, @@ -1105,13 +1105,13 @@ pattern. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626323"></a><h3> +<a name="id2643759"></a><h3> <a name="cairo-pattern-set-filter"></a>cairo_pattern_set_filter ()</h3> -<a class="indexterm" name="id2626337"></a><pre class="programlisting">void cairo_pattern_set_filter (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> filter);</pre> +<a class="indexterm" name="id2643773"></a><pre class="programlisting">void cairo_pattern_set_filter (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> filter);</pre> <p> Sets the filter to be used for resizing when using this pattern. -See <a href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> for details on each filter.</p> +See <a class="link" href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> for details on each filter.</p> <p> </p> @@ -1119,13 +1119,13 @@ See <a href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>filter</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> describing the filter to use for resizing +<td><p><span class="term"><em class="parameter"><code>filter</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> describing the filter to use for resizing the pattern </td> </tr> @@ -1134,11 +1134,11 @@ the pattern </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626433"></a><h3> +<a name="id2643869"></a><h3> <a name="cairo-pattern-get-filter"></a>cairo_pattern_get_filter ()</h3> -<a class="indexterm" name="id2626447"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> cairo_pattern_get_filter (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2643882"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-filter-t">cairo_filter_t</a> cairo_pattern_get_filter (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> -Gets the current filter for a pattern. See <a href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> +Gets the current filter for a pattern. See <a class="link" href="cairo-Patterns.html#cairo-filter-t"><span class="type">cairo_filter_t</span></a> for details on each filter.</p> <p> @@ -1147,12 +1147,12 @@ for details on each filter.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current filter used for resizing the pattern. </td> </tr> @@ -1161,10 +1161,10 @@ for details on each filter.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626524"></a><h3> +<a name="id2643960"></a><h3> <a name="cairo-pattern-set-matrix"></a>cairo_pattern_set_matrix ()</h3> -<a class="indexterm" name="id2626538"></a><pre class="programlisting">void cairo_pattern_set_matrix (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2643973"></a><pre class="programlisting">void cairo_pattern_set_matrix (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Sets the pattern's transformation matrix to <em class="parameter"><code>matrix</code></em>. This matrix is a transformation from user space to pattern space. @@ -1199,7 +1199,7 @@ would cause the pattern to appear at half of its default size. </p> <p> Also, please note the discussion of the user-space locking -semantics of <a href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>.</p> +semantics of <a class="link" href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>.</p> <p> </p> @@ -1207,13 +1207,13 @@ semantics of <a href="cairo-cairo-t.html#cairo-set-source"><code class="function <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> </tbody> @@ -1221,10 +1221,10 @@ semantics of <a href="cairo-cairo-t.html#cairo-set-source"><code class="function </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626685"></a><h3> +<a name="id2644121"></a><h3> <a name="cairo-pattern-get-matrix"></a>cairo_pattern_get_matrix ()</h3> -<a class="indexterm" name="id2626699"></a><pre class="programlisting">void cairo_pattern_get_matrix (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2644134"></a><pre class="programlisting">void cairo_pattern_get_matrix (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Stores the pattern's transformation matrix into <em class="parameter"><code>matrix</code></em>.</p> <p> @@ -1234,12 +1234,12 @@ Stores the pattern's transformation matrix into <em class="parameter"><code>matr <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> return value for the matrix </td> </tr> @@ -1248,9 +1248,9 @@ Stores the pattern's transformation matrix into <em class="parameter"><code>matr </div> <hr> <div class="refsect2" lang="en"> -<a name="id2626785"></a><h3> +<a name="id2644221"></a><h3> <a name="cairo-pattern-type-t"></a>enum cairo_pattern_type_t</h3> -<a class="indexterm" name="id2626801"></a><pre class="programlisting">typedef enum _cairo_pattern_type { +<a class="indexterm" name="id2644236"></a><pre class="programlisting">typedef enum _cairo_pattern_type { CAIRO_PATTERN_TYPE_SOLID, CAIRO_PATTERN_TYPE_SURFACE, CAIRO_PATTERN_TYPE_LINEAR, @@ -1258,24 +1258,24 @@ Stores the pattern's transformation matrix into <em class="parameter"><code>matr } cairo_pattern_type_t; </pre> <p> -<a href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_pattern_type_t</span></a> is used to describe the type of a given pattern. +<a class="link" href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_pattern_type_t</span></a> is used to describe the type of a given pattern. </p> <p> The type of a pattern is determined by the function used to create -it. The <a href="cairo-Patterns.html#cairo-pattern-create-rgb"><code class="function">cairo_pattern_create_rgb()</code></a> and <a href="cairo-Patterns.html#cairo-pattern-create-rgba"><code class="function">cairo_pattern_create_rgba()</code></a> +it. The <a class="link" href="cairo-Patterns.html#cairo-pattern-create-rgb"><code class="function">cairo_pattern_create_rgb()</code></a> and <a class="link" href="cairo-Patterns.html#cairo-pattern-create-rgba"><code class="function">cairo_pattern_create_rgba()</code></a> functions create SOLID patterns. The remaining cairo_pattern_create functions map to pattern types in obvious ways. </p> <p> -The pattern type can be queried with <a href="cairo-Patterns.html#cairo-pattern-get-type"><code class="function">cairo_pattern_get_type()</code></a> +The pattern type can be queried with <a class="link" href="cairo-Patterns.html#cairo-pattern-get-type"><code class="function">cairo_pattern_get_type()</code></a> </p> <p> Most cairo_pattern functions can be called with a pattern of any type, (though trying to change the extend or filter for a solid pattern will have no effect). A notable exception is -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> and -<a href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a> which must only be called with +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"><code class="function">cairo_pattern_add_color_stop_rgb()</code></a> and +<a class="link" href="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"><code class="function">cairo_pattern_add_color_stop_rgba()</code></a> which must only be called with gradient patterns (either LINEAR or RADIAL). Otherwise the pattern will be shutdown and put into an error state. </p> @@ -1288,23 +1288,23 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-PATTERN-TYPE-SOLID:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_SOLID</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATTERN-TYPE-SOLID:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_SOLID</code></span></p></td> <td> The pattern is a solid (uniform) color. It may be opaque or translucent. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATTERN-TYPE-SURFACE:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_SURFACE</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATTERN-TYPE-SURFACE:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_SURFACE</code></span></p></td> <td> The pattern is a based on a surface (an image). </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATTERN-TYPE-LINEAR:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_LINEAR</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATTERN-TYPE-LINEAR:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_LINEAR</code></span></p></td> <td> The pattern is a linear gradient. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-PATTERN-TYPE-RADIAL:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_RADIAL</code></span></td> +<td><p><span class="term"><a name="CAIRO-PATTERN-TYPE-RADIAL:CAPS"></a><code class="literal">CAIRO_PATTERN_TYPE_RADIAL</code></span></p></td> <td> The pattern is a radial gradient. </td> </tr> @@ -1315,12 +1315,12 @@ color. It may be opaque or translucent. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627013"></a><h3> +<a name="id2644448"></a><h3> <a name="cairo-pattern-get-type"></a>cairo_pattern_get_type ()</h3> -<a class="indexterm" name="id2627028"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a> cairo_pattern_get_type (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2644464"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-type-t">cairo_pattern_type_t</a> cairo_pattern_get_type (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> This function returns the type a pattern. -See <a href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_pattern_type_t</span></a> for available types.</p> +See <a class="link" href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_pattern_type_t</span></a> for available types.</p> <p> </p> @@ -1328,12 +1328,12 @@ See <a href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_ <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The type of <em class="parameter"><code>pattern</code></em>. </td> @@ -1345,9 +1345,9 @@ See <a href="cairo-Patterns.html#cairo-pattern-type-t"><span class="type">cairo_ </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627119"></a><h3> +<a name="id2644554"></a><h3> <a name="cairo-pattern-get-reference-count"></a>cairo_pattern_get_reference_count ()</h3> -<a class="indexterm" name="id2627135"></a><pre class="programlisting">unsigned int cairo_pattern_get_reference_count (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2644571"></a><pre class="programlisting">unsigned int cairo_pattern_get_reference_count (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> Returns the current reference count of <em class="parameter"><code>pattern</code></em>.</p> <p> @@ -1357,12 +1357,12 @@ Returns the current reference count of <em class="parameter"><code>pattern</code <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current reference count of <em class="parameter"><code>pattern</code></em>. If the object is a nil object, 0 will be returned. @@ -1375,12 +1375,12 @@ object is a nil object, 0 will be returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627225"></a><h3> +<a name="id2644660"></a><h3> <a name="cairo-pattern-set-user-data"></a>cairo_pattern_set_user_data ()</h3> -<a class="indexterm" name="id2627241"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_set_user_data (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="indexterm" name="id2644677"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_pattern_set_user_data (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> <p> Attach user data to <em class="parameter"><code>pattern</code></em>. To remove user data from a surface, call this function with the key that was used to set it and <code class="literal">NULL</code> @@ -1392,30 +1392,30 @@ for <em class="parameter"><code>data</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of a <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of a <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>user_data</code></em> :</span></td> -<td> the user data to attach to the <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> +<td> the user data to attach to the <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>destroy</code></em> :</span></td> -<td> a <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the -<a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the +<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the +<a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the same key. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a slot could not be allocated for the user data. </td> @@ -1427,10 +1427,10 @@ slot could not be allocated for the user data. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627456"></a><h3> +<a name="id2644892"></a><h3> <a name="cairo-pattern-get-user-data"></a>cairo_pattern_get_user_data ()</h3> -<a class="indexterm" name="id2627473"></a><pre class="programlisting">void* cairo_pattern_get_user_data (<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> +<a class="indexterm" name="id2644909"></a><pre class="programlisting">void* cairo_pattern_get_user_data (<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> <p> Return user data previously attached to <em class="parameter"><code>pattern</code></em> using the specified key. If no user data has been attached with the given @@ -1442,18 +1442,18 @@ key this function returns <code class="literal">NULL</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of the <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of the <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was attached to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the user data previously attached or <code class="literal">NULL</code>. </td> @@ -1464,6 +1464,11 @@ attached to </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2645042"></a><div class="refsect2" lang="en"><a name="id2645043"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2645044"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-PostScript-Surfaces.html b/doc/public/html/cairo-PostScript-Surfaces.html index 68001a8..389baf3 100644 --- a/doc/public/html/cairo-PostScript-Surfaces.html +++ b/doc/public/html/cairo-PostScript-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>PostScript Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-PNG-Support.html" title="PNG Support"> <link rel="next" href="cairo-Win32-Surfaces.html" title="Win32 Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Win32-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589875" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2623034" class="shortcut">Top</a>  |  - <a href="#id2636824" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2654312" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-PostScript-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2589875"></a><span class="refentrytitle">PostScript Surfaces</span> +<a name="id2623034"></a><span class="refentrytitle">PostScript Surfaces</span> </h2> <p>PostScript Surfaces — Rendering PostScript documents</p> </td> @@ -51,46 +51,46 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create">cairo_ps_surface_create</a> (const char *filename, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create">cairo_ps_surface_create</a> (const char *filename, double width_in_points, double height_in_points); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream">cairo_ps_surface_create_for_stream</a> (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream">cairo_ps_surface_create_for_stream</a> (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points); -void <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size">cairo_ps_surface_set_size</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size">cairo_ps_surface_set_size</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double width_in_points, double height_in_points); -void <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup">cairo_ps_surface_dsc_begin_setup</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup">cairo_ps_surface_dsc_begin_page_setup</a> - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup">cairo_ps_surface_dsc_begin_setup</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup">cairo_ps_surface_dsc_begin_page_setup</a> + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment">cairo_ps_surface_dsc_comment</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, const char *comment); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2636824"></a><h2>Description</h2> +<a name="id2654312"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2636840"></a><h2>Details</h2> +<a name="id2654328"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2636851"></a><h3> +<a name="id2654338"></a><h3> <a name="cairo-ps-surface-create"></a>cairo_ps_surface_create ()</h3> -<a class="indexterm" name="id2636864"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_ps_surface_create (const char *filename, +<a class="indexterm" name="id2654352"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_ps_surface_create (const char *filename, double width_in_points, double height_in_points);</pre> <p> Creates a PostScript surface of the specified size in points to be -written to <em class="parameter"><code>filename</code></em>. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream"><code class="function">cairo_ps_surface_create_for_stream()</code></a> for +written to <em class="parameter"><code>filename</code></em>. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream"><code class="function">cairo_ps_surface_create_for_stream()</code></a> for a more flexible mechanism for handling the PostScript output than simply writing it to a named file. </p> <p> Note that the size of individual pages of the PostScript output can -vary. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"><code class="function">cairo_ps_surface_set_size()</code></a>.</p> +vary. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"><code class="function">cairo_ps_surface_set_size()</code></a>.</p> <p> </p> @@ -98,29 +98,29 @@ vary. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"><co <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> <td> a filename for the PS output (must be writable) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -131,21 +131,21 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2638281"></a><h3> +<a name="id2655771"></a><h3> <a name="cairo-ps-surface-create-for-stream"></a>cairo_ps_surface_create_for_stream ()</h3> -<a class="indexterm" name="id2638295"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_ps_surface_create_for_stream (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="indexterm" name="id2655785"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_ps_surface_create_for_stream (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points);</pre> <p> Creates a PostScript surface of the specified size in points to be written incrementally to the stream represented by <em class="parameter"><code>write_func</code></em> and -<em class="parameter"><code>closure</code></em>. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create"><code class="function">cairo_ps_surface_create()</code></a> for a more convenient way +<em class="parameter"><code>closure</code></em>. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-create"><code class="function">cairo_ps_surface_create()</code></a> for a more convenient way to simply direct the PostScript output to a named file. </p> <p> Note that the size of individual pages of the PostScript -output can vary. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"><code class="function">cairo_ps_surface_set_size()</code></a>.</p> +output can vary. See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"><code class="function">cairo_ps_surface_set_size()</code></a>.</p> <p> </p> @@ -153,34 +153,34 @@ output can vary. See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-se <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>write_func</code></em> :</span></td> -<td> a <a href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data +<td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> the closure argument for <em class="parameter"><code>write_func</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -191,9 +191,9 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2637400"></a><h3> +<a name="id2654905"></a><h3> <a name="cairo-ps-surface-set-size"></a>cairo_ps_surface_set_size ()</h3> -<a class="indexterm" name="id2637413"></a><pre class="programlisting">void cairo_ps_surface_set_size (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2654919"></a><pre class="programlisting">void cairo_ps_surface_set_size (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double width_in_points, double height_in_points);</pre> <p> @@ -205,7 +205,7 @@ This function should only be called before any drawing operations have been performed on the current page. The simplest way to do this is to call this function immediately after creating the surface or immediately after completing a page with either -<a href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>.</p> +<a class="link" href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>.</p> <p> </p> @@ -213,17 +213,17 @@ surface or immediately after completing a page with either <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a PostScript cairo_surface_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> new surface width, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> new surface height, in points (1 point == 1/72.0 inch) </td> </tr> @@ -234,28 +234,28 @@ surface or immediately after completing a page with either </div> <hr> <div class="refsect2" lang="en"> -<a name="id2637542"></a><h3> +<a name="id2655048"></a><h3> <a name="cairo-ps-surface-dsc-begin-setup"></a>cairo_ps_surface_dsc_begin_setup ()</h3> -<a class="indexterm" name="id2637556"></a><pre class="programlisting">void cairo_ps_surface_dsc_begin_setup (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2655062"></a><pre class="programlisting">void cairo_ps_surface_dsc_begin_setup (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> This function indicates that subsequent calls to -<a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> should direct comments to the Setup +<a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> should direct comments to the Setup section of the PostScript output. </p> <p> This function should be called at most once per surface, and must -be called before any call to <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup"><code class="function">cairo_ps_surface_dsc_begin_page_setup()</code></a> +be called before any call to <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup"><code class="function">cairo_ps_surface_dsc_begin_page_setup()</code></a> and before any drawing is performed to the surface. </p> <p> -See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> for more details.</p> +See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> for more details.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a PostScript cairo_surface_t </td> </tr></tbody> @@ -265,30 +265,30 @@ See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code </div> <hr> <div class="refsect2" lang="en"> -<a name="id2645031"></a><h3> +<a name="id2662527"></a><h3> <a name="cairo-ps-surface-dsc-begin-page-setup"></a>cairo_ps_surface_dsc_begin_page_setup ()</h3> -<a class="indexterm" name="id2645043"></a><pre class="programlisting">void cairo_ps_surface_dsc_begin_page_setup - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2662540"></a><pre class="programlisting">void cairo_ps_surface_dsc_begin_page_setup + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> This function indicates that subsequent calls to -<a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> should direct comments to the +<a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> should direct comments to the PageSetup section of the PostScript output. </p> <p> This function call is only needed for the first page of a surface. It should be called after any call to -<a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup"><code class="function">cairo_ps_surface_dsc_begin_setup()</code></a> and before any drawing is +<a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup"><code class="function">cairo_ps_surface_dsc_begin_setup()</code></a> and before any drawing is performed to the surface. </p> <p> -See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> for more details.</p> +See <a class="link" href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code class="function">cairo_ps_surface_dsc_comment()</code></a> for more details.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a PostScript cairo_surface_t </td> </tr></tbody> @@ -298,9 +298,9 @@ See <a href="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"><code </div> <hr> <div class="refsect2" lang="en"> -<a name="id2645133"></a><h3> +<a name="id2662627"></a><h3> <a name="cairo-ps-surface-dsc-comment"></a>cairo_ps_surface_dsc_comment ()</h3> -<a class="indexterm" name="id2645148"></a><pre class="programlisting">void cairo_ps_surface_dsc_comment (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2662641"></a><pre class="programlisting">void cairo_ps_surface_dsc_comment (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, const char *comment);</pre> <p> Emit a comment into the PostScript output for the given surface. @@ -350,7 +350,7 @@ should be called after a call to <code class="function">cairo_ps_surface_begin_p <p> Note that it is only necessary to call <code class="function">cairo_ps_surface_begin_page_setup()</code> for the first page of any surface. After a call to -<a href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a> comments are unambiguously +<a class="link" href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a> comments are unambiguously directed to the PageSetup section of the current page. But it doesn't hurt to call this function at the beginning of every page as that consistency may make the calling code simpler. @@ -406,12 +406,12 @@ cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *PageSize A5"); <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a PostScript cairo_surface_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>comment</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>comment</code></em> :</span></p></td> <td> a comment string to be emitted into the PostScript output </td> </tr> @@ -421,6 +421,11 @@ cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *PageSize A5"); </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2663037"></a><div class="refsect2" lang="en"><a name="id2663038"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2663039"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-SVG-Surfaces.html b/doc/public/html/cairo-SVG-Surfaces.html index f20d3ac..1749d1f 100644 --- a/doc/public/html/cairo-SVG-Surfaces.html +++ b/doc/public/html/cairo-SVG-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>SVG Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-Win32-Surfaces.html" title="Win32 Surfaces"> <link rel="next" href="cairo-XLib-Surfaces.html" title="XLib Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-XLib-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2584708" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2583449" class="shortcut">Top</a>  |  - <a href="#id2643342" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2660812" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-SVG-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2584708"></a><span class="refentrytitle">SVG Surfaces</span> +<a name="id2583449"></a><span class="refentrytitle">SVG Surfaces</span> </h2> <p>SVG Surfaces — Rendering SVG documents</p> </td> @@ -51,34 +51,34 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-SVG-Surfaces.html#cairo-svg-surface-create">cairo_svg_surface_create</a> (const char *filename, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-surface-create">cairo_svg_surface_create</a> (const char *filename, double width_in_points, double height_in_points); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-SVG-Surfaces.html#cairo-svg-surface-create-for-stream">cairo_svg_surface_create_for_stream</a> (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-surface-create-for-stream">cairo_svg_surface_create_for_stream</a> (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points); -void <a href="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version">cairo_svg_surface_restrict_to_version</a> - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version); -enum <a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a>; -void <a href="cairo-SVG-Surfaces.html#cairo-svg-get-versions">cairo_svg_get_versions</a> (<a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> const **versions, +void <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version">cairo_svg_surface_restrict_to_version</a> + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version); +enum <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a>; +void <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-get-versions">cairo_svg_get_versions</a> (<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> const **versions, int *num_versions); -const char* <a href="cairo-SVG-Surfaces.html#cairo-svg-version-to-string">cairo_svg_version_to_string</a> (<a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version); +const char* <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-to-string">cairo_svg_version_to_string</a> (<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2643342"></a><h2>Description</h2> +<a name="id2660812"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2643358"></a><h2>Details</h2> +<a name="id2660828"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2643368"></a><h3> +<a name="id2660838"></a><h3> <a name="cairo-svg-surface-create"></a>cairo_svg_surface_create ()</h3> -<a class="indexterm" name="id2643382"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_svg_surface_create (const char *filename, +<a class="indexterm" name="id2660852"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_svg_surface_create (const char *filename, double width_in_points, double height_in_points);</pre> <p> @@ -91,29 +91,29 @@ to <em class="parameter"><code>filename</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>filename</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>filename</code></em> :</span></p></td> <td> a filename for the SVG output (must be writable) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -124,9 +124,9 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2643514"></a><h3> +<a name="id2660984"></a><h3> <a name="cairo-svg-surface-create-for-stream"></a>cairo_svg_surface_create_for_stream ()</h3> -<a class="indexterm" name="id2643528"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_svg_surface_create_for_stream (<a href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, +<a class="indexterm" name="id2660998"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_svg_surface_create_for_stream (<a class="link" href="cairo-PNG-Support.html#cairo-write-func-t">cairo_write_func_t</a> write_func, void *closure, double width_in_points, double height_in_points);</pre> @@ -140,34 +140,34 @@ incrementally to the stream represented by <em class="parameter"><code>write_fun <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>write_func</code></em> :</span></td> -<td> a <a href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data +<td><p><span class="term"><em class="parameter"><code>write_func</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-PNG-Support.html#cairo-write-func-t"><span class="type">cairo_write_func_t</span></a> to accept the output data </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>closure</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>closure</code></em> :</span></p></td> <td> the closure argument for <em class="parameter"><code>write_func</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width_in_points</code></em> :</span></p></td> <td> width of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height_in_points</code></em> :</span></p></td> <td> height of the surface, in points (1 point == 1/72.0 inch) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly created surface. The caller owns the surface and should call cairo_surface_destroy when done with it. This function always returns a valid pointer, but it will return a pointer to a "nil" surface if an error such as out of memory -occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. +occurs. You can use <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> to check for this. </td> </tr> @@ -178,13 +178,13 @@ occurs. You can use <a href="cairo-cairo-surface-t.html#cairo-surface-status"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2643700"></a><h3> +<a name="id2661170"></a><h3> <a name="cairo-svg-surface-restrict-to-version"></a>cairo_svg_surface_restrict_to_version ()</h3> -<a class="indexterm" name="id2643713"></a><pre class="programlisting">void cairo_svg_surface_restrict_to_version - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version);</pre> +<a class="indexterm" name="id2661183"></a><pre class="programlisting">void cairo_svg_surface_restrict_to_version + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version);</pre> <p> -Restricts the generated SVG file to <em class="parameter"><code>version</code></em>. See <a href="cairo-SVG-Surfaces.html#cairo-svg-get-versions"><code class="function">cairo_svg_get_versions()</code></a> +Restricts the generated SVG file to <em class="parameter"><code>version</code></em>. See <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-get-versions"><code class="function">cairo_svg_get_versions()</code></a> for a list of available version values that can be used here. </p> <p> @@ -199,12 +199,12 @@ surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a SVG <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a SVG <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>version</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>version</code></em> :</span></p></td> <td> SVG version </td> </tr> @@ -215,15 +215,15 @@ surface.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2643822"></a><h3> +<a name="id2661292"></a><h3> <a name="cairo-svg-version-t"></a>enum cairo_svg_version_t</h3> -<a class="indexterm" name="id2643835"></a><pre class="programlisting">typedef enum _cairo_svg_version { +<a class="indexterm" name="id2661613"></a><pre class="programlisting">typedef enum _cairo_svg_version { CAIRO_SVG_VERSION_1_1, CAIRO_SVG_VERSION_1_2 } cairo_svg_version_t; </pre> <p> -<a href="cairo-SVG-Surfaces.html#cairo-svg-version-t"><span class="type">cairo_svg_version_t</span></a> is used to describe the version number of the SVG +<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t"><span class="type">cairo_svg_version_t</span></a> is used to describe the version number of the SVG specification that a generated SVG file will conform to.</p> <p> @@ -232,12 +232,12 @@ specification that a generated SVG file will conform to.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-SVG-VERSION-1-1:CAPS"></a><code class="literal">CAIRO_SVG_VERSION_1_1</code></span></td> +<td><p><span class="term"><a name="CAIRO-SVG-VERSION-1-1:CAPS"></a><code class="literal">CAIRO_SVG_VERSION_1_1</code></span></p></td> <td> The version 1.1 of the SVG specification. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SVG-VERSION-1-2:CAPS"></a><code class="literal">CAIRO_SVG_VERSION_1_2</code></span></td> +<td><p><span class="term"><a name="CAIRO-SVG-VERSION-1-2:CAPS"></a><code class="literal">CAIRO_SVG_VERSION_1_2</code></span></p></td> <td> The version 1.2 of the SVG specification. </td> </tr> @@ -246,13 +246,13 @@ specification that a generated SVG file will conform to.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644186"></a><h3> +<a name="id2661689"></a><h3> <a name="cairo-svg-get-versions"></a>cairo_svg_get_versions ()</h3> -<a class="indexterm" name="id2644199"></a><pre class="programlisting">void cairo_svg_get_versions (<a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> const **versions, +<a class="indexterm" name="id2661703"></a><pre class="programlisting">void cairo_svg_get_versions (<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> const **versions, int *num_versions);</pre> <p> Used to retrieve the list of supported versions. See -<a href="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version"><code class="function">cairo_svg_surface_restrict_to_version()</code></a>.</p> +<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version"><code class="function">cairo_svg_surface_restrict_to_version()</code></a>.</p> <p> </p> @@ -260,12 +260,12 @@ Used to retrieve the list of supported versions. See <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>versions</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>versions</code></em> :</span></p></td> <td> supported version list </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_versions</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_versions</code></em> :</span></p></td> <td> list length </td> </tr> @@ -276,12 +276,12 @@ Used to retrieve the list of supported versions. See </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644289"></a><h3> +<a name="id2661792"></a><h3> <a name="cairo-svg-version-to-string"></a>cairo_svg_version_to_string ()</h3> -<a class="indexterm" name="id2644302"></a><pre class="programlisting">const char* cairo_svg_version_to_string (<a href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version);</pre> +<a class="indexterm" name="id2661806"></a><pre class="programlisting">const char* cairo_svg_version_to_string (<a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-version-t">cairo_svg_version_t</a> version);</pre> <p> Get the string representation of the given <em class="parameter"><code>version</code></em> id. This function -will return NULL if <em class="parameter"><code>version</code></em> isn't valid. See <a href="cairo-SVG-Surfaces.html#cairo-svg-get-versions"><code class="function">cairo_svg_get_versions()</code></a> +will return NULL if <em class="parameter"><code>version</code></em> isn't valid. See <a class="link" href="cairo-SVG-Surfaces.html#cairo-svg-get-versions"><code class="function">cairo_svg_get_versions()</code></a> for a way to get the list of valid version ids.</p> <p> @@ -290,12 +290,12 @@ for a way to get the list of valid version ids.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>version</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>version</code></em> :</span></p></td> <td> a version id </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the string associated to given version. </td> @@ -306,6 +306,11 @@ for a way to get the list of valid version ids.</p> </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2661899"></a><div class="refsect2" lang="en"><a name="id2661900"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2661901"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Scaled-Fonts.html b/doc/public/html/cairo-Scaled-Fonts.html index 3345e64..761afc7 100644 --- a/doc/public/html/cairo-Scaled-Fonts.html +++ b/doc/public/html/cairo-Scaled-Fonts.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Scaled Fonts</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Fonts.html" title="Fonts"> <link rel="prev" href="cairo-cairo-font-face-t.html" title="cairo_font_face_t"> <link rel="next" href="cairo-Font-Options.html" title="Font Options"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Font-Options.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2568045" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2629453" class="shortcut">Top</a>  |  - <a href="#id2630852" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2639438" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Scaled-Fonts"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2568045"></a><span class="refentrytitle">Scaled Fonts</span> +<a name="id2629453"></a><span class="refentrytitle">Scaled Fonts</span> </h2> <p>Scaled Fonts — Caching metrics for a particular font size</p> </td> @@ -51,58 +51,58 @@ -typedef <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>; -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create">cairo_scaled_font_create</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference">cairo_scaled_font_reference</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy">cairo_scaled_font_destroy</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-status">cairo_scaled_font_status</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); - <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a>; -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-extents">cairo_scaled_font_extents</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents); - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a>; -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-text-extents">cairo_scaled_font_text_extents</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, +typedef <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>; +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create">cairo_scaled_font_create</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference">cairo_scaled_font_reference</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy">cairo_scaled_font_destroy</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-status">cairo_scaled_font_status</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); + <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a>; +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-extents">cairo_scaled_font_extents</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents); + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a>; +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-text-extents">cairo_scaled_font_text_extents</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, const char *utf8, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-glyph-extents">cairo_scaled_font_glyph_extents</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-glyph-extents">cairo_scaled_font_glyph_extents</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-face">cairo_scaled_font_get_font_face</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-options">cairo_scaled_font_get_font_options</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-matrix">cairo_scaled_font_get_font_matrix</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix); -void <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm">cairo_scaled_font_get_ctm</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm); -<a href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type">cairo_scaled_font_get_type</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -unsigned int <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count">cairo_scaled_font_get_reference_count</a> - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-set-user-data">cairo_scaled_font_set_user_data</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-face">cairo_scaled_font_get_font_face</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-options">cairo_scaled_font_get_font_options</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-font-matrix">cairo_scaled_font_get_font_matrix</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix); +void <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm">cairo_scaled_font_get_ctm</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm); +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type">cairo_scaled_font_get_type</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +unsigned int <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count">cairo_scaled_font_get_reference_count</a> + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-set-user-data">cairo_scaled_font_set_user_data</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); -void* <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-user-data">cairo_scaled_font_get_user_data</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); +void* <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-user-data">cairo_scaled_font_get_user_data</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2630852"></a><h2>Description</h2> +<a name="id2639438"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2630868"></a><h2>Details</h2> +<a name="id2639454"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2630879"></a><h3> +<a name="id2639465"></a><h3> <a name="cairo-scaled-font-t"></a>cairo_scaled_font_t</h3> -<a class="indexterm" name="id2630891"></a><pre class="programlisting">typedef struct _cairo_scaled_font cairo_scaled_font_t; +<a class="indexterm" name="id2639477"></a><pre class="programlisting">typedef struct _cairo_scaled_font cairo_scaled_font_t; </pre> <p> -A <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> is a font scaled to a particular size and device +A <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> is a font scaled to a particular size and device resolution. A cairo_scaled_font_t is most useful for low-level font usage where a library or application wants to cache a reference to a scaled font to speed up the computation of metrics. @@ -110,25 +110,25 @@ to a scaled font to speed up the computation of metrics. <p> There are various types of scaled fonts, depending on the <em class="firstterm">font backend</em> they use. The type of a -scaled font can be queried using <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type"><code class="function">cairo_scaled_font_get_type()</code></a>. +scaled font can be queried using <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type"><code class="function">cairo_scaled_font_get_type()</code></a>. </p> <p> -Memory management of <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> is done with -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a> and <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a>.</p> +Memory management of <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> is done with +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a> and <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a>.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2630969"></a><h3> +<a name="id2639555"></a><h3> <a name="cairo-scaled-font-create"></a>cairo_scaled_font_create ()</h3> -<a class="indexterm" name="id2630980"></a><pre class="programlisting"><a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_scaled_font_create (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2639566"></a><pre class="programlisting"><a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_scaled_font_create (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> -Creates a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> object from a font face and matrices that +Creates a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> object from a font face and matrices that describe the size of the font and the environment in which it will be used.</p> <p> @@ -138,35 +138,35 @@ be used.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>font_matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>font_matrix</code></em> :</span></p></td> <td> font space to user space transformation matrix for the font. In the simplest case of a N point font, this matrix is just a scale by N, but it can also be used to shear the font or stretch it unequally along the two axes. See - <a href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. + <a class="link" href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>ctm</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>ctm</code></em> :</span></p></td> <td> user to device transformation matrix with which the font will be used. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> <td> options to use when getting metrics for the font and rendering with it. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly created <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>. Destroy with - <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly created <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>. Destroy with + <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a> </td> </tr> </tbody> @@ -174,17 +174,17 @@ be used.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2621850"></a><h3> +<a name="id2640000"></a><h3> <a name="cairo-scaled-font-reference"></a>cairo_scaled_font_reference ()</h3> -<a class="indexterm" name="id2621861"></a><pre class="programlisting"><a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_scaled_font_reference (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2640011"></a><pre class="programlisting"><a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_scaled_font_reference (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Increases the reference count on <em class="parameter"><code>scaled_font</code></em> by one. This prevents <em class="parameter"><code>scaled_font</code></em> from being destroyed until a matching call to -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a> is made. +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-destroy"><code class="function">cairo_scaled_font_destroy()</code></a> is made. </p> <p> -The number of references to a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> can be get using -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count"><code class="function">cairo_scaled_font_get_reference_count()</code></a>.</p> +The number of references to a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> can be get using +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count"><code class="function">cairo_scaled_font_get_reference_count()</code></a>.</p> <p> </p> @@ -192,14 +192,14 @@ The number of references to a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>, (may be NULL in which case +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>, (may be NULL in which case this function does nothing) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the referenced <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the referenced <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> </tbody> @@ -207,30 +207,30 @@ this function does nothing) </div> <hr> <div class="refsect2" lang="en"> -<a name="id2621980"></a><h3> +<a name="id2640131"></a><h3> <a name="cairo-scaled-font-destroy"></a>cairo_scaled_font_destroy ()</h3> -<a class="indexterm" name="id2621991"></a><pre class="programlisting">void cairo_scaled_font_destroy (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2640142"></a><pre class="programlisting">void cairo_scaled_font_destroy (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Decreases the reference count on <em class="parameter"><code>font</code></em> by one. If the result is zero, then <em class="parameter"><code>font</code></em> and all associated resources are freed. -See <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a>.</p> +See <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632143"></a><h3> +<a name="id2649597"></a><h3> <a name="cairo-scaled-font-status"></a>cairo_scaled_font_status ()</h3> -<a class="indexterm" name="id2632153"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_scaled_font_status (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2649607"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_scaled_font_status (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Checks whether an error has previously occurred for this scaled_font.</p> @@ -241,14 +241,14 @@ scaled_font.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or another error such as - <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or another error such as + <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. </td> </tr> </tbody> @@ -256,9 +256,9 @@ scaled_font.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632233"></a><h3> +<a name="id2649689"></a><h3> <a name="cairo-font-extents-t"></a>cairo_font_extents_t</h3> -<a class="indexterm" name="id2632244"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2649700"></a><pre class="programlisting">typedef struct { double ascent; double descent; double height; @@ -267,7 +267,7 @@ scaled_font.</p> } cairo_font_extents_t; </pre> <p> -The <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> structure stores metric information for +The <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> structure stores metric information for a font. Values are given in the current user-space coordinate system. </p> @@ -286,7 +286,7 @@ matrix), but otherwise will remain unchanged.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term">double <em class="structfield"><code>ascent</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>ascent</code></em>;</span></p></td> <td> the distance that the font extends above the baseline. Note that this is not always exactly equal to the maximum of the extents of all the glyphs in the font, but rather @@ -295,7 +295,7 @@ matrix), but otherwise will remain unchanged.</p> </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>descent</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>descent</code></em>;</span></p></td> <td> the distance that the font extends below the baseline. This value is positive for typical fonts that include portions below the baseline. Note that this is not always @@ -306,7 +306,7 @@ matrix), but otherwise will remain unchanged.</p> </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>height</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>height</code></em>;</span></p></td> <td> the recommended vertical distance between baselines when setting consecutive lines of text with the font. This is greater than <em class="parameter"><code>ascent</code></em>+<em class="parameter"><code>descent</code></em> by a @@ -317,13 +317,13 @@ matrix), but otherwise will remain unchanged.</p> </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>max_x_advance</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>max_x_advance</code></em>;</span></p></td> <td> the maximum distance in the X direction that the the origin is advanced for any glyph in the font. </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>max_y_advance</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>max_y_advance</code></em>;</span></p></td> <td> the maximum distance in the Y direction that the the origin is advanced for any glyph in the font. this will be zero for normal fonts used for horizontal @@ -336,12 +336,12 @@ matrix), but otherwise will remain unchanged.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632452"></a><h3> +<a name="id2649908"></a><h3> <a name="cairo-scaled-font-extents"></a>cairo_scaled_font_extents ()</h3> -<a class="indexterm" name="id2632464"></a><pre class="programlisting">void cairo_scaled_font_extents (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents);</pre> +<a class="indexterm" name="id2649920"></a><pre class="programlisting">void cairo_scaled_font_extents (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents);</pre> <p> -Gets the metrics for a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>.</p> +Gets the metrics for a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>.</p> <p> </p> @@ -349,13 +349,13 @@ Gets the metrics for a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><sp <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> which to store the retrieved extents. +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> which to store the retrieved extents. </td> </tr> </tbody> @@ -363,9 +363,9 @@ Gets the metrics for a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><sp </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632556"></a><h3> +<a name="id2650012"></a><h3> <a name="cairo-text-extents-t"></a>cairo_text_extents_t</h3> -<a class="indexterm" name="id2632568"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2650023"></a><pre class="programlisting">typedef struct { double x_bearing; double y_bearing; double width; @@ -375,7 +375,7 @@ Gets the metrics for a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><sp } cairo_text_extents_t; </pre> <p> -The <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> structure stores the extents of a single +The <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> structure stores the extents of a single glyph or a string of glyphs in user-space coordinates. Because text extents are in user-space coordinates, they are mostly, but not entirely, independent of the current transformation matrix. If you call @@ -391,14 +391,14 @@ but otherwise will remain unchanged.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term">double <em class="structfield"><code>x_bearing</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>x_bearing</code></em>;</span></p></td> <td> the horizontal distance from the origin to the leftmost part of the glyphs as drawn. Positive if the glyphs lie entirely to the right of the origin. </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>y_bearing</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>y_bearing</code></em>;</span></p></td> <td> the vertical distance from the origin to the topmost part of the glyphs as drawn. Positive only if the glyphs lie completely below the origin; will usually be @@ -406,23 +406,23 @@ but otherwise will remain unchanged.</p> </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>width</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>width</code></em>;</span></p></td> <td> width of the glyphs as drawn </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>height</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>height</code></em>;</span></p></td> <td> height of the glyphs as drawn </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>x_advance</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>x_advance</code></em>;</span></p></td> <td>distance to advance in the X direction after drawing these glyphs </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>y_advance</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>y_advance</code></em>;</span></p></td> <td> distance to advance in the Y direction after drawing these glyphs. Will typically be zero except for vertical text layout as found in East-Asian languages. @@ -433,19 +433,19 @@ but otherwise will remain unchanged.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632748"></a><h3> +<a name="id2650204"></a><h3> <a name="cairo-scaled-font-text-extents"></a>cairo_scaled_font_text_extents ()</h3> -<a class="indexterm" name="id2632763"></a><pre class="programlisting">void cairo_scaled_font_text_extents (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, +<a class="indexterm" name="id2650219"></a><pre class="programlisting">void cairo_scaled_font_text_extents (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, const char *utf8, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> <p> Gets the extents for a string of text. The extents describe a user-space rectangle that encloses the "inked" portion of the text -drawn at the origin (0,0) (as it would be drawn by <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a> +drawn at the origin (0,0) (as it would be drawn by <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a> if the cairo graphics state were set to the same font_face, font_matrix, ctm, and font_options as <em class="parameter"><code>scaled_font</code></em>). Additionally, the x_advance and y_advance values indicate the amount by which the -current point would be advanced by <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. +current point would be advanced by <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. </p> <p> Note that whitespace characters do not directly contribute to the @@ -461,18 +461,18 @@ affect the x_advance and y_advance values.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>utf8</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> <td> a string of text, encoded in UTF-8 </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> which to store the retrieved extents. +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> which to store the retrieved extents. </td> </tr> </tbody> @@ -482,20 +482,20 @@ affect the x_advance and y_advance values.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2632919"></a><h3> +<a name="id2650375"></a><h3> <a name="cairo-scaled-font-glyph-extents"></a>cairo_scaled_font_glyph_extents ()</h3> -<a class="indexterm" name="id2632932"></a><pre class="programlisting">void cairo_scaled_font_glyph_extents (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +<a class="indexterm" name="id2650388"></a><pre class="programlisting">void cairo_scaled_font_glyph_extents (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> <p> Gets the extents for an array of glyphs. The extents describe a user-space rectangle that encloses the "inked" portion of the -glyphs, (as they would be drawn by <a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a> if the cairo +glyphs, (as they would be drawn by <a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a> if the cairo graphics state were set to the same font_face, font_matrix, ctm, and font_options as <em class="parameter"><code>scaled_font</code></em>). Additionally, the x_advance and y_advance values indicate the amount by which the current point -would be advanced by <a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>. +would be advanced by <a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>. </p> <p> Note that whitespace glyphs do not contribute to the size of the @@ -507,23 +507,23 @@ rectangle (extents.width and extents.height).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td> <td> an array of glyph IDs with X and Y offsets. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></p></td> <td> the number of glyphs in the <em class="parameter"><code>glyphs</code></em> array </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> which to store the retrieved extents. +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> which to store the retrieved extents. </td> </tr> </tbody> @@ -531,9 +531,9 @@ rectangle (extents.width and extents.height).</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633073"></a><h3> +<a name="id2650560"></a><h3> <a name="cairo-scaled-font-get-font-face"></a>cairo_scaled_font_get_font_face ()</h3> -<a class="indexterm" name="id2633087"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_scaled_font_get_font_face (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2650575"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_scaled_font_get_font_face (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Gets the font face that this scaled font was created for.</p> <p> @@ -543,13 +543,13 @@ Gets the font face that this scaled font was created for.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> The <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> with which <em class="parameter"><code>scaled_font</code></em> was +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> The <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> with which <em class="parameter"><code>scaled_font</code></em> was created. </td> @@ -561,10 +561,10 @@ created. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633166"></a><h3> +<a name="id2650665"></a><h3> <a name="cairo-scaled-font-get-font-options"></a>cairo_scaled_font_get_font_options ()</h3> -<a class="indexterm" name="id2633182"></a><pre class="programlisting">void cairo_scaled_font_get_font_options (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2650682"></a><pre class="programlisting">void cairo_scaled_font_get_font_options (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Stores the font options with which <em class="parameter"><code>scaled_font</code></em> was created into <em class="parameter"><code>options</code></em>.</p> @@ -575,12 +575,12 @@ Stores the font options with which <em class="parameter"><code>scaled_font</code <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> <td> return value for the font options </td> </tr> @@ -591,10 +591,10 @@ Stores the font options with which <em class="parameter"><code>scaled_font</code </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633269"></a><h3> +<a name="id2650757"></a><h3> <a name="cairo-scaled-font-get-font-matrix"></a>cairo_scaled_font_get_font_matrix ()</h3> -<a class="indexterm" name="id2633284"></a><pre class="programlisting">void cairo_scaled_font_get_font_matrix (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix);</pre> +<a class="indexterm" name="id2650772"></a><pre class="programlisting">void cairo_scaled_font_get_font_matrix (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *font_matrix);</pre> <p> Stores the font matrix with which <em class="parameter"><code>scaled_font</code></em> was created into <em class="parameter"><code>matrix</code></em>.</p> @@ -605,12 +605,12 @@ Stores the font matrix with which <em class="parameter"><code>scaled_font</code> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>font_matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>font_matrix</code></em> :</span></p></td> <td> return value for the matrix </td> </tr> @@ -621,10 +621,10 @@ Stores the font matrix with which <em class="parameter"><code>scaled_font</code> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633372"></a><h3> +<a name="id2650860"></a><h3> <a name="cairo-scaled-font-get-ctm"></a>cairo_scaled_font_get_ctm ()</h3> -<a class="indexterm" name="id2633385"></a><pre class="programlisting">void cairo_scaled_font_get_ctm (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm);</pre> +<a class="indexterm" name="id2650873"></a><pre class="programlisting">void cairo_scaled_font_get_ctm (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *ctm);</pre> <p> Stores the CTM with which <em class="parameter"><code>scaled_font</code></em> was created into <em class="parameter"><code>ctm</code></em>.</p> <p> @@ -634,12 +634,12 @@ Stores the CTM with which <em class="parameter"><code>scaled_font</code></em> wa <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>ctm</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>ctm</code></em> :</span></p></td> <td> return value for the CTM </td> </tr> @@ -650,12 +650,12 @@ Stores the CTM with which <em class="parameter"><code>scaled_font</code></em> wa </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633471"></a><h3> +<a name="id2650959"></a><h3> <a name="cairo-scaled-font-get-type"></a>cairo_scaled_font_get_type ()</h3> -<a class="indexterm" name="id2633484"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> cairo_scaled_font_get_type (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2650972"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> cairo_scaled_font_get_type (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> This function returns the type of the backend used to create -a scaled font. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> for available types.</p> +a scaled font. See <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> for available types.</p> <p> </p> @@ -663,12 +663,12 @@ a scaled font. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><spa <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The type of <em class="parameter"><code>scaled_font</code></em>. </td> @@ -680,10 +680,10 @@ a scaled font. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><spa </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633562"></a><h3> +<a name="id2651050"></a><h3> <a name="cairo-scaled-font-get-reference-count"></a>cairo_scaled_font_get_reference_count ()</h3> -<a class="indexterm" name="id2633577"></a><pre class="programlisting">unsigned int cairo_scaled_font_get_reference_count - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2651065"></a><pre class="programlisting">unsigned int cairo_scaled_font_get_reference_count + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Returns the current reference count of <em class="parameter"><code>scaled_font</code></em>.</p> <p> @@ -693,12 +693,12 @@ Returns the current reference count of <em class="parameter"><code>scaled_font</ <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current reference count of <em class="parameter"><code>scaled_font</code></em>. If the object is a nil object, 0 will be returned. @@ -711,12 +711,12 @@ object is a nil object, 0 will be returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633659"></a><h3> +<a name="id2651147"></a><h3> <a name="cairo-scaled-font-set-user-data"></a>cairo_scaled_font_set_user_data ()</h3> -<a class="indexterm" name="id2633673"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_scaled_font_set_user_data (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="indexterm" name="id2651161"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_scaled_font_set_user_data (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> <p> Attach user data to <em class="parameter"><code>scaled_font</code></em>. To remove user data from a surface, call this function with the key that was used to set it and <code class="literal">NULL</code> @@ -728,30 +728,30 @@ for <em class="parameter"><code>data</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of a <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of a <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>user_data</code></em> :</span></td> -<td> the user data to attach to the <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> +<td> the user data to attach to the <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>destroy</code></em> :</span></td> -<td> a <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the -<a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the +<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the +<a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the same key. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a slot could not be allocated for the user data. </td> @@ -763,10 +763,10 @@ slot could not be allocated for the user data. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2633864"></a><h3> +<a name="id2651352"></a><h3> <a name="cairo-scaled-font-get-user-data"></a>cairo_scaled_font_get_user_data ()</h3> -<a class="indexterm" name="id2633878"></a><pre class="programlisting">void* cairo_scaled_font_get_user_data (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> +<a class="indexterm" name="id2651366"></a><pre class="programlisting">void* cairo_scaled_font_get_user_data (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> <p> Return user data previously attached to <em class="parameter"><code>scaled_font</code></em> using the specified key. If no user data has been attached with the given @@ -778,18 +778,18 @@ key this function returns <code class="literal">NULL</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of the <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of the <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was attached to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the user data previously attached or <code class="literal">NULL</code>. </td> @@ -800,6 +800,11 @@ attached to </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2651485"></a><div class="refsect2" lang="en"><a name="id2651486"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2651487"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Text.html b/doc/public/html/cairo-Text.html index 97c5d97..a824bbb 100644 --- a/doc/public/html/cairo-Text.html +++ b/doc/public/html/cairo-Text.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Text</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Drawing.html" title="Drawing"> <link rel="prev" href="cairo-Transformations.html" title="Transformations"> <link rel="next" href="Fonts.html" title="Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="Fonts.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2611253" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2621191" class="shortcut">Top</a>  |  - <a href="#id2622335" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2589825" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Text"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2611253"></a><span class="refentrytitle">Text</span> +<a name="id2621191"></a><span class="refentrytitle">Text</span> </h2> <p>Text — Rendering text and sets of glyphs</p> </td> @@ -51,64 +51,64 @@ - <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a>; -enum <a href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a>; -enum <a href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a>; -void <a href="cairo-Text.html#cairo-select-font-face">cairo_select_font_face</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a>; +enum <a class="link" href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a>; +enum <a class="link" href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a>; +void <a class="link" href="cairo-Text.html#cairo-select-font-face">cairo_select_font_face</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *family, - <a href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a> slant, - <a href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a> weight); -void <a href="cairo-Text.html#cairo-set-font-size">cairo_set_font_size</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a> slant, + <a class="link" href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a> weight); +void <a class="link" href="cairo-Text.html#cairo-set-font-size">cairo_set_font_size</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double size); -void <a href="cairo-Text.html#cairo-set-font-matrix">cairo_set_font_matrix</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Text.html#cairo-get-font-matrix">cairo_get_font_matrix</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Text.html#cairo-set-font-options">cairo_set_font_options</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -void <a href="cairo-Text.html#cairo-get-font-options">cairo_get_font_options</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -void <a href="cairo-Text.html#cairo-set-font-face">cairo_set_font_face</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-Text.html#cairo-get-font-face">cairo_get_font_face</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Text.html#cairo-set-scaled-font">cairo_set_scaled_font</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a href="cairo-Text.html#cairo-get-scaled-font">cairo_get_scaled_font</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Text.html#cairo-show-text">cairo_show_text</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Text.html#cairo-set-font-matrix">cairo_set_font_matrix</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Text.html#cairo-get-font-matrix">cairo_get_font_matrix</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Text.html#cairo-set-font-options">cairo_set_font_options</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +void <a class="link" href="cairo-Text.html#cairo-get-font-options">cairo_get_font_options</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +void <a class="link" href="cairo-Text.html#cairo-set-font-face">cairo_set_font_face</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-Text.html#cairo-get-font-face">cairo_get_font_face</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Text.html#cairo-set-scaled-font">cairo_set_scaled_font</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* <a class="link" href="cairo-Text.html#cairo-get-scaled-font">cairo_get_scaled_font</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Text.html#cairo-show-text">cairo_show_text</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8); -void <a href="cairo-Text.html#cairo-show-glyphs">cairo_show_glyphs</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +void <a class="link" href="cairo-Text.html#cairo-show-glyphs">cairo_show_glyphs</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs); -void <a href="cairo-Text.html#cairo-font-extents">cairo_font_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents); -void <a href="cairo-Text.html#cairo-text-extents">cairo_text_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Text.html#cairo-font-extents">cairo_font_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents); +void <a class="link" href="cairo-Text.html#cairo-text-extents">cairo_text_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); -void <a href="cairo-Text.html#cairo-glyph-extents">cairo_glyph_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); +void <a class="link" href="cairo-Text.html#cairo-glyph-extents">cairo_glyph_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2622335"></a><h2>Description</h2> +<a name="id2589825"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2622351"></a><h2>Details</h2> +<a name="id2589841"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2622362"></a><h3> +<a name="id2589852"></a><h3> <a name="cairo-glyph-t"></a>cairo_glyph_t</h3> -<a class="indexterm" name="id2622374"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2589864"></a><pre class="programlisting">typedef struct { unsigned long index; double x; double y; } cairo_glyph_t; </pre> <p> -The <a href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a> structure holds information about a single glyph +The <a class="link" href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a> structure holds information about a single glyph when drawing or measuring text. A font is (in simple terms) a collection of shapes used to draw text. A glyph is one of these shapes. There can be multiple glyphs for a single character @@ -130,13 +130,13 @@ with respect to the overall origin</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term">double <em class="structfield"><code>x</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>x</code></em>;</span></p></td> <td> the offset in the X direction between the origin used for drawing or measuring the string and the origin of this glyph. </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>y</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>y</code></em>;</span></p></td> <td> the offset in the Y direction between the origin used for drawing or measuring the string and the origin of this glyph. </td> @@ -146,9 +146,9 @@ with respect to the overall origin</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2622827"></a><h3> +<a name="id2621455"></a><h3> <a name="cairo-font-slant-t"></a>enum cairo_font_slant_t</h3> -<a class="indexterm" name="id2622839"></a><pre class="programlisting">typedef enum _cairo_font_slant { +<a class="indexterm" name="id2621468"></a><pre class="programlisting">typedef enum _cairo_font_slant { CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_SLANT_ITALIC, CAIRO_FONT_SLANT_OBLIQUE @@ -163,17 +163,17 @@ Specifies variants of a font face based on their slant.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-FONT-SLANT-NORMAL:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_NORMAL</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-SLANT-NORMAL:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_NORMAL</code></span></p></td> <td> Upright font style </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-SLANT-ITALIC:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_ITALIC</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-SLANT-ITALIC:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_ITALIC</code></span></p></td> <td> Italic font style </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-SLANT-OBLIQUE:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_OBLIQUE</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-SLANT-OBLIQUE:CAPS"></a><code class="literal">CAIRO_FONT_SLANT_OBLIQUE</code></span></p></td> <td> Oblique font style </td> </tr> @@ -182,9 +182,9 @@ Specifies variants of a font face based on their slant.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2622927"></a><h3> +<a name="id2621556"></a><h3> <a name="cairo-font-weight-t"></a>enum cairo_font_weight_t</h3> -<a class="indexterm" name="id2622940"></a><pre class="programlisting">typedef enum _cairo_font_weight { +<a class="indexterm" name="id2621568"></a><pre class="programlisting">typedef enum _cairo_font_weight { CAIRO_FONT_WEIGHT_NORMAL, CAIRO_FONT_WEIGHT_BOLD } cairo_font_weight_t; @@ -198,12 +198,12 @@ Specifies variants of a font face based on their weight.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-FONT-WEIGHT-NORMAL:CAPS"></a><code class="literal">CAIRO_FONT_WEIGHT_NORMAL</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-WEIGHT-NORMAL:CAPS"></a><code class="literal">CAIRO_FONT_WEIGHT_NORMAL</code></span></p></td> <td> Normal font weight </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-WEIGHT-BOLD:CAPS"></a><code class="literal">CAIRO_FONT_WEIGHT_BOLD</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-WEIGHT-BOLD:CAPS"></a><code class="literal">CAIRO_FONT_WEIGHT_BOLD</code></span></p></td> <td> Bold font weight </td> </tr> @@ -212,12 +212,12 @@ Specifies variants of a font face based on their weight.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2559816"></a><h3> +<a name="id2582023"></a><h3> <a name="cairo-select-font-face"></a>cairo_select_font_face ()</h3> -<a class="indexterm" name="id2559828"></a><pre class="programlisting">void cairo_select_font_face (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2582034"></a><pre class="programlisting">void cairo_select_font_face (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *family, - <a href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a> slant, - <a href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a> weight);</pre> + <a class="link" href="cairo-Text.html#cairo-font-slant-t">cairo_font_slant_t</a> slant, + <a class="link" href="cairo-Text.html#cairo-font-weight-t">cairo_font_weight_t</a> weight);</pre> <p> Selects a family and style of font from a simplified description as a family name, slant and weight. This function is meant to be used @@ -233,22 +233,22 @@ cairo.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>family</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>family</code></em> :</span></p></td> <td> a font family name, encoded in UTF-8 </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>slant</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>slant</code></em> :</span></p></td> <td> the slant for the font </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>weight</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>weight</code></em> :</span></p></td> <td> the weight for the font </td> </tr> @@ -257,14 +257,14 @@ cairo.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2559954"></a><h3> +<a name="id2582161"></a><h3> <a name="cairo-set-font-size"></a>cairo_set_font_size ()</h3> -<a class="indexterm" name="id2559967"></a><pre class="programlisting">void cairo_set_font_size (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2582173"></a><pre class="programlisting">void cairo_set_font_size (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double size);</pre> <p> Sets the current font matrix to a scale by a factor of <em class="parameter"><code>size</code></em>, replacing -any font matrix previously set with <a href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a> or -<a href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. This results in a font size of <em class="parameter"><code>size</code></em> user space +any font matrix previously set with <a class="link" href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a> or +<a class="link" href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. This results in a font size of <em class="parameter"><code>size</code></em> user space units. (More precisely, this matrix will result in the font's em-square being a <em class="parameter"><code>size</code></em> by <em class="parameter"><code>size</code></em> square in user space.)</p> <p> @@ -274,12 +274,12 @@ em-square being a <em class="parameter"><code>size</code></em> by <em class="par <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>size</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td> <td> the new font size, in user space units </td> </tr> @@ -288,15 +288,15 @@ em-square being a <em class="parameter"><code>size</code></em> by <em class="par </div> <hr> <div class="refsect2" lang="en"> -<a name="id2560088"></a><h3> +<a name="id2645057"></a><h3> <a name="cairo-set-font-matrix"></a>cairo_set_font_matrix ()</h3> -<a class="indexterm" name="id2627620"></a><pre class="programlisting">void cairo_set_font_matrix (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2645067"></a><pre class="programlisting">void cairo_set_font_matrix (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Sets the current font matrix to <em class="parameter"><code>matrix</code></em>. The font matrix gives a transformation from the design space of the font (in this space, the em-square is 1 unit by 1 unit) to user space. Normally, a -simple scale is used (see <a href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a>), but a more +simple scale is used (see <a class="link" href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a>), but a more complex font matrix can be used to shear the font or stretch it unequally along the two axes</p> <p> @@ -306,13 +306,13 @@ or stretch it unequally along the two axes</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> describing a transform to be applied to +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> describing a transform to be applied to the current font. </td> </tr> @@ -321,13 +321,13 @@ the current font. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627716"></a><h3> +<a name="id2645162"></a><h3> <a name="cairo-get-font-matrix"></a>cairo_get_font_matrix ()</h3> -<a class="indexterm" name="id2627726"></a><pre class="programlisting">void cairo_get_font_matrix (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2645173"></a><pre class="programlisting">void cairo_get_font_matrix (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Stores the current font matrix into <em class="parameter"><code>matrix</code></em>. See -<a href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>.</p> +<a class="link" href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>.</p> <p> </p> @@ -335,12 +335,12 @@ Stores the current font matrix into <em class="parameter"><code>matrix</code></e <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> return value for the matrix </td> </tr> @@ -349,15 +349,15 @@ Stores the current font matrix into <em class="parameter"><code>matrix</code></e </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627815"></a><h3> +<a name="id2645265"></a><h3> <a name="cairo-set-font-options"></a>cairo_set_font_options ()</h3> -<a class="indexterm" name="id2627826"></a><pre class="programlisting">void cairo_set_font_options (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2645276"></a><pre class="programlisting">void cairo_set_font_options (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> -Sets a set of custom font rendering options for the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. +Sets a set of custom font rendering options for the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. Rendering options are derived by merging these options with the options derived from underlying surface; if the value in <em class="parameter"><code>options</code></em> -has a default value (like <a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-DEFAULT:CAPS"><code class="literal">CAIRO_ANTIALIAS_DEFAULT</code></a>), then the value +has a default value (like <a class="link" href="cairo-cairo-t.html#CAIRO-ANTIALIAS-DEFAULT:CAPS"><code class="literal">CAIRO_ANTIALIAS_DEFAULT</code></a>), then the value from the surface is used.</p> <p> @@ -366,12 +366,12 @@ from the surface is used.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> <td> font options to use </td> </tr> @@ -380,15 +380,15 @@ from the surface is used.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2627928"></a><h3> +<a name="id2645379"></a><h3> <a name="cairo-get-font-options"></a>cairo_get_font_options ()</h3> -<a class="indexterm" name="id2627939"></a><pre class="programlisting">void cairo_get_font_options (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2645390"></a><pre class="programlisting">void cairo_get_font_options (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> -Retrieves font rendering options set via <a href="cairo-Text.html#cairo-set-font-options"><span class="type">cairo_set_font_options</span></a>. +Retrieves font rendering options set via <a class="link" href="cairo-Text.html#cairo-set-font-options"><span class="type">cairo_set_font_options</span></a>. Note that the returned options do not include any options derived from the underlying surface; they are literally the options -passed to <a href="cairo-Text.html#cairo-set-font-options"><code class="function">cairo_set_font_options()</code></a>.</p> +passed to <a class="link" href="cairo-Text.html#cairo-set-font-options"><code class="function">cairo_set_font_options()</code></a>.</p> <p> </p> @@ -396,13 +396,13 @@ passed to <a href="cairo-Text.html#cairo-set-font-options"><code class="function <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object into which to store +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object into which to store the retrieved options. All existing values are overwritten </td> </tr> @@ -411,13 +411,13 @@ passed to <a href="cairo-Text.html#cairo-set-font-options"><code class="function </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628020"></a><h3> +<a name="id2645472"></a><h3> <a name="cairo-set-font-face"></a>cairo_set_font_face ()</h3> -<a class="indexterm" name="id2628031"></a><pre class="programlisting">void cairo_set_font_face (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2645482"></a><pre class="programlisting">void cairo_set_font_face (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> -Replaces the current <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> object in the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with -<em class="parameter"><code>font_face</code></em>. The replaced font face in the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> will be +Replaces the current <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> object in the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with +<em class="parameter"><code>font_face</code></em>. The replaced font face in the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> will be destroyed if there are no other references to it.</p> <p> @@ -426,13 +426,13 @@ destroyed if there are no other references to it.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>, or <code class="literal">NULL</code> to restore to the default font +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>, or <code class="literal">NULL</code> to restore to the default font </td> </tr> </tbody> @@ -440,11 +440,11 @@ destroyed if there are no other references to it.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628141"></a><h3> +<a name="id2645593"></a><h3> <a name="cairo-get-font-face"></a>cairo_get_font_face ()</h3> -<a class="indexterm" name="id2628151"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_get_font_face (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2645603"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_get_font_face (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current font face for a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> +Gets the current font face for a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> <p> </p> @@ -452,22 +452,22 @@ Gets the current font face for a <a href="cairo-cairo-t.html#cairo-t"><span clas <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current font face. This object is owned by cairo. To keep a reference to it, you must call cairo_font_face_reference. This function never returns <code class="literal">NULL</code>. If memory cannot be allocated, a -special "nil" <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> object will be returned on which -<a href="cairo-cairo-font-face-t.html#cairo-font-face-status"><code class="function">cairo_font_face_status()</code></a> returns <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using +special "nil" <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> object will be returned on which +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-status"><code class="function">cairo_font_face_status()</code></a> returns <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using this nil object will cause its error state to propagate to other objects it is passed to, (for example, calling -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> with a nil font will trigger an error that +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> with a nil font will trigger an error that will shutdown the cairo_t object). </td> </tr> @@ -476,16 +476,16 @@ will shutdown the cairo_t object). </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628265"></a><h3> +<a name="id2645717"></a><h3> <a name="cairo-set-scaled-font"></a>cairo_set_scaled_font ()</h3> -<a class="indexterm" name="id2628278"></a><pre class="programlisting">void cairo_set_scaled_font (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2645729"></a><pre class="programlisting">void cairo_set_scaled_font (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Replaces the current font face, font matrix, and font options in -the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with those of the <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>. Except for -some translation, the current CTM of the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> should be the -same as that of the <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>, which can be accessed -using <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm"><code class="function">cairo_scaled_font_get_ctm()</code></a>.</p> +the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with those of the <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>. Except for +some translation, the current CTM of the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> should be the +same as that of the <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a>, which can be accessed +using <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm"><code class="function">cairo_scaled_font_get_ctm()</code></a>.</p> <p> </p> @@ -493,13 +493,13 @@ using <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm"><code class="f <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> </td> </tr> </tbody> @@ -509,11 +509,11 @@ using <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-ctm"><code class="f </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628396"></a><h3> +<a name="id2645848"></a><h3> <a name="cairo-get-scaled-font"></a>cairo_get_scaled_font ()</h3> -<a class="indexterm" name="id2628409"></a><pre class="programlisting"><a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_get_scaled_font (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2645861"></a><pre class="programlisting"><a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a>* cairo_get_scaled_font (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current scaled font for a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> +Gets the current scaled font for a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> <p> </p> @@ -521,22 +521,22 @@ Gets the current scaled font for a <a href="cairo-cairo-t.html#cairo-t"><span cl <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current scaled font. This object is owned by cairo. To keep a reference to it, you must call -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a>. +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"><code class="function">cairo_scaled_font_reference()</code></a>. This function never returns <code class="literal">NULL</code>. If memory cannot be allocated, a -special "nil" <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> object will be returned on which -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-status"><code class="function">cairo_scaled_font_status()</code></a> returns <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using +special "nil" <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> object will be returned on which +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-status"><code class="function">cairo_scaled_font_status()</code></a> returns <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. Using this nil object will cause its error state to propagate to other objects it is passed to, (for example, calling -<a href="cairo-Text.html#cairo-set-scaled-font"><code class="function">cairo_set_scaled_font()</code></a> with a nil font will trigger an error that +<a class="link" href="cairo-Text.html#cairo-set-scaled-font"><code class="function">cairo_set_scaled_font()</code></a> with a nil font will trigger an error that will shutdown the cairo_t object). </td> @@ -548,9 +548,9 @@ will shutdown the cairo_t object). </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628538"></a><h3> +<a name="id2645989"></a><h3> <a name="cairo-show-text"></a>cairo_show_text ()</h3> -<a class="indexterm" name="id2628548"></a><pre class="programlisting">void cairo_show_text (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2646000"></a><pre class="programlisting">void cairo_show_text (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8);</pre> <p> A drawing operator that generates the shape from a string of UTF-8 @@ -569,13 +569,13 @@ After this call the current point is moved to the origin of where the next glyph would be placed in this same progression. That is, the current point will be at the origin of the final glyph offset by its advance values. This allows for easy display of a single -logical string with multiple calls to <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. +logical string with multiple calls to <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. </p> <p> -NOTE: The <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a> function call is part of what the cairo +NOTE: The <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a> function call is part of what the cairo designers call the "toy" text API. It is convenient for short demos and simple programs, but it is not expected to be adequate for -serious text-using applications. See <a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a> for the +serious text-using applications. See <a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a> for the "real" text display API in cairo.</p> <p> @@ -584,12 +584,12 @@ serious text-using applications. See <a href="cairo-Text.html#cairo-show-glyphs" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>utf8</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> <td> a string of text encoded in UTF-8 </td> </tr> @@ -598,10 +598,10 @@ serious text-using applications. See <a href="cairo-Text.html#cairo-show-glyphs" </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628663"></a><h3> +<a name="id2646115"></a><h3> <a name="cairo-show-glyphs"></a>cairo_show_glyphs ()</h3> -<a class="indexterm" name="id2628674"></a><pre class="programlisting">void cairo_show_glyphs (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +<a class="indexterm" name="id2646125"></a><pre class="programlisting">void cairo_show_glyphs (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs);</pre> <p> A drawing operator that generates the shape from an array of glyphs, @@ -614,17 +614,17 @@ rendered according to the current font_face, font_size <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td> <td> array of glyphs to show </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></p></td> <td> number of glyphs to show </td> </tr> @@ -633,10 +633,10 @@ rendered according to the current font_face, font_size </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628759"></a><h3> +<a name="id2646210"></a><h3> <a name="cairo-font-extents"></a>cairo_font_extents ()</h3> -<a class="indexterm" name="id2628769"></a><pre class="programlisting">void cairo_font_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents);</pre> +<a class="indexterm" name="id2646221"></a><pre class="programlisting">void cairo_font_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t">cairo_font_extents_t</a> *extents);</pre> <p> Gets the font extents for the currently selected font.</p> <p> @@ -646,13 +646,13 @@ Gets the font extents for the currently selected font.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> object into which the results +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-font-extents-t"><span class="type">cairo_font_extents_t</span></a> object into which the results will be stored. </td> </tr> @@ -661,17 +661,17 @@ will be stored. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628847"></a><h3> +<a name="id2646298"></a><h3> <a name="cairo-text-extents"></a>cairo_text_extents ()</h3> -<a class="indexterm" name="id2628857"></a><pre class="programlisting">void cairo_text_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2646309"></a><pre class="programlisting">void cairo_text_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const char *utf8, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> <p> Gets the extents for a string of text. The extents describe a user-space rectangle that encloses the "inked" portion of the text, -(as it would be drawn by <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>). Additionally, the +(as it would be drawn by <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>). Additionally, the x_advance and y_advance values indicate the amount by which the -current point would be advanced by <a href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. +current point would be advanced by <a class="link" href="cairo-Text.html#cairo-show-text"><code class="function">cairo_show_text()</code></a>. </p> <p> Note that whitespace characters do not directly contribute to the @@ -687,18 +687,18 @@ affect the x_advance and y_advance values.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>utf8</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>utf8</code></em> :</span></p></td> <td> a string of text, encoded in UTF-8 </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> object into which the results +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> object into which the results will be stored </td> </tr> @@ -707,16 +707,16 @@ will be stored </div> <hr> <div class="refsect2" lang="en"> -<a name="id2628985"></a><h3> +<a name="id2646436"></a><h3> <a name="cairo-glyph-extents"></a>cairo_glyph_extents ()</h3> -<a class="indexterm" name="id2628995"></a><pre class="programlisting">void cairo_glyph_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, +<a class="indexterm" name="id2646447"></a><pre class="programlisting">void cairo_glyph_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Text.html#cairo-glyph-t">cairo_glyph_t</a> *glyphs, int num_glyphs, - <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> + <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t">cairo_text_extents_t</a> *extents);</pre> <p> Gets the extents for an array of glyphs. The extents describe a user-space rectangle that encloses the "inked" portion of the -glyphs, (as they would be drawn by <a href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>). +glyphs, (as they would be drawn by <a class="link" href="cairo-Text.html#cairo-show-glyphs"><code class="function">cairo_show_glyphs()</code></a>). Additionally, the x_advance and y_advance values indicate the amount by which the current point would be advanced by cairo_show_glyphs. @@ -731,23 +731,23 @@ rectangle (extents.width and extents.height).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></td> -<td> an array of <a href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a> objects +<td><p><span class="term"><em class="parameter"><code>glyphs</code></em> :</span></p></td> +<td> an array of <a class="link" href="cairo-Text.html#cairo-glyph-t"><span class="type">cairo_glyph_t</span></a> objects </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_glyphs</code></em> :</span></p></td> <td> the number of elements in <em class="parameter"><code>glyphs</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>extents</code></em> :</span></td> -<td> a <a href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> object into which the results +<td><p><span class="term"><em class="parameter"><code>extents</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Scaled-Fonts.html#cairo-text-extents-t"><span class="type">cairo_text_extents_t</span></a> object into which the results will be stored </td> </tr> @@ -755,6 +755,11 @@ will be stored </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2646593"></a><div class="refsect2" lang="en"><a name="id2646594"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2646595"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Transformations.html b/doc/public/html/cairo-Transformations.html index d84d455..ae84200 100644 --- a/doc/public/html/cairo-Transformations.html +++ b/doc/public/html/cairo-Transformations.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Transformations</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Drawing.html" title="Drawing"> <link rel="prev" href="cairo-Patterns.html" title="Patterns"> <link rel="next" href="cairo-Text.html" title="Text"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Text.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589853" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2604403" class="shortcut">Top</a>  |  - <a href="#id2574486" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2592034" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Transformations"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2589853"></a><span class="refentrytitle">Transformations</span> +<a name="id2604403"></a><span class="refentrytitle">Transformations</span> </h2> <p>Transformations — Manipulating the current transformation matrix</p> </td> @@ -51,47 +51,47 @@ -void <a href="cairo-Transformations.html#cairo-translate">cairo_translate</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-translate">cairo_translate</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double tx, double ty); -void <a href="cairo-Transformations.html#cairo-scale">cairo_scale</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-scale">cairo_scale</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double sx, double sy); -void <a href="cairo-Transformations.html#cairo-rotate">cairo_rotate</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-rotate">cairo_rotate</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double angle); -void <a href="cairo-Transformations.html#cairo-transform">cairo_transform</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Transformations.html#cairo-set-matrix">cairo_set_matrix</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Transformations.html#cairo-get-matrix">cairo_get_matrix</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-Transformations.html#cairo-identity-matrix">cairo_identity_matrix</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-Transformations.html#cairo-user-to-device">cairo_user_to_device</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-transform">cairo_transform</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Transformations.html#cairo-set-matrix">cairo_set_matrix</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Transformations.html#cairo-get-matrix">cairo_get_matrix</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-Transformations.html#cairo-identity-matrix">cairo_identity_matrix</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-Transformations.html#cairo-user-to-device">cairo_user_to_device</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y); -void <a href="cairo-Transformations.html#cairo-user-to-device-distance">cairo_user_to_device_distance</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-user-to-device-distance">cairo_user_to_device_distance</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dx, double *dy); -void <a href="cairo-Transformations.html#cairo-device-to-user">cairo_device_to_user</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-device-to-user">cairo_device_to_user</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y); -void <a href="cairo-Transformations.html#cairo-device-to-user-distance">cairo_device_to_user_distance</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-Transformations.html#cairo-device-to-user-distance">cairo_device_to_user_distance</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dx, double *dy); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2574486"></a><h2>Description</h2> +<a name="id2592034"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2574502"></a><h2>Details</h2> +<a name="id2592050"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2574513"></a><h3> +<a name="id2628036"></a><h3> <a name="cairo-translate"></a>cairo_translate ()</h3> -<a class="indexterm" name="id2574525"></a><pre class="programlisting">void cairo_translate (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2628048"></a><pre class="programlisting">void cairo_translate (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double tx, double ty);</pre> <p> @@ -107,17 +107,17 @@ user-space origin takes place after any existing transformation.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>tx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>tx</code></em> :</span></p></td> <td> amount to translate in the X direction </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>ty</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>ty</code></em> :</span></p></td> <td> amount to translate in the Y direction </td> </tr> @@ -126,9 +126,9 @@ user-space origin takes place after any existing transformation.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2566048"></a><h3> +<a name="id2628157"></a><h3> <a name="cairo-scale"></a>cairo_scale ()</h3> -<a class="indexterm" name="id2566060"></a><pre class="programlisting">void cairo_scale (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2628169"></a><pre class="programlisting">void cairo_scale (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double sx, double sy);</pre> <p> @@ -143,17 +143,17 @@ space.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sx</code></em> :</span></p></td> <td> scale factor for the X dimension </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sy</code></em> :</span></p></td> <td> scale factor for the Y dimension </td> </tr> @@ -162,9 +162,9 @@ space.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2566167"></a><h3> +<a name="id2628276"></a><h3> <a name="cairo-rotate"></a>cairo_rotate ()</h3> -<a class="indexterm" name="id2566179"></a><pre class="programlisting">void cairo_rotate (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2629594"></a><pre class="programlisting">void cairo_rotate (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double angle);</pre> <p> Modifies the current transformation matrix (CTM) by rotating the @@ -179,12 +179,12 @@ toward the positive Y axis.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>angle</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>angle</code></em> :</span></p></td> <td> angle (in radians) by which the user-space axes will be rotated </td> @@ -194,10 +194,10 @@ rotated </div> <hr> <div class="refsect2" lang="en"> -<a name="id2566262"></a><h3> +<a name="id2629677"></a><h3> <a name="cairo-transform"></a>cairo_transform ()</h3> -<a class="indexterm" name="id2566274"></a><pre class="programlisting">void cairo_transform (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2629689"></a><pre class="programlisting">void cairo_transform (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Modifies the current transformation matrix (CTM) by applying <em class="parameter"><code>matrix</code></em> as an additional transformation. The new transformation of @@ -209,12 +209,12 @@ user space takes place after any existing transformation.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a transformation to be applied to the user-space axes </td> </tr> @@ -223,10 +223,10 @@ user space takes place after any existing transformation.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2564448"></a><h3> +<a name="id2629770"></a><h3> <a name="cairo-set-matrix"></a>cairo_set_matrix ()</h3> -<a class="indexterm" name="id2564460"></a><pre class="programlisting">void cairo_set_matrix (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2629783"></a><pre class="programlisting">void cairo_set_matrix (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Modifies the current transformation matrix (CTM) by setting it equal to <em class="parameter"><code>matrix</code></em>.</p> @@ -237,12 +237,12 @@ equal to <em class="parameter"><code>matrix</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a transformation matrix from user space to device space </td> </tr> @@ -251,10 +251,10 @@ equal to <em class="parameter"><code>matrix</code></em>.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2564540"></a><h3> +<a name="id2628967"></a><h3> <a name="cairo-get-matrix"></a>cairo_get_matrix ()</h3> -<a class="indexterm" name="id2564552"></a><pre class="programlisting">void cairo_get_matrix (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2628978"></a><pre class="programlisting">void cairo_get_matrix (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Stores the current transformation matrix (CTM) into <em class="parameter"><code>matrix</code></em>.</p> <p> @@ -264,12 +264,12 @@ Stores the current transformation matrix (CTM) into <em class="parameter"><code> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> return value for the matrix </td> </tr> @@ -278,9 +278,9 @@ Stores the current transformation matrix (CTM) into <em class="parameter"><code> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2564630"></a><h3> +<a name="id2629056"></a><h3> <a name="cairo-identity-matrix"></a>cairo_identity_matrix ()</h3> -<a class="indexterm" name="id2564641"></a><pre class="programlisting">void cairo_identity_matrix (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2629068"></a><pre class="programlisting">void cairo_identity_matrix (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Resets the current transformation matrix (CTM) by setting it equal to the identity matrix. That is, the user-space and device-space @@ -292,7 +292,7 @@ device-space unit.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -300,9 +300,9 @@ device-space unit.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2566835"></a><h3> +<a name="id2629121"></a><h3> <a name="cairo-user-to-device"></a>cairo_user_to_device ()</h3> -<a class="indexterm" name="id2566846"></a><pre class="programlisting">void cairo_user_to_device (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2629132"></a><pre class="programlisting">void cairo_user_to_device (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y);</pre> <p> @@ -316,17 +316,17 @@ multiplying the given point by the current transformation matrix <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X value of coordinate (in/out parameter) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y value of coordinate (in/out parameter) </td> </tr> @@ -335,14 +335,14 @@ multiplying the given point by the current transformation matrix </div> <hr> <div class="refsect2" lang="en"> -<a name="id2566940"></a><h3> +<a name="id2629225"></a><h3> <a name="cairo-user-to-device-distance"></a>cairo_user_to_device_distance ()</h3> -<a class="indexterm" name="id2566951"></a><pre class="programlisting">void cairo_user_to_device_distance (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2629236"></a><pre class="programlisting">void cairo_user_to_device_distance (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dx, double *dy);</pre> <p> Transform a distance vector from user space to device space. This -function is similar to <a href="cairo-Transformations.html#cairo-user-to-device"><code class="function">cairo_user_to_device()</code></a> except that the +function is similar to <a class="link" href="cairo-Transformations.html#cairo-user-to-device"><code class="function">cairo_user_to_device()</code></a> except that the translation components of the CTM will be ignored when transforming (<em class="parameter"><code>dx</code></em>,<em class="parameter"><code>dy</code></em>).</p> <p> @@ -352,17 +352,17 @@ translation components of the CTM will be ignored when transforming <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td> <td> X component of a distance vector (in/out parameter) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td> <td> Y component of a distance vector (in/out parameter) </td> </tr> @@ -371,9 +371,9 @@ translation components of the CTM will be ignored when transforming </div> <hr> <div class="refsect2" lang="en"> -<a name="id2567068"></a><h3> +<a name="id2627502"></a><h3> <a name="cairo-device-to-user"></a>cairo_device_to_user ()</h3> -<a class="indexterm" name="id2567079"></a><pre class="programlisting">void cairo_device_to_user (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2627513"></a><pre class="programlisting">void cairo_device_to_user (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x, double *y);</pre> <p> @@ -387,17 +387,17 @@ transformation matrix (CTM).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X value of coordinate (in/out parameter) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y value of coordinate (in/out parameter) </td> </tr> @@ -406,14 +406,14 @@ transformation matrix (CTM).</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2567173"></a><h3> +<a name="id2627606"></a><h3> <a name="cairo-device-to-user-distance"></a>cairo_device_to_user_distance ()</h3> -<a class="indexterm" name="id2567184"></a><pre class="programlisting">void cairo_device_to_user_distance (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2627618"></a><pre class="programlisting">void cairo_device_to_user_distance (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dx, double *dy);</pre> <p> Transform a distance vector from device space to user space. This -function is similar to <a href="cairo-Transformations.html#cairo-device-to-user"><code class="function">cairo_device_to_user()</code></a> except that the +function is similar to <a class="link" href="cairo-Transformations.html#cairo-device-to-user"><code class="function">cairo_device_to_user()</code></a> except that the translation components of the inverse CTM will be ignored when transforming (<em class="parameter"><code>dx</code></em>,<em class="parameter"><code>dy</code></em>).</p> <p> @@ -423,17 +423,17 @@ transforming (<em class="parameter"><code>dx</code></em>,<em class="parameter">< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td> <td> X component of a distance vector (in/out parameter) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td> <td> Y component of a distance vector (in/out parameter) </td> </tr> @@ -441,6 +441,11 @@ transforming (<em class="parameter"><code>dx</code></em>,<em class="parameter">< </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2627736"></a><div class="refsect2" lang="en"><a name="id2627737"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2627738"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Types.html b/doc/public/html/cairo-Types.html index 7da47cb..82cc9d4 100644 --- a/doc/public/html/cairo-Types.html +++ b/doc/public/html/cairo-Types.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Types</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Support.html" title="Utilities"> <link rel="prev" href="cairo-Version-Information.html" title="Version Information"> <link rel="next" href="ix01.html" title="Index"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="ix01.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2576435" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2585623" class="shortcut">Top</a>  |  - <a href="#id2608210" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2625436" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Types"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2576435"></a><span class="refentrytitle">Types</span> +<a name="id2585623"></a><span class="refentrytitle">Types</span> </h2> <p>Types — Generic data types used in the cairo API</p> </td> @@ -51,27 +51,27 @@ -typedef <a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a>; - <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a>; -void (<a href="cairo-Types.html#cairo-destroy-func-t">*cairo_destroy_func_t</a>) (void *data); +typedef <a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a>; + <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a>; +void (<a class="link" href="cairo-Types.html#cairo-destroy-func-t">*cairo_destroy_func_t</a>) (void *data); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2608210"></a><h2>Description</h2> +<a name="id2625436"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2581944"></a><h2>Details</h2> +<a name="id2663912"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2580603"></a><h3> +<a name="id2666785"></a><h3> <a name="cairo-bool-t"></a>cairo_bool_t</h3> -<a class="indexterm" name="id2588213"></a><pre class="programlisting">typedef int cairo_bool_t; +<a class="indexterm" name="id2666797"></a><pre class="programlisting">typedef int cairo_bool_t; </pre> <p> -<a href="cairo-Types.html#cairo-bool-t"><span class="type">cairo_bool_t</span></a> is used for boolean values. Returns of type -<a href="cairo-Types.html#cairo-bool-t"><span class="type">cairo_bool_t</span></a> will always be either 0 or 1, but testing against +<a class="link" href="cairo-Types.html#cairo-bool-t"><span class="type">cairo_bool_t</span></a> is used for boolean values. Returns of type +<a class="link" href="cairo-Types.html#cairo-bool-t"><span class="type">cairo_bool_t</span></a> will always be either 0 or 1, but testing against these values explicitly is not encouraged; just use the value as a boolean condition. </p> @@ -88,14 +88,14 @@ value as a boolean condition. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649546"></a><h3> +<a name="id2666845"></a><h3> <a name="cairo-user-data-key-t"></a>cairo_user_data_key_t</h3> -<a class="indexterm" name="id2649558"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2666856"></a><pre class="programlisting">typedef struct { int unused; } cairo_user_data_key_t; </pre> <p> -<a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> is used for attaching user data to cairo +<a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> is used for attaching user data to cairo data structures. The actual contents of the struct is never used, and there is no need to initialize the object; only the unique address of a <span class="type">cairo_data_key_t</span> object is used. Typically, you @@ -106,7 +106,7 @@ would just use the address of a static <span class="type">cairo_data_key_t</span <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term">int <em class="structfield"><code>unused</code></em>;</span></td> +<td><p><span class="term">int <em class="structfield"><code>unused</code></em>;</span></p></td> <td> not used; ignore. </td> </tr></tbody> @@ -114,11 +114,11 @@ would just use the address of a static <span class="type">cairo_data_key_t</span </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649626"></a><h3> +<a name="id2664460"></a><h3> <a name="cairo-destroy-func-t"></a>cairo_destroy_func_t ()</h3> -<a class="indexterm" name="id2649637"></a><pre class="programlisting">void (*cairo_destroy_func_t) (void *data);</pre> +<a class="indexterm" name="id2664471"></a><pre class="programlisting">void (*cairo_destroy_func_t) (void *data);</pre> <p> -<a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> the type of function which is called when a +<a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> the type of function which is called when a data element is destroyed. It is passed the pointer to the data element and should free any memory and resources allocated for it.</p> <p> @@ -127,13 +127,18 @@ element and should free any memory and resources allocated for it.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> <td> The data element being destroyed. </td> </tr></tbody> </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2664530"></a><div class="refsect2" lang="en"><a name="id2664531"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2664532"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Version-Information.html b/doc/public/html/cairo-Version-Information.html index 94d9d0e..75b9ea8 100644 --- a/doc/public/html/cairo-Version-Information.html +++ b/doc/public/html/cairo-Version-Information.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Version Information</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Support.html" title="Utilities"> <link rel="prev" href="cairo-Error-Handling.html" title="Error handling"> <link rel="next" href="cairo-Types.html" title="Types"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Types.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2511576" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2611977" class="shortcut">Top</a>  |  - <a href="#id2651039" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2655350" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Version-Information"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2511576"></a><span class="refentrytitle">Version Information</span> +<a name="id2611977"></a><span class="refentrytitle">Version Information</span> </h2> <p>Version Information — Compile-time and run-time version checks.</p> </td> @@ -51,18 +51,18 @@ -#define <a href="cairo-Version-Information.html#CAIRO-VERSION:CAPS">CAIRO_VERSION</a> -#define <a href="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS">CAIRO_VERSION_MAJOR</a> -#define <a href="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS">CAIRO_VERSION_MINOR</a> -#define <a href="cairo-Version-Information.html#CAIRO-VERSION-MICRO:CAPS">CAIRO_VERSION_MICRO</a> -#define <a href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS">CAIRO_VERSION_STRING</a> -#define <a href="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS">CAIRO_VERSION_ENCODE</a> (major, minor, micro) -int <a href="cairo-Version-Information.html#cairo-version">cairo_version</a> (void); -const char* <a href="cairo-Version-Information.html#cairo-version-string">cairo_version_string</a> (void); +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION:CAPS">CAIRO_VERSION</a> +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS">CAIRO_VERSION_MAJOR</a> +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS">CAIRO_VERSION_MINOR</a> +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-MICRO:CAPS">CAIRO_VERSION_MICRO</a> +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS">CAIRO_VERSION_STRING</a> +#define <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS">CAIRO_VERSION_ENCODE</a> (major, minor, micro) +int <a class="link" href="cairo-Version-Information.html#cairo-version">cairo_version</a> (void); +const char* <a class="link" href="cairo-Version-Information.html#cairo-version-string">cairo_version_string</a> (void); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2651039"></a><h2>Description</h2> +<a name="id2655350"></a><h2>Description</h2> <p> Cairo has a three-part version number scheme. In this scheme, we use even vs. odd numbers to distinguish fixed points in the software @@ -102,7 +102,7 @@ In-progress development (eg. from git) <p> </p> <div class="refsect2" lang="en"> -<a name="id2651090"></a><h3>Compatibility</h3> +<a name="id2664349"></a><h3>Compatibility</h3> <p> The API/ABI compatibility guarantees for various versions are as follows. First, let's assume some cairo-using application code that is @@ -130,7 +130,7 @@ rather the many states between snapshots and releases. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651129"></a><h3>Examining the version</h3> +<a name="id2664387"></a><h3>Examining the version</h3> <p> Cairo provides the ability to examine the version at either compile-time or run-time and in both a human-readable form as well as @@ -170,21 +170,21 @@ if (cairo_version() >= %CAIRO_VERSION_ENCODE(1, 0, 0)) </div> </div> <div class="refsect1" lang="en"> -<a name="id2646232"></a><h2>Details</h2> +<a name="id2664435"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2646243"></a><h3> +<a name="id2664445"></a><h3> <a name="CAIRO-VERSION:CAPS"></a>CAIRO_VERSION</h3> -<a class="indexterm" name="id2646256"></a><pre class="programlisting">#define CAIRO_VERSION</pre> +<a class="indexterm" name="id2665756"></a><pre class="programlisting">#define CAIRO_VERSION</pre> <p> The version of cairo available at compile-time, encoded using -<a href="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS"><code class="function">CAIRO_VERSION_ENCODE()</code></a>. +<a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS"><code class="function">CAIRO_VERSION_ENCODE()</code></a>. </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2646281"></a><h3> +<a name="id2665781"></a><h3> <a name="CAIRO-VERSION-MAJOR:CAPS"></a>CAIRO_VERSION_MAJOR</h3> -<a class="indexterm" name="id2646292"></a><pre class="programlisting">#define CAIRO_VERSION_MAJOR 1 +<a class="indexterm" name="id2665793"></a><pre class="programlisting">#define CAIRO_VERSION_MAJOR 1 </pre> <p> The major component of the version of cairo available at compile-time. @@ -192,9 +192,9 @@ The major component of the version of cairo available at compile-time. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2646309"></a><h3> +<a name="id2665809"></a><h3> <a name="CAIRO-VERSION-MINOR:CAPS"></a>CAIRO_VERSION_MINOR</h3> -<a class="indexterm" name="id2646320"></a><pre class="programlisting">#define CAIRO_VERSION_MINOR 4 +<a class="indexterm" name="id2665821"></a><pre class="programlisting">#define CAIRO_VERSION_MINOR 4 </pre> <p> The minor component of the version of cairo available at compile-time. @@ -202,9 +202,9 @@ The minor component of the version of cairo available at compile-time. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2646337"></a><h3> +<a name="id2665837"></a><h3> <a name="CAIRO-VERSION-MICRO:CAPS"></a>CAIRO_VERSION_MICRO</h3> -<a class="indexterm" name="id2646349"></a><pre class="programlisting">#define CAIRO_VERSION_MICRO 10 +<a class="indexterm" name="id2665849"></a><pre class="programlisting">#define CAIRO_VERSION_MICRO 12 </pre> <p> The micro component of the version of cairo available at compile-time. @@ -212,9 +212,9 @@ The micro component of the version of cairo available at compile-time. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648004"></a><h3> +<a name="id2665865"></a><h3> <a name="CAIRO-VERSION-STRING:CAPS"></a>CAIRO_VERSION_STRING</h3> -<a class="indexterm" name="id2648015"></a><pre class="programlisting">#define CAIRO_VERSION_STRING "1.4.10" +<a class="indexterm" name="id2665877"></a><pre class="programlisting">#define CAIRO_VERSION_STRING "1.4.12" </pre> <p> A human-readable string literal containing the version of cairo available @@ -223,12 +223,12 @@ at compile-time, in the form of "X.Y.Z". </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648032"></a><h3> +<a name="id2665894"></a><h3> <a name="CAIRO-VERSION-ENCODE:CAPS"></a>CAIRO_VERSION_ENCODE()</h3> -<a class="indexterm" name="id2648044"></a><pre class="programlisting">#define CAIRO_VERSION_ENCODE(major, minor, micro)</pre> +<a class="indexterm" name="id2665905"></a><pre class="programlisting">#define CAIRO_VERSION_ENCODE(major, minor, micro)</pre> <p> This macro encodes the given cairo version into an integer. The numbers -returned by <a href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a> and <a href="cairo-Version-Information.html#cairo-version"><code class="function">cairo_version()</code></a> are encoded using this macro. +returned by <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a> and <a class="link" href="cairo-Version-Information.html#cairo-version"><code class="function">cairo_version()</code></a> are encoded using this macro. Two encoded version numbers can be compared as integers. The encoding ensures that later versions compare greater than earlier versions. </p> @@ -236,17 +236,17 @@ that later versions compare greater than earlier versions. <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>major</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>major</code></em> :</span></p></td> <td>the major component of the version number </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>minor</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>minor</code></em> :</span></p></td> <td>the minor component of the version number </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>micro</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>micro</code></em> :</span></p></td> <td>the micro component of the version number @@ -257,9 +257,9 @@ that later versions compare greater than earlier versions. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648131"></a><h3> +<a name="id2664731"></a><h3> <a name="cairo-version"></a>cairo_version ()</h3> -<a class="indexterm" name="id2648144"></a><pre class="programlisting">int cairo_version (void);</pre> +<a class="indexterm" name="id2664743"></a><pre class="programlisting">int cairo_version (void);</pre> <p> Returns the version of the cairo library encoded in a single integer as per CAIRO_VERSION_ENCODE. The encoding ensures that @@ -277,15 +277,15 @@ if (cairo_version() >= CAIRO_VERSION_ENCODE(X,Y,Z)) {...} <p> </p> <p> -See also <a href="cairo-Version-Information.html#cairo-version-string"><code class="function">cairo_version_string()</code></a> as well as the compile-time -equivalents <a href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a> and <a href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS"><code class="literal">CAIRO_VERSION_STRING</code></a>.</p> +See also <a class="link" href="cairo-Version-Information.html#cairo-version-string"><code class="function">cairo_version_string()</code></a> as well as the compile-time +equivalents <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a> and <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS"><code class="literal">CAIRO_VERSION_STRING</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the encoded version. </td> </tr></tbody> @@ -293,29 +293,34 @@ equivalents <a href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code cl </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648236"></a><h3> +<a name="id2664834"></a><h3> <a name="cairo-version-string"></a>cairo_version_string ()</h3> -<a class="indexterm" name="id2648247"></a><pre class="programlisting">const char* cairo_version_string (void);</pre> +<a class="indexterm" name="id2664845"></a><pre class="programlisting">const char* cairo_version_string (void);</pre> <p> Returns the version of the cairo library as a human-readable string of the form "X.Y.Z". </p> <p> -See also <a href="cairo-Version-Information.html#cairo-version"><code class="function">cairo_version()</code></a> as well as the compile-time equivalents -<a href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS"><code class="literal">CAIRO_VERSION_STRING</code></a> and <a href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a>.</p> +See also <a class="link" href="cairo-Version-Information.html#cairo-version"><code class="function">cairo_version()</code></a> as well as the compile-time equivalents +<a class="link" href="cairo-Version-Information.html#CAIRO-VERSION-STRING:CAPS"><code class="literal">CAIRO_VERSION_STRING</code></a> and <a class="link" href="cairo-Version-Information.html#CAIRO-VERSION:CAPS"><code class="literal">CAIRO_VERSION</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a string containing the version. </td> </tr></tbody> </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2666774"></a><div class="refsect2" lang="en"><a name="id2666775"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2666776"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Win32-Fonts.html b/doc/public/html/cairo-Win32-Fonts.html index ed1028f..c9e9190 100644 --- a/doc/public/html/cairo-Win32-Fonts.html +++ b/doc/public/html/cairo-Win32-Fonts.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Win32 Fonts</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Fonts.html" title="Fonts"> <link rel="prev" href="cairo-FreeType-Fonts.html" title="FreeType Fonts"> <link rel="next" href="Surfaces.html" title="Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2571295" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2608938" class="shortcut">Top</a>  |  - <a href="#id2629229" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2576927" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Win32-Fonts"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2571295"></a><span class="refentrytitle">Win32 Fonts</span> +<a name="id2608938"></a><span class="refentrytitle">Win32 Fonts</span> </h2> <p>Win32 Fonts — Font support for Microsoft Windows</p> </td> @@ -51,43 +51,43 @@ -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-logfontw">cairo_win32_font_face_create_for_logfontw</a> +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-logfontw">cairo_win32_font_face_create_for_logfontw</a> (LOGFONTW *logfont); -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-hfont">cairo_win32_font_face_create_for_hfont</a> +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-hfont">cairo_win32_font_face_create_for_hfont</a> (HFONT font); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font">cairo_win32_scaled_font_select_font</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font">cairo_win32_scaled_font_select_font</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, HDC hdc); -void <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-done-font">cairo_win32_scaled_font_done_font</a> (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -double <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor">cairo_win32_scaled_font_get_metrics_factor</a> - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); -void <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-logical-to-device">cairo_win32_scaled_font_get_logical_to_device</a> - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *logical_to_device); -void <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-device-to-logical">cairo_win32_scaled_font_get_device_to_logical</a> - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *device_to_logical); +void <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-done-font">cairo_win32_scaled_font_done_font</a> (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +double <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor">cairo_win32_scaled_font_get_metrics_factor</a> + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font); +void <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-logical-to-device">cairo_win32_scaled_font_get_logical_to_device</a> + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *logical_to_device); +void <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-device-to-logical">cairo_win32_scaled_font_get_device_to_logical</a> + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *device_to_logical); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2629229"></a><h2>Description</h2> +<a name="id2576927"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2629245"></a><h2>Details</h2> +<a name="id2576943"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2629256"></a><h3> +<a name="id2576953"></a><h3> <a name="cairo-win32-font-face-create-for-logfontw"></a>cairo_win32_font_face_create_for_logfontw ()</h3> -<a class="indexterm" name="id2629269"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_win32_font_face_create_for_logfontw +<a class="indexterm" name="id2576966"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_win32_font_face_create_for_logfontw (LOGFONTW *logfont);</pre> <p> Creates a new font for the Win32 font backend based on a <span class="type">LOGFONT</span>. This font can then be used with -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. -The <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> -returned from <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the Win32 backend -and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a>.</p> +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. +The <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +returned from <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the Win32 backend +and can be used with functions such as <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a>.</p> <p> </p> @@ -95,16 +95,16 @@ and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>logfont</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>logfont</code></em> :</span></p></td> <td> A <span class="type">LOGFONTW</span> structure specifying the font to use. The lfHeight, lfWidth, lfOrientation and lfEscapement fields of this structure are ignored. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly created <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with - <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly created <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. </td> </tr> </tbody> @@ -112,17 +112,17 @@ and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win </div> <hr> <div class="refsect2" lang="en"> -<a name="id2634612"></a><h3> +<a name="id2576550"></a><h3> <a name="cairo-win32-font-face-create-for-hfont"></a>cairo_win32_font_face_create_for_hfont ()</h3> -<a class="indexterm" name="id2634625"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_win32_font_face_create_for_hfont +<a class="indexterm" name="id2576562"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_win32_font_face_create_for_hfont (HFONT font);</pre> <p> Creates a new font for the Win32 font backend based on a <span class="type">HFONT</span>. This font can then be used with -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. -The <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> -returned from <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the Win32 backend -and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a>.</p> +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a> or <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>. +The <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> +returned from <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a> is also for the Win32 backend +and can be used with functions such as <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a>.</p> <p> </p> @@ -130,14 +130,14 @@ and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>font</code></em> :</span></p></td> <td> An <span class="type">HFONT</span> structure specifying the font to use. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly created <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with - <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly created <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. Free with + <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> when you are done using it. </td> </tr> </tbody> @@ -145,9 +145,9 @@ and can be used with functions such as <a href="cairo-Win32-Fonts.html#cairo-win </div> <hr> <div class="refsect2" lang="en"> -<a name="id2610404"></a><h3> +<a name="id2647465"></a><h3> <a name="cairo-win32-scaled-font-select-font"></a>cairo_win32_scaled_font_select_font ()</h3> -<a class="indexterm" name="id2610416"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_win32_scaled_font_select_font (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, +<a class="indexterm" name="id2647477"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_win32_scaled_font_select_font (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, HDC hdc);</pre> <p> Selects the font into the given device context and changes the @@ -155,11 +155,11 @@ map mode and world transformation of the device context to match that of the font. This function is intended for use when using layout APIs such as Uniscribe to do text layout with the cairo font. After finishing using the device context, you must call -<a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-done-font"><code class="function">cairo_win32_scaled_font_done_font()</code></a> to release any resources allocated +<a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-done-font"><code class="function">cairo_win32_scaled_font_done_font()</code></a> to release any resources allocated by this function. </p> <p> -See <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor"><code class="function">cairo_win32_scaled_font_get_metrics_factor()</code></a> for converting logical +See <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor"><code class="function">cairo_win32_scaled_font_get_metrics_factor()</code></a> for converting logical coordinates from the device context to font space. </p> <p> @@ -172,20 +172,20 @@ the use of this function to preserve the original graphics state.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> -<td> A <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the Win32 font backend. Such an +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> +<td> A <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t"><span class="type">cairo_scaled_font_t</span></a> from the Win32 font backend. Such an object can be created with <code class="function">cairo_win32_scaled_font_create_for_logfontw()</code>. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>hdc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>hdc</code></em> :</span></p></td> <td> a device context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> if the operation succeeded. - otherwise an error such as <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> and +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> if the operation succeeded. + otherwise an error such as <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> and the device context is unchanged. </td> </tr> @@ -194,18 +194,18 @@ the use of this function to preserve the original graphics state.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2629574"></a><h3> +<a name="id2647921"></a><h3> <a name="cairo-win32-scaled-font-done-font"></a>cairo_win32_scaled_font_done_font ()</h3> -<a class="indexterm" name="id2629586"></a><pre class="programlisting">void cairo_win32_scaled_font_done_font (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2647933"></a><pre class="programlisting">void cairo_win32_scaled_font_done_font (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> -Releases any resources allocated by <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a></p> +Releases any resources allocated by <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a></p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> <td> A scaled font from the Win32 font backend. </td> </tr></tbody> @@ -213,13 +213,13 @@ Releases any resources allocated by <a href="cairo-Win32-Fonts.html#cairo-win32- </div> <hr> <div class="refsect2" lang="en"> -<a name="id2629645"></a><h3> +<a name="id2647992"></a><h3> <a name="cairo-win32-scaled-font-get-metrics-factor"></a>cairo_win32_scaled_font_get_metrics_factor ()</h3> -<a class="indexterm" name="id2629660"></a><pre class="programlisting">double cairo_win32_scaled_font_get_metrics_factor - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> +<a class="indexterm" name="id2648007"></a><pre class="programlisting">double cairo_win32_scaled_font_get_metrics_factor + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font);</pre> <p> Gets a scale factor between logical coordinates in the coordinate -space used by <a href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a> (that is, the +space used by <a class="link" href="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"><code class="function">cairo_win32_scaled_font_select_font()</code></a> (that is, the coordinate system used by the Windows functions to return metrics) and font space coordinates.</p> <p> @@ -229,12 +229,12 @@ font space coordinates.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> <td> a scaled font from the Win32 font backend </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> factor to multiply logical units by to get font space coordinates. </td> @@ -244,11 +244,11 @@ font space coordinates.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2629735"></a><h3> +<a name="id2648083"></a><h3> <a name="cairo-win32-scaled-font-get-logical-to-device"></a>cairo_win32_scaled_font_get_logical_to_device ()</h3> -<a class="indexterm" name="id2629752"></a><pre class="programlisting">void cairo_win32_scaled_font_get_logical_to_device - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *logical_to_device);</pre> +<a class="indexterm" name="id2648099"></a><pre class="programlisting">void cairo_win32_scaled_font_get_logical_to_device + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *logical_to_device);</pre> <p> Gets the transformation mapping the logical space used by <em class="parameter"><code>scaled_font</code></em> to device space.</p> @@ -259,12 +259,12 @@ to device space.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> <td> a scaled font from the Win32 font backend </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>logical_to_device</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>logical_to_device</code></em> :</span></p></td> <td> matrix to return </td> </tr> @@ -275,11 +275,11 @@ to device space.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2629839"></a><h3> +<a name="id2648187"></a><h3> <a name="cairo-win32-scaled-font-get-device-to-logical"></a>cairo_win32_scaled_font_get_device_to_logical ()</h3> -<a class="indexterm" name="id2629856"></a><pre class="programlisting">void cairo_win32_scaled_font_get_device_to_logical - (<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *device_to_logical);</pre> +<a class="indexterm" name="id2648203"></a><pre class="programlisting">void cairo_win32_scaled_font_get_device_to_logical + (<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-t">cairo_scaled_font_t</a> *scaled_font, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *device_to_logical);</pre> <p> Gets the transformation mapping device space to the logical space used by <em class="parameter"><code>scaled_font</code></em>.</p> @@ -290,12 +290,12 @@ used by <em class="parameter"><code>scaled_font</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>scaled_font</code></em> :</span></p></td> <td> a scaled font from the Win32 font backend </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>device_to_logical</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>device_to_logical</code></em> :</span></p></td> <td> matrix to return </td> </tr> @@ -305,6 +305,11 @@ used by <em class="parameter"><code>scaled_font</code></em>.</p> </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2648292"></a><div class="refsect2" lang="en"><a name="id2648293"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2648294"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-Win32-Surfaces.html b/doc/public/html/cairo-Win32-Surfaces.html index f05c5f3..103cccf 100644 --- a/doc/public/html/cairo-Win32-Surfaces.html +++ b/doc/public/html/cairo-Win32-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Win32 Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-PostScript-Surfaces.html" title="PostScript Surfaces"> <link rel="next" href="cairo-SVG-Surfaces.html" title="SVG Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-SVG-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2589294" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2585351" class="shortcut">Top</a>  |  - <a href="#id2644880" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2662353" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-Win32-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2589294"></a><span class="refentrytitle">Win32 Surfaces</span> +<a name="id2585351"></a><span class="refentrytitle">Win32 Surfaces</span> </h2> <p>Win32 Surfaces — Microsoft Windows surface support</p> </td> @@ -51,30 +51,30 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Win32-Surfaces.html#cairo-win32-surface-create">cairo_win32_surface_create</a> (HDC hdc); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-dib">cairo_win32_surface_create_with_dib</a> (<a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-create">cairo_win32_surface_create</a> (HDC hdc); +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-dib">cairo_win32_surface_create_with_dib</a> (<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-ddb">cairo_win32_surface_create_with_ddb</a> (HDC hdc, - <a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-ddb">cairo_win32_surface_create_with_ddb</a> (HDC hdc, + <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height); -HDC <a href="cairo-Win32-Surfaces.html#cairo-win32-surface-get-dc">cairo_win32_surface_get_dc</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-Win32-Surfaces.html#cairo-win32-surface-get-image">cairo_win32_surface_get_image</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +HDC <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-get-dc">cairo_win32_surface_get_dc</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-Win32-Surfaces.html#cairo-win32-surface-get-image">cairo_win32_surface_get_image</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2644880"></a><h2>Description</h2> +<a name="id2662353"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2644896"></a><h2>Details</h2> +<a name="id2662369"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2644907"></a><h3> +<a name="id2662379"></a><h3> <a name="cairo-win32-surface-create"></a>cairo_win32_surface_create ()</h3> -<a class="indexterm" name="id2644918"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create (HDC hdc);</pre> +<a class="indexterm" name="id2662391"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create (HDC hdc);</pre> <p> Creates a cairo surface that targets the given DC. The DC will be queried for its initial clip extents, and this will be used as the @@ -88,12 +88,12 @@ be set appropriately.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>hdc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>hdc</code></em> :</span></p></td> <td> the DC to create a surface for </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the newly created surface </td> </tr> @@ -102,9 +102,9 @@ be set appropriately.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644981"></a><h3> +<a name="id2662454"></a><h3> <a name="cairo-win32-surface-create-with-dib"></a>cairo_win32_surface_create_with_dib ()</h3> -<a class="indexterm" name="id2644995"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create_with_dib (<a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="indexterm" name="id2662468"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create_with_dib (<a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height);</pre> <p> @@ -118,22 +118,22 @@ bitmap will be uninitialized.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>format</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>format</code></em> :</span></p></td> <td> format of pixels in the surface to create </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> width of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> height of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the newly created surface </td> @@ -145,10 +145,10 @@ bitmap will be uninitialized.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2642897"></a><h3> +<a name="id2660371"></a><h3> <a name="cairo-win32-surface-create-with-ddb"></a>cairo_win32_surface_create_with_ddb ()</h3> -<a class="indexterm" name="id2642913"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create_with_ddb (HDC hdc, - <a href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, +<a class="indexterm" name="id2660385"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_create_with_ddb (HDC hdc, + <a class="link" href="cairo-Image-Surfaces.html#cairo-format-t">cairo_format_t</a> format, int width, int height);</pre> <p> @@ -162,27 +162,27 @@ bitmap will be uninitialized.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>hdc</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>hdc</code></em> :</span></p></td> <td> the DC to create a surface for </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>format</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>format</code></em> :</span></p></td> <td> format of pixels in the surface to create </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> width of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> height of the surface, in pixels </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the newly created surface </td> @@ -194,9 +194,9 @@ bitmap will be uninitialized.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2643047"></a><h3> +<a name="id2660517"></a><h3> <a name="cairo-win32-surface-get-dc"></a>cairo_win32_surface_get_dc ()</h3> -<a class="indexterm" name="id2643061"></a><pre class="programlisting">HDC cairo_win32_surface_get_dc (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2660531"></a><pre class="programlisting">HDC cairo_win32_surface_get_dc (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Returns the HDC associated with this surface, or NULL if none. Also returns NULL if the surface is not a win32 surface.</p> @@ -207,12 +207,12 @@ Also returns NULL if the surface is not a win32 surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> HDC or NULL if no HDC available. </td> @@ -224,11 +224,11 @@ Also returns NULL if the surface is not a win32 surface.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2643138"></a><h3> +<a name="id2660608"></a><h3> <a name="cairo-win32-surface-get-image"></a>cairo_win32_surface_get_image ()</h3> -<a class="indexterm" name="id2643153"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_get_image (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2660623"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_win32_surface_get_image (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> -Returns a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> image surface that refers to the same bits +Returns a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> image surface that refers to the same bits as the DIB of the Win32 surface. If the passed-in win32 surface is not a DIB surface, NULL is returned.</p> <p> @@ -238,13 +238,13 @@ is not a DIB surface, NULL is returned.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> (owned by the win32 cairo_surface_t), +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> (owned by the win32 cairo_surface_t), or NULL if the win32 surface is not a DIB. </td> @@ -255,6 +255,11 @@ or NULL if the win32 surface is not a DIB. </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2660717"></a><div class="refsect2" lang="en"><a name="id2660718"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2660720"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-XLib-Surfaces.html b/doc/public/html/cairo-XLib-Surfaces.html index 1403b3b..41d4523 100644 --- a/doc/public/html/cairo-XLib-Surfaces.html +++ b/doc/public/html/cairo-XLib-Surfaces.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>XLib Surfaces</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="cairo-SVG-Surfaces.html" title="SVG Surfaces"> <link rel="next" href="Support.html" title="Utilities"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="Support.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2574711" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2583455" class="shortcut">Top</a>  |  - <a href="#id2648418" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2663170" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-XLib-Surfaces"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2574711"></a><span class="refentrytitle">XLib Surfaces</span> +<a name="id2583455"></a><span class="refentrytitle">XLib Surfaces</span> </h2> <p>XLib Surfaces — X Window System rendering using XLib</p> </td> @@ -51,45 +51,45 @@ -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-create">cairo_xlib_surface_create</a> (Display *dpy, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-create">cairo_xlib_surface_create</a> (Display *dpy, Drawable drawable, Visual *visual, int width, int height); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-create-for-bitmap">cairo_xlib_surface_create_for_bitmap</a> +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-create-for-bitmap">cairo_xlib_surface_create_for_bitmap</a> (Display *dpy, Pixmap bitmap, Screen *screen, int width, int height); -void <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-size">cairo_xlib_surface_set_size</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-size">cairo_xlib_surface_set_size</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, int width, int height); -Display* <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-display">cairo_xlib_surface_get_display</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -Screen* <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-screen">cairo_xlib_surface_get_screen</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-drawable">cairo_xlib_surface_set_drawable</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +Display* <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-display">cairo_xlib_surface_get_display</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +Screen* <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-screen">cairo_xlib_surface_get_screen</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-drawable">cairo_xlib_surface_set_drawable</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, Drawable drawable, int width, int height); -Drawable <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-drawable">cairo_xlib_surface_get_drawable</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -Visual* <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-visual">cairo_xlib_surface_get_visual</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-width">cairo_xlib_surface_get_width</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-height">cairo_xlib_surface_get_height</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -int <a href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-depth">cairo_xlib_surface_get_depth</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +Drawable <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-drawable">cairo_xlib_surface_get_drawable</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +Visual* <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-visual">cairo_xlib_surface_get_visual</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-width">cairo_xlib_surface_get_width</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-height">cairo_xlib_surface_get_height</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +int <a class="link" href="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-depth">cairo_xlib_surface_get_depth</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2648418"></a><h2>Description</h2> +<a name="id2663170"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2648434"></a><h2>Details</h2> +<a name="id2661371"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2648445"></a><h3> +<a name="id2661382"></a><h3> <a name="cairo-xlib-surface-create"></a>cairo_xlib_surface_create ()</h3> -<a class="indexterm" name="id2648456"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_xlib_surface_create (Display *dpy, +<a class="indexterm" name="id2661393"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_xlib_surface_create (Display *dpy, Drawable drawable, Visual *visual, int width, @@ -116,34 +116,34 @@ children will be included.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>dpy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dpy</code></em> :</span></p></td> <td> an X Display </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>drawable</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>drawable</code></em> :</span></p></td> <td> an X Drawable, (a Pixmap or a Window) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>visual</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>visual</code></em> :</span></p></td> <td> the visual to use for drawing to <em class="parameter"><code>drawable</code></em>. The depth of the visual must match the depth of the drawable. Currently, only TrueColor visuals are fully supported. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the current width of <em class="parameter"><code>drawable</code></em>. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the current height of <em class="parameter"><code>drawable</code></em>. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the newly created surface </td> </tr> @@ -152,9 +152,9 @@ children will be included.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644468"></a><h3> +<a name="id2661967"></a><h3> <a name="cairo-xlib-surface-create-for-bitmap"></a>cairo_xlib_surface_create_for_bitmap ()</h3> -<a class="indexterm" name="id2644482"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_xlib_surface_create_for_bitmap +<a class="indexterm" name="id2661978"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_xlib_surface_create_for_bitmap (Display *dpy, Pixmap bitmap, Screen *screen, @@ -170,32 +170,32 @@ This will be drawn to as a CAIRO_FORMAT_A1 object.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>dpy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dpy</code></em> :</span></p></td> <td> an X Display </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>bitmap</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>bitmap</code></em> :</span></p></td> <td> an X Drawable, (a depth-1 Pixmap) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>screen</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>screen</code></em> :</span></p></td> <td> the X Screen associated with <em class="parameter"><code>bitmap</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the current width of <em class="parameter"><code>bitmap</code></em>. </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the current height of <em class="parameter"><code>bitmap</code></em>. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the newly created surface </td> </tr> @@ -204,9 +204,9 @@ This will be drawn to as a CAIRO_FORMAT_A1 object.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644646"></a><h3> +<a name="id2662143"></a><h3> <a name="cairo-xlib-surface-set-size"></a>cairo_xlib_surface_set_size ()</h3> -<a class="indexterm" name="id2644657"></a><pre class="programlisting">void cairo_xlib_surface_set_size (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2662154"></a><pre class="programlisting">void cairo_xlib_surface_set_size (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, int width, int height);</pre> <p> @@ -227,17 +227,17 @@ this function on a surface created for a Pixmap.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for the XLib backend +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for the XLib backend </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the new width of the surface </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the new height of the surface </td> </tr> @@ -246,9 +246,9 @@ this function on a surface created for a Pixmap.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2644768"></a><h3> +<a name="id2666031"></a><h3> <a name="cairo-xlib-surface-get-display"></a>cairo_xlib_surface_get_display ()</h3> -<a class="indexterm" name="id2644784"></a><pre class="programlisting">Display* cairo_xlib_surface_get_display (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666044"></a><pre class="programlisting">Display* cairo_xlib_surface_get_display (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the X Display for the underlying X Drawable.</p> <p> @@ -258,12 +258,12 @@ Get the X Display for the underlying X Drawable.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the display. </td> @@ -275,9 +275,9 @@ Get the X Display for the underlying X Drawable.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648666"></a><h3> +<a name="id2666111"></a><h3> <a name="cairo-xlib-surface-get-screen"></a>cairo_xlib_surface_get_screen ()</h3> -<a class="indexterm" name="id2648680"></a><pre class="programlisting">Screen* cairo_xlib_surface_get_screen (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666124"></a><pre class="programlisting">Screen* cairo_xlib_surface_get_screen (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the X Screen for the underlying X Drawable.</p> <p> @@ -287,12 +287,12 @@ Get the X Screen for the underlying X Drawable.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the screen. </td> @@ -304,9 +304,9 @@ Get the X Screen for the underlying X Drawable.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648748"></a><h3> +<a name="id2666192"></a><h3> <a name="cairo-xlib-surface-set-drawable"></a>cairo_xlib_surface_set_drawable ()</h3> -<a class="indexterm" name="id2648761"></a><pre class="programlisting">void cairo_xlib_surface_set_drawable (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2666204"></a><pre class="programlisting">void cairo_xlib_surface_set_drawable (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, Drawable drawable, int width, int height);</pre> @@ -324,22 +324,22 @@ compatibility.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for the XLib backend +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for the XLib backend </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>drawable</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>drawable</code></em> :</span></p></td> <td> the new drawable for the surface </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> the width of the new drawable </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> the height of the new drawable </td> </tr> @@ -348,9 +348,9 @@ compatibility.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648888"></a><h3> +<a name="id2666319"></a><h3> <a name="cairo-xlib-surface-get-drawable"></a>cairo_xlib_surface_get_drawable ()</h3> -<a class="indexterm" name="id2648903"></a><pre class="programlisting">Drawable cairo_xlib_surface_get_drawable (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666334"></a><pre class="programlisting">Drawable cairo_xlib_surface_get_drawable (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the underlying X Drawable used for the surface.</p> <p> @@ -360,12 +360,12 @@ Get the underlying X Drawable used for the surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the drawable. </td> @@ -377,9 +377,9 @@ Get the underlying X Drawable used for the surface.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2648978"></a><h3> +<a name="id2666401"></a><h3> <a name="cairo-xlib-surface-get-visual"></a>cairo_xlib_surface_get_visual ()</h3> -<a class="indexterm" name="id2648994"></a><pre class="programlisting">Visual* cairo_xlib_surface_get_visual (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666416"></a><pre class="programlisting">Visual* cairo_xlib_surface_get_visual (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the X Visual used for underlying X Drawable.</p> <p> @@ -389,12 +389,12 @@ Get the X Visual used for underlying X Drawable.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the visual. </td> @@ -406,9 +406,9 @@ Get the X Visual used for underlying X Drawable.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649069"></a><h3> +<a name="id2666483"></a><h3> <a name="cairo-xlib-surface-get-width"></a>cairo_xlib_surface_get_width ()</h3> -<a class="indexterm" name="id2649085"></a><pre class="programlisting">int cairo_xlib_surface_get_width (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666498"></a><pre class="programlisting">int cairo_xlib_surface_get_width (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the width of the X Drawable underlying the surface in pixels.</p> <p> @@ -418,12 +418,12 @@ Get the width of the X Drawable underlying the surface in pixels.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the width of the surface in pixels. </td> @@ -435,9 +435,9 @@ Get the width of the X Drawable underlying the surface in pixels.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649161"></a><h3> +<a name="id2666566"></a><h3> <a name="cairo-xlib-surface-get-height"></a>cairo_xlib_surface_get_height ()</h3> -<a class="indexterm" name="id2649176"></a><pre class="programlisting">int cairo_xlib_surface_get_height (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666581"></a><pre class="programlisting">int cairo_xlib_surface_get_height (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the height of the X Drawable underlying the surface in pixels.</p> <p> @@ -447,12 +447,12 @@ Get the height of the X Drawable underlying the surface in pixels.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the height of the surface in pixels. </td> @@ -464,9 +464,9 @@ Get the height of the X Drawable underlying the surface in pixels.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2649252"></a><h3> +<a name="id2666649"></a><h3> <a name="cairo-xlib-surface-get-depth"></a>cairo_xlib_surface_get_depth ()</h3> -<a class="indexterm" name="id2649268"></a><pre class="programlisting">int cairo_xlib_surface_get_depth (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2666664"></a><pre class="programlisting">int cairo_xlib_surface_get_depth (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Get the number of bits used to represent each pixel value.</p> <p> @@ -476,12 +476,12 @@ Get the number of bits used to represent each pixel value.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a <span class="type">cairo_xlib_surface_t</span> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the depth of the surface in bits. </td> @@ -492,6 +492,11 @@ Get the number of bits used to represent each pixel value.</p> </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2666733"></a><div class="refsect2" lang="en"><a name="id2666734"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2666736"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-cairo-font-face-t.html b/doc/public/html/cairo-cairo-font-face-t.html index aee6cfe..9520827 100644 --- a/doc/public/html/cairo-cairo-font-face-t.html +++ b/doc/public/html/cairo-cairo-font-face-t.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>cairo_font_face_t</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Fonts.html" title="Fonts"> <link rel="prev" href="Fonts.html" title="Fonts"> <link rel="next" href="cairo-Scaled-Fonts.html" title="Scaled Fonts"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Scaled-Fonts.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2600918" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2591658" class="shortcut">Top</a>  |  - <a href="#id2566432" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2640462" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-cairo-font-face-t"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2600918"></a><span class="refentrytitle">cairo_font_face_t</span> +<a name="id2591658"></a><span class="refentrytitle">cairo_font_face_t</span> </h2> <p>cairo_font_face_t — Base class for fonts</p> </td> @@ -51,67 +51,67 @@ -typedef <a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>; -<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a href="cairo-cairo-font-face-t.html#cairo-font-face-reference">cairo_font_face_reference</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -void <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy">cairo_font_face_destroy</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-font-face-t.html#cairo-font-face-status">cairo_font_face_status</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -enum <a href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a>; -<a href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-type">cairo_font_face_get_type</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -unsigned int <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count">cairo_font_face_get_reference_count</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data">cairo_font_face_set_user_data</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +typedef <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>; +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-reference">cairo_font_face_reference</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +void <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy">cairo_font_face_destroy</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-status">cairo_font_face_status</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +enum <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a>; +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-type">cairo_font_face_get_type</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +unsigned int <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count">cairo_font_face_get_reference_count</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data">cairo_font_face_set_user_data</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); -void* <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data">cairo_font_face_get_user_data</a> (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); +void* <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data">cairo_font_face_get_user_data</a> (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2566432"></a><h2>Description</h2> +<a name="id2640462"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2560586"></a><h2>Details</h2> +<a name="id2640478"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2560597"></a><h3> +<a name="id2640489"></a><h3> <a name="cairo-font-face-t"></a>cairo_font_face_t</h3> -<a class="indexterm" name="id2560609"></a><pre class="programlisting">typedef struct _cairo_font_face cairo_font_face_t; +<a class="indexterm" name="id2640501"></a><pre class="programlisting">typedef struct _cairo_font_face cairo_font_face_t; </pre> <p> -A <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> specifies all aspects of a font other +A <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> specifies all aspects of a font other than the size or font matrix (a font matrix is used to distort a font by sheering it or scaling it unequally in the two -directions) . A font face can be set on a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> by using -<a href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a>; the size and font matrix are set with -<a href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a> and <a href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. +directions) . A font face can be set on a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> by using +<a class="link" href="cairo-Text.html#cairo-set-font-face"><code class="function">cairo_set_font_face()</code></a>; the size and font matrix are set with +<a class="link" href="cairo-Text.html#cairo-set-font-size"><code class="function">cairo_set_font_size()</code></a> and <a class="link" href="cairo-Text.html#cairo-set-font-matrix"><code class="function">cairo_set_font_matrix()</code></a>. </p> <p> There are various types of font faces, depending on the <em class="firstterm">font backend</em> they use. The type of a -font face can be queried using <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-type"><code class="function">cairo_font_face_get_type()</code></a>. +font face can be queried using <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-type"><code class="function">cairo_font_face_get_type()</code></a>. </p> <p> -Memory management of <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> is done with -<a href="cairo-cairo-font-face-t.html#cairo-font-face-reference"><code class="function">cairo_font_face_reference()</code></a> and <a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a>.</p> +Memory management of <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> is done with +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-reference"><code class="function">cairo_font_face_reference()</code></a> and <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a>.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2560721"></a><h3> +<a name="id2581948"></a><h3> <a name="cairo-font-face-reference"></a>cairo_font_face_reference ()</h3> -<a class="indexterm" name="id2576802"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_font_face_reference (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2581960"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a>* cairo_font_face_reference (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> Increases the reference count on <em class="parameter"><code>font_face</code></em> by one. This prevents <em class="parameter"><code>font_face</code></em> from being destroyed until a matching call to -<a href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> is made. +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-destroy"><code class="function">cairo_font_face_destroy()</code></a> is made. </p> <p> -The number of references to a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> can be get using -<a href="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count"><code class="function">cairo_font_face_get_reference_count()</code></a>.</p> +The number of references to a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> can be get using +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count"><code class="function">cairo_font_face_get_reference_count()</code></a>.</p> <p> </p> @@ -119,14 +119,14 @@ The number of references to a <a href="cairo-cairo-font-face-t.html#cairo-font-f <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>, (may be <code class="literal">NULL</code> in which case this +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>, (may be <code class="literal">NULL</code> in which case this function does nothing). </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the referenced <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the referenced <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a>. </td> </tr> </tbody> @@ -134,30 +134,30 @@ function does nothing). </div> <hr> <div class="refsect2" lang="en"> -<a name="id2576927"></a><h3> +<a name="id2621708"></a><h3> <a name="cairo-font-face-destroy"></a>cairo_font_face_destroy ()</h3> -<a class="indexterm" name="id2576938"></a><pre class="programlisting">void cairo_font_face_destroy (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2621719"></a><pre class="programlisting">void cairo_font_face_destroy (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> Decreases the reference count on <em class="parameter"><code>font_face</code></em> by one. If the result is zero, then <em class="parameter"><code>font_face</code></em> and all associated resources are freed. -See <a href="cairo-cairo-font-face-t.html#cairo-font-face-reference"><code class="function">cairo_font_face_reference()</code></a>.</p> +See <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-reference"><code class="function">cairo_font_face_reference()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2577016"></a><h3> +<a name="id2621797"></a><h3> <a name="cairo-font-face-status"></a>cairo_font_face_status ()</h3> -<a class="indexterm" name="id2577028"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_face_status (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2621808"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_face_status (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> Checks whether an error has previously occurred for this font face</p> @@ -168,14 +168,14 @@ font face</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or another error such as - <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or another error such as + <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. </td> </tr> </tbody> @@ -183,9 +183,9 @@ font face</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2622512"></a><h3> +<a name="id2621893"></a><h3> <a name="cairo-font-type-t"></a>enum cairo_font_type_t</h3> -<a class="indexterm" name="id2622526"></a><pre class="programlisting">typedef enum _cairo_font_type { +<a class="indexterm" name="id2594413"></a><pre class="programlisting">typedef enum _cairo_font_type { CAIRO_FONT_TYPE_TOY, CAIRO_FONT_TYPE_FT, CAIRO_FONT_TYPE_WIN32, @@ -193,7 +193,7 @@ font face</p> } cairo_font_type_t; </pre> <p> -<a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> is used to describe the type of a given font +<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> is used to describe the type of a given font face or scaled font. The font types are also known as "font backends" within cairo. </p> @@ -201,7 +201,7 @@ backends" within cairo. The type of a font face is determined by the function used to create it, which will generally be of the form cairo_<span class="emphasis"><em>type</em></span>_font_face_create. The font face type can be queried -with <a href="cairo-cairo-font-face-t.html#cairo-font-face-get-type"><code class="function">cairo_font_face_get_type()</code></a> +with <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-get-type"><code class="function">cairo_font_face_get_type()</code></a> </p> <p> The various cairo_font_face functions can be used with a font face @@ -210,7 +210,7 @@ of any type. <p> The type of a scaled font is determined by the type of the font face passed to cairo_scaled_font_create. The scaled font type can -be queried with <a href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type"><code class="function">cairo_scaled_font_get_type()</code></a> +be queried with <a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-get-type"><code class="function">cairo_scaled_font_get_type()</code></a> </p> <p> The various cairo_scaled_font functions can be used with scaled @@ -232,22 +232,22 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-FONT-TYPE-TOY:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_TOY</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-TYPE-TOY:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_TOY</code></span></p></td> <td> The font was created using cairo's toy font api </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-TYPE-FT:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_FT</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-TYPE-FT:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_FT</code></span></p></td> <td> The font is of type FreeType </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-TYPE-WIN32:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_WIN32</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-TYPE-WIN32:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_WIN32</code></span></p></td> <td> The font is of type Win32 </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FONT-TYPE-ATSUI:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_ATSUI</code></span></td> +<td><p><span class="term"><a name="CAIRO-FONT-TYPE-ATSUI:CAPS"></a><code class="literal">CAIRO_FONT_TYPE_ATSUI</code></span></p></td> <td> The font is of type ATSUI </td> </tr> @@ -258,12 +258,12 @@ New entries may be added in future versions.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2622714"></a><h3> +<a name="id2594600"></a><h3> <a name="cairo-font-face-get-type"></a>cairo_font_face_get_type ()</h3> -<a class="indexterm" name="id2577163"></a><pre class="programlisting"><a href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> cairo_font_face_get_type (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2594613"></a><pre class="programlisting"><a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t">cairo_font_type_t</a> cairo_font_face_get_type (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> This function returns the type of the backend used to create -a font face. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> for available types.</p> +a font face. See <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span class="type">cairo_font_type_t</span></a> for available types.</p> <p> </p> @@ -271,12 +271,12 @@ a font face. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> <td> a font face </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The type of <em class="parameter"><code>font_face</code></em>. </td> @@ -288,9 +288,9 @@ a font face. See <a href="cairo-cairo-font-face-t.html#cairo-font-type-t"><span </div> <hr> <div class="refsect2" lang="en"> -<a name="id2577244"></a><h3> +<a name="id2594694"></a><h3> <a name="cairo-font-face-get-reference-count"></a>cairo_font_face_get_reference_count ()</h3> -<a class="indexterm" name="id2577259"></a><pre class="programlisting">unsigned int cairo_font_face_get_reference_count (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> +<a class="indexterm" name="id2594708"></a><pre class="programlisting">unsigned int cairo_font_face_get_reference_count (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face);</pre> <p> Returns the current reference count of <em class="parameter"><code>font_face</code></em>.</p> <p> @@ -300,12 +300,12 @@ Returns the current reference count of <em class="parameter"><code>font_face</co <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current reference count of <em class="parameter"><code>font_face</code></em>. If the object is a nil object, 0 will be returned. @@ -318,12 +318,12 @@ object is a nil object, 0 will be returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2577348"></a><h3> +<a name="id2594797"></a><h3> <a name="cairo-font-face-set-user-data"></a>cairo_font_face_set_user_data ()</h3> -<a class="indexterm" name="id2577361"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_face_set_user_data (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="indexterm" name="id2594808"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_font_face_set_user_data (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> <p> Attach user data to <em class="parameter"><code>font_face</code></em>. To remove user data from a font face, call this function with the key that was used to set it and <code class="literal">NULL</code> @@ -335,30 +335,30 @@ for <em class="parameter"><code>data</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of a <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of a <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>user_data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> <td> the user data to attach to the font face </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>destroy</code></em> :</span></td> -<td> a <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the +<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the font face is destroyed or when new user data is attached using the same key. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a slot could not be allocated for the user data. </td> </tr> @@ -367,10 +367,10 @@ slot could not be allocated for the user data. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2621593"></a><h3> +<a name="id2646720"></a><h3> <a name="cairo-font-face-get-user-data"></a>cairo_font_face_get_user_data ()</h3> -<a class="indexterm" name="id2621606"></a><pre class="programlisting">void* cairo_font_face_get_user_data (<a href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> +<a class="indexterm" name="id2646733"></a><pre class="programlisting">void* cairo_font_face_get_user_data (<a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t">cairo_font_face_t</a> *font_face, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> <p> Return user data previously attached to <em class="parameter"><code>font_face</code></em> using the specified key. If no user data has been attached with the given key this @@ -382,18 +382,18 @@ function returns <code class="literal">NULL</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>font_face</code></em> :</span></td> -<td> a <a href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> +<td><p><span class="term"><em class="parameter"><code>font_face</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-font-face-t.html#cairo-font-face-t"><span class="type">cairo_font_face_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of the <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of the <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was attached to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the user data previously attached or <code class="literal">NULL</code>. </td> </tr> @@ -401,6 +401,11 @@ attached to </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2646846"></a><div class="refsect2" lang="en"><a name="id2646847"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2646848"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-cairo-matrix-t.html b/doc/public/html/cairo-cairo-matrix-t.html index bb48b9d..fa1bf45 100644 --- a/doc/public/html/cairo-cairo-matrix-t.html +++ b/doc/public/html/cairo-cairo-matrix-t.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>cairo_matrix_t</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Support.html" title="Utilities"> <link rel="prev" href="Support.html" title="Utilities"> <link rel="next" href="cairo-Error-Handling.html" title="Error handling"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Error-Handling.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2596521" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2587177" class="shortcut">Top</a>  |  - <a href="#id2650375" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2663271" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-cairo-matrix-t"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2596521"></a><span class="refentrytitle">cairo_matrix_t</span> +<a name="id2587177"></a><span class="refentrytitle">cairo_matrix_t</span> </h2> <p>cairo_matrix_t — Generic matrix operations</p> </td> @@ -51,48 +51,48 @@ - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a>; -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-init">cairo_matrix_init</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a>; +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-init">cairo_matrix_init</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double xx, double yx, double xy, double yy, double x0, double y0); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-init-identity">cairo_matrix_init_identity</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-init-translate">cairo_matrix_init_translate</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-init-identity">cairo_matrix_init_identity</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-init-translate">cairo_matrix_init_translate</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double tx, double ty); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-init-scale">cairo_matrix_init_scale</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-init-scale">cairo_matrix_init_scale</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double sx, double sy); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-init-rotate">cairo_matrix_init_rotate</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-init-rotate">cairo_matrix_init_rotate</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double radians); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-translate">cairo_matrix_translate</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-translate">cairo_matrix_translate</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double tx, double ty); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-scale">cairo_matrix_scale</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-scale">cairo_matrix_scale</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double sx, double sy); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-rotate">cairo_matrix_rotate</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-rotate">cairo_matrix_rotate</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double radians); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-matrix-t.html#cairo-matrix-invert">cairo_matrix_invert</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-multiply">cairo_matrix_multiply</a> (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *result, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *a, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *b); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-transform-distance">cairo_matrix_transform_distance</a> (const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-invert">cairo_matrix_invert</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix); +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-multiply">cairo_matrix_multiply</a> (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *result, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *a, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *b); +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-transform-distance">cairo_matrix_transform_distance</a> (const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double *dx, double *dy); -void <a href="cairo-cairo-matrix-t.html#cairo-matrix-transform-point">cairo_matrix_transform_point</a> (const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +void <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-transform-point">cairo_matrix_transform_point</a> (const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double *x, double *y); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2650375"></a><h2>Description</h2> -<p><a class="indexterm" name="id2650387"></a><a class="indexterm" name="id2650395"></a> - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> is used throughout cairo to convert between different - coordinate spaces. A <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> holds an affine transformation, +<a name="id2663271"></a><h2>Description</h2> +<p><a class="indexterm" name="id2663283"></a><a class="indexterm" name="id2663291"></a> + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> is used throughout cairo to convert between different + coordinate spaces. A <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> holds an affine transformation, such as a scale, rotation, shear, or a combination of these. The transformation of a point (<code class="literal">x</code>,<code class="literal">y</code>) is given by: @@ -102,25 +102,25 @@ void <a href="cairo-cairo-matrix-t.html#cairo-matrix-transform-po y_new = yx * x + yy * y + y0; </pre> <p> - The current transformation matrix of a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, represented as a - <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a>, defines the transformation from user-space - coordinates to device-space coordinates. See <a href="cairo-Transformations.html#cairo-get-matrix"><code class="function">cairo_get_matrix()</code></a> and - <a href="cairo-Transformations.html#cairo-set-matrix"><code class="function">cairo_set_matrix()</code></a>. + The current transformation matrix of a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, represented as a + <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a>, defines the transformation from user-space + coordinates to device-space coordinates. See <a class="link" href="cairo-Transformations.html#cairo-get-matrix"><code class="function">cairo_get_matrix()</code></a> and + <a class="link" href="cairo-Transformations.html#cairo-set-matrix"><code class="function">cairo_set_matrix()</code></a>. </p> </div> <div class="refsect1" lang="en"> -<a name="id2645603"></a><h2>Details</h2> +<a name="id2663376"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2645614"></a><h3> +<a name="id2663386"></a><h3> <a name="cairo-matrix-t"></a>cairo_matrix_t</h3> -<a class="indexterm" name="id2645626"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2663399"></a><pre class="programlisting">typedef struct { double xx; double yx; double xy; double yy; double x0; double y0; } cairo_matrix_t; </pre> <p> -A <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> holds an affine transformation, such as a scale, +A <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> holds an affine transformation, such as a scale, rotation, shear, or a combination of those. The transformation of a point (x, y) is given by: </p> @@ -135,32 +135,32 @@ a point (x, y) is given by: <col align="left" valign="top"> <tbody> <tr> -<td><span class="term">double <em class="structfield"><code>xx</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>xx</code></em>;</span></p></td> <td> xx component of the affine transformation </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>yx</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>yx</code></em>;</span></p></td> <td> yx component of the affine transformation </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>xy</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>xy</code></em>;</span></p></td> <td> xy component of the affine transformation </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>yy</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>yy</code></em>;</span></p></td> <td> yy component of the affine transformation </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>x0</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>x0</code></em>;</span></p></td> <td> X translation component of the affine transformation </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>y0</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>y0</code></em>;</span></p></td> <td> Y translation component of the affine transformation </td> </tr> @@ -169,9 +169,9 @@ a point (x, y) is given by: </div> <hr> <div class="refsect2" lang="en"> -<a name="id2645792"></a><h3> +<a name="id2663612"></a><h3> <a name="cairo-matrix-init"></a>cairo_matrix_init ()</h3> -<a class="indexterm" name="id2645804"></a><pre class="programlisting">void cairo_matrix_init (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2663624"></a><pre class="programlisting">void cairo_matrix_init (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double xx, double yx, double xy, @@ -194,37 +194,37 @@ by: <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a cairo_matrix_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>xx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>xx</code></em> :</span></p></td> <td> xx component of the affine transformation </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>yx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>yx</code></em> :</span></p></td> <td> yx component of the affine transformation </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>xy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>xy</code></em> :</span></p></td> <td> xy component of the affine transformation </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>yy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>yy</code></em> :</span></p></td> <td> yy component of the affine transformation </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x0</code></em> :</span></p></td> <td> X translation component of the affine transformation </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y0</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y0</code></em> :</span></p></td> <td> Y translation component of the affine transformation </td> </tr> @@ -233,9 +233,9 @@ by: </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651220"></a><h3> +<a name="id2668718"></a><h3> <a name="cairo-matrix-init-identity"></a>cairo_matrix_init_identity ()</h3> -<a class="indexterm" name="id2651231"></a><pre class="programlisting">void cairo_matrix_init_identity (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2668729"></a><pre class="programlisting">void cairo_matrix_init_identity (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Modifies <em class="parameter"><code>matrix</code></em> to be an identity transformation.</p> <p> @@ -244,17 +244,17 @@ Modifies <em class="parameter"><code>matrix</code></em> to be an identity transf <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651286"></a><h3> +<a name="id2668784"></a><h3> <a name="cairo-matrix-init-translate"></a>cairo_matrix_init_translate ()</h3> -<a class="indexterm" name="id2651297"></a><pre class="programlisting">void cairo_matrix_init_translate (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2668795"></a><pre class="programlisting">void cairo_matrix_init_translate (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double tx, double ty);</pre> <p> @@ -267,17 +267,17 @@ Initializes <em class="parameter"><code>matrix</code></em> to a transformation t <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a cairo_matrix_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>tx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>tx</code></em> :</span></p></td> <td> amount to translate in the X direction </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>ty</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>ty</code></em> :</span></p></td> <td> amount to translate in the Y direction </td> </tr> @@ -286,9 +286,9 @@ Initializes <em class="parameter"><code>matrix</code></em> to a transformation t </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651404"></a><h3> +<a name="id2668901"></a><h3> <a name="cairo-matrix-init-scale"></a>cairo_matrix_init_scale ()</h3> -<a class="indexterm" name="id2651415"></a><pre class="programlisting">void cairo_matrix_init_scale (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2668912"></a><pre class="programlisting">void cairo_matrix_init_scale (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double sx, double sy);</pre> <p> @@ -301,17 +301,17 @@ in the X and Y dimensions, respectively.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a cairo_matrix_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sx</code></em> :</span></p></td> <td> scale factor in the X direction </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sy</code></em> :</span></p></td> <td> scale factor in the Y direction </td> </tr> @@ -320,9 +320,9 @@ in the X and Y dimensions, respectively.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651526"></a><h3> +<a name="id2669023"></a><h3> <a name="cairo-matrix-init-rotate"></a>cairo_matrix_init_rotate ()</h3> -<a class="indexterm" name="id2651537"></a><pre class="programlisting">void cairo_matrix_init_rotate (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2669035"></a><pre class="programlisting">void cairo_matrix_init_rotate (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double radians);</pre> <p> Initialized <em class="parameter"><code>matrix</code></em> to a transformation that rotates by <em class="parameter"><code>radians</code></em>.</p> @@ -333,12 +333,12 @@ Initialized <em class="parameter"><code>matrix</code></em> to a transformation t <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a cairo_matrix_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radians</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radians</code></em> :</span></p></td> <td> angle of rotation, in radians. The direction of rotation is defined such that positive angles rotate in the direction from the positive X axis toward the positive Y axis. With the default @@ -351,9 +351,9 @@ direction. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651625"></a><h3> +<a name="id2669123"></a><h3> <a name="cairo-matrix-translate"></a>cairo_matrix_translate ()</h3> -<a class="indexterm" name="id2651636"></a><pre class="programlisting">void cairo_matrix_translate (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2669134"></a><pre class="programlisting">void cairo_matrix_translate (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double tx, double ty);</pre> <p> @@ -368,17 +368,17 @@ to the coordinates.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> <td> a cairo_matrix_t </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>tx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>tx</code></em> :</span></p></td> <td> amount to translate in the X direction </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>ty</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>ty</code></em> :</span></p></td> <td> amount to translate in the Y direction </td> </tr> @@ -387,9 +387,9 @@ to the coordinates.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651761"></a><h3> +<a name="id2669259"></a><h3> <a name="cairo-matrix-scale"></a>cairo_matrix_scale ()</h3> -<a class="indexterm" name="id2651774"></a><pre class="programlisting">void cairo_matrix_scale (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2669271"></a><pre class="programlisting">void cairo_matrix_scale (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double sx, double sy);</pre> <p> @@ -403,17 +403,17 @@ by <em class="parameter"><code>sx</code></em> and <em class="parameter"><code>sy <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sx</code></em> :</span></p></td> <td> scale factor in the X direction </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>sy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>sy</code></em> :</span></p></td> <td> scale factor in the Y direction </td> </tr> @@ -422,9 +422,9 @@ by <em class="parameter"><code>sx</code></em> and <em class="parameter"><code>sy </div> <hr> <div class="refsect2" lang="en"> -<a name="id2651904"></a><h3> +<a name="id2669402"></a><h3> <a name="cairo-matrix-rotate"></a>cairo_matrix_rotate ()</h3> -<a class="indexterm" name="id2651917"></a><pre class="programlisting">void cairo_matrix_rotate (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2669414"></a><pre class="programlisting">void cairo_matrix_rotate (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double radians);</pre> <p> Applies rotation by <em class="parameter"><code>radians</code></em> to the transformation in @@ -438,12 +438,12 @@ to the coordinates.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>radians</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>radians</code></em> :</span></p></td> <td> angle of rotation, in radians. The direction of rotation is defined such that positive angles rotate in the direction from the positive X axis toward the positive Y axis. With the default @@ -456,18 +456,14 @@ direction. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2652019"></a><h3> +<a name="id2669516"></a><h3> <a name="cairo-matrix-invert"></a>cairo_matrix_invert ()</h3> -<a class="indexterm" name="id2652031"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_matrix_invert (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> +<a class="indexterm" name="id2669529"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_matrix_invert (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix);</pre> <p> Changes <em class="parameter"><code>matrix</code></em> to be the inverse of it's original value. Not all transformation matrices have inverses; if the matrix collapses points together (it is <em class="firstterm">degenerate</em>), -then it has no inverse and this function will fail. -</p> -<p> -Returns: If <em class="parameter"><code>matrix</code></em> has an inverse, modifies <em class="parameter"><code>matrix</code></em> to - be the inverse matrix and returns <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>. Otherwise,</p> +then it has no inverse and this function will fail.</p> <p> </p> @@ -475,14 +471,15 @@ Returns: If <em class="parameter"><code>matrix</code></em> has an inverse, modif <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> -<a href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-MATRIX:CAPS"><code class="literal">CAIRO_STATUS_INVALID_MATRIX</code></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> If <em class="parameter"><code>matrix</code></em> has an inverse, modifies <em class="parameter"><code>matrix</code></em> to + be the inverse matrix and returns <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>. Otherwise, + returns <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-MATRIX:CAPS"><code class="literal">CAIRO_STATUS_INVALID_MATRIX</code></a>. </td> </tr> </tbody> @@ -490,11 +487,11 @@ Returns: If <em class="parameter"><code>matrix</code></em> has an inverse, modif </div> <hr> <div class="refsect2" lang="en"> -<a name="id2652144"></a><h3> +<a name="id2669639"></a><h3> <a name="cairo-matrix-multiply"></a>cairo_matrix_multiply ()</h3> -<a class="indexterm" name="id2652155"></a><pre class="programlisting">void cairo_matrix_multiply (<a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *result, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *a, - const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *b);</pre> +<a class="indexterm" name="id2669650"></a><pre class="programlisting">void cairo_matrix_multiply (<a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *result, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *a, + const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *b);</pre> <p> Multiplies the affine transformations in <em class="parameter"><code>a</code></em> and <em class="parameter"><code>b</code></em> together and stores the result in <em class="parameter"><code>result</code></em>. The effect of the resulting @@ -511,18 +508,18 @@ It is allowable for <em class="parameter"><code>result</code></em> to be identic <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>result</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> in which to store the result +<td><p><span class="term"><em class="parameter"><code>result</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> in which to store the result </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>a</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>a</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>b</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>b</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> </tbody> @@ -530,14 +527,14 @@ It is allowable for <em class="parameter"><code>result</code></em> to be identic </div> <hr> <div class="refsect2" lang="en"> -<a name="id2652323"></a><h3> +<a name="id2669818"></a><h3> <a name="cairo-matrix-transform-distance"></a>cairo_matrix_transform_distance ()</h3> -<a class="indexterm" name="id2652335"></a><pre class="programlisting">void cairo_matrix_transform_distance (const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2669832"></a><pre class="programlisting">void cairo_matrix_transform_distance (const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double *dx, double *dy);</pre> <p> Transforms the distance vector (<em class="parameter"><code>dx</code></em>,<em class="parameter"><code>dy</code></em>) by <em class="parameter"><code>matrix</code></em>. This is -similar to <a href="cairo-cairo-matrix-t.html#cairo-matrix-transform-point"><code class="function">cairo_matrix_transform_point()</code></a> except that the translation +similar to <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-transform-point"><code class="function">cairo_matrix_transform_point()</code></a> except that the translation components of the transformation are ignored. The calculation of the returned vector is as follows: </p> @@ -561,17 +558,17 @@ to (<em class="parameter"><code>x2</code></em>,<em class="parameter"><code>y2</c <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dx</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dx</code></em> :</span></p></td> <td> X component of a distance vector. An in/out parameter </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dy</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dy</code></em> :</span></p></td> <td> Y component of a distance vector. An in/out parameter </td> </tr> @@ -580,9 +577,9 @@ to (<em class="parameter"><code>x2</code></em>,<em class="parameter"><code>y2</c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2652526"></a><h3> +<a name="id2670063"></a><h3> <a name="cairo-matrix-transform-point"></a>cairo_matrix_transform_point ()</h3> -<a class="indexterm" name="id2652538"></a><pre class="programlisting">void cairo_matrix_transform_point (const <a href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, +<a class="indexterm" name="id2670076"></a><pre class="programlisting">void cairo_matrix_transform_point (const <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t">cairo_matrix_t</a> *matrix, double *x, double *y);</pre> <p> @@ -594,17 +591,17 @@ Transforms the point (<em class="parameter"><code>x</code></em>, <em class="para <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>matrix</code></em> :</span></td> -<td> a <a href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> +<td><p><span class="term"><em class="parameter"><code>matrix</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-matrix-t.html#cairo-matrix-t"><span class="type">cairo_matrix_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X position. An in/out parameter </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y position. An in/out parameter </td> </tr> @@ -612,6 +609,11 @@ Transforms the point (<em class="parameter"><code>x</code></em>, <em class="para </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2670196"></a><div class="refsect2" lang="en"><a name="id2670198"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2670199"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-cairo-surface-t.html b/doc/public/html/cairo-cairo-surface-t.html index db00650..2deeebb 100644 --- a/doc/public/html/cairo-cairo-surface-t.html +++ b/doc/public/html/cairo-cairo-surface-t.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>cairo_surface_t</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Surfaces.html" title="Surfaces"> <link rel="prev" href="Surfaces.html" title="Surfaces"> <link rel="next" href="cairo-Image-Surfaces.html" title="Image Surfaces"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Image-Surfaces.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2599274" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2618658" class="shortcut">Top</a>  |  - <a href="#id2629949" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2648302" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-cairo-surface-t"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2599274"></a><span class="refentrytitle">cairo_surface_t</span> +<a name="id2618658"></a><span class="refentrytitle">cairo_surface_t</span> </h2> <p>cairo_surface_t — Base class for surfaces</p> </td> @@ -51,91 +51,91 @@ -typedef <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>; -enum <a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a>; -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-cairo-surface-t.html#cairo-surface-create-similar">cairo_surface_create_similar</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *other, - <a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content, +typedef <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>; +enum <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a>; +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-create-similar">cairo_surface_create_similar</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *other, + <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content, int width, int height); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-cairo-surface-t.html#cairo-surface-reference">cairo_surface_reference</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-destroy">cairo_surface_destroy</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-surface-t.html#cairo-surface-status">cairo_surface_status</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-finish">cairo_surface_finish</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-flush">cairo_surface_flush</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-get-font-options">cairo_surface_get_font_options</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); -<a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> <a href="cairo-cairo-surface-t.html#cairo-surface-get-content">cairo_surface_get_content</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty">cairo_surface_mark_dirty</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -void <a href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty-rectangle">cairo_surface_mark_dirty_rectangle</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference">cairo_surface_reference</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-destroy">cairo_surface_destroy</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status">cairo_surface_status</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-finish">cairo_surface_finish</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-flush">cairo_surface_flush</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-font-options">cairo_surface_get_font_options</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options); +<a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-content">cairo_surface_get_content</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty">cairo_surface_mark_dirty</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty-rectangle">cairo_surface_mark_dirty_rectangle</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, int x, int y, int width, int height); -void <a href="cairo-cairo-surface-t.html#cairo-surface-set-device-offset">cairo_surface_set_device_offset</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-device-offset">cairo_surface_set_device_offset</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x_offset, double y_offset); -void <a href="cairo-cairo-surface-t.html#cairo-surface-get-device-offset">cairo_surface_get_device_offset</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-device-offset">cairo_surface_get_device_offset</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double *x_offset, double *y_offset); -void <a href="cairo-cairo-surface-t.html#cairo-surface-set-fallback-resolution">cairo_surface_set_fallback_resolution</a> - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-fallback-resolution">cairo_surface_set_fallback_resolution</a> + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x_pixels_per_inch, double y_pixels_per_inch); -enum <a href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a>; -<a href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a> <a href="cairo-cairo-surface-t.html#cairo-surface-get-type">cairo_surface_get_type</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -unsigned int <a href="cairo-cairo-surface-t.html#cairo-surface-get-reference-count">cairo_surface_get_reference_count</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-surface-t.html#cairo-surface-set-user-data">cairo_surface_set_user_data</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +enum <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a>; +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a> <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-type">cairo_surface_get_type</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +unsigned int <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-reference-count">cairo_surface_get_reference_count</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-user-data">cairo_surface_set_user_data</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); -void* <a href="cairo-cairo-surface-t.html#cairo-surface-get-user-data">cairo_surface_get_user_data</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); +void* <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-user-data">cairo_surface_get_user_data</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2629949"></a><h2>Description</h2> +<a name="id2648302"></a><h2>Description</h2> <p> </p> </div> <div class="refsect1" lang="en"> -<a name="id2629965"></a><h2>Details</h2> +<a name="id2648318"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2629976"></a><h3> +<a name="id2648329"></a><h3> <a name="cairo-surface-t"></a>cairo_surface_t</h3> -<a class="indexterm" name="id2629988"></a><pre class="programlisting">typedef struct _cairo_surface cairo_surface_t; +<a class="indexterm" name="id2648341"></a><pre class="programlisting">typedef struct _cairo_surface cairo_surface_t; </pre> <p> -A <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> represents an image, either as the destination +A <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> represents an image, either as the destination of a drawing operation or as source when drawing onto another -surface. To draw to a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a>, create a cairo context -with the surface as the target, using <a href="cairo-cairo-t.html#cairo-create"><code class="function">cairo_create()</code></a>. +surface. To draw to a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a>, create a cairo context +with the surface as the target, using <a class="link" href="cairo-cairo-t.html#cairo-create"><code class="function">cairo_create()</code></a>. </p> <p> -There are different subtypes of <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for -different drawing backends; for example, <a href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a> +There are different subtypes of <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> for +different drawing backends; for example, <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a> creates a bitmap image in memory. -The type of a surface can be queried with <a href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a>. +The type of a surface can be queried with <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a>. </p> <p> -Memory management of <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> is done with -<a href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a> and <a href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a>.</p> +Memory management of <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> is done with +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a> and <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a>.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2630094"></a><h3> +<a name="id2648447"></a><h3> <a name="cairo-content-t"></a>enum cairo_content_t</h3> -<a class="indexterm" name="id2630107"></a><pre class="programlisting">typedef enum _cairo_content { +<a class="indexterm" name="id2648460"></a><pre class="programlisting">typedef enum _cairo_content { CAIRO_CONTENT_COLOR = 0x1000, CAIRO_CONTENT_ALPHA = 0x2000, CAIRO_CONTENT_COLOR_ALPHA = 0x3000 } cairo_content_t; </pre> <p> -<a href="cairo-cairo-surface-t.html#cairo-content-t"><span class="type">cairo_content_t</span></a> is used to describe the content that a surface will +<a class="link" href="cairo-cairo-surface-t.html#cairo-content-t"><span class="type">cairo_content_t</span></a> is used to describe the content that a surface will contain, whether color information, alpha information (translucence vs. opacity), or both. </p> @@ -150,17 +150,17 @@ implementation can detect the error if users confuse the two types.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-CONTENT-COLOR:CAPS"></a><code class="literal">CAIRO_CONTENT_COLOR</code></span></td> +<td><p><span class="term"><a name="CAIRO-CONTENT-COLOR:CAPS"></a><code class="literal">CAIRO_CONTENT_COLOR</code></span></p></td> <td> The surface will hold color content only. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-CONTENT-ALPHA:CAPS"></a><code class="literal">CAIRO_CONTENT_ALPHA</code></span></td> +<td><p><span class="term"><a name="CAIRO-CONTENT-ALPHA:CAPS"></a><code class="literal">CAIRO_CONTENT_ALPHA</code></span></p></td> <td> The surface will hold alpha content only. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-CONTENT-COLOR-ALPHA:CAPS"></a><code class="literal">CAIRO_CONTENT_COLOR_ALPHA</code></span></td> +<td><p><span class="term"><a name="CAIRO-CONTENT-COLOR-ALPHA:CAPS"></a><code class="literal">CAIRO_CONTENT_COLOR_ALPHA</code></span></p></td> <td> The surface will hold color and alpha content. </td> </tr> @@ -169,10 +169,10 @@ implementation can detect the error if users confuse the two types.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2630214"></a><h3> +<a name="id2648567"></a><h3> <a name="cairo-surface-create-similar"></a>cairo_surface_create_similar ()</h3> -<a class="indexterm" name="id2630225"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_surface_create_similar (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *other, - <a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content, +<a class="indexterm" name="id2648578"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_surface_create_similar (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *other, + <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content, int width, int height);</pre> <p> @@ -181,7 +181,7 @@ existing surface. For example the new surface will have the same fallback resolution and font options as <em class="parameter"><code>other</code></em>. Generally, the new surface will also use the same backend as <em class="parameter"><code>other</code></em>, unless that is not possible for some reason. The type of the returned surface may -be examined with <a href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a>. +be examined with <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a>. </p> <p> Initially the surface contents are all 0 (transparent if contents @@ -193,27 +193,27 @@ have transparency, black otherwise.)</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>other</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>other</code></em> :</span></p></td> <td> an existing surface used to select the backend of the new surface </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>content</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>content</code></em> :</span></p></td> <td> the content for the new surface </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> width of the new surface, (in device-space units) </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> height of the new surface (in device-space units) </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a pointer to the newly allocated surface. The caller owns the surface and should call cairo_surface_destroy when done with it. @@ -228,17 +228,17 @@ or any other error occurs. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2640623"></a><h3> +<a name="id2658105"></a><h3> <a name="cairo-surface-reference"></a>cairo_surface_reference ()</h3> -<a class="indexterm" name="id2640633"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_surface_reference (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658115"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_surface_reference (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Increases the reference count on <em class="parameter"><code>surface</code></em> by one. This prevents <em class="parameter"><code>surface</code></em> from being destroyed until a matching call to -<a href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> is made. +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> is made. </p> <p> -The number of references to a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> can be get using -<a href="cairo-cairo-surface-t.html#cairo-surface-get-reference-count"><code class="function">cairo_surface_get_reference_count()</code></a>.</p> +The number of references to a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> can be get using +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-reference-count"><code class="function">cairo_surface_get_reference_count()</code></a>.</p> <p> </p> @@ -246,13 +246,13 @@ The number of references to a <a href="cairo-cairo-surface-t.html#cairo-surface- <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the referenced <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the referenced <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a>. </td> </tr> </tbody> @@ -260,30 +260,30 @@ The number of references to a <a href="cairo-cairo-surface-t.html#cairo-surface- </div> <hr> <div class="refsect2" lang="en"> -<a name="id2640742"></a><h3> +<a name="id2658223"></a><h3> <a name="cairo-surface-destroy"></a>cairo_surface_destroy ()</h3> -<a class="indexterm" name="id2640753"></a><pre class="programlisting">void cairo_surface_destroy (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658234"></a><pre class="programlisting">void cairo_surface_destroy (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Decreases the reference count on <em class="parameter"><code>surface</code></em> by one. If the result is zero, then <em class="parameter"><code>surface</code></em> and all associated resources are freed. See -<a href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>.</p> +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2640832"></a><h3> +<a name="id2658314"></a><h3> <a name="cairo-surface-status"></a>cairo_surface_status ()</h3> -<a class="indexterm" name="id2640843"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_status (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658325"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_status (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Checks whether an error has previously occurred for this surface.</p> @@ -294,16 +294,16 @@ surface.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, <a href="cairo-Error-Handling.html#CAIRO-STATUS-NULL-POINTER:CAPS"><code class="literal">CAIRO_STATUS_NULL_POINTER</code></a>, -<a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>, <a href="cairo-Error-Handling.html#CAIRO-STATUS-READ-ERROR:CAPS"><code class="literal">CAIRO_STATUS_READ_ERROR</code></a>, -<a href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-CONTENT:CAPS"><code class="literal">CAIRO_STATUS_INVALID_CONTENT</code></a>, <code class="literal">CAIRO_STATUS_INVALUE_FORMAT</code>, or -<a href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-VISUAL:CAPS"><code class="literal">CAIRO_STATUS_INVALID_VISUAL</code></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>, <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NULL-POINTER:CAPS"><code class="literal">CAIRO_STATUS_NULL_POINTER</code></a>, +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>, <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-READ-ERROR:CAPS"><code class="literal">CAIRO_STATUS_READ_ERROR</code></a>, +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-CONTENT:CAPS"><code class="literal">CAIRO_STATUS_INVALID_CONTENT</code></a>, <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-FORMAT:CAPS"><code class="literal">CAIRO_STATUS_INVALID_FORMAT</code></a>, or +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-VISUAL:CAPS"><code class="literal">CAIRO_STATUS_INVALID_VISUAL</code></a>. </td> </tr> </tbody> @@ -311,22 +311,22 @@ surface.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2602106"></a><h3> +<a name="id2658440"></a><h3> <a name="cairo-surface-finish"></a>cairo_surface_finish ()</h3> -<a class="indexterm" name="id2640970"></a><pre class="programlisting">void cairo_surface_finish (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658450"></a><pre class="programlisting">void cairo_surface_finish (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> This function finishes the surface and drops all references to external resources. For example, for the Xlib backend it means that cairo will no longer access the drawable, which can be freed. -After calling <a href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> the only valid operations on a +After calling <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> the only valid operations on a surface are getting and setting user data and referencing and destroying it. Further drawing to the surface will not affect the surface but will instead trigger a CAIRO_STATUS_SURFACE_FINISHED error. </p> <p> -When the last call to <a href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> decreases the -reference count to zero, cairo will call <a href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> if +When the last call to <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> decreases the +reference count to zero, cairo will call <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-finish"><code class="function">cairo_surface_finish()</code></a> if it hasn't been called already, before freeing the resources associated with the surface.</p> <p> @@ -335,17 +335,17 @@ associated with the surface.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> the <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> to finish +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> the <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> to finish </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641059"></a><h3> +<a name="id2658539"></a><h3> <a name="cairo-surface-flush"></a>cairo_surface_flush ()</h3> -<a class="indexterm" name="id2641069"></a><pre class="programlisting">void cairo_surface_flush (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658549"></a><pre class="programlisting">void cairo_surface_flush (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Do any pending drawing for the surface and also restore any temporary modification's cairo has made to the surface's @@ -359,24 +359,24 @@ then this function does nothing.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641125"></a><h3> +<a name="id2658605"></a><h3> <a name="cairo-surface-get-font-options"></a>cairo_surface_get_font_options ()</h3> -<a class="indexterm" name="id2641138"></a><pre class="programlisting">void cairo_surface_get_font_options (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - <a href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> +<a class="indexterm" name="id2658618"></a><pre class="programlisting">void cairo_surface_get_font_options (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + <a class="link" href="cairo-Font-Options.html#cairo-font-options-t">cairo_font_options_t</a> *options);</pre> <p> Retrieves the default font rendering options for the surface. This allows display surfaces to report the correct subpixel order for rendering on them, print surfaces to disable hinting of metrics and so forth. The result can then be used with -<a href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>.</p> +<a class="link" href="cairo-Scaled-Fonts.html#cairo-scaled-font-create"><code class="function">cairo_scaled_font_create()</code></a>.</p> <p> </p> @@ -384,13 +384,13 @@ metrics and so forth. The result can then be used with <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>options</code></em> :</span></td> -<td> a <a href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object into which to store +<td><p><span class="term"><em class="parameter"><code>options</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Font-Options.html#cairo-font-options-t"><span class="type">cairo_font_options_t</span></a> object into which to store the retrieved options. All existing values are overwritten </td> </tr> @@ -399,13 +399,13 @@ metrics and so forth. The result can then be used with </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641228"></a><h3> +<a name="id2658708"></a><h3> <a name="cairo-surface-get-content"></a>cairo_surface_get_content ()</h3> -<a class="indexterm" name="id2641241"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> cairo_surface_get_content (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658721"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> cairo_surface_get_content (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> This function returns the content type of <em class="parameter"><code>surface</code></em> which indicates whether the surface contains color and/or alpha information. See -<a href="cairo-cairo-surface-t.html#cairo-content-t"><span class="type">cairo_content_t</span></a>.</p> +<a class="link" href="cairo-cairo-surface-t.html#cairo-content-t"><span class="type">cairo_content_t</span></a>.</p> <p> </p> @@ -413,12 +413,12 @@ whether the surface contains color and/or alpha information. See <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The content type of <em class="parameter"><code>surface</code></em>. </td> @@ -430,36 +430,36 @@ whether the surface contains color and/or alpha information. See </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641326"></a><h3> +<a name="id2658806"></a><h3> <a name="cairo-surface-mark-dirty"></a>cairo_surface_mark_dirty ()</h3> -<a class="indexterm" name="id2641336"></a><pre class="programlisting">void cairo_surface_mark_dirty (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2658816"></a><pre class="programlisting">void cairo_surface_mark_dirty (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Tells cairo that drawing has been done to surface using means other than cairo, and that cairo should reread any cached areas. Note -that you must call <a href="cairo-cairo-surface-t.html#cairo-surface-flush"><code class="function">cairo_surface_flush()</code></a> before doing such drawing.</p> +that you must call <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-flush"><code class="function">cairo_surface_flush()</code></a> before doing such drawing.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641398"></a><h3> +<a name="id2658878"></a><h3> <a name="cairo-surface-mark-dirty-rectangle"></a>cairo_surface_mark_dirty_rectangle ()</h3> -<a class="indexterm" name="id2641411"></a><pre class="programlisting">void cairo_surface_mark_dirty_rectangle (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2658891"></a><pre class="programlisting">void cairo_surface_mark_dirty_rectangle (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, int x, int y, int width, int height);</pre> <p> -Like <a href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty"><code class="function">cairo_surface_mark_dirty()</code></a>, but drawing has been done only to +Like <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-mark-dirty"><code class="function">cairo_surface_mark_dirty()</code></a>, but drawing has been done only to the specified rectangle, so that cairo can retain cached contents for other parts of the surface. </p> @@ -474,27 +474,27 @@ expect.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X coordinate of dirty rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y coordinate of dirty rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> width of dirty rectangle </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>height</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>height</code></em> :</span></p></td> <td> height of dirty rectangle </td> </tr> @@ -503,20 +503,20 @@ expect.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641555"></a><h3> +<a name="id2659035"></a><h3> <a name="cairo-surface-set-device-offset"></a>cairo_surface_set_device_offset ()</h3> -<a class="indexterm" name="id2641568"></a><pre class="programlisting">void cairo_surface_set_device_offset (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2659048"></a><pre class="programlisting">void cairo_surface_set_device_offset (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x_offset, double y_offset);</pre> <p> Sets an offset that is added to the device coordinates determined by the CTM when drawing to <em class="parameter"><code>surface</code></em>. One use case for this function -is when we want to create a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> that redirects drawing +is when we want to create a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> that redirects drawing for a portion of an onscreen surface to an offscreen surface in a way that is completely invisible to the user of the cairo -API. Setting a transformation via <a href="cairo-Transformations.html#cairo-translate"><code class="function">cairo_translate()</code></a> isn't +API. Setting a transformation via <a class="link" href="cairo-Transformations.html#cairo-translate"><code class="function">cairo_translate()</code></a> isn't sufficient to do this, since functions like -<a href="cairo-Transformations.html#cairo-device-to-user"><code class="function">cairo_device_to_user()</code></a> will expose the hidden offset. +<a class="link" href="cairo-Transformations.html#cairo-device-to-user"><code class="function">cairo_device_to_user()</code></a> will expose the hidden offset. </p> <p> Note that the offset affects drawing to the surface as well as @@ -528,17 +528,17 @@ using the surface in a source pattern.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x_offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x_offset</code></em> :</span></p></td> <td> the offset in the X direction, in device units </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y_offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y_offset</code></em> :</span></p></td> <td> the offset in the Y direction, in device units </td> </tr> @@ -547,14 +547,14 @@ using the surface in a source pattern.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641700"></a><h3> +<a name="id2659180"></a><h3> <a name="cairo-surface-get-device-offset"></a>cairo_surface_get_device_offset ()</h3> -<a class="indexterm" name="id2641714"></a><pre class="programlisting">void cairo_surface_get_device_offset (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2659194"></a><pre class="programlisting">void cairo_surface_get_device_offset (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double *x_offset, double *y_offset);</pre> <p> This function returns the previous device offset set by -<a href="cairo-cairo-surface-t.html#cairo-surface-set-device-offset"><code class="function">cairo_surface_set_device_offset()</code></a>.</p> +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-set-device-offset"><code class="function">cairo_surface_set_device_offset()</code></a>.</p> <p> </p> @@ -562,17 +562,17 @@ This function returns the previous device offset set by <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x_offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x_offset</code></em> :</span></p></td> <td> the offset in the X direction, in device units </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y_offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y_offset</code></em> :</span></p></td> <td> the offset in the Y direction, in device units </td> </tr> @@ -583,10 +583,10 @@ This function returns the previous device offset set by </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641822"></a><h3> +<a name="id2659302"></a><h3> <a name="cairo-surface-set-fallback-resolution"></a>cairo_surface_set_fallback_resolution ()</h3> -<a class="indexterm" name="id2641837"></a><pre class="programlisting">void cairo_surface_set_fallback_resolution - (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2659317"></a><pre class="programlisting">void cairo_surface_set_fallback_resolution + (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x_pixels_per_inch, double y_pixels_per_inch);</pre> <p> @@ -612,7 +612,7 @@ backends. </p> <p> NOTE: The fallback resolution only takes effect at the time of -completing a page (with <a href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>) so +completing a page (with <a class="link" href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a>) so there is currently no way to have more than one fallback resolution in effect on a single page.</p> <p> @@ -622,17 +622,17 @@ in effect on a single page.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x_pixels_per_inch</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x_pixels_per_inch</code></em> :</span></p></td> <td> horizontal setting for pixels per inch </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y_pixels_per_inch</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y_pixels_per_inch</code></em> :</span></p></td> <td> vertical setting for pixels per inch </td> </tr> @@ -643,9 +643,9 @@ in effect on a single page.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2641981"></a><h3> +<a name="id2659460"></a><h3> <a name="cairo-surface-type-t"></a>enum cairo_surface_type_t</h3> -<a class="indexterm" name="id2641993"></a><pre class="programlisting">typedef enum _cairo_surface_type { +<a class="indexterm" name="id2659473"></a><pre class="programlisting">typedef enum _cairo_surface_type { CAIRO_SURFACE_TYPE_IMAGE, CAIRO_SURFACE_TYPE_PDF, CAIRO_SURFACE_TYPE_PS, @@ -661,7 +661,7 @@ in effect on a single page.</p> } cairo_surface_type_t; </pre> <p> -<a href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span class="type">cairo_surface_type_t</span></a> is used to describe the type of a given +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span class="type">cairo_surface_type_t</span></a> is used to describe the type of a given surface. The surface types are also known as "backends" or "surface backends" within cairo. </p> @@ -671,14 +671,14 @@ it, which will generally be of the form cairo_<span class="emphasis"><em>type</e (though see cairo_surface_create_similar as well). </p> <p> -The surface type can be queried with <a href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a> +The surface type can be queried with <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-get-type"><code class="function">cairo_surface_get_type()</code></a> </p> <p> The various cairo_surface functions can be used with surfaces of any type, but some backends also provide type-specific functions that must only be called with a surface of the appropriate type. These functions have names that begin with -cairo_<span class="emphasis"><em>type</em></span>_surface such as <a href="cairo-Image-Surfaces.html#cairo-image-surface-get-width"><code class="function">cairo_image_surface_get_width()</code></a>. +cairo_<span class="emphasis"><em>type</em></span>_surface such as <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-get-width"><code class="function">cairo_image_surface_get_width()</code></a>. </p> <p> The behavior of calling a type-specific function with a surface of @@ -693,62 +693,62 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-IMAGE:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_IMAGE</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-IMAGE:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_IMAGE</code></span></p></td> <td> The surface is of type image </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-PDF:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_PDF</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-PDF:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_PDF</code></span></p></td> <td> The surface is of type pdf </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-PS:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_PS</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-PS:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_PS</code></span></p></td> <td> The surface is of type ps </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-XLIB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_XLIB</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-XLIB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_XLIB</code></span></p></td> <td> The surface is of type xlib </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-XCB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_XCB</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-XCB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_XCB</code></span></p></td> <td> The surface is of type xcb </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-GLITZ:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_GLITZ</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-GLITZ:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_GLITZ</code></span></p></td> <td> The surface is of type glitz </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-QUARTZ:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_QUARTZ</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-QUARTZ:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_QUARTZ</code></span></p></td> <td> The surface is of type quartz </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-WIN32:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_WIN32</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-WIN32:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_WIN32</code></span></p></td> <td> The surface is of type win32 </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-BEOS:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_BEOS</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-BEOS:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_BEOS</code></span></p></td> <td> The surface is of type beos </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-DIRECTFB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_DIRECTFB</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-DIRECTFB:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_DIRECTFB</code></span></p></td> <td> The surface is of type directfb </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-SVG:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_SVG</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-SVG:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_SVG</code></span></p></td> <td> The surface is of type svg </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-SURFACE-TYPE-OS2:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_OS2</code></span></td> +<td><p><span class="term"><a name="CAIRO-SURFACE-TYPE-OS2:CAPS"></a><code class="literal">CAIRO_SURFACE_TYPE_OS2</code></span></p></td> <td> The surface is of type os2 </td> </tr> @@ -759,12 +759,12 @@ New entries may be added in future versions.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2642329"></a><h3> +<a name="id2659809"></a><h3> <a name="cairo-surface-get-type"></a>cairo_surface_get_type ()</h3> -<a class="indexterm" name="id2642342"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a> cairo_surface_get_type (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2659822"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-type-t">cairo_surface_type_t</a> cairo_surface_get_type (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> This function returns the type of the backend used to create -a surface. See <a href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span class="type">cairo_surface_type_t</span></a> for available types.</p> +a surface. See <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span class="type">cairo_surface_type_t</span></a> for available types.</p> <p> </p> @@ -772,12 +772,12 @@ a surface. See <a href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span c <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> The type of <em class="parameter"><code>surface</code></em>. </td> @@ -789,9 +789,9 @@ a surface. See <a href="cairo-cairo-surface-t.html#cairo-surface-type-t"><span c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2642420"></a><h3> +<a name="id2659900"></a><h3> <a name="cairo-surface-get-reference-count"></a>cairo_surface_get_reference_count ()</h3> -<a class="indexterm" name="id2642436"></a><pre class="programlisting">unsigned int cairo_surface_get_reference_count (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> +<a class="indexterm" name="id2659915"></a><pre class="programlisting">unsigned int cairo_surface_get_reference_count (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface);</pre> <p> Returns the current reference count of <em class="parameter"><code>surface</code></em>.</p> <p> @@ -801,12 +801,12 @@ Returns the current reference count of <em class="parameter"><code>surface</code <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current reference count of <em class="parameter"><code>surface</code></em>. If the object is a nil object, 0 will be returned. @@ -819,12 +819,12 @@ object is a nil object, 0 will be returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2642515"></a><h3> +<a name="id2659995"></a><h3> <a name="cairo-surface-set-user-data"></a>cairo_surface_set_user_data ()</h3> -<a class="indexterm" name="id2642526"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_set_user_data (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="indexterm" name="id2660006"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_surface_set_user_data (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> <p> Attach user data to <em class="parameter"><code>surface</code></em>. To remove user data from a surface, call this function with the key that was used to set it and <code class="literal">NULL</code> @@ -836,30 +836,30 @@ for <em class="parameter"><code>data</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of a <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of a <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>user_data</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> <td> the user data to attach to the surface </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>destroy</code></em> :</span></td> -<td> a <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the +<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the surface is destroyed or when new user data is attached using the same key. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a slot could not be allocated for the user data. </td> </tr> @@ -868,10 +868,10 @@ slot could not be allocated for the user data. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2642697"></a><h3> +<a name="id2660177"></a><h3> <a name="cairo-surface-get-user-data"></a>cairo_surface_get_user_data ()</h3> -<a class="indexterm" name="id2642708"></a><pre class="programlisting">void* cairo_surface_get_user_data (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> +<a class="indexterm" name="id2660188"></a><pre class="programlisting">void* cairo_surface_get_user_data (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> <p> Return user data previously attached to <em class="parameter"><code>surface</code></em> using the specified key. If no user data has been attached with the given key this @@ -883,18 +883,18 @@ function returns <code class="literal">NULL</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of the <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of the <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was attached to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the user data previously attached or <code class="literal">NULL</code>. </td> </tr> @@ -902,6 +902,11 @@ attached to </table></div> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2660301"></a><div class="refsect2" lang="en"><a name="id2660302"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2660303"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo-cairo-t.html b/doc/public/html/cairo-cairo-t.html index 37c5995..ecd9ca5 100644 --- a/doc/public/html/cairo-cairo-t.html +++ b/doc/public/html/cairo-cairo-t.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>cairo_t</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="Drawing.html" title="Drawing"> <link rel="prev" href="Drawing.html" title="Drawing"> <link rel="next" href="cairo-Paths.html" title="Paths"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,16 +30,16 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="cairo-Paths.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> -<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2574632" class="shortcut">Top</a> +<tr><td colspan="5" class="shortcuts"><nobr><a href="#id2592055" class="shortcut">Top</a>  |  - <a href="#id2613026" class="shortcut">Description</a></nobr></td></tr> + <a href="#id2630454" class="shortcut">Description</a></nobr></td></tr> </table> <div class="refentry" lang="en"> <a name="cairo-cairo-t"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> <h2> -<a name="id2574632"></a><span class="refentrytitle">cairo_t</span> +<a name="id2592055"></a><span class="refentrytitle">cairo_t</span> </h2> <p>cairo_t — The cairo drawing context</p> </td> @@ -51,179 +51,179 @@ -typedef <a href="cairo-cairo-t.html#cairo-t">cairo_t</a>; -<a href="cairo-cairo-t.html#cairo-t">cairo_t</a>* <a href="cairo-cairo-t.html#cairo-create">cairo_create</a> (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *target); -<a href="cairo-cairo-t.html#cairo-t">cairo_t</a>* <a href="cairo-cairo-t.html#cairo-reference">cairo_reference</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-destroy">cairo_destroy</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-t.html#cairo-status">cairo_status</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-save">cairo_save</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-restore">cairo_restore</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-cairo-t.html#cairo-get-target">cairo_get_target</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-push-group">cairo_push_group</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-push-group-with-content">cairo_push_group_with_content</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-cairo-t.html#cairo-pop-group">cairo_pop_group</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-pop-group-to-source">cairo_pop_group_to_source</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a href="cairo-cairo-t.html#cairo-get-group-target">cairo_get_group_target</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-set-source-rgb">cairo_set_source_rgb</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +typedef <a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a>; +<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-create">cairo_create</a> (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *target); +<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-reference">cairo_reference</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-destroy">cairo_destroy</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-t.html#cairo-status">cairo_status</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-save">cairo_save</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-restore">cairo_restore</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-get-target">cairo_get_target</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-push-group">cairo_push_group</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-push-group-with-content">cairo_push_group_with_content</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content); +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-pop-group">cairo_pop_group</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-pop-group-to-source">cairo_pop_group_to_source</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-get-group-target">cairo_get_group_target</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgb">cairo_set_source_rgb</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double red, double green, double blue); -void <a href="cairo-cairo-t.html#cairo-set-source-rgba">cairo_set_source_rgba</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-cairo-t.html#cairo-set-source-rgba">cairo_set_source_rgba</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double red, double green, double blue, double alpha); -void <a href="cairo-cairo-t.html#cairo-set-source">cairo_set_source</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *source); -void <a href="cairo-cairo-t.html#cairo-set-source-surface">cairo_set_source_surface</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-cairo-t.html#cairo-set-source">cairo_set_source</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *source); +void <a class="link" href="cairo-cairo-t.html#cairo-set-source-surface">cairo_set_source_surface</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x, double y); -<a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a href="cairo-cairo-t.html#cairo-get-source">cairo_get_source</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -enum <a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a>; -void <a href="cairo-cairo-t.html#cairo-set-antialias">cairo_set_antialias</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias); -<a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> <a href="cairo-cairo-t.html#cairo-get-antialias">cairo_get_antialias</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-set-dash">cairo_set_dash</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-get-source">cairo_get_source</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +enum <a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-set-antialias">cairo_set_antialias</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias); +<a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> <a class="link" href="cairo-cairo-t.html#cairo-get-antialias">cairo_get_antialias</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-set-dash">cairo_set_dash</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const double *dashes, int num_dashes, double offset); -int <a href="cairo-cairo-t.html#cairo-get-dash-count">cairo_get_dash_count</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-get-dash">cairo_get_dash</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +int <a class="link" href="cairo-cairo-t.html#cairo-get-dash-count">cairo_get_dash_count</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-get-dash">cairo_get_dash</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dashes, double *offset); -enum <a href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a>; -void <a href="cairo-cairo-t.html#cairo-set-fill-rule">cairo_set_fill_rule</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> fill_rule); -<a href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> <a href="cairo-cairo-t.html#cairo-get-fill-rule">cairo_get_fill_rule</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -enum <a href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a>; -void <a href="cairo-cairo-t.html#cairo-set-line-cap">cairo_set_line_cap</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> line_cap); -<a href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> <a href="cairo-cairo-t.html#cairo-get-line-cap">cairo_get_line_cap</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -enum <a href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a>; -void <a href="cairo-cairo-t.html#cairo-set-line-join">cairo_set_line_join</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> line_join); -<a href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> <a href="cairo-cairo-t.html#cairo-get-line-join">cairo_get_line_join</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-set-line-width">cairo_set_line_width</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +enum <a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule">cairo_set_fill_rule</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> fill_rule); +<a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> <a class="link" href="cairo-cairo-t.html#cairo-get-fill-rule">cairo_get_fill_rule</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +enum <a class="link" href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-set-line-cap">cairo_set_line_cap</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> line_cap); +<a class="link" href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> <a class="link" href="cairo-cairo-t.html#cairo-get-line-cap">cairo_get_line_cap</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +enum <a class="link" href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-set-line-join">cairo_set_line_join</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> line_join); +<a class="link" href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> <a class="link" href="cairo-cairo-t.html#cairo-get-line-join">cairo_get_line_join</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-set-line-width">cairo_set_line_width</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double width); -double <a href="cairo-cairo-t.html#cairo-get-line-width">cairo_get_line_width</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-set-miter-limit">cairo_set_miter_limit</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +double <a class="link" href="cairo-cairo-t.html#cairo-get-line-width">cairo_get_line_width</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-set-miter-limit">cairo_set_miter_limit</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double limit); -double <a href="cairo-cairo-t.html#cairo-get-miter-limit">cairo_get_miter_limit</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -enum <a href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a>; -void <a href="cairo-cairo-t.html#cairo-set-operator">cairo_set_operator</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> op); -<a href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> <a href="cairo-cairo-t.html#cairo-get-operator">cairo_get_operator</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-set-tolerance">cairo_set_tolerance</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +double <a class="link" href="cairo-cairo-t.html#cairo-get-miter-limit">cairo_get_miter_limit</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +enum <a class="link" href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-set-operator">cairo_set_operator</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> op); +<a class="link" href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> <a class="link" href="cairo-cairo-t.html#cairo-get-operator">cairo_get_operator</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-set-tolerance">cairo_set_tolerance</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double tolerance); -double <a href="cairo-cairo-t.html#cairo-get-tolerance">cairo_get_tolerance</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-clip">cairo_clip</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-clip-preserve">cairo_clip_preserve</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-clip-extents">cairo_clip_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +double <a class="link" href="cairo-cairo-t.html#cairo-get-tolerance">cairo_get_tolerance</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-clip">cairo_clip</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-clip-preserve">cairo_clip_preserve</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-clip-extents">cairo_clip_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, double *y2); -void <a href="cairo-cairo-t.html#cairo-reset-clip">cairo_reset_clip</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); - <a href="cairo-cairo-t.html#cairo-rectangle-t">cairo_rectangle_t</a>; - <a href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>; -void <a href="cairo-cairo-t.html#cairo-rectangle-list-destroy">cairo_rectangle_list_destroy</a> (<a href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a> *rectangle_list); -<a href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>* <a href="cairo-cairo-t.html#cairo-copy-clip-rectangle-list">cairo_copy_clip_rectangle_list</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-fill">cairo_fill</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-fill-preserve">cairo_fill_preserve</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-fill-extents">cairo_fill_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-cairo-t.html#cairo-reset-clip">cairo_reset_clip</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); + <a class="link" href="cairo-cairo-t.html#cairo-rectangle-t">cairo_rectangle_t</a>; + <a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>; +void <a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-destroy">cairo_rectangle_list_destroy</a> (<a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a> *rectangle_list); +<a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>* <a class="link" href="cairo-cairo-t.html#cairo-copy-clip-rectangle-list">cairo_copy_clip_rectangle_list</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-fill">cairo_fill</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-fill-preserve">cairo_fill_preserve</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-fill-extents">cairo_fill_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, double *y2); -<a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a href="cairo-cairo-t.html#cairo-in-fill">cairo_in_fill</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a class="link" href="cairo-cairo-t.html#cairo-in-fill">cairo_in_fill</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y); -void <a href="cairo-cairo-t.html#cairo-mask">cairo_mask</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); -void <a href="cairo-cairo-t.html#cairo-mask-surface">cairo_mask_surface</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +void <a class="link" href="cairo-cairo-t.html#cairo-mask">cairo_mask</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern); +void <a class="link" href="cairo-cairo-t.html#cairo-mask-surface">cairo_mask_surface</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double surface_x, double surface_y); -void <a href="cairo-cairo-t.html#cairo-paint">cairo_paint</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-paint-with-alpha">cairo_paint_with_alpha</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-cairo-t.html#cairo-paint">cairo_paint</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-paint-with-alpha">cairo_paint_with_alpha</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double alpha); -void <a href="cairo-cairo-t.html#cairo-stroke">cairo_stroke</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-stroke-preserve">cairo_stroke_preserve</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-stroke-extents">cairo_stroke_extents</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +void <a class="link" href="cairo-cairo-t.html#cairo-stroke">cairo_stroke</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-stroke-preserve">cairo_stroke_preserve</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-stroke-extents">cairo_stroke_extents</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, double *y2); -<a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a href="cairo-cairo-t.html#cairo-in-stroke">cairo_in_stroke</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> <a class="link" href="cairo-cairo-t.html#cairo-in-stroke">cairo_in_stroke</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y); -void <a href="cairo-cairo-t.html#cairo-copy-page">cairo_copy_page</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -void <a href="cairo-cairo-t.html#cairo-show-page">cairo_show_page</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -unsigned int <a href="cairo-cairo-t.html#cairo-get-reference-count">cairo_get_reference_count</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); -<a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a href="cairo-cairo-t.html#cairo-set-user-data">cairo_set_user_data</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +void <a class="link" href="cairo-cairo-t.html#cairo-copy-page">cairo_copy_page</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +void <a class="link" href="cairo-cairo-t.html#cairo-show-page">cairo_show_page</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +unsigned int <a class="link" href="cairo-cairo-t.html#cairo-get-reference-count">cairo_get_reference_count</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr); +<a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <a class="link" href="cairo-cairo-t.html#cairo-set-user-data">cairo_set_user_data</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); -void* <a href="cairo-cairo-t.html#cairo-get-user-data">cairo_get_user_data</a> (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy); +void* <a class="link" href="cairo-cairo-t.html#cairo-get-user-data">cairo_get_user_data</a> (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key); </pre> </div> <div class="refsect1" lang="en"> -<a name="id2613026"></a><h2>Description</h2> +<a name="id2630454"></a><h2>Description</h2> <p> - <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is the main object used when drawing with cairo. To - draw with cairo, you create a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, set the target surface, - and drawing options for the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, create shapes with - functions like <a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a> and <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, and then - draw shapes with <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> or <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>. + <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is the main object used when drawing with cairo. To + draw with cairo, you create a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, set the target surface, + and drawing options for the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>, create shapes with + functions like <a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a> and <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a>, and then + draw shapes with <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>. </p> <p> - <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>'s can be pushed to a stack via <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>. + <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>'s can be pushed to a stack via <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>. They may then safely be changed, without loosing the current state. - Use <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> to restore to the saved state. + Use <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> to restore to the saved state. </p> </div> <div class="refsect1" lang="en"> -<a name="id2613136"></a><h2>Details</h2> +<a name="id2630565"></a><h2>Details</h2> <div class="refsect2" lang="en"> -<a name="id2613147"></a><h3> +<a name="id2630576"></a><h3> <a name="cairo-t"></a>cairo_t</h3> -<a class="indexterm" name="id2613159"></a><pre class="programlisting">typedef struct _cairo cairo_t; +<a class="indexterm" name="id2630588"></a><pre class="programlisting">typedef struct _cairo cairo_t; </pre> <p> -A <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> contains the current state of the rendering device, +A <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> contains the current state of the rendering device, including coordinates of yet to be drawn shapes. </p> <p> -Cairo contexts, as <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> objects are named, are central to -cairo and all drawing with cairo is always done to a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +Cairo contexts, as <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> objects are named, are central to +cairo and all drawing with cairo is always done to a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> object. </p> <p> -Memory management of <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is done with -<a href="cairo-cairo-t.html#cairo-reference"><code class="function">cairo_reference()</code></a> and <a href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a>.</p> +Memory management of <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is done with +<a class="link" href="cairo-cairo-t.html#cairo-reference"><code class="function">cairo_reference()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a>.</p> <p> </p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613236"></a><h3> +<a name="id2630665"></a><h3> <a name="cairo-create"></a>cairo_create ()</h3> -<a class="indexterm" name="id2613249"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-t">cairo_t</a>* cairo_create (<a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *target);</pre> +<a class="indexterm" name="id2630677"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a>* cairo_create (<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *target);</pre> <p> -Creates a new <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with all graphics state parameters set to +Creates a new <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with all graphics state parameters set to default values and with <em class="parameter"><code>target</code></em> as a target surface. The target surface should be constructed with a backend-specific function such -as <a href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a> (or any other +as <a class="link" href="cairo-Image-Surfaces.html#cairo-image-surface-create"><code class="function">cairo_image_surface_create()</code></a> (or any other <code class="literal">cairo_<backend>_surface_create</code> variant). </p> <p> This function references <em class="parameter"><code>target</code></em>, so you can immediately -call <a href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> on it if you don't need to +call <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-destroy"><code class="function">cairo_surface_destroy()</code></a> on it if you don't need to maintain a separate reference to it.</p> <p> @@ -232,18 +232,18 @@ maintain a separate reference to it.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>target</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>target</code></em> :</span></p></td> <td> target surface for the context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> a newly allocated <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with a reference +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> a newly allocated <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> with a reference count of 1. The initial reference count should be released - with <a href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a> when you are done using the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. + with <a class="link" href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a> when you are done using the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. This function never returns <code class="literal">NULL</code>. If memory cannot be - allocated, a special <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> object will be returned on - which <a href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a> returns <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. + allocated, a special <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> object will be returned on + which <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a> returns <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a>. You can use this object normally, but no drawing will be done. </td> @@ -253,17 +253,17 @@ maintain a separate reference to it.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613424"></a><h3> +<a name="id2630852"></a><h3> <a name="cairo-reference"></a>cairo_reference ()</h3> -<a class="indexterm" name="id2613436"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-t">cairo_t</a>* cairo_reference (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2630865"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a>* cairo_reference (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Increases the reference count on <em class="parameter"><code>cr</code></em> by one. This prevents -<em class="parameter"><code>cr</code></em> from being destroyed until a matching call to <a href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a> +<em class="parameter"><code>cr</code></em> from being destroyed until a matching call to <a class="link" href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a> is made. </p> <p> -The number of references to a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> can be get using -<a href="cairo-cairo-t.html#cairo-get-reference-count"><code class="function">cairo_get_reference_count()</code></a>.</p> +The number of references to a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> can be get using +<a class="link" href="cairo-cairo-t.html#cairo-get-reference-count"><code class="function">cairo_get_reference_count()</code></a>.</p> <p> </p> @@ -271,13 +271,13 @@ The number of references to a <a href="cairo-cairo-t.html#cairo-t"><span class=" <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> the referenced <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> the referenced <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>. </td> </tr> </tbody> @@ -285,30 +285,30 @@ The number of references to a <a href="cairo-cairo-t.html#cairo-t"><span class=" </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613554"></a><h3> +<a name="id2630982"></a><h3> <a name="cairo-destroy"></a>cairo_destroy ()</h3> -<a class="indexterm" name="id2613566"></a><pre class="programlisting">void cairo_destroy (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2630994"></a><pre class="programlisting">void cairo_destroy (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Decreases the reference count on <em class="parameter"><code>cr</code></em> by one. If the result is zero, then <em class="parameter"><code>cr</code></em> and all associated resources are freed. -See <a href="cairo-cairo-t.html#cairo-reference"><code class="function">cairo_reference()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-reference"><code class="function">cairo_reference()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613645"></a><h3> +<a name="id2631074"></a><h3> <a name="cairo-status"></a>cairo_status ()</h3> -<a class="indexterm" name="id2613658"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_status (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631086"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_status (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Checks whether an error has previously occurred for this context.</p> <p> @@ -318,13 +318,13 @@ Checks whether an error has previously occurred for this context.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td>the current status of this context, see <a href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>the current status of this context, see <a class="link" href="cairo-Error-Handling.html#cairo-status-t"><span class="type">cairo_status_t</span></a> </td> </tr> </tbody> @@ -332,42 +332,42 @@ Checks whether an error has previously occurred for this context.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613726"></a><h3> +<a name="id2631154"></a><h3> <a name="cairo-save"></a>cairo_save ()</h3> -<a class="indexterm" name="id2613738"></a><pre class="programlisting">void cairo_save (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631166"></a><pre class="programlisting">void cairo_save (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Makes a copy of the current state of <em class="parameter"><code>cr</code></em> and saves it on an internal stack of saved states for <em class="parameter"><code>cr</code></em>. When -<a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> is called, <em class="parameter"><code>cr</code></em> will be restored to -the saved state. Multiple calls to <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and -<a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> can be nested; each call to <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> -restores the state from the matching paired <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>. +<a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> is called, <em class="parameter"><code>cr</code></em> will be restored to +the saved state. Multiple calls to <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and +<a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> can be nested; each call to <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> +restores the state from the matching paired <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>. </p> <p> It isn't necessary to clear all saved states before -a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is freed. If the reference count of a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> -drops to zero in response to a call to <a href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a>, -any saved states will be freed along with the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> +a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is freed. If the reference count of a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +drops to zero in response to a call to <a class="link" href="cairo-cairo-t.html#cairo-destroy"><code class="function">cairo_destroy()</code></a>, +any saved states will be freed along with the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613900"></a><h3> +<a name="id2631329"></a><h3> <a name="cairo-restore"></a>cairo_restore ()</h3> -<a class="indexterm" name="id2613912"></a><pre class="programlisting">void cairo_restore (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631341"></a><pre class="programlisting">void cairo_restore (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Restores <em class="parameter"><code>cr</code></em> to the state saved by a preceding call to -<a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and removes that state from the stack of +<a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and removes that state from the stack of saved states.</p> <p> @@ -375,27 +375,27 @@ saved states.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr></tbody> </table></div> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2613986"></a><h3> +<a name="id2631415"></a><h3> <a name="cairo-get-target"></a>cairo_get_target ()</h3> -<a class="indexterm" name="id2613998"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_get_target (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631428"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_get_target (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the target surface for the cairo context as passed to -<a href="cairo-cairo-t.html#cairo-create"><code class="function">cairo_create()</code></a>. +<a class="link" href="cairo-cairo-t.html#cairo-create"><code class="function">cairo_create()</code></a>. </p> <p> This function will always return a valid pointer, but the result can be a "nil" surface if <em class="parameter"><code>cr</code></em> is already in an error state, -(ie. <a href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a> <code class="literal">!=</code> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>). -A nil surface is indicated by <a href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> -<code class="literal">!=</code> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>.</p> +(ie. <a class="link" href="cairo-cairo-t.html#cairo-status"><code class="function">cairo_status()</code></a> <code class="literal">!=</code> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>). +A nil surface is indicated by <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-status"><code class="function">cairo_surface_status()</code></a> +<code class="literal">!=</code> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a>.</p> <p> </p> @@ -403,14 +403,14 @@ A nil surface is indicated by <a href="cairo-cairo-surface-t.html#cairo-surface- <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the target surface. This object is owned by cairo. To -keep a reference to it, you must call <a href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>. +keep a reference to it, you must call <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>. </td> </tr> </tbody> @@ -418,13 +418,13 @@ keep a reference to it, you must call <a href="cairo-cairo-surface-t.html#cairo- </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614140"></a><h3> +<a name="id2631569"></a><h3> <a name="cairo-push-group"></a>cairo_push_group ()</h3> -<a class="indexterm" name="id2614155"></a><pre class="programlisting">void cairo_push_group (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631584"></a><pre class="programlisting">void cairo_push_group (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Temporarily redirects drawing to an intermediate surface known as a group. The redirection lasts until the group is completed by a call -to <a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>. These calls +to <a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>. These calls provide the result of any drawing to the group as a pattern, (either as an explicit object, or set as the source pattern). </p> @@ -437,18 +437,18 @@ destination. </p> <p> Groups can be nested arbitrarily deep by making balanced calls to -<a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a>/<a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a>. Each call pushes/pops the new +<a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a>/<a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a>. Each call pushes/pops the new target group onto/from a stack. </p> <p> -The <a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> function calls <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> so that any +The <a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> function calls <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> so that any changes to the graphics state will not be visible outside the -group, (the pop_group functions call <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>). +group, (the pop_group functions call <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>). </p> <p> By default the intermediate group will have a content type of CAIRO_CONTENT_COLOR_ALPHA. Other content types can be chosen for -the group by using <a href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> instead. +the group by using <a class="link" href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> instead. </p> <p> As an example, here is how one might fill and stroke a path with @@ -472,7 +472,7 @@ cairo_paint_with_alpha (cr, alpha); <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -482,21 +482,21 @@ cairo_paint_with_alpha (cr, alpha); </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614337"></a><h3> +<a name="id2631766"></a><h3> <a name="cairo-push-group-with-content"></a>cairo_push_group_with_content ()</h3> -<a class="indexterm" name="id2614352"></a><pre class="programlisting">void cairo_push_group_with_content (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content);</pre> +<a class="indexterm" name="id2631781"></a><pre class="programlisting">void cairo_push_group_with_content (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t">cairo_content_t</a> content);</pre> <p> Temporarily redirects drawing to an intermediate surface known as a group. The redirection lasts until the group is completed by a call -to <a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>. These calls +to <a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>. These calls provide the result of any drawing to the group as a pattern, (either as an explicit object, or set as the source pattern). </p> <p> The group will have a content type of <em class="parameter"><code>content</code></em>. The ability to control this content type is the only distinction between this -function and <a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> which you should see for a more +function and <a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> which you should see for a more detailed description of group rendering.</p> <p> @@ -505,13 +505,13 @@ detailed description of group rendering.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>content</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-content-t"><code class="literal">cairo_content_t</code></a> indicating the type of group that +<td><p><span class="term"><em class="parameter"><code>content</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-content-t"><code class="literal">cairo_content_t</code></a> indicating the type of group that will be created </td> </tr> @@ -522,18 +522,18 @@ detailed description of group rendering.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2586256"></a><h3> +<a name="id2631916"></a><h3> <a name="cairo-pop-group"></a>cairo_pop_group ()</h3> -<a class="indexterm" name="id2614483"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pop_group (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2631930"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_pop_group (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Terminates the redirection begun by a call to <a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or -<a href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> and returns a new pattern +Terminates the redirection begun by a call to <a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or +<a class="link" href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> and returns a new pattern containing the results of all drawing operations performed to the group. </p> <p> -The <a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> function calls <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>, (balancing a -call to <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> by the push_group function), so that any +The <a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> function calls <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>, (balancing a +call to <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> by the push_group function), so that any changes to the graphics state will not be visible outside the group.</p> <p> @@ -543,16 +543,16 @@ group.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> a newly created (surface) pattern containing the results of all drawing operations performed to the group. The caller owns the returned object and should call -<a href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. +<a class="link" href="cairo-Patterns.html#cairo-pattern-destroy"><code class="function">cairo_pattern_destroy()</code></a> when finished with it. </td> </tr> @@ -563,12 +563,12 @@ caller owns the returned object and should call </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614604"></a><h3> +<a name="id2632040"></a><h3> <a name="cairo-pop-group-to-source"></a>cairo_pop_group_to_source ()</h3> -<a class="indexterm" name="id2614617"></a><pre class="programlisting">void cairo_pop_group_to_source (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2632053"></a><pre class="programlisting">void cairo_pop_group_to_source (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Terminates the redirection begun by a call to <a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or -<a href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> and installs the resulting pattern +Terminates the redirection begun by a call to <a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or +<a class="link" href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a> and installs the resulting pattern as the source pattern in the given cairo context. </p> <p> @@ -589,8 +589,8 @@ but is more convenient as their is no need for a variable to store the short-lived pointer to the pattern. </p> <p> -The <a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> function calls <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>, (balancing a -call to <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> by the push_group function), so that any +The <a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> function calls <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a>, (balancing a +call to <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> by the push_group function), so that any changes to the graphics state will not be visible outside the group.</p> <p> @@ -599,7 +599,7 @@ group.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -609,18 +609,18 @@ group.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614739"></a><h3> +<a name="id2632174"></a><h3> <a name="cairo-get-group-target"></a>cairo_get_group_target ()</h3> -<a class="indexterm" name="id2614751"></a><pre class="programlisting"><a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_get_group_target (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2632187"></a><pre class="programlisting"><a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a>* cairo_get_group_target (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the target surface for the current group as started by the -most recent call to <a href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or -<a href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a>. +most recent call to <a class="link" href="cairo-cairo-t.html#cairo-push-group"><code class="function">cairo_push_group()</code></a> or +<a class="link" href="cairo-cairo-t.html#cairo-push-group-with-content"><code class="function">cairo_push_group_with_content()</code></a>. </p> <p> This function will return NULL if called "outside" of any group rendering blocks, (that is, after the last balancing call to -<a href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>).</p> +<a class="link" href="cairo-cairo-t.html#cairo-pop-group"><code class="function">cairo_pop_group()</code></a> or <a class="link" href="cairo-cairo-t.html#cairo-pop-group-to-source"><code class="function">cairo_pop_group_to_source()</code></a>).</p> <p> </p> @@ -628,15 +628,15 @@ rendering blocks, (that is, after the last balancing call to <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the target group surface, or NULL if none. This object is owned by cairo. To keep a reference to it, you must call -<a href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>. +<a class="link" href="cairo-cairo-surface-t.html#cairo-surface-reference"><code class="function">cairo_surface_reference()</code></a>. </td> </tr> @@ -647,9 +647,9 @@ object is owned by cairo. To keep a reference to it, you must call </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614863"></a><h3> +<a name="id2632298"></a><h3> <a name="cairo-set-source-rgb"></a>cairo_set_source_rgb ()</h3> -<a class="indexterm" name="id2614873"></a><pre class="programlisting">void cairo_set_source_rgb (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2632309"></a><pre class="programlisting">void cairo_set_source_rgb (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double red, double green, double blue);</pre> @@ -669,22 +669,22 @@ clamped.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of color </td> </tr> @@ -693,9 +693,9 @@ clamped.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2614988"></a><h3> +<a name="id2632424"></a><h3> <a name="cairo-set-source-rgba"></a>cairo_set_source_rgba ()</h3> -<a class="indexterm" name="id2614998"></a><pre class="programlisting">void cairo_set_source_rgba (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2632434"></a><pre class="programlisting">void cairo_set_source_rgba (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double red, double green, double blue, @@ -716,27 +716,27 @@ will be clamped.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>red</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>red</code></em> :</span></p></td> <td> red component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>green</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>green</code></em> :</span></p></td> <td> green component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>blue</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>blue</code></em> :</span></p></td> <td> blue component of color </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> alpha component of color </td> </tr> @@ -745,10 +745,10 @@ will be clamped.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615133"></a><h3> +<a name="id2632568"></a><h3> <a name="cairo-set-source"></a>cairo_set_source ()</h3> -<a class="indexterm" name="id2615143"></a><pre class="programlisting">void cairo_set_source (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *source);</pre> +<a class="indexterm" name="id2632579"></a><pre class="programlisting">void cairo_set_source (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *source);</pre> <p> Sets the source pattern within <em class="parameter"><code>cr</code></em> to <em class="parameter"><code>source</code></em>. This pattern will then be used for any subsequent drawing operation until a new @@ -756,9 +756,9 @@ source pattern is set. </p> <p> Note: The pattern's transformation matrix will be locked to the -user space in effect at the time of <a href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>. This means +user space in effect at the time of <a class="link" href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>. This means that further modifications of the current transformation matrix -will not affect the source pattern. See <a href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>. +will not affect the source pattern. See <a class="link" href="cairo-Patterns.html#cairo-pattern-set-matrix"><code class="function">cairo_pattern_set_matrix()</code></a>. </p> <p> XXX: I'd also like to direct the reader's attention to some @@ -771,13 +771,13 @@ that if such a section existed? (cworth).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>source</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> to be used as the source for +<td><p><span class="term"><em class="parameter"><code>source</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> to be used as the source for subsequent drawing operations. </td> </tr> @@ -786,15 +786,15 @@ subsequent drawing operations. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615256"></a><h3> +<a name="id2632692"></a><h3> <a name="cairo-set-source-surface"></a>cairo_set_source_surface ()</h3> -<a class="indexterm" name="id2615267"></a><pre class="programlisting">void cairo_set_source_surface (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2632702"></a><pre class="programlisting">void cairo_set_source_surface (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double x, double y);</pre> <p> This is a convenience function for creating a pattern from <em class="parameter"><code>surface</code></em> -and setting it as the source in <em class="parameter"><code>cr</code></em> with <a href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>. +and setting it as the source in <em class="parameter"><code>cr</code></em> with <a class="link" href="cairo-cairo-t.html#cairo-set-source"><code class="function">cairo_set_source()</code></a>. </p> <p> The <em class="parameter"><code>x</code></em> and <em class="parameter"><code>y</code></em> parameters give the user-space coordinate at which @@ -806,10 +806,10 @@ in the pattern matrix. <p> Other than the initial translation pattern matrix, as described above, all other pattern attributes, (such as its extend mode), are -set to the default values as in <a href="cairo-Patterns.html#cairo-pattern-create-for-surface"><code class="function">cairo_pattern_create_for_surface()</code></a>. -The resulting pattern can be queried with <a href="cairo-cairo-t.html#cairo-get-source"><code class="function">cairo_get_source()</code></a> so +set to the default values as in <a class="link" href="cairo-Patterns.html#cairo-pattern-create-for-surface"><code class="function">cairo_pattern_create_for_surface()</code></a>. +The resulting pattern can be queried with <a class="link" href="cairo-cairo-t.html#cairo-get-source"><code class="function">cairo_get_source()</code></a> so that these attributes can be modified if desired, (eg. to create a -repeating pattern with <a href="cairo-Patterns.html#cairo-pattern-set-extend"><code class="function">cairo_pattern_set_extend()</code></a>).</p> +repeating pattern with <a class="link" href="cairo-Patterns.html#cairo-pattern-set-extend"><code class="function">cairo_pattern_set_extend()</code></a>).</p> <p> </p> @@ -817,22 +817,22 @@ repeating pattern with <a href="cairo-Patterns.html#cairo-pattern-set-extend"><c <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> <td> a surface to be used to set the source pattern </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> User-space X coordinate for surface origin </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> User-space Y coordinate for surface origin </td> </tr> @@ -841,9 +841,9 @@ repeating pattern with <a href="cairo-Patterns.html#cairo-pattern-set-extend"><c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615455"></a><h3> +<a name="id2632891"></a><h3> <a name="cairo-get-source"></a>cairo_get_source ()</h3> -<a class="indexterm" name="id2615466"></a><pre class="programlisting"><a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_get_source (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2632901"></a><pre class="programlisting"><a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a>* cairo_get_source (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the current source pattern for <em class="parameter"><code>cr</code></em>.</p> <p> @@ -853,15 +853,15 @@ Gets the current source pattern for <em class="parameter"><code>cr</code></em>.< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current source pattern. This object is owned by cairo. To keep a reference to it, you must call -<a href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a>. +<a class="link" href="cairo-Patterns.html#cairo-pattern-reference"><code class="function">cairo_pattern_reference()</code></a>. </td> </tr> </tbody> @@ -869,9 +869,9 @@ cairo. To keep a reference to it, you must call </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615535"></a><h3> +<a name="id2632970"></a><h3> <a name="cairo-antialias-t"></a>enum cairo_antialias_t</h3> -<a class="indexterm" name="id2615545"></a><pre class="programlisting">typedef enum _cairo_antialias { +<a class="indexterm" name="id2632981"></a><pre class="programlisting">typedef enum _cairo_antialias { CAIRO_ANTIALIAS_DEFAULT, CAIRO_ANTIALIAS_NONE, CAIRO_ANTIALIAS_GRAY, @@ -887,24 +887,24 @@ Specifies the type of antialiasing to do when rendering text or shapes.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-ANTIALIAS-DEFAULT:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_DEFAULT</code></span></td> +<td><p><span class="term"><a name="CAIRO-ANTIALIAS-DEFAULT:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_DEFAULT</code></span></p></td> <td> Use the default antialiasing for the subsystem and target device </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-ANTIALIAS-NONE:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_NONE</code></span></td> +<td><p><span class="term"><a name="CAIRO-ANTIALIAS-NONE:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_NONE</code></span></p></td> <td> Use a bilevel alpha mask </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-ANTIALIAS-GRAY:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_GRAY</code></span></td> +<td><p><span class="term"><a name="CAIRO-ANTIALIAS-GRAY:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_GRAY</code></span></p></td> <td> Perform single-color antialiasing (using shades of gray for black text on a white background, for example). </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-ANTIALIAS-SUBPIXEL:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></span></td> +<td><p><span class="term"><a name="CAIRO-ANTIALIAS-SUBPIXEL:CAPS"></a><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></span></p></td> <td> Perform antialiasing by taking advantage of the order of subpixel elements on devices such as LCD panels @@ -915,19 +915,19 @@ Specifies the type of antialiasing to do when rendering text or shapes.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615654"></a><h3> +<a name="id2633090"></a><h3> <a name="cairo-set-antialias"></a>cairo_set_antialias ()</h3> -<a class="indexterm" name="id2615665"></a><pre class="programlisting">void cairo_set_antialias (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias);</pre> +<a class="indexterm" name="id2633100"></a><pre class="programlisting">void cairo_set_antialias (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> antialias);</pre> <p> Set the antialiasing mode of the rasterizer used for drawing shapes. This value is a hint, and a particular backend may or may not support a particular value. At the current time, no backend supports -<a href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a> when drawing shapes. +<a class="link" href="cairo-cairo-t.html#CAIRO-ANTIALIAS-SUBPIXEL:CAPS"><code class="literal">CAIRO_ANTIALIAS_SUBPIXEL</code></a> when drawing shapes. </p> <p> Note that this option does not affect text rendering, instead see -<a href="cairo-Font-Options.html#cairo-font-options-set-antialias"><code class="function">cairo_font_options_set_antialias()</code></a>.</p> +<a class="link" href="cairo-Font-Options.html#cairo-font-options-set-antialias"><code class="function">cairo_font_options_set_antialias()</code></a>.</p> <p> </p> @@ -935,12 +935,12 @@ Note that this option does not affect text rendering, instead see <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>antialias</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>antialias</code></em> :</span></p></td> <td> the new antialiasing mode </td> </tr> @@ -949,9 +949,9 @@ Note that this option does not affect text rendering, instead see </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615760"></a><h3> +<a name="id2633195"></a><h3> <a name="cairo-get-antialias"></a>cairo_get_antialias ()</h3> -<a class="indexterm" name="id2615770"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> cairo_get_antialias (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2633206"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-antialias-t">cairo_antialias_t</a> cairo_get_antialias (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the current shape antialiasing mode, as set by <code class="function">cairo_set_shape_antialias()</code>.</p> <p> @@ -961,12 +961,12 @@ Gets the current shape antialiasing mode, as set by <code class="function">cairo <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current shape antialiasing mode. </td> </tr> @@ -975,14 +975,14 @@ Gets the current shape antialiasing mode, as set by <code class="function">cairo </div> <hr> <div class="refsect2" lang="en"> -<a name="id2615834"></a><h3> +<a name="id2633269"></a><h3> <a name="cairo-set-dash"></a>cairo_set_dash ()</h3> -<a class="indexterm" name="id2615844"></a><pre class="programlisting">void cairo_set_dash (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2633280"></a><pre class="programlisting">void cairo_set_dash (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, const double *dashes, int num_dashes, double offset);</pre> <p> -Sets the dash pattern to be used by <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>. A dash pattern +Sets the dash pattern to be used by <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>. A dash pattern is specified by <em class="parameter"><code>dashes</code></em>, an array of positive values. Each value provides the length of alternate "on" and "off" portions of the stroke. The <em class="parameter"><code>offset</code></em> specifies an offset into the pattern at which @@ -997,7 +997,7 @@ to distributed dots or squares along a path. <p> Note: The length values are in user-space units as evaluated at the time of stroking. This is not necessarily the same as the user -space at the time of <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>. +space at the time of <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>. </p> <p> If <em class="parameter"><code>num_dashes</code></em> is 0 dashing is disabled. @@ -1010,7 +1010,7 @@ on and off portions of the size specified by the single value in <p> If any value in <em class="parameter"><code>dashes</code></em> is negative, or if all values are 0, then <em class="parameter"><code>cairo_t</code></em> will be put into an error state with a status of -<a href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-DASH:CAPS"><span class="type">CAIRO_STATUS_INVALID_DASH</span></a>.</p> +<a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-INVALID-DASH:CAPS"><span class="type">CAIRO_STATUS_INVALID_DASH</span></a>.</p> <p> </p> @@ -1018,22 +1018,22 @@ If any value in <em class="parameter"><code>dashes</code></em> is negative, or i <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dashes</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dashes</code></em> :</span></p></td> <td> an array specifying alternate lengths of on and off stroke portions </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>num_dashes</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>num_dashes</code></em> :</span></p></td> <td> the length of the dashes array </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> <td> an offset into the dash pattern at which the stroke should start </td> </tr> @@ -1042,15 +1042,15 @@ If any value in <em class="parameter"><code>dashes</code></em> is negative, or i </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616040"></a><h3> +<a name="id2633476"></a><h3> <a name="cairo-get-dash-count"></a>cairo_get_dash_count ()</h3> -<a class="indexterm" name="id2616053"></a><pre class="programlisting">int cairo_get_dash_count (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2633488"></a><pre class="programlisting">int cairo_get_dash_count (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> This function returns the length of the dash array in <em class="parameter"><code>cr</code></em> (0 if dashing is not currently in effect). </p> <p> -See also <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a> and <a href="cairo-cairo-t.html#cairo-get-dash"><code class="function">cairo_get_dash()</code></a>.</p> +See also <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-get-dash"><code class="function">cairo_get_dash()</code></a>.</p> <p> </p> @@ -1058,12 +1058,12 @@ See also <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cair <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the length of the dash array, or 0 if no dash array set. </td> @@ -1075,15 +1075,15 @@ See also <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cair </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616147"></a><h3> +<a name="id2633582"></a><h3> <a name="cairo-get-dash"></a>cairo_get_dash ()</h3> -<a class="indexterm" name="id2616159"></a><pre class="programlisting">void cairo_get_dash (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2633594"></a><pre class="programlisting">void cairo_get_dash (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *dashes, double *offset);</pre> <p> Gets the current dash array. If not <code class="literal">NULL</code>, <em class="parameter"><code>dashes</code></em> should be big enough to hold at least the number of values returned by -<a href="cairo-cairo-t.html#cairo-get-dash-count"><code class="function">cairo_get_dash_count()</code></a>.</p> +<a class="link" href="cairo-cairo-t.html#cairo-get-dash-count"><code class="function">cairo_get_dash_count()</code></a>.</p> <p> </p> @@ -1091,17 +1091,17 @@ enough to hold at least the number of values returned by <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>dashes</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>dashes</code></em> :</span></p></td> <td> return value for the dash array, or <code class="literal">NULL</code> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>offset</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>offset</code></em> :</span></p></td> <td> return value for the current dash offset, or <code class="literal">NULL</code> </td> </tr> @@ -1112,15 +1112,15 @@ enough to hold at least the number of values returned by </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616296"></a><h3> +<a name="id2633731"></a><h3> <a name="cairo-fill-rule-t"></a>enum cairo_fill_rule_t</h3> -<a class="indexterm" name="id2616306"></a><pre class="programlisting">typedef enum _cairo_fill_rule { +<a class="indexterm" name="id2633742"></a><pre class="programlisting">typedef enum _cairo_fill_rule { CAIRO_FILL_RULE_WINDING, CAIRO_FILL_RULE_EVEN_ODD } cairo_fill_rule_t; </pre> <p> -<a href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> is used to select how paths are filled. For both +<a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> is used to select how paths are filled. For both fill rules, whether or not a point is included in the fill is determined by taking a ray from that point to infinity and looking at intersections with the path. The ray can be in any direction, @@ -1138,7 +1138,7 @@ New entries may be added in future versions.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-FILL-RULE-WINDING:CAPS"></a><code class="literal">CAIRO_FILL_RULE_WINDING</code></span></td> +<td><p><span class="term"><a name="CAIRO-FILL-RULE-WINDING:CAPS"></a><code class="literal">CAIRO_FILL_RULE_WINDING</code></span></p></td> <td> If the path crosses the ray from left-to-right, counts +1. If the path crosses the ray from right to left, counts -1. (Left and right are determined @@ -1147,7 +1147,7 @@ point.) If the total count is non-zero, the point will be filled. </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-FILL-RULE-EVEN-ODD:CAPS"></a><code class="literal">CAIRO_FILL_RULE_EVEN_ODD</code></span></td> +<td><p><span class="term"><a name="CAIRO-FILL-RULE-EVEN-ODD:CAPS"></a><code class="literal">CAIRO_FILL_RULE_EVEN_ODD</code></span></p></td> <td> Counts the total number of intersections, without regard to the orientation of the contour. If the total number of intersections is odd, the point will be @@ -1159,15 +1159,15 @@ filled. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616396"></a><h3> +<a name="id2633832"></a><h3> <a name="cairo-set-fill-rule"></a>cairo_set_fill_rule ()</h3> -<a class="indexterm" name="id2616407"></a><pre class="programlisting">void cairo_set_fill_rule (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> fill_rule);</pre> +<a class="indexterm" name="id2633842"></a><pre class="programlisting">void cairo_set_fill_rule (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> fill_rule);</pre> <p> Set the current fill rule within the cairo context. The fill rule is used to determine which regions are inside or outside a complex (potentially self-intersecting) path. The current fill rule affects -both <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> and <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>. See <a href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> for details +both <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>. See <a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> for details on the semantics of each available fill rule.</p> <p> @@ -1176,13 +1176,13 @@ on the semantics of each available fill rule.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>fill_rule</code></em> :</span></td> -<td> a fill rule, specified as a <a href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> +<td><p><span class="term"><em class="parameter"><code>fill_rule</code></em> :</span></p></td> +<td> a fill rule, specified as a <a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t"><span class="type">cairo_fill_rule_t</span></a> </td> </tr> </tbody> @@ -1190,11 +1190,11 @@ on the semantics of each available fill rule.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616510"></a><h3> +<a name="id2633945"></a><h3> <a name="cairo-get-fill-rule"></a>cairo_get_fill_rule ()</h3> -<a class="indexterm" name="id2616520"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> cairo_get_fill_rule (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2633956"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-fill-rule-t">cairo_fill_rule_t</a> cairo_get_fill_rule (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current fill rule, as set by <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>.</p> +Gets the current fill rule, as set by <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>.</p> <p> </p> @@ -1202,12 +1202,12 @@ Gets the current fill rule, as set by <a href="cairo-cairo-t.html#cairo-set-fill <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current fill rule. </td> </tr> @@ -1216,9 +1216,9 @@ Gets the current fill rule, as set by <a href="cairo-cairo-t.html#cairo-set-fill </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616583"></a><h3> +<a name="id2634018"></a><h3> <a name="cairo-line-cap-t"></a>enum cairo_line_cap_t</h3> -<a class="indexterm" name="id2616593"></a><pre class="programlisting">typedef enum _cairo_line_cap { +<a class="indexterm" name="id2634029"></a><pre class="programlisting">typedef enum _cairo_line_cap { CAIRO_LINE_CAP_BUTT, CAIRO_LINE_CAP_ROUND, CAIRO_LINE_CAP_SQUARE @@ -1233,17 +1233,17 @@ Specifies how to render the endpoint of a line when stroking.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-LINE-CAP-BUTT:CAPS"></a><code class="literal">CAIRO_LINE_CAP_BUTT</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-CAP-BUTT:CAPS"></a><code class="literal">CAIRO_LINE_CAP_BUTT</code></span></p></td> <td> start(stop) the line exactly at the start(end) point </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-LINE-CAP-ROUND:CAPS"></a><code class="literal">CAIRO_LINE_CAP_ROUND</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-CAP-ROUND:CAPS"></a><code class="literal">CAIRO_LINE_CAP_ROUND</code></span></p></td> <td> use a round ending, the center of the circle is the end point </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-LINE-CAP-SQUARE:CAPS"></a><code class="literal">CAIRO_LINE_CAP_SQUARE</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-CAP-SQUARE:CAPS"></a><code class="literal">CAIRO_LINE_CAP_SQUARE</code></span></p></td> <td> use squared ending, the center of the square is the end point </td> </tr> @@ -1252,18 +1252,18 @@ Specifies how to render the endpoint of a line when stroking.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616677"></a><h3> +<a name="id2634113"></a><h3> <a name="cairo-set-line-cap"></a>cairo_set_line_cap ()</h3> -<a class="indexterm" name="id2616688"></a><pre class="programlisting">void cairo_set_line_cap (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> line_cap);</pre> +<a class="indexterm" name="id2634123"></a><pre class="programlisting">void cairo_set_line_cap (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> line_cap);</pre> <p> Sets the current line cap style within the cairo context. See -<a href="cairo-cairo-t.html#cairo-line-cap-t"><span class="type">cairo_line_cap_t</span></a> for details about how the available line cap +<a class="link" href="cairo-cairo-t.html#cairo-line-cap-t"><span class="type">cairo_line_cap_t</span></a> for details about how the available line cap styles are drawn. </p> <p> As with the other stroke parameters, the current line cap style is -examined by <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and +examined by <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and <code class="function">cairo_stroke_to_path()</code>, but does not have any effect during path construction.</p> <p> @@ -1273,12 +1273,12 @@ construction.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>line_cap</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>line_cap</code></em> :</span></p></td> <td> a line cap style </td> </tr> @@ -1287,11 +1287,11 @@ construction.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616790"></a><h3> +<a name="id2634226"></a><h3> <a name="cairo-get-line-cap"></a>cairo_get_line_cap ()</h3> -<a class="indexterm" name="id2616800"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> cairo_get_line_cap (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2634236"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-line-cap-t">cairo_line_cap_t</a> cairo_get_line_cap (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current line cap style, as set by <a href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>.</p> +Gets the current line cap style, as set by <a class="link" href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>.</p> <p> </p> @@ -1299,12 +1299,12 @@ Gets the current line cap style, as set by <a href="cairo-cairo-t.html#cairo-set <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current line cap style. </td> </tr> @@ -1313,9 +1313,9 @@ Gets the current line cap style, as set by <a href="cairo-cairo-t.html#cairo-set </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616864"></a><h3> +<a name="id2634299"></a><h3> <a name="cairo-line-join-t"></a>enum cairo_line_join_t</h3> -<a class="indexterm" name="id2616874"></a><pre class="programlisting">typedef enum _cairo_line_join { +<a class="indexterm" name="id2634310"></a><pre class="programlisting">typedef enum _cairo_line_join { CAIRO_LINE_JOIN_MITER, CAIRO_LINE_JOIN_ROUND, CAIRO_LINE_JOIN_BEVEL @@ -1330,19 +1330,19 @@ Specifies how to render the junction of two lines when stroking.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a name="CAIRO-LINE-JOIN-MITER:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_MITER</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-JOIN-MITER:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_MITER</code></span></p></td> <td> use a sharp (angled) corner, see -<a href="cairo-cairo-t.html#cairo-set-miter-limit"><code class="function">cairo_set_miter_limit()</code></a> +<a class="link" href="cairo-cairo-t.html#cairo-set-miter-limit"><code class="function">cairo_set_miter_limit()</code></a> </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-LINE-JOIN-ROUND:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_ROUND</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-JOIN-ROUND:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_ROUND</code></span></p></td> <td> use a rounded join, the center of the circle is the joint point </td> </tr> <tr> -<td><span class="term"><a name="CAIRO-LINE-JOIN-BEVEL:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_BEVEL</code></span></td> +<td><p><span class="term"><a name="CAIRO-LINE-JOIN-BEVEL:CAPS"></a><code class="literal">CAIRO_LINE_JOIN_BEVEL</code></span></p></td> <td> use a cut-off join, the join is cut off at half the line width from the joint point </td> @@ -1352,18 +1352,18 @@ the line width from the joint point </div> <hr> <div class="refsect2" lang="en"> -<a name="id2616980"></a><h3> +<a name="id2634408"></a><h3> <a name="cairo-set-line-join"></a>cairo_set_line_join ()</h3> -<a class="indexterm" name="id2616994"></a><pre class="programlisting">void cairo_set_line_join (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> line_join);</pre> +<a class="indexterm" name="id2634422"></a><pre class="programlisting">void cairo_set_line_join (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> line_join);</pre> <p> Sets the current line join style within the cairo context. See -<a href="cairo-cairo-t.html#cairo-line-join-t"><span class="type">cairo_line_join_t</span></a> for details about how the available line join +<a class="link" href="cairo-cairo-t.html#cairo-line-join-t"><span class="type">cairo_line_join_t</span></a> for details about how the available line join styles are drawn. </p> <p> As with the other stroke parameters, the current line join style is -examined by <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and +examined by <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and <code class="function">cairo_stroke_to_path()</code>, but does not have any effect during path construction.</p> <p> @@ -1373,12 +1373,12 @@ construction.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>line_join</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>line_join</code></em> :</span></p></td> <td> a line joint style </td> </tr> @@ -1387,11 +1387,11 @@ construction.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617109"></a><h3> +<a name="id2634538"></a><h3> <a name="cairo-get-line-join"></a>cairo_get_line_join ()</h3> -<a class="indexterm" name="id2617123"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> cairo_get_line_join (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2634551"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-line-join-t">cairo_line_join_t</a> cairo_get_line_join (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current line join style, as set by <a href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>.</p> +Gets the current line join style, as set by <a class="link" href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>.</p> <p> </p> @@ -1399,12 +1399,12 @@ Gets the current line join style, as set by <a href="cairo-cairo-t.html#cairo-se <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current line join style. </td> </tr> @@ -1413,9 +1413,9 @@ Gets the current line join style, as set by <a href="cairo-cairo-t.html#cairo-se </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617194"></a><h3> +<a name="id2634622"></a><h3> <a name="cairo-set-line-width"></a>cairo_set_line_width ()</h3> -<a class="indexterm" name="id2617207"></a><pre class="programlisting">void cairo_set_line_width (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2634635"></a><pre class="programlisting">void cairo_set_line_width (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double width);</pre> <p> Sets the current line width within the cairo context. The line @@ -1427,15 +1427,15 @@ due to scaling/shear/rotation of the CTM). Note: When the description above refers to user space and CTM it refers to the user space and CTM in effect at the time of the stroking operation, not the user space and CTM in effect at the -time of the call to <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>. The simplest usage +time of the call to <a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>. The simplest usage makes both of these spaces identical. That is, if there is no change to the CTM between a call to <code class="function">cairo_set_line_with()</code> and the stroking operation, then one can just pass user-space values to -<a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a> and ignore this note. +<a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a> and ignore this note. </p> <p> As with the other stroke parameters, the current line width is -examined by <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and +examined by <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and <code class="function">cairo_stroke_to_path()</code>, but does not have any effect during path construction. </p> @@ -1448,12 +1448,12 @@ The default line width value is 2.0.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>width</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>width</code></em> :</span></p></td> <td> a line width </td> </tr> @@ -1462,14 +1462,14 @@ The default line width value is 2.0.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617369"></a><h3> +<a name="id2634797"></a><h3> <a name="cairo-get-line-width"></a>cairo_get_line_width ()</h3> -<a class="indexterm" name="id2617382"></a><pre class="programlisting">double cairo_get_line_width (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2634810"></a><pre class="programlisting">double cairo_get_line_width (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> This function returns the current line width value exactly as set by -<a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>. Note that the value is unchanged even if -the CTM has changed between the calls to <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a> and -<a href="cairo-cairo-t.html#cairo-get-line-width"><code class="function">cairo_get_line_width()</code></a>.</p> +<a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>. Note that the value is unchanged even if +the CTM has changed between the calls to <a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a> and +<a class="link" href="cairo-cairo-t.html#cairo-get-line-width"><code class="function">cairo_get_line_width()</code></a>.</p> <p> </p> @@ -1477,12 +1477,12 @@ the CTM has changed between the calls to <a href="cairo-cairo-t.html#cairo-set-l <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current line width. </td> </tr> @@ -1491,16 +1491,16 @@ the CTM has changed between the calls to <a href="cairo-cairo-t.html#cairo-set-l </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617475"></a><h3> +<a name="id2634903"></a><h3> <a name="cairo-set-miter-limit"></a>cairo_set_miter_limit ()</h3> -<a class="indexterm" name="id2617488"></a><pre class="programlisting">void cairo_set_miter_limit (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2634916"></a><pre class="programlisting">void cairo_set_miter_limit (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double limit);</pre> <p> Sets the current miter limit within the cairo context. </p> <p> -If the current line join style is set to <a href="cairo-cairo-t.html#CAIRO-LINE-JOIN-MITER:CAPS"><code class="literal">CAIRO_LINE_JOIN_MITER</code></a> -(see <a href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>), the miter limit is used to determine +If the current line join style is set to <a class="link" href="cairo-cairo-t.html#CAIRO-LINE-JOIN-MITER:CAPS"><code class="literal">CAIRO_LINE_JOIN_MITER</code></a> +(see <a class="link" href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>), the miter limit is used to determine whether the lines should be joined with a bevel instead of a miter. Cairo divides the length of the miter by the line width. If the result is greater than the miter limit, the style is @@ -1508,7 +1508,7 @@ converted to a bevel. </p> <p> As with the other stroke parameters, the current line miter limit is -examined by <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and +examined by <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-stroke-extents"><code class="function">cairo_stroke_extents()</code></a>, and <code class="function">cairo_stroke_to_path()</code>, but does not have any effect during path construction.</p> <p> @@ -1518,12 +1518,12 @@ construction.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>limit</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>limit</code></em> :</span></p></td> <td> miter limit to set </td> </tr> @@ -1532,11 +1532,11 @@ construction.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617624"></a><h3> +<a name="id2635052"></a><h3> <a name="cairo-get-miter-limit"></a>cairo_get_miter_limit ()</h3> -<a class="indexterm" name="id2617637"></a><pre class="programlisting">double cairo_get_miter_limit (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2635065"></a><pre class="programlisting">double cairo_get_miter_limit (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current miter limit, as set by <a href="cairo-cairo-t.html#cairo-set-miter-limit"><code class="function">cairo_set_miter_limit()</code></a>.</p> +Gets the current miter limit, as set by <a class="link" href="cairo-cairo-t.html#cairo-set-miter-limit"><code class="function">cairo_set_miter_limit()</code></a>.</p> <p> </p> @@ -1544,12 +1544,12 @@ Gets the current miter limit, as set by <a href="cairo-cairo-t.html#cairo-set-mi <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current miter limit. </td> </tr> @@ -1558,9 +1558,9 @@ Gets the current miter limit, as set by <a href="cairo-cairo-t.html#cairo-set-mi </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617708"></a><h3> +<a name="id2635136"></a><h3> <a name="cairo-operator-t"></a>enum cairo_operator_t</h3> -<a class="indexterm" name="id2617722"></a><pre class="programlisting">typedef enum _cairo_operator { +<a class="indexterm" name="id2635150"></a><pre class="programlisting">typedef enum _cairo_operator { CAIRO_OPERATOR_CLEAR, CAIRO_OPERATOR_SOURCE, @@ -1586,13 +1586,13 @@ Gets the current miter limit, as set by <a href="cairo-cairo-t.html#cairo-set-mi </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617744"></a><h3> +<a name="id2635172"></a><h3> <a name="cairo-set-operator"></a>cairo_set_operator ()</h3> -<a class="indexterm" name="id2617758"></a><pre class="programlisting">void cairo_set_operator (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> op);</pre> +<a class="indexterm" name="id2635186"></a><pre class="programlisting">void cairo_set_operator (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> op);</pre> <p> Sets the compositing operator to be used for all drawing -operations. See <a href="cairo-cairo-t.html#cairo-operator-t"><span class="type">cairo_operator_t</span></a> for details on the semantics of +operations. See <a class="link" href="cairo-cairo-t.html#cairo-operator-t"><span class="type">cairo_operator_t</span></a> for details on the semantics of each available compositing operator. </p> <p> @@ -1606,13 +1606,13 @@ that if such a section existed? (cworth).</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>op</code></em> :</span></td> -<td> a compositing operator, specified as a <a href="cairo-cairo-t.html#cairo-operator-t"><span class="type">cairo_operator_t</span></a> +<td><p><span class="term"><em class="parameter"><code>op</code></em> :</span></p></td> +<td> a compositing operator, specified as a <a class="link" href="cairo-cairo-t.html#cairo-operator-t"><span class="type">cairo_operator_t</span></a> </td> </tr> </tbody> @@ -1620,9 +1620,9 @@ that if such a section existed? (cworth).</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617860"></a><h3> +<a name="id2635288"></a><h3> <a name="cairo-get-operator"></a>cairo_get_operator ()</h3> -<a class="indexterm" name="id2617873"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> cairo_get_operator (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2635301"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-operator-t">cairo_operator_t</a> cairo_get_operator (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the current compositing operator for a cairo context.</p> <p> @@ -1632,12 +1632,12 @@ Gets the current compositing operator for a cairo context.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current compositing operator. </td> </tr> @@ -1646,9 +1646,9 @@ Gets the current compositing operator for a cairo context.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2617935"></a><h3> +<a name="id2635363"></a><h3> <a name="cairo-set-tolerance"></a>cairo_set_tolerance ()</h3> -<a class="indexterm" name="id2617948"></a><pre class="programlisting">void cairo_set_tolerance (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2635376"></a><pre class="programlisting">void cairo_set_tolerance (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double tolerance);</pre> <p> Sets the tolerance used when converting paths into trapezoids. @@ -1665,12 +1665,12 @@ is unlikely to improve appearance significantly.)</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>tolerance</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>tolerance</code></em> :</span></p></td> <td> the tolerance, in device units (typically pixels) </td> </tr> @@ -1679,11 +1679,11 @@ is unlikely to improve appearance significantly.)</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618039"></a><h3> +<a name="id2635468"></a><h3> <a name="cairo-get-tolerance"></a>cairo_get_tolerance ()</h3> -<a class="indexterm" name="id2618053"></a><pre class="programlisting">double cairo_get_tolerance (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2635481"></a><pre class="programlisting">double cairo_get_tolerance (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> -Gets the current tolerance value, as set by <a href="cairo-cairo-t.html#cairo-set-tolerance"><code class="function">cairo_set_tolerance()</code></a>.</p> +Gets the current tolerance value, as set by <a class="link" href="cairo-cairo-t.html#cairo-set-tolerance"><code class="function">cairo_set_tolerance()</code></a>.</p> <p> </p> @@ -1691,12 +1691,12 @@ Gets the current tolerance value, as set by <a href="cairo-cairo-t.html#cairo-se <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current tolerance value. </td> </tr> @@ -1705,13 +1705,13 @@ Gets the current tolerance value, as set by <a href="cairo-cairo-t.html#cairo-se </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618124"></a><h3> +<a name="id2635552"></a><h3> <a name="cairo-clip"></a>cairo_clip ()</h3> -<a class="indexterm" name="id2618136"></a><pre class="programlisting">void cairo_clip (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2635565"></a><pre class="programlisting">void cairo_clip (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Establishes a new clip region by intersecting the current clip -region with the current path as it would be filled by <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> -and according to the current fill rule (see <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>). +region with the current path as it would be filled by <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> +and according to the current fill rule (see <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>). </p> <p> After cairo_clip, the current path will be cleared from the cairo @@ -1723,19 +1723,19 @@ effectively masking out any changes to the surface that are outside the current clip region. </p> <p> -Calling <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> can only make the clip region smaller, never +Calling <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> can only make the clip region smaller, never larger. But the current clip is part of the graphics state, so a temporary restriction of the clip region can be achieved by -calling <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> within a <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>/<a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> +calling <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> within a <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>/<a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> pair. The only other means of increasing the size of the clip -region is <a href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a>.</p> +region is <a class="link" href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -1743,16 +1743,16 @@ region is <a href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618274"></a><h3> +<a name="id2635702"></a><h3> <a name="cairo-clip-preserve"></a>cairo_clip_preserve ()</h3> -<a class="indexterm" name="id2618288"></a><pre class="programlisting">void cairo_clip_preserve (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2635716"></a><pre class="programlisting">void cairo_clip_preserve (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Establishes a new clip region by intersecting the current clip -region with the current path as it would be filled by <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> -and according to the current fill rule (see <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>). +region with the current path as it would be filled by <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> +and according to the current fill rule (see <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a>). </p> <p> -Unlike <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>, cairo_clip_preserve preserves the path within +Unlike <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>, cairo_clip_preserve preserves the path within the cairo context. </p> <p> @@ -1761,19 +1761,19 @@ effectively masking out any changes to the surface that are outside the current clip region. </p> <p> -Calling <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> can only make the clip region smaller, never +Calling <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> can only make the clip region smaller, never larger. But the current clip is part of the graphics state, so a temporary restriction of the clip region can be achieved by -calling <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> within a <a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>/<a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> +calling <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> within a <a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a>/<a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> pair. The only other means of increasing the size of the clip -region is <a href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a>.</p> +region is <a class="link" href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -1781,9 +1781,9 @@ region is <a href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">c </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618435"></a><h3> +<a name="id2635863"></a><h3> <a name="cairo-clip-extents"></a>cairo_clip_extents ()</h3> -<a class="indexterm" name="id2618451"></a><pre class="programlisting">void cairo_clip_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2635880"></a><pre class="programlisting">void cairo_clip_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, @@ -1798,27 +1798,27 @@ current clip.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> left of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> top of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x2</code></em> :</span></p></td> <td> right of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y2</code></em> :</span></p></td> <td> bottom of the resulting extents </td> </tr> @@ -1829,9 +1829,9 @@ current clip.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618596"></a><h3> +<a name="id2636024"></a><h3> <a name="cairo-reset-clip"></a>cairo_reset_clip ()</h3> -<a class="indexterm" name="id2618608"></a><pre class="programlisting">void cairo_reset_clip (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2636037"></a><pre class="programlisting">void cairo_reset_clip (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Reset the current clip region to its original, unrestricted state. That is, set the clip region to an infinitely large shape @@ -1841,9 +1841,9 @@ exact bounds of the target surface. </p> <p> Note that code meant to be reusable should not call -<a href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a> as it will cause results unexpected by -higher-level code which calls <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>. Consider using -<a href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and <a href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> around <a href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> as a more +<a class="link" href="cairo-cairo-t.html#cairo-reset-clip"><code class="function">cairo_reset_clip()</code></a> as it will cause results unexpected by +higher-level code which calls <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a>. Consider using +<a class="link" href="cairo-cairo-t.html#cairo-save"><code class="function">cairo_save()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-restore"><code class="function">cairo_restore()</code></a> around <a class="link" href="cairo-cairo-t.html#cairo-clip"><code class="function">cairo_clip()</code></a> as a more robust means of temporarily restricting the clip region.</p> <p> @@ -1851,7 +1851,7 @@ robust means of temporarily restricting the clip region.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -1859,9 +1859,9 @@ robust means of temporarily restricting the clip region.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618718"></a><h3> +<a name="id2636146"></a><h3> <a name="cairo-rectangle-t"></a>cairo_rectangle_t</h3> -<a class="indexterm" name="id2618733"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2636161"></a><pre class="programlisting">typedef struct { double x, y, width, height; } cairo_rectangle_t; </pre> @@ -1874,22 +1874,22 @@ A data structure for holding a rectangle.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term">double <em class="structfield"><code>x</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>x</code></em>;</span></p></td> <td> X coordinate of the left side of the rectangle </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>y</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>y</code></em>;</span></p></td> <td> Y coordinate of the the top side of the rectangle </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>width</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>width</code></em>;</span></p></td> <td> width of the rectangle </td> </tr> <tr> -<td><span class="term">double <em class="structfield"><code>height</code></em>;</span></td> +<td><p><span class="term">double <em class="structfield"><code>height</code></em>;</span></p></td> <td> height of the rectangle </td> </tr> @@ -1900,9 +1900,9 @@ A data structure for holding a rectangle.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618850"></a><h3> +<a name="id2636278"></a><h3> <a name="cairo-rectangle-list-t"></a>cairo_rectangle_list_t</h3> -<a class="indexterm" name="id2618866"></a><pre class="programlisting">typedef struct { +<a class="indexterm" name="id2636294"></a><pre class="programlisting">typedef struct { cairo_status_t status; cairo_rectangle_t *rectangles; int num_rectangles; @@ -1918,17 +1918,17 @@ array of rectangles.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <em class="structfield"><code>status</code></em>;</span></td> +<td><p><span class="term"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> <em class="structfield"><code>status</code></em>;</span></p></td> <td> Error status of the rectangle list </td> </tr> <tr> -<td><span class="term"><a href="cairo-cairo-t.html#cairo-rectangle-t">cairo_rectangle_t</a> *<em class="structfield"><code>rectangles</code></em>;</span></td> +<td><p><span class="term"><a class="link" href="cairo-cairo-t.html#cairo-rectangle-t">cairo_rectangle_t</a> *<em class="structfield"><code>rectangles</code></em>;</span></p></td> <td> Array containing the rectangles </td> </tr> <tr> -<td><span class="term">int <em class="structfield"><code>num_rectangles</code></em>;</span></td> +<td><p><span class="term">int <em class="structfield"><code>num_rectangles</code></em>;</span></p></td> <td> Number of rectangles in this list </td> </tr> @@ -1939,9 +1939,9 @@ array of rectangles.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2618965"></a><h3> +<a name="id2636393"></a><h3> <a name="cairo-rectangle-list-destroy"></a>cairo_rectangle_list_destroy ()</h3> -<a class="indexterm" name="id2618981"></a><pre class="programlisting">void cairo_rectangle_list_destroy (<a href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a> *rectangle_list);</pre> +<a class="indexterm" name="id2636409"></a><pre class="programlisting">void cairo_rectangle_list_destroy (<a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a> *rectangle_list);</pre> <p> Unconditionally frees <em class="parameter"><code>rectangle_list</code></em> and all associated references. After this call, the <em class="parameter"><code>rectangle_list</code></em> pointer must not @@ -1952,7 +1952,7 @@ be dereferenced.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>rectangle_list</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>rectangle_list</code></em> :</span></p></td> <td> a rectangle list, as obtained from <code class="function">cairo_copy_clip_rectangles()</code> </td> </tr></tbody> @@ -1962,9 +1962,9 @@ be dereferenced.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619063"></a><h3> +<a name="id2636491"></a><h3> <a name="cairo-copy-clip-rectangle-list"></a>cairo_copy_clip_rectangle_list ()</h3> -<a class="indexterm" name="id2619079"></a><pre class="programlisting"><a href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>* cairo_copy_clip_rectangle_list (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2636508"></a><pre class="programlisting"><a class="link" href="cairo-cairo-t.html#cairo-rectangle-list-t">cairo_rectangle_list_t</a>* cairo_copy_clip_rectangle_list (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Gets the current clip region as a list of rectangles in user coordinates. Never returns <code class="literal">NULL</code>. @@ -1985,12 +1985,12 @@ this function.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current clip region as a list of rectangles in user coordinates. </td> @@ -2002,22 +2002,22 @@ this function.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619171"></a><h3> +<a name="id2636600"></a><h3> <a name="cairo-fill"></a>cairo_fill ()</h3> -<a class="indexterm" name="id2619184"></a><pre class="programlisting">void cairo_fill (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2636612"></a><pre class="programlisting">void cairo_fill (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> A drawing operator that fills the current path according to the current fill rule, (each sub-path is implicitly closed before being filled). After cairo_fill, the current path will be cleared from -the cairo context. See <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and -<a href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> +the cairo context. See <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and +<a class="link" href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2025,24 +2025,24 @@ the cairo context. See <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code cl </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619257"></a><h3> +<a name="id2636685"></a><h3> <a name="cairo-fill-preserve"></a>cairo_fill_preserve ()</h3> -<a class="indexterm" name="id2619270"></a><pre class="programlisting">void cairo_fill_preserve (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2636699"></a><pre class="programlisting">void cairo_fill_preserve (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> A drawing operator that fills the current path according to the current fill rule, (each sub-path is implicitly closed before being -filled). Unlike <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, cairo_fill_preserve preserves the +filled). Unlike <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, cairo_fill_preserve preserves the path within the cairo context. </p> <p> -See <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2050,22 +2050,22 @@ See <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cair </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619356"></a><h3> +<a name="id2636784"></a><h3> <a name="cairo-fill-extents"></a>cairo_fill_extents ()</h3> -<a class="indexterm" name="id2619369"></a><pre class="programlisting">void cairo_fill_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2636798"></a><pre class="programlisting">void cairo_fill_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, double *y2);</pre> <p> Computes a bounding box in user coordinates covering the area that -would be affected by a <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> operation given the current path +would be affected by a <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> operation given the current path and fill parameters. If the current path is empty, returns an empty rectangle (0,0, 0,0). Surface dimensions and clipping are not taken into account. </p> <p> -See <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> <p> </p> @@ -2073,27 +2073,27 @@ See <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> left of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> top of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x2</code></em> :</span></p></td> <td> right of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y2</code></em> :</span></p></td> <td> bottom of the resulting extents </td> </tr> @@ -2102,19 +2102,19 @@ See <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()< </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619552"></a><h3> +<a name="id2636980"></a><h3> <a name="cairo-in-fill"></a>cairo_in_fill ()</h3> -<a class="indexterm" name="id2619565"></a><pre class="programlisting"><a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_in_fill (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2636993"></a><pre class="programlisting"><a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_in_fill (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y);</pre> <p> Tests whether the given point is inside the area that would be -affected by a <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> operation given the current path and +affected by a <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a> operation given the current path and filling parameters. Surface dimensions and clipping are not taken into account. </p> <p> -See <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-fill-rule"><code class="function">cairo_set_fill_rule()</code></a> and <a class="link" href="cairo-cairo-t.html#cairo-fill-preserve"><code class="function">cairo_fill_preserve()</code></a>.</p> <p> </p> @@ -2122,22 +2122,22 @@ See <a href="cairo-cairo-t.html#cairo-fill"><code class="function">cairo_fill()< <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X coordinate of the point to test </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y coordinate of the point to test </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> A non-zero value if the point is inside, or zero if outside. </td> @@ -2147,10 +2147,10 @@ outside. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619715"></a><h3> +<a name="id2637144"></a><h3> <a name="cairo-mask"></a>cairo_mask ()</h3> -<a class="indexterm" name="id2619728"></a><pre class="programlisting">void cairo_mask (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> +<a class="indexterm" name="id2637156"></a><pre class="programlisting">void cairo_mask (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-Patterns.html#cairo-pattern-t">cairo_pattern_t</a> *pattern);</pre> <p> A drawing operator that paints the current source using the alpha channel of <em class="parameter"><code>pattern</code></em> as a mask. (Opaque @@ -2163,13 +2163,13 @@ areas are not painted.)</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>pattern</code></em> :</span></td> -<td> a <a href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> +<td><p><span class="term"><em class="parameter"><code>pattern</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Patterns.html#cairo-pattern-t"><span class="type">cairo_pattern_t</span></a> </td> </tr> </tbody> @@ -2177,10 +2177,10 @@ areas are not painted.)</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619821"></a><h3> +<a name="id2637249"></a><h3> <a name="cairo-mask-surface"></a>cairo_mask_surface ()</h3> -<a class="indexterm" name="id2619835"></a><pre class="programlisting">void cairo_mask_surface (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - <a href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, +<a class="indexterm" name="id2637263"></a><pre class="programlisting">void cairo_mask_surface (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t">cairo_surface_t</a> *surface, double surface_x, double surface_y);</pre> <p> @@ -2195,22 +2195,22 @@ areas are not painted.)</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>surface</code></em> :</span></td> -<td> a <a href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> +<td><p><span class="term"><em class="parameter"><code>surface</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-surface-t.html#cairo-surface-t"><span class="type">cairo_surface_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>surface_x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface_x</code></em> :</span></p></td> <td> X coordinate at which to place the origin of <em class="parameter"><code>surface</code></em> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>surface_y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>surface_y</code></em> :</span></p></td> <td> Y coordinate at which to place the origin of <em class="parameter"><code>surface</code></em> </td> </tr> @@ -2219,9 +2219,9 @@ areas are not painted.)</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2619984"></a><h3> +<a name="id2637412"></a><h3> <a name="cairo-paint"></a>cairo_paint ()</h3> -<a class="indexterm" name="id2619997"></a><pre class="programlisting">void cairo_paint (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2637426"></a><pre class="programlisting">void cairo_paint (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> A drawing operator that paints the current source everywhere within the current clip region.</p> @@ -2231,7 +2231,7 @@ the current clip region.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2239,14 +2239,14 @@ the current clip region.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620049"></a><h3> +<a name="id2637477"></a><h3> <a name="cairo-paint-with-alpha"></a>cairo_paint_with_alpha ()</h3> -<a class="indexterm" name="id2620062"></a><pre class="programlisting">void cairo_paint_with_alpha (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2637490"></a><pre class="programlisting">void cairo_paint_with_alpha (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double alpha);</pre> <p> A drawing operator that paints the current source everywhere within the current clip region using a mask of constant alpha value -<em class="parameter"><code>alpha</code></em>. The effect is similar to <a href="cairo-cairo-t.html#cairo-paint"><code class="function">cairo_paint()</code></a>, but the drawing +<em class="parameter"><code>alpha</code></em>. The effect is similar to <a class="link" href="cairo-cairo-t.html#cairo-paint"><code class="function">cairo_paint()</code></a>, but the drawing is faded out using the alpha value.</p> <p> @@ -2255,12 +2255,12 @@ is faded out using the alpha value.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>alpha</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>alpha</code></em> :</span></p></td> <td> alpha value, between 0 (transparent) and 1 (opaque) </td> </tr> @@ -2269,16 +2269,16 @@ is faded out using the alpha value.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620153"></a><h3> +<a name="id2637581"></a><h3> <a name="cairo-stroke"></a>cairo_stroke ()</h3> -<a class="indexterm" name="id2620166"></a><pre class="programlisting">void cairo_stroke (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2637594"></a><pre class="programlisting">void cairo_stroke (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> A drawing operator that strokes the current path according to the current line width, line join, line cap, and dash settings. After cairo_stroke, the current path will be cleared from the cairo -context. See <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, -<a href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and -<a href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>. +context. See <a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, +<a class="link" href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and +<a class="link" href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>. </p> <p> Note: Degenerate segments and sub-paths are treated specially and @@ -2286,16 +2286,16 @@ provide a useful result. These can result in two different situations: </p> <p> -1. Zero-length "on" segments set in <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>. If the cap +1. Zero-length "on" segments set in <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>. If the cap style is CAIRO_LINE_CAP_ROUND or CAIRO_LINE_CAP_SQUARE then these segments will be drawn as circular dots or squares respectively. In the case of CAIRO_LINE_CAP_SQUARE, the orientation of the squares is determined by the direction of the underlying path. </p> <p> -2. A sub-path created by <a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a> followed by either a -<a href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a> or one or more calls to <a href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> to the -same coordinate as the <a href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>. If the cap style is +2. A sub-path created by <a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a> followed by either a +<a class="link" href="cairo-Paths.html#cairo-close-path"><code class="function">cairo_close_path()</code></a> or one or more calls to <a class="link" href="cairo-Paths.html#cairo-line-to"><code class="function">cairo_line_to()</code></a> to the +same coordinate as the <a class="link" href="cairo-Paths.html#cairo-move-to"><code class="function">cairo_move_to()</code></a>. If the cap style is CAIRO_LINE_CAP_ROUND then these sub-paths will be drawn as circular dots. Note that in the case of CAIRO_LINE_CAP_SQUARE a degenerate sub-path will not be drawn at all, (since the correct orientation @@ -2310,7 +2310,7 @@ to be drawn in the case of either degenerate segments or sub-paths.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2318,26 +2318,26 @@ to be drawn in the case of either degenerate segments or sub-paths.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620346"></a><h3> +<a name="id2637774"></a><h3> <a name="cairo-stroke-preserve"></a>cairo_stroke_preserve ()</h3> -<a class="indexterm" name="id2620359"></a><pre class="programlisting">void cairo_stroke_preserve (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2637787"></a><pre class="programlisting">void cairo_stroke_preserve (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> A drawing operator that strokes the current path according to the current line width, line join, line cap, and dash settings. Unlike -<a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, cairo_stroke_preserve preserves the path within the +<a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, cairo_stroke_preserve preserves the path within the cairo context. </p> <p> -See <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, -<a href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and -<a href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, +<a class="link" href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and +<a class="link" href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2345,16 +2345,16 @@ See <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cai </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620474"></a><h3> +<a name="id2637903"></a><h3> <a name="cairo-stroke-extents"></a>cairo_stroke_extents ()</h3> -<a class="indexterm" name="id2620488"></a><pre class="programlisting">void cairo_stroke_extents (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2637916"></a><pre class="programlisting">void cairo_stroke_extents (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double *x1, double *y1, double *x2, double *y2);</pre> <p> Computes a bounding box in user coordinates covering the area that -would be affected by a <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> operation operation given the +would be affected by a <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> operation operation given the current path and stroke parameters. If the current path is empty,</p> <p> @@ -2363,27 +2363,27 @@ current path and stroke parameters. If the current path is empty,</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x1</code></em> :</span></p></td> <td> left of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y1</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y1</code></em> :</span></p></td> <td> top of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x2</code></em> :</span></p></td> <td> right of the resulting extents </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y2</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y2</code></em> :</span></p></td> <td> bottom of the resulting extents </td> </tr> @@ -2392,21 +2392,21 @@ current path and stroke parameters. If the current path is empty,</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620637"></a><h3> +<a name="id2638065"></a><h3> <a name="cairo-in-stroke"></a>cairo_in_stroke ()</h3> -<a class="indexterm" name="id2620650"></a><pre class="programlisting"><a href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_in_stroke (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, +<a class="indexterm" name="id2638078"></a><pre class="programlisting"><a class="link" href="cairo-Types.html#cairo-bool-t">cairo_bool_t</a> cairo_in_stroke (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, double x, double y);</pre> <p> Tests whether the given point is inside the area that would be -affected by a <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> operation given the current path and +affected by a <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a> operation given the current path and stroking parameters. Surface dimensions and clipping are not taken into account. </p> <p> -See <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, -<a href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and -<a href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>.</p> +See <a class="link" href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_stroke()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-line-width"><code class="function">cairo_set_line_width()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-line-join"><code class="function">cairo_set_line_join()</code></a>, +<a class="link" href="cairo-cairo-t.html#cairo-set-line-cap"><code class="function">cairo_set_line_cap()</code></a>, <a class="link" href="cairo-cairo-t.html#cairo-set-dash"><code class="function">cairo_set_dash()</code></a>, and +<a class="link" href="cairo-cairo-t.html#cairo-stroke-preserve"><code class="function">cairo_stroke_preserve()</code></a>.</p> <p> </p> @@ -2414,22 +2414,22 @@ See <a href="cairo-cairo-t.html#cairo-stroke"><code class="function">cairo_strok <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>x</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>x</code></em> :</span></p></td> <td> X coordinate of the point to test </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>y</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>y</code></em> :</span></p></td> <td> Y coordinate of the point to test </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> A non-zero value if the point is inside, or zero if outside. </td> @@ -2439,13 +2439,13 @@ outside. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620829"></a><h3> +<a name="id2638258"></a><h3> <a name="cairo-copy-page"></a>cairo_copy_page ()</h3> -<a class="indexterm" name="id2620843"></a><pre class="programlisting">void cairo_copy_page (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2638271"></a><pre class="programlisting">void cairo_copy_page (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Emits the current page for backends that support multiple pages, but doesn't clear it, so, the contents of the current page will be retained -for the next page too. Use <a href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> if you want to get an +for the next page too. Use <a class="link" href="cairo-cairo-t.html#cairo-show-page"><code class="function">cairo_show_page()</code></a> if you want to get an empty page after the emission.</p> <p> @@ -2453,7 +2453,7 @@ empty page after the emission.</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2461,19 +2461,19 @@ empty page after the emission.</p> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620906"></a><h3> +<a name="id2638334"></a><h3> <a name="cairo-show-page"></a>cairo_show_page ()</h3> -<a class="indexterm" name="id2620919"></a><pre class="programlisting">void cairo_show_page (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2638347"></a><pre class="programlisting">void cairo_show_page (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Emits and clears the current page for backends that support multiple -pages. Use <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a> if you don't want to clear the page.</p> +pages. Use <a class="link" href="cairo-cairo-t.html#cairo-copy-page"><code class="function">cairo_copy_page()</code></a> if you don't want to clear the page.</p> <p> </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> <td> a cairo context </td> </tr></tbody> @@ -2481,9 +2481,9 @@ pages. Use <a href="cairo-cairo-t.html#cairo-copy-page"><code class="function"> </div> <hr> <div class="refsect2" lang="en"> -<a name="id2620980"></a><h3> +<a name="id2638408"></a><h3> <a name="cairo-get-reference-count"></a>cairo_get_reference_count ()</h3> -<a class="indexterm" name="id2620996"></a><pre class="programlisting">unsigned int cairo_get_reference_count (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> +<a class="indexterm" name="id2638425"></a><pre class="programlisting">unsigned int cairo_get_reference_count (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr);</pre> <p> Returns the current reference count of <em class="parameter"><code>cr</code></em>.</p> <p> @@ -2493,12 +2493,12 @@ Returns the current reference count of <em class="parameter"><code>cr</code></em <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the current reference count of <em class="parameter"><code>cr</code></em>. If the object is a nil object, 0 will be returned. @@ -2511,12 +2511,12 @@ object is a nil object, 0 will be returned. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2621085"></a><h3> +<a name="id2638514"></a><h3> <a name="cairo-set-user-data"></a>cairo_set_user_data ()</h3> -<a class="indexterm" name="id2621102"></a><pre class="programlisting"><a href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_set_user_data (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, +<a class="indexterm" name="id2638530"></a><pre class="programlisting"><a class="link" href="cairo-Error-Handling.html#cairo-status-t">cairo_status_t</a> cairo_set_user_data (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key, void *user_data, - <a href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> + <a class="link" href="cairo-Types.html#cairo-destroy-func-t">cairo_destroy_func_t</a> destroy);</pre> <p> Attach user data to <em class="parameter"><code>cr</code></em>. To remove user data from a surface, call this function with the key that was used to set it and <code class="literal">NULL</code> @@ -2528,30 +2528,30 @@ for <em class="parameter"><code>data</code></em>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of a <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of a <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> to attach the user data to </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>user_data</code></em> :</span></td> -<td> the user data to attach to the <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> +<td> the user data to attach to the <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>destroy</code></em> :</span></td> -<td> a <a href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the -<a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the +<td><p><span class="term"><em class="parameter"><code>destroy</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-Types.html#cairo-destroy-func-t"><span class="type">cairo_destroy_func_t</span></a> which will be called when the +<a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> is destroyed or when new user data is attached using the same key. </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> -<td> <a href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-SUCCESS:CAPS"><code class="literal">CAIRO_STATUS_SUCCESS</code></a> or <a class="link" href="cairo-Error-Handling.html#CAIRO-STATUS-NO-MEMORY:CAPS"><code class="literal">CAIRO_STATUS_NO_MEMORY</code></a> if a slot could not be allocated for the user data. </td> @@ -2563,10 +2563,10 @@ slot could not be allocated for the user data. </div> <hr> <div class="refsect2" lang="en"> -<a name="id2621316"></a><h3> +<a name="id2638744"></a><h3> <a name="cairo-get-user-data"></a>cairo_get_user_data ()</h3> -<a class="indexterm" name="id2621332"></a><pre class="programlisting">void* cairo_get_user_data (<a href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, - const <a href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> +<a class="indexterm" name="id2638760"></a><pre class="programlisting">void* cairo_get_user_data (<a class="link" href="cairo-cairo-t.html#cairo-t">cairo_t</a> *cr, + const <a class="link" href="cairo-Types.html#cairo-user-data-key-t">cairo_user_data_key_t</a> *key);</pre> <p> Return user data previously attached to <em class="parameter"><code>cr</code></em> using the specified key. If no user data has been attached with the given key this @@ -2578,18 +2578,18 @@ function returns <code class="literal">NULL</code>.</p> <col align="left" valign="top"> <tbody> <tr> -<td><span class="term"><em class="parameter"><code>cr</code></em> :</span></td> -<td> a <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> +<td><p><span class="term"><em class="parameter"><code>cr</code></em> :</span></p></td> +<td> a <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> </td> </tr> <tr> -<td><span class="term"><em class="parameter"><code>key</code></em> :</span></td> -<td> the address of the <a href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was +<td><p><span class="term"><em class="parameter"><code>key</code></em> :</span></p></td> +<td> the address of the <a class="link" href="cairo-Types.html#cairo-user-data-key-t"><span class="type">cairo_user_data_key_t</span></a> the user data was attached to </td> </tr> <tr> -<td><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></td> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> the user data previously attached or <code class="literal">NULL</code>. </td> @@ -2600,6 +2600,11 @@ attached to </p> </div> </div> +<div class="refsect1" lang="en"> +<a name="id2638893"></a><div class="refsect2" lang="en"><a name="id2638894"></a></div> +<hr> +<div class="refsect2" lang="en"><a name="id2638895"></a></div> +</div> </div> </body> </html> diff --git a/doc/public/html/cairo.devhelp b/doc/public/html/cairo.devhelp index 70e8d70..487f668 100644 --- a/doc/public/html/cairo.devhelp +++ b/doc/public/html/cairo.devhelp @@ -119,6 +119,8 @@ <function name="cairo_get_reference_count ()" link="cairo-cairo-t.html#cairo-get-reference-count"/> <function name="cairo_set_user_data ()" link="cairo-cairo-t.html#cairo-set-user-data"/> <function name="cairo_get_user_data ()" link="cairo-cairo-t.html#cairo-get-user-data"/> + <function name="" link="cairo-cairo-t.html#id2638894"/> + <function name="" link="cairo-cairo-t.html#id2638895"/> <function name="cairo_path_t" link="cairo-Paths.html#cairo-path-t"/> <function name="union cairo_path_data_t" link="cairo-Paths.html#cairo-path-data-t"/> <function name="enum cairo_path_data_type_t" link="cairo-Paths.html#cairo-path-data-type-t"/> @@ -141,6 +143,8 @@ <function name="cairo_rel_curve_to ()" link="cairo-Paths.html#cairo-rel-curve-to"/> <function name="cairo_rel_line_to ()" link="cairo-Paths.html#cairo-rel-line-to"/> <function name="cairo_rel_move_to ()" link="cairo-Paths.html#cairo-rel-move-to"/> + <function name="" link="cairo-Paths.html#id2581754"/> + <function name="" link="cairo-Paths.html#id2581755"/> <function name="cairo_pattern_t" link="cairo-Patterns.html#cairo-pattern-t"/> <function name="cairo_pattern_add_color_stop_rgb ()" link="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"/> <function name="cairo_pattern_add_color_stop_rgba ()" link="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"/> @@ -171,6 +175,8 @@ <function name="cairo_pattern_get_reference_count ()" link="cairo-Patterns.html#cairo-pattern-get-reference-count"/> <function name="cairo_pattern_set_user_data ()" link="cairo-Patterns.html#cairo-pattern-set-user-data"/> <function name="cairo_pattern_get_user_data ()" link="cairo-Patterns.html#cairo-pattern-get-user-data"/> + <function name="" link="cairo-Patterns.html#id2645043"/> + <function name="" link="cairo-Patterns.html#id2645044"/> <function name="cairo_translate ()" link="cairo-Transformations.html#cairo-translate"/> <function name="cairo_scale ()" link="cairo-Transformations.html#cairo-scale"/> <function name="cairo_rotate ()" link="cairo-Transformations.html#cairo-rotate"/> @@ -182,6 +188,8 @@ <function name="cairo_user_to_device_distance ()" link="cairo-Transformations.html#cairo-user-to-device-distance"/> <function name="cairo_device_to_user ()" link="cairo-Transformations.html#cairo-device-to-user"/> <function name="cairo_device_to_user_distance ()" link="cairo-Transformations.html#cairo-device-to-user-distance"/> + <function name="" link="cairo-Transformations.html#id2627737"/> + <function name="" link="cairo-Transformations.html#id2627738"/> <function name="cairo_glyph_t" link="cairo-Text.html#cairo-glyph-t"/> <function name="enum cairo_font_slant_t" link="cairo-Text.html#cairo-font-slant-t"/> <function name="enum cairo_font_weight_t" link="cairo-Text.html#cairo-font-weight-t"/> @@ -200,6 +208,8 @@ <function name="cairo_font_extents ()" link="cairo-Text.html#cairo-font-extents"/> <function name="cairo_text_extents ()" link="cairo-Text.html#cairo-text-extents"/> <function name="cairo_glyph_extents ()" link="cairo-Text.html#cairo-glyph-extents"/> + <function name="" link="cairo-Text.html#id2646594"/> + <function name="" link="cairo-Text.html#id2646595"/> <function name="cairo_font_face_t" link="cairo-cairo-font-face-t.html#cairo-font-face-t"/> <function name="cairo_font_face_reference ()" link="cairo-cairo-font-face-t.html#cairo-font-face-reference"/> <function name="cairo_font_face_destroy ()" link="cairo-cairo-font-face-t.html#cairo-font-face-destroy"/> @@ -209,6 +219,8 @@ <function name="cairo_font_face_get_reference_count ()" link="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count"/> <function name="cairo_font_face_set_user_data ()" link="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"/> <function name="cairo_font_face_get_user_data ()" link="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data"/> + <function name="" link="cairo-cairo-font-face-t.html#id2646847"/> + <function name="" link="cairo-cairo-font-face-t.html#id2646848"/> <function name="cairo_scaled_font_t" link="cairo-Scaled-Fonts.html#cairo-scaled-font-t"/> <function name="cairo_scaled_font_create ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-create"/> <function name="cairo_scaled_font_reference ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"/> @@ -227,6 +239,8 @@ <function name="cairo_scaled_font_get_reference_count ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count"/> <function name="cairo_scaled_font_set_user_data ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-set-user-data"/> <function name="cairo_scaled_font_get_user_data ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-get-user-data"/> + <function name="" link="cairo-Scaled-Fonts.html#id2651486"/> + <function name="" link="cairo-Scaled-Fonts.html#id2651487"/> <function name="cairo_font_options_t" link="cairo-Font-Options.html#cairo-font-options-t"/> <function name="cairo_font_options_create ()" link="cairo-Font-Options.html#cairo-font-options-create"/> <function name="cairo_font_options_copy ()" link="cairo-Font-Options.html#cairo-font-options-copy"/> @@ -246,11 +260,15 @@ <function name="enum cairo_hint_metrics_t" link="cairo-Font-Options.html#cairo-hint-metrics-t"/> <function name="cairo_font_options_set_hint_metrics ()" link="cairo-Font-Options.html#cairo-font-options-set-hint-metrics"/> <function name="cairo_font_options_get_hint_metrics ()" link="cairo-Font-Options.html#cairo-font-options-get-hint-metrics"/> + <function name="" link="cairo-Font-Options.html#id2653596"/> + <function name="" link="cairo-Font-Options.html#id2653597"/> <function name="cairo_ft_font_face_create_for_ft_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face"/> <function name="cairo_ft_font_face_create_for_pattern ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"/> <function name="cairo_ft_font_options_substitute ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute"/> <function name="cairo_ft_scaled_font_lock_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face"/> <function name="cairo_ft_scaled_font_unlock_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-unlock-face"/> + <function name="" link="cairo-FreeType-Fonts.html#id2576417"/> + <function name="" link="cairo-FreeType-Fonts.html#id2576418"/> <function name="cairo_win32_font_face_create_for_logfontw ()" link="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-logfontw"/> <function name="cairo_win32_font_face_create_for_hfont ()" link="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-hfont"/> <function name="cairo_win32_scaled_font_select_font ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"/> @@ -258,6 +276,8 @@ <function name="cairo_win32_scaled_font_get_metrics_factor ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor"/> <function name="cairo_win32_scaled_font_get_logical_to_device ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-logical-to-device"/> <function name="cairo_win32_scaled_font_get_device_to_logical ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-device-to-logical"/> + <function name="" link="cairo-Win32-Fonts.html#id2648293"/> + <function name="" link="cairo-Win32-Fonts.html#id2648294"/> <function name="cairo_surface_t" link="cairo-cairo-surface-t.html#cairo-surface-t"/> <function name="enum cairo_content_t" link="cairo-cairo-surface-t.html#cairo-content-t"/> <function name="cairo_surface_create_similar ()" link="cairo-cairo-surface-t.html#cairo-surface-create-similar"/> @@ -278,6 +298,8 @@ <function name="cairo_surface_get_reference_count ()" link="cairo-cairo-surface-t.html#cairo-surface-get-reference-count"/> <function name="cairo_surface_set_user_data ()" link="cairo-cairo-surface-t.html#cairo-surface-set-user-data"/> <function name="cairo_surface_get_user_data ()" link="cairo-cairo-surface-t.html#cairo-surface-get-user-data"/> + <function name="" link="cairo-cairo-surface-t.html#id2660302"/> + <function name="" link="cairo-cairo-surface-t.html#id2660303"/> <function name="enum cairo_format_t" link="cairo-Image-Surfaces.html#cairo-format-t"/> <function name="cairo_image_surface_create ()" link="cairo-Image-Surfaces.html#cairo-image-surface-create"/> <function name="cairo_image_surface_create_for_data ()" link="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data"/> @@ -286,32 +308,44 @@ <function name="cairo_image_surface_get_width ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-width"/> <function name="cairo_image_surface_get_height ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-height"/> <function name="cairo_image_surface_get_stride ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-stride"/> + <function name="" link="cairo-Image-Surfaces.html#id2656544"/> + <function name="" link="cairo-Image-Surfaces.html#id2656545"/> <function name="cairo_pdf_surface_create ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-create"/> <function name="cairo_pdf_surface_create_for_stream ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-create-for-stream"/> <function name="cairo_pdf_surface_set_size ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-set-size"/> + <function name="" link="cairo-PDF-Surfaces.html#id2656676"/> + <function name="" link="cairo-PDF-Surfaces.html#id2656677"/> <function name="cairo_image_surface_create_from_png ()" link="cairo-PNG-Support.html#cairo-image-surface-create-from-png"/> <function name="cairo_read_func_t ()" link="cairo-PNG-Support.html#cairo-read-func-t"/> <function name="cairo_image_surface_create_from_png_stream ()" link="cairo-PNG-Support.html#cairo-image-surface-create-from-png-stream"/> <function name="cairo_surface_write_to_png ()" link="cairo-PNG-Support.html#cairo-surface-write-to-png"/> <function name="cairo_write_func_t ()" link="cairo-PNG-Support.html#cairo-write-func-t"/> <function name="cairo_surface_write_to_png_stream ()" link="cairo-PNG-Support.html#cairo-surface-write-to-png-stream"/> + <function name="" link="cairo-PNG-Support.html#id2654725"/> + <function name="" link="cairo-PNG-Support.html#id2654726"/> <function name="cairo_ps_surface_create ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-create"/> <function name="cairo_ps_surface_create_for_stream ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream"/> <function name="cairo_ps_surface_set_size ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size"/> <function name="cairo_ps_surface_dsc_begin_setup ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup"/> <function name="cairo_ps_surface_dsc_begin_page_setup ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup"/> <function name="cairo_ps_surface_dsc_comment ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment"/> + <function name="" link="cairo-PostScript-Surfaces.html#id2663038"/> + <function name="" link="cairo-PostScript-Surfaces.html#id2663039"/> <function name="cairo_win32_surface_create ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create"/> <function name="cairo_win32_surface_create_with_dib ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-dib"/> <function name="cairo_win32_surface_create_with_ddb ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-ddb"/> <function name="cairo_win32_surface_get_dc ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-get-dc"/> <function name="cairo_win32_surface_get_image ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-get-image"/> + <function name="" link="cairo-Win32-Surfaces.html#id2660718"/> + <function name="" link="cairo-Win32-Surfaces.html#id2660720"/> <function name="cairo_svg_surface_create ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-create"/> <function name="cairo_svg_surface_create_for_stream ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-create-for-stream"/> <function name="cairo_svg_surface_restrict_to_version ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version"/> <function name="enum cairo_svg_version_t" link="cairo-SVG-Surfaces.html#cairo-svg-version-t"/> <function name="cairo_svg_get_versions ()" link="cairo-SVG-Surfaces.html#cairo-svg-get-versions"/> <function name="cairo_svg_version_to_string ()" link="cairo-SVG-Surfaces.html#cairo-svg-version-to-string"/> + <function name="" link="cairo-SVG-Surfaces.html#id2661900"/> + <function name="" link="cairo-SVG-Surfaces.html#id2661901"/> <function name="cairo_xlib_surface_create ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-create"/> <function name="cairo_xlib_surface_create_for_bitmap ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-create-for-bitmap"/> <function name="cairo_xlib_surface_set_size ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-size"/> @@ -323,6 +357,8 @@ <function name="cairo_xlib_surface_get_width ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-width"/> <function name="cairo_xlib_surface_get_height ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-height"/> <function name="cairo_xlib_surface_get_depth ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-depth"/> + <function name="" link="cairo-XLib-Surfaces.html#id2666734"/> + <function name="" link="cairo-XLib-Surfaces.html#id2666736"/> <function name="cairo_matrix_t" link="cairo-cairo-matrix-t.html#cairo-matrix-t"/> <function name="cairo_matrix_init ()" link="cairo-cairo-matrix-t.html#cairo-matrix-init"/> <function name="cairo_matrix_init_identity ()" link="cairo-cairo-matrix-t.html#cairo-matrix-init-identity"/> @@ -336,11 +372,15 @@ <function name="cairo_matrix_multiply ()" link="cairo-cairo-matrix-t.html#cairo-matrix-multiply"/> <function name="cairo_matrix_transform_distance ()" link="cairo-cairo-matrix-t.html#cairo-matrix-transform-distance"/> <function name="cairo_matrix_transform_point ()" link="cairo-cairo-matrix-t.html#cairo-matrix-transform-point"/> + <function name="" link="cairo-cairo-matrix-t.html#id2670198"/> + <function name="" link="cairo-cairo-matrix-t.html#id2670199"/> <function name="enum cairo_status_t" link="cairo-Error-Handling.html#cairo-status-t"/> <function name="cairo_status_to_string ()" link="cairo-Error-Handling.html#cairo-status-to-string"/> <function name="cairo_debug_reset_static_data ()" link="cairo-Error-Handling.html#cairo-debug-reset-static-data"/> - <function name="Compatibility" link="cairo-Version-Information.html#id2651090"/> - <function name="Examining the version" link="cairo-Version-Information.html#id2651129"/> + <function name="" link="cairo-Error-Handling.html#id2665747"/> + <function name="" link="cairo-Error-Handling.html#id2665748"/> + <function name="Compatibility" link="cairo-Version-Information.html#id2664349"/> + <function name="Examining the version" link="cairo-Version-Information.html#id2664387"/> <function name="CAIRO_VERSION" link="cairo-Version-Information.html#CAIRO-VERSION:CAPS"/> <function name="CAIRO_VERSION_MAJOR" link="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS"/> <function name="CAIRO_VERSION_MINOR" link="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS"/> @@ -349,8 +389,12 @@ <function name="CAIRO_VERSION_ENCODE()" link="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS"/> <function name="cairo_version ()" link="cairo-Version-Information.html#cairo-version"/> <function name="cairo_version_string ()" link="cairo-Version-Information.html#cairo-version-string"/> + <function name="" link="cairo-Version-Information.html#id2666775"/> + <function name="" link="cairo-Version-Information.html#id2666776"/> <function name="cairo_bool_t" link="cairo-Types.html#cairo-bool-t"/> <function name="cairo_user_data_key_t" link="cairo-Types.html#cairo-user-data-key-t"/> <function name="cairo_destroy_func_t ()" link="cairo-Types.html#cairo-destroy-func-t"/> + <function name="" link="cairo-Types.html#id2664531"/> + <function name="" link="cairo-Types.html#id2664532"/> </functions> </book> diff --git a/doc/public/html/cairo.devhelp2 b/doc/public/html/cairo.devhelp2 index b823c0c..86f014e 100644 --- a/doc/public/html/cairo.devhelp2 +++ b/doc/public/html/cairo.devhelp2 @@ -119,6 +119,8 @@ <keyword type="function" name="cairo_get_reference_count ()" link="cairo-cairo-t.html#cairo-get-reference-count" since="1.4"/> <keyword type="function" name="cairo_set_user_data ()" link="cairo-cairo-t.html#cairo-set-user-data" since="1.4"/> <keyword type="function" name="cairo_get_user_data ()" link="cairo-cairo-t.html#cairo-get-user-data" since="1.4"/> + <keyword type="" name="" link="cairo-cairo-t.html#id2638894"/> + <keyword type="" name="" link="cairo-cairo-t.html#id2638895"/> <keyword type="struct" name="cairo_path_t" link="cairo-Paths.html#cairo-path-t"/> <keyword type="union" name="union cairo_path_data_t" link="cairo-Paths.html#cairo-path-data-t"/> <keyword type="enum" name="enum cairo_path_data_type_t" link="cairo-Paths.html#cairo-path-data-type-t"/> @@ -141,6 +143,8 @@ <keyword type="function" name="cairo_rel_curve_to ()" link="cairo-Paths.html#cairo-rel-curve-to"/> <keyword type="function" name="cairo_rel_line_to ()" link="cairo-Paths.html#cairo-rel-line-to"/> <keyword type="function" name="cairo_rel_move_to ()" link="cairo-Paths.html#cairo-rel-move-to"/> + <keyword type="" name="" link="cairo-Paths.html#id2581754"/> + <keyword type="" name="" link="cairo-Paths.html#id2581755"/> <keyword type="typedef" name="cairo_pattern_t" link="cairo-Patterns.html#cairo-pattern-t"/> <keyword type="function" name="cairo_pattern_add_color_stop_rgb ()" link="cairo-Patterns.html#cairo-pattern-add-color-stop-rgb"/> <keyword type="function" name="cairo_pattern_add_color_stop_rgba ()" link="cairo-Patterns.html#cairo-pattern-add-color-stop-rgba"/> @@ -171,6 +175,8 @@ <keyword type="function" name="cairo_pattern_get_reference_count ()" link="cairo-Patterns.html#cairo-pattern-get-reference-count" since="1.4"/> <keyword type="function" name="cairo_pattern_set_user_data ()" link="cairo-Patterns.html#cairo-pattern-set-user-data" since="1.4"/> <keyword type="function" name="cairo_pattern_get_user_data ()" link="cairo-Patterns.html#cairo-pattern-get-user-data" since="1.4"/> + <keyword type="" name="" link="cairo-Patterns.html#id2645043"/> + <keyword type="" name="" link="cairo-Patterns.html#id2645044"/> <keyword type="function" name="cairo_translate ()" link="cairo-Transformations.html#cairo-translate"/> <keyword type="function" name="cairo_scale ()" link="cairo-Transformations.html#cairo-scale"/> <keyword type="function" name="cairo_rotate ()" link="cairo-Transformations.html#cairo-rotate"/> @@ -182,6 +188,8 @@ <keyword type="function" name="cairo_user_to_device_distance ()" link="cairo-Transformations.html#cairo-user-to-device-distance"/> <keyword type="function" name="cairo_device_to_user ()" link="cairo-Transformations.html#cairo-device-to-user"/> <keyword type="function" name="cairo_device_to_user_distance ()" link="cairo-Transformations.html#cairo-device-to-user-distance"/> + <keyword type="" name="" link="cairo-Transformations.html#id2627737"/> + <keyword type="" name="" link="cairo-Transformations.html#id2627738"/> <keyword type="struct" name="cairo_glyph_t" link="cairo-Text.html#cairo-glyph-t"/> <keyword type="enum" name="enum cairo_font_slant_t" link="cairo-Text.html#cairo-font-slant-t"/> <keyword type="enum" name="enum cairo_font_weight_t" link="cairo-Text.html#cairo-font-weight-t"/> @@ -200,6 +208,8 @@ <keyword type="function" name="cairo_font_extents ()" link="cairo-Text.html#cairo-font-extents"/> <keyword type="function" name="cairo_text_extents ()" link="cairo-Text.html#cairo-text-extents"/> <keyword type="function" name="cairo_glyph_extents ()" link="cairo-Text.html#cairo-glyph-extents"/> + <keyword type="" name="" link="cairo-Text.html#id2646594"/> + <keyword type="" name="" link="cairo-Text.html#id2646595"/> <keyword type="typedef" name="cairo_font_face_t" link="cairo-cairo-font-face-t.html#cairo-font-face-t"/> <keyword type="function" name="cairo_font_face_reference ()" link="cairo-cairo-font-face-t.html#cairo-font-face-reference"/> <keyword type="function" name="cairo_font_face_destroy ()" link="cairo-cairo-font-face-t.html#cairo-font-face-destroy"/> @@ -209,6 +219,8 @@ <keyword type="function" name="cairo_font_face_get_reference_count ()" link="cairo-cairo-font-face-t.html#cairo-font-face-get-reference-count" since="1.4"/> <keyword type="function" name="cairo_font_face_set_user_data ()" link="cairo-cairo-font-face-t.html#cairo-font-face-set-user-data"/> <keyword type="function" name="cairo_font_face_get_user_data ()" link="cairo-cairo-font-face-t.html#cairo-font-face-get-user-data"/> + <keyword type="" name="" link="cairo-cairo-font-face-t.html#id2646847"/> + <keyword type="" name="" link="cairo-cairo-font-face-t.html#id2646848"/> <keyword type="typedef" name="cairo_scaled_font_t" link="cairo-Scaled-Fonts.html#cairo-scaled-font-t"/> <keyword type="function" name="cairo_scaled_font_create ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-create"/> <keyword type="function" name="cairo_scaled_font_reference ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-reference"/> @@ -227,6 +239,8 @@ <keyword type="function" name="cairo_scaled_font_get_reference_count ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-get-reference-count" since="1.4"/> <keyword type="function" name="cairo_scaled_font_set_user_data ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-set-user-data" since="1.4"/> <keyword type="function" name="cairo_scaled_font_get_user_data ()" link="cairo-Scaled-Fonts.html#cairo-scaled-font-get-user-data" since="1.4"/> + <keyword type="" name="" link="cairo-Scaled-Fonts.html#id2651486"/> + <keyword type="" name="" link="cairo-Scaled-Fonts.html#id2651487"/> <keyword type="typedef" name="cairo_font_options_t" link="cairo-Font-Options.html#cairo-font-options-t"/> <keyword type="function" name="cairo_font_options_create ()" link="cairo-Font-Options.html#cairo-font-options-create"/> <keyword type="function" name="cairo_font_options_copy ()" link="cairo-Font-Options.html#cairo-font-options-copy"/> @@ -246,11 +260,15 @@ <keyword type="enum" name="enum cairo_hint_metrics_t" link="cairo-Font-Options.html#cairo-hint-metrics-t"/> <keyword type="function" name="cairo_font_options_set_hint_metrics ()" link="cairo-Font-Options.html#cairo-font-options-set-hint-metrics"/> <keyword type="function" name="cairo_font_options_get_hint_metrics ()" link="cairo-Font-Options.html#cairo-font-options-get-hint-metrics"/> + <keyword type="" name="" link="cairo-Font-Options.html#id2653596"/> + <keyword type="" name="" link="cairo-Font-Options.html#id2653597"/> <keyword type="function" name="cairo_ft_font_face_create_for_ft_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-ft-face"/> <keyword type="function" name="cairo_ft_font_face_create_for_pattern ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-face-create-for-pattern"/> <keyword type="function" name="cairo_ft_font_options_substitute ()" link="cairo-FreeType-Fonts.html#cairo-ft-font-options-substitute"/> <keyword type="function" name="cairo_ft_scaled_font_lock_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-lock-face"/> <keyword type="function" name="cairo_ft_scaled_font_unlock_face ()" link="cairo-FreeType-Fonts.html#cairo-ft-scaled-font-unlock-face"/> + <keyword type="" name="" link="cairo-FreeType-Fonts.html#id2576417"/> + <keyword type="" name="" link="cairo-FreeType-Fonts.html#id2576418"/> <keyword type="function" name="cairo_win32_font_face_create_for_logfontw ()" link="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-logfontw"/> <keyword type="function" name="cairo_win32_font_face_create_for_hfont ()" link="cairo-Win32-Fonts.html#cairo-win32-font-face-create-for-hfont"/> <keyword type="function" name="cairo_win32_scaled_font_select_font ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-select-font"/> @@ -258,6 +276,8 @@ <keyword type="function" name="cairo_win32_scaled_font_get_metrics_factor ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-metrics-factor"/> <keyword type="function" name="cairo_win32_scaled_font_get_logical_to_device ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-logical-to-device" since="1.4"/> <keyword type="function" name="cairo_win32_scaled_font_get_device_to_logical ()" link="cairo-Win32-Fonts.html#cairo-win32-scaled-font-get-device-to-logical" since="1.4"/> + <keyword type="" name="" link="cairo-Win32-Fonts.html#id2648293"/> + <keyword type="" name="" link="cairo-Win32-Fonts.html#id2648294"/> <keyword type="typedef" name="cairo_surface_t" link="cairo-cairo-surface-t.html#cairo-surface-t"/> <keyword type="enum" name="enum cairo_content_t" link="cairo-cairo-surface-t.html#cairo-content-t"/> <keyword type="function" name="cairo_surface_create_similar ()" link="cairo-cairo-surface-t.html#cairo-surface-create-similar"/> @@ -278,6 +298,8 @@ <keyword type="function" name="cairo_surface_get_reference_count ()" link="cairo-cairo-surface-t.html#cairo-surface-get-reference-count" since="1.4"/> <keyword type="function" name="cairo_surface_set_user_data ()" link="cairo-cairo-surface-t.html#cairo-surface-set-user-data"/> <keyword type="function" name="cairo_surface_get_user_data ()" link="cairo-cairo-surface-t.html#cairo-surface-get-user-data"/> + <keyword type="" name="" link="cairo-cairo-surface-t.html#id2660302"/> + <keyword type="" name="" link="cairo-cairo-surface-t.html#id2660303"/> <keyword type="enum" name="enum cairo_format_t" link="cairo-Image-Surfaces.html#cairo-format-t"/> <keyword type="function" name="cairo_image_surface_create ()" link="cairo-Image-Surfaces.html#cairo-image-surface-create"/> <keyword type="function" name="cairo_image_surface_create_for_data ()" link="cairo-Image-Surfaces.html#cairo-image-surface-create-for-data"/> @@ -286,32 +308,44 @@ <keyword type="function" name="cairo_image_surface_get_width ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-width"/> <keyword type="function" name="cairo_image_surface_get_height ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-height"/> <keyword type="function" name="cairo_image_surface_get_stride ()" link="cairo-Image-Surfaces.html#cairo-image-surface-get-stride" since="1.2"/> + <keyword type="" name="" link="cairo-Image-Surfaces.html#id2656544"/> + <keyword type="" name="" link="cairo-Image-Surfaces.html#id2656545"/> <keyword type="function" name="cairo_pdf_surface_create ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-create" since="1.2"/> <keyword type="function" name="cairo_pdf_surface_create_for_stream ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-create-for-stream" since="1.2"/> <keyword type="function" name="cairo_pdf_surface_set_size ()" link="cairo-PDF-Surfaces.html#cairo-pdf-surface-set-size" since="1.2"/> + <keyword type="" name="" link="cairo-PDF-Surfaces.html#id2656676"/> + <keyword type="" name="" link="cairo-PDF-Surfaces.html#id2656677"/> <keyword type="function" name="cairo_image_surface_create_from_png ()" link="cairo-PNG-Support.html#cairo-image-surface-create-from-png"/> <keyword type="function" name="cairo_read_func_t ()" link="cairo-PNG-Support.html#cairo-read-func-t"/> <keyword type="function" name="cairo_image_surface_create_from_png_stream ()" link="cairo-PNG-Support.html#cairo-image-surface-create-from-png-stream"/> <keyword type="function" name="cairo_surface_write_to_png ()" link="cairo-PNG-Support.html#cairo-surface-write-to-png"/> <keyword type="function" name="cairo_write_func_t ()" link="cairo-PNG-Support.html#cairo-write-func-t"/> <keyword type="function" name="cairo_surface_write_to_png_stream ()" link="cairo-PNG-Support.html#cairo-surface-write-to-png-stream"/> + <keyword type="" name="" link="cairo-PNG-Support.html#id2654725"/> + <keyword type="" name="" link="cairo-PNG-Support.html#id2654726"/> <keyword type="function" name="cairo_ps_surface_create ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-create" since="1.2"/> <keyword type="function" name="cairo_ps_surface_create_for_stream ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-create-for-stream" since="1.2"/> <keyword type="function" name="cairo_ps_surface_set_size ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-set-size" since="1.2"/> <keyword type="function" name="cairo_ps_surface_dsc_begin_setup ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-setup" since="1.2"/> <keyword type="function" name="cairo_ps_surface_dsc_begin_page_setup ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-begin-page-setup" since="1.2"/> <keyword type="function" name="cairo_ps_surface_dsc_comment ()" link="cairo-PostScript-Surfaces.html#cairo-ps-surface-dsc-comment" since="1.2"/> + <keyword type="" name="" link="cairo-PostScript-Surfaces.html#id2663038"/> + <keyword type="" name="" link="cairo-PostScript-Surfaces.html#id2663039"/> <keyword type="function" name="cairo_win32_surface_create ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create"/> <keyword type="function" name="cairo_win32_surface_create_with_dib ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-dib" since="1.2"/> <keyword type="function" name="cairo_win32_surface_create_with_ddb ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-create-with-ddb" since="1.4"/> <keyword type="function" name="cairo_win32_surface_get_dc ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-get-dc" since="1.2"/> <keyword type="function" name="cairo_win32_surface_get_image ()" link="cairo-Win32-Surfaces.html#cairo-win32-surface-get-image" since="1.4"/> + <keyword type="" name="" link="cairo-Win32-Surfaces.html#id2660718"/> + <keyword type="" name="" link="cairo-Win32-Surfaces.html#id2660720"/> <keyword type="function" name="cairo_svg_surface_create ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-create" since="1.2"/> <keyword type="function" name="cairo_svg_surface_create_for_stream ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-create-for-stream" since="1.2"/> <keyword type="function" name="cairo_svg_surface_restrict_to_version ()" link="cairo-SVG-Surfaces.html#cairo-svg-surface-restrict-to-version" since="1.2"/> <keyword type="enum" name="enum cairo_svg_version_t" link="cairo-SVG-Surfaces.html#cairo-svg-version-t"/> <keyword type="function" name="cairo_svg_get_versions ()" link="cairo-SVG-Surfaces.html#cairo-svg-get-versions" since="1.2"/> <keyword type="function" name="cairo_svg_version_to_string ()" link="cairo-SVG-Surfaces.html#cairo-svg-version-to-string" since="1.2"/> + <keyword type="" name="" link="cairo-SVG-Surfaces.html#id2661900"/> + <keyword type="" name="" link="cairo-SVG-Surfaces.html#id2661901"/> <keyword type="function" name="cairo_xlib_surface_create ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-create"/> <keyword type="function" name="cairo_xlib_surface_create_for_bitmap ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-create-for-bitmap"/> <keyword type="function" name="cairo_xlib_surface_set_size ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-set-size"/> @@ -323,6 +357,8 @@ <keyword type="function" name="cairo_xlib_surface_get_width ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-width" since="1.2"/> <keyword type="function" name="cairo_xlib_surface_get_height ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-height" since="1.2"/> <keyword type="function" name="cairo_xlib_surface_get_depth ()" link="cairo-XLib-Surfaces.html#cairo-xlib-surface-get-depth" since="1.2"/> + <keyword type="" name="" link="cairo-XLib-Surfaces.html#id2666734"/> + <keyword type="" name="" link="cairo-XLib-Surfaces.html#id2666736"/> <keyword type="struct" name="cairo_matrix_t" link="cairo-cairo-matrix-t.html#cairo-matrix-t"/> <keyword type="function" name="cairo_matrix_init ()" link="cairo-cairo-matrix-t.html#cairo-matrix-init"/> <keyword type="function" name="cairo_matrix_init_identity ()" link="cairo-cairo-matrix-t.html#cairo-matrix-init-identity"/> @@ -336,11 +372,15 @@ <keyword type="function" name="cairo_matrix_multiply ()" link="cairo-cairo-matrix-t.html#cairo-matrix-multiply"/> <keyword type="function" name="cairo_matrix_transform_distance ()" link="cairo-cairo-matrix-t.html#cairo-matrix-transform-distance"/> <keyword type="function" name="cairo_matrix_transform_point ()" link="cairo-cairo-matrix-t.html#cairo-matrix-transform-point"/> + <keyword type="" name="" link="cairo-cairo-matrix-t.html#id2670198"/> + <keyword type="" name="" link="cairo-cairo-matrix-t.html#id2670199"/> <keyword type="enum" name="enum cairo_status_t" link="cairo-Error-Handling.html#cairo-status-t"/> <keyword type="function" name="cairo_status_to_string ()" link="cairo-Error-Handling.html#cairo-status-to-string"/> <keyword type="function" name="cairo_debug_reset_static_data ()" link="cairo-Error-Handling.html#cairo-debug-reset-static-data"/> - <keyword type="" name="Compatibility" link="cairo-Version-Information.html#id2651090"/> - <keyword type="" name="Examining the version" link="cairo-Version-Information.html#id2651129"/> + <keyword type="" name="" link="cairo-Error-Handling.html#id2665747"/> + <keyword type="" name="" link="cairo-Error-Handling.html#id2665748"/> + <keyword type="" name="Compatibility" link="cairo-Version-Information.html#id2664349"/> + <keyword type="" name="Examining the version" link="cairo-Version-Information.html#id2664387"/> <keyword type="macro" name="CAIRO_VERSION" link="cairo-Version-Information.html#CAIRO-VERSION:CAPS"/> <keyword type="macro" name="CAIRO_VERSION_MAJOR" link="cairo-Version-Information.html#CAIRO-VERSION-MAJOR:CAPS"/> <keyword type="macro" name="CAIRO_VERSION_MINOR" link="cairo-Version-Information.html#CAIRO-VERSION-MINOR:CAPS"/> @@ -349,8 +389,12 @@ <keyword type="macro" name="CAIRO_VERSION_ENCODE()" link="cairo-Version-Information.html#CAIRO-VERSION-ENCODE:CAPS"/> <keyword type="function" name="cairo_version ()" link="cairo-Version-Information.html#cairo-version"/> <keyword type="function" name="cairo_version_string ()" link="cairo-Version-Information.html#cairo-version-string"/> + <keyword type="" name="" link="cairo-Version-Information.html#id2666775"/> + <keyword type="" name="" link="cairo-Version-Information.html#id2666776"/> <keyword type="typedef" name="cairo_bool_t" link="cairo-Types.html#cairo-bool-t"/> <keyword type="struct" name="cairo_user_data_key_t" link="cairo-Types.html#cairo-user-data-key-t"/> <keyword type="function" name="cairo_destroy_func_t ()" link="cairo-Types.html#cairo-destroy-func-t"/> + <keyword type="" name="" link="cairo-Types.html#id2664531"/> + <keyword type="" name="" link="cairo-Types.html#id2664532"/> </functions> </book> diff --git a/doc/public/html/index-1.2.html b/doc/public/html/index-1.2.html index 18ba52c..6fc147d 100644 --- a/doc/public/html/index-1.2.html +++ b/doc/public/html/index-1.2.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Index of new symbols in 1.2</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="ix01.html" title="Index"> <link rel="next" href="index-1.4.html" title="Index of new symbols in 1.4"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -35,101 +35,101 @@ <div class="index"><div class="indexdiv"> <h3>C</h3> <dl> -<dt>cairo_font_face_get_type, <a href="cairo-cairo-font-face-t.html#id2622714">cairo_font_face_get_type ()</a> +<dt>cairo_font_face_get_type, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2594600">cairo_font_face_get_type ()</a> </dt> -<dt>cairo_font_type_t, <a href="cairo-cairo-font-face-t.html#id2622512">enum cairo_font_type_t</a> +<dt>cairo_font_type_t, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2621893">enum cairo_font_type_t</a> </dt> -<dt>cairo_get_group_target, <a href="cairo-cairo-t.html#id2614739">cairo_get_group_target ()</a> +<dt>cairo_get_group_target, <a class="indexterm" href="cairo-cairo-t.html#id2632174">cairo_get_group_target ()</a> </dt> -<dt>cairo_image_surface_get_data, <a href="cairo-Image-Surfaces.html#id2638481">cairo_image_surface_get_data ()</a> +<dt>cairo_image_surface_get_data, <a class="indexterm" href="cairo-Image-Surfaces.html#id2657901">cairo_image_surface_get_data ()</a> </dt> -<dt>cairo_image_surface_get_format, <a href="cairo-Image-Surfaces.html#id2638577">cairo_image_surface_get_format ()</a> +<dt>cairo_image_surface_get_format, <a class="indexterm" href="cairo-Image-Surfaces.html#id2658000">cairo_image_surface_get_format ()</a> </dt> -<dt>cairo_image_surface_get_stride, <a href="cairo-Image-Surfaces.html#id2636344">cairo_image_surface_get_stride ()</a> +<dt>cairo_image_surface_get_stride, <a class="indexterm" href="cairo-Image-Surfaces.html#id2653841">cairo_image_surface_get_stride ()</a> </dt> -<dt>cairo_new_sub_path, <a href="cairo-Paths.html#id2561862">cairo_new_sub_path ()</a> +<dt>cairo_new_sub_path, <a class="indexterm" href="cairo-Paths.html#id2579229">cairo_new_sub_path ()</a> </dt> -<dt>cairo_pattern_get_type, <a href="cairo-Patterns.html#id2627013">cairo_pattern_get_type ()</a> +<dt>cairo_pattern_get_type, <a class="indexterm" href="cairo-Patterns.html#id2644448">cairo_pattern_get_type ()</a> </dt> -<dt>cairo_pattern_type_t, <a href="cairo-Patterns.html#id2626785">enum cairo_pattern_type_t</a> +<dt>cairo_pattern_type_t, <a class="indexterm" href="cairo-Patterns.html#id2644221">enum cairo_pattern_type_t</a> </dt> -<dt>cairo_pdf_surface_create, <a href="cairo-PDF-Surfaces.html#id2640178">cairo_pdf_surface_create ()</a> +<dt>cairo_pdf_surface_create, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2596618">cairo_pdf_surface_create ()</a> </dt> -<dt>cairo_pdf_surface_create_for_stream, <a href="cairo-PDF-Surfaces.html#id2638626">cairo_pdf_surface_create_for_stream ()</a> +<dt>cairo_pdf_surface_create_for_stream, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2657687">cairo_pdf_surface_create_for_stream ()</a> </dt> -<dt>cairo_pdf_surface_set_size, <a href="cairo-PDF-Surfaces.html#id2639157">cairo_pdf_surface_set_size ()</a> +<dt>cairo_pdf_surface_set_size, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2656183">cairo_pdf_surface_set_size ()</a> </dt> -<dt>cairo_pop_group, <a href="cairo-cairo-t.html#id2586256">cairo_pop_group ()</a> +<dt>cairo_pop_group, <a class="indexterm" href="cairo-cairo-t.html#id2631916">cairo_pop_group ()</a> </dt> -<dt>cairo_pop_group_to_source, <a href="cairo-cairo-t.html#id2614604">cairo_pop_group_to_source ()</a> +<dt>cairo_pop_group_to_source, <a class="indexterm" href="cairo-cairo-t.html#id2632040">cairo_pop_group_to_source ()</a> </dt> -<dt>cairo_ps_surface_create, <a href="cairo-PostScript-Surfaces.html#id2636851">cairo_ps_surface_create ()</a> +<dt>cairo_ps_surface_create, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2654338">cairo_ps_surface_create ()</a> </dt> -<dt>cairo_ps_surface_create_for_stream, <a href="cairo-PostScript-Surfaces.html#id2638281">cairo_ps_surface_create_for_stream ()</a> +<dt>cairo_ps_surface_create_for_stream, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2655771">cairo_ps_surface_create_for_stream ()</a> </dt> -<dt>cairo_ps_surface_dsc_begin_page_setup, <a href="cairo-PostScript-Surfaces.html#id2645031">cairo_ps_surface_dsc_begin_page_setup ()</a> +<dt>cairo_ps_surface_dsc_begin_page_setup, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2662527">cairo_ps_surface_dsc_begin_page_setup ()</a> </dt> -<dt>cairo_ps_surface_dsc_begin_setup, <a href="cairo-PostScript-Surfaces.html#id2637542">cairo_ps_surface_dsc_begin_setup ()</a> +<dt>cairo_ps_surface_dsc_begin_setup, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2655048">cairo_ps_surface_dsc_begin_setup ()</a> </dt> -<dt>cairo_ps_surface_dsc_comment, <a href="cairo-PostScript-Surfaces.html#id2645133">cairo_ps_surface_dsc_comment ()</a> +<dt>cairo_ps_surface_dsc_comment, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2662627">cairo_ps_surface_dsc_comment ()</a> </dt> -<dt>cairo_ps_surface_set_size, <a href="cairo-PostScript-Surfaces.html#id2637400">cairo_ps_surface_set_size ()</a> +<dt>cairo_ps_surface_set_size, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2654905">cairo_ps_surface_set_size ()</a> </dt> -<dt>cairo_push_group, <a href="cairo-cairo-t.html#id2614140">cairo_push_group ()</a> +<dt>cairo_push_group, <a class="indexterm" href="cairo-cairo-t.html#id2631569">cairo_push_group ()</a> </dt> -<dt>cairo_push_group_with_content, <a href="cairo-cairo-t.html#id2614337">cairo_push_group_with_content ()</a> +<dt>cairo_push_group_with_content, <a class="indexterm" href="cairo-cairo-t.html#id2631766">cairo_push_group_with_content ()</a> </dt> -<dt>cairo_scaled_font_get_ctm, <a href="cairo-Scaled-Fonts.html#id2633372">cairo_scaled_font_get_ctm ()</a> +<dt>cairo_scaled_font_get_ctm, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650860">cairo_scaled_font_get_ctm ()</a> </dt> -<dt>cairo_scaled_font_get_font_face, <a href="cairo-Scaled-Fonts.html#id2633073">cairo_scaled_font_get_font_face ()</a> +<dt>cairo_scaled_font_get_font_face, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650560">cairo_scaled_font_get_font_face ()</a> </dt> -<dt>cairo_scaled_font_get_font_matrix, <a href="cairo-Scaled-Fonts.html#id2633269">cairo_scaled_font_get_font_matrix ()</a> +<dt>cairo_scaled_font_get_font_matrix, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650757">cairo_scaled_font_get_font_matrix ()</a> </dt> -<dt>cairo_scaled_font_get_font_options, <a href="cairo-Scaled-Fonts.html#id2633166">cairo_scaled_font_get_font_options ()</a> +<dt>cairo_scaled_font_get_font_options, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650665">cairo_scaled_font_get_font_options ()</a> </dt> -<dt>cairo_scaled_font_get_type, <a href="cairo-Scaled-Fonts.html#id2633471">cairo_scaled_font_get_type ()</a> +<dt>cairo_scaled_font_get_type, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650959">cairo_scaled_font_get_type ()</a> </dt> -<dt>cairo_scaled_font_text_extents, <a href="cairo-Scaled-Fonts.html#id2632748">cairo_scaled_font_text_extents ()</a> +<dt>cairo_scaled_font_text_extents, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650204">cairo_scaled_font_text_extents ()</a> </dt> -<dt>cairo_set_scaled_font, <a href="cairo-Text.html#id2628265">cairo_set_scaled_font ()</a> +<dt>cairo_set_scaled_font, <a class="indexterm" href="cairo-Text.html#id2645717">cairo_set_scaled_font ()</a> </dt> -<dt>cairo_surface_get_content, <a href="cairo-cairo-surface-t.html#id2641228">cairo_surface_get_content ()</a> +<dt>cairo_surface_get_content, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658708">cairo_surface_get_content ()</a> </dt> -<dt>cairo_surface_get_device_offset, <a href="cairo-cairo-surface-t.html#id2641700">cairo_surface_get_device_offset ()</a> +<dt>cairo_surface_get_device_offset, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659180">cairo_surface_get_device_offset ()</a> </dt> -<dt>cairo_surface_get_type, <a href="cairo-cairo-surface-t.html#id2642329">cairo_surface_get_type ()</a> +<dt>cairo_surface_get_type, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659809">cairo_surface_get_type ()</a> </dt> -<dt>cairo_surface_set_fallback_resolution, <a href="cairo-cairo-surface-t.html#id2641822">cairo_surface_set_fallback_resolution ()</a> +<dt>cairo_surface_set_fallback_resolution, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659302">cairo_surface_set_fallback_resolution ()</a> </dt> -<dt>cairo_surface_type_t, <a href="cairo-cairo-surface-t.html#id2641981">enum cairo_surface_type_t</a> +<dt>cairo_surface_type_t, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659460">enum cairo_surface_type_t</a> </dt> -<dt>cairo_svg_get_versions, <a href="cairo-SVG-Surfaces.html#id2644186">cairo_svg_get_versions ()</a> +<dt>cairo_svg_get_versions, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661689">cairo_svg_get_versions ()</a> </dt> -<dt>cairo_svg_surface_create, <a href="cairo-SVG-Surfaces.html#id2643368">cairo_svg_surface_create ()</a> +<dt>cairo_svg_surface_create, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2660838">cairo_svg_surface_create ()</a> </dt> -<dt>cairo_svg_surface_create_for_stream, <a href="cairo-SVG-Surfaces.html#id2643514">cairo_svg_surface_create_for_stream ()</a> +<dt>cairo_svg_surface_create_for_stream, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2660984">cairo_svg_surface_create_for_stream ()</a> </dt> -<dt>cairo_svg_surface_restrict_to_version, <a href="cairo-SVG-Surfaces.html#id2643700">cairo_svg_surface_restrict_to_version ()</a> +<dt>cairo_svg_surface_restrict_to_version, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661170">cairo_svg_surface_restrict_to_version ()</a> </dt> -<dt>cairo_svg_version_to_string, <a href="cairo-SVG-Surfaces.html#id2644289">cairo_svg_version_to_string ()</a> +<dt>cairo_svg_version_to_string, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661792">cairo_svg_version_to_string ()</a> </dt> -<dt>cairo_win32_surface_create_with_dib, <a href="cairo-Win32-Surfaces.html#id2644981">cairo_win32_surface_create_with_dib ()</a> +<dt>cairo_win32_surface_create_with_dib, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2662454">cairo_win32_surface_create_with_dib ()</a> </dt> -<dt>cairo_win32_surface_get_dc, <a href="cairo-Win32-Surfaces.html#id2643047">cairo_win32_surface_get_dc ()</a> +<dt>cairo_win32_surface_get_dc, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660517">cairo_win32_surface_get_dc ()</a> </dt> -<dt>cairo_xlib_surface_get_depth, <a href="cairo-XLib-Surfaces.html#id2649252">cairo_xlib_surface_get_depth ()</a> +<dt>cairo_xlib_surface_get_depth, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666649">cairo_xlib_surface_get_depth ()</a> </dt> -<dt>cairo_xlib_surface_get_display, <a href="cairo-XLib-Surfaces.html#id2644768">cairo_xlib_surface_get_display ()</a> +<dt>cairo_xlib_surface_get_display, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666031">cairo_xlib_surface_get_display ()</a> </dt> -<dt>cairo_xlib_surface_get_drawable, <a href="cairo-XLib-Surfaces.html#id2648888">cairo_xlib_surface_get_drawable ()</a> +<dt>cairo_xlib_surface_get_drawable, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666319">cairo_xlib_surface_get_drawable ()</a> </dt> -<dt>cairo_xlib_surface_get_height, <a href="cairo-XLib-Surfaces.html#id2649161">cairo_xlib_surface_get_height ()</a> +<dt>cairo_xlib_surface_get_height, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666566">cairo_xlib_surface_get_height ()</a> </dt> -<dt>cairo_xlib_surface_get_screen, <a href="cairo-XLib-Surfaces.html#id2648666">cairo_xlib_surface_get_screen ()</a> +<dt>cairo_xlib_surface_get_screen, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666111">cairo_xlib_surface_get_screen ()</a> </dt> -<dt>cairo_xlib_surface_get_visual, <a href="cairo-XLib-Surfaces.html#id2648978">cairo_xlib_surface_get_visual ()</a> +<dt>cairo_xlib_surface_get_visual, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666401">cairo_xlib_surface_get_visual ()</a> </dt> -<dt>cairo_xlib_surface_get_width, <a href="cairo-XLib-Surfaces.html#id2649069">cairo_xlib_surface_get_width ()</a> +<dt>cairo_xlib_surface_get_width, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666483">cairo_xlib_surface_get_width ()</a> </dt> </dl> </div></div> diff --git a/doc/public/html/index-1.4.html b/doc/public/html/index-1.4.html index da83967..58ceaa4 100644 --- a/doc/public/html/index-1.4.html +++ b/doc/public/html/index-1.4.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Index of new symbols in 1.4</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="index-1.2.html" title="Index of new symbols in 1.2"> <link rel="next" href="language-bindings.html" title="Appendix A. Creating a language binding for cairo"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -35,63 +35,63 @@ <div class="index"><div class="indexdiv"> <h3>C</h3> <dl> -<dt>cairo_clip_extents, <a href="cairo-cairo-t.html#id2618435">cairo_clip_extents ()</a> +<dt>cairo_clip_extents, <a class="indexterm" href="cairo-cairo-t.html#id2635863">cairo_clip_extents ()</a> </dt> -<dt>cairo_copy_clip_rectangle_list, <a href="cairo-cairo-t.html#id2619063">cairo_copy_clip_rectangle_list ()</a> +<dt>cairo_copy_clip_rectangle_list, <a class="indexterm" href="cairo-cairo-t.html#id2636491">cairo_copy_clip_rectangle_list ()</a> </dt> -<dt>cairo_font_face_get_reference_count, <a href="cairo-cairo-font-face-t.html#id2577244">cairo_font_face_get_reference_count ()</a> +<dt>cairo_font_face_get_reference_count, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2594694">cairo_font_face_get_reference_count ()</a> </dt> -<dt>cairo_get_dash, <a href="cairo-cairo-t.html#id2616147">cairo_get_dash ()</a> +<dt>cairo_get_dash, <a class="indexterm" href="cairo-cairo-t.html#id2633582">cairo_get_dash ()</a> </dt> -<dt>cairo_get_dash_count, <a href="cairo-cairo-t.html#id2616040">cairo_get_dash_count ()</a> +<dt>cairo_get_dash_count, <a class="indexterm" href="cairo-cairo-t.html#id2633476">cairo_get_dash_count ()</a> </dt> -<dt>cairo_get_reference_count, <a href="cairo-cairo-t.html#id2620980">cairo_get_reference_count ()</a> +<dt>cairo_get_reference_count, <a class="indexterm" href="cairo-cairo-t.html#id2638408">cairo_get_reference_count ()</a> </dt> -<dt>cairo_get_scaled_font, <a href="cairo-Text.html#id2628396">cairo_get_scaled_font ()</a> +<dt>cairo_get_scaled_font, <a class="indexterm" href="cairo-Text.html#id2645848">cairo_get_scaled_font ()</a> </dt> -<dt>cairo_get_user_data, <a href="cairo-cairo-t.html#id2621316">cairo_get_user_data ()</a> +<dt>cairo_get_user_data, <a class="indexterm" href="cairo-cairo-t.html#id2638744">cairo_get_user_data ()</a> </dt> -<dt>cairo_pattern_get_color_stop_count, <a href="cairo-Patterns.html#id2623599">cairo_pattern_get_color_stop_count ()</a> +<dt>cairo_pattern_get_color_stop_count, <a class="indexterm" href="cairo-Patterns.html#id2641038">cairo_pattern_get_color_stop_count ()</a> </dt> -<dt>cairo_pattern_get_color_stop_rgba, <a href="cairo-Patterns.html#id2623733">cairo_pattern_get_color_stop_rgba ()</a> +<dt>cairo_pattern_get_color_stop_rgba, <a class="indexterm" href="cairo-Patterns.html#id2641173">cairo_pattern_get_color_stop_rgba ()</a> </dt> -<dt>cairo_pattern_get_linear_points, <a href="cairo-Patterns.html#id2624961">cairo_pattern_get_linear_points ()</a> +<dt>cairo_pattern_get_linear_points, <a class="indexterm" href="cairo-Patterns.html#id2642401">cairo_pattern_get_linear_points ()</a> </dt> -<dt>cairo_pattern_get_radial_circles, <a href="cairo-Patterns.html#id2625410">cairo_pattern_get_radial_circles ()</a> +<dt>cairo_pattern_get_radial_circles, <a class="indexterm" href="cairo-Patterns.html#id2642849">cairo_pattern_get_radial_circles ()</a> </dt> -<dt>cairo_pattern_get_reference_count, <a href="cairo-Patterns.html#id2627119">cairo_pattern_get_reference_count ()</a> +<dt>cairo_pattern_get_reference_count, <a class="indexterm" href="cairo-Patterns.html#id2644554">cairo_pattern_get_reference_count ()</a> </dt> -<dt>cairo_pattern_get_rgba, <a href="cairo-Patterns.html#id2624324">cairo_pattern_get_rgba ()</a> +<dt>cairo_pattern_get_rgba, <a class="indexterm" href="cairo-Patterns.html#id2641763">cairo_pattern_get_rgba ()</a> </dt> -<dt>cairo_pattern_get_surface, <a href="cairo-Patterns.html#id2624630">cairo_pattern_get_surface ()</a> +<dt>cairo_pattern_get_surface, <a class="indexterm" href="cairo-Patterns.html#id2642070">cairo_pattern_get_surface ()</a> </dt> -<dt>cairo_pattern_get_user_data, <a href="cairo-Patterns.html#id2627456">cairo_pattern_get_user_data ()</a> +<dt>cairo_pattern_get_user_data, <a class="indexterm" href="cairo-Patterns.html#id2644892">cairo_pattern_get_user_data ()</a> </dt> -<dt>cairo_pattern_set_user_data, <a href="cairo-Patterns.html#id2627225">cairo_pattern_set_user_data ()</a> +<dt>cairo_pattern_set_user_data, <a class="indexterm" href="cairo-Patterns.html#id2644660">cairo_pattern_set_user_data ()</a> </dt> -<dt>cairo_rectangle_list_destroy, <a href="cairo-cairo-t.html#id2618965">cairo_rectangle_list_destroy ()</a> +<dt>cairo_rectangle_list_destroy, <a class="indexterm" href="cairo-cairo-t.html#id2636393">cairo_rectangle_list_destroy ()</a> </dt> -<dt>cairo_rectangle_list_t, <a href="cairo-cairo-t.html#id2618850">cairo_rectangle_list_t</a> +<dt>cairo_rectangle_list_t, <a class="indexterm" href="cairo-cairo-t.html#id2636278">cairo_rectangle_list_t</a> </dt> -<dt>cairo_rectangle_t, <a href="cairo-cairo-t.html#id2618718">cairo_rectangle_t</a> +<dt>cairo_rectangle_t, <a class="indexterm" href="cairo-cairo-t.html#id2636146">cairo_rectangle_t</a> </dt> -<dt>cairo_scaled_font_get_reference_count, <a href="cairo-Scaled-Fonts.html#id2633562">cairo_scaled_font_get_reference_count ()</a> +<dt>cairo_scaled_font_get_reference_count, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651050">cairo_scaled_font_get_reference_count ()</a> </dt> -<dt>cairo_scaled_font_get_user_data, <a href="cairo-Scaled-Fonts.html#id2633864">cairo_scaled_font_get_user_data ()</a> +<dt>cairo_scaled_font_get_user_data, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651352">cairo_scaled_font_get_user_data ()</a> </dt> -<dt>cairo_scaled_font_set_user_data, <a href="cairo-Scaled-Fonts.html#id2633659">cairo_scaled_font_set_user_data ()</a> +<dt>cairo_scaled_font_set_user_data, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651147">cairo_scaled_font_set_user_data ()</a> </dt> -<dt>cairo_set_user_data, <a href="cairo-cairo-t.html#id2621085">cairo_set_user_data ()</a> +<dt>cairo_set_user_data, <a class="indexterm" href="cairo-cairo-t.html#id2638514">cairo_set_user_data ()</a> </dt> -<dt>cairo_surface_get_reference_count, <a href="cairo-cairo-surface-t.html#id2642420">cairo_surface_get_reference_count ()</a> +<dt>cairo_surface_get_reference_count, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659900">cairo_surface_get_reference_count ()</a> </dt> -<dt>cairo_win32_scaled_font_get_device_to_logical, <a href="cairo-Win32-Fonts.html#id2629839">cairo_win32_scaled_font_get_device_to_logical ()</a> +<dt>cairo_win32_scaled_font_get_device_to_logical, <a class="indexterm" href="cairo-Win32-Fonts.html#id2648187">cairo_win32_scaled_font_get_device_to_logical ()</a> </dt> -<dt>cairo_win32_scaled_font_get_logical_to_device, <a href="cairo-Win32-Fonts.html#id2629735">cairo_win32_scaled_font_get_logical_to_device ()</a> +<dt>cairo_win32_scaled_font_get_logical_to_device, <a class="indexterm" href="cairo-Win32-Fonts.html#id2648083">cairo_win32_scaled_font_get_logical_to_device ()</a> </dt> -<dt>cairo_win32_surface_create_with_ddb, <a href="cairo-Win32-Surfaces.html#id2642897">cairo_win32_surface_create_with_ddb ()</a> +<dt>cairo_win32_surface_create_with_ddb, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660371">cairo_win32_surface_create_with_ddb ()</a> </dt> -<dt>cairo_win32_surface_get_image, <a href="cairo-Win32-Surfaces.html#id2643138">cairo_win32_surface_get_image ()</a> +<dt>cairo_win32_surface_get_image, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660608">cairo_win32_surface_get_image ()</a> </dt> </dl> </div></div> diff --git a/doc/public/html/index.html b/doc/public/html/index.html index 29ee8ba..114c639 100644 --- a/doc/public/html/index.html +++ b/doc/public/html/index.html @@ -3,10 +3,10 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Cairo: A Vector Graphics Library</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="next" href="pt01.html" title="Part I. Tutorial"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -23,7 +23,7 @@ <div class="titlepage"> <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Cairo: A Vector Graphics Library</p></th></tr></table></div> -<div><p class="releaseinfo">for Cairo 1.4.10 +<div><p class="releaseinfo">for Cairo 1.4.12 </p></div> </div> <hr> diff --git a/doc/public/html/ix01.html b/doc/public/html/ix01.html index bb6ab84..e757087 100644 --- a/doc/public/html/ix01.html +++ b/doc/public/html/ix01.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Index</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="cairo-Types.html" title="Types"> <link rel="next" href="index-1.2.html" title="Index of new symbols in 1.2"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -31,611 +31,611 @@ </tr></table> <div class="index"> <div class="titlepage"><div><div><h2 class="title"> -<a name="id2510602"></a>Index</h2></div></div></div> +<a name="id2528119"></a>Index</h2></div></div></div> <div class="index"> <div class="indexdiv"> <h3></h3> -<dl><dt>, <a href="cairo-cairo-matrix-t.html#id2650375">Description</a> +<dl><dt>, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2663271">Description</a> </dt></dl> </div> <div class="indexdiv"> <h3>C</h3> <dl> -<dt>cairo_antialias_t, <a href="cairo-cairo-t.html#id2615535">enum cairo_antialias_t</a> +<dt>cairo_antialias_t, <a class="indexterm" href="cairo-cairo-t.html#id2632970">enum cairo_antialias_t</a> </dt> -<dt>cairo_append_path, <a href="cairo-Paths.html#id2561333">cairo_append_path ()</a> +<dt>cairo_append_path, <a class="indexterm" href="cairo-Paths.html#id2578699">cairo_append_path ()</a> </dt> -<dt>cairo_arc, <a href="cairo-Paths.html#id2562112">cairo_arc ()</a> +<dt>cairo_arc, <a class="indexterm" href="cairo-Paths.html#id2579479">cairo_arc ()</a> </dt> -<dt>cairo_arc_negative, <a href="cairo-Paths.html#id2562422">cairo_arc_negative ()</a> +<dt>cairo_arc_negative, <a class="indexterm" href="cairo-Paths.html#id2579789">cairo_arc_negative ()</a> </dt> -<dt>cairo_bool_t, <a href="cairo-Types.html#id2580603">cairo_bool_t</a> +<dt>cairo_bool_t, <a class="indexterm" href="cairo-Types.html#id2666785">cairo_bool_t</a> </dt> -<dt>cairo_clip, <a href="cairo-cairo-t.html#id2618124">cairo_clip ()</a> +<dt>cairo_clip, <a class="indexterm" href="cairo-cairo-t.html#id2635552">cairo_clip ()</a> </dt> -<dt>cairo_clip_extents, <a href="cairo-cairo-t.html#id2618435">cairo_clip_extents ()</a> +<dt>cairo_clip_extents, <a class="indexterm" href="cairo-cairo-t.html#id2635863">cairo_clip_extents ()</a> </dt> -<dt>cairo_clip_preserve, <a href="cairo-cairo-t.html#id2618274">cairo_clip_preserve ()</a> +<dt>cairo_clip_preserve, <a class="indexterm" href="cairo-cairo-t.html#id2635702">cairo_clip_preserve ()</a> </dt> -<dt>cairo_close_path, <a href="cairo-Paths.html#id2561985">cairo_close_path ()</a> +<dt>cairo_close_path, <a class="indexterm" href="cairo-Paths.html#id2579352">cairo_close_path ()</a> </dt> -<dt>cairo_content_t, <a href="cairo-cairo-surface-t.html#id2630094">enum cairo_content_t</a> +<dt>cairo_content_t, <a class="indexterm" href="cairo-cairo-surface-t.html#id2648447">enum cairo_content_t</a> </dt> -<dt>cairo_copy_clip_rectangle_list, <a href="cairo-cairo-t.html#id2619063">cairo_copy_clip_rectangle_list ()</a> +<dt>cairo_copy_clip_rectangle_list, <a class="indexterm" href="cairo-cairo-t.html#id2636491">cairo_copy_clip_rectangle_list ()</a> </dt> -<dt>cairo_copy_page, <a href="cairo-cairo-t.html#id2620829">cairo_copy_page ()</a> +<dt>cairo_copy_page, <a class="indexterm" href="cairo-cairo-t.html#id2638258">cairo_copy_page ()</a> </dt> -<dt>cairo_copy_path, <a href="cairo-Paths.html#id2609471">cairo_copy_path ()</a> +<dt>cairo_copy_path, <a class="indexterm" href="cairo-Paths.html#id2626837">cairo_copy_path ()</a> </dt> -<dt>cairo_copy_path_flat, <a href="cairo-Paths.html#id2561006">cairo_copy_path_flat ()</a> +<dt>cairo_copy_path_flat, <a class="indexterm" href="cairo-Paths.html#id2578373">cairo_copy_path_flat ()</a> </dt> -<dt>cairo_create, <a href="cairo-cairo-t.html#id2613236">cairo_create ()</a> +<dt>cairo_create, <a class="indexterm" href="cairo-cairo-t.html#id2630665">cairo_create ()</a> </dt> -<dt>cairo_curve_to, <a href="cairo-Paths.html#id2562654">cairo_curve_to ()</a> +<dt>cairo_curve_to, <a class="indexterm" href="cairo-Paths.html#id2580020">cairo_curve_to ()</a> </dt> -<dt>cairo_debug_reset_static_data, <a href="cairo-Error-Handling.html#id2649377">cairo_debug_reset_static_data ()</a> +<dt>cairo_debug_reset_static_data, <a class="indexterm" href="cairo-Error-Handling.html#id2665684">cairo_debug_reset_static_data ()</a> </dt> -<dt>cairo_destroy, <a href="cairo-cairo-t.html#id2613554">cairo_destroy ()</a> +<dt>cairo_destroy, <a class="indexterm" href="cairo-cairo-t.html#id2630982">cairo_destroy ()</a> </dt> -<dt>cairo_destroy_func_t, <a href="cairo-Types.html#id2649626">cairo_destroy_func_t ()</a> +<dt>cairo_destroy_func_t, <a class="indexterm" href="cairo-Types.html#id2664460">cairo_destroy_func_t ()</a> </dt> -<dt>cairo_device_to_user, <a href="cairo-Transformations.html#id2567068">cairo_device_to_user ()</a> +<dt>cairo_device_to_user, <a class="indexterm" href="cairo-Transformations.html#id2627502">cairo_device_to_user ()</a> </dt> -<dt>cairo_device_to_user_distance, <a href="cairo-Transformations.html#id2567173">cairo_device_to_user_distance ()</a> +<dt>cairo_device_to_user_distance, <a class="indexterm" href="cairo-Transformations.html#id2627606">cairo_device_to_user_distance ()</a> </dt> -<dt>cairo_extend_t, <a href="cairo-Patterns.html#id2625984">enum cairo_extend_t</a> +<dt>cairo_extend_t, <a class="indexterm" href="cairo-Patterns.html#id2643423">enum cairo_extend_t</a> </dt> -<dt>cairo_fill, <a href="cairo-cairo-t.html#id2619171">cairo_fill ()</a> +<dt>cairo_fill, <a class="indexterm" href="cairo-cairo-t.html#id2636600">cairo_fill ()</a> </dt> -<dt>cairo_fill_extents, <a href="cairo-cairo-t.html#id2619356">cairo_fill_extents ()</a> +<dt>cairo_fill_extents, <a class="indexterm" href="cairo-cairo-t.html#id2636784">cairo_fill_extents ()</a> </dt> -<dt>cairo_fill_preserve, <a href="cairo-cairo-t.html#id2619257">cairo_fill_preserve ()</a> +<dt>cairo_fill_preserve, <a class="indexterm" href="cairo-cairo-t.html#id2636685">cairo_fill_preserve ()</a> </dt> -<dt>cairo_fill_rule_t, <a href="cairo-cairo-t.html#id2616296">enum cairo_fill_rule_t</a> +<dt>cairo_fill_rule_t, <a class="indexterm" href="cairo-cairo-t.html#id2633731">enum cairo_fill_rule_t</a> </dt> -<dt>cairo_filter_t, <a href="cairo-Patterns.html#id2626291">enum cairo_filter_t</a> +<dt>cairo_filter_t, <a class="indexterm" href="cairo-Patterns.html#id2643727">enum cairo_filter_t</a> </dt> -<dt>cairo_font_extents, <a href="cairo-Text.html#id2628759">cairo_font_extents ()</a> +<dt>cairo_font_extents, <a class="indexterm" href="cairo-Text.html#id2646210">cairo_font_extents ()</a> </dt> -<dt>cairo_font_extents_t, <a href="cairo-Scaled-Fonts.html#id2632233">cairo_font_extents_t</a> +<dt>cairo_font_extents_t, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2649689">cairo_font_extents_t</a> </dt> -<dt>cairo_font_face_destroy, <a href="cairo-cairo-font-face-t.html#id2576927">cairo_font_face_destroy ()</a> +<dt>cairo_font_face_destroy, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2621708">cairo_font_face_destroy ()</a> </dt> -<dt>cairo_font_face_get_reference_count, <a href="cairo-cairo-font-face-t.html#id2577244">cairo_font_face_get_reference_count ()</a> +<dt>cairo_font_face_get_reference_count, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2594694">cairo_font_face_get_reference_count ()</a> </dt> -<dt>cairo_font_face_get_type, <a href="cairo-cairo-font-face-t.html#id2622714">cairo_font_face_get_type ()</a> +<dt>cairo_font_face_get_type, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2594600">cairo_font_face_get_type ()</a> </dt> -<dt>cairo_font_face_get_user_data, <a href="cairo-cairo-font-face-t.html#id2621593">cairo_font_face_get_user_data ()</a> +<dt>cairo_font_face_get_user_data, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2646720">cairo_font_face_get_user_data ()</a> </dt> -<dt>cairo_font_face_reference, <a href="cairo-cairo-font-face-t.html#id2560721">cairo_font_face_reference ()</a> +<dt>cairo_font_face_reference, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2581948">cairo_font_face_reference ()</a> </dt> -<dt>cairo_font_face_set_user_data, <a href="cairo-cairo-font-face-t.html#id2577348">cairo_font_face_set_user_data ()</a> +<dt>cairo_font_face_set_user_data, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2594797">cairo_font_face_set_user_data ()</a> </dt> -<dt>cairo_font_face_status, <a href="cairo-cairo-font-face-t.html#id2577016">cairo_font_face_status ()</a> +<dt>cairo_font_face_status, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2621797">cairo_font_face_status ()</a> </dt> -<dt>cairo_font_face_t, <a href="cairo-cairo-font-face-t.html#id2560597">cairo_font_face_t</a> +<dt>cairo_font_face_t, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2640489">cairo_font_face_t</a> </dt> -<dt>cairo_font_options_copy, <a href="cairo-Font-Options.html#id2631823">cairo_font_options_copy ()</a> +<dt>cairo_font_options_copy, <a class="indexterm" href="cairo-Font-Options.html#id2639063">cairo_font_options_copy ()</a> </dt> -<dt>cairo_font_options_create, <a href="cairo-Font-Options.html#id2631744">cairo_font_options_create ()</a> +<dt>cairo_font_options_create, <a class="indexterm" href="cairo-Font-Options.html#id2638983">cairo_font_options_create ()</a> </dt> -<dt>cairo_font_options_destroy, <a href="cairo-Font-Options.html#id2610082">cairo_font_options_destroy ()</a> +<dt>cairo_font_options_destroy, <a class="indexterm" href="cairo-Font-Options.html#id2639175">cairo_font_options_destroy ()</a> </dt> -<dt>cairo_font_options_equal, <a href="cairo-Font-Options.html#id2634884">cairo_font_options_equal ()</a> +<dt>cairo_font_options_equal, <a class="indexterm" href="cairo-Font-Options.html#id2652358">cairo_font_options_equal ()</a> </dt> -<dt>cairo_font_options_get_antialias, <a href="cairo-Font-Options.html#id2635093">cairo_font_options_get_antialias ()</a> +<dt>cairo_font_options_get_antialias, <a class="indexterm" href="cairo-Font-Options.html#id2652566">cairo_font_options_get_antialias ()</a> </dt> -<dt>cairo_font_options_get_hint_metrics, <a href="cairo-Font-Options.html#id2636018">cairo_font_options_get_hint_metrics ()</a> +<dt>cairo_font_options_get_hint_metrics, <a class="indexterm" href="cairo-Font-Options.html#id2653511">cairo_font_options_get_hint_metrics ()</a> </dt> -<dt>cairo_font_options_get_hint_style, <a href="cairo-Font-Options.html#id2635745">cairo_font_options_get_hint_style ()</a> +<dt>cairo_font_options_get_hint_style, <a class="indexterm" href="cairo-Font-Options.html#id2653239">cairo_font_options_get_hint_style ()</a> </dt> -<dt>cairo_font_options_get_subpixel_order, <a href="cairo-Font-Options.html#id2635421">cairo_font_options_get_subpixel_order ()</a> +<dt>cairo_font_options_get_subpixel_order, <a class="indexterm" href="cairo-Font-Options.html#id2652924">cairo_font_options_get_subpixel_order ()</a> </dt> -<dt>cairo_font_options_hash, <a href="cairo-Font-Options.html#id2634807">cairo_font_options_hash ()</a> +<dt>cairo_font_options_hash, <a class="indexterm" href="cairo-Font-Options.html#id2652281">cairo_font_options_hash ()</a> </dt> -<dt>cairo_font_options_merge, <a href="cairo-Font-Options.html#id2610270">cairo_font_options_merge ()</a> +<dt>cairo_font_options_merge, <a class="indexterm" href="cairo-Font-Options.html#id2639363">cairo_font_options_merge ()</a> </dt> -<dt>cairo_font_options_set_antialias, <a href="cairo-Font-Options.html#id2635000">cairo_font_options_set_antialias ()</a> +<dt>cairo_font_options_set_antialias, <a class="indexterm" href="cairo-Font-Options.html#id2652474">cairo_font_options_set_antialias ()</a> </dt> -<dt>cairo_font_options_set_hint_metrics, <a href="cairo-Font-Options.html#id2635926">cairo_font_options_set_hint_metrics ()</a> +<dt>cairo_font_options_set_hint_metrics, <a class="indexterm" href="cairo-Font-Options.html#id2653420">cairo_font_options_set_hint_metrics ()</a> </dt> -<dt>cairo_font_options_set_hint_style, <a href="cairo-Font-Options.html#id2635653">cairo_font_options_set_hint_style ()</a> +<dt>cairo_font_options_set_hint_style, <a class="indexterm" href="cairo-Font-Options.html#id2653147">cairo_font_options_set_hint_style ()</a> </dt> -<dt>cairo_font_options_set_subpixel_order, <a href="cairo-Font-Options.html#id2635318">cairo_font_options_set_subpixel_order ()</a> +<dt>cairo_font_options_set_subpixel_order, <a class="indexterm" href="cairo-Font-Options.html#id2652814">cairo_font_options_set_subpixel_order ()</a> </dt> -<dt>cairo_font_options_status, <a href="cairo-Font-Options.html#id2610173">cairo_font_options_status ()</a> +<dt>cairo_font_options_status, <a class="indexterm" href="cairo-Font-Options.html#id2639266">cairo_font_options_status ()</a> </dt> -<dt>cairo_font_options_t, <a href="cairo-Font-Options.html#id2631622">cairo_font_options_t</a> +<dt>cairo_font_options_t, <a class="indexterm" href="cairo-Font-Options.html#id2649056">cairo_font_options_t</a> </dt> -<dt>cairo_font_slant_t, <a href="cairo-Text.html#id2622827">enum cairo_font_slant_t</a> +<dt>cairo_font_slant_t, <a class="indexterm" href="cairo-Text.html#id2621455">enum cairo_font_slant_t</a> </dt> -<dt>cairo_font_type_t, <a href="cairo-cairo-font-face-t.html#id2622512">enum cairo_font_type_t</a> +<dt>cairo_font_type_t, <a class="indexterm" href="cairo-cairo-font-face-t.html#id2621893">enum cairo_font_type_t</a> </dt> -<dt>cairo_font_weight_t, <a href="cairo-Text.html#id2622927">enum cairo_font_weight_t</a> +<dt>cairo_font_weight_t, <a class="indexterm" href="cairo-Text.html#id2621556">enum cairo_font_weight_t</a> </dt> -<dt>cairo_format_t, <a href="cairo-Image-Surfaces.html#id2640044">enum cairo_format_t</a> +<dt>cairo_format_t, <a class="indexterm" href="cairo-Image-Surfaces.html#id2648751">enum cairo_format_t</a> </dt> -<dt>cairo_ft_font_face_create_for_ft_face, <a href="cairo-FreeType-Fonts.html#id2631497">cairo_ft_font_face_create_for_ft_face ()</a> +<dt>cairo_ft_font_face_create_for_ft_face, <a class="indexterm" href="cairo-FreeType-Fonts.html#id2651735">cairo_ft_font_face_create_for_ft_face ()</a> </dt> -<dt>cairo_ft_font_face_create_for_pattern, <a href="cairo-FreeType-Fonts.html#id2631127">cairo_ft_font_face_create_for_pattern ()</a> +<dt>cairo_ft_font_face_create_for_pattern, <a class="indexterm" href="cairo-FreeType-Fonts.html#id2649300">cairo_ft_font_face_create_for_pattern ()</a> </dt> -<dt>cairo_ft_font_options_substitute, <a href="cairo-FreeType-Fonts.html#id2630565">cairo_ft_font_options_substitute ()</a> +<dt>cairo_ft_font_options_substitute, <a class="indexterm" href="cairo-FreeType-Fonts.html#id2649532">cairo_ft_font_options_substitute ()</a> </dt> -<dt>cairo_ft_scaled_font_lock_face, <a href="cairo-FreeType-Fonts.html#id2630697">cairo_ft_scaled_font_lock_face ()</a> +<dt>cairo_ft_scaled_font_lock_face, <a class="indexterm" href="cairo-FreeType-Fonts.html#id2646977">cairo_ft_scaled_font_lock_face ()</a> </dt> -<dt>cairo_ft_scaled_font_unlock_face, <a href="cairo-FreeType-Fonts.html#id2634289">cairo_ft_scaled_font_unlock_face ()</a> +<dt>cairo_ft_scaled_font_unlock_face, <a class="indexterm" href="cairo-FreeType-Fonts.html#id2576304">cairo_ft_scaled_font_unlock_face ()</a> </dt> -<dt>cairo_get_antialias, <a href="cairo-cairo-t.html#id2615760">cairo_get_antialias ()</a> +<dt>cairo_get_antialias, <a class="indexterm" href="cairo-cairo-t.html#id2633195">cairo_get_antialias ()</a> </dt> -<dt>cairo_get_current_point, <a href="cairo-Paths.html#id2561470">cairo_get_current_point ()</a> +<dt>cairo_get_current_point, <a class="indexterm" href="cairo-Paths.html#id2578836">cairo_get_current_point ()</a> </dt> -<dt>cairo_get_dash, <a href="cairo-cairo-t.html#id2616147">cairo_get_dash ()</a> +<dt>cairo_get_dash, <a class="indexterm" href="cairo-cairo-t.html#id2633582">cairo_get_dash ()</a> </dt> -<dt>cairo_get_dash_count, <a href="cairo-cairo-t.html#id2616040">cairo_get_dash_count ()</a> +<dt>cairo_get_dash_count, <a class="indexterm" href="cairo-cairo-t.html#id2633476">cairo_get_dash_count ()</a> </dt> -<dt>cairo_get_fill_rule, <a href="cairo-cairo-t.html#id2616510">cairo_get_fill_rule ()</a> +<dt>cairo_get_fill_rule, <a class="indexterm" href="cairo-cairo-t.html#id2633945">cairo_get_fill_rule ()</a> </dt> -<dt>cairo_get_font_face, <a href="cairo-Text.html#id2628141">cairo_get_font_face ()</a> +<dt>cairo_get_font_face, <a class="indexterm" href="cairo-Text.html#id2645593">cairo_get_font_face ()</a> </dt> -<dt>cairo_get_font_matrix, <a href="cairo-Text.html#id2627716">cairo_get_font_matrix ()</a> +<dt>cairo_get_font_matrix, <a class="indexterm" href="cairo-Text.html#id2645162">cairo_get_font_matrix ()</a> </dt> -<dt>cairo_get_font_options, <a href="cairo-Text.html#id2627928">cairo_get_font_options ()</a> +<dt>cairo_get_font_options, <a class="indexterm" href="cairo-Text.html#id2645379">cairo_get_font_options ()</a> </dt> -<dt>cairo_get_group_target, <a href="cairo-cairo-t.html#id2614739">cairo_get_group_target ()</a> +<dt>cairo_get_group_target, <a class="indexterm" href="cairo-cairo-t.html#id2632174">cairo_get_group_target ()</a> </dt> -<dt>cairo_get_line_cap, <a href="cairo-cairo-t.html#id2616790">cairo_get_line_cap ()</a> +<dt>cairo_get_line_cap, <a class="indexterm" href="cairo-cairo-t.html#id2634226">cairo_get_line_cap ()</a> </dt> -<dt>cairo_get_line_join, <a href="cairo-cairo-t.html#id2617109">cairo_get_line_join ()</a> +<dt>cairo_get_line_join, <a class="indexterm" href="cairo-cairo-t.html#id2634538">cairo_get_line_join ()</a> </dt> -<dt>cairo_get_line_width, <a href="cairo-cairo-t.html#id2617369">cairo_get_line_width ()</a> +<dt>cairo_get_line_width, <a class="indexterm" href="cairo-cairo-t.html#id2634797">cairo_get_line_width ()</a> </dt> -<dt>cairo_get_matrix, <a href="cairo-Transformations.html#id2564540">cairo_get_matrix ()</a> +<dt>cairo_get_matrix, <a class="indexterm" href="cairo-Transformations.html#id2628967">cairo_get_matrix ()</a> </dt> -<dt>cairo_get_miter_limit, <a href="cairo-cairo-t.html#id2617624">cairo_get_miter_limit ()</a> +<dt>cairo_get_miter_limit, <a class="indexterm" href="cairo-cairo-t.html#id2635052">cairo_get_miter_limit ()</a> </dt> -<dt>cairo_get_operator, <a href="cairo-cairo-t.html#id2617860">cairo_get_operator ()</a> +<dt>cairo_get_operator, <a class="indexterm" href="cairo-cairo-t.html#id2635288">cairo_get_operator ()</a> </dt> -<dt>cairo_get_reference_count, <a href="cairo-cairo-t.html#id2620980">cairo_get_reference_count ()</a> +<dt>cairo_get_reference_count, <a class="indexterm" href="cairo-cairo-t.html#id2638408">cairo_get_reference_count ()</a> </dt> -<dt>cairo_get_scaled_font, <a href="cairo-Text.html#id2628396">cairo_get_scaled_font ()</a> +<dt>cairo_get_scaled_font, <a class="indexterm" href="cairo-Text.html#id2645848">cairo_get_scaled_font ()</a> </dt> -<dt>cairo_get_source, <a href="cairo-cairo-t.html#id2615455">cairo_get_source ()</a> +<dt>cairo_get_source, <a class="indexterm" href="cairo-cairo-t.html#id2632891">cairo_get_source ()</a> </dt> -<dt>cairo_get_target, <a href="cairo-cairo-t.html#id2613986">cairo_get_target ()</a> +<dt>cairo_get_target, <a class="indexterm" href="cairo-cairo-t.html#id2631415">cairo_get_target ()</a> </dt> -<dt>cairo_get_tolerance, <a href="cairo-cairo-t.html#id2618039">cairo_get_tolerance ()</a> +<dt>cairo_get_tolerance, <a class="indexterm" href="cairo-cairo-t.html#id2635468">cairo_get_tolerance ()</a> </dt> -<dt>cairo_get_user_data, <a href="cairo-cairo-t.html#id2621316">cairo_get_user_data ()</a> +<dt>cairo_get_user_data, <a class="indexterm" href="cairo-cairo-t.html#id2638744">cairo_get_user_data ()</a> </dt> -<dt>cairo_glyph_extents, <a href="cairo-Text.html#id2628985">cairo_glyph_extents ()</a> +<dt>cairo_glyph_extents, <a class="indexterm" href="cairo-Text.html#id2646436">cairo_glyph_extents ()</a> </dt> -<dt>cairo_glyph_path, <a href="cairo-Paths.html#id2563386">cairo_glyph_path ()</a> +<dt>cairo_glyph_path, <a class="indexterm" href="cairo-Paths.html#id2580751">cairo_glyph_path ()</a> </dt> -<dt>cairo_glyph_t, <a href="cairo-Text.html#id2622362">cairo_glyph_t</a> +<dt>cairo_glyph_t, <a class="indexterm" href="cairo-Text.html#id2589852">cairo_glyph_t</a> </dt> -<dt>cairo_hint_metrics_t, <a href="cairo-Font-Options.html#id2635827">enum cairo_hint_metrics_t</a> +<dt>cairo_hint_metrics_t, <a class="indexterm" href="cairo-Font-Options.html#id2653321">enum cairo_hint_metrics_t</a> </dt> -<dt>cairo_hint_style_t, <a href="cairo-Font-Options.html#id2635504">enum cairo_hint_style_t</a> +<dt>cairo_hint_style_t, <a class="indexterm" href="cairo-Font-Options.html#id2652998">enum cairo_hint_style_t</a> </dt> -<dt>cairo_identity_matrix, <a href="cairo-Transformations.html#id2564630">cairo_identity_matrix ()</a> +<dt>cairo_identity_matrix, <a class="indexterm" href="cairo-Transformations.html#id2629056">cairo_identity_matrix ()</a> </dt> -<dt>cairo_image_surface_create, <a href="cairo-Image-Surfaces.html#id2640322">cairo_image_surface_create ()</a> +<dt>cairo_image_surface_create, <a class="indexterm" href="cairo-Image-Surfaces.html#id2655841">cairo_image_surface_create ()</a> </dt> -<dt>cairo_image_surface_create_for_data, <a href="cairo-Image-Surfaces.html#id2640452">cairo_image_surface_create_for_data ()</a> +<dt>cairo_image_surface_create_for_data, <a class="indexterm" href="cairo-Image-Surfaces.html#id2655972">cairo_image_surface_create_for_data ()</a> </dt> -<dt>cairo_image_surface_create_from_png, <a href="cairo-PNG-Support.html#id2636717">cairo_image_surface_create_from_png ()</a> +<dt>cairo_image_surface_create_from_png, <a class="indexterm" href="cairo-PNG-Support.html#id2654202">cairo_image_surface_create_from_png ()</a> </dt> -<dt>cairo_image_surface_create_from_png_stream, <a href="cairo-PNG-Support.html#id2639527">cairo_image_surface_create_from_png_stream ()</a> +<dt>cairo_image_surface_create_from_png_stream, <a class="indexterm" href="cairo-PNG-Support.html#id2656905">cairo_image_surface_create_from_png_stream ()</a> </dt> -<dt>cairo_image_surface_get_data, <a href="cairo-Image-Surfaces.html#id2638481">cairo_image_surface_get_data ()</a> +<dt>cairo_image_surface_get_data, <a class="indexterm" href="cairo-Image-Surfaces.html#id2657901">cairo_image_surface_get_data ()</a> </dt> -<dt>cairo_image_surface_get_format, <a href="cairo-Image-Surfaces.html#id2638577">cairo_image_surface_get_format ()</a> +<dt>cairo_image_surface_get_format, <a class="indexterm" href="cairo-Image-Surfaces.html#id2658000">cairo_image_surface_get_format ()</a> </dt> -<dt>cairo_image_surface_get_height, <a href="cairo-Image-Surfaces.html#id2636263">cairo_image_surface_get_height ()</a> +<dt>cairo_image_surface_get_height, <a class="indexterm" href="cairo-Image-Surfaces.html#id2653759">cairo_image_surface_get_height ()</a> </dt> -<dt>cairo_image_surface_get_stride, <a href="cairo-Image-Surfaces.html#id2636344">cairo_image_surface_get_stride ()</a> +<dt>cairo_image_surface_get_stride, <a class="indexterm" href="cairo-Image-Surfaces.html#id2653841">cairo_image_surface_get_stride ()</a> </dt> -<dt>cairo_image_surface_get_width, <a href="cairo-Image-Surfaces.html#id2636181">cairo_image_surface_get_width ()</a> +<dt>cairo_image_surface_get_width, <a class="indexterm" href="cairo-Image-Surfaces.html#id2653678">cairo_image_surface_get_width ()</a> </dt> -<dt>cairo_in_fill, <a href="cairo-cairo-t.html#id2619552">cairo_in_fill ()</a> +<dt>cairo_in_fill, <a class="indexterm" href="cairo-cairo-t.html#id2636980">cairo_in_fill ()</a> </dt> -<dt>cairo_in_stroke, <a href="cairo-cairo-t.html#id2620637">cairo_in_stroke ()</a> +<dt>cairo_in_stroke, <a class="indexterm" href="cairo-cairo-t.html#id2638065">cairo_in_stroke ()</a> </dt> -<dt>cairo_line_cap_t, <a href="cairo-cairo-t.html#id2616583">enum cairo_line_cap_t</a> +<dt>cairo_line_cap_t, <a class="indexterm" href="cairo-cairo-t.html#id2634018">enum cairo_line_cap_t</a> </dt> -<dt>cairo_line_join_t, <a href="cairo-cairo-t.html#id2616864">enum cairo_line_join_t</a> +<dt>cairo_line_join_t, <a class="indexterm" href="cairo-cairo-t.html#id2634299">enum cairo_line_join_t</a> </dt> -<dt>cairo_line_to, <a href="cairo-Paths.html#id2562929">cairo_line_to ()</a> +<dt>cairo_line_to, <a class="indexterm" href="cairo-Paths.html#id2580295">cairo_line_to ()</a> </dt> -<dt>cairo_mask, <a href="cairo-cairo-t.html#id2619715">cairo_mask ()</a> +<dt>cairo_mask, <a class="indexterm" href="cairo-cairo-t.html#id2637144">cairo_mask ()</a> </dt> -<dt>cairo_mask_surface, <a href="cairo-cairo-t.html#id2619821">cairo_mask_surface ()</a> +<dt>cairo_mask_surface, <a class="indexterm" href="cairo-cairo-t.html#id2637249">cairo_mask_surface ()</a> </dt> -<dt>cairo_matrix_init, <a href="cairo-cairo-matrix-t.html#id2645792">cairo_matrix_init ()</a> +<dt>cairo_matrix_init, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2663612">cairo_matrix_init ()</a> </dt> -<dt>cairo_matrix_init_identity, <a href="cairo-cairo-matrix-t.html#id2651220">cairo_matrix_init_identity ()</a> +<dt>cairo_matrix_init_identity, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2668718">cairo_matrix_init_identity ()</a> </dt> -<dt>cairo_matrix_init_rotate, <a href="cairo-cairo-matrix-t.html#id2651526">cairo_matrix_init_rotate ()</a> +<dt>cairo_matrix_init_rotate, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669023">cairo_matrix_init_rotate ()</a> </dt> -<dt>cairo_matrix_init_scale, <a href="cairo-cairo-matrix-t.html#id2651404">cairo_matrix_init_scale ()</a> +<dt>cairo_matrix_init_scale, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2668901">cairo_matrix_init_scale ()</a> </dt> -<dt>cairo_matrix_init_translate, <a href="cairo-cairo-matrix-t.html#id2651286">cairo_matrix_init_translate ()</a> +<dt>cairo_matrix_init_translate, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2668784">cairo_matrix_init_translate ()</a> </dt> -<dt>cairo_matrix_invert, <a href="cairo-cairo-matrix-t.html#id2652019">cairo_matrix_invert ()</a> +<dt>cairo_matrix_invert, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669516">cairo_matrix_invert ()</a> </dt> -<dt>cairo_matrix_multiply, <a href="cairo-cairo-matrix-t.html#id2652144">cairo_matrix_multiply ()</a> +<dt>cairo_matrix_multiply, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669639">cairo_matrix_multiply ()</a> </dt> -<dt>cairo_matrix_rotate, <a href="cairo-cairo-matrix-t.html#id2651904">cairo_matrix_rotate ()</a> +<dt>cairo_matrix_rotate, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669402">cairo_matrix_rotate ()</a> </dt> -<dt>cairo_matrix_scale, <a href="cairo-cairo-matrix-t.html#id2651761">cairo_matrix_scale ()</a> +<dt>cairo_matrix_scale, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669259">cairo_matrix_scale ()</a> </dt> -<dt>cairo_matrix_t, <a href="cairo-cairo-matrix-t.html#id2645614">cairo_matrix_t</a> +<dt>cairo_matrix_t, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2663386">cairo_matrix_t</a> </dt> -<dt>cairo_matrix_transform_distance, <a href="cairo-cairo-matrix-t.html#id2652323">cairo_matrix_transform_distance ()</a> +<dt>cairo_matrix_transform_distance, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669818">cairo_matrix_transform_distance ()</a> </dt> -<dt>cairo_matrix_transform_point, <a href="cairo-cairo-matrix-t.html#id2652526">cairo_matrix_transform_point ()</a> +<dt>cairo_matrix_transform_point, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2670063">cairo_matrix_transform_point ()</a> </dt> -<dt>cairo_matrix_translate, <a href="cairo-cairo-matrix-t.html#id2651625">cairo_matrix_translate ()</a> +<dt>cairo_matrix_translate, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2669123">cairo_matrix_translate ()</a> </dt> -<dt>cairo_move_to, <a href="cairo-Paths.html#id2563094">cairo_move_to ()</a> +<dt>cairo_move_to, <a class="indexterm" href="cairo-Paths.html#id2580460">cairo_move_to ()</a> </dt> -<dt>cairo_new_path, <a href="cairo-Paths.html#id2561799">cairo_new_path ()</a> +<dt>cairo_new_path, <a class="indexterm" href="cairo-Paths.html#id2579165">cairo_new_path ()</a> </dt> -<dt>cairo_new_sub_path, <a href="cairo-Paths.html#id2561862">cairo_new_sub_path ()</a> +<dt>cairo_new_sub_path, <a class="indexterm" href="cairo-Paths.html#id2579229">cairo_new_sub_path ()</a> </dt> -<dt>cairo_operator_t, <a href="cairo-cairo-t.html#id2617708">enum cairo_operator_t</a> +<dt>cairo_operator_t, <a class="indexterm" href="cairo-cairo-t.html#id2635136">enum cairo_operator_t</a> </dt> -<dt>cairo_paint, <a href="cairo-cairo-t.html#id2619984">cairo_paint ()</a> +<dt>cairo_paint, <a class="indexterm" href="cairo-cairo-t.html#id2637412">cairo_paint ()</a> </dt> -<dt>cairo_paint_with_alpha, <a href="cairo-cairo-t.html#id2620049">cairo_paint_with_alpha ()</a> +<dt>cairo_paint_with_alpha, <a class="indexterm" href="cairo-cairo-t.html#id2637477">cairo_paint_with_alpha ()</a> </dt> -<dt>cairo_path_data_t, <a href="cairo-Paths.html#id2607426">union cairo_path_data_t</a> +<dt>cairo_path_data_t, <a class="indexterm" href="cairo-Paths.html#id2624848">union cairo_path_data_t</a> </dt> -<dt>cairo_path_data_type_t, <a href="cairo-Paths.html#id2609327">enum cairo_path_data_type_t</a> +<dt>cairo_path_data_type_t, <a class="indexterm" href="cairo-Paths.html#id2626694">enum cairo_path_data_type_t</a> </dt> -<dt>cairo_path_destroy, <a href="cairo-Paths.html#id2561215">cairo_path_destroy ()</a> +<dt>cairo_path_destroy, <a class="indexterm" href="cairo-Paths.html#id2578582">cairo_path_destroy ()</a> </dt> -<dt>cairo_path_t, <a href="cairo-Paths.html#id2607272">cairo_path_t</a> +<dt>cairo_path_t, <a class="indexterm" href="cairo-Paths.html#id2624694">cairo_path_t</a> </dt> -<dt>cairo_pattern_add_color_stop_rgb, <a href="cairo-Patterns.html#id2623213">cairo_pattern_add_color_stop_rgb ()</a> +<dt>cairo_pattern_add_color_stop_rgb, <a class="indexterm" href="cairo-Patterns.html#id2640648">cairo_pattern_add_color_stop_rgb ()</a> </dt> -<dt>cairo_pattern_add_color_stop_rgba, <a href="cairo-Patterns.html#id2623411">cairo_pattern_add_color_stop_rgba ()</a> +<dt>cairo_pattern_add_color_stop_rgba, <a class="indexterm" href="cairo-Patterns.html#id2640846">cairo_pattern_add_color_stop_rgba ()</a> </dt> -<dt>cairo_pattern_create_for_surface, <a href="cairo-Patterns.html#id2624535">cairo_pattern_create_for_surface ()</a> +<dt>cairo_pattern_create_for_surface, <a class="indexterm" href="cairo-Patterns.html#id2641974">cairo_pattern_create_for_surface ()</a> </dt> -<dt>cairo_pattern_create_linear, <a href="cairo-Patterns.html#id2624772">cairo_pattern_create_linear ()</a> +<dt>cairo_pattern_create_linear, <a class="indexterm" href="cairo-Patterns.html#id2642212">cairo_pattern_create_linear ()</a> </dt> -<dt>cairo_pattern_create_radial, <a href="cairo-Patterns.html#id2625181">cairo_pattern_create_radial ()</a> +<dt>cairo_pattern_create_radial, <a class="indexterm" href="cairo-Patterns.html#id2642620">cairo_pattern_create_radial ()</a> </dt> -<dt>cairo_pattern_create_rgb, <a href="cairo-Patterns.html#id2624032">cairo_pattern_create_rgb ()</a> +<dt>cairo_pattern_create_rgb, <a class="indexterm" href="cairo-Patterns.html#id2641472">cairo_pattern_create_rgb ()</a> </dt> -<dt>cairo_pattern_create_rgba, <a href="cairo-Patterns.html#id2624168">cairo_pattern_create_rgba ()</a> +<dt>cairo_pattern_create_rgba, <a class="indexterm" href="cairo-Patterns.html#id2641607">cairo_pattern_create_rgba ()</a> </dt> -<dt>cairo_pattern_destroy, <a href="cairo-Patterns.html#id2625805">cairo_pattern_destroy ()</a> +<dt>cairo_pattern_destroy, <a class="indexterm" href="cairo-Patterns.html#id2643244">cairo_pattern_destroy ()</a> </dt> -<dt>cairo_pattern_get_color_stop_count, <a href="cairo-Patterns.html#id2623599">cairo_pattern_get_color_stop_count ()</a> +<dt>cairo_pattern_get_color_stop_count, <a class="indexterm" href="cairo-Patterns.html#id2641038">cairo_pattern_get_color_stop_count ()</a> </dt> -<dt>cairo_pattern_get_color_stop_rgba, <a href="cairo-Patterns.html#id2623733">cairo_pattern_get_color_stop_rgba ()</a> +<dt>cairo_pattern_get_color_stop_rgba, <a class="indexterm" href="cairo-Patterns.html#id2641173">cairo_pattern_get_color_stop_rgba ()</a> </dt> -<dt>cairo_pattern_get_extend, <a href="cairo-Patterns.html#id2626207">cairo_pattern_get_extend ()</a> +<dt>cairo_pattern_get_extend, <a class="indexterm" href="cairo-Patterns.html#id2643646">cairo_pattern_get_extend ()</a> </dt> -<dt>cairo_pattern_get_filter, <a href="cairo-Patterns.html#id2626433">cairo_pattern_get_filter ()</a> +<dt>cairo_pattern_get_filter, <a class="indexterm" href="cairo-Patterns.html#id2643869">cairo_pattern_get_filter ()</a> </dt> -<dt>cairo_pattern_get_linear_points, <a href="cairo-Patterns.html#id2624961">cairo_pattern_get_linear_points ()</a> +<dt>cairo_pattern_get_linear_points, <a class="indexterm" href="cairo-Patterns.html#id2642401">cairo_pattern_get_linear_points ()</a> </dt> -<dt>cairo_pattern_get_matrix, <a href="cairo-Patterns.html#id2626685">cairo_pattern_get_matrix ()</a> +<dt>cairo_pattern_get_matrix, <a class="indexterm" href="cairo-Patterns.html#id2644121">cairo_pattern_get_matrix ()</a> </dt> -<dt>cairo_pattern_get_radial_circles, <a href="cairo-Patterns.html#id2625410">cairo_pattern_get_radial_circles ()</a> +<dt>cairo_pattern_get_radial_circles, <a class="indexterm" href="cairo-Patterns.html#id2642849">cairo_pattern_get_radial_circles ()</a> </dt> -<dt>cairo_pattern_get_reference_count, <a href="cairo-Patterns.html#id2627119">cairo_pattern_get_reference_count ()</a> +<dt>cairo_pattern_get_reference_count, <a class="indexterm" href="cairo-Patterns.html#id2644554">cairo_pattern_get_reference_count ()</a> </dt> -<dt>cairo_pattern_get_rgba, <a href="cairo-Patterns.html#id2624324">cairo_pattern_get_rgba ()</a> +<dt>cairo_pattern_get_rgba, <a class="indexterm" href="cairo-Patterns.html#id2641763">cairo_pattern_get_rgba ()</a> </dt> -<dt>cairo_pattern_get_surface, <a href="cairo-Patterns.html#id2624630">cairo_pattern_get_surface ()</a> +<dt>cairo_pattern_get_surface, <a class="indexterm" href="cairo-Patterns.html#id2642070">cairo_pattern_get_surface ()</a> </dt> -<dt>cairo_pattern_get_type, <a href="cairo-Patterns.html#id2627013">cairo_pattern_get_type ()</a> +<dt>cairo_pattern_get_type, <a class="indexterm" href="cairo-Patterns.html#id2644448">cairo_pattern_get_type ()</a> </dt> -<dt>cairo_pattern_get_user_data, <a href="cairo-Patterns.html#id2627456">cairo_pattern_get_user_data ()</a> +<dt>cairo_pattern_get_user_data, <a class="indexterm" href="cairo-Patterns.html#id2644892">cairo_pattern_get_user_data ()</a> </dt> -<dt>cairo_pattern_reference, <a href="cairo-Patterns.html#id2625688">cairo_pattern_reference ()</a> +<dt>cairo_pattern_reference, <a class="indexterm" href="cairo-Patterns.html#id2643128">cairo_pattern_reference ()</a> </dt> -<dt>cairo_pattern_set_extend, <a href="cairo-Patterns.html#id2626111">cairo_pattern_set_extend ()</a> +<dt>cairo_pattern_set_extend, <a class="indexterm" href="cairo-Patterns.html#id2643550">cairo_pattern_set_extend ()</a> </dt> -<dt>cairo_pattern_set_filter, <a href="cairo-Patterns.html#id2626323">cairo_pattern_set_filter ()</a> +<dt>cairo_pattern_set_filter, <a class="indexterm" href="cairo-Patterns.html#id2643759">cairo_pattern_set_filter ()</a> </dt> -<dt>cairo_pattern_set_matrix, <a href="cairo-Patterns.html#id2626524">cairo_pattern_set_matrix ()</a> +<dt>cairo_pattern_set_matrix, <a class="indexterm" href="cairo-Patterns.html#id2643960">cairo_pattern_set_matrix ()</a> </dt> -<dt>cairo_pattern_set_user_data, <a href="cairo-Patterns.html#id2627225">cairo_pattern_set_user_data ()</a> +<dt>cairo_pattern_set_user_data, <a class="indexterm" href="cairo-Patterns.html#id2644660">cairo_pattern_set_user_data ()</a> </dt> -<dt>cairo_pattern_status, <a href="cairo-Patterns.html#id2625886">cairo_pattern_status ()</a> +<dt>cairo_pattern_status, <a class="indexterm" href="cairo-Patterns.html#id2643326">cairo_pattern_status ()</a> </dt> -<dt>cairo_pattern_t, <a href="cairo-Patterns.html#id2623103">cairo_pattern_t</a> +<dt>cairo_pattern_t, <a class="indexterm" href="cairo-Patterns.html#id2640539">cairo_pattern_t</a> </dt> -<dt>cairo_pattern_type_t, <a href="cairo-Patterns.html#id2626785">enum cairo_pattern_type_t</a> +<dt>cairo_pattern_type_t, <a class="indexterm" href="cairo-Patterns.html#id2644221">enum cairo_pattern_type_t</a> </dt> -<dt>cairo_pdf_surface_create, <a href="cairo-PDF-Surfaces.html#id2640178">cairo_pdf_surface_create ()</a> +<dt>cairo_pdf_surface_create, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2596618">cairo_pdf_surface_create ()</a> </dt> -<dt>cairo_pdf_surface_create_for_stream, <a href="cairo-PDF-Surfaces.html#id2638626">cairo_pdf_surface_create_for_stream ()</a> +<dt>cairo_pdf_surface_create_for_stream, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2657687">cairo_pdf_surface_create_for_stream ()</a> </dt> -<dt>cairo_pdf_surface_set_size, <a href="cairo-PDF-Surfaces.html#id2639157">cairo_pdf_surface_set_size ()</a> +<dt>cairo_pdf_surface_set_size, <a class="indexterm" href="cairo-PDF-Surfaces.html#id2656183">cairo_pdf_surface_set_size ()</a> </dt> -<dt>cairo_pop_group, <a href="cairo-cairo-t.html#id2586256">cairo_pop_group ()</a> +<dt>cairo_pop_group, <a class="indexterm" href="cairo-cairo-t.html#id2631916">cairo_pop_group ()</a> </dt> -<dt>cairo_pop_group_to_source, <a href="cairo-cairo-t.html#id2614604">cairo_pop_group_to_source ()</a> +<dt>cairo_pop_group_to_source, <a class="indexterm" href="cairo-cairo-t.html#id2632040">cairo_pop_group_to_source ()</a> </dt> -<dt>cairo_ps_surface_create, <a href="cairo-PostScript-Surfaces.html#id2636851">cairo_ps_surface_create ()</a> +<dt>cairo_ps_surface_create, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2654338">cairo_ps_surface_create ()</a> </dt> -<dt>cairo_ps_surface_create_for_stream, <a href="cairo-PostScript-Surfaces.html#id2638281">cairo_ps_surface_create_for_stream ()</a> +<dt>cairo_ps_surface_create_for_stream, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2655771">cairo_ps_surface_create_for_stream ()</a> </dt> -<dt>cairo_ps_surface_dsc_begin_page_setup, <a href="cairo-PostScript-Surfaces.html#id2645031">cairo_ps_surface_dsc_begin_page_setup ()</a> +<dt>cairo_ps_surface_dsc_begin_page_setup, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2662527">cairo_ps_surface_dsc_begin_page_setup ()</a> </dt> -<dt>cairo_ps_surface_dsc_begin_setup, <a href="cairo-PostScript-Surfaces.html#id2637542">cairo_ps_surface_dsc_begin_setup ()</a> +<dt>cairo_ps_surface_dsc_begin_setup, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2655048">cairo_ps_surface_dsc_begin_setup ()</a> </dt> -<dt>cairo_ps_surface_dsc_comment, <a href="cairo-PostScript-Surfaces.html#id2645133">cairo_ps_surface_dsc_comment ()</a> +<dt>cairo_ps_surface_dsc_comment, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2662627">cairo_ps_surface_dsc_comment ()</a> </dt> -<dt>cairo_ps_surface_set_size, <a href="cairo-PostScript-Surfaces.html#id2637400">cairo_ps_surface_set_size ()</a> +<dt>cairo_ps_surface_set_size, <a class="indexterm" href="cairo-PostScript-Surfaces.html#id2654905">cairo_ps_surface_set_size ()</a> </dt> -<dt>cairo_push_group, <a href="cairo-cairo-t.html#id2614140">cairo_push_group ()</a> +<dt>cairo_push_group, <a class="indexterm" href="cairo-cairo-t.html#id2631569">cairo_push_group ()</a> </dt> -<dt>cairo_push_group_with_content, <a href="cairo-cairo-t.html#id2614337">cairo_push_group_with_content ()</a> +<dt>cairo_push_group_with_content, <a class="indexterm" href="cairo-cairo-t.html#id2631766">cairo_push_group_with_content ()</a> </dt> -<dt>cairo_read_func_t, <a href="cairo-PNG-Support.html#id2639400">cairo_read_func_t ()</a> +<dt>cairo_read_func_t, <a class="indexterm" href="cairo-PNG-Support.html#id2656777">cairo_read_func_t ()</a> </dt> -<dt>cairo_rectangle, <a href="cairo-Paths.html#id2563212">cairo_rectangle ()</a> +<dt>cairo_rectangle, <a class="indexterm" href="cairo-Paths.html#id2580577">cairo_rectangle ()</a> </dt> -<dt>cairo_rectangle_list_destroy, <a href="cairo-cairo-t.html#id2618965">cairo_rectangle_list_destroy ()</a> +<dt>cairo_rectangle_list_destroy, <a class="indexterm" href="cairo-cairo-t.html#id2636393">cairo_rectangle_list_destroy ()</a> </dt> -<dt>cairo_rectangle_list_t, <a href="cairo-cairo-t.html#id2618850">cairo_rectangle_list_t</a> +<dt>cairo_rectangle_list_t, <a class="indexterm" href="cairo-cairo-t.html#id2636278">cairo_rectangle_list_t</a> </dt> -<dt>cairo_rectangle_t, <a href="cairo-cairo-t.html#id2618718">cairo_rectangle_t</a> +<dt>cairo_rectangle_t, <a class="indexterm" href="cairo-cairo-t.html#id2636146">cairo_rectangle_t</a> </dt> -<dt>cairo_reference, <a href="cairo-cairo-t.html#id2613424">cairo_reference ()</a> +<dt>cairo_reference, <a class="indexterm" href="cairo-cairo-t.html#id2630852">cairo_reference ()</a> </dt> -<dt>cairo_rel_curve_to, <a href="cairo-Paths.html#id2563666">cairo_rel_curve_to ()</a> +<dt>cairo_rel_curve_to, <a class="indexterm" href="cairo-Paths.html#id2581031">cairo_rel_curve_to ()</a> </dt> -<dt>cairo_rel_line_to, <a href="cairo-Paths.html#id2564020">cairo_rel_line_to ()</a> +<dt>cairo_rel_line_to, <a class="indexterm" href="cairo-Paths.html#id2581386">cairo_rel_line_to ()</a> </dt> -<dt>cairo_rel_move_to, <a href="cairo-Paths.html#id2564215">cairo_rel_move_to ()</a> +<dt>cairo_rel_move_to, <a class="indexterm" href="cairo-Paths.html#id2581581">cairo_rel_move_to ()</a> </dt> -<dt>cairo_reset_clip, <a href="cairo-cairo-t.html#id2618596">cairo_reset_clip ()</a> +<dt>cairo_reset_clip, <a class="indexterm" href="cairo-cairo-t.html#id2636024">cairo_reset_clip ()</a> </dt> -<dt>cairo_restore, <a href="cairo-cairo-t.html#id2613900">cairo_restore ()</a> +<dt>cairo_restore, <a class="indexterm" href="cairo-cairo-t.html#id2631329">cairo_restore ()</a> </dt> -<dt>cairo_rotate, <a href="cairo-Transformations.html#id2566167">cairo_rotate ()</a> +<dt>cairo_rotate, <a class="indexterm" href="cairo-Transformations.html#id2628276">cairo_rotate ()</a> </dt> -<dt>cairo_save, <a href="cairo-cairo-t.html#id2613726">cairo_save ()</a> +<dt>cairo_save, <a class="indexterm" href="cairo-cairo-t.html#id2631154">cairo_save ()</a> </dt> -<dt>cairo_scale, <a href="cairo-Transformations.html#id2566048">cairo_scale ()</a> +<dt>cairo_scale, <a class="indexterm" href="cairo-Transformations.html#id2628157">cairo_scale ()</a> </dt> -<dt>cairo_scaled_font_create, <a href="cairo-Scaled-Fonts.html#id2630969">cairo_scaled_font_create ()</a> +<dt>cairo_scaled_font_create, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2639555">cairo_scaled_font_create ()</a> </dt> -<dt>cairo_scaled_font_destroy, <a href="cairo-Scaled-Fonts.html#id2621980">cairo_scaled_font_destroy ()</a> +<dt>cairo_scaled_font_destroy, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2640131">cairo_scaled_font_destroy ()</a> </dt> -<dt>cairo_scaled_font_extents, <a href="cairo-Scaled-Fonts.html#id2632452">cairo_scaled_font_extents ()</a> +<dt>cairo_scaled_font_extents, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2649908">cairo_scaled_font_extents ()</a> </dt> -<dt>cairo_scaled_font_get_ctm, <a href="cairo-Scaled-Fonts.html#id2633372">cairo_scaled_font_get_ctm ()</a> +<dt>cairo_scaled_font_get_ctm, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650860">cairo_scaled_font_get_ctm ()</a> </dt> -<dt>cairo_scaled_font_get_font_face, <a href="cairo-Scaled-Fonts.html#id2633073">cairo_scaled_font_get_font_face ()</a> +<dt>cairo_scaled_font_get_font_face, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650560">cairo_scaled_font_get_font_face ()</a> </dt> -<dt>cairo_scaled_font_get_font_matrix, <a href="cairo-Scaled-Fonts.html#id2633269">cairo_scaled_font_get_font_matrix ()</a> +<dt>cairo_scaled_font_get_font_matrix, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650757">cairo_scaled_font_get_font_matrix ()</a> </dt> -<dt>cairo_scaled_font_get_font_options, <a href="cairo-Scaled-Fonts.html#id2633166">cairo_scaled_font_get_font_options ()</a> +<dt>cairo_scaled_font_get_font_options, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650665">cairo_scaled_font_get_font_options ()</a> </dt> -<dt>cairo_scaled_font_get_reference_count, <a href="cairo-Scaled-Fonts.html#id2633562">cairo_scaled_font_get_reference_count ()</a> +<dt>cairo_scaled_font_get_reference_count, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651050">cairo_scaled_font_get_reference_count ()</a> </dt> -<dt>cairo_scaled_font_get_type, <a href="cairo-Scaled-Fonts.html#id2633471">cairo_scaled_font_get_type ()</a> +<dt>cairo_scaled_font_get_type, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650959">cairo_scaled_font_get_type ()</a> </dt> -<dt>cairo_scaled_font_get_user_data, <a href="cairo-Scaled-Fonts.html#id2633864">cairo_scaled_font_get_user_data ()</a> +<dt>cairo_scaled_font_get_user_data, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651352">cairo_scaled_font_get_user_data ()</a> </dt> -<dt>cairo_scaled_font_glyph_extents, <a href="cairo-Scaled-Fonts.html#id2632919">cairo_scaled_font_glyph_extents ()</a> +<dt>cairo_scaled_font_glyph_extents, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650375">cairo_scaled_font_glyph_extents ()</a> </dt> -<dt>cairo_scaled_font_reference, <a href="cairo-Scaled-Fonts.html#id2621850">cairo_scaled_font_reference ()</a> +<dt>cairo_scaled_font_reference, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2640000">cairo_scaled_font_reference ()</a> </dt> -<dt>cairo_scaled_font_set_user_data, <a href="cairo-Scaled-Fonts.html#id2633659">cairo_scaled_font_set_user_data ()</a> +<dt>cairo_scaled_font_set_user_data, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2651147">cairo_scaled_font_set_user_data ()</a> </dt> -<dt>cairo_scaled_font_status, <a href="cairo-Scaled-Fonts.html#id2632143">cairo_scaled_font_status ()</a> +<dt>cairo_scaled_font_status, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2649597">cairo_scaled_font_status ()</a> </dt> -<dt>cairo_scaled_font_t, <a href="cairo-Scaled-Fonts.html#id2630879">cairo_scaled_font_t</a> +<dt>cairo_scaled_font_t, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2639465">cairo_scaled_font_t</a> </dt> -<dt>cairo_scaled_font_text_extents, <a href="cairo-Scaled-Fonts.html#id2632748">cairo_scaled_font_text_extents ()</a> +<dt>cairo_scaled_font_text_extents, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650204">cairo_scaled_font_text_extents ()</a> </dt> -<dt>cairo_select_font_face, <a href="cairo-Text.html#id2559816">cairo_select_font_face ()</a> +<dt>cairo_select_font_face, <a class="indexterm" href="cairo-Text.html#id2582023">cairo_select_font_face ()</a> </dt> -<dt>cairo_set_antialias, <a href="cairo-cairo-t.html#id2615654">cairo_set_antialias ()</a> +<dt>cairo_set_antialias, <a class="indexterm" href="cairo-cairo-t.html#id2633090">cairo_set_antialias ()</a> </dt> -<dt>cairo_set_dash, <a href="cairo-cairo-t.html#id2615834">cairo_set_dash ()</a> +<dt>cairo_set_dash, <a class="indexterm" href="cairo-cairo-t.html#id2633269">cairo_set_dash ()</a> </dt> -<dt>cairo_set_fill_rule, <a href="cairo-cairo-t.html#id2616396">cairo_set_fill_rule ()</a> +<dt>cairo_set_fill_rule, <a class="indexterm" href="cairo-cairo-t.html#id2633832">cairo_set_fill_rule ()</a> </dt> -<dt>cairo_set_font_face, <a href="cairo-Text.html#id2628020">cairo_set_font_face ()</a> +<dt>cairo_set_font_face, <a class="indexterm" href="cairo-Text.html#id2645472">cairo_set_font_face ()</a> </dt> -<dt>cairo_set_font_matrix, <a href="cairo-Text.html#id2560088">cairo_set_font_matrix ()</a> +<dt>cairo_set_font_matrix, <a class="indexterm" href="cairo-Text.html#id2645057">cairo_set_font_matrix ()</a> </dt> -<dt>cairo_set_font_options, <a href="cairo-Text.html#id2627815">cairo_set_font_options ()</a> +<dt>cairo_set_font_options, <a class="indexterm" href="cairo-Text.html#id2645265">cairo_set_font_options ()</a> </dt> -<dt>cairo_set_font_size, <a href="cairo-Text.html#id2559954">cairo_set_font_size ()</a> +<dt>cairo_set_font_size, <a class="indexterm" href="cairo-Text.html#id2582161">cairo_set_font_size ()</a> </dt> -<dt>cairo_set_line_cap, <a href="cairo-cairo-t.html#id2616677">cairo_set_line_cap ()</a> +<dt>cairo_set_line_cap, <a class="indexterm" href="cairo-cairo-t.html#id2634113">cairo_set_line_cap ()</a> </dt> -<dt>cairo_set_line_join, <a href="cairo-cairo-t.html#id2616980">cairo_set_line_join ()</a> +<dt>cairo_set_line_join, <a class="indexterm" href="cairo-cairo-t.html#id2634408">cairo_set_line_join ()</a> </dt> -<dt>cairo_set_line_width, <a href="cairo-cairo-t.html#id2617194">cairo_set_line_width ()</a> +<dt>cairo_set_line_width, <a class="indexterm" href="cairo-cairo-t.html#id2634622">cairo_set_line_width ()</a> </dt> -<dt>cairo_set_matrix, <a href="cairo-Transformations.html#id2564448">cairo_set_matrix ()</a> +<dt>cairo_set_matrix, <a class="indexterm" href="cairo-Transformations.html#id2629770">cairo_set_matrix ()</a> </dt> -<dt>cairo_set_miter_limit, <a href="cairo-cairo-t.html#id2617475">cairo_set_miter_limit ()</a> +<dt>cairo_set_miter_limit, <a class="indexterm" href="cairo-cairo-t.html#id2634903">cairo_set_miter_limit ()</a> </dt> -<dt>cairo_set_operator, <a href="cairo-cairo-t.html#id2617744">cairo_set_operator ()</a> +<dt>cairo_set_operator, <a class="indexterm" href="cairo-cairo-t.html#id2635172">cairo_set_operator ()</a> </dt> -<dt>cairo_set_scaled_font, <a href="cairo-Text.html#id2628265">cairo_set_scaled_font ()</a> +<dt>cairo_set_scaled_font, <a class="indexterm" href="cairo-Text.html#id2645717">cairo_set_scaled_font ()</a> </dt> -<dt>cairo_set_source, <a href="cairo-cairo-t.html#id2615133">cairo_set_source ()</a> +<dt>cairo_set_source, <a class="indexterm" href="cairo-cairo-t.html#id2632568">cairo_set_source ()</a> </dt> -<dt>cairo_set_source_rgb, <a href="cairo-cairo-t.html#id2614863">cairo_set_source_rgb ()</a> +<dt>cairo_set_source_rgb, <a class="indexterm" href="cairo-cairo-t.html#id2632298">cairo_set_source_rgb ()</a> </dt> -<dt>cairo_set_source_rgba, <a href="cairo-cairo-t.html#id2614988">cairo_set_source_rgba ()</a> +<dt>cairo_set_source_rgba, <a class="indexterm" href="cairo-cairo-t.html#id2632424">cairo_set_source_rgba ()</a> </dt> -<dt>cairo_set_source_surface, <a href="cairo-cairo-t.html#id2615256">cairo_set_source_surface ()</a> +<dt>cairo_set_source_surface, <a class="indexterm" href="cairo-cairo-t.html#id2632692">cairo_set_source_surface ()</a> </dt> -<dt>cairo_set_tolerance, <a href="cairo-cairo-t.html#id2617935">cairo_set_tolerance ()</a> +<dt>cairo_set_tolerance, <a class="indexterm" href="cairo-cairo-t.html#id2635363">cairo_set_tolerance ()</a> </dt> -<dt>cairo_set_user_data, <a href="cairo-cairo-t.html#id2621085">cairo_set_user_data ()</a> +<dt>cairo_set_user_data, <a class="indexterm" href="cairo-cairo-t.html#id2638514">cairo_set_user_data ()</a> </dt> -<dt>cairo_show_glyphs, <a href="cairo-Text.html#id2628663">cairo_show_glyphs ()</a> +<dt>cairo_show_glyphs, <a class="indexterm" href="cairo-Text.html#id2646115">cairo_show_glyphs ()</a> </dt> -<dt>cairo_show_page, <a href="cairo-cairo-t.html#id2620906">cairo_show_page ()</a> +<dt>cairo_show_page, <a class="indexterm" href="cairo-cairo-t.html#id2638334">cairo_show_page ()</a> </dt> -<dt>cairo_show_text, <a href="cairo-Text.html#id2628538">cairo_show_text ()</a> +<dt>cairo_show_text, <a class="indexterm" href="cairo-Text.html#id2645989">cairo_show_text ()</a> </dt> -<dt>cairo_status, <a href="cairo-cairo-t.html#id2613645">cairo_status ()</a> +<dt>cairo_status, <a class="indexterm" href="cairo-cairo-t.html#id2631074">cairo_status ()</a> </dt> -<dt>cairo_status_t, <a href="cairo-Error-Handling.html#id2589634">enum cairo_status_t</a> +<dt>cairo_status_t, <a class="indexterm" href="cairo-Error-Handling.html#id2665464">enum cairo_status_t</a> </dt> -<dt>cairo_status_to_string, <a href="cairo-Error-Handling.html#id2650964">cairo_status_to_string ()</a> +<dt>cairo_status_to_string, <a class="indexterm" href="cairo-Error-Handling.html#id2665606">cairo_status_to_string ()</a> </dt> -<dt>cairo_stroke, <a href="cairo-cairo-t.html#id2620153">cairo_stroke ()</a> +<dt>cairo_stroke, <a class="indexterm" href="cairo-cairo-t.html#id2637581">cairo_stroke ()</a> </dt> -<dt>cairo_stroke_extents, <a href="cairo-cairo-t.html#id2620474">cairo_stroke_extents ()</a> +<dt>cairo_stroke_extents, <a class="indexterm" href="cairo-cairo-t.html#id2637903">cairo_stroke_extents ()</a> </dt> -<dt>cairo_stroke_preserve, <a href="cairo-cairo-t.html#id2620346">cairo_stroke_preserve ()</a> +<dt>cairo_stroke_preserve, <a class="indexterm" href="cairo-cairo-t.html#id2637774">cairo_stroke_preserve ()</a> </dt> -<dt>cairo_subpixel_order_t, <a href="cairo-Font-Options.html#id2635173">enum cairo_subpixel_order_t</a> +<dt>cairo_subpixel_order_t, <a class="indexterm" href="cairo-Font-Options.html#id2652647">enum cairo_subpixel_order_t</a> </dt> -<dt>cairo_surface_create_similar, <a href="cairo-cairo-surface-t.html#id2630214">cairo_surface_create_similar ()</a> +<dt>cairo_surface_create_similar, <a class="indexterm" href="cairo-cairo-surface-t.html#id2648567">cairo_surface_create_similar ()</a> </dt> -<dt>cairo_surface_destroy, <a href="cairo-cairo-surface-t.html#id2640742">cairo_surface_destroy ()</a> +<dt>cairo_surface_destroy, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658223">cairo_surface_destroy ()</a> </dt> -<dt>cairo_surface_finish, <a href="cairo-cairo-surface-t.html#id2602106">cairo_surface_finish ()</a> +<dt>cairo_surface_finish, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658440">cairo_surface_finish ()</a> </dt> -<dt>cairo_surface_flush, <a href="cairo-cairo-surface-t.html#id2641059">cairo_surface_flush ()</a> +<dt>cairo_surface_flush, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658539">cairo_surface_flush ()</a> </dt> -<dt>cairo_surface_get_content, <a href="cairo-cairo-surface-t.html#id2641228">cairo_surface_get_content ()</a> +<dt>cairo_surface_get_content, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658708">cairo_surface_get_content ()</a> </dt> -<dt>cairo_surface_get_device_offset, <a href="cairo-cairo-surface-t.html#id2641700">cairo_surface_get_device_offset ()</a> +<dt>cairo_surface_get_device_offset, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659180">cairo_surface_get_device_offset ()</a> </dt> -<dt>cairo_surface_get_font_options, <a href="cairo-cairo-surface-t.html#id2641125">cairo_surface_get_font_options ()</a> +<dt>cairo_surface_get_font_options, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658605">cairo_surface_get_font_options ()</a> </dt> -<dt>cairo_surface_get_reference_count, <a href="cairo-cairo-surface-t.html#id2642420">cairo_surface_get_reference_count ()</a> +<dt>cairo_surface_get_reference_count, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659900">cairo_surface_get_reference_count ()</a> </dt> -<dt>cairo_surface_get_type, <a href="cairo-cairo-surface-t.html#id2642329">cairo_surface_get_type ()</a> +<dt>cairo_surface_get_type, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659809">cairo_surface_get_type ()</a> </dt> -<dt>cairo_surface_get_user_data, <a href="cairo-cairo-surface-t.html#id2642697">cairo_surface_get_user_data ()</a> +<dt>cairo_surface_get_user_data, <a class="indexterm" href="cairo-cairo-surface-t.html#id2660177">cairo_surface_get_user_data ()</a> </dt> -<dt>cairo_surface_mark_dirty, <a href="cairo-cairo-surface-t.html#id2641326">cairo_surface_mark_dirty ()</a> +<dt>cairo_surface_mark_dirty, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658806">cairo_surface_mark_dirty ()</a> </dt> -<dt>cairo_surface_mark_dirty_rectangle, <a href="cairo-cairo-surface-t.html#id2641398">cairo_surface_mark_dirty_rectangle ()</a> +<dt>cairo_surface_mark_dirty_rectangle, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658878">cairo_surface_mark_dirty_rectangle ()</a> </dt> -<dt>cairo_surface_reference, <a href="cairo-cairo-surface-t.html#id2640623">cairo_surface_reference ()</a> +<dt>cairo_surface_reference, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658105">cairo_surface_reference ()</a> </dt> -<dt>cairo_surface_set_device_offset, <a href="cairo-cairo-surface-t.html#id2641555">cairo_surface_set_device_offset ()</a> +<dt>cairo_surface_set_device_offset, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659035">cairo_surface_set_device_offset ()</a> </dt> -<dt>cairo_surface_set_fallback_resolution, <a href="cairo-cairo-surface-t.html#id2641822">cairo_surface_set_fallback_resolution ()</a> +<dt>cairo_surface_set_fallback_resolution, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659302">cairo_surface_set_fallback_resolution ()</a> </dt> -<dt>cairo_surface_set_user_data, <a href="cairo-cairo-surface-t.html#id2642515">cairo_surface_set_user_data ()</a> +<dt>cairo_surface_set_user_data, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659995">cairo_surface_set_user_data ()</a> </dt> -<dt>cairo_surface_status, <a href="cairo-cairo-surface-t.html#id2640832">cairo_surface_status ()</a> +<dt>cairo_surface_status, <a class="indexterm" href="cairo-cairo-surface-t.html#id2658314">cairo_surface_status ()</a> </dt> -<dt>cairo_surface_t, <a href="cairo-cairo-surface-t.html#id2629976">cairo_surface_t</a> +<dt>cairo_surface_t, <a class="indexterm" href="cairo-cairo-surface-t.html#id2648329">cairo_surface_t</a> </dt> -<dt>cairo_surface_type_t, <a href="cairo-cairo-surface-t.html#id2641981">enum cairo_surface_type_t</a> +<dt>cairo_surface_type_t, <a class="indexterm" href="cairo-cairo-surface-t.html#id2659460">enum cairo_surface_type_t</a> </dt> -<dt>cairo_surface_write_to_png, <a href="cairo-PNG-Support.html#id2639655">cairo_surface_write_to_png ()</a> +<dt>cairo_surface_write_to_png, <a class="indexterm" href="cairo-PNG-Support.html#id2657033">cairo_surface_write_to_png ()</a> </dt> -<dt>cairo_surface_write_to_png_stream, <a href="cairo-PNG-Support.html#id2637100">cairo_surface_write_to_png_stream ()</a> +<dt>cairo_surface_write_to_png_stream, <a class="indexterm" href="cairo-PNG-Support.html#id2654588">cairo_surface_write_to_png_stream ()</a> </dt> -<dt>cairo_svg_get_versions, <a href="cairo-SVG-Surfaces.html#id2644186">cairo_svg_get_versions ()</a> +<dt>cairo_svg_get_versions, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661689">cairo_svg_get_versions ()</a> </dt> -<dt>cairo_svg_surface_create, <a href="cairo-SVG-Surfaces.html#id2643368">cairo_svg_surface_create ()</a> +<dt>cairo_svg_surface_create, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2660838">cairo_svg_surface_create ()</a> </dt> -<dt>cairo_svg_surface_create_for_stream, <a href="cairo-SVG-Surfaces.html#id2643514">cairo_svg_surface_create_for_stream ()</a> +<dt>cairo_svg_surface_create_for_stream, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2660984">cairo_svg_surface_create_for_stream ()</a> </dt> -<dt>cairo_svg_surface_restrict_to_version, <a href="cairo-SVG-Surfaces.html#id2643700">cairo_svg_surface_restrict_to_version ()</a> +<dt>cairo_svg_surface_restrict_to_version, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661170">cairo_svg_surface_restrict_to_version ()</a> </dt> -<dt>cairo_svg_version_t, <a href="cairo-SVG-Surfaces.html#id2643822">enum cairo_svg_version_t</a> +<dt>cairo_svg_version_t, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661292">enum cairo_svg_version_t</a> </dt> -<dt>cairo_svg_version_to_string, <a href="cairo-SVG-Surfaces.html#id2644289">cairo_svg_version_to_string ()</a> +<dt>cairo_svg_version_to_string, <a class="indexterm" href="cairo-SVG-Surfaces.html#id2661792">cairo_svg_version_to_string ()</a> </dt> -<dt>cairo_t, <a href="cairo-cairo-t.html#id2613147">cairo_t</a> +<dt>cairo_t, <a class="indexterm" href="cairo-cairo-t.html#id2630576">cairo_t</a> </dt> -<dt>cairo_text_extents, <a href="cairo-Text.html#id2628847">cairo_text_extents ()</a> +<dt>cairo_text_extents, <a class="indexterm" href="cairo-Text.html#id2646298">cairo_text_extents ()</a> </dt> -<dt>cairo_text_extents_t, <a href="cairo-Scaled-Fonts.html#id2632556">cairo_text_extents_t</a> +<dt>cairo_text_extents_t, <a class="indexterm" href="cairo-Scaled-Fonts.html#id2650012">cairo_text_extents_t</a> </dt> -<dt>cairo_text_path, <a href="cairo-Paths.html#id2563502">cairo_text_path ()</a> +<dt>cairo_text_path, <a class="indexterm" href="cairo-Paths.html#id2580868">cairo_text_path ()</a> </dt> -<dt>cairo_transform, <a href="cairo-Transformations.html#id2566262">cairo_transform ()</a> +<dt>cairo_transform, <a class="indexterm" href="cairo-Transformations.html#id2629677">cairo_transform ()</a> </dt> -<dt>cairo_translate, <a href="cairo-Transformations.html#id2574513">cairo_translate ()</a> +<dt>cairo_translate, <a class="indexterm" href="cairo-Transformations.html#id2628036">cairo_translate ()</a> </dt> -<dt>cairo_user_data_key_t, <a href="cairo-Types.html#id2649546">cairo_user_data_key_t</a> +<dt>cairo_user_data_key_t, <a class="indexterm" href="cairo-Types.html#id2666845">cairo_user_data_key_t</a> </dt> -<dt>cairo_user_to_device, <a href="cairo-Transformations.html#id2566835">cairo_user_to_device ()</a> +<dt>cairo_user_to_device, <a class="indexterm" href="cairo-Transformations.html#id2629121">cairo_user_to_device ()</a> </dt> -<dt>cairo_user_to_device_distance, <a href="cairo-Transformations.html#id2566940">cairo_user_to_device_distance ()</a> +<dt>cairo_user_to_device_distance, <a class="indexterm" href="cairo-Transformations.html#id2629225">cairo_user_to_device_distance ()</a> </dt> -<dt>CAIRO_VERSION, <a href="cairo-Version-Information.html#id2646243">CAIRO_VERSION</a> +<dt>CAIRO_VERSION, <a class="indexterm" href="cairo-Version-Information.html#id2664445">CAIRO_VERSION</a> </dt> -<dt>cairo_version, <a href="cairo-Version-Information.html#id2648131">cairo_version ()</a> +<dt>cairo_version, <a class="indexterm" href="cairo-Version-Information.html#id2664731">cairo_version ()</a> </dt> -<dt>CAIRO_VERSION_ENCODE, <a href="cairo-Version-Information.html#id2648032">CAIRO_VERSION_ENCODE()</a> +<dt>CAIRO_VERSION_ENCODE, <a class="indexterm" href="cairo-Version-Information.html#id2665894">CAIRO_VERSION_ENCODE()</a> </dt> -<dt>CAIRO_VERSION_MAJOR, <a href="cairo-Version-Information.html#id2646281">CAIRO_VERSION_MAJOR</a> +<dt>CAIRO_VERSION_MAJOR, <a class="indexterm" href="cairo-Version-Information.html#id2665781">CAIRO_VERSION_MAJOR</a> </dt> -<dt>CAIRO_VERSION_MICRO, <a href="cairo-Version-Information.html#id2646337">CAIRO_VERSION_MICRO</a> +<dt>CAIRO_VERSION_MICRO, <a class="indexterm" href="cairo-Version-Information.html#id2665837">CAIRO_VERSION_MICRO</a> </dt> -<dt>CAIRO_VERSION_MINOR, <a href="cairo-Version-Information.html#id2646309">CAIRO_VERSION_MINOR</a> +<dt>CAIRO_VERSION_MINOR, <a class="indexterm" href="cairo-Version-Information.html#id2665809">CAIRO_VERSION_MINOR</a> </dt> -<dt>CAIRO_VERSION_STRING, <a href="cairo-Version-Information.html#id2648004">CAIRO_VERSION_STRING</a> +<dt>CAIRO_VERSION_STRING, <a class="indexterm" href="cairo-Version-Information.html#id2665865">CAIRO_VERSION_STRING</a> </dt> -<dt>cairo_version_string, <a href="cairo-Version-Information.html#id2648236">cairo_version_string ()</a> +<dt>cairo_version_string, <a class="indexterm" href="cairo-Version-Information.html#id2664834">cairo_version_string ()</a> </dt> -<dt>cairo_win32_font_face_create_for_hfont, <a href="cairo-Win32-Fonts.html#id2634612">cairo_win32_font_face_create_for_hfont ()</a> +<dt>cairo_win32_font_face_create_for_hfont, <a class="indexterm" href="cairo-Win32-Fonts.html#id2576550">cairo_win32_font_face_create_for_hfont ()</a> </dt> -<dt>cairo_win32_font_face_create_for_logfontw, <a href="cairo-Win32-Fonts.html#id2629256">cairo_win32_font_face_create_for_logfontw ()</a> +<dt>cairo_win32_font_face_create_for_logfontw, <a class="indexterm" href="cairo-Win32-Fonts.html#id2576953">cairo_win32_font_face_create_for_logfontw ()</a> </dt> -<dt>cairo_win32_scaled_font_done_font, <a href="cairo-Win32-Fonts.html#id2629574">cairo_win32_scaled_font_done_font ()</a> +<dt>cairo_win32_scaled_font_done_font, <a class="indexterm" href="cairo-Win32-Fonts.html#id2647921">cairo_win32_scaled_font_done_font ()</a> </dt> -<dt>cairo_win32_scaled_font_get_device_to_logical, <a href="cairo-Win32-Fonts.html#id2629839">cairo_win32_scaled_font_get_device_to_logical ()</a> +<dt>cairo_win32_scaled_font_get_device_to_logical, <a class="indexterm" href="cairo-Win32-Fonts.html#id2648187">cairo_win32_scaled_font_get_device_to_logical ()</a> </dt> -<dt>cairo_win32_scaled_font_get_logical_to_device, <a href="cairo-Win32-Fonts.html#id2629735">cairo_win32_scaled_font_get_logical_to_device ()</a> +<dt>cairo_win32_scaled_font_get_logical_to_device, <a class="indexterm" href="cairo-Win32-Fonts.html#id2648083">cairo_win32_scaled_font_get_logical_to_device ()</a> </dt> -<dt>cairo_win32_scaled_font_get_metrics_factor, <a href="cairo-Win32-Fonts.html#id2629645">cairo_win32_scaled_font_get_metrics_factor ()</a> +<dt>cairo_win32_scaled_font_get_metrics_factor, <a class="indexterm" href="cairo-Win32-Fonts.html#id2647992">cairo_win32_scaled_font_get_metrics_factor ()</a> </dt> -<dt>cairo_win32_scaled_font_select_font, <a href="cairo-Win32-Fonts.html#id2610404">cairo_win32_scaled_font_select_font ()</a> +<dt>cairo_win32_scaled_font_select_font, <a class="indexterm" href="cairo-Win32-Fonts.html#id2647465">cairo_win32_scaled_font_select_font ()</a> </dt> -<dt>cairo_win32_surface_create, <a href="cairo-Win32-Surfaces.html#id2644907">cairo_win32_surface_create ()</a> +<dt>cairo_win32_surface_create, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2662379">cairo_win32_surface_create ()</a> </dt> -<dt>cairo_win32_surface_create_with_ddb, <a href="cairo-Win32-Surfaces.html#id2642897">cairo_win32_surface_create_with_ddb ()</a> +<dt>cairo_win32_surface_create_with_ddb, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660371">cairo_win32_surface_create_with_ddb ()</a> </dt> -<dt>cairo_win32_surface_create_with_dib, <a href="cairo-Win32-Surfaces.html#id2644981">cairo_win32_surface_create_with_dib ()</a> +<dt>cairo_win32_surface_create_with_dib, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2662454">cairo_win32_surface_create_with_dib ()</a> </dt> -<dt>cairo_win32_surface_get_dc, <a href="cairo-Win32-Surfaces.html#id2643047">cairo_win32_surface_get_dc ()</a> +<dt>cairo_win32_surface_get_dc, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660517">cairo_win32_surface_get_dc ()</a> </dt> -<dt>cairo_win32_surface_get_image, <a href="cairo-Win32-Surfaces.html#id2643138">cairo_win32_surface_get_image ()</a> +<dt>cairo_win32_surface_get_image, <a class="indexterm" href="cairo-Win32-Surfaces.html#id2660608">cairo_win32_surface_get_image ()</a> </dt> -<dt>cairo_write_func_t, <a href="cairo-PNG-Support.html#id2636973">cairo_write_func_t ()</a> +<dt>cairo_write_func_t, <a class="indexterm" href="cairo-PNG-Support.html#id2654460">cairo_write_func_t ()</a> </dt> -<dt>cairo_xlib_surface_create, <a href="cairo-XLib-Surfaces.html#id2648445">cairo_xlib_surface_create ()</a> +<dt>cairo_xlib_surface_create, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2661382">cairo_xlib_surface_create ()</a> </dt> -<dt>cairo_xlib_surface_create_for_bitmap, <a href="cairo-XLib-Surfaces.html#id2644468">cairo_xlib_surface_create_for_bitmap ()</a> +<dt>cairo_xlib_surface_create_for_bitmap, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2661967">cairo_xlib_surface_create_for_bitmap ()</a> </dt> -<dt>cairo_xlib_surface_get_depth, <a href="cairo-XLib-Surfaces.html#id2649252">cairo_xlib_surface_get_depth ()</a> +<dt>cairo_xlib_surface_get_depth, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666649">cairo_xlib_surface_get_depth ()</a> </dt> -<dt>cairo_xlib_surface_get_display, <a href="cairo-XLib-Surfaces.html#id2644768">cairo_xlib_surface_get_display ()</a> +<dt>cairo_xlib_surface_get_display, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666031">cairo_xlib_surface_get_display ()</a> </dt> -<dt>cairo_xlib_surface_get_drawable, <a href="cairo-XLib-Surfaces.html#id2648888">cairo_xlib_surface_get_drawable ()</a> +<dt>cairo_xlib_surface_get_drawable, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666319">cairo_xlib_surface_get_drawable ()</a> </dt> -<dt>cairo_xlib_surface_get_height, <a href="cairo-XLib-Surfaces.html#id2649161">cairo_xlib_surface_get_height ()</a> +<dt>cairo_xlib_surface_get_height, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666566">cairo_xlib_surface_get_height ()</a> </dt> -<dt>cairo_xlib_surface_get_screen, <a href="cairo-XLib-Surfaces.html#id2648666">cairo_xlib_surface_get_screen ()</a> +<dt>cairo_xlib_surface_get_screen, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666111">cairo_xlib_surface_get_screen ()</a> </dt> -<dt>cairo_xlib_surface_get_visual, <a href="cairo-XLib-Surfaces.html#id2648978">cairo_xlib_surface_get_visual ()</a> +<dt>cairo_xlib_surface_get_visual, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666401">cairo_xlib_surface_get_visual ()</a> </dt> -<dt>cairo_xlib_surface_get_width, <a href="cairo-XLib-Surfaces.html#id2649069">cairo_xlib_surface_get_width ()</a> +<dt>cairo_xlib_surface_get_width, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666483">cairo_xlib_surface_get_width ()</a> </dt> -<dt>cairo_xlib_surface_set_drawable, <a href="cairo-XLib-Surfaces.html#id2648748">cairo_xlib_surface_set_drawable ()</a> +<dt>cairo_xlib_surface_set_drawable, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2666192">cairo_xlib_surface_set_drawable ()</a> </dt> -<dt>cairo_xlib_surface_set_size, <a href="cairo-XLib-Surfaces.html#id2644646">cairo_xlib_surface_set_size ()</a> +<dt>cairo_xlib_surface_set_size, <a class="indexterm" href="cairo-XLib-Surfaces.html#id2662143">cairo_xlib_surface_set_size ()</a> </dt> </dl> </div> @@ -643,7 +643,7 @@ <h3>T</h3> <dl> <dt>types</dt> -<dd><dl><dt>cairo_matrix, <a href="cairo-cairo-matrix-t.html#id2650375">Description</a> +<dd><dl><dt>cairo_matrix, <a class="indexterm" href="cairo-cairo-matrix-t.html#id2663271">Description</a> </dt></dl></dd> </dl> </div> diff --git a/doc/public/html/language-bindings.html b/doc/public/html/language-bindings.html index 5bfe3f8..ba8da86 100644 --- a/doc/public/html/language-bindings.html +++ b/doc/public/html/language-bindings.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Appendix A. Creating a language binding for cairo</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="index-1.4.html" title="Index of new symbols in 1.4"> <link rel="next" href="bindings-memory.html" title="Memory management"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -46,7 +46,7 @@ <div class="titlepage"><div><div><h2 class="title" style="clear: both"> <a name="bindings-general"></a>General considerations</h2></div></div></div> <p> - The naming of the central <a href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> type is a + The naming of the central <a class="link" href="cairo-cairo-t.html#cairo-t"><span class="type">cairo_t</span></a> type is a special exception. The object is “a cairo context” not “a cairo”, and names such as <span class="type">cairo_t</span> rather than <span class="type">cairo_context_t</span> and diff --git a/doc/public/html/pt01.html b/doc/public/html/pt01.html index a1a4993..6b916b4 100644 --- a/doc/public/html/pt01.html +++ b/doc/public/html/pt01.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Part I. Tutorial</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="next" href="pt02.html" title="Part II. Reference"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -30,6 +30,6 @@ <td><a accesskey="n" href="pt02.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr></table> <div class="part" lang="en"><div class="titlepage"><div><div><h1 class="title"> -<a name="id2548884"></a>Part I. Tutorial</h1></div></div></div></div> +<a name="id2566370"></a>Part I. Tutorial</h1></div></div></div></div> </body> </html> diff --git a/doc/public/html/pt02.html b/doc/public/html/pt02.html index 5c81c32..cc734ab 100644 --- a/doc/public/html/pt02.html +++ b/doc/public/html/pt02.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=US-ASCII"> <title>Part II. Reference</title> -<meta name="generator" content="DocBook XSL Stylesheets V1.72.0"> +<meta name="generator" content="DocBook XSL Stylesheets V1.73.2"> <link rel="start" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="up" href="index.html" title="Cairo: A Vector Graphics Library"> <link rel="prev" href="pt01.html" title="Part I. Tutorial"> <link rel="next" href="Drawing.html" title="Drawing"> -<meta name="generator" content="GTK-Doc V1.8 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.9 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> <link rel="part" href="pt01.html" title="Part I. Tutorial"> <link rel="part" href="pt02.html" title="Part II. Reference"> @@ -29,7 +29,92 @@ <th width="100%" align="center">Cairo: A Vector Graphics Library</th> <td><a accesskey="n" href="Drawing.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr></table> -<div class="part" lang="en"><div class="titlepage"><div><div><h1 class="title"> -<a name="id2548902"></a>Part II. Reference</h1></div></div></div></div> +<div class="part" lang="en"> +<div class="titlepage"><div><div><h1 class="title"> +<a name="id2566326"></a>Part II. Reference</h1></div></div></div> +<div class="toc"> +<p><b>Table of Contents</b></p> +<dl> +<dt><span class="chapter"><a href="Drawing.html">Drawing</a></span></dt> +<dd><dl> +<dt> +<span class="refentrytitle"><a href="cairo-cairo-t.html">cairo_t</a></span><span class="refpurpose"> — The cairo drawing context</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Paths.html">Paths</a></span><span class="refpurpose"> — Creating paths and manipulating path data</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Patterns.html">Patterns</a></span><span class="refpurpose"> — Gradients and filtered sources</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Transformations.html">Transformations</a></span><span class="refpurpose"> — Manipulating the current transformation matrix</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Text.html">Text</a></span><span class="refpurpose"> — Rendering text and sets of glyphs</span> +</dt> +</dl></dd> +<dt><span class="chapter"><a href="Fonts.html">Fonts</a></span></dt> +<dd><dl> +<dt> +<span class="refentrytitle"><a href="cairo-cairo-font-face-t.html">cairo_font_face_t</a></span><span class="refpurpose"> — Base class for fonts</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Scaled-Fonts.html">Scaled Fonts</a></span><span class="refpurpose"> — Caching metrics for a particular font size</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Font-Options.html">Font Options</a></span><span class="refpurpose"> — How a font should be rendered</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-FreeType-Fonts.html">FreeType Fonts</a></span><span class="refpurpose"> — Font support for FreeType</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Win32-Fonts.html">Win32 Fonts</a></span><span class="refpurpose"> — Font support for Microsoft Windows</span> +</dt> +</dl></dd> +<dt><span class="chapter"><a href="Surfaces.html">Surfaces</a></span></dt> +<dd><dl> +<dt> +<span class="refentrytitle"><a href="cairo-cairo-surface-t.html">cairo_surface_t</a></span><span class="refpurpose"> — Base class for surfaces</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Image-Surfaces.html">Image Surfaces</a></span><span class="refpurpose"> — Rendering to memory buffers</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-PDF-Surfaces.html">PDF Surfaces</a></span><span class="refpurpose"> — Rendering PDF documents</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-PNG-Support.html">PNG Support</a></span><span class="refpurpose"> — Reading and writing PNG images</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-PostScript-Surfaces.html">PostScript Surfaces</a></span><span class="refpurpose"> — Rendering PostScript documents</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Win32-Surfaces.html">Win32 Surfaces</a></span><span class="refpurpose"> — Microsoft Windows surface support</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-SVG-Surfaces.html">SVG Surfaces</a></span><span class="refpurpose"> — Rendering SVG documents</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-XLib-Surfaces.html">XLib Surfaces</a></span><span class="refpurpose"> — X Window System rendering using XLib</span> +</dt> +</dl></dd> +<dt><span class="chapter"><a href="Support.html">Utilities</a></span></dt> +<dd><dl> +<dt> +<span class="refentrytitle"><a href="cairo-cairo-matrix-t.html">cairo_matrix_t</a></span><span class="refpurpose"> — Generic matrix operations</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Error-Handling.html">Error handling</a></span><span class="refpurpose"> — Decoding cairo's status</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Version-Information.html">Version Information</a></span><span class="refpurpose"> — Compile-time and run-time version checks.</span> +</dt> +<dt> +<span class="refentrytitle"><a href="cairo-Types.html">Types</a></span><span class="refpurpose"> — Generic data types used in the cairo API</span> +</dt> +</dl></dd> +</dl> +</div> +</div> </body> </html> diff --git a/doc/public/html/style.css b/doc/public/html/style.css index 2341768..cecc821 100644 --- a/doc/public/html/style.css +++ b/doc/public/html/style.css @@ -1,16 +1,16 @@ -.synopsis, .classsynopsis +.synopsis, .classsynopsis { background: #eeeeee; border: solid 1px #aaaaaa; padding: 0.5em; } -.programlisting +.programlisting { background: #eeeeff; border: solid 1px #aaaaff; padding: 0.5em; } -.variablelist +.variablelist { padding: 4px; margin-left: 3em; @@ -19,62 +19,88 @@ { vertical-align: top; } + /* this is needed so that the local anchors are displayed below the naviagtion */ -div.refnamediv a[name], div.refsect1 a[name] -{ - position: relative; - top: -4.5em; -} -table.navigation#top -{ - background: #ffeeee; - border: solid 1px #ffaaaa; - margin-top: 0; - margin-bottom: 0; - position: fixed; - top: 0; - left: 0; - height: 2em; - z-index: 1; -} -.navigation a -{ - color: #770000; +@media screen { + div.refnamediv a[name], div.refsect1 a[name] + { + position: relative; + top: -4.5em; + } + table.navigation#top + { + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + position: fixed; + top: 0; + left: 0; + height: 2em; + z-index: 1; + } + .navigation a + { + color: #770000; + } + .navigation a:visited + { + color: #550000; + } + td.shortcuts + { + color: #770000; + font-size: 80%; + } + div.refentry, div.chapter, div.reference, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } +} +@media print { + table.navigation { + visibility: collapse; + display: none; + } + div.titlepage table.navigation { + visibility: visible; + display: table; + background: #ffeeee; + border: solid 1px #ffaaaa; + margin-top: 0; + margin-bottom: 0; + top: 0; + left: 0; + height: 2em; + } } -.navigation a:visited -{ - color: #550000; -} -.navigation .title + +.navigation .title { font-size: 200%; } -td.shortcuts -{ - color: #770000; - font-size: 80%; -} -div.refentry, div.chapter, div.part, div.book, div.index, div.glossary, div.sect1, div.appendix, div.preface -{ - position: relative; - top: 3em; - z-index: 0; -} -div.refnamediv -{ - margin-top: 2em; -} -div.gallery-float + +div.gallery-float { float: left; padding: 10px; } -div.gallery-float img +div.gallery-float img { border-style: none; } -div.gallery-spacer +div.gallery-spacer { clear: both; } @@ -110,3 +136,13 @@ div.table table th { background-color: #eeeeee; } + +hr +{ + color: #888; + background: #888; + border: 0; + height: 1px; + clear: both; +} + diff --git a/doc/public/version.xml b/doc/public/version.xml index ac9f79c..f86e029 100644 --- a/doc/public/version.xml +++ b/doc/public/version.xml @@ -1 +1 @@ -1.4.10 +1.4.12 diff --git a/doc/public/xml/cairo-beos.xml b/doc/public/xml/cairo-beos.xml deleted file mode 100644 index 1bbec1a..0000000 --- a/doc/public/xml/cairo-beos.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<refentry id="cairo-BeOS-Surfaces"> -<refmeta> -<refentrytitle role="top_of_page">BeOS Surfaces</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>CAIRO Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>BeOS Surfaces</refname> -<refpurpose>BeOS surface support</refpurpose> -<!--[<xref linkend="desc" endterm="desc.title"/>]--> -</refnamediv> - -<refsynopsisdiv role="synopsis"> -<title role="synopsis.title">Synopsis</title> - -<synopsis> - - - -</synopsis> -</refsynopsisdiv> - - - - - - - - - -<refsect1 role="desc"> -<title role="desc.title">Description</title> -<para> - -</para> -</refsect1> - -<refsect1 role="details"> -<title role="details.title">Details</title> - -</refsect1> - - - - -</refentry> diff --git a/doc/public/xml/cairo-font-options.xml b/doc/public/xml/cairo-font-options.xml index d514672..0b77d87 100644 --- a/doc/public/xml/cairo-font-options.xml +++ b/doc/public/xml/cairo-font-options.xml @@ -494,4 +494,6 @@ See the documentation for <link linkend="cairo-hint-metrics-t"><type>cairo_hint_ + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-font.xml b/doc/public/xml/cairo-font.xml index 16e0fb8..a992db5 100644 --- a/doc/public/xml/cairo-font.xml +++ b/doc/public/xml/cairo-font.xml @@ -289,4 +289,6 @@ attached to + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-ft.xml b/doc/public/xml/cairo-ft.xml index ae1d69d..b5fc7c0 100644 --- a/doc/public/xml/cairo-ft.xml +++ b/doc/public/xml/cairo-ft.xml @@ -200,4 +200,6 @@ Releases a face obtained with <link linkend="cairo-ft-scaled-font-lock-face"><fu + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-glitz.xml b/doc/public/xml/cairo-glitz.xml deleted file mode 100644 index 61641eb..0000000 --- a/doc/public/xml/cairo-glitz.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<refentry id="cairo-Glitz-Surfaces"> -<refmeta> -<refentrytitle role="top_of_page">Glitz Surfaces</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>CAIRO Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>Glitz Surfaces</refname> -<refpurpose>OpenGL accelerated rendering using the Glitz library</refpurpose> -<!--[<xref linkend="desc" endterm="desc.title"/>]--> -</refnamediv> - -<refsynopsisdiv role="synopsis"> -<title role="synopsis.title">Synopsis</title> - -<synopsis> - - - -</synopsis> -</refsynopsisdiv> - - - - - - - - - -<refsect1 role="desc"> -<title role="desc.title">Description</title> -<para> - -</para> -</refsect1> - -<refsect1 role="details"> -<title role="details.title">Details</title> - -</refsect1> - - - - -</refentry> diff --git a/doc/public/xml/cairo-image.xml b/doc/public/xml/cairo-image.xml index 6c1db9a..a54cf86 100644 --- a/doc/public/xml/cairo-image.xml +++ b/doc/public/xml/cairo-image.xml @@ -282,4 +282,6 @@ beginning of the next row. + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-matrix.xml b/doc/public/xml/cairo-matrix.xml index 4af0d4f..993f401 100644 --- a/doc/public/xml/cairo-matrix.xml +++ b/doc/public/xml/cairo-matrix.xml @@ -334,18 +334,16 @@ direction. Changes <parameter>matrix</parameter> to be the inverse of it's original value. Not all transformation matrices have inverses; if the matrix collapses points together (it is <firstterm>degenerate</firstterm>), -then it has no inverse and this function will fail. -</para> -<para> -Returns: If <parameter>matrix</parameter> has an inverse, modifies <parameter>matrix</parameter> to - be the inverse matrix and returns <link linkend="CAIRO-STATUS-SUCCESS:CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link>. Otherwise,</para> +then it has no inverse and this function will fail.</para> <para> </para><variablelist role="params"> <varlistentry><term><parameter>matrix</parameter> :</term> <listitem><simpara> a <link linkend="cairo-matrix-t"><type>cairo_matrix_t</type></link> </simpara></listitem></varlistentry> -<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara><link linkend="CAIRO-STATUS-INVALID-MATRIX:CAPS"><literal>CAIRO_STATUS_INVALID_MATRIX</literal></link>. +<varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> If <parameter>matrix</parameter> has an inverse, modifies <parameter>matrix</parameter> to + be the inverse matrix and returns <link linkend="CAIRO-STATUS-SUCCESS:CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link>. Otherwise, + returns <link linkend="CAIRO-STATUS-INVALID-MATRIX:CAPS"><literal>CAIRO_STATUS_INVALID_MATRIX</literal></link>. </simpara></listitem></varlistentry> </variablelist></refsect2> <refsect2> @@ -436,4 +434,6 @@ Transforms the point (<parameter>x</parameter>, <parameter>y</parameter>) by <pa + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-paths.xml b/doc/public/xml/cairo-paths.xml index db88b7d..7937f5f 100644 --- a/doc/public/xml/cairo-paths.xml +++ b/doc/public/xml/cairo-paths.xml @@ -189,7 +189,7 @@ with <link linkend="cairo-move-to"><function>cairo_move_to()</function></link>, <link linkend="cairo-close-path"><function>cairo_close_path()</function></link>. </para> <para> -Here is sample code for iterating through a <link linkend="cairo-path-t--"><type>cairo_path_t:</type></link> +Here is sample code for iterating through a <link linkend="cairo-path-t--"><type>""</type></link> </para> <para> <informalexample><programlisting> @@ -931,4 +931,6 @@ CAIRO_STATUS_NO_CURRENT_POINT.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-pattern.xml b/doc/public/xml/cairo-pattern.xml index 805f17f..512be83 100644 --- a/doc/public/xml/cairo-pattern.xml +++ b/doc/public/xml/cairo-pattern.xml @@ -1026,4 +1026,6 @@ attached to + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-pdf.xml b/doc/public/xml/cairo-pdf.xml index e16aed3..1354587 100644 --- a/doc/public/xml/cairo-pdf.xml +++ b/doc/public/xml/cairo-pdf.xml @@ -154,4 +154,6 @@ surface or immediately after completing a page with either + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-png.xml b/doc/public/xml/cairo-png.xml index 7a32597..69f2da4 100644 --- a/doc/public/xml/cairo-png.xml +++ b/doc/public/xml/cairo-png.xml @@ -214,4 +214,6 @@ pixel contents. + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-ps.xml b/doc/public/xml/cairo-ps.xml index 6b34212..d5c6e0f 100644 --- a/doc/public/xml/cairo-ps.xml +++ b/doc/public/xml/cairo-ps.xml @@ -330,4 +330,6 @@ cairo_ps_surface_dsc_comment (surface, "%%IncludeFeature: *PageSize A5"); + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-quartz.xml b/doc/public/xml/cairo-quartz.xml deleted file mode 100644 index 88fb32d..0000000 --- a/doc/public/xml/cairo-quartz.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<refentry id="cairo-Quartz-Surfaces"> -<refmeta> -<refentrytitle role="top_of_page">Quartz Surfaces</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>CAIRO Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>Quartz Surfaces</refname> -<refpurpose>Rendering to Quartz surfaces</refpurpose> -<!--[<xref linkend="desc" endterm="desc.title"/>]--> -</refnamediv> - -<refsynopsisdiv role="synopsis"> -<title role="synopsis.title">Synopsis</title> - -<synopsis> - - - -</synopsis> -</refsynopsisdiv> - - - - - - - - - -<refsect1 role="desc"> -<title role="desc.title">Description</title> -<para> - -</para> -</refsect1> - -<refsect1 role="details"> -<title role="details.title">Details</title> - -</refsect1> - - - - -</refentry> diff --git a/doc/public/xml/cairo-scaled-font.xml b/doc/public/xml/cairo-scaled-font.xml index 9179b87..6363ced 100644 --- a/doc/public/xml/cairo-scaled-font.xml +++ b/doc/public/xml/cairo-scaled-font.xml @@ -573,4 +573,6 @@ attached to + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-status.xml b/doc/public/xml/cairo-status.xml index 20ea538..9330bcb 100644 --- a/doc/public/xml/cairo-status.xml +++ b/doc/public/xml/cairo-status.xml @@ -248,4 +248,6 @@ failure due to a hash table being destroyed when non-empty).</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-surface.xml b/doc/public/xml/cairo-surface.xml index a13fc16..ccc0848 100644 --- a/doc/public/xml/cairo-surface.xml +++ b/doc/public/xml/cairo-surface.xml @@ -229,7 +229,7 @@ surface.</para> </simpara></listitem></varlistentry> <varlistentry><term><emphasis>Returns</emphasis> :</term><listitem><simpara> <link linkend="CAIRO-STATUS-SUCCESS:CAPS"><literal>CAIRO_STATUS_SUCCESS</literal></link>, <link linkend="CAIRO-STATUS-NULL-POINTER:CAPS"><literal>CAIRO_STATUS_NULL_POINTER</literal></link>, <link linkend="CAIRO-STATUS-NO-MEMORY:CAPS"><literal>CAIRO_STATUS_NO_MEMORY</literal></link>, <link linkend="CAIRO-STATUS-READ-ERROR:CAPS"><literal>CAIRO_STATUS_READ_ERROR</literal></link>, -<link linkend="CAIRO-STATUS-INVALID-CONTENT:CAPS"><literal>CAIRO_STATUS_INVALID_CONTENT</literal></link>, <link linkend="CAIRO-STATUS-INVALUE-FORMAT:CAPS"><literal>CAIRO_STATUS_INVALUE_FORMAT</literal></link>, or +<link linkend="CAIRO-STATUS-INVALID-CONTENT:CAPS"><literal>CAIRO_STATUS_INVALID_CONTENT</literal></link>, <link linkend="CAIRO-STATUS-INVALID-FORMAT:CAPS"><literal>CAIRO_STATUS_INVALID_FORMAT</literal></link>, or <link linkend="CAIRO-STATUS-INVALID-VISUAL:CAPS"><literal>CAIRO_STATUS_INVALID_VISUAL</literal></link>. </simpara></listitem></varlistentry> </variablelist></refsect2> @@ -662,4 +662,6 @@ attached to + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-svg.xml b/doc/public/xml/cairo-svg.xml index 0909853..3ffeb8a 100644 --- a/doc/public/xml/cairo-svg.xml +++ b/doc/public/xml/cairo-svg.xml @@ -214,4 +214,6 @@ for a way to get the list of valid version ids.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-text.xml b/doc/public/xml/cairo-text.xml index 4ec4e6f..e54225e 100644 --- a/doc/public/xml/cairo-text.xml +++ b/doc/public/xml/cairo-text.xml @@ -541,4 +541,6 @@ will be stored + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-transforms.xml b/doc/public/xml/cairo-transforms.xml index 79900de..a7b7f6a 100644 --- a/doc/public/xml/cairo-transforms.xml +++ b/doc/public/xml/cairo-transforms.xml @@ -300,4 +300,6 @@ transforming (<parameter>dx</parameter>,<parameter>dy</parameter>).</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-types.xml b/doc/public/xml/cairo-types.xml index f7dd64d..d094244 100644 --- a/doc/public/xml/cairo-types.xml +++ b/doc/public/xml/cairo-types.xml @@ -106,4 +106,6 @@ element and should free any memory and resources allocated for it.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-version.xml b/doc/public/xml/cairo-version.xml index 68bc6be..6d20e0b 100644 --- a/doc/public/xml/cairo-version.xml +++ b/doc/public/xml/cairo-version.xml @@ -174,14 +174,14 @@ The minor component of the version of cairo available at compile-time. </para></refsect2> <refsect2> <title><anchor id="CAIRO-VERSION-MICRO:CAPS" role="macro"/>CAIRO_VERSION_MICRO</title> -<indexterm><primary>CAIRO_VERSION_MICRO</primary></indexterm><programlisting>#define CAIRO_VERSION_MICRO 10 +<indexterm><primary>CAIRO_VERSION_MICRO</primary></indexterm><programlisting>#define CAIRO_VERSION_MICRO 12 </programlisting> <para> The micro component of the version of cairo available at compile-time. </para></refsect2> <refsect2> <title><anchor id="CAIRO-VERSION-STRING:CAPS" role="macro"/>CAIRO_VERSION_STRING</title> -<indexterm><primary>CAIRO_VERSION_STRING</primary></indexterm><programlisting>#define CAIRO_VERSION_STRING "1.4.10" +<indexterm><primary>CAIRO_VERSION_STRING</primary></indexterm><programlisting>#define CAIRO_VERSION_STRING "1.4.12" </programlisting> <para> A human-readable string literal containing the version of cairo available @@ -256,4 +256,6 @@ See also <link linkend="cairo-version"><function>cairo_version()</function></lin + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-win32-fonts.xml b/doc/public/xml/cairo-win32-fonts.xml index 8d06fa0..40bda3c 100644 --- a/doc/public/xml/cairo-win32-fonts.xml +++ b/doc/public/xml/cairo-win32-fonts.xml @@ -212,4 +212,6 @@ used by <parameter>scaled_font</parameter>.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-win32.xml b/doc/public/xml/cairo-win32.xml index 68a9923..06fa030 100644 --- a/doc/public/xml/cairo-win32.xml +++ b/doc/public/xml/cairo-win32.xml @@ -169,4 +169,6 @@ or NULL if the win32 surface is not a DIB. + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-xcb-xrender.xml b/doc/public/xml/cairo-xcb-xrender.xml deleted file mode 100644 index 65197b6..0000000 --- a/doc/public/xml/cairo-xcb-xrender.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<refentry id="cairo-XCB-Render-Surfaces"> -<refmeta> -<refentrytitle role="top_of_page">XCB Surfaces</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>CAIRO Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>XCB Surfaces</refname> -<refpurpose>X Window System rendering using the XCB library</refpurpose> -<!--[<xref linkend="desc" endterm="desc.title"/>]--> -</refnamediv> - -<refsynopsisdiv role="synopsis"> -<title role="synopsis.title">Synopsis</title> - -<synopsis> - - - -</synopsis> -</refsynopsisdiv> - - - - - - - - - -<refsect1 role="desc"> -<title role="desc.title">Description</title> -<para> - -</para> -</refsect1> - -<refsect1 role="details"> -<title role="details.title">Details</title> - -</refsect1> - - - - -</refentry> diff --git a/doc/public/xml/cairo-xcb.xml b/doc/public/xml/cairo-xcb.xml deleted file mode 100644 index 31ee9bf..0000000 --- a/doc/public/xml/cairo-xcb.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ -<!ENTITY version SYSTEM "version.xml"> -]> -<refentry id="cairo-XCB-Surfaces"> -<refmeta> -<refentrytitle role="top_of_page">XCB Surfaces</refentrytitle> -<manvolnum>3</manvolnum> -<refmiscinfo>CAIRO Library</refmiscinfo> -</refmeta> - -<refnamediv> -<refname>XCB Surfaces</refname> -<refpurpose>X Window System rendering using the XCB library</refpurpose> -<!--[<xref linkend="desc" endterm="desc.title"/>]--> -</refnamediv> - -<refsynopsisdiv role="synopsis"> -<title role="synopsis.title">Synopsis</title> - -<synopsis> - - - -</synopsis> -</refsynopsisdiv> - - - - - - - - - -<refsect1 role="desc"> -<title role="desc.title">Description</title> -<para> - -</para> -</refsect1> - -<refsect1 role="details"> -<title role="details.title">Details</title> - -</refsect1> - - - - -</refentry> diff --git a/doc/public/xml/cairo-xlib-xrender.xml b/doc/public/xml/cairo-xlib-xrender.xml index e560c38..2a6ceb4 100644 --- a/doc/public/xml/cairo-xlib-xrender.xml +++ b/doc/public/xml/cairo-xlib-xrender.xml @@ -99,4 +99,6 @@ window changes.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo-xlib.xml b/doc/public/xml/cairo-xlib.xml index bc64690..e07b29f 100644 --- a/doc/public/xml/cairo-xlib.xml +++ b/doc/public/xml/cairo-xlib.xml @@ -321,4 +321,6 @@ Get the number of bits used to represent each pixel value.</para> + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> diff --git a/doc/public/xml/cairo.xml b/doc/public/xml/cairo.xml index b260d37..802e408 100644 --- a/doc/public/xml/cairo.xml +++ b/doc/public/xml/cairo.xml @@ -1858,4 +1858,6 @@ attached to + +<refsect1><refsect2 /><refsect2 /></refsect1> </refentry> @@ -1,8 +1,8 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # # This program is free software; you can redistribute it and/or modify @@ -43,14 +43,22 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.22 Debian 1.5.22-4" -TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" - -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes. -if test -n "${ZSH_VERSION+set}" ; then +VERSION="1.5.24 Debian 1.5.24-1" +TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)" + +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -105,12 +113,14 @@ esac # These must not be set unconditionally because not all systems understand # e.g. LANG=C (notably SCO). # We save the old values to restore during execute mode. -if test "${LC_ALL+set}" = set; then - save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL -fi -if test "${LANG+set}" = set; then - save_LANG="$LANG"; LANG=C; export LANG -fi +for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES +do + eval "if test \"\${$lt_var+set}\" = set; then + save_$lt_var=\$$lt_var + $lt_var=C + export $lt_var + fi" +done # Make sure IFS has a sensible default lt_nl=' @@ -136,6 +146,8 @@ duplicate_deps=no preserve_args= lo2o="s/\\.lo\$/.${objext}/" o2lo="s/\\.${objext}\$/.lo/" +extracted_archives= +extracted_serial=0 ##################################### # Shell function definitions: @@ -196,7 +208,13 @@ func_win32_libid () if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ - $SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'` + $SED -n -e '1,100{ + / I /{ + s,.*,import, + p + q + } + }'` case $win32_nmres in import*) win32_libid_type="x86 archive import";; *) win32_libid_type="x86 archive static";; @@ -327,7 +345,17 @@ func_extract_archives () *) my_xabs=`pwd`"/$my_xlib" ;; esac my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` - my_xdir="$my_gentop/$my_xlib" + my_xlib_u=$my_xlib + while :; do + case " $extracted_archives " in + *" $my_xlib_u "*) + extracted_serial=`expr $extracted_serial + 1` + my_xlib_u=lt$extracted_serial-$my_xlib ;; + *) break ;; + esac + done + extracted_archives="$extracted_archives $my_xlib_u" + my_xdir="$my_gentop/$my_xlib_u" $show "${rm}r $my_xdir" $run ${rm}r "$my_xdir" @@ -454,11 +482,12 @@ do ;; --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2005 Free Software Foundation, Inc." - $echo "This is free software; see the source for copying conditions. There is NO" - $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + echo "\ +$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP + +Copyright (C) 2007 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." exit $? ;; @@ -755,9 +784,10 @@ if test -z "$show_help"; then *.class) xform=class ;; *.cpp) xform=cpp ;; *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; + *.[fF][09]?) xform=[fF][09]. ;; *.for) xform=for ;; *.java) xform=java ;; + *.obj) xform=obj ;; esac libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` @@ -1138,8 +1168,9 @@ EOF for arg do case $arg in - -all-static | -static) - if test "X$arg" = "X-all-static"; then + -all-static | -static | -static-libtool-libs) + case $arg in + -all-static) if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2 fi @@ -1147,12 +1178,20 @@ EOF dlopen_self=$dlopen_self_static fi prefer_static_libs=yes - else + ;; + -static) if test -z "$pic_flag" && test -n "$link_static_flag"; then dlopen_self=$dlopen_self_static fi prefer_static_libs=built - fi + ;; + -static-libtool-libs) + if test -z "$pic_flag" && test -n "$link_static_flag"; then + dlopen_self=$dlopen_self_static + fi + prefer_static_libs=yes + ;; + esac build_libtool_libs=no build_old_libs=yes break @@ -1600,7 +1639,7 @@ EOF continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) compiler_flags="$compiler_flags $arg" compile_command="$compile_command $arg" finalize_command="$finalize_command $arg" @@ -1620,10 +1659,11 @@ EOF # -m* pass through architecture-specific compiler args for GCC # -m*, -t[45]*, -txscale* pass through architecture-specific # compiler args for GCC - # -pg pass through profiling flag for GCC + # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC + # -F/path gives path to uninstalled frameworks, gcc on darwin # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \ - -t[45]*|-txscale*|@*) + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. @@ -1651,9 +1691,9 @@ EOF -no-install) case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*) # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. + # and Darwin in order for the loader to find any dlls it needs. $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 fast_install=no @@ -1712,7 +1752,7 @@ EOF continue ;; - -static) + -static | -static-libtool-libs) # The effects of -static are defined in a previous loop. # We used to do the same as -all-static on platforms that # didn't have a PIC flag, but the assumption that the effects @@ -2097,7 +2137,7 @@ EOF lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -2493,7 +2533,9 @@ EOF if test "$linkmode,$pass" = "prog,link"; then if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then + { { test "$prefer_static_libs" = no || + test "$prefer_static_libs,$installed" = "built,yes"; } || + test -z "$old_library"; }; then # We need to hardcode the library path if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. @@ -3189,7 +3231,7 @@ EOF # which has an extra 1 added just for fun # case $version_type in - darwin|linux|osf|windows) + darwin|linux|osf|windows|none) current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_revision" @@ -3200,9 +3242,10 @@ EOF age="0" ;; irix|nonstopux) - current=`expr $number_major + $number_minor - 1` + current=`expr $number_major + $number_minor` age="$number_minor" revision="$number_minor" + lt_irix_increment=no ;; *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 @@ -3266,7 +3309,8 @@ EOF versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" + verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" ;; freebsd-aout) @@ -3280,8 +3324,11 @@ EOF ;; irix | nonstopux) - major=`expr $current - $age + 1` - + if test "X$lt_irix_increment" = "Xno"; then + major=`expr $current - $age` + else + major=`expr $current - $age + 1` + fi case $version_type in nonstopux) verstring_prefix=nonstopux ;; *) verstring_prefix=sgi ;; @@ -3418,11 +3465,11 @@ EOF fi # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` - deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` - dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` - done + #for path in $notinst_path; do + # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"` + # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"` + # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"` + #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. @@ -3523,13 +3570,12 @@ EOF int main() { return 0; } EOF $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $deplibs - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then ldd_output=`ldd conftest` for i in $deplibs; do name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. - if test "$name" != "" && test "$name" -ne "0"; then + if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) @@ -3568,9 +3614,7 @@ EOF # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest - $LTCC $LTCFLAGS -o conftest conftest.c $i - # Did it work? - if test "$?" -eq 0 ; then + if $LTCC $LTCFLAGS -o conftest conftest.c $i; then ldd_output=`ldd conftest` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in @@ -3602,7 +3646,7 @@ EOF droppeddeps=yes $echo $echo "*** Warning! Library $i is needed by this library but I was not able to" - $echo "*** make it link in! You will probably need to install it or some" + $echo "*** make it link in! You will probably need to install it or some" $echo "*** library that it depends on before this library will be fully" $echo "*** functional. Installing it before continuing would be even better." fi @@ -3888,7 +3932,10 @@ EOF test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" + case $archive_cmds in + *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;; + *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;; + esac else eval dep_rpath=\"$hardcode_libdir_flag_spec\" fi @@ -4247,12 +4294,14 @@ EOF reload_conv_objs= gentop= # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec + # -Wl from whole_archive_flag_spec and hope we can get by with + # turning comma into space.. wl= if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then - eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" + eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" + reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` else gentop="$output_objdir/${obj}x" generated="$generated $gentop" @@ -4700,16 +4749,16 @@ static const void *lt_preloaded_setup() { case $host in *cygwin* | *mingw* ) if test -f "$output_objdir/${outputname}.def" ; then - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP` else - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` fi ;; * ) - compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP` ;; esac ;; @@ -4724,13 +4773,13 @@ static const void *lt_preloaded_setup() { # really was required. # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` + finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP` fi if test "$need_relink" = no || test "$build_libtool_libs" != yes; then # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. @@ -4817,7 +4866,7 @@ static const void *lt_preloaded_setup() { if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP` else # fast_install is set to needless relink_command= @@ -4854,7 +4903,7 @@ static const void *lt_preloaded_setup() { fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` fi # Quote $echo for shipping. @@ -5261,6 +5310,20 @@ EOF Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' +# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). +if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST +else + case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac +fi +BIN_SH=xpg4; export BIN_SH # for Tru64 +DUALCASE=1; export DUALCASE # for MKS sh + # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH @@ -5403,7 +5466,7 @@ else ;; esac $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" + \$echo \"\$0: cannot exec \$program \$*\" exit $EXIT_FAILURE fi else @@ -5589,7 +5652,7 @@ fi\ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -5934,9 +5997,9 @@ relink_command=\"$relink_command\"" if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP` else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` + relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP` fi $echo "$modename: warning: relinking \`$file'" 1>&2 @@ -6145,7 +6208,7 @@ relink_command=\"$relink_command\"" file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP` $show "$relink_command" if $run eval "$relink_command"; then : @@ -6356,8 +6419,10 @@ relink_command=\"$relink_command\"" if test -f "$dir/$objdir/$dlname"; then dir="$dir/$objdir" else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE + if test ! -f "$dir/$dlname"; then + $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 + exit $EXIT_FAILURE + fi fi ;; @@ -6421,12 +6486,12 @@ relink_command=\"$relink_command\"" fi # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi + for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES + do + eval "if test \"\${save_$lt_var+set}\" = set; then + $lt_var=\$save_$lt_var; export $lt_var + fi" + done # Now prepare to actually exec the command. exec_cmd="\$cmd$args" @@ -6783,9 +6848,9 @@ The following components of LINK-COMMAND are treated specially: -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE + try to export only the symbols listed in SYMFILE -export-symbols-regex REGEX - try to export only the symbols matching REGEX + try to export only the symbols matching REGEX -LLIBDIR search LIBDIR for required installed libraries -lNAME OUTPUT-FILE requires the installed library libNAME -module build a library that can dlopened @@ -6799,9 +6864,11 @@ The following components of LINK-COMMAND are treated specially: -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries + -static do not do any dynamic linking of uninstalled libtool libraries + -static-libtool-libs + do not do any dynamic linking of libtool libraries -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] + specify library version info [each variable defaults to 0] All other options (arguments beginning with \`-') are ignored. diff --git a/perf/Makefile.in b/perf/Makefile.in index 454c07f..6a68a9a 100644 --- a/perf/Makefile.in +++ b/perf/Makefile.in @@ -247,6 +247,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/pixman/Makefile.in b/pixman/Makefile.in index 2859354..f1bf389 100644 --- a/pixman/Makefile.in +++ b/pixman/Makefile.in @@ -205,6 +205,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/pixman/src/Makefile.in b/pixman/src/Makefile.in index edfe020..30c1b81 100644 --- a/pixman/src/Makefile.in +++ b/pixman/src/Makefile.in @@ -233,6 +233,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/pixman/src/fbcompose.c b/pixman/src/fbcompose.c index 4197e34..e2823ec 100644 --- a/pixman/src/fbcompose.c +++ b/pixman/src/fbcompose.c @@ -3883,7 +3883,7 @@ static void fbFetchExternalAlpha(PicturePtr pict, int x, int y, int width, CARD3 } if (width > SCANLINE_BUFFER_LENGTH) - alpha_buffer = (CARD32 *) malloc(width*sizeof(CARD32)); + alpha_buffer = (CARD32 *) _pixman_malloc_ab (width, sizeof(CARD32)); fbFetchTransformed(pict, x, y, width, buffer, mask, maskBits); fbFetchTransformed(pict->alphaMap, x - pict->alphaOrigin.x, @@ -4286,7 +4286,7 @@ pixman_compositeGeneral (pixman_operator_t op, compose_data.mask = pMask; compose_data.dest = pDst; if (width > SCANLINE_BUFFER_LENGTH) - scanline_buffer = (CARD32 *) malloc(width * 3 * sizeof(CARD32)); + scanline_buffer = (CARD32 *) _pixman_malloc_abc (width, 3, sizeof(CARD32)); n = pixman_region_num_rects (®ion); pbox = pixman_region_rects (®ion); diff --git a/pixman/src/icimage.c b/pixman/src/icimage.c index 61a84c5..8bcccc4 100644 --- a/pixman/src/icimage.c +++ b/pixman/src/icimage.c @@ -215,8 +215,8 @@ pixman_image_create_linear_gradient (const pixman_linear_gradient_t *gradient, if (!image) return NULL; - linear = malloc (sizeof (pixman_linear_gradient_image_t) + - sizeof (pixman_gradient_stop_t) * n_stops); + linear = _pixman_malloc_ab_plus_c (n_stops, sizeof (pixman_gradient_stop_t), + sizeof (pixman_linear_gradient_image_t)); if (!linear) { free (image); @@ -259,8 +259,8 @@ pixman_image_create_radial_gradient (const pixman_radial_gradient_t *gradient, if (!image) return NULL; - radial = malloc (sizeof (pixman_radial_gradient_image_t) + - sizeof (pixman_gradient_stop_t) * n_stops); + radial = _pixman_malloc_ab_plus_c (n_stops, sizeof (pixman_gradient_stop_t), + sizeof (pixman_radial_gradient_image_t)); if (!radial) { free (image); diff --git a/pixman/src/pixman.h b/pixman/src/pixman.h index feaf60a..3eeb6c3 100644 --- a/pixman/src/pixman.h +++ b/pixman/src/pixman.h @@ -89,6 +89,24 @@ SOFTWARE. typedef unsigned __int32 uint32_t; typedef __int64 int64_t; typedef unsigned __int64 uint64_t; +# ifndef INT16_MIN +# define INT16_MIN (-32767-1) +# endif +# ifndef INT16_MAX +# define INT16_MAX (32767) +# endif +# ifndef UINT16_MAX +# define UINT16_MAX (65535) +# endif +# ifndef INT32_MIN +# define INT32_MIN (-2147483647-1) +# endif +# ifndef INT32_MAX +# define INT32_MAX (2147483647) +# endif +# ifndef UINT32_MAX +# define UINT32_MAX (0xffffffffU) +# endif #else #error Cannot find definitions for fixed-width integral types (uint8_t, uint32_t, etc.) #endif diff --git a/pixman/src/pixmanint.h b/pixman/src/pixmanint.h index a10a834..6ad373e 100644 --- a/pixman/src/pixmanint.h +++ b/pixman/src/pixmanint.h @@ -1073,4 +1073,21 @@ typedef xFixed_16_16 xFixed; (*((a)+2) = (CARD8) ((v) >> 16)))) #endif + +/* Allocation helpers */ + +#define _pixman_malloc_ab(n, size) \ + ((unsigned) (n) >= INT32_MAX / (unsigned) (size) ? NULL : \ + malloc((unsigned) (n) * (unsigned) (size))) + +#define _pixman_malloc_abc(a, b, size) \ + ((unsigned) (a) >= INT32_MAX / (unsigned) (b) ? NULL : \ + (unsigned) ((a)*(b)) >= INT32_MAX / (unsigned) (size) ? NULL : \ + malloc((unsigned) (a) * (unsigned) (b) * (unsigned) size)) + +#define _pixman_malloc_ab_plus_c(n, size, k) \ + ((unsigned) (n) >= INT32_MAX / (unsigned) (size) ? NULL : \ + (unsigned) (k) >= INT32_MAX - (unsigned) (n) * (unsigned) (size) ? NULL : \ + malloc((unsigned) (n) * (unsigned) (size) + (unsigned) (k))) + #endif /* _PIXMANINT_H_ */ diff --git a/pixman/src/pixregion.c b/pixman/src/pixregion.c index 4cd08e5..1ed3ad7 100644 --- a/pixman/src/pixregion.c +++ b/pixman/src/pixregion.c @@ -148,7 +148,31 @@ pixman_rect_alloc(pixman_region16_t * region, int n); ((r1)->y1 <= (r2)->y1) && \ ((r1)->y2 >= (r2)->y2) ) -#define allocData(n) malloc(PIXREGION_SZOF(n)) +static size_t +PIXREGION_SZOF(size_t n) +{ + size_t size = n * sizeof(pixman_box16_t); + if (n > UINT32_MAX / sizeof(pixman_box16_t)) + return 0; + + if (sizeof(pixman_region16_data_t) > UINT32_MAX - size) + return 0; + + return size + sizeof(pixman_region16_data_t); +} + +static void +allocData(size_t n, void **data) +{ + size_t sz = PIXREGION_SZOF(n); + if (!sz) { + *data = NULL; + return; + } + + *data = malloc(sz); +} + #define freeData(reg) if ((reg)->data && (reg)->data->size) free((reg)->data) #define RECTALLOC_BAIL(pReg,n,bail) \ @@ -185,7 +209,10 @@ if (!(pReg)->data || (((pReg)->data->numRects + (n)) > (pReg)->data->size)) \ if (((numRects) < ((reg)->data->size >> 1)) && ((reg)->data->size > 50)) \ { \ pixman_region16_data_t * NewData; \ - NewData = (pixman_region16_data_t *)realloc((reg)->data, PIXREGION_SZOF(numRects)); \ + size_t data_size = PIXREGION_SZOF(numRects); \ + if (!data_size) \ + goto bail; \ + NewData = (pixman_region16_data_t *)realloc((reg)->data, data_size); \ if (NewData) \ { \ NewData->size = (numRects); \ @@ -372,11 +399,12 @@ static pixman_region_status_t pixman_rect_alloc(pixman_region16_t * region, int n) { pixman_region16_data_t *data; + size_t data_size; if (!region->data) { n++; - region->data = allocData(n); + allocData(n, (void **) ®ion->data); if (!region->data) return pixman_break (region); region->data->numRects = 1; @@ -384,7 +412,7 @@ pixman_rect_alloc(pixman_region16_t * region, int n) } else if (!region->data->size) { - region->data = allocData(n); + allocData(n, (void **) ®ion->data); if (!region->data) return pixman_break (region); region->data->numRects = 0; @@ -398,7 +426,10 @@ pixman_rect_alloc(pixman_region16_t * region, int n) n = 250; } n += region->data->numRects; - data = (pixman_region16_data_t *)realloc(region->data, PIXREGION_SZOF(n)); + data_size = PIXREGION_SZOF(n); + if (!data_size) + return pixman_break (region); + data = (pixman_region16_data_t *)realloc(region->data, data_size); if (!data) return pixman_break (region); region->data = data; @@ -424,7 +455,7 @@ pixman_region_copy(pixman_region16_t *dst, pixman_region16_t *src) if (!dst->data || (dst->data->size < src->data->numRects)) { freeData(dst); - dst->data = allocData(src->data->numRects); + allocData(src->data->numRects, (void **) &dst->data); if (!dst->data) return pixman_break (dst); dst->data->size = src->data->numRects; @@ -835,8 +866,10 @@ pixman_op( AppendRegions(newReg, r2BandEnd, r2End); } - if (oldData) + if (oldData) { free(oldData); + oldData = NULL; + } if (!(numRects = newReg->data->numRects)) { @@ -1493,7 +1526,7 @@ pixman_region_validate(pixman_region16_t * badreg, /* Set up the first region to be the first rectangle in badreg */ /* Note that step 2 code will never overflow the ri[0].reg rects array */ - ri = (RegionInfo *) malloc(4 * sizeof(RegionInfo)); + ri = (RegionInfo *) _pixman_malloc_ab(4, sizeof(RegionInfo)); if (!ri) return pixman_break (badreg); sizeRI = 4; @@ -1555,9 +1588,13 @@ pixman_region_validate(pixman_region16_t * badreg, /* Uh-oh. No regions were appropriate. Create a new one. */ if (sizeRI == numRI) { + size_t data_size; /* Oops, allocate space for new region information */ sizeRI <<= 1; - rit = (RegionInfo *) realloc(ri, sizeRI * sizeof(RegionInfo)); + data_size = sizeRI * sizeof(RegionInfo); + if (data_size / sizeRI != sizeof(RegionInfo)) + goto bail; + rit = (RegionInfo *) realloc(ri, data_size); if (!rit) goto bail; ri = rit; @@ -1659,7 +1696,7 @@ pixman_region_rectsToRegion(nrects, prect, ctype) } return region; } - pData = allocData(nrects); + allocData(nrects, &pData); if (!pData) { pixman_break (region); @@ -2167,7 +2204,7 @@ pixman_region16_data_copy(pixman_region16_t * dst, pixman_region16_t * src) if (!dst->data || (dst->data->size < src->data->numRects)) { freeData(dst); - dst->data = allocData(src->data->numRects); + allocData(src->data->numRects, &dst->data); if (!dst->data) return pixman_break (dst); } diff --git a/pixman/src/pixregionint.h b/pixman/src/pixregionint.h index 385a7f2..0ac7db4 100644 --- a/pixman/src/pixregionint.h +++ b/pixman/src/pixregionint.h @@ -70,6 +70,5 @@ typedef struct pixman_region16_point { #define PIXREGION_BOX(reg,i) (&PIXREGION_BOXPTR(reg)[i]) #define PIXREGION_TOP(reg) PIXREGION_BOX(reg, (reg)->data->numRects) #define PIXREGION_END(reg) PIXREGION_BOX(reg, (reg)->data->numRects - 1) -#define PIXREGION_SZOF(n) (sizeof(pixman_region16_data_t) + ((n) * sizeof(pixman_box16_t))) #endif /* _PIXREGIONINT_H_ */ diff --git a/src/Makefile.am b/src/Makefile.am index 0378ca4..f8d21b7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -191,6 +191,7 @@ libcairo_la_SOURCES = \ cairo-hull.c \ cairo-image-surface.c \ cairo-lzw.c \ + cairo-malloc-private.h \ cairo-matrix.c \ cairo-mutex.c \ cairo-mutex-list-private.h \ diff --git a/src/Makefile.in b/src/Makefile.in index 1fcf89e..399687f 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -89,8 +89,8 @@ am__libcairo_la_SOURCES_DIST = cairo.c cairo.h cairo-private.h \ cairo-font-options.c cairo-freelist.c cairo-freelist-private.h \ cairo-gstate.c cairo-gstate-private.h cairo-hash.c \ cairo-hash-private.h cairo-hull.c cairo-image-surface.c \ - cairo-lzw.c cairo-matrix.c cairo-mutex.c \ - cairo-mutex-list-private.h cairo-mutex-private.h \ + cairo-lzw.c cairo-malloc-private.h cairo-matrix.c \ + cairo-mutex.c cairo-mutex-list-private.h cairo-mutex-private.h \ cairo-mutex-type-private.h cairo-operator.c cairo-path.c \ cairo-path-private.h cairo-path-bounds.c cairo-path-fill.c \ cairo-path-fixed.c cairo-path-fixed-private.h \ @@ -375,6 +375,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ @@ -560,6 +561,7 @@ libcairo_la_SOURCES = \ cairo-hull.c \ cairo-image-surface.c \ cairo-lzw.c \ + cairo-malloc-private.h \ cairo-matrix.c \ cairo-mutex.c \ cairo-mutex-list-private.h \ diff --git a/src/cairo-array.c b/src/cairo-array.c index ff8cce4..3525c78 100644 --- a/src/cairo-array.c +++ b/src/cairo-array.c @@ -138,8 +138,8 @@ _cairo_array_grow_by (cairo_array_t *array, int additional) } array->size = new_size; - new_elements = realloc (*array->elements, - array->size * array->element_size); + new_elements = _cairo_realloc_ab (*array->elements, + array->size, array->element_size); if (new_elements == NULL) { array->size = old_size; diff --git a/src/cairo-atsui-font.c b/src/cairo-atsui-font.c index 361e787..6d8586a 100644 --- a/src/cairo-atsui-font.c +++ b/src/cairo-atsui-font.c @@ -63,6 +63,9 @@ /* Public in 10.4, present in 10.3.9 */ CG_EXTERN CGRect CGRectApplyAffineTransform (CGRect, CGAffineTransform); +/* Error code for path callbacks */ +static OSStatus CAIRO_CG_PATH_ERROR = 1001; + typedef struct _cairo_atsui_font_face cairo_atsui_font_face_t; typedef struct _cairo_atsui_font cairo_atsui_font_t; typedef struct _cairo_atsui_scaled_path cairo_atsui_scaled_path_t; @@ -108,6 +111,7 @@ _cairo_atsui_font_face_scaled_font_create (void *abstract_face, const cairo_font_options_t *options, cairo_scaled_font_t **font) { + cairo_status_t status; cairo_atsui_font_face_t *font_face = abstract_face; OSStatus err; ATSUAttributeTag styleTags[] = { kATSUFontTag }; @@ -116,11 +120,25 @@ _cairo_atsui_font_face_scaled_font_create (void *abstract_face, ATSUStyle style; err = ATSUCreateStyle (&style); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } + err = ATSUSetAttributes(style, ARRAY_LENGTH (styleTags), styleTags, styleSizes, styleValues); + if (err != noErr) { + ATSUDisposeStyle (style); + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } - return _cairo_atsui_font_create_scaled (&font_face->base, font_face->font_id, style, + status = _cairo_atsui_font_create_scaled (&font_face->base, font_face->font_id, style, font_matrix, ctm, options, font); + if (status) + ATSUDisposeStyle (style); + + return status; } static const cairo_font_face_backend_t _cairo_atsui_font_face_backend = { @@ -160,30 +178,35 @@ cairo_atsui_font_face_create_for_atsu_font_id (ATSUFontID font_id) return &font_face->base; } -static ATSUStyle +static OSStatus CreateSizedCopyOfStyle(ATSUStyle inStyle, const Fixed *theSize, - const CGAffineTransform *theTransform) + const CGAffineTransform *theTransform, + ATSUStyle *style) { - ATSUStyle style; OSStatus err; const ATSUAttributeTag theFontStyleTags[] = { kATSUSizeTag, - kATSUFontMatrixTag }; + kATSUFontMatrixTag }; const ByteCount theFontStyleSizes[] = { sizeof(Fixed), - sizeof(CGAffineTransform) }; + sizeof(CGAffineTransform) }; ATSUAttributeValuePtr theFontStyleValues[] = { (Fixed *)theSize, - (CGAffineTransform *)theTransform }; + (CGAffineTransform *)theTransform }; - err = ATSUCreateAndCopyStyle(inStyle, &style); + err = ATSUCreateAndCopyStyle (inStyle, style); + if (err != noErr) + return err; - err = ATSUSetAttributes(style, + err = ATSUSetAttributes(*style, sizeof(theFontStyleTags) / sizeof(ATSUAttributeTag), theFontStyleTags, theFontStyleSizes, theFontStyleValues); + if (err != noErr) + ATSUDisposeStyle (*style); - return style; + return err; } + static cairo_status_t _cairo_atsui_font_set_metrics (cairo_atsui_font_t *font) { @@ -201,7 +224,7 @@ _cairo_atsui_font_set_metrics (cairo_atsui_font_t *font) extents.ascent = metrics.ascent; extents.descent = -metrics.descent; - extents.height = metrics.capHeight; + extents.height = extents.ascent + extents.descent + metrics.leading; extents.max_x_advance = metrics.maxAdvanceWidth; /* The FT backend doesn't handle max_y_advance either, so we'll ignore it for now. */ @@ -250,7 +273,12 @@ _cairo_atsui_font_create_scaled (cairo_font_face_t *font_face, 0., 0.); font->size = FloatToFixed (xscale); - font->style = CreateSizedCopyOfStyle (style, &font->size, &font->font_matrix); + err = CreateSizedCopyOfStyle (style, &font->size, &font->font_matrix, &font->style); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto FAIL; + } { Fixed theSize = FloatToFixed(1.0); @@ -277,7 +305,12 @@ _cairo_atsui_font_create_scaled (cairo_font_face_t *font_face, FAIL: if (status) { - cairo_scaled_font_destroy (&font->base); + if (font) { + if (font->style) + ATSUDisposeStyle(font->style); + free (font); + } + return status; } @@ -291,6 +324,7 @@ _cairo_atsui_font_create_toy(cairo_toy_font_face_t *toy_face, const cairo_font_options_t *options, cairo_scaled_font_t **font_out) { + cairo_status_t status; ATSUStyle style; ATSUFontID fontID; OSStatus err; @@ -299,6 +333,10 @@ _cairo_atsui_font_create_toy(cairo_toy_font_face_t *toy_face, const char *full_name; err = ATSUCreateStyle(&style); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } switch (toy_face->weight) { case CAIRO_FONT_WEIGHT_BOLD: @@ -372,6 +410,11 @@ _cairo_atsui_font_create_toy(cairo_toy_font_face_t *toy_face, kFontNoPlatformCode, kFontRomanScript, kFontNoLanguageCode, &fontID); + if (err != noErr) { + ATSUDisposeStyle (style); + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } } } @@ -384,10 +427,19 @@ _cairo_atsui_font_create_toy(cairo_toy_font_face_t *toy_face, err = ATSUSetAttributes(style, ARRAY_LENGTH (styleTags), styleTags, styleSizes, styleValues); + if (err != noErr) { + ATSUDisposeStyle (style); + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } } - return _cairo_atsui_font_create_scaled (&toy_face->base, fontID, style, + status = _cairo_atsui_font_create_scaled (&toy_face->base, fontID, style, font_matrix, ctm, options, font_out); + if (status) + ATSUDisposeStyle (style); + + return status; } static void @@ -462,16 +514,22 @@ static OSStatus _move_to (const Float32Point *point, void *callback_data) { + cairo_status_t status; cairo_atsui_scaled_path_t *scaled_path = callback_data; double x = point->x; double y = point->y; cairo_matrix_transform_point (scaled_path->scale, &x, &y); - _cairo_path_fixed_close_path (scaled_path->path); - _cairo_path_fixed_move_to (scaled_path->path, + status = _cairo_path_fixed_close_path (scaled_path->path); + if (status) + return CAIRO_CG_PATH_ERROR; + + status = _cairo_path_fixed_move_to (scaled_path->path, _cairo_fixed_from_double (x), _cairo_fixed_from_double (y)); - + if (status) + return CAIRO_CG_PATH_ERROR; + return noErr; } @@ -479,15 +537,18 @@ static OSStatus _line_to (const Float32Point *point, void *callback_data) { + cairo_status_t status; cairo_atsui_scaled_path_t *scaled_path = callback_data; double x = point->x; double y = point->y; cairo_matrix_transform_point (scaled_path->scale, &x, &y); - _cairo_path_fixed_line_to (scaled_path->path, + status = _cairo_path_fixed_line_to (scaled_path->path, _cairo_fixed_from_double (x), _cairo_fixed_from_double (y)); + if (status) + return CAIRO_CG_PATH_ERROR; return noErr; } @@ -498,6 +559,7 @@ _curve_to (const Float32Point *point1, const Float32Point *point3, void *callback_data) { + cairo_status_t status; cairo_atsui_scaled_path_t *scaled_path = callback_data; double x1 = point1->x; double y1 = point1->y; @@ -510,13 +572,15 @@ _curve_to (const Float32Point *point1, cairo_matrix_transform_point (scaled_path->scale, &x2, &y2); cairo_matrix_transform_point (scaled_path->scale, &x3, &y3); - _cairo_path_fixed_curve_to (scaled_path->path, + status = _cairo_path_fixed_curve_to (scaled_path->path, _cairo_fixed_from_double (x1), _cairo_fixed_from_double (y1), _cairo_fixed_from_double (x2), _cairo_fixed_from_double (y2), _cairo_fixed_from_double (x3), _cairo_fixed_from_double (y3)); + if (status) + return CAIRO_CG_PATH_ERROR; return noErr; } @@ -525,9 +589,12 @@ static OSStatus _close_path (void *callback_data) { + cairo_status_t status; cairo_atsui_scaled_path_t *scaled_path = callback_data; - _cairo_path_fixed_close_path (scaled_path->path); + status = _cairo_path_fixed_close_path (scaled_path->path); + if (status) + return CAIRO_CG_PATH_ERROR; return noErr; } @@ -583,6 +650,11 @@ _cairo_atsui_scaled_font_init_glyph_path (cairo_atsui_font_t *scaled_font, lineProc, curveProc, closePathProc, (void *)&scaled_path, &err); + if (err != noErr) { + _cairo_path_fixed_destroy (scaled_path.path); + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } _cairo_scaled_glyph_set_path (scaled_glyph, &scaled_font->base, scaled_path.path); @@ -646,6 +718,11 @@ _cairo_atsui_scaled_font_init_glyph_surface (cairo_atsui_font_t *scaled_font, err = ATSUGlyphGetScreenMetrics (scaled_font->style, 1, &theGlyph, 0, false, false, &metricsH); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } + left = metricsH.sideBearing.x - 1.0; width = metricsH.deviceAdvance.x - metricsH.sideBearing.x @@ -791,27 +868,49 @@ _cairo_atsui_font_text_to_glyphs (void *abstract_font, status = _cairo_utf8_to_utf16 ((unsigned char *)utf8, -1, &utf16, &n16); if (status) - return status; + goto BAIL3; err = ATSUCreateTextLayout(&textLayout); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL3; + } err = ATSUSetTextPointerLocation(textLayout, utf16, 0, n16, n16); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL2; + } /* Set the style for all of the text */ err = ATSUSetRunStyle(textLayout, font->style, kATSUFromTextBeginning, kATSUToTextEnd); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL2; + } err = ATSUDirectGetLayoutDataArrayPtrFromTextLayout(textLayout, 0, kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, (void *)&layoutRecords, &glyphCount); + if (err != noErr) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL2; + } *num_glyphs = glyphCount - 1; *glyphs = - (cairo_glyph_t *) malloc(*num_glyphs * (sizeof (cairo_glyph_t))); + (cairo_glyph_t *) _cairo_malloc_ab(*num_glyphs, sizeof (cairo_glyph_t)); if (*glyphs == NULL) { - return CAIRO_STATUS_NO_MEMORY; + _cairo_error (CAIRO_STATUS_NO_MEMORY); + status = CAIRO_STATUS_NO_MEMORY; + goto BAIL1; } _cairo_matrix_compute_scale_factors (&font->base.ctm, &xscale, &yscale, 1); @@ -829,14 +928,17 @@ _cairo_atsui_font_text_to_glyphs (void *abstract_font, (*glyphs)[i].y = y; } - free (utf16); - + BAIL1: + /* TODO ignored return value. Is there anything we should do? */ ATSUDirectReleaseLayoutDataArrayPtr(NULL, kATSUDirectDataLayoutRecordATSLayoutRecordCurrent, (void *) &layoutRecords); + BAIL2: ATSUDisposeTextLayout(textLayout); + BAIL3: + free (utf16); - return CAIRO_STATUS_SUCCESS; + return status; } ATSUStyle diff --git a/src/cairo-bentley-ottmann.c b/src/cairo-bentley-ottmann.c index b8d97fa..267459c 100644 --- a/src/cairo-bentley-ottmann.c +++ b/src/cairo-bentley-ottmann.c @@ -754,7 +754,7 @@ _cairo_bo_event_queue_init (cairo_bo_event_queue_t *event_queue, * or stop events, so this allocation is safe. XXX: make the * event type a union so it doesn't always contain the skip * elt? */ - events = malloc (num_events * (sizeof (cairo_bo_event_t) + sizeof(cairo_bo_event_t*))); + events = _cairo_malloc_ab (num_events, sizeof (cairo_bo_event_t) + sizeof(cairo_bo_event_t*)); if (events == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -1436,7 +1436,7 @@ _cairo_bentley_ottmann_tessellate_polygon (cairo_traps_t *traps, if (polygon->num_edges < ARRAY_LENGTH (stack_edges)) { edges = stack_edges; } else { - edges = malloc (polygon->num_edges * sizeof (cairo_bo_edge_t)); + edges = _cairo_malloc_ab (polygon->num_edges, sizeof (cairo_bo_edge_t)); if (edges == NULL) return CAIRO_STATUS_NO_MEMORY; } @@ -1757,7 +1757,7 @@ run_test (const char *test_name, while (intersections) { int num_edges = _cairo_array_num_elements (&intersected_edges); passes++; - edges = malloc (num_edges * sizeof (cairo_bo_edge_t)); + edges = _cairo_malloc_ab (num_edges, sizeof (cairo_bo_edge_t)); assert (edges != NULL); memcpy (edges, _cairo_array_index (&intersected_edges, 0), num_edges * sizeof (cairo_bo_edge_t)); _cairo_array_fini (&intersected_edges); diff --git a/src/cairo-beos-surface.cpp b/src/cairo-beos-surface.cpp index abf094a..193fa43 100644 --- a/src/cairo-beos-surface.cpp +++ b/src/cairo-beos-surface.cpp @@ -259,7 +259,7 @@ premultiply_rgba (unsigned char* data, int height, int stride) { - unsigned char* retdata = reinterpret_cast<unsigned char*>(malloc(stride * height)); + unsigned char* retdata = reinterpret_cast<unsigned char*>(_cairo_malloc_ab(height, stride)); if (!retdata) return NULL; @@ -322,7 +322,7 @@ _cairo_beos_bitmap_to_surface (BBitmap* bitmap) bitmap->BytesPerRow()); } else { premultiplied = reinterpret_cast<unsigned char*>( - malloc(bitmap->BytesPerRow() * height)); + _cairo_malloc_ab(bitmap->BytesPerRow(), height)); if (premultiplied) memcpy(premultiplied, bits, bitmap->BytesPerRow() * height); } diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c index 2adc709..390b149 100644 --- a/src/cairo-cff-subset.c +++ b/src/cairo-cff-subset.c @@ -158,7 +158,7 @@ encode_integer (unsigned char *p, int i) i = -i - 108; *p++ = (i >> 8)+ 251; *p++ = i & 0xff; - } else if (i >= -1131 && i <= -108) { + } else if (i >= -32768 && i <= 32767) { *p++ = 28; *p++ = (i >> 8) & 0xff; *p++ = i & 0xff; @@ -1521,8 +1521,8 @@ static const font_write_t font_write_funcs[] = { cairo_cff_font_write_top_dict, cairo_cff_font_write_strings, cairo_cff_font_write_global_subrs, - cairo_cff_font_write_fdselect, cairo_cff_font_write_charset, + cairo_cff_font_write_fdselect, cairo_cff_font_write_charstrings, cairo_cff_font_write_cid_fontdict, cairo_cff_font_write_cid_private_dict_and_local_sub, diff --git a/src/cairo-clip.c b/src/cairo-clip.c index 60f2418..8394077 100644 --- a/src/cairo-clip.c +++ b/src/cairo-clip.c @@ -634,9 +634,13 @@ _cairo_clip_copy_rectangle_list (cairo_clip_t *clip, cairo_gstate_t *gstate) return (cairo_rectangle_list_t*) &_cairo_rectangles_not_representable; n_boxes = clip->has_region ? pixman_region_num_rects (&clip->region) : 1; - rectangles = malloc (sizeof (cairo_rectangle_t)*n_boxes); - if (rectangles == NULL) - return (cairo_rectangle_list_t*) &_cairo_rectangles_nil; + if (n_boxes > 0) { + rectangles = _cairo_malloc_ab (n_boxes, sizeof (cairo_rectangle_t)); + if (rectangles == NULL) + return (cairo_rectangle_list_t*) &_cairo_rectangles_nil; + } else { + rectangles = NULL; + } if (clip->has_region) { pixman_box16_t *boxes; diff --git a/src/cairo-directfb-surface.c b/src/cairo-directfb-surface.c index fa31b06..5505501 100644 --- a/src/cairo-directfb-surface.c +++ b/src/cairo-directfb-surface.c @@ -1113,7 +1113,7 @@ _cairo_directfb_surface_set_clip_region (void *abstract_surface, if( surface->clips ) free (surface->clips); - surface->clips = malloc (n_boxes * sizeof(DFBRegion)); + surface->clips = _cairo_malloc_ab (n_boxes, sizeof(DFBRegion)); if (!surface->clips) { surface->n_clips = 0; return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c index 89bb12a..804ecc2 100644 --- a/src/cairo-ft-font.c +++ b/src/cairo-ft-font.c @@ -552,6 +552,7 @@ _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled) unscaled->id, &face) != FT_Err_Ok) { + unscaled->lock_count--; CAIRO_MUTEX_UNLOCK (unscaled->mutex); _cairo_error (CAIRO_STATUS_NO_MEMORY); return NULL; @@ -735,6 +736,12 @@ _get_bitmap_surface (FT_Bitmap *bitmap, width = bitmap->width; height = bitmap->rows; + if (width == 0 || height == 0) { + *surface = (cairo_image_surface_t *) + cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); + return (*surface)->base.status; + } + switch (bitmap->pixel_mode) { case FT_PIXEL_MODE_MONO: stride = (((width + 31) & ~31) >> 3); @@ -742,7 +749,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, data = bitmap->buffer; assert (stride == bitmap->pitch); } else { - data = malloc (stride * height); + data = _cairo_malloc_ab (height, stride); if (!data) { _cairo_error (CAIRO_STATUS_NO_MEMORY); return CAIRO_STATUS_NO_MEMORY; @@ -792,7 +799,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, if (own_buffer) { data = bitmap->buffer; } else { - data = malloc (stride * height); + data = _cairo_malloc_ab (height, stride); if (!data) { _cairo_error (CAIRO_STATUS_NO_MEMORY); return CAIRO_STATUS_NO_MEMORY; @@ -834,7 +841,7 @@ _get_bitmap_surface (FT_Bitmap *bitmap, width_rgba = width; stride = bitmap->pitch; stride_rgba = (width_rgba * 4 + 3) & ~3; - data_rgba = calloc (1, stride_rgba * height); + data_rgba = calloc (stride_rgba, height); if (data_rgba == NULL) { if (own_buffer) free (bitmap->buffer); @@ -1035,7 +1042,7 @@ _render_glyph_outline (FT_Face face, bitmap.pitch = stride; bitmap.width = width * hmul; bitmap.rows = height * vmul; - bitmap.buffer = calloc (1, stride * bitmap.rows); + bitmap.buffer = calloc (stride, bitmap.rows); if (bitmap.buffer == NULL) { _cairo_error (CAIRO_STATUS_NO_MEMORY); @@ -1084,7 +1091,9 @@ _render_glyph_bitmap (FT_Face face, * we avoid the FT_LOAD_NO_RECURSE flag. */ error = FT_Render_Glyph (glyphslot, FT_RENDER_MODE_NORMAL); - if (error) { + /* XXX ignoring all other errors for now. They are not fatal, typically + * just a glyph-not-found. */ + if (error == FT_Err_Out_Of_Memory) { _cairo_error (CAIRO_STATUS_NO_MEMORY); return CAIRO_STATUS_NO_MEMORY; } @@ -1503,6 +1512,30 @@ _cairo_ft_scaled_font_create (cairo_ft_unscaled_font_t *unscaled, return NULL; } + /* + * Force non-AA drawing when using a bitmap strike that + * won't be resampled due to non-scaling transform + */ + if (!unscaled->have_shape && + (scaled_font->ft_options.load_flags & FT_LOAD_NO_BITMAP) == 0 && + scaled_font->ft_options.base.antialias != CAIRO_ANTIALIAS_NONE && + (face->face_flags & FT_FACE_FLAG_FIXED_SIZES)) + { + int i; + FT_Size_Metrics *size_metrics = &face->size->metrics; + + for (i = 0; i < face->num_fixed_sizes; i++) + { + FT_Bitmap_Size *bitmap_size = &face->available_sizes[i]; + + if (bitmap_size->x_ppem == size_metrics->x_ppem * 64 && + bitmap_size->y_ppem == size_metrics->y_ppem * 64) + { + scaled_font->ft_options.base.antialias = CAIRO_ANTIALIAS_NONE; + break; + } + } + } metrics = &face->size->metrics; @@ -1878,8 +1911,9 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, error = FT_Load_Glyph (scaled_font->unscaled->face, _cairo_scaled_glyph_index(scaled_glyph), load_flags); - - if (error) { + /* XXX ignoring all other errors for now. They are not fatal, typically + * just a glyph-not-found. */ + if (error == FT_Err_Out_Of_Memory) { status = CAIRO_STATUS_NO_MEMORY; goto FAIL; } @@ -2029,8 +2063,9 @@ _cairo_ft_scaled_glyph_init (void *abstract_font, error = FT_Load_Glyph (face, _cairo_scaled_glyph_index(scaled_glyph), load_flags | FT_LOAD_NO_BITMAP); - - if (error) { + /* XXX ignoring all other errors for now. They are not fatal, typically + * just a glyph-not-found. */ + if (error == FT_Err_Out_Of_Memory) { _cairo_ft_unscaled_font_unlock_face (unscaled); _cairo_error (CAIRO_STATUS_NO_MEMORY); return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-glitz-surface.c b/src/cairo-glitz-surface.c index ab15404..15d6025 100644 --- a/src/cairo-glitz-surface.c +++ b/src/cairo-glitz-surface.c @@ -197,7 +197,7 @@ _cairo_glitz_surface_get_image (cairo_glitz_surface_t *surface, pf.bytes_per_line = (((width * format.bpp) / 8) + 3) & -4; pf.scanline_order = GLITZ_PIXEL_SCANLINE_ORDER_TOP_DOWN; - pixels = malloc (height * pf.bytes_per_line); + pixels = _cairo_malloc_ab (height, pf.bytes_per_line); if (!pixels) return CAIRO_STATUS_NO_MEMORY; @@ -627,8 +627,22 @@ _cairo_glitz_pattern_acquire_surface (cairo_pattern_t *pattern, n_params = gradient->n_stops * 3 + n_base_params; - data = malloc (sizeof (glitz_fixed16_16_t) * n_params + - sizeof (unsigned int) * gradient->n_stops); + /* check for int overflow */ + { + int size1, size2; + if (n_params >= INT32_MAX / sizeof (glitz_fixed16_16_t) || + gradient->n_stops >= INT32_MAX / sizeof (unsigned int)) + return CAIRO_STATUS_NO_MEMORY; + + size1 = n_params * sizeof (glitz_fixed16_16_t); + size2 = gradient->n_stops * sizeof (unsigned int); + + if (size1 >= INT32_MAX - size2) + return CAIRO_STATUS_NO_MEMORY; + + data = malloc (size1 + size2); + } + if (!data) return CAIRO_STATUS_NO_MEMORY; @@ -1201,7 +1215,7 @@ _cairo_glitz_surface_composite_trapezoids (cairo_operator_t op, int stride; stride = (width + 3) & -4; - data = calloc (stride * height, 1); + data = calloc (stride, height); if (!data) { _cairo_glitz_pattern_release_surface (src_pattern, src, &attributes); @@ -1992,9 +2006,19 @@ _cairo_glitz_surface_old_show_glyphs (cairo_scaled_font_t *scaled_font, if (num_glyphs > N_STACK_BUF) { char *data; + int size1, size2; + + if (num_glyphs >= INT32_MAX / sizeof(void*) || + num_glyphs >= INT32_MAX / sizeof(glitz_float_t) || + (num_glyphs * sizeof(glitz_float_t)) >= INT32_MAX / 16) + goto FAIL1; + + size1 = num_glyphs * sizeof(void *); + size2 = num_glyphs * sizeof(glitz_float_t) * 16; + if (size1 >= INT32_MAX - size2) + goto FAIL1; - data = malloc (num_glyphs * sizeof (void *) + - num_glyphs * sizeof (glitz_float_t) * 16); + data = malloc (size1 + size2); if (!data) goto FAIL1; diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c index fc8c545..185224d 100644 --- a/src/cairo-gstate.c +++ b/src/cairo-gstate.c @@ -170,7 +170,7 @@ _cairo_gstate_fini (cairo_gstate_t *gstate) gstate->parent_target = NULL; cairo_surface_destroy (gstate->original_target); - gstate->target = NULL; + gstate->original_target = NULL; cairo_pattern_destroy (gstate->source); gstate->source = NULL; @@ -530,7 +530,7 @@ _cairo_gstate_set_dash (cairo_gstate_t *gstate, const double *dash, int num_dash return CAIRO_STATUS_SUCCESS; } - gstate->stroke_style.dash = malloc (gstate->stroke_style.num_dashes * sizeof (double)); + gstate->stroke_style.dash = _cairo_malloc_ab (gstate->stroke_style.num_dashes, sizeof (double)); if (gstate->stroke_style.dash == NULL) { gstate->stroke_style.num_dashes = 0; return CAIRO_STATUS_NO_MEMORY; @@ -1570,7 +1570,7 @@ _cairo_gstate_show_glyphs (cairo_gstate_t *gstate, if (num_glyphs <= STACK_GLYPHS_LEN) { transformed_glyphs = stack_transformed_glyphs; } else { - transformed_glyphs = malloc (num_glyphs * sizeof(cairo_glyph_t)); + transformed_glyphs = _cairo_malloc_ab (num_glyphs, sizeof(cairo_glyph_t)); if (transformed_glyphs == NULL) return CAIRO_STATUS_NO_MEMORY; } @@ -1615,16 +1615,18 @@ _cairo_gstate_glyph_path (cairo_gstate_t *gstate, if (num_glyphs < STACK_GLYPHS_LEN) transformed_glyphs = stack_transformed_glyphs; else - transformed_glyphs = malloc (num_glyphs * sizeof(cairo_glyph_t)); + transformed_glyphs = _cairo_malloc_ab (num_glyphs, sizeof(cairo_glyph_t)); if (transformed_glyphs == NULL) return CAIRO_STATUS_NO_MEMORY; _cairo_gstate_transform_glyphs_to_backend (gstate, glyphs, num_glyphs, transformed_glyphs); + CAIRO_MUTEX_LOCK (gstate->scaled_font->mutex); status = _cairo_scaled_font_glyph_path (gstate->scaled_font, transformed_glyphs, num_glyphs, path); + CAIRO_MUTEX_UNLOCK (gstate->scaled_font->mutex); if (transformed_glyphs != stack_transformed_glyphs) free (transformed_glyphs); diff --git a/src/cairo-hull.c b/src/cairo-hull.c index e9d0a15..c56e9e0 100644 --- a/src/cairo-hull.c +++ b/src/cairo-hull.c @@ -62,7 +62,7 @@ _cairo_hull_create (cairo_pen_vertex_t *vertices, int num_vertices) *extremum = vertices[0].point; vertices[0].point = tmp; - hull = malloc (num_vertices * sizeof (cairo_hull_t)); + hull = _cairo_malloc_ab (num_vertices, sizeof (cairo_hull_t)); if (hull == NULL) return NULL; diff --git a/src/cairo-image-surface.c b/src/cairo-image-surface.c index ad41a4c..27287fa 100644 --- a/src/cairo-image-surface.c +++ b/src/cairo-image-surface.c @@ -988,7 +988,7 @@ _cairo_image_surface_composite_trapezoids (cairo_operator_t op, } /* The image must be initially transparent */ - mask_data = calloc (1, mask_stride * height); + mask_data = calloc (mask_stride, height); if (mask_data == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto CLEANUP_SOURCE; diff --git a/src/cairo-lzw.c b/src/cairo-lzw.c index 370d258..36a59fd 100644 --- a/src/cairo-lzw.c +++ b/src/cairo-lzw.c @@ -93,7 +93,11 @@ _lzw_buf_grow (lzw_buf_t *buf) if (buf->status) return buf->status; - new_data = realloc (buf->data, new_size); + new_data = NULL; + /* check for integer overflow */ + if (new_size / 2 == buf->data_size) + new_data = realloc (buf->data, new_size); + if (new_data == NULL) { free (buf->data); buf->data_size = 0; diff --git a/src/cairo-malloc-private.h b/src/cairo-malloc-private.h new file mode 100644 index 0000000..f8094f9 --- /dev/null +++ b/src/cairo-malloc-private.h @@ -0,0 +1,141 @@ +/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ +/* Cairo - a vector graphics library with display and print output + * + * Copyright © 2007 Mozilla Corporation + * + * This library is free software; you can redistribute it and/or + * modify it either under the terms of the GNU Lesser General Public + * License version 2.1 as published by the Free Software Foundation + * (the "LGPL") or, at your option, under the terms of the Mozilla + * Public License Version 1.1 (the "MPL"). If you do not alter this + * notice, a recipient may use your version of this file under either + * the MPL or the LGPL. + * + * You should have received a copy of the LGPL along with this library + * in the file COPYING-LGPL-2.1; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the MPL along with this library + * in the file COPYING-MPL-1.1 + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY + * OF ANY KIND, either express or implied. See the LGPL or the MPL for + * the specific language governing rights and limitations. + * + * The Original Code is the cairo graphics library. + * + * The Initial Developer of the Original Code is Mozilla Corporation + * + * Contributor(s): + * Vladimir Vukicevic <vladimir@pobox.com> + */ + +#ifndef CAIRO_MALLOC_PRIVATE_H +#define CAIRO_MALLOC_PRIVATE_H + +#include "cairo-wideint-private.h" + +/** + * _cairo_malloc: + * @size: size in bytes + * + * Allocate @size memory using malloc(). + * The memory should be freed using free(). + * malloc is skipped, if 0 bytes are requested, and %NULL will be returned. + * + * Return value: A pointer to the newly allocated memory, or %NULL in + * case of malloc() failure or size is 0. + */ + +#define _cairo_malloc(size) \ + ((size) ? malloc((unsigned) (size)) : NULL) + +/** + * _cairo_malloc_ab: + * @n: number of elements to allocate + * @size: size of each element + * + * Allocates @n*@size memory using _cairo_malloc(), taking care to not + * overflow when doing the multiplication. Behaves much like + * calloc(), except that the returned memory is not set to zero. + * The memory should be freed using free(). + * + * @size should be a constant so that the compiler can optimize + * out a constant division. + * + * Return value: A pointer to the newly allocated memory, or %NULL in + * case of malloc() failure or overflow. + */ + +#define _cairo_malloc_ab(a, size) \ + ((size) && (unsigned) (a) >= INT32_MAX / (unsigned) (size) ? NULL : \ + _cairo_malloc((unsigned) (a) * (unsigned) (size))) + +/** + * _cairo_realloc_ab: + * @ptr: original pointer to block of memory to be resized + * @n: number of elements to allocate + * @size: size of each element + * + * Reallocates @ptr a block of @n*@size memory using realloc(), taking + * care to not overflow when doing the multiplication. The memory + * should be freed using free(). + * + * @size should be a constant so that the compiler can optimize + * out a constant division. + * + * Return value: A pointer to the newly allocated memory, or %NULL in + * case of realloc() failure or overflow (whereupon the original block + * of memory * is left untouched). + */ + +#define _cairo_realloc_ab(ptr, a, size) \ + ((size) && (unsigned) (a) >= INT32_MAX / (unsigned) (size) ? NULL : \ + realloc(ptr, (unsigned) (a) * (unsigned) (size))) + +/** + * _cairo_malloc_abc: + * @n: first factor of number of elements to allocate + * @b: second factor of number of elements to allocate + * @size: size of each element + * + * Allocates @n*@b*@size memory using _cairo_malloc(), taking care to not + * overflow when doing the multiplication. Behaves like + * _cairo_malloc_ab(). The memory should be freed using free(). + * + * @size should be a constant so that the compiler can optimize + * out a constant division. + * + * Return value: A pointer to the newly allocated memory, or %NULL in + * case of malloc() failure or overflow. + */ + +#define _cairo_malloc_abc(a, b, size) \ + ((b) && (unsigned) (a) >= INT32_MAX / (unsigned) (b) ? NULL : \ + (size) && (unsigned) ((a)*(b)) >= INT32_MAX / (unsigned) (size) ? NULL : \ + _cairo_malloc((unsigned) (a) * (unsigned) (b) * (unsigned) (size))) + +/** + * _cairo_malloc_ab_plus_c: + * @n: number of elements to allocate + * @size: size of each element + * @k: additional size to allocate + * + * Allocates @n*@ksize+@k memory using _cairo_malloc(), taking care to not + * overflow when doing the arithmetic. Behaves like + * _cairo_malloc_ab(). The memory should be freed using free(). + * + * Return value: A pointer to the newly allocated memory, or %NULL in + * case of malloc() failure or overflow. + */ + +#define _cairo_malloc_ab_plus_c(n, size, k) \ + ((size) && (unsigned) (n) >= INT32_MAX / (unsigned) (size) ? NULL : \ + (unsigned) (k) >= INT32_MAX - (unsigned) (n) * (unsigned) (size) ? NULL : \ + _cairo_malloc((unsigned) (n) * (unsigned) (size) + (unsigned) (k))) + +#endif /* CAIRO_MALLOC_PRIVATE_H */ diff --git a/src/cairo-meta-surface.c b/src/cairo-meta-surface.c index 8dbd608..01da1e3 100644 --- a/src/cairo-meta-surface.c +++ b/src/cairo-meta-surface.c @@ -184,9 +184,9 @@ _cairo_meta_surface_acquire_source_image (void *abstract_surface, cairo_meta_surface_t *surface = abstract_surface; cairo_surface_t *image; - image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, - surface->width_pixels, - surface->height_pixels); + image = _cairo_image_surface_create_with_content (surface->content, + surface->width_pixels, + surface->height_pixels); status = _cairo_meta_surface_replay (&surface->base, image); if (status) { @@ -243,12 +243,6 @@ _cairo_meta_surface_paint (void *abstract_surface, cairo_meta_surface_t *meta = abstract_surface; cairo_command_paint_t *command; - /* An optimisation that takes care to not replay what was done - * before surface is cleared. We don't erase recorded commands - * since we may have earlier snapshots of this surface. */ - if (op == CAIRO_OPERATOR_CLEAR && !meta->is_clipped) - meta->replay_start_idx = meta->commands.num_elements; - command = malloc (sizeof (cairo_command_paint_t)); if (command == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -264,6 +258,12 @@ _cairo_meta_surface_paint (void *abstract_surface, if (status) goto CLEANUP_SOURCE; + /* An optimisation that takes care to not replay what was done + * before surface is cleared. We don't erase recorded commands + * since we may have earlier snapshots of this surface. */ + if (op == CAIRO_OPERATOR_CLEAR && !meta->is_clipped) + meta->replay_start_idx = meta->commands.num_elements; + return CAIRO_STATUS_SUCCESS; CLEANUP_SOURCE: @@ -439,7 +439,7 @@ _cairo_meta_surface_show_glyphs (void *abstract_surface, if (status) goto CLEANUP_COMMAND; - command->glyphs = malloc (sizeof (cairo_glyph_t) * num_glyphs); + command->glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); if (command->glyphs == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto CLEANUP_SOURCE; @@ -735,7 +735,7 @@ _cairo_meta_surface_replay (cairo_surface_t *surface, int i, num_glyphs = command->show_glyphs.num_glyphs; if (has_device_transform) { - dev_glyphs = malloc (sizeof (cairo_glyph_t) * num_glyphs); + dev_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); if (dev_glyphs == NULL) { status = CAIRO_STATUS_NO_MEMORY; break; diff --git a/src/cairo-mutex-type-private.h b/src/cairo-mutex-type-private.h index 59d581a..b9f0fb3 100644 --- a/src/cairo-mutex-type-private.h +++ b/src/cairo-mutex-type-private.h @@ -141,13 +141,13 @@ CAIRO_BEGIN_DECLS #if CAIRO_NO_MUTEX -/* A poor man's mutex */ +/* No mutexes */ typedef int cairo_mutex_t; # define CAIRO_MUTEX_INITIALIZE() CAIRO_MUTEX_NOOP -# define CAIRO_MUTEX_LOCK(mutex) do { while (mutex) ; (mutex) = 1; } while (0) -# define CAIRO_MUTEX_UNLOCK(mutex) (mutex) = 0 +# define CAIRO_MUTEX_LOCK(mutex) CAIRO_MUTEX_NOOP1(mutex) +# define CAIRO_MUTEX_UNLOCK(mutex) CAIRO_MUTEX_NOOP1(mutex) # define CAIRO_MUTEX_NIL_INITIALIZER 0 #elif HAVE_PTHREAD_H /*******************************************************/ diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c index 319a7ab..1535de4 100644 --- a/src/cairo-os2-surface.c +++ b/src/cairo-os2-surface.c @@ -296,8 +296,9 @@ _cairo_os2_surface_blit_pixels (cairo_os2_surface_t *surface, ULONG ulPixels; /* allocate temporary pixel buffer */ - pchPixBuf = (unsigned char *) malloc (3 * surface->bitmap_info.cx * - surface->bitmap_info.cy); + pchPixBuf = (unsigned char *) _cairo_malloc_abc (surface->bitmap_info.cy, + surface->bitmap_info.cx, + 3); pchPixSource = surface->pixels; /* start at beginning of pixel buffer */ pBufStart = pchPixBuf; /* remember beginning of the new pixel buffer */ @@ -713,7 +714,7 @@ cairo_os2_surface_create (HPS hps_client_window, local_os2_surface->bitmap_info.cBitCount = 32; /* Allocate memory for pixels */ - local_os2_surface->pixels = (unsigned char *) malloc (width * height * 4); + local_os2_surface->pixels = (unsigned char *) _cairo_malloc_abc (height, width, 4); if (!(local_os2_surface->pixels)) { /* Not enough memory for the pixels! */ DosCloseEventSem (local_os2_surface->hev_pixel_array_came_back); @@ -783,7 +784,7 @@ cairo_os2_surface_set_size (cairo_surface_t *surface, } /* Allocate memory for new stuffs */ - pchNewPixels = (unsigned char *) malloc (new_width * new_height * 4); + pchNewPixels = (unsigned char *) _cairo_malloc_abc (new_height, new_width, 4); if (!pchNewPixels) { /* Not enough memory for the pixels! * Everything remains the same! diff --git a/src/cairo-path-stroke.c b/src/cairo-path-stroke.c index d9f7ed2..8535828 100644 --- a/src/cairo-path-stroke.c +++ b/src/cairo-path-stroke.c @@ -280,6 +280,9 @@ _cairo_stroker_join (cairo_stroker_t *stroker, cairo_stroke_face_t *in, cairo_st double in_dot_out = ((-in->usr_vector.x * out->usr_vector.x)+ (-in->usr_vector.y * out->usr_vector.y)); double ml = stroker->style->miter_limit; + double tolerance_squared = stroker->tolerance * stroker->tolerance; + double line_width_squared = (stroker->style->line_width * + stroker->style->line_width); /* * Check the miter limit -- lines meeting at an acute angle @@ -308,8 +311,79 @@ _cairo_stroker_join (cairo_stroker_t *stroker, cairo_stroke_face_t *in, cairo_st * * 2 <= ml² (1 - in · out) * + * + * That gives us the condition to avoid generating miters that + * are too large from angles that are too large. But we also + * need to avoid generating miters when the angle is very small. + * + * The miter formed from a tiny angle is also tiny, so the + * miter limit is not a concern. But with a tiny angle we will + * be computing the intersection of two lines that are very + * near parallel. Also, the limits of the fixed-point grid on + * the input face coordinates mean that the resulting + * intersection could be wildly wrong. (See the + * get-path-extents test case for a call to cairo_arc that + * results in two problematic faces.) + * + * Fortunately we can also derive an expression for when using + * a bevel join instead of a miter will introduce an error no + * larger than the tolerance. Consider the same join from + * before but with the miter now chopped off and replaced with + * a bevel join. The drawing is zoomed in a bit again, the + * point marked as '*' is the center of the stroke---the point + * where the two line segments of interest intersect: + * + * ----- . + * ^ .. + * | . . + * | . . + * 1/2 . . + * miter . . | + * length . . | + * | .______. ___v___ + * | | . \ 1/2 bevel + * v | . \ width + * ---- * \ ------- + * | \ ^ + * + * + * The length of interest here is the vertical length of the + * miter that is eliminated. It's length can be obtained by + * starting with 1/2 the miter length and the subtracting off + * the vertical length that is included by the bevel join, + * (here termed 1/2 bevel width). To determine this new bevel + * width, we have a small right triangle shown, the hypotenuse + * of which has a length of 1/2 the line width, and the small + * angle at the upper right of the figure is psi/2. + * + * So we have: + * + * sin (psi/2) = (bevel_width / 2) / (line_width / 2) + * + * And we can determine when the miter is required by + * calculating when the eliminated portion of the miter is + * greater than the tolerance: + * + * (miter_length / 2) - (bevel_width / 2) > tolerance + * + * Substituting in the above expressions for miter_length and + * bevel_width: + * + * (line_width/2) / sin (psi/2) - (line_width/2) * sin (psi/2) > tolerance + * 1 / sin(psi/2) - sin (psi/2) > 2 * tolerance / line_width + * 1 / sin²(psi/2) -2 + sin²(psi/2) > 4 * (tolerance/line_width)² + * + * Use identity: sin²(psi/2) = (1-cos(psi))/2 + + * 2/(1 - cos(psi)) - 2 + (1-cos(psi))/2 > 4 * (tolerance/line_width)² + * 4/(1 - cos(psi)) - 4 + (1-cos(psi)) > 8 * (tolerance/line_width)² + * 4/(1 - cos(psi)) + (1-cos(psi)) > 8 * ((tolerance/line_width)² + 0.5) */ - if (2 <= ml * ml * (1 - in_dot_out)) { + if ((2 <= ml * ml * (1 - in_dot_out)) && + ((8 * (tolerance_squared / line_width_squared + 0.5)) < + 4 / (1 - in_dot_out) + (1 - in_dot_out)) + ) + { double x1, y1, x2, y2; double mx, my; double dx1, dx2, dy1, dy2; @@ -1076,7 +1150,8 @@ _cairo_rectilinear_stroker_add_segment (cairo_rectilinear_stroker_t *stroker, /* Common case is one rectangle of exactly 4 segments. */ if (new_size == 0) new_size = 4; - new_segments = realloc (stroker->segments, new_size * sizeof (cairo_line_t)); + new_segments = _cairo_realloc_ab (stroker->segments, + new_size, sizeof (cairo_line_t)); if (new_segments == NULL) return CAIRO_STATUS_NO_MEMORY; stroker->segments_size = new_size; diff --git a/src/cairo-path.c b/src/cairo-path.c index 4c8e09e..b1ef44e 100644 --- a/src/cairo-path.c +++ b/src/cairo-path.c @@ -352,8 +352,10 @@ _cairo_path_create_in_error (cairo_status_t status) return (cairo_path_t*) &_cairo_path_nil; path = malloc (sizeof (cairo_path_t)); - if (path == NULL) + if (path == NULL) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); return (cairo_path_t*) &_cairo_path_nil; + } path->num_data = 0; path->data = NULL; @@ -370,25 +372,34 @@ _cairo_path_create_internal (cairo_path_fixed_t *path_fixed, cairo_path_t *path; path = malloc (sizeof (cairo_path_t)); - if (path == NULL) + if (path == NULL) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); return (cairo_path_t*) &_cairo_path_nil; + } path->num_data = _cairo_path_count (path, path_fixed, _cairo_gstate_get_tolerance (gstate), flatten); - if (path->num_data <= 0) { + if (path->num_data < 0) { free (path); return (cairo_path_t*) &_cairo_path_nil; } - path->data = malloc (path->num_data * sizeof (cairo_path_data_t)); - if (path->data == NULL) { - free (path); - return (cairo_path_t*) &_cairo_path_nil; - } + if (path->num_data) { + path->data = _cairo_malloc_ab (path->num_data, + sizeof (cairo_path_data_t)); + if (path->data == NULL) { + free (path); + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return (cairo_path_t*) &_cairo_path_nil; + } - path->status = _cairo_path_populate (path, path_fixed, - gstate, flatten); + path->status = _cairo_path_populate (path, path_fixed, + gstate, flatten); + } else { + path->data = NULL; + path->status = CAIRO_STATUS_SUCCESS; + } return path; } @@ -413,8 +424,9 @@ cairo_path_destroy (cairo_path_t *path) if (path == NULL || path == &_cairo_path_nil) return; - free (path->data); - path->num_data = 0; + if (path->data) + free (path->data); + free (path); } diff --git a/src/cairo-pattern.c b/src/cairo-pattern.c index 9fafc99..e8b6dd0 100644 --- a/src/cairo-pattern.c +++ b/src/cairo-pattern.c @@ -133,8 +133,8 @@ _cairo_gradient_pattern_init_copy (cairo_gradient_pattern_t *pattern, pattern->stops = pattern->stops_embedded; else if (other->stops) { - pattern->stops = malloc (other->stops_size * - sizeof (pixman_gradient_stop_t)); + pattern->stops = _cairo_malloc_ab (other->stops_size, + sizeof (pixman_gradient_stop_t)); if (pattern->stops == NULL) { pattern->stops_size = 0; pattern->n_stops = 0; @@ -185,7 +185,9 @@ _cairo_pattern_init_copy (cairo_pattern_t *pattern, } break; } + /* The reference count and user_data array are unique to the copy. */ pattern->ref_count = 1; + _cairo_user_data_array_init (&pattern->user_data); return CAIRO_STATUS_SUCCESS; } @@ -757,11 +759,13 @@ _cairo_pattern_gradient_grow (cairo_gradient_pattern_t *pattern) assert (pattern->n_stops <= pattern->stops_size); if (pattern->stops == pattern->stops_embedded) { - new_stops = malloc (new_size * sizeof (pixman_gradient_stop_t)); + new_stops = _cairo_malloc_ab (new_size, sizeof (pixman_gradient_stop_t)); if (new_stops) memcpy (new_stops, pattern->stops, old_size * sizeof (pixman_gradient_stop_t)); } else { - new_stops = realloc (pattern->stops, new_size * sizeof (pixman_gradient_stop_t)); + new_stops = _cairo_realloc_ab (pattern->stops, + new_size, + sizeof (pixman_gradient_stop_t)); } if (new_stops == NULL) { @@ -1632,38 +1636,6 @@ _cairo_pattern_acquire_surface_for_surface (cairo_surface_pattern_t *pattern, status = _cairo_surface_clone_similar (dst, pattern->surface, x, y, width, height, out); - - if (status == CAIRO_INT_STATUS_UNSUPPORTED) { - - cairo_t *cr; - - *out = cairo_surface_create_similar (dst, dst->content, - width, height); - status = cairo_surface_status (*out); - if (status) { - cairo_surface_destroy (*out); - *out = NULL; - return status; - } - - (*out)->device_transform = pattern->surface->device_transform; - (*out)->device_transform_inverse = pattern->surface->device_transform_inverse; - - /* XXX Use _cairo_surface_composite directly */ - cr = cairo_create (*out); - - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); - cairo_set_source_surface (cr, pattern->surface, -x, -y); - cairo_paint (cr); - - status = cairo_status (cr); - cairo_destroy (cr); - - if (status) { - cairo_surface_destroy (*out); - *out = NULL; - } - } } return status; diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c index 1e73c4c..862e14a 100644 --- a/src/cairo-pdf-surface.c +++ b/src/cairo-pdf-surface.c @@ -446,6 +446,7 @@ cairo_pdf_surface_set_size (cairo_surface_t *surface, pdf_surface->width = width_in_points; pdf_surface->height = height_in_points; + cairo_matrix_init (&pdf_surface->cairo_to_pdf, 1, 0, 0, -1, 0, height_in_points); } static void @@ -1189,9 +1190,9 @@ _cairo_pdf_surface_emit_stitched_colorgradient (cairo_pdf_surface_t *surface, for (i = 0; i < n_stops-1; i++) { if (is_alpha) { status = cairo_pdf_surface_emit_alpha_linear_function (surface, - &stops[i], - &stops[i+1], - &stops[i].resource); + &stops[i], + &stops[i+1], + &stops[i].resource); if (status) return status; } else { @@ -1209,8 +1210,10 @@ _cairo_pdf_surface_emit_stitched_colorgradient (cairo_pdf_surface_t *surface, _cairo_output_stream_printf (surface->output, "%d 0 obj\r\n" "<< /FunctionType 3\r\n" - " /Domain [ 0 1 ]\r\n", - res.id); + " /Domain [ %f %f ]\r\n", + res.id, + stops[0].offset, + stops[n_stops - 1].offset); _cairo_output_stream_printf (surface->output, " /Functions [ "); @@ -1262,7 +1265,7 @@ _cairo_pdf_surface_emit_pattern_stops (cairo_pdf_surface_t *surface, color_function->id = 0; alpha_function->id = 0; - allstops = malloc ((pattern->n_stops + 2) * sizeof (cairo_pdf_color_stop_t)); + allstops = _cairo_malloc_ab ((pattern->n_stops + 2), sizeof (cairo_pdf_color_stop_t)); if (allstops == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -1279,23 +1282,6 @@ _cairo_pdf_surface_emit_pattern_stops (cairo_pdf_surface_t *surface, stops[i].offset = _cairo_fixed_to_double (pattern->stops[i].x); } - /* make sure first offset is 0.0 and last offset is 1.0. (Otherwise Acrobat - * Reader chokes.) */ - if (stops[0].offset > COLOR_STOP_EPSILON) { - memcpy (allstops, stops, sizeof (cairo_pdf_color_stop_t)); - stops = allstops; - n_stops++; - } - stops[0].offset = 0.0; - - if (stops[n_stops-1].offset < 1.0 - COLOR_STOP_EPSILON) { - memcpy (&stops[n_stops], - &stops[n_stops - 1], - sizeof (cairo_pdf_color_stop_t)); - n_stops++; - } - stops[n_stops-1].offset = 1.0; - if (n_stops == 2) { /* no need for stitched function */ status = cairo_pdf_surface_emit_rgb_linear_function (surface, @@ -1423,6 +1409,8 @@ _cairo_pdf_surface_emit_linear_pattern (cairo_pdf_surface_t *surface, cairo_matrix_t pat_to_pdf; cairo_extend_t extend; cairo_status_t status; + cairo_gradient_pattern_t *gradient = &pattern->base; + double first_stop, last_stop; extend = cairo_pattern_get_extend (&pattern->base.base); status = _cairo_pdf_surface_pause_content_stream (surface); @@ -1447,6 +1435,36 @@ _cairo_pdf_surface_emit_linear_pattern (cairo_pdf_surface_t *surface, x2 = _cairo_fixed_to_double (pattern->gradient.p2.x); y2 = _cairo_fixed_to_double (pattern->gradient.p2.y); + first_stop = _cairo_fixed_to_double (gradient->stops[0].x); + last_stop = _cairo_fixed_to_double (gradient->stops[gradient->n_stops - 1].x); + + /* PDF requires the first and last stop to be the same as the line + * coordinates. If this is not a repeating pattern move the line + * coordinates to the location of first and last stop. */ + + if (pattern->base.base.extend == CAIRO_EXTEND_NONE || + pattern->base.base.extend == CAIRO_EXTEND_PAD) { + double _x1, _y1, _x2, _y2; + + _x1 = x1 + (x2 - x1)*first_stop; + _y1 = y1 + (y2 - y1)*first_stop; + _x2 = x1 + (x2 - x1)*last_stop; + _y2 = y1 + (y2 - y1)*last_stop; + + x1 = _x1; + x2 = _x2; + y1 = _y1; + y2 = _y2; + } + + if (gradient->n_stops == 2) { + /* If only two stops the Type 2 function is used by itself + * without a Stitching function. Type 2 functions always have + * the domain [0 1] */ + first_stop = 0.0; + last_stop = 1.0; + } + pattern_resource = _cairo_pdf_surface_new_object (surface); _cairo_output_stream_printf (surface->output, "%d 0 obj\r\n" @@ -1457,12 +1475,14 @@ _cairo_pdf_surface_emit_linear_pattern (cairo_pdf_surface_t *surface, " << /ShadingType 2\r\n" " /ColorSpace /DeviceRGB\r\n" " /Coords [ %f %f %f %f ]\r\n" + " /Domain [ %f %f ]\r\n" " /Function %d 0 R\r\n", pattern_resource.id, pat_to_pdf.xx, pat_to_pdf.yx, pat_to_pdf.xy, pat_to_pdf.yy, pat_to_pdf.x0, pat_to_pdf.y0, x1, y1, x2, y2, + first_stop, last_stop, color_function.id); if (extend == CAIRO_EXTEND_PAD) { @@ -2726,13 +2746,13 @@ _cairo_pdf_surface_emit_type3_font_subset (cairo_pdf_surface_t *surface, cairo_box_t font_bbox = {{0,0},{0,0}}; cairo_box_t bbox = {{0,0},{0,0}}; - glyphs = malloc (font_subset->num_glyphs * sizeof (cairo_pdf_resource_t)); + glyphs = _cairo_malloc_ab (font_subset->num_glyphs, sizeof (cairo_pdf_resource_t)); if (glyphs == NULL) { _cairo_surface_set_error (&surface->base, CAIRO_STATUS_NO_MEMORY); return CAIRO_STATUS_NO_MEMORY; } - widths = malloc (font_subset->num_glyphs * sizeof (double)); + widths = _cairo_malloc_ab (font_subset->num_glyphs, sizeof (double)); if (widths == NULL) { free (glyphs); _cairo_surface_set_error (&surface->base, CAIRO_STATUS_NO_MEMORY); diff --git a/src/cairo-pen.c b/src/cairo-pen.c index ec9eb7a..24c3eae 100644 --- a/src/cairo-pen.c +++ b/src/cairo-pen.c @@ -78,7 +78,7 @@ _cairo_pen_init (cairo_pen_t *pen, radius, ctm); - pen->vertices = malloc (pen->num_vertices * sizeof (cairo_pen_vertex_t)); + pen->vertices = _cairo_malloc_ab (pen->num_vertices, sizeof (cairo_pen_vertex_t)); if (pen->vertices == NULL) { return CAIRO_STATUS_NO_MEMORY; } @@ -119,7 +119,7 @@ _cairo_pen_init_copy (cairo_pen_t *pen, cairo_pen_t *other) *pen = *other; if (pen->num_vertices) { - pen->vertices = malloc (pen->num_vertices * sizeof (cairo_pen_vertex_t)); + pen->vertices = _cairo_malloc_ab (pen->num_vertices, sizeof (cairo_pen_vertex_t)); if (pen->vertices == NULL) { return CAIRO_STATUS_NO_MEMORY; } @@ -138,7 +138,8 @@ _cairo_pen_add_points (cairo_pen_t *pen, cairo_point_t *point, int num_points) int i; num_vertices = pen->num_vertices + num_points; - vertices = realloc (pen->vertices, num_vertices * sizeof (cairo_pen_vertex_t)); + vertices = _cairo_realloc_ab (pen->vertices, + num_vertices, sizeof (cairo_pen_vertex_t)); if (vertices == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -321,7 +322,13 @@ _cairo_pen_find_active_cw_vertex_index (cairo_pen_t *pen, break; } - assert (i < pen->num_vertices); + /* If the desired slope cannot be found between any of the pen + * vertices, then we must have a degenerate pen, (such as a pen + * that's been transformed to a line). In that case, we consider + * the first pen vertex as the appropriate clockwise vertex. + */ + if (i == pen->num_vertices) + i = 0; *active = i; @@ -351,6 +358,14 @@ _cairo_pen_find_active_ccw_vertex_index (cairo_pen_t *pen, break; } + /* If the desired slope cannot be found between any of the pen + * vertices, then we must have a degenerate pen, (such as a pen + * that's been transformed to a line). In that case, we consider + * the last pen vertex as the appropriate counterclockwise vertex. + */ + if (i < 0) + i = pen->num_vertices - 1; + *active = i; return CAIRO_STATUS_SUCCESS; diff --git a/src/cairo-png.c b/src/cairo-png.c index 35db3d9..761fb3f 100644 --- a/src/cairo-png.c +++ b/src/cairo-png.c @@ -128,7 +128,7 @@ write_png (cairo_surface_t *surface, else if (status != CAIRO_STATUS_SUCCESS) return CAIRO_STATUS_SURFACE_TYPE_MISMATCH; - rows = malloc (image->height * sizeof(png_byte*)); + rows = _cairo_malloc_ab (image->height, sizeof(png_byte*)); if (rows == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto BAIL1; @@ -429,11 +429,11 @@ read_png (png_rw_ptr read_func, png_read_update_info (png, info); pixel_size = 4; - data = malloc (png_width * png_height * pixel_size); + data = _cairo_malloc_abc (png_height, png_width, pixel_size); if (data == NULL) goto BAIL; - row_pointers = malloc (png_height * sizeof(char *)); + row_pointers = _cairo_malloc_ab (png_height, sizeof(char *)); if (row_pointers == NULL) goto BAIL; diff --git a/src/cairo-polygon.c b/src/cairo-polygon.c index e9fc78b..0aa88bc 100644 --- a/src/cairo-polygon.c +++ b/src/cairo-polygon.c @@ -93,11 +93,12 @@ _cairo_polygon_grow (cairo_polygon_t *polygon) assert (polygon->num_edges <= polygon->edges_size); if (polygon->edges == polygon->edges_embedded) { - new_edges = malloc (new_size * sizeof (cairo_edge_t)); + new_edges = _cairo_malloc_ab (new_size, sizeof (cairo_edge_t)); if (new_edges) memcpy (new_edges, polygon->edges, old_size * sizeof (cairo_edge_t)); } else { - new_edges = realloc (polygon->edges, new_size * sizeof (cairo_edge_t)); + new_edges = _cairo_realloc_ab (polygon->edges, + new_size, sizeof (cairo_edge_t)); } if (new_edges == NULL) { diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c index 919a498..2da20d4 100644 --- a/src/cairo-ps-surface.c +++ b/src/cairo-ps-surface.c @@ -2037,7 +2037,7 @@ _cairo_ps_surface_stroke (void *abstract_surface, * can modify some of the values. */ if (num_dashes % 2) { - dash = malloc (2 * num_dashes * sizeof (double)); + dash = _cairo_malloc_abc (num_dashes, 2, sizeof (double)); if (dash == NULL) return CAIRO_STATUS_NO_MEMORY; @@ -2215,7 +2215,7 @@ _cairo_ps_surface_show_glyphs (void *abstract_surface, num_glyphs_unsigned = num_glyphs; _cairo_ps_surface_emit_pattern (surface, source); - glyph_ids = malloc (num_glyphs_unsigned*sizeof (cairo_ps_glyph_id_t)); + glyph_ids = _cairo_malloc_ab (num_glyphs_unsigned, sizeof (cairo_ps_glyph_id_t)); if (glyph_ids == NULL) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-quartz-surface.c b/src/cairo-quartz-surface.c index 06c8ba8..5cff47e 100644 --- a/src/cairo-quartz-surface.c +++ b/src/cairo-quartz-surface.c @@ -336,22 +336,23 @@ CreateGradientFunction (cairo_gradient_pattern_t *gpat) &callbacks); } -static CGShadingRef -_cairo_quartz_cairo_gradient_pattern_to_quartz (cairo_pattern_t *abspat) +static cairo_int_status_t +_cairo_quartz_cairo_gradient_pattern_to_quartz (cairo_pattern_t *abspat, + CGShadingRef *shading) { cairo_matrix_t mat; double x0, y0; if (abspat->type != CAIRO_PATTERN_TYPE_LINEAR && abspat->type != CAIRO_PATTERN_TYPE_RADIAL) - return NULL; + return CAIRO_INT_STATUS_UNSUPPORTED; /* bandaid for mozilla bug 379321, also visible in the * linear-gradient-reflect test. */ if (abspat->extend == CAIRO_EXTEND_REFLECT || abspat->extend == CAIRO_EXTEND_REPEAT) - return NULL; + return CAIRO_INT_STATUS_UNSUPPORTED; /* We can only do this if we have an identity pattern matrix; * otherwise fall back through to the generic pattern case. @@ -362,17 +363,17 @@ _cairo_quartz_cairo_gradient_pattern_to_quartz (cairo_pattern_t *abspat) */ cairo_pattern_get_matrix (abspat, &mat); if (mat.xx != 1.0 || mat.yy != 1.0 || mat.xy != 0.0 || mat.yx != 0.0) - return NULL; + return CAIRO_INT_STATUS_UNSUPPORTED; x0 = mat.x0; y0 = mat.y0; if (abspat->type == CAIRO_PATTERN_TYPE_LINEAR) { cairo_linear_pattern_t *lpat = (cairo_linear_pattern_t*) abspat; - CGShadingRef shading; CGPoint start, end; CGFunctionRef gradFunc; CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB(); + bool extend = abspat->extend == CAIRO_EXTEND_PAD; start = CGPointMake (_cairo_fixed_to_double (lpat->gradient.p1.x) - x0, _cairo_fixed_to_double (lpat->gradient.p1.y) - y0); @@ -381,22 +382,22 @@ _cairo_quartz_cairo_gradient_pattern_to_quartz (cairo_pattern_t *abspat) cairo_pattern_reference (abspat); gradFunc = CreateGradientFunction ((cairo_gradient_pattern_t*) lpat); - shading = CGShadingCreateAxial (rgb, + *shading = CGShadingCreateAxial (rgb, start, end, gradFunc, - true, true); + extend, extend); CGColorSpaceRelease(rgb); CGFunctionRelease(gradFunc); - return shading; + return CAIRO_STATUS_SUCCESS; } if (abspat->type == CAIRO_PATTERN_TYPE_RADIAL) { cairo_radial_pattern_t *rpat = (cairo_radial_pattern_t*) abspat; - CGShadingRef shading; CGPoint start, end; CGFunctionRef gradFunc; CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB(); + bool extend = abspat->extend == CAIRO_EXTEND_PAD; start = CGPointMake (_cairo_fixed_to_double (rpat->gradient.c1.x) - x0, _cairo_fixed_to_double (rpat->gradient.c1.y) - y0); @@ -405,29 +406,30 @@ _cairo_quartz_cairo_gradient_pattern_to_quartz (cairo_pattern_t *abspat) cairo_pattern_reference (abspat); gradFunc = CreateGradientFunction ((cairo_gradient_pattern_t*) rpat); - shading = CGShadingCreateRadial (rgb, + *shading = CGShadingCreateRadial (rgb, start, _cairo_fixed_to_double (rpat->gradient.c1.radius), end, _cairo_fixed_to_double (rpat->gradient.c2.radius), gradFunc, - true, true); + extend, extend); CGColorSpaceRelease(rgb); CGFunctionRelease(gradFunc); - return shading; + return CAIRO_STATUS_SUCCESS; } /* Shouldn't be reached */ ASSERT_NOT_REACHED; - return NULL; + return CAIRO_STATUS_SUCCESS; } /* generic cairo surface -> cairo_quartz_surface_t function */ -static cairo_quartz_surface_t * -_cairo_quartz_surface_to_quartz (cairo_surface_t *target, cairo_surface_t *pat_surf) +static cairo_int_status_t +_cairo_quartz_surface_to_quartz (cairo_surface_t *target, + cairo_surface_t *pat_surf, + cairo_quartz_surface_t **quartz_surf) { - cairo_quartz_surface_t *quartz_surf = NULL; if (cairo_surface_get_type(pat_surf) != CAIRO_SURFACE_TYPE_QUARTZ) { /* XXXtodo/perf don't use clone if the source surface is an image surface! Instead, @@ -437,28 +439,33 @@ _cairo_quartz_surface_to_quartz (cairo_surface_t *target, cairo_surface_t *pat_s cairo_surface_t *ref_type = target; cairo_surface_t *new_surf = NULL; cairo_rectangle_int16_t rect; + cairo_status_t status; + if (ref_type == NULL) ref_type = cairo_quartz_surface_create (CAIRO_FORMAT_ARGB32, 1, 1); - _cairo_surface_get_extents (pat_surf, &rect); + status = _cairo_surface_get_extents (pat_surf, &rect); + if (status) + return status; - _cairo_surface_clone_similar (ref_type, pat_surf, rect.x, rect.y, + status = _cairo_surface_clone_similar (ref_type, pat_surf, rect.x, rect.y, rect.width, rect.height, &new_surf); - if (target == NULL) cairo_surface_destroy(ref_type); - quartz_surf = (cairo_quartz_surface_t *) new_surf; + if (status) + return status; + + *quartz_surf = (cairo_quartz_surface_t *) new_surf; } else { /* If it's a quartz surface, we can try to see if it's a CGBitmapContext; * we do this when we call CGBitmapContextCreateImage below. */ cairo_surface_reference (pat_surf); - quartz_surf = (cairo_quartz_surface_t*) pat_surf; - + *quartz_surf = (cairo_quartz_surface_t*) pat_surf; } - return quartz_surf; + return CAIRO_STATUS_SUCCESS; } /* Generic cairo_pattern -> CGPattern function */ @@ -467,14 +474,21 @@ SurfacePatternDrawFunc (void *info, CGContextRef context) { cairo_surface_pattern_t *spat = (cairo_surface_pattern_t *) info; cairo_surface_t *pat_surf = spat->surface; + cairo_int_status_t status; - cairo_quartz_surface_t *quartz_surf = _cairo_quartz_surface_to_quartz (NULL, pat_surf); - CGImageRef img = CGBitmapContextCreateImage (quartz_surf->cgContext); + cairo_quartz_surface_t *quartz_surf; + CGImageRef img; CGRect imageBounds; + status = _cairo_quartz_surface_to_quartz (NULL, pat_surf, &quartz_surf); + if (status) + return; + + img = CGBitmapContextCreateImage (quartz_surf->cgContext); if (!img) { // ... give up. ND((stderr, "CGBitmapContextCreateImage failed\n")); + _cairo_error (CAIRO_STATUS_NO_MEMORY); cairo_surface_destroy ((cairo_surface_t*)quartz_surf); return; } @@ -539,9 +553,10 @@ _init_pattern_with_snapshot (cairo_pattern_t *pattern, return CAIRO_STATUS_SUCCESS; } -static CGPatternRef +static cairo_int_status_t _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t *dest, - cairo_pattern_t *abspat) + cairo_pattern_t *abspat, + CGPatternRef *cgpat) { cairo_surface_pattern_t *spat; cairo_surface_t *pat_surf; @@ -552,8 +567,8 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t CGPatternCallbacks cb = { 0, SurfacePatternDrawFunc, (CGFunctionReleaseInfoCallback) cairo_pattern_destroy }; - CGPatternRef cgpat; float rw, rh; + cairo_status_t status; cairo_pattern_union_t *snap_pattern = NULL; cairo_pattern_t *target_pattern = abspat; @@ -561,12 +576,15 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t cairo_matrix_t m; /* SURFACE is the only type we'll handle here */ if (abspat->type != CAIRO_PATTERN_TYPE_SURFACE) - return NULL; + return CAIRO_INT_STATUS_UNSUPPORTED; spat = (cairo_surface_pattern_t *) abspat; pat_surf = spat->surface; - _cairo_surface_get_extents (pat_surf, &extents); + status = _cairo_surface_get_extents (pat_surf, &extents); + if (status) + return status; + pbounds.origin.x = 0; pbounds.origin.y = 0; @@ -618,14 +636,14 @@ _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (cairo_quartz_surface_t target_pattern = abspat; } - cgpat = CGPatternCreate (target_pattern, + *cgpat = CGPatternCreate (target_pattern, pbounds, ptransform, rw, rh, kCGPatternTilingConstantSpacing, /* kCGPatternTilingNoDistortion, */ TRUE, &cb); - return cgpat; + return CAIRO_STATUS_SUCCESS; } typedef enum { @@ -660,8 +678,11 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, } else if (source->type == CAIRO_PATTERN_TYPE_LINEAR || source->type == CAIRO_PATTERN_TYPE_RADIAL) { - CGShadingRef shading = _cairo_quartz_cairo_gradient_pattern_to_quartz (source); - if (!shading) + CGShadingRef shading = NULL; + cairo_int_status_t status; + + status = _cairo_quartz_cairo_gradient_pattern_to_quartz (source, &shading); + if (status) return DO_UNSUPPORTED; surface->sourceShading = shading; @@ -672,11 +693,17 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, { cairo_surface_pattern_t *spat = (cairo_surface_pattern_t *) source; cairo_surface_t *pat_surf = spat->surface; - cairo_quartz_surface_t *quartz_surf = _cairo_quartz_surface_to_quartz ((cairo_surface_t *) surface, pat_surf); - CGImageRef img = CGBitmapContextCreateImage (quartz_surf->cgContext); + cairo_quartz_surface_t *quartz_surf; + CGImageRef img; cairo_matrix_t m = spat->base.matrix; cairo_rectangle_int16_t extents; + cairo_status_t status; + + status = _cairo_quartz_surface_to_quartz ((cairo_surface_t *) surface, pat_surf, &quartz_surf); + if (status) + return DO_UNSUPPORTED; + img = CGBitmapContextCreateImage (quartz_surf->cgContext); if (!img) return DO_UNSUPPORTED; @@ -685,7 +712,10 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, cairo_matrix_invert(&m); _cairo_quartz_cairo_matrix_to_quartz (&m, &surface->sourceImageTransform); - _cairo_surface_get_extents (pat_surf, &extents); + status = _cairo_surface_get_extents (pat_surf, &extents); + if (status) + return DO_UNSUPPORTED; + surface->sourceImageRect = CGRectMake (0, 0, extents.width, extents.height); surface->sourceImageSurface = (cairo_surface_t *)quartz_surf; @@ -694,9 +724,11 @@ _cairo_quartz_setup_source (cairo_quartz_surface_t *surface, } else if (source->type == CAIRO_PATTERN_TYPE_SURFACE) { float patternAlpha = 1.0f; CGColorSpaceRef patternSpace; + CGPatternRef pattern; + cairo_int_status_t status; - CGPatternRef pattern = _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (surface, source); - if (!pattern) + status = _cairo_quartz_cairo_repeating_surface_pattern_to_quartz (surface, source, &pattern); + if (status) return DO_UNSUPPORTED; // Save before we change the pattern, colorspace, etc. so that @@ -876,13 +908,20 @@ _cairo_quartz_surface_acquire_source_image (void *abstract_surface, cairo_image_surface_t **image_out, void **image_extra) { + cairo_int_status_t status; cairo_quartz_surface_t *surface = (cairo_quartz_surface_t *) abstract_surface; //ND((stderr, "%p _cairo_quartz_surface_acquire_source_image\n", surface)); *image_extra = NULL; - return _cairo_quartz_get_image (surface, image_out, NULL); + status = _cairo_quartz_get_image (surface, image_out, NULL); + if (status) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } + + return CAIRO_STATUS_SUCCESS; } static void @@ -910,8 +949,10 @@ _cairo_quartz_surface_acquire_dest_image (void *abstract_surface, *image_rect = surface->extents; status = _cairo_quartz_get_image (surface, image_out, &data); - if (status) - return status; + if (status) { + _cairo_error (CAIRO_STATUS_NO_MEMORY); + return CAIRO_STATUS_NO_MEMORY; + } *image_extra = data; @@ -1253,15 +1294,21 @@ _cairo_quartz_surface_stroke (void *abstract_surface, #define STATIC_DASH 32 float sdash[STATIC_DASH]; float *fdash = sdash; + unsigned int max_dashes = style->num_dashes; unsigned int k; - if (style->num_dashes > STATIC_DASH) - fdash = malloc (sizeof(float)*style->num_dashes); - for (k = 0; k < style->num_dashes; k++) - fdash[k] = (float) style->dash[k]; - - CGContextSetLineDash (surface->cgContext, style->dash_offset, fdash, style->num_dashes); + if (style->num_dashes%2) + max_dashes *= 2; + if (max_dashes > STATIC_DASH) + fdash = _cairo_malloc_ab (style->num_dashes, sizeof (float)); + if (max_dashes > STATIC_DASH) + fdash = malloc (sizeof(float)*max_dashes); + + for (k = 0; k < max_dashes; k++) + fdash[k] = (float) style->dash[k % style->num_dashes]; + + CGContextSetLineDash (surface->cgContext, style->dash_offset, fdash, max_dashes); if (fdash != sdash) free (fdash); } @@ -1394,8 +1441,8 @@ _cairo_quartz_surface_show_glyphs (void *abstract_surface, CGContextSetFontSize (surface->cgContext, 1.0); if (num_glyphs > STATIC_BUF_SIZE) { - cg_glyphs = (CGGlyph*) malloc(sizeof(CGGlyph) * num_glyphs); - cg_advances = (CGSize*) malloc(sizeof(CGSize) * num_glyphs); + cg_glyphs = (CGGlyph*) _cairo_malloc_ab (num_glyphs, sizeof(CGGlyph)); + cg_advances = (CGSize*) _cairo_malloc_ab (num_glyphs, sizeof(CGSize)); } xprev = glyphs[0].x; @@ -1711,7 +1758,7 @@ cairo_quartz_surface_create (cairo_format_t format, return (cairo_surface_t*) &_cairo_surface_nil; } - imageData = malloc (height * stride); + imageData = _cairo_malloc_ab (height, stride); if (!imageData) { CGColorSpaceRelease (cgColorspace); _cairo_error (CAIRO_STATUS_NO_MEMORY); diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c index 65b1cdc..ea2e63a 100644 --- a/src/cairo-scaled-font-subsets.c +++ b/src/cairo-scaled-font-subsets.c @@ -390,7 +390,7 @@ _cairo_sub_font_collect (void *entry, void *closure) subset.num_glyphs = collection->num_glyphs; /* No need to check for out of memory here. If to_unicode is NULL, the PDF * surface does not emit an ToUnicode stream */ - subset.to_unicode = malloc (collection->num_glyphs*sizeof(unsigned long)); + subset.to_unicode = _cairo_malloc_ab (collection->num_glyphs, sizeof (unsigned long)); if (subset.to_unicode) { for (j = 0; j < collection->num_glyphs; j++) { /* default unicode character required when mapping fails */ @@ -622,7 +622,7 @@ _cairo_scaled_font_subsets_foreach_internal (cairo_scaled_font_subsets_t if (! collection.glyphs_size) return CAIRO_STATUS_SUCCESS; - collection.glyphs = malloc (collection.glyphs_size * sizeof(unsigned long)); + collection.glyphs = _cairo_malloc_ab (collection.glyphs_size, sizeof(unsigned long)); if (collection.glyphs == NULL) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c index 7a47219..ef70a38 100644 --- a/src/cairo-scaled-font.c +++ b/src/cairo-scaled-font.c @@ -927,7 +927,7 @@ _cairo_scaled_font_text_to_glyphs (cairo_scaled_font_t *scaled_font, if (status) goto DONE; - *glyphs = (cairo_glyph_t *) malloc ((*num_glyphs) * (sizeof (cairo_glyph_t))); + *glyphs = (cairo_glyph_t *) _cairo_malloc_ab ((*num_glyphs), sizeof (cairo_glyph_t)); if (*glyphs == NULL) { status = CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-spline.c b/src/cairo-spline.c index bf87770..c4540c5 100644 --- a/src/cairo-spline.c +++ b/src/cairo-spline.c @@ -109,11 +109,12 @@ _cairo_spline_grow (cairo_spline_t *spline) assert (spline->num_points <= spline->points_size); if (spline->points == spline->points_embedded) { - new_points = malloc (new_size * sizeof (cairo_point_t)); + new_points = _cairo_malloc_ab (new_size, sizeof (cairo_point_t)); if (new_points) memcpy (new_points, spline->points, old_size * sizeof (cairo_point_t)); } else { - new_points = realloc (spline->points, new_size * sizeof (cairo_point_t)); + new_points = _cairo_realloc_ab (spline->points, + new_size, sizeof (cairo_point_t)); } if (new_points == NULL) { diff --git a/src/cairo-stroke-style.c b/src/cairo-stroke-style.c index a150906..2eccb80 100644 --- a/src/cairo-stroke-style.c +++ b/src/cairo-stroke-style.c @@ -62,7 +62,7 @@ _cairo_stroke_style_init_copy (cairo_stroke_style_t *style, if (other->dash == NULL) { style->dash = NULL; } else { - style->dash = malloc (style->num_dashes * sizeof (double)); + style->dash = _cairo_malloc_ab (style->num_dashes, sizeof (double)); if (style->dash == NULL) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-surface-fallback-private.h b/src/cairo-surface-fallback-private.h index e0f83c4..b4ec5d1 100644 --- a/src/cairo-surface-fallback-private.h +++ b/src/cairo-surface-fallback-private.h @@ -1,3 +1,4 @@ +/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ /* cairo - a vector graphics library with display and print output * * Copyright © 2002 University of Southern California @@ -116,4 +117,13 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t op, cairo_trapezoid_t *traps, int num_traps); +cairo_private cairo_status_t +_cairo_surface_fallback_clone_similar (cairo_surface_t *surface, + cairo_surface_t *src, + int src_x, + int src_y, + int width, + int height, + cairo_surface_t **clone_out); + #endif diff --git a/src/cairo-surface-fallback.c b/src/cairo-surface-fallback.c index 8898aee..0d36257 100644 --- a/src/cairo-surface-fallback.c +++ b/src/cairo-surface-fallback.c @@ -1,3 +1,4 @@ +/* -*- Mode: c; tab-width: 8; c-basic-offset: 4; indent-tabs-mode: t; -*- */ /* cairo - a vector graphics library with display and print output * * Copyright © 2002 University of Southern California @@ -1166,7 +1167,7 @@ _cairo_surface_fallback_fill_rectangles (cairo_surface_t *surface, /* If the fetched image isn't at 0,0, we need to offset the rectangles */ if (state.image_rect.x != 0 || state.image_rect.y != 0) { - offset_rects = malloc (sizeof (cairo_rectangle_int16_t) * num_rects); + offset_rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int16_t)); if (offset_rects == NULL) { status = CAIRO_STATUS_NO_MEMORY; goto DONE; @@ -1222,7 +1223,7 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t op, /* If the destination image isn't at 0,0, we need to offset the trapezoids */ if (state.image_rect.x != 0 || state.image_rect.y != 0) { - offset_traps = malloc (sizeof (cairo_trapezoid_t) * num_traps); + offset_traps = _cairo_malloc_ab (num_traps, sizeof (cairo_trapezoid_t)); if (!offset_traps) { status = CAIRO_STATUS_NO_MEMORY; goto DONE; @@ -1250,3 +1251,47 @@ _cairo_surface_fallback_composite_trapezoids (cairo_operator_t op, return status; } + +cairo_status_t +_cairo_surface_fallback_clone_similar (cairo_surface_t *surface, + cairo_surface_t *src, + int src_x, + int src_y, + int width, + int height, + cairo_surface_t **clone_out) +{ + cairo_status_t status; + cairo_surface_t *new_surface = NULL; + cairo_t *cr; + + new_surface = _cairo_surface_create_similar_scratch (surface, + cairo_surface_get_content (src), + width, height); + if (new_surface->status) + return new_surface->status; + + /* We have to copy these here, so that the coordinate spaces are correct */ + new_surface->device_transform = src->device_transform; + new_surface->device_transform_inverse = src->device_transform_inverse; + + /* We can't use _cairo_composite directly, because backends that + * implement the "high-level" API may not have it implemented. + * (For example, SVG.) We can fix this by either checking if the + * destination supports composite first, or we can make clone a + * required "high-level" operation. + */ + cr = cairo_create (new_surface); + cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); + cairo_set_source_surface (cr, src, -src_x, -src_y); + cairo_paint (cr); + status = cairo_status (cr); + cairo_destroy (cr); + + if (status == CAIRO_STATUS_SUCCESS) + *clone_out = new_surface; + else + cairo_surface_destroy (new_surface); + + return status; +} diff --git a/src/cairo-surface.c b/src/cairo-surface.c index d7ef33f..0d31d04 100644 --- a/src/cairo-surface.c +++ b/src/cairo-surface.c @@ -164,7 +164,7 @@ slim_hidden_def(cairo_surface_get_content); * * Return value: %CAIRO_STATUS_SUCCESS, %CAIRO_STATUS_NULL_POINTER, * %CAIRO_STATUS_NO_MEMORY, %CAIRO_STATUS_READ_ERROR, - * %CAIRO_STATUS_INVALID_CONTENT, %CAIRO_STATUS_INVALUE_FORMAT, or + * %CAIRO_STATUS_INVALID_CONTENT, %CAIRO_STATUS_INVALID_FORMAT, or * %CAIRO_STATUS_INVALID_VISUAL. **/ cairo_status_t @@ -1023,42 +1023,49 @@ _cairo_surface_clone_similar (cairo_surface_t *surface, int height, cairo_surface_t **clone_out) { - cairo_status_t status; + cairo_status_t status = CAIRO_INT_STATUS_UNSUPPORTED; cairo_image_surface_t *image; void *image_extra; if (surface->finished) return CAIRO_STATUS_SURFACE_FINISHED; - if (surface->backend->clone_similar == NULL) - return CAIRO_INT_STATUS_UNSUPPORTED; + if (surface->backend->clone_similar) { + status = surface->backend->clone_similar (surface, src, src_x, src_y, + width, height, clone_out); - status = surface->backend->clone_similar (surface, src, src_x, src_y, - width, height, clone_out); - if (status == CAIRO_STATUS_SUCCESS && *clone_out != src) - (*clone_out)->device_transform = src->device_transform; + if (status == CAIRO_INT_STATUS_UNSUPPORTED) { + /* If we failed, try again with an image surface */ + status = _cairo_surface_acquire_source_image (src, &image, &image_extra); + if (status == CAIRO_STATUS_SUCCESS) { + status = + surface->backend->clone_similar (surface, &image->base, + src_x, src_y, + width, height, + clone_out); - if (status != CAIRO_INT_STATUS_UNSUPPORTED) - return status; + _cairo_surface_release_source_image (src, image, image_extra); + } + } + } - status = _cairo_surface_acquire_source_image (src, &image, &image_extra); - if (status != CAIRO_STATUS_SUCCESS) + /* If we're still unsupported, hit our fallback path to get a clone */ + if (status == CAIRO_INT_STATUS_UNSUPPORTED) + status = + _cairo_surface_fallback_clone_similar (surface, src, src_x, src_y, + width, height, clone_out); + + /* We should never get UNSUPPORTED here, so if we have an error, bail. */ + if (status) return status; - status = surface->backend->clone_similar (surface, &image->base, src_x, - src_y, width, height, clone_out); - if (status == CAIRO_STATUS_SUCCESS && *clone_out != src) { + /* Update the clone's device_transform (which the underlying surface + * backend knows nothing about) */ + if (*clone_out != src) { (*clone_out)->device_transform = src->device_transform; (*clone_out)->device_transform_inverse = src->device_transform_inverse; - } - - /* If the above failed point, we could implement a full fallback - * using acquire_dest_image, but that's going to be very - * inefficient compared to a backend-specific implementation of - * clone_similar() with an image source. So we don't bother - */ + } - _cairo_surface_release_source_image (src, image, image_extra); return status; } @@ -1245,7 +1252,7 @@ _cairo_surface_fill_region (cairo_surface_t *surface, rects = stack_rects; if (num_rects > ARRAY_LENGTH (stack_rects)) { - rects = malloc (sizeof (cairo_rectangle_int16_t) * num_rects); + rects = _cairo_malloc_ab (num_rects, sizeof (cairo_rectangle_int16_t)); if (!rects) return CAIRO_STATUS_NO_MEMORY; } diff --git a/src/cairo-svg-surface.c b/src/cairo-svg-surface.c index 483440f..9d5ed6a 100644 --- a/src/cairo-svg-surface.c +++ b/src/cairo-svg-surface.c @@ -1220,7 +1220,7 @@ _cairo_svg_surface_emit_pattern_stops (cairo_output_stream_t *output, if (emulate_reflect || reverse_stops) { n_stops = emulate_reflect ? pattern->n_stops * 2 - 2: pattern->n_stops; - stops = malloc (sizeof (pixman_gradient_stop_t) * n_stops); + stops = _cairo_malloc_ab (n_stops, sizeof (pixman_gradient_stop_t)); for (i = 0; i < pattern->n_stops; i++) { if (reverse_stops) { diff --git a/src/cairo-traps.c b/src/cairo-traps.c index dd885c5..ac8b11d 100644 --- a/src/cairo-traps.c +++ b/src/cairo-traps.c @@ -260,11 +260,12 @@ _cairo_traps_grow (cairo_traps_t *traps) return traps->status; if (traps->traps == traps->traps_embedded) { - new_traps = malloc (new_size * sizeof (cairo_trapezoid_t)); + new_traps = _cairo_malloc_ab (new_size, sizeof (cairo_trapezoid_t)); if (new_traps) memcpy (new_traps, traps->traps, sizeof (traps->traps_embedded)); } else { - new_traps = realloc (traps->traps, new_size * sizeof (cairo_trapezoid_t)); + new_traps = _cairo_realloc_ab (traps->traps, + new_size, sizeof (cairo_trapezoid_t)); } if (new_traps == NULL) { diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c index 7f168a5..1efa4c8 100644 --- a/src/cairo-truetype-subset.c +++ b/src/cairo-truetype-subset.c @@ -46,10 +46,22 @@ struct subset_glyph { unsigned long location; }; -typedef struct _cairo_truetype_font { +typedef struct _cairo_truetype_font cairo_truetype_font_t; + +typedef struct table table_t; +struct table { + unsigned long tag; + cairo_status_t (*write) (cairo_truetype_font_t *font, unsigned long tag); + int pos; /* position in the font directory */ +}; + +struct _cairo_truetype_font { cairo_scaled_font_subset_t *scaled_font_subset; + table_t truetype_tables[10]; + int num_tables; + struct { char *base_font; unsigned int num_glyphs; @@ -70,7 +82,7 @@ typedef struct _cairo_truetype_font { int *parent_to_subset; cairo_status_t status; -} cairo_truetype_font_t; +}; static int cairo_truetype_font_use_glyph (cairo_truetype_font_t *font, int glyph); @@ -712,35 +724,6 @@ cairo_truetype_font_write_maxp_table (cairo_truetype_font_t *font, return font->status; } -typedef struct table table_t; -struct table { - unsigned long tag; - cairo_status_t (*write) (cairo_truetype_font_t *font, unsigned long tag); - int pos; /* position in the font directory */ -}; - -static const table_t truetype_tables[] = { - /* As we write out the glyf table we remap composite glyphs. - * Remapping composite glyphs will reference the sub glyphs the - * composite glyph is made up of. That needs to be done first so - * we have all the glyphs in the subset before going further. - * - * The third column in this table is the order in which the - * directory entries will appear in the table directory. - * The table directory must be sorted in tag order. */ - { TT_TAG_glyf, cairo_truetype_font_write_glyf_table, 3 }, - { TT_TAG_cmap, cairo_truetype_font_write_cmap_table, 0 }, - { TT_TAG_cvt, cairo_truetype_font_write_generic_table, 1 }, - { TT_TAG_fpgm, cairo_truetype_font_write_generic_table, 2 }, - { TT_TAG_head, cairo_truetype_font_write_head_table, 4 }, - { TT_TAG_hhea, cairo_truetype_font_write_hhea_table, 5 }, - { TT_TAG_hmtx, cairo_truetype_font_write_hmtx_table, 6 }, - { TT_TAG_loca, cairo_truetype_font_write_loca_table, 7 }, - { TT_TAG_maxp, cairo_truetype_font_write_maxp_table, 8 }, - { TT_TAG_name, cairo_truetype_font_write_generic_table, 9 }, - { TT_TAG_prep, cairo_truetype_font_write_generic_table, 10 }, -}; - static cairo_status_t cairo_truetype_font_write_offset_table (cairo_truetype_font_t *font) { @@ -748,20 +731,18 @@ cairo_truetype_font_write_offset_table (cairo_truetype_font_t *font) unsigned char *table_buffer; size_t table_buffer_length; unsigned short search_range, entry_selector, range_shift; - int num_tables; - num_tables = ARRAY_LENGTH (truetype_tables); search_range = 1; entry_selector = 0; - while (search_range * 2 <= num_tables) { + while (search_range * 2 <= font->num_tables) { search_range *= 2; entry_selector++; } search_range *= 16; - range_shift = num_tables * 16 - search_range; + range_shift = font->num_tables * 16 - search_range; cairo_truetype_font_write_be32 (font, SFNT_VERSION); - cairo_truetype_font_write_be16 (font, num_tables); + cairo_truetype_font_write_be16 (font, font->num_tables); cairo_truetype_font_write_be16 (font, search_range); cairo_truetype_font_write_be16 (font, entry_selector); cairo_truetype_font_write_be16 (font, range_shift); @@ -769,7 +750,7 @@ cairo_truetype_font_write_offset_table (cairo_truetype_font_t *font) /* Allocate space for the table directory. Each directory entry * will be filled in by cairo_truetype_font_update_entry() after * the table is written. */ - table_buffer_length = ARRAY_LENGTH (truetype_tables) * 16; + table_buffer_length = font->num_tables * 16; status = cairo_truetype_font_allocate_write_buffer (font, table_buffer_length, &table_buffer); if (status) @@ -824,7 +805,7 @@ cairo_truetype_font_generate (cairo_truetype_font_t *font, cairo_status_t status; unsigned long start, end, next; uint32_t checksum, *checksum_location; - unsigned int i; + int i; if (cairo_truetype_font_write_offset_table (font)) goto fail; @@ -833,14 +814,14 @@ cairo_truetype_font_generate (cairo_truetype_font_t *font, end = start; end = 0; - for (i = 0; i < ARRAY_LENGTH (truetype_tables); i++) { - if (truetype_tables[i].write (font, truetype_tables[i].tag)) + for (i = 0; i < font->num_tables; i++) { + if (font->truetype_tables[i].write (font, font->truetype_tables[i].tag)) goto fail; end = _cairo_array_num_elements (&font->output); next = cairo_truetype_font_align_output (font); - cairo_truetype_font_update_entry (font, truetype_tables[i].pos, truetype_tables[i].tag, - start, end); + cairo_truetype_font_update_entry (font, font->truetype_tables[i].pos, + font->truetype_tables[i].tag, start, end); status = cairo_truetype_font_check_boundary (font, next); if (status) { font->status = status; @@ -879,6 +860,91 @@ cairo_truetype_font_use_glyph (cairo_truetype_font_t *font, int glyph) return font->parent_to_subset[glyph]; } +static void +cairo_truetype_font_add_truetype_table (cairo_truetype_font_t *font, + unsigned long tag, + cairo_status_t (*write) (cairo_truetype_font_t *font, unsigned long tag), + int pos) +{ + font->truetype_tables[font->num_tables].tag = tag; + font->truetype_tables[font->num_tables].write = write; + font->truetype_tables[font->num_tables].pos = pos; + font->num_tables++; +} + +/* cairo_truetype_font_create_truetype_table_list() builds the list of + * truetype tables to be embedded in the subsetted font. Each call to + * cairo_truetype_font_add_truetype_table() adds a table, the callback + * for generating the table, and the position in the table directory + * to the truetype_tables array. + * + * As we write out the glyf table we remap composite glyphs. + * Remapping composite glyphs will reference the sub glyphs the + * composite glyph is made up of. The "glyf" table callback needs to + * be called first so we have all the glyphs in the subset before + * going further. + * + * The order in which tables are added to the truetype_table array + * using cairo_truetype_font_add_truetype_table() specifies the order + * in which the callback functions will be called. + * + * The tables in the table directory must be listed in alphabetical + * order. The "cvt", "fpgm", and "prep" are optional tables. They + * will only be embedded in the subset if they exist in the source + * font. The pos parameter of cairo_truetype_font_add_truetype_table() + * specifies the position of the table in the table directory. + */ +static void +cairo_truetype_font_create_truetype_table_list (cairo_truetype_font_t *font) +{ + cairo_bool_t has_cvt = FALSE; + cairo_bool_t has_fpgm = FALSE; + cairo_bool_t has_prep = FALSE; + unsigned long size; + int pos; + + size = 0; + if (font->backend->load_truetype_table (font->scaled_font_subset->scaled_font, + TT_TAG_cvt, 0, NULL, + &size) == CAIRO_STATUS_SUCCESS) + has_cvt = TRUE; + + size = 0; + if (font->backend->load_truetype_table (font->scaled_font_subset->scaled_font, + TT_TAG_fpgm, 0, NULL, + &size) == CAIRO_STATUS_SUCCESS) + has_fpgm = TRUE; + + size = 0; + if (font->backend->load_truetype_table (font->scaled_font_subset->scaled_font, + TT_TAG_prep, 0, NULL, + &size) == CAIRO_STATUS_SUCCESS) + has_prep = TRUE; + + font->num_tables = 0; + pos = 1; + if (has_cvt) + pos++; + if (has_fpgm) + pos++; + cairo_truetype_font_add_truetype_table (font, TT_TAG_glyf, cairo_truetype_font_write_glyf_table, pos); + + pos = 0; + cairo_truetype_font_add_truetype_table (font, TT_TAG_cmap, cairo_truetype_font_write_cmap_table, pos++); + if (has_cvt) + cairo_truetype_font_add_truetype_table (font, TT_TAG_cvt, cairo_truetype_font_write_generic_table, pos++); + if (has_fpgm) + cairo_truetype_font_add_truetype_table (font, TT_TAG_fpgm, cairo_truetype_font_write_generic_table, pos++); + pos++; + cairo_truetype_font_add_truetype_table (font, TT_TAG_head, cairo_truetype_font_write_head_table, pos++); + cairo_truetype_font_add_truetype_table (font, TT_TAG_hhea, cairo_truetype_font_write_hhea_table, pos++); + cairo_truetype_font_add_truetype_table (font, TT_TAG_hmtx, cairo_truetype_font_write_hmtx_table, pos++); + cairo_truetype_font_add_truetype_table (font, TT_TAG_loca, cairo_truetype_font_write_loca_table, pos++); + cairo_truetype_font_add_truetype_table (font, TT_TAG_maxp, cairo_truetype_font_write_maxp_table, pos++); + if (has_prep) + cairo_truetype_font_add_truetype_table (font, TT_TAG_prep, cairo_truetype_font_write_generic_table, pos); +} + cairo_status_t _cairo_truetype_subset_init (cairo_truetype_subset_t *truetype_subset, cairo_scaled_font_subset_t *font_subset) @@ -901,8 +967,9 @@ _cairo_truetype_subset_init (cairo_truetype_subset_t *truetype_subset, cairo_truetype_font_use_glyph (font, parent_glyph); } + cairo_truetype_font_create_truetype_table_list (font); status = cairo_truetype_font_generate (font, &data, &length, - &string_offsets, &num_strings); + &string_offsets, &num_strings); if (status) goto fail1; diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c index 919b1d5..0716005 100644 --- a/src/cairo-type1-subset.c +++ b/src/cairo-type1-subset.c @@ -1203,6 +1203,8 @@ _cairo_type1_scaled_font_is_type1 (cairo_scaled_font_t *scaled_font) PS_FontInfoRec font_info; cairo_bool_t is_type1 = FALSE; + if (!_cairo_scaled_font_is_ft (scaled_font)) + return FALSE; unscaled = (cairo_ft_unscaled_font_t *) _cairo_ft_scaled_font_get_unscaled_font (scaled_font); face = _cairo_ft_unscaled_font_lock_face (unscaled); if (!face) diff --git a/src/cairo-unicode.c b/src/cairo-unicode.c index 9abb0eb..1d1c00a 100644 --- a/src/cairo-unicode.c +++ b/src/cairo-unicode.c @@ -240,7 +240,7 @@ _cairo_utf8_to_ucs4 (const unsigned char *str, in = UTF8_NEXT_CHAR (in); } - str32 = malloc (sizeof (uint32_t) * (n_chars + 1)); + str32 = _cairo_malloc_ab (n_chars + 1, sizeof (uint32_t)); if (!str32) return CAIRO_STATUS_NO_MEMORY; @@ -307,7 +307,7 @@ _cairo_utf8_to_utf16 (const unsigned char *str, in = UTF8_NEXT_CHAR (in); } - str16 = malloc (sizeof (uint16_t) * (n16 + 1)); + str16 = _cairo_malloc_ab (n16 + 1, sizeof (uint16_t)); if (!str16) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-win32-font.c b/src/cairo-win32-font.c index e1f263b..3a13ef3 100644 --- a/src/cairo-win32-font.c +++ b/src/cairo-win32-font.c @@ -286,16 +286,21 @@ _win32_scaled_font_create (LOGFONTW *logfont, status = _cairo_scaled_font_init (&f->base, font_face, font_matrix, ctm, options, &cairo_win32_scaled_font_backend); + if (status) + goto FAIL; - if (status == CAIRO_STATUS_SUCCESS) - status = _cairo_win32_scaled_font_set_metrics (f); + status = _cairo_win32_scaled_font_set_metrics (f); if (status) { - cairo_scaled_font_destroy (&f->base); - return NULL; + _cairo_scaled_font_fini (&f->base); + goto FAIL; } return &f->base; + + FAIL: + free (f); + return NULL; } static cairo_status_t @@ -613,8 +618,8 @@ _cairo_win32_scaled_font_text_to_glyphs (void *abstract_font, dx = NULL; } - glyph_indices = malloc (sizeof (WCHAR) * buffer_size); - dx = malloc (sizeof (int) * buffer_size); + glyph_indices = _cairo_malloc_ab (buffer_size, sizeof (WCHAR)); + dx = _cairo_malloc_ab (buffer_size, sizeof (int)); if (!glyph_indices || !dx) { status = CAIRO_STATUS_NO_MEMORY; goto FAIL2; @@ -645,7 +650,7 @@ _cairo_win32_scaled_font_text_to_glyphs (void *abstract_font, } *num_glyphs = gcp_results.nGlyphs; - *glyphs = malloc (sizeof (cairo_glyph_t) * gcp_results.nGlyphs); + *glyphs = _cairo_malloc_ab (gcp_results.nGlyphs, sizeof (cairo_glyph_t)); if (!*glyphs) { status = CAIRO_STATUS_NO_MEMORY; goto FAIL2; diff --git a/src/cairo-win32-surface.c b/src/cairo-win32-surface.c index 450887a..f1a8703 100644 --- a/src/cairo-win32-surface.c +++ b/src/cairo-win32-surface.c @@ -186,7 +186,7 @@ _create_dc_and_bitmap (cairo_win32_surface_t *surface, } if (num_palette > 2) { - bitmap_info = malloc (sizeof (BITMAPINFOHEADER) + num_palette * sizeof (RGBQUAD)); + bitmap_info = _cairo_malloc_ab_plus_c (num_palette, sizeof(RGBQUAD), sizeof(BITMAPINFOHEADER)); if (!bitmap_info) return CAIRO_STATUS_NO_MEMORY; } else { @@ -476,7 +476,10 @@ _cairo_win32_surface_get_subimage (cairo_win32_surface_t *surface, status = CAIRO_INT_STATUS_UNSUPPORTED; - if ((local->flags & CAIRO_WIN32_SURFACE_CAN_BITBLT) && + /* We are blitting -from- surface, so we need to check if it + * supports BitBlt. I believe any surface can be used as a + * BitBlt destination. */ + if ((surface->flags & CAIRO_WIN32_SURFACE_CAN_BITBLT) && BitBlt (local->dc, 0, 0, width, height, @@ -1546,8 +1549,8 @@ _cairo_win32_surface_show_glyphs (void *surface, SetBkMode(dst->dc, TRANSPARENT); if (num_glyphs > STACK_GLYPH_SIZE) { - glyph_buf = (WORD *)malloc(num_glyphs * sizeof(WORD)); - dxy_buf = (int *)malloc(num_glyphs * 2 * sizeof(int)); + glyph_buf = (WORD *) _cairo_malloc_ab (num_glyphs, sizeof(WORD)); + dxy_buf = (int *) _cairo_malloc_abc (num_glyphs, sizeof(int), 2); } /* It is vital that dx values for dxy_buf are calculated from the delta of @@ -1759,7 +1762,7 @@ cairo_win32_surface_create_with_ddb (HDC hdc, HBITMAP saved_dc_bitmap; if (format != CAIRO_FORMAT_RGB24) - return NULL; + return NIL_SURFACE; /* XXX handle these eventually format != CAIRO_FORMAT_A8 || format != CAIRO_FORMAT_A1) @@ -1772,8 +1775,25 @@ cairo_win32_surface_create_with_ddb (HDC hdc, screen_dc = NULL; } - ddb = CreateCompatibleBitmap (hdc, width, height); ddb_dc = CreateCompatibleDC (hdc); + if (ddb_dc == NULL) { + _cairo_win32_print_gdi_error("CreateCompatibleDC"); + new_surf = NIL_SURFACE; + goto FINISH; + } + + ddb = CreateCompatibleBitmap (hdc, width, height); + if (ddb == NULL) { + DeleteDC (ddb_dc); + + /* Note that if an app actually does hit this out of memory + * condition, it's going to have lots of other issues, as + * video memory is probably exhausted. + */ + _cairo_win32_print_gdi_error("CreateCompatibleBitmap"); + new_surf = NIL_SURFACE; + goto FINISH; + } saved_dc_bitmap = SelectObject (ddb_dc, ddb); @@ -1786,6 +1806,7 @@ cairo_win32_surface_create_with_ddb (HDC hdc, new_surf->saved_dc_bitmap = saved_dc_bitmap; new_surf->is_dib = FALSE; +FINISH: if (screen_dc) ReleaseDC (NULL, screen_dc); diff --git a/src/cairo-xcb-surface.c b/src/cairo-xcb-surface.c index f929040..f16de3f 100644 --- a/src/cairo-xcb-surface.c +++ b/src/cairo-xcb-surface.c @@ -403,7 +403,7 @@ _get_image_surface (cairo_xcb_surface_t *surface, bpp = _bits_per_pixel(surface->dpy, imagerep->depth); bytes_per_line = _bytes_per_line(surface->dpy, surface->width, bpp); - data = malloc (bytes_per_line * surface->height); + data = _cairo_malloc_ab (surface->height, bytes_per_line); if (data == NULL) { free (imagerep); return CAIRO_STATUS_NO_MEMORY; @@ -1328,7 +1328,7 @@ _create_trapezoid_mask (cairo_xcb_surface_t *dst, mask_picture = _create_a8_picture (dst, &transparent, width, height, FALSE); solid_picture = _create_a8_picture (dst, &solid, width, height, TRUE); - offset_traps = malloc (sizeof (xcb_render_trapezoid_t) * num_traps); + offset_traps = _cairo_malloc_ab (num_traps, sizeof (xcb_render_trapezoid_t)); if (!offset_traps) return XCB_NONE; @@ -1515,7 +1515,7 @@ _cairo_xcb_surface_set_clip_region (void *abstract_surface, n_boxes = pixman_region_num_rects (region); if (n_boxes > 0) { - rects = malloc (sizeof(xcb_rectangle_t) * n_boxes); + rects = _cairo_malloc_ab (n_boxes, sizeof(xcb_rectangle_t)); if (rects == NULL) return CAIRO_STATUS_NO_MEMORY; } else { @@ -2360,7 +2360,7 @@ _cairo_xcb_surface_show_glyphs (void *abstract_dst, /* We make a copy of the glyphs so that we can elide any size-zero * glyphs to workaround an X server bug, (present in at least Xorg * 7.1 without EXA). */ - output_glyphs = malloc (num_glyphs * sizeof (cairo_glyph_t)); + output_glyphs = _cairo_malloc_ab (num_glyphs, sizeof (cairo_glyph_t)); if (output_glyphs == NULL) return CAIRO_STATUS_NO_MEMORY; diff --git a/src/cairo-xlib-display.c b/src/cairo-xlib-display.c index c7c3c43..b8f35cb 100644 --- a/src/cairo-xlib-display.c +++ b/src/cairo-xlib-display.c @@ -226,6 +226,7 @@ _cairo_xlib_display_get (Display *dpy) cairo_xlib_display_t *display; cairo_xlib_display_t **prev; XExtCodes *codes; + int major_unused, minor_unused; /* There is an apparent deadlock between this mutex and the * mutex for the display, but it's actually safe. For the @@ -260,6 +261,14 @@ _cairo_xlib_display_get (Display *dpy) if (display == NULL) goto UNLOCK; + /* Xlib calls out to the extension close_display hooks in LIFO + * order. So we have to ensure that all extensions that we depend + * on in our close_display hook are properly initialized before we + * add our hook. For now, that means Render, so we call into its + * QueryVersion function to ensure it gets initialized. + */ + XRenderQueryVersion (dpy, &major_unused, &minor_unused); + codes = XAddExtension (dpy); if (codes == NULL) { free (display); diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c index 39175bd..05d4dca 100644 --- a/src/cairo-xlib-surface.c +++ b/src/cairo-xlib-surface.c @@ -195,10 +195,10 @@ _xrender_format_to_content (XRenderPictFormat *xrender_format) if (xrender_format == NULL) return CAIRO_CONTENT_COLOR; - xrender_format_has_alpha = (xrender_format->direct.alpha != 0); - xrender_format_has_color = (xrender_format->direct.red != 0 || - xrender_format->direct.green != 0 || - xrender_format->direct.blue != 0); + xrender_format_has_alpha = (xrender_format->direct.alphaMask != 0); + xrender_format_has_color = (xrender_format->direct.redMask != 0 || + xrender_format->direct.greenMask != 0 || + xrender_format->direct.blueMask != 0); if (xrender_format_has_alpha) if (xrender_format_has_color) @@ -1263,10 +1263,8 @@ _recategorize_composite_operation (cairo_xlib_surface_t *dst, return DO_XCOPYAREA; } - if (!dst->buggy_repeat) - return DO_RENDER; - - if (is_integer_translation && + if (dst->buggy_repeat && + is_integer_translation && src_attr->extend == CAIRO_EXTEND_REPEAT && (src->width != 1 || src->height != 1)) { @@ -1280,6 +1278,9 @@ _recategorize_composite_operation (cairo_xlib_surface_t *dst, return DO_UNSUPPORTED; } + if (!CAIRO_SURFACE_RENDER_HAS_COMPOSITE (src)) + return DO_UNSUPPORTED; + return DO_RENDER; } @@ -1384,13 +1385,13 @@ _cairo_xlib_surface_composite (cairo_operator_t op, goto BAIL; } - status = _cairo_xlib_surface_set_attributes (src, &src_attr); - if (status) - goto BAIL; - switch (operation) { case DO_RENDER: + status = _cairo_xlib_surface_set_attributes (src, &src_attr); + if (status) + goto BAIL; + _cairo_xlib_surface_ensure_dst_picture (dst); if (mask) { status = _cairo_xlib_surface_set_attributes (mask, &mask_attr); @@ -1579,7 +1580,7 @@ _create_trapezoid_mask (cairo_xlib_surface_t *dst, mask_picture = _create_a8_picture (dst, &transparent, width, height, FALSE); solid_picture = _create_a8_picture (dst, &solid, width, height, TRUE); - offset_traps = malloc (sizeof (XTrapezoid) * num_traps); + offset_traps = _cairo_malloc_ab (num_traps, sizeof (XTrapezoid)); if (!offset_traps) return None; @@ -1760,7 +1761,7 @@ _cairo_xlib_surface_set_clip_region (void *abstract_surface, n_boxes = pixman_region_num_rects (region); if (n_boxes > ARRAY_LENGTH (surface->embedded_clip_rects)) { - rects = malloc (sizeof(XRectangle) * n_boxes); + rects = _cairo_malloc_ab (n_boxes, sizeof(XRectangle)); if (rects == NULL) return CAIRO_STATUS_NO_MEMORY; }else { @@ -2557,15 +2558,34 @@ _native_byte_order_lsb (void) static cairo_status_t _cairo_xlib_surface_add_glyph (Display *dpy, - cairo_scaled_font_t *scaled_font, - cairo_scaled_glyph_t *scaled_glyph) + cairo_scaled_font_t *scaled_font, + cairo_scaled_glyph_t **pscaled_glyph) { XGlyphInfo glyph_info; unsigned long glyph_index; unsigned char *data; cairo_status_t status = CAIRO_STATUS_SUCCESS; cairo_xlib_surface_font_private_t *font_private; + cairo_scaled_glyph_t *scaled_glyph = *pscaled_glyph; cairo_image_surface_t *glyph_surface = scaled_glyph->surface; + cairo_bool_t already_had_glyph_surface; + + if (!glyph_surface) { + + status = _cairo_scaled_glyph_lookup (scaled_font, + _cairo_scaled_glyph_index (scaled_glyph), + CAIRO_SCALED_GLYPH_INFO_METRICS | + CAIRO_SCALED_GLYPH_INFO_SURFACE, + pscaled_glyph); + if (status != CAIRO_STATUS_SUCCESS) + return status; + + scaled_glyph = *pscaled_glyph; + glyph_surface = scaled_glyph->surface; + already_had_glyph_surface = FALSE; + } else { + already_had_glyph_surface = TRUE; + } if (scaled_font->surface_private == NULL) { status = _cairo_xlib_surface_font_init (dpy, scaled_font, @@ -2575,6 +2595,31 @@ _cairo_xlib_surface_add_glyph (Display *dpy, } font_private = scaled_font->surface_private; + /* If the glyph surface has zero height or width, we create + * a clear 1x1 surface, to avoid various X server bugs. + */ + if ((glyph_surface->width == 0) || (glyph_surface->height == 0)) { + cairo_t *cr; + cairo_surface_t *tmp_surface; + + tmp_surface = cairo_image_surface_create (font_private->format, 1, 1); + cr = cairo_create (tmp_surface); + cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR); + cairo_paint (cr); + + status = cairo_status (cr); + + cairo_destroy (cr); + + tmp_surface->device_transform = glyph_surface->base.device_transform; + tmp_surface->device_transform_inverse = glyph_surface->base.device_transform_inverse; + + glyph_surface = (cairo_image_surface_t *) tmp_surface; + + if (status) + goto BAIL; + } + /* If the glyph format does not match the font format, then we * create a temporary surface for the glyph image with the font's * format. @@ -2582,14 +2627,16 @@ _cairo_xlib_surface_add_glyph (Display *dpy, if (glyph_surface->format != font_private->format) { cairo_t *cr; cairo_surface_t *tmp_surface; - double x_offset, y_offset; tmp_surface = cairo_image_surface_create (font_private->format, glyph_surface->width, glyph_surface->height); + tmp_surface->device_transform = glyph_surface->base.device_transform; + tmp_surface->device_transform_inverse = glyph_surface->base.device_transform_inverse; + cr = cairo_create (tmp_surface); - cairo_surface_get_device_offset (&glyph_surface->base, &x_offset, &y_offset); - cairo_set_source_surface (cr, &glyph_surface->base, x_offset, y_offset); + + cairo_set_source_surface (cr, &glyph_surface->base, 0, 0); cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); cairo_paint (cr); @@ -2597,9 +2644,6 @@ _cairo_xlib_surface_add_glyph (Display *dpy, cairo_destroy (cr); - tmp_surface->device_transform = glyph_surface->base.device_transform; - tmp_surface->device_transform_inverse = glyph_surface->base.device_transform_inverse; - glyph_surface = (cairo_image_surface_t *) tmp_surface; if (status) @@ -2728,6 +2772,15 @@ _cairo_xlib_surface_add_glyph (Display *dpy, if (glyph_surface != scaled_glyph->surface) cairo_surface_destroy (&glyph_surface->base); + /* if the scaled glyph didn't already have a surface attached + * to it, release the created surface now that we have it + * uploaded to the X server. If the surface has already been + * there (eg. because image backend requested it), leave it in + * the cache + */ + if (!already_had_glyph_surface) + _cairo_scaled_glyph_set_surface (scaled_glyph, scaled_font, NULL); + return status; } @@ -2815,7 +2868,7 @@ _cairo_xlib_surface_emit_glyphs_chunk (cairo_xlib_surface_t *dst, if (num_elts <= STACK_ELTS_LEN) { elts = stack_elts; } else { - elts = malloc (num_elts * sizeof (XGlyphElt8)); + elts = _cairo_malloc_ab (num_elts, sizeof (XGlyphElt8)); if (elts == NULL) return CAIRO_STATUS_NO_MEMORY; } @@ -2913,7 +2966,6 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst, status = _cairo_scaled_glyph_lookup (scaled_font, glyphs[i].index, - CAIRO_SCALED_GLYPH_INFO_SURFACE | CAIRO_SCALED_GLYPH_INFO_METRICS, &scaled_glyph); if (status != CAIRO_STATUS_SUCCESS) @@ -2924,14 +2976,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst, /* Glyph skipping: * - * We skip any initial size-zero glyphs to avoid an X server bug (present - * in at least Xorg 7.1 without EXA) which stops rendering glyphs after - * the first zero-size glyph. However, we don't skip all size-zero - * glyphs, since that will force a new element at every space. We - * skip initial size-zero glyphs and hope that it's enough. Since - * Xft never exposed that bug, this assumption should be correct. - * - * We also skip any glyphs that have troublesome coordinates. We want + * We skip any glyphs that have troublesome coordinates. We want * to make sure that (glyph2.x - (glyph1.x + glyph1.width)) fits in * a signed 16bit integer, otherwise it will overflow in the render * protocol. @@ -2945,8 +2990,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst, * Anyway, we will allow positions in the range -1024..15359. That * will buy us a few more years before this stops working. */ - if ((!num_out_glyphs && !(scaled_glyph->surface->width && scaled_glyph->surface->height)) || - (((this_x+1024)|(this_y+1024))&~0x3fffu)) { + if (((this_x+1024)|(this_y+1024))&~0x3fffu) { glyphs[i].index = GLYPH_INDEX_SKIP; continue; } @@ -3002,7 +3046,7 @@ _cairo_xlib_surface_emit_glyphs (cairo_xlib_surface_t *dst, if (scaled_glyph->surface_private == NULL) { status = _cairo_xlib_surface_add_glyph (dst->dpy, scaled_font, - scaled_glyph); + &scaled_glyph); if (status) return status; scaled_glyph->surface_private = (void *) 1; diff --git a/src/cairo.c b/src/cairo.c index 6859e45..c6ea8c5 100644 --- a/src/cairo.c +++ b/src/cairo.c @@ -3405,6 +3405,9 @@ cairo_append_path (cairo_t *cr, return; } + if (path->num_data == 0) + return; + if (path->data == NULL) { _cairo_set_error (cr, CAIRO_STATUS_NULL_POINTER); return; diff --git a/src/cairoint.h b/src/cairoint.h index 07846b8..21d43d9 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -181,6 +181,7 @@ do { \ #include "cairo-mutex-private.h" #include "cairo-wideint-private.h" +#include "cairo-malloc-private.h" typedef int32_t cairo_fixed_16_16_t; typedef cairo_int64_t cairo_fixed_32_32_t; diff --git a/test/Makefile.am b/test/Makefile.am index 4d9f5f5..716f558 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -346,6 +346,7 @@ REFERENCE_IMAGES = \ push-group-rgb24-ref.png \ push-group-svg-argb32-ref.png \ radial-gradient-ref.png \ + radial-gradient-svg-ref.png \ random-intersections-ps-argb32-ref.png \ random-intersections-ref.png \ rectangle-rounding-error-ref.png \ @@ -436,6 +437,7 @@ $(REFERENCE_IMAGES) XFAIL_TESTS = \ a8-mask \ big-trap \ +bitmap-font \ extend-pad \ filter-nearest-offset \ long-lines \ @@ -617,4 +619,10 @@ check-ref-dups: @sha1sum *-ref.png > ref.hash @join ref.hash ref.hash | grep -v -E '( .*-ref.png).*\1' | cut -d' ' -f 1-2 | sort -u -.PHONY: check-valgrind test recheck retest html rehtml check-ref-dups +# Not exactly the best script in the world... +check-ref-missing: + @for i in *-ref.png; do\ + echo ${REFERENCE_IMAGES} | grep -sq $$i || echo $$i; \ + done + +.PHONY: check-valgrind test recheck retest html rehtml check-ref-dups check-ref-missing diff --git a/test/Makefile.in b/test/Makefile.in index bc3318f..a0682ba 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1104,6 +1104,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ @@ -1412,6 +1413,7 @@ REFERENCE_IMAGES = \ push-group-rgb24-ref.png \ push-group-svg-argb32-ref.png \ radial-gradient-ref.png \ + radial-gradient-svg-ref.png \ random-intersections-ps-argb32-ref.png \ random-intersections-ref.png \ rectangle-rounding-error-ref.png \ @@ -1503,6 +1505,7 @@ $(REFERENCE_IMAGES) XFAIL_TESTS = \ a8-mask \ big-trap \ +bitmap-font \ extend-pad \ filter-nearest-offset \ long-lines \ @@ -2673,7 +2676,13 @@ check-ref-dups: @sha1sum *-ref.png > ref.hash @join ref.hash ref.hash | grep -v -E '( .*-ref.png).*\1' | cut -d' ' -f 1-2 | sort -u -.PHONY: check-valgrind test recheck retest html rehtml check-ref-dups +# Not exactly the best script in the world... +check-ref-missing: + @for i in *-ref.png; do\ + echo ${REFERENCE_IMAGES} | grep -sq $$i || echo $$i; \ + done + +.PHONY: check-valgrind test recheck retest html rehtml check-ref-dups check-ref-missing # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/test/bitmap-font.c b/test/bitmap-font.c index 2a9754e..ca38f36 100644 --- a/test/bitmap-font.c +++ b/test/bitmap-font.c @@ -40,7 +40,8 @@ static cairo_test_draw_function_t draw; cairo_test_t test = { "bitmap-font", - "Test drawing with a font consisting only of bitmaps", + "Test drawing with a font consisting only of bitmaps" + "\nPDF backend is failing for an unknown reason (not a regression compared to 1.4.10", 246 + 1, 2 * TEXT_SIZE, draw }; diff --git a/test/copy-path.c b/test/copy-path.c index 142bfa5..362bb34 100644 --- a/test/copy-path.c +++ b/test/copy-path.c @@ -125,6 +125,29 @@ draw (cairo_t *cr, int width, int height) cairo_path_destroy (path); cairo_destroy (cr_error); + + /* first check that we can copy an empty path */ + cairo_new_path (cr); + path = cairo_copy_path (cr); + if (path->status != CAIRO_STATUS_SUCCESS) { + cairo_test_log ("Error: cairo_copy_path returned status of %s\n", + cairo_status_to_string (path->status)); + cairo_path_destroy (path); + return CAIRO_TEST_FAILURE; + } + if (path->num_data != 0) { + cairo_test_log ("Error: cairo_copy_path did not copy an empty path, returned path contains %d elements\n", + path->num_data); + cairo_path_destroy (path); + return CAIRO_TEST_FAILURE; + } + cairo_append_path (cr, path); + cairo_path_destroy (path); + if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) { + cairo_test_log ("Error: cairo_append_path failed with a copy of an empty path, returned status of %s\n", + cairo_status_to_string (cairo_status (cr))); + return CAIRO_TEST_FAILURE; + } /* We draw in the default black, so paint white first. */ cairo_save (cr); @@ -207,6 +230,15 @@ main (void) path.num_data = 0; path.status = CAIRO_STATUS_SUCCESS; cairo_append_path (cr, &path); + if (cairo_status (cr) != CAIRO_STATUS_SUCCESS) + return 1; + cairo_destroy (cr); + + cr = cairo_create (surface); + path.data = NULL; + path.num_data = 1; + path.status = CAIRO_STATUS_SUCCESS; + cairo_append_path (cr, &path); if (cairo_status (cr) != CAIRO_STATUS_NULL_POINTER) return 1; cairo_destroy (cr); diff --git a/test/ft-text-vertical-layout-type1-ps-argb32-ref.png b/test/ft-text-vertical-layout-type1-ps-argb32-ref.png Binary files differindex bc71bbc..56943e4 100644 --- a/test/ft-text-vertical-layout-type1-ps-argb32-ref.png +++ b/test/ft-text-vertical-layout-type1-ps-argb32-ref.png diff --git a/test/ft-text-vertical-layout-type3-ps-argb32-ref.png b/test/ft-text-vertical-layout-type3-ps-argb32-ref.png Binary files differindex e5b12bf..08581e5 100644 --- a/test/ft-text-vertical-layout-type3-ps-argb32-ref.png +++ b/test/ft-text-vertical-layout-type3-ps-argb32-ref.png diff --git a/test/pdiff/Makefile.in b/test/pdiff/Makefile.in index ada0ee9..5652f1d 100644 --- a/test/pdiff/Makefile.in +++ b/test/pdiff/Makefile.in @@ -219,6 +219,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ diff --git a/test/radial-gradient-svg-ref.png b/test/radial-gradient-svg-ref.png Binary files differnew file mode 100644 index 0000000..7e04701 --- /dev/null +++ b/test/radial-gradient-svg-ref.png diff --git a/util/Makefile.in b/util/Makefile.in index a3d15b3..a8d6cab 100644 --- a/util/Makefile.in +++ b/util/Makefile.in @@ -217,6 +217,7 @@ PKG_CONFIG = @PKG_CONFIG@ POPPLER_CFLAGS = @POPPLER_CFLAGS@ POPPLER_LIBS = @POPPLER_LIBS@ RANLIB = @RANLIB@ +SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SHTOOL = @SHTOOL@ |
