Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

*/*: Use FT_Err_Ok only.

Browse Source 
This is a purely mechanical conversion.
2.6.5
Werner Lemberg 12 years ago
parent 059bc335ce
commit e3c9301581
81 changed files with 413 additions and 407 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ChangeLog
  2. 8
      src/autofit/afcjk.c
  3. 6
      src/autofit/afdummy.c
  4. 6
      src/autofit/afglobal.c
  5. 10
      src/autofit/afhints.c
  6. 4
      src/autofit/afindic.c
  7. 10
      src/autofit/aflatin.c
  8. 10
      src/autofit/aflatin2.c
  9. 2
      src/autofit/afloader.c
  10. 6
      src/autofit/afmodule.c
  11. 4
      src/autofit/afpic.c
  12. 14
      src/bdf/bdfdrivr.c
  13. 30
      src/bdf/bdflib.c
  14. 10
      src/bzip2/ftbzip2.c
  15. 2
      src/cache/ftccache.c
  16. 5
      src/cache/ftccache.h
  17. 4
      src/cache/ftcmru.h
  18. 2
      src/cache/ftcsbits.c
  19. 16
      src/cff/cffdrivr.c
  20. 16
      src/cff/cffgload.c
  21. 12
      src/cff/cffload.c
  22. 14
      src/cff/cffobjs.c
  23. 12
      src/cff/cffparse.c
  24. 4
      src/cff/cffpic.c
  25. 4
      src/cid/cidgload.c
  26. 10
      src/cid/cidload.c
  27. 6
      src/cid/cidobjs.c
  28. 12
      src/cid/cidriver.c
  29. 4
      src/gxvalid/gxvcommn.c
  30. 6
      src/gxvalid/gxvmod.c
  31. 10
      src/gzip/ftgzip.c
  32. 6
      src/lzw/ftlzw.c
  33. 4
      src/otvalid/otvmod.c
  34. 12
      src/pcf/pcfdrivr.c
  35. 20
      src/pcf/pcfread.c
  36. 2
      src/pfr/pfrcmap.c
  37. 8
      src/pfr/pfrdrivr.c
  38. 4
      src/pfr/pfrgload.c
  39. 12
      src/pfr/pfrload.c
  40. 2
      src/pfr/pfrobjs.c
  41. 4
      src/pfr/pfrsbit.c
  42. 14
      src/psaux/afmparse.c
  43. 30
      src/psaux/psobjs.c
  44. 34
      src/psaux/t1decode.c
  45. 2
      src/pshinter/pshalgo.c
  46. 4
      src/pshinter/pshpic.c
  47. 38
      src/pshinter/pshrec.c
  48. 2
      src/psnames/psmodule.c
  49. 4
      src/psnames/pspic.c
  50. 2
      src/raster/ftraster.c
  51. 4
      src/raster/ftrend1.c
  52. 4
      src/raster/rastpic.c
  53. 8
      src/sfnt/sfdriver.c
  54. 4
      src/sfnt/sfntpic.c
  55. 12
      src/sfnt/sfobjs.c
  56. 8
      src/sfnt/ttbdf.c
  57. 54
      src/sfnt/ttcmap.c
  58. 6
      src/sfnt/ttload.c
  59. 6
      src/sfnt/ttmtx.c
  60. 6
      src/sfnt/ttpost.c
  61. 10
      src/sfnt/ttsbit.c
  62. 16
      src/sfnt/ttsbit0.c
  63. 4
      src/smooth/ftsmooth.c
  64. 4
      src/smooth/ftspic.c
  65. 6
      src/truetype/ttdriver.c
  66. 24
      src/truetype/ttgload.c
  67. 24
      src/truetype/ttgxvar.c
  68. 26
      src/truetype/ttinterp.c
  69. 14
      src/truetype/ttobjs.c
  70. 4
      src/truetype/ttpic.c
  71. 14
      src/truetype/ttpload.c
  72. 4
      src/type1/t1afm.c
  73. 12
      src/type1/t1driver.c
  74. 8
      src/type1/t1gload.c
  75. 24
      src/type1/t1load.c
  76. 8
      src/type1/t1objs.c
  77. 6
      src/type1/t1parse.c
  78. 11
      src/type42/t42drivr.c
  79. 6
      src/type42/t42objs.c
  80. 4
      src/type42/t42parse.c
  81. 8
      src/winfonts/winfnt.c

8
ChangeLog
Unescape View File

@ -1,4 +1,10 @@
2013-03-13 Werner Lemberg <wl@gnu.org>
2013-03-14 Werner Lemberg <wl@gnu.org>
*/*: Use FT_Err_Ok only.
This is a purely mechanical conversion.
2013-03-14 Werner Lemberg <wl@gnu.org>
*/*: Use `FT_THROW'.

8
src/autofit/afcjk.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Auto-fitter hinting routines for CJK script (body). */
/* */
/* Copyright 2006-2012 by */
/* Copyright 2006-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -566,7 +566,7 @@
FT_Set_Charmap( face, oldmap );
return AF_Err_Ok;
return FT_Err_Ok;
}
@ -721,7 +721,7 @@
}
}
return AF_Err_Ok;
return FT_Err_Ok;
}
@ -895,7 +895,7 @@
AF_Dimension dim )
{
AF_AxisHints axis = &hints->axis[dim];
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = hints->memory;
AF_CJKAxis laxis = &((AF_CJKMetrics)hints->metrics)->axis[dim];

6
src/autofit/afdummy.c
Unescape View File

@ -5,7 +5,7 @@
/* Auto-fitter dummy routines to be used if no hinting should be */
/* performed (body). */
/* */
/* Copyright 2003-2005, 2011 by */
/* Copyright 2003-2005, 2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -28,7 +28,7 @@
{
af_glyph_hints_rescale( hints,
metrics );
return AF_Err_Ok;
return FT_Err_Ok;
}
@ -39,7 +39,7 @@
FT_UNUSED( hints );
FT_UNUSED( outline );
return AF_Err_Ok;
return FT_Err_Ok;
}

6
src/autofit/afglobal.c
Unescape View File

@ -55,7 +55,7 @@
static FT_Error
af_face_globals_compute_script_coverage( AF_FaceGlobals globals )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Face face = globals->face;
FT_CharMap old_charmap = face->charmap;
FT_Byte* gscripts = globals->glyph_scripts;
@ -75,7 +75,7 @@
* Ignore this error; we simply use the fallback script.
* XXX: Shouldn't we rather disable hinting?
*/
error = AF_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -237,7 +237,7 @@
FT_UInt script = options & 15;
const FT_Offset script_max = sizeof ( AF_SCRIPT_CLASSES_GET ) /
sizeof ( AF_SCRIPT_CLASSES_GET[0] );
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( gindex >= (FT_ULong)globals->glyph_count )

10
src/autofit/afhints.c
Unescape View File

@ -39,7 +39,7 @@
FT_Memory memory,
AF_Segment *asegment )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Segment segment = NULL;
@ -83,7 +83,7 @@
FT_Memory memory,
AF_Edge *anedge )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Edge edge = NULL;
AF_Edge edges;
@ -316,7 +316,7 @@
axis = &hints->axis[dim];
*num_segments = axis->num_segments;
return AF_Err_Ok;
return FT_Err_Ok;
}
#ifdef __cplusplus
}
@ -353,7 +353,7 @@
*offset = (dim == AF_DIMENSION_HORZ) ? seg->first->ox
: seg->first->oy;
return AF_Err_Ok;
return FT_Err_Ok;
}
#ifdef __cplusplus
}
@ -593,7 +593,7 @@
af_glyph_hints_reload( AF_GlyphHints hints,
FT_Outline* outline )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Point points;
FT_UInt old_max, new_max;
FT_Fixed x_scale = hints->x_scale;

