Commit graph

241 commits

Author SHA1 Message Date
Andrea Canciani
aa2fb0c05f quartz: Do not use opaque patterns as masks
When an opaque surface is used as a mask, Quartz converts it to
greyscale and uses the result as an alpha value. Cairo expects the
mask operation to ignore the color components and only use the alpha
of the pattern.

The expected behavior can be achieved by drawing the mask on a
temporary surface with an alpha channel.

Fixes clear-source.
2011-01-19 11:53:53 +01:00
Andrea Canciani
7d89d69c49 quartz: Make huge domain handling more stable
Quartz cannot correctly handle arbitrary domains. Falling back is
needed to get correct results on very large (in parameter space)
gradients.

For PAD extended gradients, limiting the domain to (at most) [-0.5,
1.5] is sufficient to guarantee that it will correctly sample the
extreme stops and improves the accuracy (over having a much bigger
domain).

Fixes radial-gradient, radial-gradient-mask, radial-gradient-source,
radial-gradient-mask-source, radial-gradient-one-stop.

Improves the quality of the linear gradients in linear-gradient,
linear-gradient-subset, mask, operator-source, trap-clip.
2011-01-19 11:53:52 +01:00
Andrea Canciani
4874dab984 quartz: Use standard stack allocation size
Make cairo-quartz respect the convention that stack-allocated data
structures use the size computed by CAIRO_STACK_ARRAY_LENGTH ().

Additionally this increases the size of the dash and glyph arrays,
making dynamic memory allocation less likely.
2011-01-19 11:53:52 +01:00
Andrea Canciani
8c031c029d pdf,ps,quartz: Use correct tolerance for gradient domain computation
The tolerance argument of _cairo_gradient_pattern_box_to_parameter ()
is in pattern space, so to have it constant in device space, it should
depend on the pattern matrix.

In ps and pdf the fallback resolution alone is not meaningful. The
resolution/fallback_resolution ratio should be used instead.
2011-01-18 15:15:28 +01:00
Andrea Canciani
32241cde01 doc: Add links to flush() and mark_dirty() in direct access functions
cairo_image_get_data() and other direct access functions are often
misused by applications because they don't call cairo_surface_flush()
and/or cairo_surface_mark_dirty() around the code which accesses the
surface data directly.

Although this information is already available in the description of
the cairo_surface_t type, adding a reminder about it in the direct
access functions should make it easier to use them correctly.
2011-01-16 18:40:42 +01:00
Andrea Canciani
8f598dd69d quartz: Use native PDF blend modes
Quartz supports PDF blend modes since 10.4 and exposes Porter-Duff
compositing operators through the public API since 10.5.
2011-01-01 12:54:32 +01:00
Andrea Canciani
fabbc16253 quartz: Don't dynamically load unused functions
Remove an unused variable.
2011-01-01 12:54:32 +01:00
Andrea Canciani
1bc7d948c7 quartz: Clean up dynamically loaded functions
README indicates MacOSX 10.4 as a requirement for quartz and we are
directly using some functions that have been added to the public
CoreGraphics API in 10.4.

rop 10.3-specific workarounds and link to 10.4 API functions instead
of loading them at runtime.
2011-01-01 12:54:15 +01:00
Andrea Canciani
ca7f141dd7 quartz: Unify gradient construction and fix radial gradients.
Share code between linear and radial gradients, using
_cairo_gradient_pattern_box_to_parameter() instead of open coding the
parameter range computation.

As a side effect this fixes parameter range computation for radial
gradients, because the previous code assumed that the focal point was
inside the circles.

