diff options
| author | Mika Saari <mika.saari@wipsl.com> | 2005-09-19 21:58:51 +0400 |
|---|---|---|
| committer | Mika Saari <mika.saari@wipsl.com> | 2005-09-19 21:58:51 +0400 |
| commit | f210e88263aa73a27c105fef4d2afb2bfeab5234 (patch) | |
| tree | 3fc6a804163a8ce21e29e7ce00a7eef36c5733dd /source/blender/blenlib | |
| parent | 6183bdf1b87186ff2d3cf100972262f22e54f00d (diff) | |
Coding style from spaces to tabs in files related to Unicode Font Object.
Function strlen changed to wcslen in editfont.c in ALT-U (undo) functionality.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_vfontdata.h | 2 | ||||
| -rw-r--r-- | source/blender/blenlib/intern/freetypefont.c | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/blenlib/BLI_vfontdata.h b/source/blender/blenlib/BLI_vfontdata.h index 1ebcd80b22b..ce800111afb 100644 --- a/source/blender/blenlib/BLI_vfontdata.h +++ b/source/blender/blenlib/BLI_vfontdata.h @@ -97,7 +97,7 @@ BLI_vfontdata_from_freetypefont( int BLI_vfontchar_from_freetypefont( - struct VFont *vfont, unsigned long character); + struct VFont *vfont, unsigned long character); #endif diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 577309a5474..308f567005a 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -329,7 +329,7 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf) VFontData *vfd; /* - FT_CharMap found = 0; + FT_CharMap found = 0; FT_CharMap charmap; FT_UShort my_platform_id = TT_PLATFORM_MICROSOFT; FT_UShort my_encoding_id = TT_MS_ID_UNICODE_CS; @@ -345,22 +345,22 @@ static VFontData *objfnt_to_ftvfontdata(PackedFile * pf) if(err) return NULL; /* - for ( n = 0; n < face->num_charmaps; n++ ) - { - charmap = face->charmaps[n]; - if ( charmap->platform_id == my_platform_id && - charmap->encoding_id == my_encoding_id ) - { - found = charmap; - break; - } - } - - if ( !found ) { return NULL; } - - // now, select the charmap for the face object - err = FT_Set_Charmap( face, found ); - if ( err ) { return NULL; } + for ( n = 0; n < face->num_charmaps; n++ ) + { + charmap = face->charmaps[n]; + if ( charmap->platform_id == my_platform_id && + charmap->encoding_id == my_encoding_id ) + { + found = charmap; + break; + } + } + + if ( !found ) { return NULL; } + + // now, select the charmap for the face object + err = FT_Set_Charmap( face, found ); + if ( err ) { return NULL; } */ // allocate blender font @@ -487,7 +487,7 @@ VFontData *BLI_vfontdata_from_freetypefont(PackedFile *pf) //init Freetype err = FT_Init_FreeType( &library); if(err) { - error("Failed to load the Freetype font library"); + error("Failed to load the Freetype font library"); return 0; } |