summaryrefslogtreecommitdiff
path: root/src/cairo-font-face.c
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2008-01-17 22:31:05 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2008-01-17 22:38:02 +0000
commit0086db893cba90dc73824d77c661d2965ad48112 (patch)
tree4b7ef3959d890c2e7956fce9ec9af160efcbd688 /src/cairo-font-face.c
parent02d0e070638f668bf50a8ce2174c21e5614dd6c4 (diff)
downloadcairo-0086db893cba90dc73824d77c661d2965ad48112.tar.gz
[cairo-font-options] Treat NULL as a default cairo_font_options_t
Interpret a NULL cairo_font_options_t as the default values - i.e as if it were a fresh pointer returned by cairo_font_options_create().
Diffstat (limited to 'src/cairo-font-face.c')
-rw-r--r--src/cairo-font-face.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/cairo-font-face.c b/src/cairo-font-face.c
index f7294764a..b944534b9 100644
--- a/src/cairo-font-face.c
+++ b/src/cairo-font-face.c
@@ -476,9 +476,11 @@ _cairo_toy_font_face_scaled_font_create (void *abstract_font_face
if (font_face->base.status)
return font_face->base.status;
- status = cairo_font_options_status ((cairo_font_options_t *) options);
- if (status)
- return status;
+ if (options != NULL) {
+ status = cairo_font_options_status ((cairo_font_options_t *) options);
+ if (status)
+ return status;
+ }
return _cairo_font_face_set_error (&font_face->base,
backend->create_toy (font_face,