4
src/autofit/afindic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Auto-fitter hinting routines for Indic scripts (body). */
/* */
/* Copyright 2007, 2011, 2012 by */
/* Copyright 2007, 2011-2013 by */
/* Rahul Bhalerao <rahul.bhalerao@redhat.com>, <b.rahul.pm@gmail.com>. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -56,7 +56,7 @@
FT_Set_Charmap( face, oldmap );
return AF_Err_Ok;
return FT_Err_Ok;
}

10
src/autofit/aflatin.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Auto-fitter hinting routines for latin script (body). */
/* */
/* Copyright 2003-2012 by */
/* Copyright 2003-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -561,7 +561,7 @@
}
FT_Set_Charmap( face, oldmap );
return AF_Err_Ok;
return FT_Err_Ok;
}
@ -795,7 +795,7 @@
{
AF_AxisHints axis = &hints->axis[dim];
FT_Memory memory = hints->memory;
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Segment segment = NULL;
AF_SegmentRec seg0;
AF_Point* contour = hints->contours;
@ -1107,7 +1107,7 @@
AF_Dimension dim )
{
AF_AxisHints axis = &hints->axis[dim];
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = hints->memory;
AF_LatinAxis laxis = &((AF_LatinMetrics)hints->metrics)->axis[dim];
@ -1583,7 +1583,7 @@
hints->scaler_flags = scaler_flags;
hints->other_flags = other_flags;
return AF_Err_Ok;
return FT_Err_Ok;
}

10
src/autofit/aflatin2.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Auto-fitter hinting routines for latin script (body). */
/* */
/* Copyright 2003-2012 by */
/* Copyright 2003-2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -475,7 +475,7 @@
af_latin2_metrics_init( AF_LatinMetrics metrics,
FT_Face face )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_CharMap oldmap = face->charmap;
FT_UInt ee;
@ -507,7 +507,7 @@
}
FT_Set_Charmap( face, oldmap );
return AF_Err_Ok;
return FT_Err_Ok;
}
@ -708,7 +708,7 @@
{
AF_AxisHints axis = &hints->axis[dim];
FT_Memory memory = hints->memory;
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Segment segment = NULL;
AF_SegmentRec seg0;
AF_Point* contour = hints->contours;
@ -1064,7 +1064,7 @@
AF_Dimension dim )
{
AF_AxisHints axis = &hints->axis[dim];
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = hints->memory;
AF_LatinAxis laxis = &((AF_LatinMetrics)hints->metrics)->axis[dim];

2
src/autofit/afloader.c
Unescape View File

@ -48,7 +48,7 @@
af_loader_reset( AF_Module module,
FT_Face face )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Loader loader = module->loader;

6
src/autofit/afmodule.c
Unescape View File

@ -50,7 +50,7 @@
AF_FaceGlobals* aglobals,
AF_Module module )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_FaceGlobals globals;
@ -84,7 +84,7 @@
const char* property_name,
const void* value )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Module module = (AF_Module)ft_module;
@ -121,7 +121,7 @@
const char* property_name,
void* value )
{
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AF_Module module = (AF_Module)ft_module;
FT_UInt fallback_script = module->fallback_script;

4
src/autofit/afpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for autofit module. */
/* */
/* Copyright 2009-2012 by */
/* Copyright 2009-2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -80,7 +80,7 @@
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_UInt ss;
FT_Error error = AF_Err_Ok;
FT_Error error = FT_Err_Ok;
AFModulePIC* container = NULL;
FT_Memory memory = library->memory;

14
src/bdf/bdfdrivr.c
Unescape View File

@ -72,7 +72,7 @@ THE SOFTWARE.
cmap->num_encodings = face->bdffont->glyphs_used;
cmap->encodings = face->en_table;
return BDF_Err_Ok;
return FT_Err_Ok;
}
@ -198,7 +198,7 @@ THE SOFTWARE.
static FT_Error
bdf_interpret_style( BDF_Face bdf )
{
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Face face = FT_FACE( bdf );
FT_Memory memory = face->memory;
bdf_font_t* font = bdf->bdffont;
@ -342,7 +342,7 @@ THE SOFTWARE.
FT_Int num_params,
FT_Parameter* params )
{
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
BDF_Face face = (BDF_Face)bdfface;
FT_Memory memory = FT_FACE_MEMORY( face );
@ -608,7 +608,7 @@ THE SOFTWARE.
size->metrics.descender = -bdffont->font_descent << 6;
size->metrics.max_advance = bdffont->bbx.width << 6;
return BDF_Err_Ok;
return FT_Err_Ok;
}
@ -630,13 +630,13 @@ THE SOFTWARE.
{
case FT_SIZE_REQUEST_TYPE_NOMINAL:
if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) )
error = BDF_Err_Ok;
error = FT_Err_Ok;
break;
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == ( bdffont->font_ascent +
bdffont->font_descent ) )
error = BDF_Err_Ok;
error = FT_Err_Ok;
break;
default:
@ -660,7 +660,7 @@ THE SOFTWARE.
{
BDF_Face bdf = (BDF_Face)FT_SIZE_FACE( size );
FT_Face face = FT_FACE( bdf );
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Bitmap* bitmap = &slot->bitmap;
bdf_glyph_t glyph;
int bpp = bdf->bdffont->bpp;

30
src/bdf/bdflib.c
Unescape View File

@ -254,7 +254,7 @@
{
hashnode* obp = ht->table, *bp, *nbp;
int i, sz = ht->size;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
ht->size <<= 1;
@ -283,7 +283,7 @@
FT_Memory memory )
{
int sz = INITIAL_HT_SIZE;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
ht->size = sz;
@ -324,7 +324,7 @@
{
hashnode nn;
hashnode* bp = hash_bucket( key, ht );
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
nn = *bp;
@ -457,7 +457,7 @@
_bdf_list_ensure( _bdf_list_t* list,
unsigned long num_items ) /* same as _bdf_list_t.used */
{
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( num_items > list->size )
@ -559,7 +559,7 @@
int mult, final_empty;
char *sp, *ep, *end;
char seps[32];
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
/* Initialize the list. */
@ -670,7 +670,7 @@
ptrdiff_t bytes, start, end, cursor, avail;
char* buf = 0;
FT_Memory memory = stream->memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( callback == 0 )
@ -1029,7 +1029,7 @@
size_t n;
bdf_property_t* p;
FT_Memory memory = font->memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
/* First check whether the property has */
@ -1135,7 +1135,7 @@
{
char* cp;
FT_Memory memory = font->memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( FT_RENEW_ARRAY( font->comments,
@ -1166,7 +1166,7 @@
char name[256];
_bdf_list_t list;
FT_Memory memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( font == 0 || font->name == 0 || font->name[0] == 0 )
@ -1299,7 +1299,7 @@
hashnode hn;
bdf_property_t *prop, *fp;
FT_Memory memory = font->memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
/* First, check whether the property already exists in the font. */
@ -1473,7 +1473,7 @@
bdf_font_t* font;
FT_Memory memory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( call_data );
FT_UNUSED( lineno ); /* only used in debug mode */
@ -1964,7 +1964,7 @@
char* name;
char* value;
char nbuf[128];
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( lineno );
@ -2070,7 +2070,7 @@
char *s;
FT_Memory memory = NULL;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( lineno ); /* only used in debug mode */
@ -2371,7 +2371,7 @@
_bdf_parse_t *p = NULL;
FT_Memory memory = extmemory;
FT_Error error = BDF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( FT_NEW( p ) )
@ -2491,7 +2491,7 @@
p->font->comments[p->font->comments_len] = 0;
}
}
else if ( error == BDF_Err_Ok )
else if ( error == FT_Err_Ok )
error = FT_THROW( Invalid_File_Format );
*font = p->font;

10
src/bzip2/ftbzip2.c
Unescape View File

@ -120,7 +120,7 @@
static FT_Error
ft_bzip2_check_header( FT_Stream stream )
{
FT_Error error = Bzip2_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte head[4];
@ -149,7 +149,7 @@
FT_Stream source )
{
bz_stream* bzstream = &zip->bzstream;
FT_Error error = Bzip2_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->stream = stream;
@ -273,7 +273,7 @@
bzstream->next_in = (char*)zip->input;
bzstream->avail_in = size;
return Bzip2_Err_Ok;
return FT_Err_Ok;
}
@ -281,7 +281,7 @@
ft_bzip2_file_fill_output( FT_BZip2File zip )
{
bz_stream* bzstream = &zip->bzstream;
FT_Error error = Bzip2_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->cursor = zip->buffer;
@ -325,7 +325,7 @@
ft_bzip2_file_skip_output( FT_BZip2File zip,
FT_ULong count )
{
FT_Error error = Bzip2_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ULong delta;

2
src/cache/ftccache.c vendored
Unescape View File

@ -492,7 +492,7 @@
FTC_Node* bucket;
FTC_Node* pnode;
FTC_Node node;
FT_Error error = FTC_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Bool list_changed = FALSE;
FTC_Node_CompareFunc compare = cache->clazz.node_compare;

5
src/cache/ftccache.h vendored
Unescape View File

@ -4,8 +4,7 @@
/* */
/* FreeType internal cache interface (specification). */
/* */
/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, */
/* 2011 by */
/* Copyright 2000-2007, 2009-2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -223,7 +222,7 @@ FT_BEGIN_HEADER
FT_Bool _list_changed = FALSE; \
\
\
error = FTC_Err_Ok; \
error = FT_Err_Ok; \
node = NULL; \
\
/* Go to the `top' node of the list sharing same masked hash */ \

4
src/cache/ftcmru.h vendored
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Simple MRU list-cache (specification). */
/* */
/* Copyright 2000-2001, 2003, 2004, 2005, 2006, 2010 by */
/* Copyright 2000-2001, 2003-2006, 2010, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -166,7 +166,7 @@ FT_BEGIN_HEADER
FTC_MruNode _first, _node; \
\
\
error = FTC_Err_Ok; \
error = FT_Err_Ok; \
_first = *(_pfirst); \
_node = NULL; \
\

2
src/cache/ftcsbits.c vendored
Unescape View File

@ -195,7 +195,7 @@
sbit->width = 255;
sbit->height = 0;
sbit->buffer = NULL;
error = FTC_Err_Ok;
error = FT_Err_Ok;
if ( asize )
*asize = 0;
}

16
src/cff/cffdrivr.c
Unescape View File

@ -115,7 +115,7 @@
if ( sfnt )
kerning->x = sfnt->get_kerning( face, left_glyph, right_glyph );
return CFF_Err_Ok;
return FT_Err_Ok;
}
@ -195,7 +195,7 @@
FT_Fixed* advances )
{
FT_UInt nn;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_GlyphSlot slot = face->glyph;
@ -252,7 +252,7 @@
if ( gname )
FT_STRCPYN( buffer, gname, buffer_max );
error = CFF_Err_Ok;
error = FT_Err_Ok;
Exit:
return error;
@ -321,7 +321,7 @@
PS_FontInfoRec* afont_info )
{
CFF_Font cff = (CFF_Font)face->extra.data;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( cff && cff->font_info == NULL )
@ -404,7 +404,7 @@
TT_CMapInfo *cmap_info )
{
FT_CMap cmap = FT_CMAP( charmap );
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Face face = FT_CMAP_FACE( cmap );
FT_Library library = FT_FACE_LIBRARY( face );
@ -445,7 +445,7 @@
const char* *ordering,
FT_Int *supplement )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
CFF_Font cff = (CFF_Font)face->extra.data;
@ -500,7 +500,7 @@
cff_get_is_cid( CFF_Face face,
FT_Bool *is_cid )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
CFF_Font cff = (CFF_Font)face->extra.data;
@ -524,7 +524,7 @@
FT_UInt glyph_index,
FT_UInt *cid )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
CFF_Font cff;

16
src/cff/cffgload.c
Unescape View File

@ -412,7 +412,7 @@
CFF_Builder *builder = &decoder->builder;
CFF_Font cff = (CFF_Font)builder->face->extra.data;
CFF_SubFont sub = &cff->top_font;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
/* manage CID fonts */
@ -522,7 +522,7 @@
if ( !builder->load_points )
{
outline->n_contours++;
return CFF_Err_Ok;
return FT_Err_Ok;
}
error = FT_GLYPHLOADER_CHECK_POINTS( builder->loader, 0, 1 );
@ -545,7 +545,7 @@
FT_Pos x,
FT_Pos y )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
/* test whether we are building a new contour */
@ -925,7 +925,7 @@
limit = zone->limit = charstring_base + charstring_len;
ip = zone->cursor = zone->base;
error = CFF_Err_Ok;
error = FT_Err_Ok;
x = builder->pos_x;
y = builder->pos_y;
@ -1968,7 +1968,7 @@
else
{
if ( !error )
error = CFF_Err_Ok;
error = FT_Err_Ok;
cff_builder_close_contour( builder );
@ -2526,7 +2526,7 @@
cff_compute_max_advance( TT_Face face,
FT_Int* max_advance )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
CFF_Decoder decoder;
FT_Int glyph_index;
CFF_Font cff = (CFF_Font)face->other;
@ -2564,12 +2564,12 @@
}
/* ignore the error if one has occurred -- skip to next glyph */
error = CFF_Err_Ok;
error = FT_Err_Ok;
}
*max_advance = decoder.builder.advance.x;
return CFF_Err_Ok;
return FT_Err_Ok;
}

12
src/cff/cffload.c
Unescape View File

@ -318,7 +318,7 @@
static FT_Error
cff_index_load_offsets( CFF_Index idx )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Stream stream = idx->stream;
FT_Memory memory = stream->memory;
@ -384,7 +384,7 @@
FT_Byte*** table,
FT_Byte** pool )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = idx->stream->memory;
FT_Byte** t = NULL;
@ -472,7 +472,7 @@
FT_Byte** pbytes,
FT_ULong* pbyte_len )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( idx && idx->count > element )
@ -781,7 +781,7 @@
FT_UInt num_glyphs,
FT_Memory memory )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt i;
FT_Long j;
FT_UShort max_cid = 0;
@ -860,7 +860,7 @@
FT_Bool invert )
{
FT_Memory memory = stream->memory;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UShort glyph_sid;
@ -1058,7 +1058,7 @@
FT_ULong base_offset,
FT_ULong offset )
{
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt count;
FT_UInt j;
FT_UShort glyph_sid;

14
src/cff/cffobjs.c
Unescape View File

@ -153,7 +153,7 @@
cff_size_init( FT_Size cffsize ) /* CFF_Size */
{
CFF_Size size = (CFF_Size)cffsize;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
PSH_Globals_Funcs funcs = cff_size_get_globals_funcs( size );
@ -253,7 +253,7 @@
}
}
return CFF_Err_Ok;
return FT_Err_Ok;
}
#endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */
@ -325,7 +325,7 @@
}
}
return CFF_Err_Ok;
return FT_Err_Ok;
}
@ -367,7 +367,7 @@
}
}
return CFF_Err_Ok;
return FT_Err_Ok;
}
@ -524,7 +524,7 @@
/* if we are performing a simple font format check, exit immediately */
if ( face_index < 0 )
return CFF_Err_Ok;
return FT_Err_Ok;
sfnt_format = 1;
@ -559,7 +559,7 @@
/* rewind to start of file; we are going to load a pure-CFF font */
if ( FT_STREAM_SEEK( 0 ) )
goto Exit;
error = CFF_Err_Ok;
error = FT_Err_Ok;
}
/* now load and parse the CFF table in the file */
@ -1050,7 +1050,7 @@
{
FT_UNUSED( module );
return CFF_Err_Ok;
return FT_Err_Ok;
}

