diff options
| author | Manish Singh <yosh@gimp.org> | 2005-07-22 16:13:59 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2005-07-22 16:13:59 +0000 |
| commit | 1c0631c8f9d56f4ba146edbe5b908741a5f7fab3 (patch) | |
| tree | 6043030554d3be86e8f0ec50764bfeaafd54e9f7 | |
| parent | c040d51c9c76932fea029a6e1faf14f6ebc26168 (diff) | |
| download | pango-1c0631c8f9d56f4ba146edbe5b908741a5f7fab3.tar.gz | |
use GPOINTER_TO_UINT() instead of bare casts to guint.
2005-07-21 Manish Singh <yosh@gimp.org>
* pango/pangofc-fontmap.c (fontset_hash_key_hash, font_hash_key_hash):
use GPOINTER_TO_UINT() instead of bare casts to guint.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 5 | ||||
| -rw-r--r-- | pango/pangofc-fontmap.c | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2005-07-21 Manish Singh <yosh@gimp.org> + + * pango/pangofc-fontmap.c (fontset_hash_key_hash, font_hash_key_hash): + use GPOINTER_TO_UINT() instead of bare casts to guint. + 2005-07-21 Owen Taylor <otaylor@redhat.com> Based on patch from Gustavo J. A. M. Carneiro (#305975) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 0ff6b8f1..6924d524 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +2005-07-21 Manish Singh <yosh@gimp.org> + + * pango/pangofc-fontmap.c (fontset_hash_key_hash, font_hash_key_hash): + use GPOINTER_TO_UINT() instead of bare casts to guint. + 2005-07-21 Owen Taylor <otaylor@redhat.com> Based on patch from Gustavo J. A. M. Carneiro (#305975) diff --git a/pango/pangofc-fontmap.c b/pango/pangofc-fontmap.c index 86387ae2..8732b2ac 100644 --- a/pango/pangofc-fontmap.c +++ b/pango/pangofc-fontmap.c @@ -336,7 +336,7 @@ fontset_hash_key_hash (const FontsetHashKey *key) /* 1237 is just an abitrary prime */ return (hash ^ - (guint)key->language ^ + GPOINTER_TO_UINT (key->language) ^ (key->size * 1237) ^ pango_font_description_hash (key->desc)); } @@ -407,7 +407,7 @@ font_hash_key_hash (const FontHashKey *key) hash ^= PANGO_FC_FONT_MAP_GET_CLASS (key->fontmap)->context_key_hash (key->fontmap, key->context_key); - return (hash ^ (guint32)key->pattern); + return (hash ^ GPOINTER_TO_UINT (key->pattern)); } static void |