diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-01-09 00:12:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-01-09 00:12:39 +0000 |
| commit | cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e (patch) | |
| tree | e1b8ffc1c14d449a41946d22ea5d1c6ddf9115d8 /pango/pangoft2-private.h | |
| parent | 75f4ad29adce645ddb837e662c9d71ccfbf60154 (diff) | |
| download | pango-cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e.tar.gz | |
Add checks for Cairo
Sat Jan 8 16:46:37 2005 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Cairo
* pango/Makefile.am: Add libpangocairo.
* pango/pangocairo-font.c pango/pangocairo-fontmap.c
pango/pangocairo.h pango/pangocairo-private.h
pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c
pango/pangocairo-fc.h: Start of a Cairo/FreeType backend.
* pango/pangofc-fontmap.[ch]: Add a "get_render_key"
virtual function to allow subclasses to specialize the
details of how caching works. Add a default implementation
that's a little more sophisticated than what was there
before.
* pango/pangoft2-private.h pangofc-font.c pangoft2.c:
Move default implementations of has_char(), get_glyph()
to the base class.
* pango/pangofc-private.h pango/pangoft2-private.h:
Move PANGO_UNITS_26_6 and friends to pango/pangofc-private.h.
* examples/renderdemo.[ch] examples/pangoft2topgm.c
examples/xftview.c: Allow passing in a custom function
to transform drawing.
* examples/Makefile.am examples/cairoview.c: Add a
Cairo/Xlib example program.
* examples/cairosimple.c: Simple Cairo example with
output to a PNG.
* pango/pango-layout.c (pango_layout_line_get_extents): Fix
bug where line ink rect was always including 0, 0.
Diffstat (limited to 'pango/pangoft2-private.h')
| -rw-r--r-- | pango/pangoft2-private.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/pango/pangoft2-private.h b/pango/pangoft2-private.h index c0b8a7e5..ac5c85a8 100644 --- a/pango/pangoft2-private.h +++ b/pango/pangoft2-private.h @@ -26,7 +26,6 @@ #include "pangoft2.h" #include "pango-renderer.h" #include <fontconfig/fontconfig.h> -#include <fontconfig/fcfreetype.h> /* Debugging... */ /*#define DEBUGGING 1*/ @@ -47,13 +46,6 @@ #define PING(printlist) #endif -#define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6)) -#define PANGO_PIXELS_26_6(d) \ - (((d) >= 0) ? \ - ((d) + PANGO_SCALE_26_6 / 2) / PANGO_SCALE_26_6 : \ - ((d) - PANGO_SCALE_26_6 / 2) / PANGO_SCALE_26_6) -#define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d)) - typedef struct _PangoFT2Font PangoFT2Font; typedef struct _PangoFT2GlyphInfo PangoFT2GlyphInfo; typedef struct _PangoFT2Renderer PangoFT2Renderer; |