12
src/cff/cffparse.c
Unescape View File

@ -523,7 +523,7 @@
FT_Long scaling;
error = CFF_Err_Ok;
error = FT_Err_Ok;
dict->has_font_matrix = TRUE;
@ -596,7 +596,7 @@
bbox->yMin = FT_RoundFix( cff_parse_fixed( data++ ) );
bbox->xMax = FT_RoundFix( cff_parse_fixed( data++ ) );
bbox->yMax = FT_RoundFix( cff_parse_fixed( data ) );
error = CFF_Err_Ok;
error = FT_Err_Ok;
FT_TRACE4(( " [%d %d %d %d]\n",
bbox->xMin / 65536,
@ -626,7 +626,7 @@
FT_TRACE4(( " %lu %lu\n",
dict->private_size, dict->private_offset ));
error = CFF_Err_Ok;
error = FT_Err_Ok;
}
return error;
@ -653,7 +653,7 @@
if ( dict->cid_supplement < 0 )
FT_TRACE1(( "cff_parse_cid_ros: negative supplement %d is found\n",
dict->cid_supplement ));
error = CFF_Err_Ok;
error = FT_Err_Ok;
FT_TRACE4(( " %d %d %d\n",
dict->cid_registry,
@ -922,7 +922,7 @@
*output_class = clazz;
return CFF_Err_Ok;
return FT_Err_Ok;
}
@ -935,7 +935,7 @@
FT_Byte* limit )
{
FT_Byte* p = start;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Library library = parser->library;
FT_UNUSED( library );

4
src/cff/cffpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for cff module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -102,7 +102,7 @@
cff_driver_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = CFF_Err_Ok;
FT_Error error = FT_Err_Ok;
CffModulePIC* container = NULL;
FT_Memory memory = library->memory;

4
src/cid/cidgload.c
Unescape View File

@ -46,7 +46,7 @@
FT_Byte* p;
FT_UInt fd_select;
FT_Stream stream = face->cid_stream;
FT_Error error = CID_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* charstring = 0;
FT_Memory memory = face->root.memory;
FT_ULong glyph_length = 0;
@ -258,7 +258,7 @@
psaux->t1_decoder_funcs->done( &decoder );
return CID_Err_Ok;
return FT_Err_Ok;
}

10
src/cid/cidload.c
Unescape View File

@ -195,7 +195,7 @@
offset->y = temp[5] >> 16;
}
return CID_Err_Ok; /* this is a callback function; */
return FT_Err_Ok; /* this is a callback function; */
/* we must return an error code */
}
@ -206,7 +206,7 @@
{
CID_FaceInfo cid = &face->cid;
FT_Memory memory = face->root.memory;
FT_Error error = CID_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Long num_dicts;
@ -257,7 +257,7 @@
dict->private_dict.expansion_factor = dict->expansion_factor;
}
return CID_Err_Ok;
return FT_Err_Ok;
}
@ -286,7 +286,7 @@
parser->root.cursor = base;
parser->root.limit = base + size;
parser->root.error = CID_Err_Ok;
parser->root.error = FT_Err_Ok;
{
FT_Byte* cur = base;
@ -624,7 +624,7 @@
p++;
}
error = CID_Err_Ok;
error = FT_Err_Ok;
Exit:
return error;

6
src/cid/cidobjs.c
Unescape View File

@ -131,7 +131,7 @@
cid_size_init( FT_Size cidsize ) /* CID_Size */
{
CID_Size size = (CID_Size)cidsize;
FT_Error error = CID_Err_Ok;
FT_Error error = FT_Err_Ok;
PSH_Globals_Funcs funcs = cid_size_get_globals_funcs( size );
@ -169,7 +169,7 @@
size->metrics.y_scale,
0, 0 );
return CID_Err_Ok;
return FT_Err_Ok;
}
@ -466,7 +466,7 @@
{
FT_UNUSED( driver );
return CID_Err_Ok;
return FT_Err_Ok;
}

12
src/cid/cidriver.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* CID driver interface (body). */
/* */
/* Copyright 1996-2004, 2006, 2008, 2009, 2011 by */
/* Copyright 1996-2004, 2006, 2008, 2009, 2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -74,7 +74,7 @@
{
*afont_info = ((CID_Face)face)->cid.font_info;
return CID_Err_Ok;
return FT_Err_Ok;
}
static FT_Error
@ -83,7 +83,7 @@
{
*afont_extra = ((CID_Face)face)->font_extra;
return CID_Err_Ok;
return FT_Err_Ok;
}
static const FT_Service_PsInfoRec cid_service_ps_info =
@ -118,7 +118,7 @@
if ( supplement )
*supplement = cid->supplement;
return CID_Err_Ok;
return FT_Err_Ok;
}
@ -126,7 +126,7 @@
cid_get_is_cid( CID_Face face,
FT_Bool *is_cid )
{
FT_Error error = CID_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( face );
@ -142,7 +142,7 @@
FT_UInt glyph_index,
FT_UInt *cid )
{
FT_Error error = CID_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( face );

4
src/gxvalid/gxvcommn.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* TrueTypeGX/AAT common tables validation (body). */
/* */
/* Copyright 2004, 2005, 2009, 2010 */
/* Copyright 2004, 2005, 2009, 2010, 2013 */
/* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
@ -900,7 +900,7 @@
nnames = FT_Get_Sfnt_Name_Count( valid->face );
for ( i = 0; i < nnames; i++ )
{
if ( FT_Get_Sfnt_Name( valid->face, i, &name ) != GXV_Err_Ok )
if ( FT_Get_Sfnt_Name( valid->face, i, &name ) != FT_Err_Ok )
continue ;
if ( name.name_id == name_index )

6
src/gxvalid/gxvmod.c
Unescape View File

@ -59,7 +59,7 @@
error = FT_Load_Sfnt_Table( face, tag, 0, NULL, table_len );
if ( FT_ERROR_BASE( error ) == FT_Err_Table_Missing )
return GXV_Err_Ok;
return FT_Err_Ok;
if ( error )
goto Exit;
@ -112,7 +112,7 @@
{
FT_Memory volatile memory = FT_FACE_MEMORY( face );
FT_Error error = GXV_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ValidatorRec volatile valid;
FT_UInt i;
@ -200,7 +200,7 @@
/* without volatile on `error' GCC 4.1.1. emits: */
/* warning: variable 'error' might be clobbered by 'longjmp' or 'vfork' */
/* this warning seems spurious but --- */
FT_Error volatile error = GXV_Err_Ok;
FT_Error volatile error = FT_Err_Ok;
FT_ValidatorRec volatile valid;

10
src/gzip/ftgzip.c
Unescape View File

@ -262,7 +262,7 @@
FT_Stream source )
{
z_stream* zstream = &zip->zstream;
FT_Error error = Gzip_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->stream = stream;
@ -383,7 +383,7 @@
zstream->next_in = zip->input;
zstream->avail_in = size;
return Gzip_Err_Ok;
return FT_Err_Ok;
}
@ -391,7 +391,7 @@
ft_gzip_file_fill_output( FT_GZipFile zip )
{
z_stream* zstream = &zip->zstream;
FT_Error error = Gzip_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->cursor = zip->buffer;
@ -435,7 +435,7 @@
ft_gzip_file_skip_output( FT_GZipFile zip,
FT_ULong count )
{
FT_Error error = Gzip_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ULong delta;
@ -657,7 +657,7 @@
ft_gzip_file_io( zip, 0, NULL, 0 );
FT_FREE( zip_buff );
}
error = Gzip_Err_Ok;
error = FT_Err_Ok;
}
}

