Commit graph

3106 commits

Author SHA1 Message Date
Behdad Esfahbod
7dce536042 Add XXX marker 2008-05-09 15:54:04 +02:00
Behdad Esfahbod
a3c091e292 [src/check-doc-syntax.sh] Use cairo_all_source_files if available 2008-05-09 14:54:31 +02:00
Behdad Esfahbod
e39127627a [Makefile.am] Rename cairo_all_source_file to cairo_all_source_files 2008-05-09 14:54:31 +02:00
Behdad Esfahbod
d6654ce2a6 [Makefile.am] Sort source files 2008-05-09 14:54:30 +02:00
Chris Wilson
b7272e9e8e [cairo-xlib] Batch XRenderFreeGlyphs
For every glyph evicted from the cache we would allocate a very small
structure to push onto the xlib work queue. This quickly becomes
noticably for an app that consumes a lot of scaled fonts and glyphs,
e.g. trying to draw text at various angles. So we maintain a small array
of glyphs pending finalisation and issue the XRenderFreeGlyphs() once the
array is full.
2008-05-06 15:11:00 +01:00
Chris Wilson
3428acf25d [cairo-scaled-font] Mark the scaled font as finished during destruction.
During the destruction of every font used with an xlib surface, we send
an XRenderFreeGlyphs() for every single glyph in the cache. These
requests are redundant as the server-side glyphs will be released along
with the XRenderFreeGlyphSet(), so we skip the individual glyph
destruction if the font is marked as finished.
2008-05-06 15:10:51 +01:00
Chris Wilson
24284c5101 [cairo-xlib] Enlarge the on-stack arrays.
Grow the on-stack arrays for the XRectangles and XTrapezoids to the
standard size in order to reduce the frequency of allocations.
2008-05-06 14:31:55 +01:00
Chris Wilson
fda9586802 [cairo-xlib] Cache standard xrender formats.
XRender performs a round-trip in order to query the available formats on
the xserver, before searching for a matching format. In order to save
that round-trip and to avoid the short-lived allocation of the array of
available formats, we cache the result on the display.
2008-05-06 14:31:45 +01:00
Chris Wilson
8457374c9c [cairo-pattern] Repaint existing cached similar solid surfaces.
The current solid surface cache returns an existing similar surface only
if it is an exact match for the desired colour.  This gives a high hit
rate for the original goal of drawing text, but fails when using a lot
of colours - for example drawing a pie-chart, the mosaic perf case, or
browsing the web.  So instead of creating a new surface from scratch we
can repaint an existing one, providing that we have sufficient surfaces
already cached, i.e. if we are going to evict a surface, we may as well
just repaint it.
2008-05-06 14:31:32 +01:00
Chris Wilson
4b3f9c7c7d [cairo-arc] Protect against division-by-zero.
Avoid a division-by-zero which can only happen if the start angle is
exactly equal to the end angle.

Fixes test/degenerate-arc.
2008-05-06 14:31:13 +01:00
Adrian Johnson
504132db6d win32-font: Check status in load_truetype_table 2008-05-04 23:05:01 +09:30
Adrian Johnson
2a7c5cd1ee Eliminate warning in win32 load_truetype_table with bitmap fonts
Use cairo_win32_scaled_font_select_font() instead of
_cairo_win32_scaled_font_select_unscaled_font() to select the font.
Because _cairo_win32_scaled_font_select_unscaled_font() displays a
warning when used with a bitmap font.
2008-05-04 23:01:48 +09:30
Adrian Johnson
7063e7b0bf Fix bug in win32 font metrics with bitmap fonts
The glyph width caculation was not compensating for the
WIN32_FONT_LOGICAL_SCALE resulting in a glyph width and glyph advance
32 times larger than it should be.
2008-05-04 22:56:50 +09:30
Adrian Johnson
d35d6eec24 Fix win32 bitmap font metrics when device scale != 1
158d24412b fixed win32 printing of bitmap fonts by forcing the use
of fallback images. This exposed a bug in the win32 bitmap font
metrics when a device scale is used that resulted in clipped glyphs.
2008-05-04 22:54:02 +09:30
Adrian Johnson
158d24412b Make win32-printing surface work with bitmap fonts
The win32 printing surface has the same problem with bitmap fonts as
it does with Type 1 fonts. ie ExtTextOutW() with glyph indices works
for a display DC but not a printer DC.

