Commit graph

2558 commits

Author SHA1 Message Date
Emmanuel Pacaud
916d82586e [SVG] Indentation fixes. 2007-11-10 10:24:21 +01:00
Emmanuel Pacaud
8edc3ed485 Merge branch 'master' of git+ssh://emmanuel@git.cairographics.org/git/cairo 2007-11-10 10:10:50 +01:00
Emmanuel Pacaud
3bc8a8d1d0 [SVG] Remove spurious semicolon when emitting mask url. 2007-11-10 10:10:03 +01:00
Emmanuel Pacaud
b68968ffd1 [SVG] Fix opacity of combined stroke and fill.
When emitting combined stroke and fill, cairo SVG backend was using the opacity
two times, instead of using fill-opacity and stroke-opacity, leading to
incorrect output.

I've updated the mask test reference images for the SVG output, since it seems
there's a bug in librsvg when fill-opacity is used in the mask image.
I've checked the SVG output with batik, and it looks fine.
2007-11-10 10:07:12 +01:00
Vladimir Vukicevic
28412f780e [win32-printing] bail out early if we don't have anything to do in paint_surf 2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
d72bb8c12e [win32] Fix FIXED_to_fixed when cairo's fixed format isn't 16.16 2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
0901b83ca5 [win32] Don't use GetGlyphOutline on non-TrueType fonts
win32-glyph-metrics.patch: GetGlyphOutline only works on Truetype fonts,
so for non-Truetype fonts, assume no left or right bearing and use the
font ascent and descent for the glyph extents.
2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
f11f7524b6 [quartz] work around Quartz bugs with images bigger than a certain size
Quartz has a bug with images greater than (signed) 16 bits in height; avoid
creating or working with those.  Also fixes some memory leaks.

Patch from John Daggett.
2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
95ede9ea59 Use correct surface resolution when creating paginated fallback image
If a surface resolution is set via _cairo_surface_set_resolution, it
needs to be used when the fallback image is created.  The user sets
the fallback resolution on the paginated surface, so we need
to divide that by the resolution of the actual (target) surface, not
the paginated surface.
2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
9b8d9f2859 [win32] Skip doing some work if we can't call StretchDIBits 2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
fa7e36669a [quartz] Fix for 10.5 SDK; the FloatToFixed macro started doing strange things 2007-11-09 12:50:45 -08:00
Vladimir Vukicevic
236c52b095 Handle overflow/underflow gracefully when converting to 16.16 fixed 2007-11-09 12:50:45 -08:00
Carl Worth
5b0a0fe7a2 Mention cairo_new_sub_path in documentation of cairo_arc 2007-11-07 11:18:05 -08:00
Chris Wilson
62d64e12aa [cairo-pdf-surface] Create a new path for an empty clip.
If the clip path is empty, then we need to start a new path otherwise
the clip is ineffective.
2007-11-06 15:22:07 +00:00
Chris Wilson
b4057b8643 [cairo-clip] Special case using an empty clip path.
Detect when the user calls cairo_clip() with an empty clip path and
mark the clip as all_clipped.
2007-11-06 15:21:37 +00:00
Chris Wilson
2f0867b43f [cairo-surface] Handle the all clipped out case.
Explicitly handle a clip which represents that the entire surface is
clipped out.