Reviewed-by: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi>
2010-12-13 09:46:09 +01:00
Andrea Canciani
a8ae8759f5 path: Always interpret in forward direction
Path are always interpreted in forward direction, so the ability of
interpreting in the opposite direction (which is very unlikely to be
useful at all) can be removed.
2010-12-10 10:58:51 +01:00
Andrea Canciani
35b1688c92 quartz: Remove unused imageSurface field
imageSurface was used to store a reference to the fallback image
generated by during fallbacks for gradients. The fallback code
has been removed as it is not needed anymore, thus this field can
be removed as well.
2010-10-13 00:27:01 +02:00
Andrea Canciani
ce455994a3 quartz: Cleanup gradient setup functions
Gradient setup does not depend anymore on the surface on which the
gradient will be composited.
2010-10-13 00:27:01 +02:00
Andrea Canciani
1061c80d79 quartz: Move drawing state out of surface
Some pattern types (gradients, surface patterns) require some
temporary information to be stored as "graphic state", because it
doesn't belong to CGContext. Previously all of this data was stored
inside the surface during the drawing operations, now it's in a
stack-allocated structure (of type cairo_quartz_drawing_state_t).
Based on a patch by Robert O'Callahan <robert@ocallahan.org>.
See https://bugzilla.mozilla.org/show_bug.cgi?id=522859
2010-10-13 00:27:01 +02:00
Andrea Canciani
bbaca95982 quartz: Unify DO_SHADING, DO_IMAGE and DO_TILED_IMAGE
DO_SHADING, DO_IMAGE and DO_TILED_IMAGE sources all require the source
to be painted over the whole surface (inside the clip region), thus can
share the same code path in drawing functions.
2010-10-13 00:27:01 +02:00
Andrea Canciani
51a6ae9d71 quartz: Unify DO_SOLID and DO_PATTERN
Both DO_SOLID and DO_PATTERN setup the underlying CGContext to directly
use the chosen color/pattern when filling and stroking, thus require no
additional drawing operations and can share the same drawing code.
2010-10-13 00:27:01 +02:00
Andrea Canciani
c22e75e9f6 quartz: Set operator when setting up source
Share some code between the drawing functions by saving the state
and setting the operator when setting up the source and by restoring
the state during teardown.
Based on a patch by Robert O'Callahan <robert@ocallahan.org>.
See https://bugzilla.mozilla.org/show_bug.cgi?id=522859
2010-10-13 00:27:01 +02:00
Andrea Canciani
6bc1376cf5 quartz: Remove DO_NOTHING and DO_UNSUPPORTED actions
DO_NOTHING and DO_UNSUPPORTED are not actual actions and are better
handled by returning an appropriate cairo_int_status_t (and falling
back, if needed).
2010-10-13 00:26:57 +02:00
Andrea Canciani
08c59c6bf3 quartz: Improve gradient quality
Instead of extending the range of the interpolation parameter to make
sure that pixels exactly on the edge get drawn, we are now asking
quartz to extend the gradient.
2010-10-12 23:18:13 +02:00
Andrea Canciani
620c43f50c quartz: Fix EXTEND_PAD gradients
Make PAD extended gardients more robust, by computing the color
explicitly like for REPEAT and REFLECT extend modes.
This removes a hack introducing a small but non-0 negative value
that ensured that the gradient started with the correct color (but
not that it ended with the correct one, too).

Fixes linear-gradient-large.
2010-10-12 23:18:13 +02:00
Andrea Canciani
2af3ae92eb quartz: Improve gradient consistency
By keeping "virtual extents", quartz surfaces now keep track of
the extents where they want the gradients to be consistent.
This works across various API for surface creation and editing:
 - cairo_surface_create_for_rectangle
 - cairo_surface_create_similar + cairo_surface_set_device_offset
 - cairo_push_group/cairo_pop_group

This method does not use clip extents, so it also makes gradient
rasterization independent of clip/path extents.
2010-10-12 23:18:13 +02:00
Andrea Canciani
1c36766d27 quartz: Remove unused code
The gradient fallback path is not used anymore.
2010-10-12 20:19:39 +02:00
Andrea Canciani
2cea2bb085 quartz: Make radial gradients follow PDF specification
Pixman master (soon to become pixman 0.20) implements radial
gradients based on the PDF specification (section 8.7.4.5.4).
Quartz natively implements them, so falling back is not needed
anymore.
2010-10-12 20:19:39 +02:00
Andrea Canciani
5054727927 quartz: Remove linear gradient fallback
Degenerate linear gradients are reduced to solid gradients in
gstate, so backends do not need to handle them.
2010-10-12 20:19:39 +02:00
Andrea Canciani
5500d072e0 quartz: Handle failures in _cairo_quartz_setup_fallback_source
If the fallback surface creation or painting fail, the fallback
surface needs to be destroyed.
2010-10-07 20:44:50 +02:00
Andrea Canciani
17bb0f8b1f quartz: Improve _cg function types 2010-10-07 20:44:50 +02:00
Andrea Canciani
3b4f7c3662 quartz: Improve handling of surface creation failure
Don't paint on a surface whose status is not SUCCESS.
2010-10-07 20:44:50 +02:00
Andrea Canciani
b13a8035c1 quartz: Remove useless code
The condition is always true (since surface creation returns non-NULL
even upon failure).
2010-10-07 20:44:50 +02:00
Andrea Canciani
f156f89db0 quartz: Simplify cairo_quartz_surface_create_for_cg_context
Only retaining the context when the surface cration is successful
avoids needless retaining and simplifies the code.
2010-10-07 20:44:50 +02:00
Andrea Canciani
c5fc8fa62f quartz: Use NOTHING_TO_DO instead of SUCCESS where appropriate
Returning CAIRO_INT_STATUS_NOTHING_TO_DO removes some code that
specifically handles it to convert to CAIRO_STATUS_SUCCESS. This
is already performed out of the backend, in the upper layers, so
it is not needed here.
2010-10-07 20:44:50 +02:00
Andrea Canciani
eae5fafc89 quartz: Beautify code
Remove redundant parentheses and reference/dereferences.
2010-10-07 20:44:50 +02:00
Andrea Canciani
f93603fda0 quartz: Whitespace cleanup 2010-10-07 20:44:50 +02:00
Andrea Canciani
6ff5cbd8a9 quartz: Mark failures as unlikely 2010-10-07 20:44:50 +02:00
Andrea Canciani
2f4a47c6bf quartz: Fix function call coding style
Cairo coding style specifies a single space between the function
name and the parentheses.
2010-10-07 20:44:49 +02:00
Andrea Canciani
692f20a859 quartz: Don't typecast surfaces
Casting to (cairo_surface_t *) is considered bad practice. The
correct way to get a reference to the generic surface information
is &(surface->base)
2010-10-07 20:44:49 +02:00
Andrea Canciani
b922477e4e quartz: Check for valid patterns
The pattern handling code ensures that 0 stops patterns are reduced
to clear solid patterns before being passed down to the backend.
An assertion is used to make sure that the assumption actually holds,
removing the duplication of the reduce-to-solid-clear logic.
2010-10-07 20:44:49 +02:00
Andrea Canciani
c9aa393a4d quartz: Assert upon invalid enum values
Invalid enum values were being ignored (and replaced by a default
value). This behavior is not desirable on development builds,
because an explicit failure is much easier to track.
Assertions allow release builds to keep on with the old behaviour,
while development builds fail as soon as the invalid operaiton is
performed.
2010-10-07 20:44:49 +02:00
Andrea Canciani
9c22f97ebd quartz: Remove unused argument from _cairo_surface_to_cgimage 2010-10-07 20:44:49 +02:00
Andrea Canciani
de606af5d6 quartz: improve backend detection
Quartz previously crashed with NULL backends and didn't check for
the backend type when getting a CGContext from a quartz surface,
returning meaningless data for subsurfaces.
2010-08-07 12:37:22 +02:00
Andrea Canciani
056ce165c4 quartz: fix solid masking fallback
Falling back when painting would ignore the alpha value (which is
needed to have the correct mask opacity).
_cairo_quartz_surface_paint_cg doesn't fallback, so the usual mask
fallback path is now taken, as expected.
2010-08-07 12:21:06 +02:00
Andrea Canciani
bdeade14ea quartz: fix stroking with unbounded operators
Self-intersecting strokes were drawn incorrectly when an unbounded
operator was used, since the fixup operation also cleared the
intersection.