Fix this by forcing fallback for bitmap fonts.
2008-05-04 22:46:41 +09:30
Adrian Johnson
547e2f552c Fix win32-printing show_glyphs analysis for Type 1 fonts
The analysis code needs to include the Type 1 font check that was
previously adding the the rendering code.
2008-05-04 22:43:08 +09:30
Adrian Johnson
141bca74ba Make cairo_win32_surface_get_dc work with win32 printing surface
The win32 printing surface is a paginated surface so we need to get
the paginated surface target to get to the win32_printing surface.
2008-05-04 22:40:49 +09:30
Chris Wilson
afa4ff8df5 [check] Filter programlistings for check-doc-syntax.sh
We do not want to enforce the gtk-doc markup in the preformated
examples, so run the files through sed to filter out <programlisting>
before checking with the error detecting regexp.
2008-04-29 10:02:51 +01:00
Chris Wilson
e94126fb67 [cairo-ft] Add a demonstration of how to handle the lifetime of the FT_Face.
Extend the documentation for cairo_ft_font_face_create_for_ft_face() to
demonstrate using cairo_font_face_set_user_data() to destroy the FT_Face
after the final reference to the cairo_font_face_t has been dropped.
2008-04-29 09:28:59 +01:00
Chris Wilson
78cb05a1b7 [cairo-ft-font] Fixup doc reference to cairo_ft_font_face_create_for_ft_face()
The documentation referred to cairo_ft_font_face_create_for_face().
2008-04-29 09:28:48 +01:00
Chris Wilson
f43e5e9ed9 [cairo-ft] Correct the function references in the docs.
The docs reference cairo_ft_font_lock_face() instead of the correct
cairo_ft_scaled_font_lock_face() (and friends).
2008-04-29 09:28:31 +01:00
Chris Wilson
00965edf49 [cairo-ft] Remove unused private aliases.
cairo_ft_scaled_font_lock_face() and friends are unused internally
(instead _cairo_ft_unscaled_font_lock_face() is used directly), so
remove the unnecessary aliases.
2008-04-29 09:23:27 +01:00
Vladimir Vukicevic
122a31a075 [quartz] Fix CGFont leaks when creating quartz fonts
The toy font constructor and the _with_atsu_font_id constructor were
not properly managing the refcount of the CGFontRef.
2008-04-27 15:20:43 -07:00
Adrian Johnson
76e655e508 Fix group-paint PDF test failure 2008-04-27 22:59:22 +09:30
Adrian Johnson
5e102b06d1 PDF: Fix unbalanced save/restore 2008-04-27 21:52:25 +09:30
Adrian Johnson
3a2a867210 PS: Fix gradients with one stop 2008-04-27 21:52:25 +09:30
Adrian Johnson
f99d86e708 PDF: Fix gradients with one stop 2008-04-27 21:52:25 +09:30
Chris Wilson
63bba7e60c [cairo-png] Call png_set_filler() before png_read_update_info().
Otherwise libpng gets very confused and we start scribbling over invalid
memory whilst reading in the PNG.
2008-04-21 20:15:28 +01:00
Chris Wilson
20b1b33c0f [cairo-png] Recheck png_info after setting transformation options.
After specifying how to transform the various colour modes into ones we
can handle, re-read the image header to confirm that the output on
reading the PNG will be RGB24 or ARGB32. This simplifies our logic
considerably as we no longer have to second guess the colour space
transformation that will be performed by libpng. (And allows for some
paranoid checks.)
2008-04-21 19:54:48 +01:00
Chris Wilson
f2f91db131 [cairo-png] Create an ARGB32 surface for paletted PNGs.
jeremie54 reported a regression in the handling of transparent paletted
PNGs beween 1.4.14 and 1.6.4. This was caused by the change to load
opaque PNGs into a RGB24 image surface, which made the assumption that
indexed PNGs were opaque. However, alpha/transparency in PNG is more
complicated, as PNG uses a tRNS chunk to supply transparency data for
paletted images and other image types that don't need a full alpha
channel. Therefore if the PNG contains a tRNS chunk always generate an
ARGB32 surface.
2008-04-21 18:35:07 +01:00
Chris Wilson
ea6dbfd36f [cairo-meta-surface] Save and restore the original clip.
When replaying the meta-surface to the target, we apply a stack-based
clip to the surface. However, we did not remove this clip from the
surface and so a pointer into our stack existed beyond the scope of
function.

