diff options
| author | Adrian Johnson <ajohnson@redneon.com> | 2021-07-25 06:18:37 +0930 |
|---|---|---|
| committer | Adrian Johnson <ajohnson@redneon.com> | 2021-07-25 11:01:20 +0930 |
| commit | 9fbf42754899898934bc8bf4f8eeacba37656fdc (patch) | |
| tree | 71290e364a7dd65973cb0cdcef32615c4c8dc374 /src/cairo-script-surface.c | |
| parent | 099d71fb9f267153da8b45adc288f9715fbb4611 (diff) | |
| download | cairo-9fbf42754899898934bc8bf4f8eeacba37656fdc.tar.gz | |
Use uintptr_t for all casts between pointer and integer
On 64-bit windows, long is 32-bit. When compiling there are a large
number of warnings about mismatched sizes when casting long to/from a
pointer.
Use the (u)intptr_t type for any integer that will have a pointer stored
in it. Use a (u)intptr_t cast when integers are stored in pointers to
silence warnings.
Fixes #263
Diffstat (limited to 'src/cairo-script-surface.c')
| -rw-r--r-- | src/cairo-script-surface.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cairo-script-surface.c b/src/cairo-script-surface.c index 4d7778b99..800db0780 100644 --- a/src/cairo-script-surface.c +++ b/src/cairo-script-surface.c @@ -3047,7 +3047,7 @@ _emit_scaled_glyph_vector (cairo_script_surface_t *surface, index = ++font_private->subset_glyph_index; scaled_glyph->dev_private_key = ctx; - scaled_glyph->dev_private = (void *) index; + scaled_glyph->dev_private = (void *)(uintptr_t)index; _cairo_output_stream_printf (ctx->stream, "%lu <<\n" @@ -3095,7 +3095,7 @@ _emit_scaled_glyph_bitmap (cairo_script_surface_t *surface, index = ++font_private->subset_glyph_index; scaled_glyph->dev_private_key = ctx; - scaled_glyph->dev_private = (void *) index; + scaled_glyph->dev_private = (void *)(uintptr_t)index; _cairo_output_stream_printf (ctx->stream, "%lu <<\n" @@ -3395,7 +3395,7 @@ _cairo_script_surface_show_text_glyphs (void *abstract_surface, goto BAIL; } - if ((long unsigned) scaled_glyph->dev_private > 256) + if ((uintptr_t)scaled_glyph->dev_private > 256) break; } } @@ -3466,7 +3466,7 @@ _cairo_script_surface_show_text_glyphs (void *abstract_surface, if (font_private->has_sfnt) c = glyphs[n].index; else - c = (uint8_t) (long unsigned) scaled_glyph->dev_private; + c = (uint8_t) (uintptr_t) scaled_glyph->dev_private; _cairo_output_stream_write (base85_stream, &c, 1); } else { @@ -3475,7 +3475,7 @@ _cairo_script_surface_show_text_glyphs (void *abstract_surface, glyphs[n].index); else _cairo_output_stream_printf (ctx->stream, " %lu", - (long unsigned) scaled_glyph->dev_private); + (long unsigned) (uintptr_t)scaled_glyph->dev_private); } dx = scaled_glyph->metrics.x_advance; |