diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-07-22 22:39:27 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-07-22 22:39:27 +0000 |
| commit | 1470d761b0faf8de46ff38163272a9a6af6c5e64 (patch) | |
| tree | c850fc2c223e0b8cff494a35792845f7ad9fcfeb | |
| parent | 08e044e049cc08ca045f94a00a3d564944f18797 (diff) | |
| download | pango-1470d761b0faf8de46ff38163272a9a6af6c5e64.tar.gz | |
Handle context == NULL. (Reported by Behdad Esfahbod)
2005-07-22 Owen Taylor <otaylor@redhat.com>
* pango/pangofc-fontmap.c (get_context_matrix): Handle context == NULL.
(Reported by Behdad Esfahbod)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 7 |
3 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2005-07-22 Owen Taylor <otaylor@redhat.com> + * pango/pangofc-fontmap.c (get_context_matrix): Handle context == NULL. + (Reported by Behdad Esfahbod) + +2005-07-22 Owen Taylor <otaylor@redhat.com> + * pango/Makefile.am configure.in: Use -export-symbols-regex to control symbol exports, including not exporting the symbols from opentype/. diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index ba670223..b42b3daf 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,5 +1,10 @@ 2005-07-22 Owen Taylor <otaylor@redhat.com> + * pango/pangofc-fontmap.c (get_context_matrix): Handle context == NULL. + (Reported by Behdad Esfahbod) + +2005-07-22 Owen Taylor <otaylor@redhat.com> + * pango/Makefile.am configure.in: Use -export-symbols-regex to control symbol exports, including not exporting the symbols from opentype/. diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 8732b2ac..4f0e43f0 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -506,9 +506,14 @@ static void get_context_matrix (PangoContext *context, PangoMatrix *matrix) { - const PangoMatrix *set_matrix = pango_context_get_matrix (context); + const PangoMatrix *set_matrix; static const PangoMatrix identity = PANGO_MATRIX_INIT; + if (context) + set_matrix = pango_context_get_matrix (context); + else + set_matrix = NULL; + if (set_matrix) *matrix = *set_matrix; else |