6
src/lzw/ftlzw.c
Unescape View File

@ -111,7 +111,7 @@
FT_Stream source )
{
FT_LzwState lzw = &zip->lzw;
FT_Error error = LZW_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->stream = stream;
@ -172,7 +172,7 @@
{
FT_LzwState lzw = &zip->lzw;
FT_ULong count;
FT_Error error = LZW_Err_Ok;
FT_Error error = FT_Err_Ok;
zip->cursor = zip->buffer;
@ -193,7 +193,7 @@
ft_lzw_file_skip_output( FT_LZWFile zip,
FT_ULong count )
{
FT_Error error = LZW_Err_Ok;
FT_Error error = FT_Err_Ok;
/* first, we skip what we can from the output buffer */

4
src/otvalid/otvmod.c
Unescape View File

@ -50,7 +50,7 @@
error = FT_Load_Sfnt_Table( face, tag, 0, NULL, table_len );
if ( FT_ERROR_BASE( error ) == FT_Err_Table_Missing )
return OTV_Err_Ok;
return FT_Err_Ok;
if ( error )
goto Exit;
@ -73,7 +73,7 @@
FT_Bytes *ot_gsub,
FT_Bytes *ot_jstf )
{
FT_Error error = OTV_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* volatile base;
FT_Byte* volatile gdef;
FT_Byte* volatile gpos;

12
src/pcf/pcfdrivr.c
Unescape View File

@ -83,7 +83,7 @@ THE SOFTWARE.
cmap->num_encodings = (FT_UInt)face->nencodings;
cmap->encodings = face->encodings;
return PCF_Err_Ok;
return FT_Err_Ok;
}
@ -264,7 +264,7 @@ THE SOFTWARE.
FT_Parameter* params )
{
PCF_Face face = (PCF_Face)pcfface;
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( num_params );
FT_UNUSED( params );
@ -424,7 +424,7 @@ THE SOFTWARE.
size->metrics.descender = -accel->fontDescent << 6;
size->metrics.max_advance = accel->maxbounds.characterWidth << 6;
return PCF_Err_Ok;
return FT_Err_Ok;
}
@ -445,13 +445,13 @@ THE SOFTWARE.
{
case FT_SIZE_REQUEST_TYPE_NOMINAL:
if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) )
error = PCF_Err_Ok;
error = FT_Err_Ok;
break;
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == ( face->accel.fontAscent +
face->accel.fontDescent ) )
error = PCF_Err_Ok;
error = FT_Err_Ok;
break;
default:
@ -474,7 +474,7 @@ THE SOFTWARE.
{
PCF_Face face = (PCF_Face)FT_SIZE_FACE( size );
FT_Stream stream;
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Bitmap* bitmap = &slot->bitmap;
PCF_Metric metric;
FT_Offset bytes;

20
src/pcf/pcfread.c
Unescape View File

@ -181,7 +181,7 @@ THE SOFTWARE.
#endif
return PCF_Err_Ok;
return FT_Err_Ok;
Exit:
FT_FREE( face->toc.tables );
@ -248,7 +248,7 @@ THE SOFTWARE.
FT_ULong format,
PCF_Metric metric )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( PCF_FORMAT_MATCH( format, PCF_DEFAULT_FORMAT ) )
@ -316,7 +316,7 @@ THE SOFTWARE.
*asize = tables[i].size;
*aformat = tables[i].format;
return PCF_Err_Ok;
return FT_Err_Ok;
}
Fail:
@ -552,7 +552,7 @@ THE SOFTWARE.
}
}
error = PCF_Err_Ok;
error = FT_Err_Ok;
Bail:
FT_FREE( props );
@ -566,7 +566,7 @@ THE SOFTWARE.
pcf_get_metrics( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
FT_ULong format, size;
PCF_Metric metrics = 0;
@ -663,7 +663,7 @@ THE SOFTWARE.
pcf_get_bitmaps( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
FT_Long* offsets = NULL;
FT_Long bitmapSizes[GLYPHPADOPTIONS];
@ -765,7 +765,7 @@ THE SOFTWARE.
pcf_get_encodings( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
FT_ULong format, size;
int firstCol, lastCol;
@ -914,7 +914,7 @@ THE SOFTWARE.
FT_ULong type )
{
FT_ULong format, size;
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
PCF_Accel accel = &face->accel;
@ -985,7 +985,7 @@ THE SOFTWARE.
static FT_Error
pcf_interpret_style( PCF_Face pcf )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Face face = FT_FACE( pcf );
FT_Memory memory = face->memory;
@ -1096,7 +1096,7 @@ THE SOFTWARE.
pcf_load_font( FT_Stream stream,
PCF_Face face )
{
FT_Error error = PCF_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = FT_FACE(face)->memory;
FT_Bool hasBDFAccelerators;

2
src/pfr/pfrcmap.c
Unescape View File

@ -27,7 +27,7 @@
FT_CALLBACK_DEF( FT_Error )
pfr_cmap_init( PFR_CMap cmap )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
PFR_Face face = (PFR_Face)FT_CMAP_FACE( cmap );

8
src/pfr/pfrdrivr.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* FreeType PFR driver interface (body). */
/* */
/* Copyright 2002-2004, 2006, 2008, 2010, 2011 by */
/* Copyright 2002-2004, 2006, 2008, 2010, 2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -51,7 +51,7 @@
phys->metrics_resolution );
}
return PFR_Err_Ok;
return FT_Err_Ok;
}
@ -84,7 +84,7 @@
if ( gindex < phys->num_chars )
{
*anadvance = phys->chars[gindex].advance;
error = PFR_Err_Ok;
error = FT_Err_Ok;
}
}
@ -130,7 +130,7 @@
if ( ametrics_y_scale )
*ametrics_y_scale = y_scale;
return PFR_Err_Ok;
return FT_Err_Ok;
}

4
src/pfr/pfrgload.c
Unescape View File

@ -248,7 +248,7 @@
FT_Byte* p,
FT_Byte* limit )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = glyph->loader->memory;
FT_UInt flags, x_count, y_count, i, count, mask;
FT_Int x;
@ -558,7 +558,7 @@
FT_Byte* p,
FT_Byte* limit )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_GlyphLoader loader = glyph->loader;
FT_Memory memory = loader->memory;
PFR_SubGlyph subglyph;

12
src/pfr/pfrload.c
Unescape View File

@ -49,7 +49,7 @@
PFR_ExtraItem item_list,
FT_Pointer item_data )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* p = *pp;
FT_UInt num_items, item_type, item_size;
@ -353,7 +353,7 @@
PFR_Strike strike;
FT_UInt flags0;
FT_UInt n, count, size1;
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
PFR_CHECK( 5 );
@ -449,7 +449,7 @@
FT_Byte* limit,
PFR_PhyFont phy_font )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = phy_font->memory;
FT_PtrDist len = limit - p;
@ -477,7 +477,7 @@
{
FT_UInt count, num_vert, num_horz;
FT_Int* snaps = NULL;
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = phy_font->memory;
@ -521,7 +521,7 @@
PFR_PhyFont phy_font )
{
PFR_KernItem item = NULL;
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = phy_font->memory;
@ -631,7 +631,7 @@
FT_Memory memory,
FT_String* *astring )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_String* result = NULL;
FT_UInt n, ok;

2
src/pfr/pfrobjs.c
Unescape View File

@ -468,7 +468,7 @@
FT_Vector* kerning )
{
PFR_Face face = (PFR_Face)pfrface;
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
PFR_PhyFont phy_font = &face->phy_font;
FT_UInt32 code1, code2, pair;

4
src/pfr/pfrsbit.c
Unescape View File

@ -353,7 +353,7 @@
FT_Long *aadvance,
FT_UInt *aformat )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte flags;
FT_Char b;
FT_Byte* p = *pdata;
@ -484,7 +484,7 @@
FT_Bool decreasing,
FT_Bitmap* target )
{
FT_Error error = PFR_Err_Ok;
FT_Error error = FT_Err_Ok;
PFR_BitWriterRec writer;

14
src/psaux/afmparse.c
Unescape View File

@ -546,7 +546,7 @@
parser->FontInfo = NULL;
parser->get_index = NULL;
return PSaux_Err_Ok;
return FT_Err_Ok;
}
@ -573,7 +573,7 @@
{
*aint = val.u.i;
return PSaux_Err_Ok;
return FT_Err_Ok;
}
else
return FT_THROW( Syntax_Error );
@ -638,7 +638,7 @@
case AFM_TOKEN_ENDKERNDATA:
case AFM_TOKEN_ENDFONTMETRICS:
fi->NumTrackKern = n + 1;
return PSaux_Err_Ok;
return FT_Err_Ok;
case AFM_TOKEN_UNKNOWN:
break;
@ -754,7 +754,7 @@
ft_qsort( fi->KernPairs, fi->NumKernPair,
sizeof ( AFM_KernPairRec ),
afm_compare_kern_pairs );
return PSaux_Err_Ok;
return FT_Err_Ok;
case AFM_TOKEN_UNKNOWN:
break;
@ -796,7 +796,7 @@
case AFM_TOKEN_ENDKERNDATA:
case AFM_TOKEN_ENDFONTMETRICS:
return PSaux_Err_Ok;
return FT_Err_Ok;
case AFM_TOKEN_UNKNOWN:
break;
@ -833,7 +833,7 @@
if ( token == end_section || token == AFM_TOKEN_ENDFONTMETRICS )
return PSaux_Err_Ok;
return FT_Err_Ok;
}
Fail:
@ -939,7 +939,7 @@
/* fall through since we only support kern data */
case AFM_TOKEN_ENDFONTMETRICS:
return PSaux_Err_Ok;
return FT_Err_Ok;
default:
break;

30
src/psaux/psobjs.c
Unescape View File

@ -138,7 +138,7 @@
table->capacity = new_size;
return PSaux_Err_Ok;
return FT_Err_Ok;
}
@ -216,7 +216,7 @@
FT_MEM_COPY( table->block + table->cursor, object, length );
table->cursor += length;
return PSaux_Err_Ok;
return FT_Err_Ok;
}
@ -397,7 +397,7 @@
embed--;
if ( embed == 0 )
{
error = PSaux_Err_Ok;
error = FT_Err_Ok;
break;
}
}
@ -416,7 +416,7 @@
FT_Byte* limit )
{
FT_Byte* cur = *acur;
FT_Error err = PSaux_Err_Ok;
FT_Error err = FT_Err_Ok;
while ( ++cur < limit )
@ -456,12 +456,12 @@
{
FT_Byte* cur;
FT_Int embed = 0;
FT_Error error = PSaux_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ASSERT( **acur == '{' );
for ( cur = *acur; cur < limit && error == PSaux_Err_Ok; ++cur )
for ( cur = *acur; cur < limit && error == FT_Err_Ok; ++cur )
{
switch ( *cur )
{
@ -519,7 +519,7 @@
FT_Byte* cur = parser->cursor;
FT_Byte* limit = parser->limit;
FT_Error error = PSaux_Err_Ok;
FT_Error error = FT_Err_Ok;
skip_spaces( &cur, limit ); /* this also skips comments */
@ -644,7 +644,7 @@
token->type = T1_TOKEN_TYPE_STRING;
token->start = cur;
if ( skip_literal_string( &cur, limit ) == PSaux_Err_Ok )
if ( skip_literal_string( &cur, limit ) == FT_Err_Ok )
token->limit = cur;
break;
@ -653,7 +653,7 @@
token->type = T1_TOKEN_TYPE_ARRAY;
token->start = cur;
if ( skip_procedure( &cur, limit ) == PSaux_Err_Ok )
if ( skip_procedure( &cur, limit ) == FT_Err_Ok )
token->limit = cur;
break;
@ -1276,7 +1276,7 @@
FT_UNUSED( pflags );
#endif
error = PSaux_Err_Ok;
error = FT_Err_Ok;
Exit:
return error;
@ -1300,7 +1300,7 @@
T1_TokenRec elements[T1_MAX_TABLE_ELEMENTS];
T1_Token token;
FT_Int num_elements;
FT_Error error = PSaux_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* old_cursor;
FT_Byte* old_limit;
T1_FieldRec fieldrec = *(T1_Field)field;
@ -1372,7 +1372,7 @@
FT_Long* pnum_bytes,
FT_Bool delimiters )
{
FT_Error error = PSaux_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* cur;
@ -1474,7 +1474,7 @@
FT_Byte* limit,
FT_Memory memory )
{
parser->error = PSaux_Err_Ok;
parser->error = FT_Err_Ok;
parser->base = base;
parser->limit = limit;
parser->cursor = base;
@ -1653,7 +1653,7 @@
if ( !builder->load_points )
{
outline->n_contours++;
return PSaux_Err_Ok;
return FT_Err_Ok;
}
error = FT_GLYPHLOADER_CHECK_POINTS( builder->loader, 0, 1 );
@ -1682,7 +1682,7 @@
/* test whether we are building a new contour */
if ( builder->parse_state == T1_Parse_Have_Path )
error = PSaux_Err_Ok;
error = FT_Err_Ok;
else
{
builder->parse_state = T1_Parse_Have_Path;

34
src/psaux/t1decode.c
Unescape View File

@ -415,7 +415,7 @@
limit = zone->limit = charstring_base + charstring_len;
ip = zone->cursor = zone->base;
error = PSaux_Err_Ok;
error = FT_Err_Ok;
x = orig_x = builder->pos_x;
y = orig_y = builder->pos_y;
@ -756,9 +756,9 @@
decoder->flex_state = 1;
decoder->num_flex_vectors = 0;
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok ||
!= FT_Err_Ok ||
( error = t1_builder_check_points( builder, 6 ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
break;
@ -1129,7 +1129,7 @@
FT_TRACE4(( "\n" ));
/* return now! */
return PSaux_Err_Ok;
return FT_Err_Ok;
case op_hsbw:
FT_TRACE4(( " hsbw" ));
@ -1149,7 +1149,7 @@
/* the glyph's metrics (lsb + advance width), not load the */
/* rest of it; so exit immediately */
if ( builder->metrics_only )
return PSaux_Err_Ok;
return FT_Err_Ok;
break;
@ -1178,7 +1178,7 @@
/* the glyph's metrics (lsb + advance width), not load the */
/* rest of it; so exit immediately */
if ( builder->metrics_only )
return PSaux_Err_Ok;
return FT_Err_Ok;
break;
@ -1197,7 +1197,7 @@
FT_TRACE4(( " hlineto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
x += top[0];
@ -1219,9 +1219,9 @@
FT_TRACE4(( " hvcurveto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok ||
!= FT_Err_Ok ||
( error = t1_builder_check_points( builder, 3 ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
x += top[0];
@ -1237,7 +1237,7 @@
FT_TRACE4(( " rlineto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
x += top[0];
@ -1245,7 +1245,7 @@
Add_Line:
if ( ( error = t1_builder_add_point1( builder, x, y ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
break;
@ -1266,9 +1266,9 @@
FT_TRACE4(( " rrcurveto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok ||
!= FT_Err_Ok ||
( error = t1_builder_check_points( builder, 3 ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
x += top[0];
@ -1288,9 +1288,9 @@
FT_TRACE4(( " vhcurveto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok ||
!= FT_Err_Ok ||
( error = t1_builder_check_points( builder, 3 ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
y += top[0];
@ -1306,7 +1306,7 @@
FT_TRACE4(( " vlineto" ));
if ( ( error = t1_builder_start_point( builder, x, y ) )
!= PSaux_Err_Ok )
!= FT_Err_Ok )
goto Fail;
y += top[0];
@ -1605,7 +1605,7 @@
decoder->funcs = t1_decoder_funcs;
return PSaux_Err_Ok;
return FT_Err_Ok;
}

2
src/pshinter/pshalgo.c
Unescape View File

@ -2193,7 +2193,7 @@
/* something to do? */
if ( outline->n_points == 0 || outline->n_contours == 0 )
return PSH_Err_Ok;
return FT_Err_Ok;
#ifdef DEBUG_HINTER

4
src/pshinter/pshpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for pshinter module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -49,7 +49,7 @@
pshinter_module_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
PSHinterPIC* container = NULL;
FT_Memory memory = library->memory;

38
src/pshinter/pshrec.c
Unescape View File

@ -64,7 +64,7 @@
{
FT_UInt old_max = table->max_hints;
FT_UInt new_max = count;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( new_max > old_max )
@ -83,7 +83,7 @@
FT_Memory memory,
PS_Hint *ahint )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt count;
PS_Hint hint = 0;
@ -139,7 +139,7 @@
{
FT_UInt old_max = ( mask->max_bits + 7 ) >> 3;
FT_UInt new_max = ( count + 7 ) >> 3;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( new_max > old_max )
@ -186,7 +186,7 @@
FT_Int idx,
FT_Memory memory )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* p;
@ -236,7 +236,7 @@
{
FT_UInt old_max = table->max_masks;
FT_UInt new_max = count;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( new_max > old_max )
@ -256,7 +256,7 @@
PS_Mask *amask )
{
FT_UInt count;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
PS_Mask mask = 0;
@ -287,7 +287,7 @@
FT_Memory memory,
PS_Mask *amask )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt count;
PS_Mask mask;
@ -316,7 +316,7 @@
FT_UInt bit_count,
FT_Memory memory )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
PS_Mask mask;
@ -409,7 +409,7 @@
FT_Memory memory )
{
FT_UInt temp;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
/* swap index1 and index2 so that index1 < index2 */
@ -499,7 +499,7 @@
FT_Memory memory )
{
FT_Int index1, index2;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
for ( index1 = table->num_masks - 1; index1 > 0; index1-- )
@ -561,7 +561,7 @@
FT_Memory memory )
{
PS_Mask mask;
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
/* get last hint mask */
@ -621,7 +621,7 @@
FT_UInt end_point,
FT_Memory memory )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
/* reset current mask, if any */
@ -646,7 +646,7 @@
FT_Memory memory,
FT_Int *aindex )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt flags = 0;
@ -717,7 +717,7 @@
FT_Int hint3,
FT_Memory memory )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt count = dim->counters.num_masks;
PS_Mask counter = dim->counters.masks;
@ -791,7 +791,7 @@
ps_dimension_done( &hints->dimension[0], memory );
ps_dimension_done( &hints->dimension[1], memory );
hints->error = PSH_Err_Ok;
hints->error = FT_Err_Ok;
hints->memory = 0;
}
@ -802,7 +802,7 @@
{
FT_MEM_ZERO( hints, sizeof ( *hints ) );
hints->memory = memory;
return PSH_Err_Ok;
return FT_Err_Ok;
}
@ -815,7 +815,7 @@
{
case PS_HINT_TYPE_1:
case PS_HINT_TYPE_2:
hints->error = PSH_Err_Ok;
hints->error = FT_Err_Ok;
hints->hint_type = hint_type;
ps_dimension_init( &hints->dimension[0] );
@ -894,7 +894,7 @@
FT_Int dimension,
FT_Fixed* stems )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( !hints->error )
@ -956,7 +956,7 @@
ps_hints_t1reset( PS_Hints hints,
FT_UInt end_point )
{
FT_Error error = PSH_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( !hints->error )

2
src/psnames/psmodule.c
Unescape View File

@ -378,7 +378,7 @@
if ( count < num_glyphs / 2 )
{
(void)FT_RENEW_ARRAY( table->maps, num_glyphs, count );
error = PSnames_Err_Ok;
error = FT_Err_Ok;
}
/* Sort the table in increasing order of unicode values, */

4
src/psnames/pspic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for psnames module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -64,7 +64,7 @@
psnames_module_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = PSnames_Err_Ok;
FT_Error error = FT_Err_Ok;
PSModulePIC* container = NULL;
FT_Memory memory = library->memory;

2
src/raster/ftraster.c
Unescape View File

@ -235,7 +235,7 @@
#include "rasterrs.h"
#define Raster_Err_None Raster_Err_Ok
#define Raster_Err_None FT_Err_Ok
#define Raster_Err_Not_Ini Raster_Err_Raster_Uninitialized
#define Raster_Err_Overflow Raster_Err_Raster_Overflow
#define Raster_Err_Neg_Height Raster_Err_Raster_Negative_Height

4
src/raster/ftrend1.c
Unescape View File

@ -38,7 +38,7 @@
library->raster_pool,
library->raster_pool_size );
return Raster_Err_Ok;
return FT_Err_Ok;
}
@ -62,7 +62,7 @@
const FT_Matrix* matrix,
const FT_Vector* delta )
{
FT_Error error = Raster_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( slot->format != render->glyph_format )

4
src/raster/rastpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for raster module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -50,7 +50,7 @@
ft_raster1_renderer_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = Raster_Err_Ok;
FT_Error error = FT_Err_Ok;
RasterPIC* container = NULL;
FT_Memory memory = library->memory;

8
src/sfnt/sfdriver.c
Unescape View File

@ -133,7 +133,7 @@
*length = face->dir_tables[idx].Length;
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -257,7 +257,7 @@
FT_Memory memory = face->root.memory;
TT_NameEntryRec* name = face->name_table.names + found_win;
FT_UInt len = name->stringLength / 2;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( error );
@ -299,7 +299,7 @@
FT_Memory memory = face->root.memory;
TT_NameEntryRec* name = face->name_table.names + found_apple;
FT_UInt len = name->stringLength;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( error );
@ -567,7 +567,7 @@
FT_UNUSED( face );
FT_UNUSED( cmap );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
#endif /* FT_CONFIG_OPTION_OLD_INTERNALS */

4
src/sfnt/sfntpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for sfnt module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -102,7 +102,7 @@
sfnt_module_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
sfntModulePIC* container = NULL;
FT_Memory memory = library->memory;

12
src/sfnt/sfobjs.c
Unescape View File

@ -145,7 +145,7 @@
FT_String** name )
{
FT_Memory memory = face->root.memory;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_String* result = NULL;
FT_UShort n;
TT_NameEntryRec* rec;
@ -668,7 +668,7 @@
get_glyph_metrics )
{
face->horizontal.number_Of_HMetrics = 0;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
}
#endif
}
@ -681,7 +681,7 @@
FT_TRACE2(( "This is an SFNT Mac font.\n" ));
has_outline = 0;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
}
else
{
@ -695,7 +695,7 @@
get_glyph_metrics )
{
face->horizontal.number_Of_HMetrics = 0;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
}
#endif
@ -737,7 +737,7 @@
/* still valid (although rather useless in most cases); */
/* however, you can find such stripped fonts in PDFs */
if ( error == SFNT_Err_Table_Missing )
error = SFNT_Err_Ok;
error = FT_Err_Ok;
else
goto Exit;
}
@ -812,7 +812,7 @@
FT_FACE_FLAG_HORIZONTAL; /* horizontal data */
#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
if ( psnames_error == SFNT_Err_Ok &&
if ( psnames_error == FT_Err_Ok &&
face->postscript.FormatType != 0x00030000L )
flags |= FT_FACE_FLAG_GLYPH_NAMES;
#endif

8
src/sfnt/ttbdf.c
Unescape View File

@ -143,7 +143,7 @@
{
TT_BDF bdf = &face->bdf;
FT_Size size = FT_FACE(face)->size;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* p;
FT_UInt count;
FT_Byte* strike;
@ -215,7 +215,7 @@
{
aprop->type = BDF_PROPERTY_TYPE_ATOM;
aprop->u.atom = (const char*)bdf->strings + value;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
break;
@ -223,13 +223,13 @@
case 0x02:
aprop->type = BDF_PROPERTY_TYPE_INTEGER;
aprop->u.integer = (FT_Int32)value;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
case 0x03:
aprop->type = BDF_PROPERTY_TYPE_CARDINAL;
aprop->u.cardinal = value;
error = SFNT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
default:

54
src/sfnt/ttcmap.c
Unescape View File

@ -56,7 +56,7 @@
FT_Byte* table )
{
cmap->data = table;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -110,7 +110,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -161,7 +161,7 @@
cmap_info->format = 0;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -369,7 +369,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -541,7 +541,7 @@
cmap_info->format = 2;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -670,7 +670,7 @@
cmap->cur_charcode = (FT_UInt32)0xFFFFFFFFUL;
cmap->cur_gindex = 0;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -820,7 +820,7 @@
FT_UInt length = TT_NEXT_USHORT( p );
FT_Byte *ends, *starts, *offsets, *deltas, *glyph_ids;
FT_UInt num_segs;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( length < 16 )
@ -1381,7 +1381,7 @@
cmap_info->format = 4;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1468,7 +1468,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1544,7 +1544,7 @@
cmap_info->format = 6;
cmap_info->language = (FT_ULong)TT_PEEK_USHORT( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1716,7 +1716,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1801,7 +1801,7 @@
cmap_info->format = 8;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1887,7 +1887,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -1954,7 +1954,7 @@
cmap_info->format = 10;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2034,7 +2034,7 @@
cmap->valid = 0;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2087,7 +2087,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2278,7 +2278,7 @@
cmap_info->format = 12;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2358,7 +2358,7 @@
cmap->valid = 0;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2411,7 +2411,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2597,7 +2597,7 @@
cmap_info->format = 13;
cmap_info->language = (FT_ULong)TT_PEEK_ULONG( p );
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2720,7 +2720,7 @@
FT_Memory memory )
{
FT_UInt32 old_max = cmap->max_results;
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( num_results > cmap->max_results )
@ -2748,7 +2748,7 @@
cmap->max_results = 0;
cmap->results = NULL;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2850,7 +2850,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -2888,7 +2888,7 @@
/* subtable 14 does not define a language field */
cmap_info->language = 0xFFFFFFFFUL;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -3420,7 +3420,7 @@
clazz[i] = NULL;
*output_class = clazz;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
#endif /*FT_CONFIG_OPTION_PIC*/
@ -3490,7 +3490,7 @@
if ( clazz->format == format )
{
volatile TT_ValidatorRec valid;
volatile FT_Error error = SFNT_Err_Ok;
volatile FT_Error error = FT_Err_Ok;
ft_validator_init( FT_VALIDATOR( &valid ), cmap, limit,
@ -3538,7 +3538,7 @@
}
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}

6
src/sfnt/ttload.c
Unescape View File

@ -274,7 +274,7 @@
/* if `sing' and `meta' tables are present, there is no `head' table */
if ( has_head || ( has_sing && has_meta ) )
{
error = SFNT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
else
@ -497,7 +497,7 @@
{
*length = size;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
if ( length )
@ -1127,7 +1127,7 @@
FT_TRACE3(( "isFixedPitch: %s\n", post->isFixedPitch
? " yes" : " no" ));
return SFNT_Err_Ok;
return FT_Err_Ok;
}

6
src/sfnt/ttmtx.c
Unescape View File

@ -419,7 +419,7 @@
*aadvance = 0;
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
#else /* !FT_CONFIG_OPTION_OLD_INTERNALS */
@ -444,7 +444,7 @@
gindex >= (FT_UInt)face->max_profile.numGlyphs )
{
*abearing = *aadvance = 0;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
if ( gindex < (FT_UInt)k )
@ -459,7 +459,7 @@
*aadvance = ((TT_LongMetrics)header->long_metrics)[k - 1].advance;
}
return SFNT_Err_Ok;
return FT_Err_Ok;
}
#endif /* !FT_CONFIG_OPTION_OLD_INTERNALS */

6
src/sfnt/ttpost.c
Unescape View File

@ -284,7 +284,7 @@
table->glyph_indices = glyph_indices;
table->glyph_names = name_strings;
}
return SFNT_Err_Ok;
return FT_Err_Ok;
Fail1:
{
@ -360,7 +360,7 @@
table->offsets = offset_table;
}
return SFNT_Err_Ok;
return FT_Err_Ok;
Fail:
FT_FREE( offset_table );
@ -556,7 +556,7 @@
/* nothing to do for format == 0x00030000L */
End:
return SFNT_Err_Ok;
return FT_Err_Ok;
}

10
src/sfnt/ttsbit.c
Unescape View File

@ -417,7 +417,7 @@
tt_face_load_eblc( TT_Face face,
FT_Stream stream )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = stream->memory;
FT_Fixed version;
FT_ULong num_strikes;
@ -678,7 +678,7 @@
metrics->height = metrics->ascender - metrics->descender;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -773,7 +773,7 @@
Found:
/* return successfully! */
*arange = range;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
}
@ -838,7 +838,7 @@
*astrike = strike;
return SFNT_Err_Ok;
return FT_Err_Ok;
Fail:
/* no embedded bitmap for this glyph in face */
@ -882,7 +882,7 @@
TT_SBit_Range range,
TT_SBit_Metrics metrics )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
switch ( range->image_format )

16
src/sfnt/ttsbit0.c
Unescape View File

@ -43,7 +43,7 @@
tt_face_load_eblc( TT_Face face,
FT_Stream stream )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Fixed version;
FT_ULong num_strikes, table_size;
FT_Byte* p;
@ -153,7 +153,7 @@
(FT_Char)strike[23] /* min_advance_SB */
) << 6;
return SFNT_Err_Ok;
return FT_Err_Ok;
}
@ -249,7 +249,7 @@
static FT_Error
tt_sbit_decoder_alloc_bitmap( TT_SBitDecoder decoder )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt width, height;
FT_Bitmap* map = decoder->bitmap;
FT_Long size;
@ -345,7 +345,7 @@
decoder->metrics_loaded = 1;
*pp = p;
return SFNT_Err_Ok;
return FT_Err_Ok;
Fail:
return FT_THROW( Invalid_Argument );
@ -373,7 +373,7 @@
FT_Int x_pos,
FT_Int y_pos )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* line;
FT_Int bit_height, bit_width, pitch, width, height, line_bits, h;
FT_Bitmap* bitmap;
@ -513,7 +513,7 @@
FT_Int x_pos,
FT_Int y_pos )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* line;
FT_Int bit_height, bit_width, pitch, width, height, line_bits, h, nbits;
FT_Bitmap* bitmap;
@ -638,7 +638,7 @@
FT_Int x_pos,
FT_Int y_pos )
{
FT_Error error = SFNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UInt num_components, nn;
FT_Char horiBearingX = decoder->metrics->horiBearingX;
@ -740,7 +740,7 @@
break;
default:
error = SFNT_Err_Ok;
error = FT_Err_Ok;
}
if ( error )

4
src/smooth/ftsmooth.c
Unescape View File

@ -61,7 +61,7 @@
const FT_Matrix* matrix,
const FT_Vector* delta )
{
FT_Error error = Smooth_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( slot->format != render->glyph_format )
@ -384,7 +384,7 @@
/* everything is fine; don't deallocate buffer */
have_buffer = FALSE;
error = Smooth_Err_Ok;
error = FT_Err_Ok;
Exit:
if ( have_outline_shifted )

4
src/smooth/ftspic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for smooth module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -52,7 +52,7 @@
ft_smooth_renderer_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = Smooth_Err_Ok;
FT_Error error = FT_Err_Ok;
SmoothPIC* container = NULL;
FT_Memory memory = library->memory;

6
src/truetype/ttdriver.c
Unescape View File

@ -163,7 +163,7 @@
}
}
return TT_Err_Ok;
return FT_Err_Ok;
}
/*************************************************************************/
@ -187,7 +187,7 @@
{
TT_Face ttface = (TT_Face)size->face;
TT_Size ttsize = (TT_Size)size;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
ttsize->strike_index = strike_index;
@ -221,7 +221,7 @@
FT_Size_Request req )
{
TT_Size ttsize = (TT_Size)size;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS

24
src/truetype/ttgload.c
Unescape View File

@ -292,7 +292,7 @@
loader->cursor = stream->cursor;
loader->limit = stream->limit;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -330,7 +330,7 @@
loader->bbox.yMax ));
loader->cursor = p;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -826,7 +826,7 @@
else if ( loader->exec->sph_tweak_flags & SPH_TWEAK_EMBOLDEN )
FT_Outline_EmboldenXY( &loader->gloader->current.outline, 24, 0 );
#endif
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -844,7 +844,7 @@
TT_Process_Simple_Glyph( TT_Loader loader )
{
FT_GlyphLoader gloader = loader->gloader;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Outline* outline;
FT_Int n_points;
@ -1038,7 +1038,7 @@
y = subglyph->arg2;
if ( !x && !y )
return TT_Err_Ok;
return FT_Err_Ok;
/* Use a default value dependent on */
/* TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED. This is useful for old TT */
@ -1118,7 +1118,7 @@
base_vec + num_base_points,
x, y );
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -1201,7 +1201,7 @@
return error;
}
else if ( n_ins == 0 )
return TT_Err_Ok;
return FT_Err_Ok;
if ( FT_STREAM_READ( loader->exec->glyphIns, n_ins ) )
return error;
@ -1257,7 +1257,7 @@
FT_UInt recurse_count,
FT_Bool header_only )
{
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Fixed x_scale, y_scale;
FT_ULong offset;
TT_Face face = (TT_Face)loader->face;
@ -1418,7 +1418,7 @@
loader->pp4.y = FT_MulFix( loader->pp4.y, y_scale );
}
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -2104,7 +2104,7 @@
loader->glyph = (FT_GlyphSlot)glyph;
loader->stream = stream;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -2145,7 +2145,7 @@
TT_LoaderRec loader;
error = TT_Err_Ok;
error = FT_Err_Ok;
#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
@ -2169,7 +2169,7 @@
loader.vadvance;
}
return TT_Err_Ok;
return FT_Err_Ok;
}
}