Saving the original clip pointer and restoring it before leaving the
function resolves the issue and appears to fix
https://bugzilla.mozilla.org/show_bug.cgi?id=429071.
2008-04-21 18:35:07 +01:00
Adrian Johnson
a2c4fd0572 Add "Since: 1.6" to win32 printing surface 2008-04-18 18:18:30 +09:30
Robert O'Callahan
212357cb4c Clone surface correctly when doing a deep clip copy
The rect specifies the clip surface location within the owning surface;
when cloned, the x/y should be 0 to get the entire surface.

Ref: https://bugzilla.mozilla.org/show_bug.cgi?id=409227
2008-04-18 06:15:26 +02:00
Chris Wilson
a0d71e5a38 [Makefile.am] Fix breakage in previous commit.
I checked with --disable-pdf and with --disable-ps, but forgot to
check with them both enabled. D'oh.
2008-04-16 14:33:00 +01:00
Chris Wilson
472637da05 [Makefile.am] Add cairo-pdf-operators*.[ch] to ps_sources
The postscript backends depends upon cairo-pdf-operators.c, so list it
as a requirement in ps_sources. This enables the postscript backend to
build even if the pdf backend is disable by the user during configure.

(Fixes http://bugs.freedesktop.org/show_bug.cgi?id=15532.)
2008-04-16 14:19:02 +01:00
Behdad Esfahbod
cafdd01619 [Makefile.am] Document why beos was removed from build, and remove some cruft 2008-04-15 13:33:50 -04:00
Richard Hult
8514d33444 Fix to install cairo-quartz-font.pc 2008-04-14 16:55:23 -07:00
Kouhei Sutou
4ff59960f3 Fix typo in documentation (missing stride argument) 2008-04-14 16:53:37 -07:00
Carl Worth
9db764c732 Merge in '1.6'
This gets us a fix for not linking with g++ from 1.6.4

We don't take from 1.6.4 the revert of the addition of
missing locking from the GC cache, (meanwhile, we've
already got a corrected fix for this).

Conflicts:

	src/cairo-xlib-screen.c
2008-04-14 16:42:07 -07:00
Adrian Johnson
d96fdd58ab win32: Fix broken printing of type1 fonts
ExtTextOut() does not work with Type 1 font glyph indices when
printing. The same code works fine when dst->dc is a display. It
appears that ExtTextOut expects unicode character values when using
Type 1 fonts and a printer DC.

Fix this by making Type 1 fonts in the win32-printing surface use the
fallback path for non Windows fonts. ie the glyphs will be emitted as
filled paths.
2008-04-13 22:16:52 +09:30
Chris Wilson
ff5376563b [xlib] Clear the gc_needs_clip_reset after use.
If you think this commit is reminiscent of
40558cb15e, you would be right as it fixes
exactly the same bug I made then and reintroduced in dc714106e1.

So quoting 40558cb:
After consuming the GC we need to unset the clip reset flag, so that
if we try and get a new GC without first putting a fresh one we do not
try to call XSetClipMask on a NULL GC.
2008-04-11 23:57:01 +01:00
Carl Worth
32e576382b Prevent cairo from being linked unnecessarilly with g++
The beos backend involves a source file written in C++.
Apparently, automake sees the conditional inclusion of
that source file and insists on doing the final link of
cairo with g++ even though that file isn't being compiled
at all.

We definitely don't want that as it makes libcairo link
and depend on libstdc++ unnecessarily, (which can break
distribution packaging when not expecting it, etc.).
2008-04-11 14:13:03 -07:00
Carl Worth
8f1c8d4b26 Revert "[xlib] Add locking around GC cache."
This reverts commit 9cfd82e87b.

The fix was broken as it introduced crashes by calling
XSetClipMask with a NULL GC, (basically a reintroduction
of the bug originally fixed here:

	7802de6d5edaf998c98b141870dc2c6b4c0f3e91

Let's revert for sake of the release, and fix this correctly
on master.
2008-04-11 14:09:15 -07:00
Chris Wilson
9cfd82e87b [xlib] Add locking around GC cache.
The per-screen cached of most-recently freed GCs lacks suitable locking
for it to be threadsafe.
(cherry picked from commit dc714106e1)
2008-04-11 09:07:24 -07:00
Adrian Johnson
cf057c1e86 PS: Fix inefficient implementation of Tm/Td operators that was crashing printers
The Td and Tm operator emulation were setting the font matrix like this:

  /some_font [xx yx xy yy x0 y0] selectfont

where [xx yx xy yy] is the font matrix and [x0 y0] is the position of
the first glyph to be drawn. This seemed to be the easiest way to
emulate the Tm operator since the six arguments to Tm required by PDF
are xx,yx,xy,yy,x0,y0.

Before the switch to pdf-operators the font matrix was set like this:

  /somefont [xx yx xy yy 0 0] selectfont x0 y0 moveto

The selectfont operator is equivalent to calling findfont, makefont,
and setfont. The makefont operator creates a new font dictionary for
specified font that contains the specified font matrix. The
description of the makefont operator in the PostScript Language
Reference Manual states:

  "The interpreter keeps track of font dictionaries recently created
   by makefont. Calling makefont multiple times with the same font and
   matrix will usually return the same font rather than create a new
   one."

So the emulation of Tm and Td was creating a new font dictionary every
time a text string was displayed due to the change in the translation
components of the font matrix. Previously the font dictionary was
re-used as with the translation components of the matrix set to zero,
the font matrix did not change frequently.

Some printers did not handle well the frequent creation a font
dictionary every time a few glyphs were displayed.

Fix this by ensuring the translation components of the font matrix
used in the emulation of Tm and Td operators is always set to
zero. Use moveto instead for the translation components.
(cherry picked from commit c5814d2aa3)
2008-04-11 09:03:49 -07:00
Chris Wilson
e4fc5279cc [cairo-font-options] Eliminate internal use of cairo_font_options_create()
Within the library, we know the precise size of the struct and so can
allocate temporary font options on the stack - eliminating the need
to export an internal alias of cairo_font_options_(create|destory).
2008-04-11 15:39:11 +01:00
Chris Wilson
b72fe9bb5f [cairo-arc] Check that the context is not error before proceeding.
We depend on values stored on the context that become invalid upon an
error, so stop processing as soon as an error occurs. Prior to
adjusting, the values returned from the error context, this would cause
an infinite loop whilst calculating the number of segments required for
a tolerance of 0.
2008-04-11 15:39:10 +01:00
Chris Wilson
f6834dacef [cairo] Return defaults when the context is in error.
Return the default values instead of zero for an error context. This
helps to prevent application logic faults when using the values from
the error context (for an example, see _cairo_arc_in_direction()).
2008-04-11 15:39:10 +01:00
Chris Wilson
68f53282b9 [xlib] Clear the Visual cache upon display closure.
Clear the Visual cache, similarly to flushing the GC cache, upon
XCloseDisplay.
2008-04-11 15:39:10 +01:00
Chris Wilson
a2608cdde5 [xlib] Convert the Visual cache to use the screen mutex.
Use the per-screen mutex, introduced for the GC cache, to lock access to
the Visual cache (instead of the per-display mutex).
2008-04-11 15:39:10 +01:00