diff options
| author | Carl Worth <cworth@cworth.org> | 2008-10-29 16:21:42 -0700 |
|---|---|---|
| committer | Carl Worth <cworth@cworth.org> | 2008-10-29 16:21:42 -0700 |
| commit | a824d284be23793a5c48b9ae833dcb7b2d5fff80 (patch) | |
| tree | 8688808838b682c894e1b5d4febf77d3e58f1e9b /src | |
| parent | f039da8d9172a6fb60082901c8dc56c7159ecd24 (diff) | |
Remove the ability to select the internal font face with a name of "cairo".
It's not fair to steal this name from the namespace of family names.
There are definitely cairo.ttf files that exist out there, and people
may already be using these, (or may use them in the future), with
cairo_select_font_face and a family name of "cairo".
In place of this, we'll want to come up with some other new, and
documented API for selecting the internal font face.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cairo-font-face.c | 6 | ||||
| -rw-r--r-- | src/cairoint.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/cairo-font-face.c b/src/cairo-font-face.c index 6cea3958..30c8d9fb 100644 --- a/src/cairo-font-face.c +++ b/src/cairo-font-face.c @@ -578,8 +578,7 @@ _cairo_toy_font_face_scaled_font_get_implementation (void *abstra if (font_face->base.status) return font_face->base.status; - if (CAIRO_SCALED_FONT_BACKEND_DEFAULT != &_cairo_user_scaled_font_backend && - 0 != strcmp (font_face->family, CAIRO_USER_FONT_FAMILY_DEFAULT)) + if (CAIRO_SCALED_FONT_BACKEND_DEFAULT != &_cairo_user_scaled_font_backend) { const cairo_scaled_font_backend_t * backend = CAIRO_SCALED_FONT_BACKEND_DEFAULT; @@ -618,8 +617,7 @@ _cairo_toy_font_face_scaled_font_create (void *abstract_font_face if (status) return status; - if (CAIRO_SCALED_FONT_BACKEND_DEFAULT != &_cairo_user_scaled_font_backend && - 0 != strcmp (font_face->family, CAIRO_USER_FONT_FAMILY_DEFAULT)) + if (CAIRO_SCALED_FONT_BACKEND_DEFAULT != &_cairo_user_scaled_font_backend) { const cairo_scaled_font_backend_t * backend = CAIRO_SCALED_FONT_BACKEND_DEFAULT; diff --git a/src/cairoint.h b/src/cairoint.h index a1d3f3d4..a00e6e12 100644 --- a/src/cairoint.h +++ b/src/cairoint.h @@ -938,7 +938,6 @@ typedef struct _cairo_traps { #define CAIRO_WIN32_FONT_FAMILY_DEFAULT "Arial" #define CAIRO_QUARTZ_FONT_FAMILY_DEFAULT "Helvetica" #define CAIRO_FT_FONT_FAMILY_DEFAULT "" -#define CAIRO_USER_FONT_FAMILY_DEFAULT "cairo" #if CAIRO_HAS_WIN32_FONT |