Fixes clip-stroke-unbounded.
2010-08-06 20:24:52 +02:00
Andrea Canciani
c1fcbd0322 quartz: fix REFLECT radial gradients
The interpolation range of repeating radial gradients can safely be
reflected around any integer (previously 0), but for reflect-extended
radial gradients can only be reflected around odd integers if the
appearance is to be the same, thus reflecting around 1 is correct for both.

Fixes radial-gradient.
2010-07-26 11:39:27 +02:00
Benjamin Otte
b870cc030d doc: Move tmpl/ docs to inline docs
I did this manually so I could review the docs at the same time.
If anyone finds typos or other mistakes I did, please complain to me (or
better: fix them).
2010-07-08 14:27:16 +02:00
Andrea Canciani
7d69100143 quartz: remove unused declarations 2010-06-28 17:12:41 +02:00
Andrea Canciani
bd4c14b94e quartz: remove unused os version info
It was previously used to activate a workaround for text transformation
whenrunning on some os versions. Now the workaround is not needed anymore.
2010-06-28 16:55:57 +02:00
Andrea Canciani
b26f72fef9 quartz: check return status
If the font backend is unable to tell the extents of the operation,
consider it unbound.
2010-06-28 16:55:57 +02:00
Andrea Canciani
9c0d761bfc quartz: improve text transform handling
Use scale instead of manually compositing font_matrix and ctm and
composite it with the context ctm, so that no workaround for clipping
is needed anymore.
2010-06-28 16:55:57 +02:00
Andrea Canciani
53260148ea quartz: fix repeating radial gradients on 64 bits
Quartz API uses the type CGFloat, which is double on 64 bits,
float on 32 bits architectures
2010-05-17 22:12:36 +02:00
Andrea Canciani
0104976dc8 quartz: silence compiler warnings
All the possible enum values have to be explicitly handled in switch statements.
2010-05-17 22:12:36 +02:00
Andrea Canciani
ac94a00a4d quartz: fallback for A1 images on little endian archs
Quartz uses a bit ordering that is consistent with cairo on big
endian architectures, but isn't on little endian architectures.

Fixes a1-mask and large-source-roi (on little endian)
2010-05-17 22:09:06 +02:00
Robert O'Callahan
d65e8064c0 Ensure the quartz backend returns the first stop for negative positions on the gradient line of a nonrepeating linear gradient.
I discovered a small bug in cairo-quartz gradients. If you have multiple stops
at position 0, then cairo-quartz pads with the *last* stop at position 0,
instead of the first stop at position 0. This patch fixes that.

From https://bugzilla.mozilla.org/show_bug.cgi?id=513395
2010-05-11 13:59:58 -04:00