Commit graph

2023 commits

Author SHA1 Message Date
Kristian Høgsberg
45cbe055d9 Convert the stdio output stream to use the new output stream interface. 2006-06-12 03:08:51 -04:00
Kristian Høgsberg
3575c942f8 Make cairo_output_stream_t an embeddable type.
Most internal cairo types are transparent within cairo and have init and fini
functions to intialize and finialize them in place.  This way they can be
easily be embedded in other structs or derived from.  Initially, the
cairo_output_stream_t type was proposed as a publically visible type and
thus kept opaque.  However, now it's only used internally and derived from
in a number of places so let's make it an embeddable type for consistency
and ease of use.

The patch keeps _cairo_output_stream_create() and _cairo_output_stream_close()
around for (internal) backwards compatibility by deriving a
cairo_output_stream_with_closure_t stream type.

The patch also moves all cairo_output_stream_t functions out of cairoint.h
and into new file cairo-output-stream-private.h, thus chipping away at the
monolithic cairoint.h.
2006-06-12 03:07:19 -04:00
Emmanuel Pacaud
7992810135 SVG: Sets fallback resolution when compositing a meta surface.
For doing so, I've changed document owner to be the paginated surface,
instead of the svg surface like previously. That's because fallback
resolution is stored in paginated surface.
2006-06-11 21:07:34 +02:00
Jinghua Luo
7e1a01092c freetype: build fix for _transform_glyph_bitmap.
I sorry for this noise, I didn't notice cworth's device_{x, y}_offset
changes. Now cairo builds again.
paths...
2006-06-11 18:37:59 +08:00
Jinghua Luo
4af28e639d ignore FC_MATRIX in font pattern.
With previous commit, freetype font backend is able to transform
both bitmap and outline glyphs, so ignores FC_MATRIX from now,
cairo doesn't need this for artificial oblique. And cairo doesn't
use FC_MATRIX direct anyway, it has its own font matrix that may be not
equal to FC_MATRIX in the font pattern! You should pass the matrix
(usually the matrix is multiplied by font's pixel size) to cairo when
creating scaled font.
2006-06-11 18:16:46 +08:00
Jinghua Luo
f5bc26b75d freetype: rework _transform_glyph_bitmap.
This function is used to shape bitmap glyphs(outline glyphs are
transformed by freetype). That means freetype backend is able to
tranform both bitmap & outline glyphs now. This is needed for glyph
rotating, artificial oblique etc.
2006-06-11 18:09:05 +08:00
Carl Worth
da9cd55afb ROADMAP: Note that cairo_surface_set_fallback_resolution is in place now. 2006-06-10 16:31:05 -07:00
Carl Worth
2f4210d346 Change _cairo_meta_surface_get_extents to return a bounded size.
The old behavior of returning "infinite" extents is inconsistent with
the current usage of meta-surface where it is always created for
replay against a particular (sized) target surface and that size is
passed to _cairo_meta_surface_create.

Also clarify documentation of _cairo_surface_get_extents to eliminate
the possibility of inifinite extents.
2006-06-10 11:20:21 -07:00
Carl Worth
d758d5104a Don't create a new scaled_font if there's a device_offset but no device_scale.
(This is covering up my mistake from the last batch of 12 commits which
wasn't ready to be pushed yet. This fixes some of the crashes which
were introduced, and is a good thing to do regardless.)
2006-06-10 10:42:32 -07:00
Carl Worth
0662928e4f Clarify that fallback_resolution acts on a per-page granularity.
This explains why the SVG result from the fallback-resolution test
doesn't actually show multiple resolutions in effect at the same time.
2006-06-10 09:44:30 -07:00
Carl Worth
13ba5316fb Test PS and SVG backends in addition to PDF in test/fallback-resolution. 2006-06-10 09:15:31 -07:00
Carl Worth
6ca30e108f Add cairo_{ps,svg}_test_force_fallbacks so tests can force fallbacks. 2006-06-10 09:14:47 -07:00
Carl Worth
100b30d1c0 Fix font size when drawing text with a device_scale.
The trick is to create a new scaled_font with the device_transform
multiplied into the CTM within _cairo_surface_show_glyphs before
calling into the backend. The fallback-resolution test shows that
the font size is now correct.
2006-06-10 08:35:01 -07:00
Carl Worth
74857181c9 Fix line width for stroking with a device_scale.
The trick is to simply multiply the device_transform into the CTM
within _cairo_surface_stroke before passing the CTM down to the
backend. The fallback-resolution test shows that the stroke width is
now correct.
2006-06-10 08:29:14 -07:00
Carl Worth
ebb53b2572 Add text and stroke to falback-resolution test (showing bugs in each). 2006-06-10 08:21:18 -07:00
Carl Worth
6efeb1e19b Hook up device scaling so fallback_resolution starts working.
Add new, private _cairo_surface_set_device_scale for getting at the
scaling components of device_transform. Use this in paginated surface
when replaying to an image surface. The fallback-resolution test now
clearly shows that image fallback resolution can be controlled by the
user. Hurrah!
2006-06-10 08:19:41 -07:00
Carl Worth
b129f747c5 Change {x,y}_device_offset values to a device_transform matrix.
This is a step toward allowing device scaling in addition to device offsets.
So far, the scale values are still always 1.0 so only the translation is
actually being used. But most of the code is in place for doing scaling as
well and it just needs to be hooked up.

There are some fragile parts in this code, all of which involve using the
translation without the scale, (so grep for device_transform.x0 or
device_transform->x0). Some of these are likely bugs that will hopefully
be obvious once we start using the scale. Others are OK if only because
we 'know' that we aren't ever setting device scaling on a surface that
has a device offset (we only set device scaling on surfaces we create
internally and we don't export device scaling to the user).

All of these fragile parts in the code have been marked with comments of
the form: XXX: FRAGILE.
2006-06-10 00:12:51 -07:00
Carl Worth
24da744d03 doc: SGML template churn 2006-06-09 23:59:24 -07:00
Carl Worth
999315cc0a Rename device_{x,y}_offset to {x,y}_device_offset for better consitency/grepability 2006-06-09 21:12:44 -07:00
Carl Worth
6f6bdb6663 Add REPLACED_BY macros to help porting to new set_fallback_resolution 2006-06-09 16:54:09 -07:00
Carl Worth
b2f274b3e8 New API: Replace cairo_{ps,pdf,svg}_set_dpi with new cairo_surface_set_fallback_resolution.
This just provides the mechanics for storing the value and removing the old
function calls. The new value is still not used anywhere (though nor where
the old values), so there should be no functional change (other than forcing
any programs calling the old API to be updated).
2006-06-09 16:52:17 -07:00
Carl Worth
a812b3c490 Ignore ft-text-vertical-layout binary 2006-06-09 15:37:50 -07:00
Jinghua Luo
ac20c80960 freetype: Ignore global advance unconditionally.
Global advance exists for historical reasons. Nowadays, most of fonts
support unicode, means it's no guaranteed to every glyphs in the font
has the same advance.Sometimes it maybe is biger/smaller then the global
advance even for monospace fonts!So forcing their advance to global
advance, it's obviously wrong.
2006-06-09 07:06:51 +08:00
Carl Worth
d3c782320a Rename ft-text-vertical-layout reference image according to standard convention.
The standard convention is that the ARGB32 reference image has no
-argb32- component in its name (no real important reason, just
historical). So let's be consist and rename:
test/ft-text-vertical-layout-argb32-ref.png -> test/ft-text-vertical-layout-ref.png
2006-06-07 17:38:09 -07:00
Carl Worth
b7b3d05d78 Fix bug in get-group-target (in the test itself) letting it now pass. 2006-06-07 14:00:15 -07:00
Jinghua Luo
45ca22e5e1 Make image-*-ref.png image as reference image. 2006-06-08 04:06:30 +08:00
Jinghua Luo
5ae2a78a29 freetype: Fix for test case ft-text-vertial-layout.
Fix scaled font metrics and glyph metrics calculation for vertical
layout. Test case ft-text-vertial-layout passes now.
2006-06-08 03:45:38 +08:00
Jinghua Luo
6b5be506ed Add ft-text-vertical-layout test case for vertical layout. 2006-06-08 03:33:38 +08:00
Jinghua Luo
bb66d15a79 Merge branch 'master' of git+ssh://jinghua@git.cairographics.org/git/cairo 2006-06-08 02:38:17 +08:00
Jinghua Luo
3594fd2d27 glitz: Don't hardcode content type when initializing cairo surface
since we can compute it from glitz format.
2006-06-08 02:35:42 +08:00
Carl Worth
b7c7d2e57c Add new test get-group-target (currently failing with paginated).
This test exercises the combination of cairo_get_group_target along
with cairo_surface_get_device_offset. Something funny is currently
going on with the surfaces based on the paginated surface.
2006-06-07 10:37:29 -07:00
Carl Worth
53bf2f8d5d Remove debugging "prints" of images from test/device-offset.c 2006-06-07 10:29:33 -07:00
Zakharov Mikhail
32c0e85d45 pixman: fix compilation on HP-UX 11.11 2006-06-07 09:42:48 -07:00
Carl Worth
3690eeb44c Change all instances of UINT16_MAX to INT16_MAX to avoid new bug.
A recent renaming from CAIRO_MAXSHORT also changed the range of some
values from INT16_MAX to UINT16_MAX. The test suite shows one case
where this introduces a bug, (push/pop_group with SVG and RGB24
surfaces).

I haven't tracked the bug down, (presumably there's overflow of the
unsigned value at some point), but I'm now reverting this to avoid
triggering the bug.
2006-06-07 02:59:51 -07:00
Carl Worth
7f2cf378d5 Fix MAX vs. MIN bug introduced with rename away from CAIRO_MINSHORT 2006-06-07 02:56:45 -07:00
Carl Worth
bf458c9c67 win32: Add conditional definitions for INT16_{MIN,MAX} and UINT16_MAX now that we use them. 2006-06-06 17:06:57 -07:00
Carl Worth
c1855f1762 Remove CAIRO_{MIN,MAX}SHORT which did not distinguish signed vs. unsigned.
Instead, use the standard INT16_{MIN,MAX} and UINT16_{MIN,MAX} as
appropriate.
2006-06-06 16:59:59 -07:00
Carl Worth
746f66c3fc Fix bogus cairo_rectangle_fixed_t to be cairo_rectangle_int16_t.
This rectangle has regular integer values, not fixed-point values.
So the old name was horribly wrong and misleading, (and yes I think
it was even I that had suggested it).
2006-06-06 16:54:03 -07:00
Carl Worth
5570bf0a9e CODING_STYLE: Fix misspellings. 2006-06-06 16:36:24 -07:00
Carl Worth
a21a2e935d CODING_STYLE: Add notes on avoiding trailing whitespace. 2006-06-06 16:28:15 -07:00
Carl Worth
ef10a0403a Remove initial, final, and duplicate blank lines.
This patch was produced by running git-stripspace on all *.[ch] files
within cairo. Note that this script would have also created all the changes
from the previous commits to remove trailing whitespace.
2006-06-06 15:50:33 -07:00
Carl Worth
5278de0997 Remove all remaining trailing whitespace.
This patch was produced with the following (GNU) sed script:

	sed -i -r -e 's/[ \t]+$//'

run on all *.[ch] files within cairo.

Note that the above script would have also created all the changes
from the previous commits to remove trailing whitespace.
2006-06-06 15:41:31 -07:00
Carl Worth
00592e0757 Remove trailing whitespace from lines with a single brace.
This patch was produced with the following (GNU) sed script:

	sed -i -r -e '/^[ \t]*[{}][ \t]*/ s/[ \t]+$//'

run on all *.[ch] files within cairo.
2006-06-06 15:38:58 -07:00
Carl Worth
4670366ede Remove trailing whitespace from lines that look like comments.
This patch was produced with the following (GNU) sed script:

	sed -i -r -e '/^[ \t]*\/?\*/ s/[ \t]+$//'

run on all *.[ch] files within cairo, (though I manually excluded
src/cairo-atsui-font.c which has a code line that appears as a comment
to this script).
2006-06-06 15:35:48 -07:00
Carl Worth
80b8deb1e4 Remove extraneous whitespace from "blank" lines.
This patch was produced with the following (GNU) sed script:

	sed -i -r -e 's/^[ \t]+$//'

run on all *.[ch] files within cairo.
2006-06-06 15:25:49 -07:00
Carl Worth
28d47d332a Move rectangle functions to new cairo-rectangle.c 2006-06-05 14:25:22 -07:00
Carl Worth
3d9dc96d18 New API: Add cairo_image_surface_get_{data,format,stride} 2006-06-05 14:25:21 -07:00
Jeff Muizelaar
0c49666231 Only destroy scaled glyphs if they are not in the cache.
Previously, when scaled_glyph_init failed we would destroy the scaled glyph in
CLEANUP. However, this causes trouble later because there is still a reference
to the glyph in the cache. This remaining reference causes a number of bad things,
including a double destruction when the cache is destroyed.
2006-05-29 18:50:32 -04:00
Kristian Høgsberg
bafdded8ee Remove cairo_public from _cairo_lzw_compress() definition. 2006-05-28 13:39:34 -04:00
Kristian Høgsberg
84c6f87963 Clarify licensing of float formatting code. 2006-05-28 13:38:50 -04:00