/[freetype]/freetype2/src/truetype/ttdriver.c
ViewVC logotype

Diff of /freetype2/src/truetype/ttdriver.c

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

revision 1.80 by wl, Wed Aug 3 21:17:53 2005 UTC revision 1.81 by olvaffe, Tue Aug 16 01:54:59 2005 UTC
# Line 283  Line 283 
283      if ( !slot )      if ( !slot )
284        return TT_Err_Invalid_Slot_Handle;        return TT_Err_Invalid_Slot_Handle;
285    
286      /* check whether we want a scaled outline or bitmap */      if ( !size || !size->ttmetrics.valid )
287      if ( !size )        return TT_Err_Invalid_Size_Handle;
       load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;  
288    
289      if ( load_flags & FT_LOAD_NO_SCALE )      if ( load_flags & ( FT_LOAD_NO_RECURSE | FT_LOAD_NO_SCALE ) )
       size = NULL;  
   
     /* reset the size object if necessary */  
     if ( size )  
290      {      {
291        /* these two object must have the same parent */        load_flags |= FT_LOAD_NO_HINTING |
292        if ( size->root.face != slot->face )                      FT_LOAD_NO_BITMAP  |
293          return TT_Err_Invalid_Face_Handle;                      FT_LOAD_NO_SCALE;
   
       if ( !size->ttmetrics.valid )  
       {  
         if ( FT_SET_ERROR( tt_size_reset( size ) ) )  
           return error;  
       }  
294      }      }
295    
296      /* now load the glyph outline if necessary */      /* now load the glyph outline if necessary */
# Line 409  Line 398 
398      tt_face_done,      tt_face_done,
399      tt_size_init,      tt_size_init,
400      tt_size_done,      tt_size_done,
401      0,                      /* FT_Slot_InitFunc        */      tt_slot_init,
402      0,                      /* FT_Slot_DoneFunc        */      0,                      /* FT_Slot_DoneFunc */
403    
404      Set_Char_Sizes,      Set_Char_Sizes,
405      Set_Pixel_Sizes,      Set_Pixel_Sizes,

Legend:
Removed from v.1.80  
changed lines
  Added in v.1.81

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