Commit graph

7759 commits

Author SHA1 Message Date
Adrian Johnson
d0a2031c5c Merge branch 'fix-color-glyph-compositing' into 'master'
Fix compositing non-color glyphs in one case

See merge request cairo/cairo!224
2021-08-14 12:08:32 +00:00
Adrian Johnson
1e446cb31e Fix color fonts when antialias == SUBPIXEL or NONE 2021-08-14 07:06:34 +00:00
Adrian Johnson
6ea9ec75ed Merge branch 'issue-389' into 'master'
Add color user-font support

See merge request cairo/cairo!223
2021-08-14 06:06:20 +00:00
Adrian Johnson
62cc53f9b8 Add color user-font support
Adds new API cairo_user_font_face_set_render_color_glyph_func()
to set a color glyph renderer.
2021-08-14 06:06:19 +00:00
Adrian Johnson
76331f654e Fix some mingw warnings and correct the value of R_OK 2021-08-07 15:44:21 +09:30
Jonathan Kew
67c91db455 Check correctly for surface_pattern being a snapshot/recording in _cairo_win32_printing_surface_paint_pattern.
(Corrected patch as proposed by Uli Schlachter.)

Fixes poor-quality print output on Windows reported in https://bugzilla.mozilla.org/show_bug.cgi?id=1721127.
2021-08-04 11:58:49 +01:00
Matthias Clasen
4e859ddb19 Fix compositing non-color glyphs in one case
The intention here is: "if show_text_glyphs is unsupported,
try show_gyphs". We need to make sure to set the status to
unsupported before checking it, otherwise we end up looking
at the status that was set by composite_color_glyphs if
show_text_glyphs is NULL.

This showed up in https://github.com/harfbuzz/harfbuzz/issues/2675
2021-08-02 12:37:27 -04:00
Heiko Lewin
4dd48f0979 Merge branch 'fix_infinite_loop' into 'master'
_arc_max_angle_for_tolerance_normalized: fix infinite loop

See merge request cairo/cairo!155
2021-08-01 11:16:04 +00:00
Heiko Lewin
ab2c5ee21e _arc_max_angle_for_tolerance_normalized: fix infinite loop 2021-08-01 11:16:03 +00:00
Heiko Lewin
7176cc8f0f Fix clip leak 2021-08-01 11:10:40 +00:00
Adrian Johnson
ca1fb44dd3 pdf links: fix forward references to dest names with 'internal' flag 2021-07-29 07:31:31 +09:30
Adrian Johnson
24616585ec Print tag error details when CAIRO_DEBUG_TAG is defined
Add a _cairo_tag_error(fmt, ...) function that is used liked _cairo_error()
but allows an error message to be specified. When CAIRO_DEBUG_TAG is defined
the error is printed.
2021-07-29 06:00:37 +09:30
Adrian Johnson
4e3f6bf0c2 Merge branch 'pdf-object-streams' into 'master'
pdf: use cross-reference stream for PDF >= 1.5

See merge request cairo/cairo!197
2021-07-28 20:27:45 +00:00
Adrian Johnson
6fbfc9d927 pdf: use floating point widths when emitting fonts 2021-07-27 20:13:23 +00:00
Uli Schlachter
220222c5ff Merge branch 'issue-263' into 'master'
Win 64-bit fix pointer to long cast size mismatch

Closes #263

See merge request cairo/cairo!216
2021-07-27 15:53:03 +00:00
Adrian Johnson
90193cc3a2 pdf: convert all document interchange features to use object streams 2021-07-26 18:31:57 +09:30
Adrian Johnson
bd514f6b08 pdf: add support for object streams for PDF >= 1.5
This allows all objects that were previously emitted uncompressed to
be compressed into a an object stream.

Currently only /Page, /Pages, and /Catalog have been converted to use
object streams.
2021-07-26 18:31:47 +09:30
Adrian Johnson
0f382eb087 pdf: use cross-reference stream for PDF >= 1.5
This reduces the output size and is required for object streams.
2021-07-26 18:31:33 +09:30
Adrian Johnson
908b243ab8 Merge branch 'svg-create-for-stream' into 'master'
svg: Fix create-for-stream test case

See merge request cairo/cairo!212
2021-07-25 03:21:03 +00:00
Adrian Johnson
62681fe052 Change FNV hash to 64-bit
Most builds are 64-bit where the uintptr_t type of the hash value and the font
face pointer that is being hashed are 64-bit.
2021-07-25 11:06:52 +09:30
Adrian Johnson
8d14a20a00 Fix some win32 compile warnings 2021-07-25 11:02:55 +09:30
Adrian Johnson
9fbf427548 Use uintptr_t for all casts between pointer and integer
On 64-bit windows, long is 32-bit. When compiling there are a large
number of warnings about mismatched sizes when casting long to/from a
pointer.