Fixes https://bugs.freedesktop.org/show_bug.cgi?id=13084.
2007-11-06 14:26:28 +00:00
Behdad Esfahbod
55b530ffef [PS] Fix compiler warnings 2007-11-05 14:47:27 -05:00
Behdad Esfahbod
7f21bfb0a8 [meta-surface] Adjust tolerance when replaying to surfaces with device scale
such that we get a consistent look with different fallback resolutions.
2007-11-05 13:23:28 -05:00
Richard Hult
4270cd3358 [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).
2007-11-05 10:05:07 +00:00
Chris Wilson
bd5ed9a398 [cairo-atomic] Declare the mutex for NEEDS_MEMORY_BARRIER.
Whilst NEED_MEMORY_BARRIER should be a subset of ! HAS_ATOMIC_OPS,
until we have accurate configure tests NEED_MEMORY_BARRIER may be
invoked independently.
2007-11-05 09:05:25 +00:00
Chris Wilson
901b0c9752 [cairo-path-fixed] Exponentially enlarge cairo_path_buf_t.
Allocate subsequent path bufs twice as large as the previous buf,
whilst still embedding a small initial buf into cairo_path_fixed_t
that handles the most frequent usage.
2007-11-05 08:51:06 +00:00
Chris Wilson
92a18464ba [cairo-surface] Avoid allocation for common case of 1 box.
_cairo_surface_fill_region(): avoid allocating the array of boxes if we
know that the region only contains one box and is therefore defined by its
extents.
2007-11-05 08:51:06 +00:00
Chris Wilson
e60a7c39cd [cairo-atomic] Check whether we can access int/pointers atomically.
Add a configure check to determine whether the host cpu can read/write
cairo_atomic_t without an explicit memory barrier, and update the macros
within cairo-atomic-private.h to reflect this knowledge.
2007-11-05 08:51:06 +00:00
Chris Wilson
eb0b16837b [cairo-spline] Eliminate redundant _cairo_fixed_to_double().
Inline and unroll PointDistanceSquaredToSegment() and eliminate the
multiple conversions between fixed point and doubles. This simple
transformation both shrinks the code and wins a few percent in path
intensive benchmarks such as fuckhergently.swf
2007-11-01 22:42:34 +00:00
Chris Wilson
2a25e22658 [cairo-spline] Reduce stack requirements during recursive refinement.
By splitting out the knot vectors into a smaller, separate structure, we
can dramatically reduce the stack allocation for each level of recursion.
Secondly we can have the storage requirements by modifying the first set
of knots in-place, thus we need only allocate stack space for the knots
covering the deferred half of the spline.
2007-11-01 22:27:34 +00:00
Chris Wilson
b311c414a2 [cairo] Use NULL instead of a bare 0.
Silence a sparse warning.
2007-11-01 22:27:19 +00:00
Chris Wilson
fd5c517818 [cairo-scaled-font] Zero extents on early error.
Ensure that the output extents of cairo_scaled_font_glyph_extents(),
are zeroed if we return early due to being passed by the user a
cairo_scaled_font_t with an error set.
2007-11-01 22:27:04 +00:00
Chris Wilson
cee6aa016b [cairo-paginated-surface] Mark the backend static.
Only used within the file, so do not expose outside the library.
2007-11-01 22:26:19 +00:00
Chris Wilson
6e0151df46 [cairo-atomic] Rearrange code under the correct ifdefs.
The atomic get/set depend upon NEED_MEMORY_BARRIER which is separate
from HAVE_ATOMIC_OPS.
2007-11-01 22:26:06 +00:00
Chris Wilson
a26118cf5b [cairo-png] Check for feof whilst reading.
We need to check for both ferror() and feof() when handling short reads.
2007-10-31 21:41:24 +00:00
Chris Wilson
61143e5b21 [cairo-png] Handle missing PNG_SETJMP_SUPPORTED
If libpng has not been compiled with jmpbuf support, then we cannot
atempt to use it - in which case we fall back to png's default error
handler and abort.
2007-10-31 21:41:00 +00:00
Adrian Johnson
c37a8ace81 Round floats in output-stream to 6 significant digits after decimal
The previous commit increased the precision of floats from 6 digits
after the decimal point to 18 digits to correct rounding errors with
very small numbers. However most of the time this extra precision is
not required and results in increased PS/PDF output.

This commit makes the precision after the decimal point 6 significant
digits. For example:

   1.234567
   0.123456
   0.00123456
   0.00000000123456
