← Back to branch summary

~oif-team/ubuntu/natty/qt4-x11/xi2.1

« back to all changes in this revision

Viewing changes to src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2009-11-02 18:30:08 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (15.2.5 experimental)
  • mto: This revision was merged to the branch mainline in revision 88.
  • Revision ID: james.westby@ubuntu.com-20091102183008-b6a4gcs128mvfb3m
Tags: upstream-4.6.0~beta1
Import upstream version 4.6.0~beta1

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c
1
 
/* Copyright (C) 2005 by George Williams */
 
1
/* Copyright (C) 2005, 2007, 2008 by George Williams */
2
2
/*
3
3
 * Redistribution and use in source and binary forms, with or without
4
4
 * modification, are permitted provided that the following conditions are met:
151
151
    int  load_flags = FT_LOAD_DEFAULT;
152
152
 
153
153
 
154
 
    if ( check_outlines                               &&
155
 
         ( face->face_flags & FT_FACE_FLAG_SCALABLE ) )
 
154
    if ( check_outlines         &&
 
155
         FT_IS_SCALABLE( face ) )
156
156
      load_flags = FT_LOAD_NO_BITMAP;
157
157
 
158
158
    if ( nohints )
162
162
 
163
163
    for ( gid = 0; gid < face->num_glyphs; ++gid )
164
164
    {
165
 
      if ( check_outlines                               &&
166
 
           ( face->face_flags & FT_FACE_FLAG_SCALABLE ) )
 
165
      if ( check_outlines         &&
 
166
           FT_IS_SCALABLE( face ) )
167
167
      {
168
168
        if ( !FT_Load_Glyph( face, gid, load_flags ) )
169
169
          FT_Outline_Decompose( &face->glyph->outline, &outlinefuncs, NULL );