Use the (u)intptr_t type for any integer that will have a pointer stored
in it. Use a (u)intptr_t cast when integers are stored in pointers to
silence warnings.

Fixes #263
2021-07-25 11:01:20 +09:30
Uli Schlachter
4c6b604bd5 svg: Fix create-for-stream test case
Commit 2fbd53 added another test to create-for-stream that failed for
cairo-pdf. Manual testing shows that this test also fails for cairo-svg.
However, this was not noticed because even before this addition to the
test, create-for-stream already failed for cairo-svg. Since the
introduction on CI was done based on "let's ignore all current
failures", this hid the error.

This commit applies the trivial fix for cairo-svg to make this test
pass. It is basically the same error that cairo-pdf had.

Additionally, this removes the hack to ignore create-for-stream failures
in CI since it is now no longer necessary.

Thanks to Knut Peterson for reporting this [0].

[0]:
https://lists.cairographics.org/archives/cairo/2021-July/029291.html

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-07-24 14:42:26 +02:00
Adrian Johnson
f7c7bcb603 tags: allow links to page numbers not yet created
Previously, forward references were required to use named destinations.

This patch is based on the patch in #336 by Guillaume Ayoub <guillaume.ayoub@kozea.fr>
that converted all links to indirect objects written at the end of the document.

I have reworked the patch so that only forward references to future page numbers are
written as indirect objects. Backward references and named destinations remain as they
are. This is to minimize the number of objects written to the PDF file.

Fixes #336
2021-07-24 21:33:09 +09:30
Adrian Johnson
994eccefc0 Merge branch 'recording-playback-nothing-to-do' into 'master'
Don't assert on NOTHING_TO_DO during recording replay.

See merge request cairo/cairo!195
2021-07-24 08:19:16 +00:00
Uli Schlachter
2fbd53a6b3 pdf: Properly pass on stdio write errors
cairo-pdf was silently ignoring write errors in
_cairo_pdf_surface_finish(). Any write errors that happened here ended
up setting a "status" variable, but the value in this variable was then
unused.

This commit fixes this bug by passing this error on to the caller.

Additionally, this also adds a test case for this behaviour based on
writing to /dev/full. This file is non-standard and thus the test first
checks that this file exists and is writable before trying to write to
it.

This bug was found based on a report from Knut Petersen [0].

[0]: https://lists.cairographics.org/archives/cairo/2021-July/029281.html

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-07-23 17:22:16 +02:00
Jonathan Kew
2d488b3596 Don't assert on NOTHING_TO_DO during recording replay. 2021-07-23 15:19:05 +01:00
Uli Schlachter
b408352d45 Merge branch 'issue-381' into 'master'
Always define _cairo_utf8_to_utf16 on Windows

Closes #381

See merge request cairo/cairo!209
2021-07-23 12:11:30 +00:00
Uli Schlachter
0d3090ad84 Merge branch 'issue-411' into 'master'
PS: ensure setup DSC comments are in BeginSetup section

Closes #411

See merge request cairo/cairo!208
2021-07-23 12:11:04 +00:00
Uli Schlachter
bfedda6a18 Merge branch 'issue-264' into 'master'
Patches from #264

Closes #264

See merge request cairo/cairo!207
2021-07-23 12:09:51 +00:00
Adrian Johnson
014707b7bc Merge branch 'parse-float-errors' into 'master'
Handle _cairo_strtod() failures in parse_float()

See merge request cairo/cairo!205
2021-07-23 09:51:24 +00:00
Peter Wang
bd54a1bf98 Always define _cairo_utf8_to_utf16 on Windows
_cairo_utf8_to_utf16 is used by _cairo_fopen on Windows so must be
defined even if Win32 fonts or other features are disabled.

Fixes #381
2021-07-23 19:15:56 +09:30
Adrian Johnson
0f18a873ef PS: ensure setup DSC comments are in BeginSetup section
Fixes #411
2021-07-23 19:10:55 +09:30
Adrian Johnson
ae04679a08 truetype: check cmap size before allocating memory
Fixes #264
2021-07-23 18:32:44 +09:30
Uli Schlachter
6f64682ca0 Handle _cairo_strtod() failures in parse_float()
When strtod cannot do anything, it returns zero and sets the end pointer
to the beginning of the string. This commit changes the code in
parse_float() to treat this case as an error.

