Commit graph

8269 commits

Author SHA1 Message Date
Enrico Weigelt, metux IT consult
5bb43c92b3 core: dropped actually unused parameter of _cairo_boxes_to_array()
When parameter force_allocation is false *and* the box set has
exactly one chunk, this chunk is returned directly - w/o copying it.

That mode is never used, and it's highly problematic as it's unclear
whether we have to free the returnd object or it's still owned
by somebody else.

Just dropping the useless parameter / corner case to make the function
simpler and more robust.

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Signed-off-by: Uli Schlachter <psychon@znc.in>
2016-07-02 13:35:38 +02:00
Enrico Weigelt, metux IT consult
b23c2291d8 core: helper inline for rect->box conversion
Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Signed-off-by: Uli Schlachter <psychon@znc.in>
2016-07-02 13:35:34 +02:00
Enrico Weigelt, metux IT consult
ae403448af core: fix compiler warnings
The code correct, but the compiler can't check that and thinks
there're uninitialized variables.

Perhaps we could rewrite it in a better way, so the compiler
can do better (even arch specific) optimizations.

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Signed-off-by: Uli Schlachter <psychon@znc.in>
2016-07-02 13:27:11 +02:00
Adrian Johnson
90d50cd923 win32-print: fix unbounded surface assertion
https://lists.cairographics.org/archives/cairo/2016-June/027445.html
2016-06-19 19:52:32 +09:30
Uli Schlachter
d69dd6b341 xlib: Fix double free in _get_image_surface()
If XShmGetImage() fails, the code tries to continue with its normal,
non-shared-memory path. However, the image variable, which was previously set to
NULL, now points to an already-destroyed surface, causing a double-free when the
function cleans up after itself (actually, its an assertion failure because the
reference count of the surface is zero, but technically this is still a double
free).

Fix this by setting image=NULL after destroying the surface that this refers to,
to make sure this surface will not be destroyed again.

