View | Details | Raw Unified | Return to bug 97202
Collapse All | Expand All

(-)lib/font/FreeType/ftfuncs.c.orig (-2 / +6 lines)
Lines 928-934 Link Here
928
    face = (TT_Face)ft_face;
928
    face = (TT_Face)ft_face;
929
    sfnt   = (SFNT_Service)face->sfnt;
929
    sfnt   = (SFNT_Service)face->sfnt;
930
930
931
    if ( strike_index != 0xFFFFU && sfnt->load_sbits ) {
931
    if ( strike_index != 0xFFFFU && sfnt->load_sbits && 
932
         sfnt->find_sbit_image) {
932
        /* Check whether there is a glyph sbit for the current index */
933
        /* Check whether there is a glyph sbit for the current index */
933
        error = sfnt->find_sbit_image( face, glyph_index, strike_index,
934
        error = sfnt->find_sbit_image( face, glyph_index, strike_index,
934
                                       &range, &strike, &glyph_offset );
935
                                       &range, &strike, &glyph_offset );
Lines 954-960 Link Here
954
    if ( FT_STREAM_SEEK( ebdt_pos + glyph_offset ) )
955
    if ( FT_STREAM_SEEK( ebdt_pos + glyph_offset ) )
955
      goto Exit;
956
      goto Exit;
956
957
957
    error = sfnt->load_sbit_metrics( stream, range, &elem_metrics );
958
    if ( sfnt->load_sbit_metrics ) {
959
      error = sfnt->load_sbit_metrics( stream, range, &elem_metrics );
960
    }
961
    else error=-1;
958
    if ( error )
962
    if ( error )
959
      goto Exit;
963
      goto Exit;
960
964

Return to bug 97202