[PATCH 2/4] scaled fonts: Use wide enough type for pointer arithmetic

The "unsigned long" type on Windows is only 32 bit wide, so conversion from
and to pointers is unsafe.

Replace with intptr_t, which is guaranteed to be large enough.
---
 src/cairo-cache-private.h       | 2 +-
 src/cairo-hash.c                | 2 +-
 src/cairo-scaled-font-subsets.c | 4 ++--
 src/cairo-scaled-font.c         | 4 ++--
 src/cairo-types-private.h       | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cairo-cache-private.h b/src/cairo-cache-private.h
index 24b6d0b..275552c 100644
--- a/src/cairo-cache-private.h
+++ b/src/cairo-cache-private.h
@@ -84,7 +84,7 @@
  * not be initialized if so desired.
  **/
 typedef struct _cairo_cache_entry {
-    unsigned long hash;
+    intptr_t hash;
     unsigned long size;
 } cairo_cache_entry_t;
 
diff --git a/src/cairo-hash.c b/src/cairo-hash.c
index 928c74b..8709918 100644
--- a/src/cairo-hash.c
+++ b/src/cairo-hash.c
@@ -340,7 +340,7 @@ _cairo_hash_table_lookup (cairo_hash_table_t *hash_table,
 {
     cairo_hash_entry_t *entry;
     unsigned long table_size, i, idx, step;
-    unsigned long hash = key->hash;
+    intptr_t hash = key->hash;
 
     entry = hash_table->cache[hash & 31];
     if (entry && entry->hash == hash && hash_table->keys_equal (key, entry))
diff --git a/src/cairo-scaled-font-subsets.c b/src/cairo-scaled-font-subsets.c
index 74bfb9e..6080a41 100644
--- a/src/cairo-scaled-font-subsets.c
+++ b/src/cairo-scaled-font-subsets.c
@@ -255,12 +255,12 @@ _cairo_sub_font_init_key (cairo_sub_font_t	*sub_font,
 {
     if (sub_font->is_scaled)
     {
-        sub_font->base.hash = (unsigned long) scaled_font;
+        sub_font->base.hash = (intptr_t) scaled_font;
         sub_font->scaled_font = scaled_font;
     }
     else
     {
-        sub_font->base.hash = (unsigned long) scaled_font->font_face;
+        sub_font->base.hash = (intptr_t) scaled_font->font_face;
         sub_font->scaled_font = scaled_font;
     }
 }
diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index ac80c97..1a3483a 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -639,7 +639,7 @@ _cairo_scaled_font_compute_hash (cairo_scaled_font_t *scaled_font)
     hash = _hash_matrix_fnv (&scaled_font->ctm, hash);
     hash = _hash_mix_bits (hash);
 
-    hash ^= (unsigned long) scaled_font->original_font_face;
+    hash ^= (intptr_t) scaled_font->original_font_face;
     hash ^= cairo_font_options_hash (&scaled_font->options);
 
     /* final mixing of bits */
@@ -2852,7 +2852,7 @@ _cairo_scaled_font_allocate_glyph (cairo_scaled_font_t *scaled_font,
     if (unlikely (page == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    page->cache_entry.hash = (unsigned long) scaled_font;
+    page->cache_entry.hash = (intptr_t) scaled_font;
     page->cache_entry.size = 1; /* XXX occupancy weighting? */
     page->num_glyphs = 0;
 
diff --git a/src/cairo-types-private.h b/src/cairo-types-private.h
index 3d15d96..8a540cc 100644
--- a/src/cairo-types-private.h
+++ b/src/cairo-types-private.h
@@ -147,7 +147,7 @@ struct _cairo_observer {
  * the entry need not be initialized if so desired.
  **/
 struct _cairo_hash_entry {
-    unsigned long hash;
+    intptr_t hash;
 };
 
 struct _cairo_array {
-- 
2.1.4

-- 
cairo mailing list
[email protected]
https://lists.cairographics.org/mailman/listinfo/cairo