While we are here (multiple changes in a single commit are bad...), also fix the
cleanup done in bail. In practice, &image->base should be safe when image==NULL,
because this just adds some offset to the pointer (the offset here is actually
zero, so this doesn't do anything at all). However, the C standard does not
require this to be safe, so let's handle this case specially.

Note that anything that is fixed by this change is still buggy, because the only
reason why XShmGetImage() could fail would be BadDrawable, meaning that the
target we draw to does not exist or was already destroyed. This patch will
likely just cause X11 errors elsewhere and drawing to (possible) invalid
drawables is not supported by cairo anyway. This means that if SHM fails, the
following fallback code has a high chance of failing, too.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91967
Signed-off-by: Uli Schlachter <psychon@znc.in>
2016-06-19 11:34:35 +02:00
Adrian Johnson
eb808aa625 image: only cache analyzed transparency/color for snapshot surfaces
https://lists.cairographics.org/archives/cairo/2016-June/027429.html
2016-06-19 14:08:55 +09:30
Adrian Johnson
1c5ec6e380 Fix PS record-neg-extents test failure 2016-06-05 20:43:36 +09:30
Adrian Johnson
a14d319e43 ps: change from ps coordinates to cairo coordinates 2016-06-05 20:43:36 +09:30
Adrian Johnson
14fa88fd02 pdf: fix record-replay-extend test failures 2016-06-05 20:43:36 +09:30
Adrian Johnson
e7b1cb0c53 image: fix record-replay-extend test failures 2016-06-05 20:43:36 +09:30
Adrian Johnson
a736fd8699 Fix PDF record-neg-extents test failure
Modify PDF surface to allow surface extents to have negative x, y.
When emitting recording surfaces, set the surface extents to the
recording extents.
2016-06-05 20:43:36 +09:30
Adrian Johnson
1e07ced66d pdf: change from pdf coordinates to cairo coordinates
When an unbounded recording surface is used multiple times with
different extents for each operation we need the XObject containing
the recording surface to have the same origin for each operation. This
is not possible when the recording surface is converted to PDF
coordinates because each operation has different extents resulting in
a different origin when the Y-axis is flipped (since the flip matrix
depends on the recording surface height which for unbounded surfaces
depends on the extents of the operation that paints the recording
surface).

Switching to cairo coordinates by emitting a Y-axis flip matrix as the
first object of each page allows the recording surface to be emitted
in cairo coordinates. This results in the same origin for all
operations using the recording surface XObject.
2016-06-05 20:43:36 +09:30
Adrian Johnson
d2dc2e90a7 Fix test failures when recording surface extents has negative x,y
Fixes record-neg-bounded-extents (image only) and
recording-ink-extents.
2016-06-05 20:43:36 +09:30
Guillaume Ayoub
d2f1ebf579 Use surface_transform in replay_and_create_regions
The surface_transform was already used surface_replay_with_clip, as the
matrix is obviously needed for the clip. But now, because of the
optimization done in commit 09b42c7, it's also needed by
replay_and_create_regions: get_target_extents clips the target surface
for performance issues, and therefore needs the surface_transform matrix
to get the right clipping surface.

Signed-off-by: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
2016-04-12 06:58:28 +09:30
Adrian Johnson
747cab741c Add CAIRO_STATUS_WIN32_GDI_ERROR for GDI errors 2016-03-26 22:18:05 +10:30
Adrian Johnson
cdd5c92ced Add CAIRO_STATUS_FREETYPE_ERROR for errors returned by libfreetype 2016-03-26 21:45:59 +10:30
Adrian Johnson
c5ee3f11b5 Add CAIRO_STATUS_PNG_ERROR for errors returned by libpng 2016-03-26 19:04:44 +10:30
Adrian Johnson
72c9a022ac scaled-font: don't store pointer in hash value 2016-03-10 19:00:48 +10:30
Wan-Teh Chang
3538ac3e68 Fix data race in freed_pool
This adds _cairo_atomic_int_get_relaxed and _cairo_atomic_int_set_relaxed which
are meant to have a behaviour of relaxed read/writes in C11's memory model. This
patch also uses these new function to fix a data race with freed_pool_t's |top|
data member.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=90318
Signed-off-by: Wan-Teh Chang <wtc@google.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
2016-03-05 14:35:17 +01:00
Enrico Weigelt, metux IT consult
968f8c70aa core: some in-code documentation
Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
2016-01-13 17:14:51 -08:00
Enrico Weigelt, metux IT consult
047ba66519 core: dropped unnecessary local variable in _cairo_composite_rectangles_intersect()
Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2016-01-13 17:09:28 -08:00
Enrico Weigelt, metux IT consult
b371b0157f core: reintroduce bot-scan-converter functions
These functions have been accidentially removed by commit:
494cfd7eb9.

They're still needed by the DRM backend.
(will be used by subsequent patches)

Signed-off-by: Enrico Weigelt, metux IT consult <enrico.weigelt@gr13.net>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Cc: Uli Schlachter <psychon@znc.in>
2016-01-13 17:07:53 -08:00
Patrick Fritzsch
ad99e1b9d8 win32: check if GetTextMetrics failed
http://lists.cairographics.org/archives/cairo/2015-November/026544.html
2015-11-13 21:27:34 +10:30
Marc-André Lureau
98d01cd119 xlib: fix mixing xcb & xlib calls
NextRequest is a macro that doesn't mix well with xcb, since
dpy->request is not updated. Instead use XNextRequest() that was fixed
to do the right thing with xcb in libX11 commit:
http://cgit.freedesktop.org/xorg/lib/libX11/commit/?id=7f8f9a36ef901f31279c385caf960a22daeb33fe

This may solve application X errors when a shmdt() is called by cairo
before the Attach request is processed.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Uli Schlachter <psychon@znc.in>
2015-11-06 21:00:48 +01:00
Uli Schlachter
bf41cc397f Fix cairo-xlib-xcb compilation
This is broken since:

commit b1192beac7
Author: Adrian Johnson <ajohnson@redneon.com>
Date:   Mon Sep 21 21:35:05 2015 +0930

    Don't cull very thin lines on vector surfaces

    On vector surfaces, use a minimum line width when calculating extents.

    Bug 77298

Signed-off-by: Uli Schlachter <psychon@znc.in>
2015-11-06 20:50:47 +01:00
Adrian Johnson
481e5986f9 Compile fix 2015-10-17 22:46:23 +10:30
Adrian Johnson
2d026bd2cf win32-print: support subsurface recording patterns 2015-10-17 22:42:37 +10:30
Adrian Johnson
b7d864e8c1 Compile fix 2015-10-17 22:38:50 +10:30
Adrian Johnson
aa1323f04c Fix some surfaces missed in b1192bea 2015-10-17 22:02:11 +10:30
Adrian Johnson
b1192beac7 Don't cull very thin lines on vector surfaces
On vector surfaces, use a minimum line width when calculating extents.

Bug 77298
2015-10-17 18:39:18 +10:30
Adrian Johnson
6656cafebf win32-print: support raster_source patterns 2015-10-17 18:33:36 +10:30
Adrian Johnson
9fcb42f7fe win32-print: fix warnings 2015-10-17 18:32:59 +10:30
Adrian Johnson
2c45fdfc15 win32-print: Fix the page extents
As the page size can be changed between pages, set the extents in
_start_page. The extents are invalidated in _show_page since the
page size on the DC may be changed after this call. The only thing that
uses the extents between _show_page and _start_page (and before the first
_start_page) is the creation of the recording surface in the paginated
surface. In this case, when the paginated surface can't get the extents,
it will create an unbounded recording surface.

The extents x,y is always set to 0 to prevent the replay from translating
the page.
2015-10-17 18:32:57 +10:30
Adrian Johnson
094f0e0fa0 pdf: fix subsurface recordings 2015-10-17 18:16:33 +10:30
Adrian Johnson
2215b4e0c0 ps: fix subsurface recordings 2015-10-17 18:16:32 +10:30
Adrian Johnson
6952e03262 ps: fix raster source patterns 2015-10-17 18:16:22 +10:30
Uli Schlachter
25a55822b4 xcb: Fix _put_image_boxes() if no SHM is available
This function tries to use _cairo_xcb_connection_put_image() to do the actual
work. However, that function can only be used for images with "native" stride.
If we only want to upload a rectangle from within an image, the function
_cairo_xcb_connection_put_subimage() has to be used. This function makes sure
that the correct information is sent to the X11 server.

No unit test for this, because we currently do not test the !SHM case
automatically. Perhaps we should?

Signed-off-by: Uli Schlachter <psychon@znc.in>
2015-10-14 14:26:47 +02:00
Uli Schlachter
d31dc73f9b xcb: Fix _put_shm_image_boxes if no SHM available
This function always returned CAIRO_INT_STATUS_SUCCESS, even if it didn't do
anything. This commit makes the function return CAIRO_INT_STATUS_UNSUPPORTED
instead.

No unit test for this, because we currently do not test the !SHM case
automatically. Perhaps we should?

Signed-off-by: Uli Schlachter <psychon@znc.in>
2015-10-14 14:26:32 +02:00
Adrian Johnson
0537479bd1 ps: merge emit_recording surface and emit_recording_subsurface into one function
Most of each function was identical.
2015-10-05 16:10:02 +10:30
Rodrigo Rivas Costa
e5d4f520aa win32-print: fix transparent images have black background
Bug 91835
2015-09-30 23:53:23 +09:30
Adrian Johnson
495362279b scaled-font-subsets: if glyph 0 used for rendering, remap to different index
Some broken pdfs use glyph 0 in embedded fonts for rendering instead of .notdef.
The cmap we use for embedding latin fonts does not allow rendering glyph 0. Ensure
if glyph 0 is used, it is mapped to a non 0 glyph in the subset.

Bug 89082
2015-09-27 09:34:37 +09:30
Bryce Harrington
6f7a9b4f03 Ensure null-terminated result from strncpy() 2015-09-10 11:18:08 -07:00
Adrian Johnson
b353d1f1b1 cff: opentype fonts always use gid to lookup glyph
Bug 91902
2015-09-07 22:20:08 +09:30
Sahil Vij
f6c46d9473 gl: Fix bug in _cairo_gl_pattern_texture_setup()
The memory allocated to "image" at line 298 is not freed before moving to label fail at line 305 and 314.
This patch takes care of this memory leak in above mentioned cases.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=91537
Signed-off-by: Sahil Vij <sahil.vij@samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
2015-08-07 18:02:07 -07:00
Bryce Harrington
e0963f6c8e gitignore: Ignore .trs (test results) 2015-07-31 17:56:54 -07:00
Bryce Harrington
576bb3ffee If more than one trap is passed in then it's guaranteed that the
returned traps will have their left edge to the left of their right
edge, but if only one trap is passed in then the function always returns
without doing anything.  This results in incorrect rendering of SVG
paths with more than one subpath.

Currently calls to _cairo_bentley_ottmann_tessellate_rectangular_traps
are guarded by traps.has_intersections checks, so this is only a
theoretical bug.  But we'll eliminate the potential of the bug by
making the left side to be left of the right side, similar to what was
done in _cairo_bentley_ottmann_tessellate_boxes (commit 11b6c49c).

Patch authored by Tom Klein for Mozilla.

Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=90984
Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=853889
Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
2015-07-27 18:20:07 -07:00
Bryce Harrington
c7cf0dfd60 Revert "cairo-gl: Fix compiler warning if CAIRO_HAS_*_FUNCTIONS is not defined."
This reverts commit c8b6c6066a.

An undefined macro is evaluated as 0.
The preference is to use #if MACRO_NAME rather than #ifdef.

Conflicts:
	src/cairo-gl.h
2015-07-27 14:15:11 -07:00
Andrea Canciani
66bc7b8cb0 quartz: be more strict about the behavior of blend operators
Some blend operators have a (small, but potentially noticeable)
different behaviour in Quartz and pixman. Use the Quartz ones only for
the operators which match pixman except for rounding errors.

Fixes:
 - extended-blend
 - extended-blend-alpha
 - extended-blend-mask
 - extended-blend-alpha-mask
 - extended-blend-solid
 - extended-blend-solid-alpha
2015-07-27 12:46:00 +02:00
Andrea Canciani
6210e34771 quartz: Align filtering quality with image backend
The Quartz framework provides several quality settings, but they were
not used. Now the translation of cairo_filter_t to Quartz filtering
modes tries to match the quality settings from image as much as
possible.

Specifically, CAIRO_FILTER_GOOD and CAIRO_FILTER_BILINEAR are now
converted to kCGInterpolationLow, which seems to be a bilinear filter.

Fixes:
 - pixman-downscale-bilinear-24
 - pixman-downscale-bilinear-95
 - pixman-downscale-good-24
 - pixman-downscale-good-95
 - pthread-same-source
 - recording-surface-extend-none
 - recording-surface-extend-reflect
 - recording-surface-extend-repeat
 - recording-surface-over
 - recording-surface-source
 - surface-pattern-big-scale-down
 - surface-pattern-scale-down
 - surface-pattern-scale-down-extend-none
 - surface-pattern-scale-down-extend-reflect
 - surface-pattern-scale-down-extend-repeat
2015-07-27 12:46:00 +02:00
Bryce Harrington
6951fb4238 Revert "pattern: allow for a floating one pixel rounded difference."
While this fixed a real bug, in testing this patch was found to fail a
number of tests and thus needs further work.

This reverts commit e7acf4b6dc.
2015-07-17 12:07:18 -07:00