2007-11-01 00:01:16 +10:30
Behdad Esfahbod
8297daff89 [cairo-output-stream] Write out floats to 18 digits after decimal point
We write floats using %f as the scientific format used by smarter %g is
invalid in PS/PDF.  %f however by default rounds to five digits after
decimal point.  This was causing precision loss and making the newly
added degenerate-pen test fail for PDF.  We now print up to 18 digits
which is as many bits doubles can accomodate.  We can be smarter, but
that's for another commit.
2007-10-31 02:41:33 -04:00
Keith Packard
06af5c2891 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.
2007-10-30 22:01:36 -07:00
Carl Worth
448c931425 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.
2007-10-30 17:17:38 -07:00
Carl Worth
6957aa27e8 Merge in fix for get-path-extents test case.
With independent fixes on both branches, the test case now
passes completely. Hurrah!
2007-10-30 09:46:59 -07:00
Carl Worth
8d8724e804 Improve brace readability for multi-line conditional 2007-10-30 09:45:45 -07:00
Carl Worth
f43f0c1040 Fix remaining two calls to _cairo_path_fixed_get_current_point
The previous commit failed to fix up two callers to the
_cairo_path_fixed_get_current_point function, (and since
C doesn't distinguish between an enum and our integer-as-
Boolean, the compiler didn't complain).

Fortunately, though, the test suite did complain, as the
bug introduced a new failure into the get-path-extents
test, and git-bisect helpfully pointed to the previous
commit.

With this fix, the new failure of get-path-extents is
eliminated, (though, in this branch the arc-based failure
of that test still exists).
2007-10-30 09:44:42 -07:00
Carl Worth
00d701ff7d 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.
2007-10-30 08:18:57 -07:00
Carl Worth
9bf0a640d2 Add figure illustrating derivation of miter limit
And use sin in the first place rather than the more awkward
secant.
2007-10-30 08:18:56 -07:00
Chris Wilson
0d42af2427 [cairo-surface] Fix typo in doc.
s/INVALUE_FORMAT/INVALID_FORMAT/
2007-10-30 11:13:44 +00:00
Chris Wilson
39664b7cac [cairo-path] Return CAIRO_STATUS_SUCCESS.
If we have already returned the error status, then it is cleaner (and
the common idiom) to use 'return CAIRO_STATUS_SUCCESS' rather than
'return status'.
2007-10-30 11:01:40 +00:00
Chris Wilson
e57df31963 [cairo-path] Make _cairo_path_nil static.
_cairo_path_nil is only used within cairo-path.c, so there is no reason
to expose it to the rest of the libary.
2007-10-30 10:58:16 +00:00
Chris Wilson
6fdb7f129c Simplify return value from cairo_path_fixed_get_current_point().
The only caller of cairo_path_fixed_get_current_point(), used the status
return to determine whether or not the path had a current point (and did
not propagate the error) - for which we had already removed the
_cairo_error() markup. Now we reduce the boolean status return to a
cairo_bool_t, with a net reduction in code.
2007-10-30 10:43:55 +00:00
Chris Wilson
4a2ab87e1a [cairo-surface] Add the usual guards to _cairo_surface_set_font_options().
Adrian Johnson hit a SEGV after
_cairo_paginaged_surface_create_image_surface() tried to set the font
options on an error surface after running out of memory. So add the
usual checks that the surface is not a snapshot, or in an error state or
finished before modifying its font options.
2007-10-29 12:04:33 +00:00
Carl Worth
a69d473130 Fix typo in _cairo_gstate_fini
Obrigado a Luiz Americo Pereira Camara <luizmed@oi.com.br>
2007-10-26 22:58:57 -07:00
Chris Wilson
0c02b998f9 [cairo-gstate] Allow angle==0 whilst rotating.
Cut'n'paste error whilst copying the NaN check from
_cairo_gstate_scale() flagged the no rotation case as an error.
2007-10-26 18:07:31 +01:00
Chris Wilson
ce44cd6523 [cairo-gstate] Add a missing _cairo_error() markup.
Missed calling _cairo_error() for the CAIRO_STATUS_NULL_POINTER
returned by _cairo_gstate_init(). Rearrange the code to avoid the
overly complicated return statement. We note that _cairo_gstate_init()
is special as _cairo_gstate_fini() will always be called, even if an
error is thrown, and so do not do the usual cleanup in the case of an
aborted initialization.
2007-10-25 01:02:03 +01:00
Chris Wilson
4ce785e6a9 [cairo-gstate] Add NaN check to rotate.
Check the user input to _cairo_gstate_rotate() for invalid numbers.
2007-10-25 01:00:55 +01:00
Chris Wilson
6295a296b0 [cairo-gstate] Check scale sx * sy != 0.
Bill Spitzak said
    "If you really want to match when the determinant is non-zero in the
    resulting matrix, use sx*sy != 0. This appears the same as sx&&sy but
    may also catch when underflow makes the determinant zero."

Return CAIRO_STATUS_INVALID_MATRIX if we know the user input will
generate a degenerate matrix. For additional paranoia we could recompute
and validate the inverse each time as well.
2007-10-25 01:00:30 +01:00