Commit graph

11954 commits

Author SHA1 Message Date
Uli Schlachter
1981fb6dfb meson: Use more dependency objects
For example, to depend on cairo-script, inccairoscript was added to
"include_directories:" and libcairoscript was added to "link_with:".
This commit instead uses the libcairoscript_dep dependency everywhere.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-05-22 07:59:52 +02:00
Uli Schlachter
63f0d62684 Merge branch 'meson-defines' into 'master'
meson: Move CAIRO_HAS_INTERPRETER to config.h

See merge request cairo/cairo!174
2021-05-21 15:36:44 +00:00
Uli Schlachter
936e5ce8ee Merge branch 'xcb-free-xid-cache' into 'master'
xcb: Remove free XID cache

Closes #434

See merge request cairo/cairo!175
2021-05-21 15:35:59 +00:00
Uli Schlachter
91225d4dd7 Merge branch 'SVG-doc-scanner' into 'master'
#483

See merge request cairo/cairo!182
2021-05-20 15:43:16 +00:00
Uli Schlachter
9fcc7fb0bf Merge branch 'doc-scanner' into 'master'
Issue #482

See merge request cairo/cairo!181
2021-05-20 15:41:56 +00:00
Glash Gnome
7bf3a780ba #483
Fix Enum_member_description
2021-05-13 23:21:26 +00:00
Glash Gnome
7aa5e25772 Issue #482
Documentation stanza
2021-05-13 22:36:06 +00:00
Uli Schlachter
7c7b4e35bc Merge branch 'macos-dejavu' into 'master'
Install DejaVu fonts on macOS

See merge request cairo/cairo!179
2021-05-08 06:08:48 +00:00
Anton Danilkin
1339e5c275 Install DejaVu fonts on macOS
This also fixes some test failures.
2021-05-08 00:01:11 +02:00
Tim-Philipp Müller
0a4ba0507c Merge branch 'macos-artifacts' into 'master'
Export test images in artifacts on macOS

See merge request cairo/cairo!178
2021-05-06 23:17:34 +00:00
Anton Danilkin
37443761c9 Export test images in artifacts on macOS 2021-05-07 00:45:09 +02:00
Uli Schlachter
929262dd54 Merge branch 'jfkthame-master-patch-60882' into 'master'
Bail early from _cairo_image_compute_color if image is zero-sized.