Without the fix from commit b7d67433b7, this commit turns the error
from an endless loop into a parse error, which is a lot better error
behaviour.

Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-07-21 17:16:00 +02:00
Adrian Johnson
caf422b00b cff: use correct size cast when decoding bytes to a signed int
Fixes #399
2021-07-21 22:21:37 +09:30
Adrian Johnson
ab82549f03 Merge branch 'strtod-fix' into 'master'
Ensure _cairo_strtod accepts a leading sign character

Closes #499

See merge request cairo/cairo!203
2021-07-20 23:03:37 +00:00
Jonathan Kew
b7d67433b7 Accept a leading sign character in _cairo_strtod. 2021-07-20 17:53:45 +01:00
Adrian Johnson
b6c89810f2 cff: Check subroutine number is valid before using as an array index
Fixes #413
2021-07-20 21:54:08 +09:30
Adrian Johnson
06f405c775 Merge branch 'cff-subset-leak' into 'master'
Fix memory leak in cairo_cff_font_read_cid_fontdict

See merge request cairo/cairo!192
2021-07-20 12:00:05 +00:00
Adrian Johnson
a623906bf9 Fix some type1-subset array indexing bugs
Fixes #13
Fixes #452
2021-07-20 08:22:55 +09:30
Adrian Johnson
cb0bfefba2 Update DSC documention
Fixes #380
2021-07-18 19:30:48 +09:30
Adrian Johnson
26043a2db1 Fix crash 2021-07-18 18:13:10 +09:30
Adrian Johnson
1c64d2635b Remove all gstate from _cairo_surface_tag
The gstate is not required and was causing some tag operations to be
ignored.
2021-07-18 18:13:10 +09:30
Adrian Johnson
30a0ae56d8 Create cairo version of isxdigit()
Fixes #335
2021-07-18 16:10:59 +09:30
Uli Schlachter
fc1d6caa8c Fix memory leak in cairo_cff_font_read_cid_fontdict
The function cairo_cff_font_read_cid_fontdict() has a local variable
"cairo_array_t index". This array is first filled with data from the
font with cff_index_read(). Later in this function, each resulting entry
is given to cff_dict_read(). Nothing else is done with the array.

Thus, nothing can keep a reference to "index" and thus this array has to
be finalised at the end of the function to avoid a memory leak.

This commit does that by falling through to the call to cff_index_fini()
that is already there in the error case. This function checks for each
element if its ->is_copy is true and then frees the data. However,
cff_index_read() only creates elements with ->is_copy = FALSE, thus this
does not do anything. At the end, this calls _cairo_array_fini() which
frees the array's memory.

Fixes the following memory leak according to valgrind:

 24 bytes in 1 blocks are definitely lost in loss record 173 of 490
    at 0x48386AF: malloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
    by 0x483ADE7: realloc (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
    by 0x4A5ECC3: _cairo_array_grow_by (cairo-array.c:115)
    by 0x4A5EEEE: _cairo_array_allocate (cairo-array.c:317)
    by 0x4A5EE95: _cairo_array_append_multiple (cairo-array.c:288)
    by 0x4A5EE6B: _cairo_array_append (cairo-array.c:265)
    by 0x4AFB12E: cff_index_read (cairo-cff-subset.c:438)
    by 0x4AFC280: cairo_cff_font_read_cid_fontdict (cairo-cff-subset.c:1022)
    by 0x4AFCD42: cairo_cff_font_read_top_dict (cairo-cff-subset.c:1232)
    by 0x4AFD145: cairo_cff_font_read_font (cairo-cff-subset.c:1351)
    by 0x4AFFDC0: cairo_cff_font_generate (cairo-cff-subset.c:2583)
    by 0x4B00D71: _cairo_cff_subset_init (cairo-cff-subset.c:2975)

Fixes: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=30650
Signed-off-by: Uli Schlachter <psychon@znc.in>
2021-06-26 14:03:34 +02:00
Uli Schlachter
43a48fb6a5 Merge branch 'more-meson' into 'master'
Add more of the auto-foo build to meson

See merge request cairo/cairo!183
2021-06-17 14:25:16 +00:00
Uli Schlachter
39db60e957 Merge branch 'build-without-zlib' into 'master'
meson: Use more dependency objects & fix build without zlib

Closes #475

See merge request cairo/cairo!184
2021-06-03 15:26:07 +00:00
Uli Schlachter
2edcb1ac23 Merge branch 'jfkthame-master-patch-75366' into 'master'
[pdf-interchange] Write trees even if only LINK tags are present

Closes #487

See merge request cairo/cairo!185
2021-06-02 10:24:33 +00:00
Uli Schlachter
267d0e1c98 Merge branch 'issue_488' into 'master'
Allow empty postscript name when using a CFF font in pdf

Closes #488

See merge request cairo/cairo!186
2021-06-02 10:23:26 +00:00