diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2007-06-12 00:07:24 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2007-06-12 00:07:24 +0000 |
commit | 19290cba0704aec45d7cceb81c283f80a79db933 (patch) | |
tree | 9c2adc8f2b8ad1942269e0018fd79e67be52f2d4 /pango/pango-ot.h | |
parent | 238cd14f991b00a9499e1bd4b6a1d9a27113e16d (diff) | |
download | pango-19290cba0704aec45d7cceb81c283f80a79db933.tar.gz |
New engine public macros:
2007-06-11 Behdad Esfahbod <behdad@gnome.org>
* pango/pango-ot.h: New engine public macros:
PANGO_OT_TAG_MAKE()
PANGO_OT_TAG_MAKE_FROM_STRING()
* docs/pango-sections.txt:
* docs/tmpl/opentype.sgml:
Update.
2007-06-11 Behdad Esfahbod <behdad@gnome.org>
Bug 446018 – Bus error in the pango_ot_tag_from_language()
* pango/pango-ot-tag.c (pango_ot_tag_from_script),
(pango_ot_tag_to_script), (pango_ot_tag_from_language),
(pango_ot_tag_to_language): Make sure int access is
aligned.
svn path=/trunk/; revision=2344
Diffstat (limited to 'pango/pango-ot.h')
-rw-r--r-- | pango/pango-ot.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/pango/pango-ot.h b/pango/pango-ot.h index 60d2a55c..52cc30f0 100644 --- a/pango/pango-ot.h +++ b/pango/pango-ot.h @@ -34,6 +34,12 @@ G_BEGIN_DECLS typedef guint32 PangoOTTag; +#define PANGO_OT_TAG_MAKE(c1,c2,c3,c4) ((PangoOTTag) FT_MAKE_TAG (c1, c2, c3, c4)) +#define PANGO_OT_TAG_MAKE_FROM_STRING(s) (PANGO_OT_TAG_MAKE(((const char *) s)[0], \ + ((const char *) s)[1], \ + ((const char *) s)[2], \ + ((const char *) s)[3])) + typedef struct _PangoOTInfo PangoOTInfo; typedef struct _PangoOTBuffer PangoOTBuffer; typedef struct _PangoOTGlyph PangoOTGlyph; @@ -47,14 +53,13 @@ typedef enum PANGO_OT_TABLE_GPOS } PangoOTTableType; +#define PANGO_OT_ALL_GLYPHS ((guint) 0xFFFF) +#define PANGO_OT_NO_FEATURE ((guint) 0xFFFF) +#define PANGO_OT_NO_SCRIPT ((guint) 0xFFFF) +#define PANGO_OT_DEFAULT_LANGUAGE ((guint) 0xFFFF) -#define PANGO_OT_ALL_GLYPHS ((guint) 0xFFFF) -#define PANGO_OT_NO_FEATURE ((guint) 0xFFFF) -#define PANGO_OT_NO_SCRIPT ((guint) 0xFFFF) -#define PANGO_OT_DEFAULT_LANGUAGE ((guint) 0xFFFF) - -#define PANGO_OT_TAG_DEFAULT_SCRIPT ((PangoOTTag) (FT_MAKE_TAG ('D', 'F', 'L', 'T'))) -#define PANGO_OT_TAG_DEFAULT_LANGUAGE ((PangoOTTag) (FT_MAKE_TAG ('d', 'f', 'l', 't'))) +#define PANGO_OT_TAG_DEFAULT_SCRIPT PANGO_OT_TAG_MAKE ('D', 'F', 'L', 'T') +#define PANGO_OT_TAG_DEFAULT_LANGUAGE PANGO_OT_TAG_MAKE ('d', 'f', 'l', 't') /* Note that this must match HB_GlyphItem */ struct _PangoOTGlyph |