/[freetype]/freetype2/src/cff/cffgload.c
ViewVC logotype

Diff of /freetype2/src/cff/cffgload.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.65 by werner, Thu May 13 21:59:17 2004 UTC revision 1.66 by wl, Mon Apr 18 07:13:07 2005 UTC
# Line 4  Line 4 
4  /*                                                                         */  /*                                                                         */
5  /*    OpenType Glyph Loader (body).                                        */  /*    OpenType Glyph Loader (body).                                        */
6  /*                                                                         */  /*                                                                         */
7  /*  Copyright 1996-2001, 2002, 2003, 2004 by                               */  /*  Copyright 1996-2001, 2002, 2003, 2004, 2005 by                         */
8  /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */  /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
9  /*                                                                         */  /*                                                                         */
10  /*  This file is part of the FreeType project, and may only be used,       */  /*  This file is part of the FreeType project, and may only be used,       */
# Line 2466  Line 2466 
2466    
2467  #endif /* FT_CONFIG_OPTION_INCREMENTAL */  #endif /* FT_CONFIG_OPTION_INCREMENTAL */
2468    
2469      font_matrix = cff->top_font.font_dict.font_matrix;      if ( cff->num_subfonts >= 1 )
2470      font_offset = cff->top_font.font_dict.font_offset;      {
2471          FT_Byte  fd_index = cff_fd_select_get( &cff->fd_select, glyph_index );
2472    
2473    
2474          font_matrix = cff->subfonts[fd_index]->font_dict.font_matrix;
2475          font_offset = cff->subfonts[fd_index]->font_dict.font_offset;
2476        }
2477        else
2478        {
2479          font_matrix = cff->top_font.font_dict.font_matrix;
2480          font_offset = cff->top_font.font_dict.font_offset;
2481        }
2482    
2483      /* Now, set the metrics -- this is rather simple, as   */      /* Now, set the metrics -- this is rather simple, as   */
2484      /* the left side bearing is the xMin, and the top side */      /* the left side bearing is the xMin, and the top side */

Legend:
Removed from v.1.65  
changed lines
  Added in v.1.66

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26