24
src/truetype/ttgxvar.c
Unescape View File

@ -130,7 +130,7 @@
FT_Int j;
FT_Int first;
FT_Memory memory = stream->memory;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( error );
@ -215,7 +215,7 @@
FT_Offset i;
FT_UInt j;
FT_Memory memory = stream->memory;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_UNUSED( error );
@ -283,7 +283,7 @@
FT_Memory memory = stream->memory;
GX_Blend blend = face->blend;
GX_AVarSegment segment;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ULong version;
FT_Long axisCount;
FT_Int i, j;
@ -610,7 +610,7 @@
FT_Stream stream = face->root.stream;
FT_Memory memory = face->root.memory;
FT_ULong table_len;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ULong fvar_start;
FT_Int i, j;
FT_MM_Var* mmvar = NULL;
@ -847,7 +847,7 @@
FT_UInt num_coords,
FT_Fixed* coords )
{
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
GX_Blend blend;
FT_MM_Var* mmvar;
FT_UInt i;
@ -983,7 +983,7 @@
FT_UInt num_coords,
FT_Fixed* coords )
{
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Fixed* normalized = NULL;
GX_Blend blend;
FT_MM_Var* mmvar;
@ -1120,7 +1120,7 @@
{
FT_TRACE2(( "tt_face_vary_cvt: no blend specified\n" ));
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -1128,7 +1128,7 @@
{
FT_TRACE2(( "tt_face_vary_cvt: no `cvt ' table\n" ));
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -1137,13 +1137,13 @@
{
FT_TRACE2(( "is missing\n" ));
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
if ( FT_FRAME_ENTER( table_len ) )
{
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -1152,7 +1152,7 @@
{
FT_TRACE2(( "bad table version\n" ));
error = TT_Err_Ok;
error = FT_Err_Ok;
goto FExit;
}
@ -1333,7 +1333,7 @@
if ( glyph_index >= blend->gv_glyphcnt ||
blend->glyphoffsets[glyph_index] ==
blend->glyphoffsets[glyph_index + 1] )
return TT_Err_Ok; /* no variation data for this glyph */
return FT_Err_Ok; /* no variation data for this glyph */
if ( FT_STREAM_SEEK( blend->glyphoffsets[glyph_index] ) ||
FT_FRAME_ENTER( blend->glyphoffsets[glyph_index + 1] -

26
src/truetype/ttinterp.c
Unescape View File

@ -304,7 +304,7 @@
exec->IP = IP;
exec->curRange = range;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -340,7 +340,7 @@
exec->codeRangeTable[range - 1].base = (FT_Byte*)base;
exec->codeRangeTable[range - 1].size = length;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -373,7 +373,7 @@
exec->codeRangeTable[range - 1].base = NULL;
exec->codeRangeTable[range - 1].size = 0;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -431,7 +431,7 @@
FT_FREE( exec );
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -481,7 +481,7 @@
exec->face = NULL;
exec->size = NULL;
return TT_Err_Ok;
return FT_Err_Ok;
Fail_Memory:
FT_ERROR(( "Init_Context: not enough memory for %p\n", exec ));
@ -533,7 +533,7 @@
*size = new_max;
}
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -640,7 +640,7 @@
exec->instruction_trap = FALSE;
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -683,7 +683,7 @@
for ( i = 0; i < TT_MAX_CODE_RANGES; i++ )
size->codeRangeTable[i] = exec->codeRangeTable[i];
return TT_Err_Ok;
return FT_Err_Ok;
}
@ -719,7 +719,7 @@
if ( ( error = TT_Goto_CodeRange( exec, tt_coderange_glyph, 0 ) )
!= TT_Err_Ok )
!= FT_Err_Ok )
return error;
exec->zp0 = exec->pts;
@ -756,7 +756,7 @@
if ( !debug )
return TT_RunIns( exec );
else
return TT_Err_Ok;
return FT_Err_Ok;
#endif
}
@ -8114,7 +8114,7 @@
}
CUR.step_ins = TRUE;
CUR.error = TT_Err_Ok;
CUR.error = FT_Err_Ok;
#ifdef TT_CONFIG_OPTION_INTERPRETER_SWITCH
@ -8693,7 +8693,7 @@
#endif /* TT_CONFIG_OPTION_INTERPRETER_SWITCH */
if ( CUR.error != TT_Err_Ok )
if ( CUR.error != FT_Err_Ok )
{
switch ( CUR.error )
{
@ -8779,7 +8779,7 @@
*exc = cur;
#endif
return TT_Err_Ok;
return FT_Err_Ok;
LErrorCodeOverflow_:
CUR.error = FT_THROW( Code_Overflow );

14
src/truetype/ttobjs.c
Unescape View File

@ -551,7 +551,7 @@
/* If we are performing a simple font format check, exit immediately. */
if ( face_index < 0 )
return TT_Err_Ok;
return FT_Err_Ok;
/* Load font directory */
error = sfnt->load_face( stream, face, face_index, num_params, params );
@ -805,7 +805,7 @@
}
}
else
error = TT_Err_Ok;
error = FT_Err_Ok;
if ( !error )
TT_Save_Context( exec, size );
@ -876,7 +876,7 @@
}
}
else
error = TT_Err_Ok;
error = FT_Err_Ok;
/* UNDOCUMENTED! The MS rasterizer doesn't allow the following */
/* graphics state variables to be modified by the CVT program. */
@ -1043,7 +1043,7 @@
tt_size_ready_bytecode( TT_Size size,
FT_Bool pedantic )
{
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( !size->bytecode_ready )
@ -1110,7 +1110,7 @@
tt_size_init( FT_Size ttsize ) /* TT_Size */
{
TT_Size size = (TT_Size)ttsize;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
#ifdef TT_USE_BYTECODE_INTERPRETER
size->bytecode_ready = 0;
@ -1166,7 +1166,7 @@
tt_size_reset( TT_Size size )
{
TT_Face face;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Size_Metrics* metrics;
@ -1265,7 +1265,7 @@
#endif
return TT_Err_Ok;
return FT_Err_Ok;
}

4
src/truetype/ttpic.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for truetype module. */
/* */
/* Copyright 2009, 2010, 2012 by */
/* Copyright 2009, 2010, 2012, 2013 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -67,7 +67,7 @@
tt_driver_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = TT_Err_Ok;
FT_Error error = FT_Err_Ok;
TTModulePIC* container = NULL;
FT_Memory memory = library->memory;

14
src/truetype/ttpload.c
Unescape View File

@ -296,7 +296,7 @@
face->cvt_size = 0;
face->cvt = NULL;
error = TT_Err_Ok;
error = FT_Err_Ok;
goto Exit;
}
@ -334,7 +334,7 @@
FT_UNUSED( face );
FT_UNUSED( stream );
return TT_Err_Ok;
return FT_Err_Ok;
#endif
}
@ -375,7 +375,7 @@
{
face->font_program = NULL;
face->font_program_size = 0;
error = TT_Err_Ok;
error = FT_Err_Ok;
FT_TRACE2(( "is missing\n" ));
}
@ -396,7 +396,7 @@
FT_UNUSED( face );
FT_UNUSED( stream );
return TT_Err_Ok;
return FT_Err_Ok;
#endif
}
@ -436,7 +436,7 @@
{
face->cvt_program = NULL;
face->cvt_program_size = 0;
error = TT_Err_Ok;
error = FT_Err_Ok;
FT_TRACE2(( "is missing\n" ));
}
@ -457,7 +457,7 @@
FT_UNUSED( face );
FT_UNUSED( stream );
return TT_Err_Ok;
return FT_Err_Ok;
#endif
}
@ -495,7 +495,7 @@
/* this table is optional */
error = face->goto_table( face, TTAG_hdmx, stream, &table_size );
if ( error || table_size < 8 )
return TT_Err_Ok;
return FT_Err_Ok;
if ( FT_FRAME_EXTRACT( table_size, face->hdmx_table ) )
goto Exit;

4
src/type1/t1afm.c
Unescape View File

@ -108,7 +108,7 @@
FT_Stream stream,
AFM_FontInfo fi )
{
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Memory memory = stream->memory;
FT_Byte* start;
FT_Byte* limit;
@ -390,7 +390,7 @@
}
}
return T1_Err_Ok;
return FT_Err_Ok;
}

