diff --git a/gfx/cairo/cairo/src/cairo-truetype-subset.c b/gfx/cairo/cairo/src/cairo-truetype-subset.c
--- a/gfx/cairo/cairo/src/cairo-truetype-subset.c
+++ b/gfx/cairo/cairo/src/cairo-truetype-subset.c
@@ -109,17 +109,17 @@ check (tt_maxp_t,	32);
 check (tt_name_record_t, 12);
 check (tt_name_t,	18);
 check (tt_composite_glyph_t, 16);
 check (tt_glyph_data_t,	26);
 #undef check
 
 static cairo_status_t
 cairo_truetype_font_use_glyph (cairo_truetype_font_t	    *font,
-	                       unsigned short		     glyph,
+	                       unsigned long		     glyph,
 			       unsigned short		    *out);
 
 #define SFNT_VERSION			0x00010000
 #define SFNT_STRING_MAX_LENGTH  65535
 
 static cairo_status_t
 _cairo_truetype_font_set_error (cairo_truetype_font_t *font,
 			        cairo_status_t status)
@@ -1021,17 +1021,17 @@ cairo_truetype_font_generate (cairo_true
 	*string_offsets = NULL;
 
  FAIL:
     return _cairo_truetype_font_set_error (font, status);
 }
 
 static cairo_status_t
 cairo_truetype_font_use_glyph (cairo_truetype_font_t	    *font,
-	                       unsigned short		     glyph,
+	                       unsigned long		     glyph,
 			       unsigned short		    *out)
 {
     if (glyph >= font->base.num_glyphs_in_face)
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
     if (font->parent_to_subset[glyph] == 0) {
 	font->parent_to_subset[glyph] = font->num_glyphs;
 	font->glyphs[font->num_glyphs].parent_index = glyph;
@@ -1145,17 +1145,17 @@ cairo_truetype_subset_init_internal (cai
     const unsigned long *string_offsets = NULL;
     unsigned long num_strings = 0;
 
     status = _cairo_truetype_font_create (font_subset, is_pdf, &font);
     if (unlikely (status))
 	return status;
 
     for (i = 0; i < font->scaled_font_subset->num_glyphs; i++) {
-	unsigned short parent_glyph = font->scaled_font_subset->glyphs[i];
+	unsigned long parent_glyph = font->scaled_font_subset->glyphs[i];
 	status = cairo_truetype_font_use_glyph (font, parent_glyph, &parent_glyph);
 	if (unlikely (status))
 	    goto fail1;
     }
 
     cairo_truetype_font_create_truetype_table_list (font);
     status = cairo_truetype_font_generate (font, &data, &length,
                                            &string_offsets, &num_strings);