See merge request cairo/cairo!177
2021-05-05 14:48:20 +00:00
Jonathan Kew
ac23567a0c Bail early from _cairo_image_compute_color if image is zero-sized.
This avoids the risk of encountering undefined behavior when computing the `pixel` pointer (even though it won't actually be used) in the case where the image width or height is zero and the data is NULL. (Observed when called from cairo_pdf_surface code when an extreme scaling transform was present, though I guess there are probably other ways to end up with such an image.)
2021-05-05 13:43:57 +00:00
Uli Schlachter
45cca0c984 meson: Move CAIRO_HAS_INTERPRETER to config.h
This is what autoconf does and hopefully that means this is the correct
thing to do.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-05-02 21:25:48 +02:00
Uli Schlachter
009d75b8db xcb: remove free pixmap/gc wrappers
With the last commit, these became pointless. Just switch the code to
call the underlying function directly.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-05-02 19:30:28 +02:00
Uli Schlachter
c16094fc44 xcb: Remove free XID cache
cairo-xcb kept a cache of free xid to avoid calling xcb_generate_id()
later. However, this is unsafe: When libxcb runs out of ids, it asks the
X11 server for an empty range of ids to use. The X11 server of course
does not know about cairo's cache and could hand out an id that cairo
will use again later. This would then result in BadIdChoice errors
later.

Fix this by simply removing the whole cache.

Fixes: https://gitlab.freedesktop.org/cairo/cairo/-/issues/434
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-05-02 17:49:32 +02:00
Uli Schlachter
4f61b765c9 Merge branch 'record-png-offset' into 'master'
Add a test case for commit d07fb41056

See merge request cairo/cairo!122
2021-05-02 14:55:48 +00:00
Uli Schlachter
aa02315243 Merge branch 'ebassi/config-define' into 'master'
meson: Define HAVE_CONFIG_H as a project flag

See merge request cairo/cairo!172
2021-05-02 05:48:26 +00:00
Emmanuele Bassi
bd13841257 Drop the conditional inclusion of config.h
We *always* generate this file, and we depend on its existence.

The idea behind HAVE_CONFIG_H was being able to include random files
from different projects, back in a time where "libraries" were literally
just random files instead of actual shared objects.

Since we're not in the '80s any more, and our build system(s) define
HAVE_CONFIG_H *and* generate the config.h header file, we don't need a
conditional guard around its inclusion.
2021-05-01 17:05:29 +01:00
Emmanuele Bassi
bfd1602db9 Remove stray _GNU_SOURCE definitions
We define _GNU_SOURCE globally in both the Autotools build, through the
use of the AC_USE_SYSTEM_EXTENSIONS macro; and in the Meson build, with
add_project_arguments().
2021-05-01 16:58:15 +01:00
Emmanuele Bassi
8336309794 meson: Define HAVE_CONFIG_H as a project flag
Precisely what Autotools does, instead of adding it as per-target C
argument.

Once we remove HAVE_CONFIG_H checks in every source file, we'll be able
to drop it.
2021-05-01 16:55:38 +01:00
Uli Schlachter
8f6cfe4177 Merge branch 'ci-test-x11' into 'master'
CI: Check test results for cairo-xcb and cairo-x11

See merge request cairo/cairo!165
2021-04-30 12:12:22 +00:00
Emmanuele Bassi
4c4e6127f4 Merge branch 'jfkthame-master-patch-60864' into 'master'
Don't leave the shm field uninitialized when building without shm support.

See merge request cairo/cairo!170
2021-04-29 09:18:07 +00:00
Jonathan Kew
cb86c13b62 Don't leave the shm field uninitialized when building without shm support.
This can result in reading an uninitialized value in draw_image_boxes() in cairo-xlib-render-compositor.c.
2021-04-29 08:52:31 +00:00
Uli Schlachter
64e1fd70ec Merge branch 'ebassi/warnings-fixes' into 'master'
Avoid a bunch of compiler warnings

See merge request cairo/cairo!166
2021-04-27 16:30:44 +00:00
Uli Schlachter
47770fc2b7 Merge branch 'ebassi/deprecations' into 'master'
Use g_memdup2() with newer versions of GLib

See merge request cairo/cairo!167
2021-04-27 16:24:29 +00:00
Emmanuele Bassi
efab74f5a1 Drop volatile from the GType registration
The `volatile` is unnecessary, and newer versions of GLib and GCC will
complain if you use it.
2021-04-27 16:59:35 +01:00
Emmanuele Bassi
0f39b79575 Define _GNU_SOURCE in order to use memmem
The memmem() function is a GNU extension, which means we need to define
_GNU_SOURCE in order to avoid a compiler warning about a missing
declaration.
2021-04-27 16:59:35 +01:00
Emmanuele Bassi
0bbb9de806 Disable deprecation warnings from librsvg
This is a test utility, we don't really care about deprecations.
2021-04-27 16:54:22 +01:00
Emmanuele Bassi
b7d38e048f Use g_memdup2() with newer versions of GLib
The g_memdup() function has been deprecated, as it takes the size of the
memory area as an unsigned integer. The g_memdup2() replacement uses the
more appropriate size_t type, instead.
2021-04-27 16:54:22 +01:00
Emmanuele Bassi
966b4a4e5f Handle new Cairo formats in test-trace
We are missing RGB96F and RGBA128F.
2021-04-27 16:50:56 +01:00
Emmanuele Bassi
7027360c82 Handle new Cairo formats in the XML surface
We are missing RGB96F and RGBA128F.
2021-04-27 16:50:38 +01:00
Uli Schlachter
14385eeff3 Merge branch 'mac-tests' into 'master'
Run the test suite on MacOS

See merge request cairo/cairo!160
2021-04-26 16:06:23 +00:00
Uli Schlachter
816e7ac06f Merge branch 'fix-cairo-gstate-copy-transformed-pattern-comment' into 'master'
Replace an outdated (after f0e2cd44) comment with clarification in _cairo_gstate_copy_transformed_pattern

See merge request cairo/cairo!162
2021-04-26 16:04:23 +00:00
Anton Danilkin
8d02744136 Replace an outdated (after f0e2cd44) comment with clarification in _cairo_gstate_copy_transformed_pattern 2021-04-25 13:35:41 +02:00
Uli Schlachter
58b1929173 script: Also ignore {xcb,xlib}-surface-source
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-25 12:32:56 +02:00
Uli Schlachter
4d3dfb7bcb .gitlab-ci.yml: Ignore current X11 test failures
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-25 11:05:59 +02:00
Uli Schlachter
845c1f2a9a CI: Run tests with an X11 server
Running the test suite with an X11 server allows testing cairo-x11 and
cairo-xcb.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-25 10:07:54 +02:00
Uli Schlachter
f125a457ea Merge branch 'fix-cairo-operator-bounded' into 'master'
Make the _cairo_operator_bounded family of functions consistent

See merge request cairo/cairo!163
2021-04-25 07:26:19 +00:00
Uli Schlachter
3c00a849f6 Merge branch 'fix-cairo-status-is-error' into 'master'
Add missing parentheses to _cairo_status_is_error and _cairo_int_status_is_error

See merge request cairo/cairo!161
2021-04-25 07:20:26 +00:00
Anton Danilkin
d03b6c90a7 Make the _cairo_operator_bounded family of functions consistent 2021-04-24 14:57:47 +02:00
Anton Danilkin
f4a3236d14 Add missing parentheses to _cairo_status_is_error and _cairo_int_status_is_error 2021-04-24 14:50:30 +02:00
Uli Schlachter
de2a71b230 Merge branch 'svg-ci' into 'master'
Enable SVG in CI

See merge request cairo/cairo!156
2021-04-23 19:40:46 +00:00
Uli Schlachter
2d2f73bc3c Run the test suite on MacOS
This adds the necessary commands to run the test suite on MacOS in CI
and to also ignore the current failures.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-22 16:14:37 +02:00
Heiko Lewin
ec2933b06e Merge branch 'wip/Jehan/subpixel-antialiasing' into 'master'
src: do not override explicitly requested grayscale antialiasing.

See merge request cairo/cairo!114
2021-04-20 12:35:17 +00:00
Tim-Philipp Müller
d4617e31be Merge branch 'no-fontconfig-on-windows' into 'master'
Don't build fontconfig on Windows

See merge request cairo/cairo!159
2021-04-20 10:33:20 +00:00
Matthias Clasen
f6a3f6d8ad Don't build fontconfig on Windows
mesons 'auto' is too eager to build things. Building
fontconfig as a subproject on Windows is not the right
thing, unless it was explictly requested.
2021-04-19 11:49:31 -04:00
Uli Schlachter
0392dd783c Ignore create-for-stream failure with svg
The create-for-stream test verifies that writing something to a file and
writing it to an in-memory surface produces the same output. The test
currently fails when the svg backend is tested with:

TEST: create_for_stream TARGET: pdf RESULT: PASS
svg: Stream based output differ from file output for output/create-for-stream.out.svg.
TEST: create_for_stream TARGET: svg RESULT: FAIL

I guess this is because svg uses unique IDs for surfaces, meaning that
drawing two times the same thing in the same process can produce
different outputs. However, this is just a guess and I didn't
investigate further.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-18 13:00:07 +02:00
Uli Schlachter
2f8b5bc7b2 Add hack to ignore a svg test crashes
This adds a special hack to the test suite to ignore the crashes for
self-copy and self-copy-overlap for the svg backend in CI.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-18 12:25:13 +02:00
Uli Schlachter
0c9dacbc43 svg: Reject raster sources
This hopefully fixes the raster-source test case crashing:

cairo-svg-surface.c:2269: _cairo_svg_surface_emit_pattern: Assertion `!"reached"' failed.

I cannot / did not test this change locally and rely on CI to tell me
whether this works.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-04-18 09:32:44 +02:00