12
src/type1/t1driver.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Type 1 driver interface (body). */
/* */
/* Copyright 1996-2004, 2006, 2007, 2009, 2011 by */
/* Copyright 1996-2004, 2006, 2007, 2009, 2011, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -61,7 +61,7 @@
{
FT_STRCPYN( buffer, face->type1.glyph_names[glyph_index], buffer_max );
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -138,7 +138,7 @@
{
*afont_info = ((T1_Face)face)->type1.font_info;
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -148,7 +148,7 @@
{
*afont_extra = ((T1_Face)face)->type1.font_extra;
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -167,7 +167,7 @@
{
*afont_private = ((T1_Face)face)->type1.private_dict;
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -669,7 +669,7 @@
right_glyph,
kerning );
return T1_Err_Ok;
return FT_Err_Ok;
}

8
src/type1/t1gload.c
Unescape View File

@ -61,7 +61,7 @@
{
T1_Face face = (T1_Face)decoder->builder.face;
T1_Font type1 = &face->type1;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
#ifdef FT_CONFIG_OPTION_INCREMENTAL
FT_Incremental_InterfaceRec *inc =
@ -203,7 +203,7 @@
psaux->t1_decoder_funcs->done( &decoder );
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -227,7 +227,7 @@
for ( nn = 0; nn < count; nn++ )
advances[nn] = 0;
return T1_Err_Ok;
return FT_Err_Ok;
}
error = psaux->t1_decoder_funcs->init( &decoder,
@ -261,7 +261,7 @@
advances[nn] = 0;
}
return T1_Err_Ok;
return FT_Err_Ok;
}

24
src/type1/t1load.c
Unescape View File

@ -106,7 +106,7 @@
{
PS_Blend blend;
FT_Memory memory = face->root.memory;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
blend = face->blend;
@ -214,7 +214,7 @@
axis->maximum = map->design_points[map->num_points - 1];
}
error = T1_Err_Ok;
error = FT_Err_Ok;
}
return error;
@ -377,7 +377,7 @@
if ( blend && blend->num_axis == num_coords )
{
/* recompute the weight vector from the blend coordinates */
error = T1_Err_Ok;
error = FT_Err_Ok;
for ( n = 0; n < blend->num_designs; n++ )
{
@ -404,7 +404,7 @@
blend->weight_vector[n] = result;
}
error = T1_Err_Ok;
error = FT_Err_Ok;
}
return error;
@ -569,7 +569,7 @@
{
T1_TokenRec axis_tokens[T1_MAX_MM_AXIS];
FT_Int n, num_axis;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
PS_Blend blend;
FT_Memory memory;
@ -639,7 +639,7 @@
FT_Int num_axis;
T1_Parser parser = &loader->parser;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
PS_Blend blend;
@ -731,7 +731,7 @@
parse_blend_design_map( T1_Face face,
T1_Loader loader )
{
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
T1_Parser parser = &loader->parser;
PS_Blend blend;
T1_TokenRec axis_tokens[T1_MAX_MM_AXIS];
@ -823,7 +823,7 @@
{
T1_TokenRec design_tokens[T1_MAX_MM_DESIGNS];
FT_Int num_designs;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
T1_Parser parser = &loader->parser;
PS_Blend blend = face->blend;
T1_Token token;
@ -1022,7 +1022,7 @@
" which is not valid at this point\n"
" (probably due to missing keywords)\n",
field->ident ));
error = T1_Err_Ok;
error = FT_Err_Ok;
}
Exit:
@ -1845,7 +1845,7 @@
parser->root.cursor = base;
parser->root.limit = base + size;
parser->root.error = T1_Err_Ok;
parser->root.error = FT_Err_Ok;
limit = parser->root.limit;
@ -1996,10 +1996,10 @@
parser->root.error = t1_load_keyword( face,
loader,
keyword );
if ( parser->root.error != T1_Err_Ok )
if ( parser->root.error != FT_Err_Ok )
{
if ( FT_ERROR_BASE( parser->root.error ) == FT_Err_Ignore )
parser->root.error = T1_Err_Ok;
parser->root.error = FT_Err_Ok;
else
return parser->root.error;
}

