diff options
| author | Noah Levitt <nlevitt@columbia.edu> | 2004-02-23 03:29:21 +0000 |
|---|---|---|
| committer | Noah Levitt <nlevitt@src.gnome.org> | 2004-02-23 03:29:21 +0000 |
| commit | 87eb95a56174cf5ed182f480f5ec1f7196f11da2 (patch) | |
| tree | d694c4bdc8aa53be134e3c5263f96bf6965983d3 | |
| parent | d2c50eca978828bbf7c3b0386da35ee1444a64f7 (diff) | |
| download | pango-87eb95a56174cf5ed182f480f5ec1f7196f11da2.tar.gz | |
Handle possibility of FcPatternGetDouble(FC_DPI) failing.
2003-02-22 Noah Levitt <nlevitt@columbia.edu>
* pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle
possibility of FcPatternGetDouble(FC_DPI) failing.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 3 |
6 files changed, 32 insertions, 6 deletions
@@ -1,10 +1,15 @@ 2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle + possibility of FcPatternGetDouble(FC_DPI) failing. + +2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pango-font.h: * pango/pangofc-fontmap.c: * pango/pangowin32-fontmap.c: * pango/fonts.c (pango_font_face_list_sizes): New API for - getting available sizes for a bitmap font face. + getting available sizes for a bitmap font face. (#99235) Sat Feb 21 11:31:16 2004 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d852e435..0b1a9a12 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,10 +1,15 @@ 2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle + possibility of FcPatternGetDouble(FC_DPI) failing. + +2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pango-font.h: * pango/pangofc-fontmap.c: * pango/pangowin32-fontmap.c: * pango/fonts.c (pango_font_face_list_sizes): New API for - getting available sizes for a bitmap font face. + getting available sizes for a bitmap font face. (#99235) Sat Feb 21 11:31:16 2004 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d852e435..0b1a9a12 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,10 +1,15 @@ 2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle + possibility of FcPatternGetDouble(FC_DPI) failing. + +2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pango-font.h: * pango/pangofc-fontmap.c: * pango/pangowin32-fontmap.c: * pango/fonts.c (pango_font_face_list_sizes): New API for - getting available sizes for a bitmap font face. + getting available sizes for a bitmap font face. (#99235) Sat Feb 21 11:31:16 2004 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d852e435..0b1a9a12 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,10 +1,15 @@ 2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle + possibility of FcPatternGetDouble(FC_DPI) failing. + +2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pango-font.h: * pango/pangofc-fontmap.c: * pango/pangowin32-fontmap.c: * pango/fonts.c (pango_font_face_list_sizes): New API for - getting available sizes for a bitmap font face. + getting available sizes for a bitmap font face. (#99235) Sat Feb 21 11:31:16 2004 Owen Taylor <otaylor@redhat.com> diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d852e435..0b1a9a12 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,10 +1,15 @@ 2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pangofc-fontmap.c (pango_fc_face_list_sizes): Handle + possibility of FcPatternGetDouble(FC_DPI) failing. + +2003-02-22 Noah Levitt <nlevitt@columbia.edu> + * pango/pango-font.h: * pango/pangofc-fontmap.c: * pango/pangowin32-fontmap.c: * pango/fonts.c (pango_font_face_list_sizes): New API for - getting available sizes for a bitmap font face. + getting available sizes for a bitmap font face. (#99235) Sat Feb 21 11:31:16 2004 Owen Taylor <otaylor@redhat.com> diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index e7dfdd1a..a1b44285 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -1185,7 +1185,8 @@ pango_fc_face_list_sizes (PangoFontFace *face, { FcPattern *tmp = FcPatternDuplicate (fontset->fonts[i]); pango_fc_default_substitute (fcface->family->fontmap, tmp); - FcPatternGetDouble (tmp, FC_DPI, 0, &dpi); + if (FcPatternGetDouble (tmp, FC_DPI, 0, &dpi) != FcResultMatch) + dpi = 72.0; FcPatternDestroy (tmp); } |