8
src/type1/t1objs.c
Unescape View File

@ -95,7 +95,7 @@
T1_Size_Init( FT_Size t1size ) /* T1_Size */
{
T1_Size size = (T1_Size)t1size;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
PSH_Globals_Funcs funcs = T1_Size_Get_Globals_Funcs( size );
@ -131,7 +131,7 @@
size->root.metrics.y_scale,
0, 0 );
return T1_Err_Ok;
return FT_Err_Ok;
}
@ -489,7 +489,7 @@
if ( !error )
root->max_advance_width = (FT_Short)FIXED_TO_INT( max_advance );
else
error = T1_Err_Ok; /* clear error */
error = FT_Err_Ok; /* clear error */
}
root->max_advance_height = root->height;
@ -591,7 +591,7 @@
{
FT_UNUSED( driver );
return T1_Err_Ok;
return FT_Err_Ok;
}

6
src/type1/t1parse.c
Unescape View File

@ -119,7 +119,7 @@
if ( !FT_FRAME_ENTER( header_length ) )
{
error = T1_Err_Ok;
error = FT_Err_Ok;
if ( ft_memcmp( stream->cursor, header_string, header_length ) != 0 )
error = FT_THROW( Unknown_File_Format );
@ -263,7 +263,7 @@
{
FT_Stream stream = parser->stream;
FT_Memory memory = parser->root.memory;
FT_Error error = T1_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_ULong size;
@ -313,7 +313,7 @@
error = read_pfb_tag( stream, &tag, &size );
if ( error || tag != 0x8002U )
{
error = T1_Err_Ok;
error = FT_Err_Ok;
break;
}

11
src/type42/t42drivr.c
Unescape View File

@ -4,7 +4,8 @@
/* */
/* High-level Type 42 driver interface (body). */
/* */
/* Copyright 2002-2004, 2006, 2007, 2009, 2011 by Roberto Alameda. */
/* Copyright 2002-2004, 2006, 2007, 2009, 2011, 2013 by */
/* Roberto Alameda. */
/* */
/* This file is part of the FreeType project, and may only be used, */
/* modified, and distributed under the terms of the FreeType project */
@ -63,7 +64,7 @@
{
FT_STRCPYN( buffer, face->type1.glyph_names[glyph_index], buffer_max );
return T42_Err_Ok;
return FT_Err_Ok;
}
@ -125,7 +126,7 @@
{
*afont_info = ((T42_Face)face)->type1.font_info;
return T42_Err_Ok;
return FT_Err_Ok;
}
@ -135,7 +136,7 @@
{
*afont_extra = ((T42_Face)face)->type1.font_extra;
return T42_Err_Ok;
return FT_Err_Ok;
}
@ -154,7 +155,7 @@
{
*afont_private = ((T42_Face)face)->type1.private_dict;
return T42_Err_Ok;
return FT_Err_Ok;
}

6
src/type42/t42objs.c
Unescape View File

@ -487,7 +487,7 @@
driver->ttclazz = (FT_Driver_Class)ttmodule->clazz;
return T42_Err_Ok;
return FT_Err_Ok;
}
@ -505,7 +505,7 @@
FT_Face face = size->face;
T42_Face t42face = (T42_Face)face;
FT_Size ttsize;
FT_Error error = T42_Err_Ok;
FT_Error error = FT_Err_Ok;
error = FT_New_Size( t42face->ttf_face, &ttsize );
@ -581,7 +581,7 @@
FT_Face face = t42slot->face;
T42_Face t42face = (T42_Face)face;
FT_GlyphSlot ttslot;
FT_Error error = T42_Err_Ok;
FT_Error error = FT_Err_Ok;
if ( face->glyph == NULL )

4
src/type42/t42parse.c
Unescape View File

@ -144,7 +144,7 @@
FT_Memory memory,
PSAux_Service psaux )
{
FT_Error error = T42_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Long size;
@ -1033,7 +1033,7 @@
parser->root.cursor = base;
parser->root.limit = base + size;
parser->root.error = T42_Err_Ok;
parser->root.error = FT_Err_Ok;
limit = parser->root.limit;

8
src/winfonts/winfnt.c
Unescape View File

@ -909,7 +909,7 @@
header->ascent ) * 64;
size->metrics.max_advance = header->max_width * 64;
return FNT_Err_Ok;
return FT_Err_Ok;
}
@ -931,12 +931,12 @@
{
case FT_SIZE_REQUEST_TYPE_NOMINAL:
if ( height == ( ( bsize->y_ppem + 32 ) >> 6 ) )
error = FNT_Err_Ok;
error = FT_Err_Ok;
break;
case FT_SIZE_REQUEST_TYPE_REAL_DIM:
if ( height == header->pixel_height )
error = FNT_Err_Ok;
error = FT_Err_Ok;
break;
default:
@ -959,7 +959,7 @@
{
FNT_Face face = (FNT_Face)FT_SIZE_FACE( size );
FNT_Font font;
FT_Error error = FNT_Err_Ok;
FT_Error error = FT_Err_Ok;
FT_Byte* p;
FT_Int len;
FT_Bitmap* bitmap = &slot->bitmap;

Write Preview
Loading…
Cancel
Save