minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c, 

src/smooth/ftgrays.c, src/base/ftobjc.s, src/sfobjs.c:
s/_Err_Bad_Argument/_Err_Invalid_Argument/.  The former is for
errors in the bytecode interpreter only.
This commit is contained in:
Werner Lemberg 2008-12-21 17:51:12 +00:00
parent 478cca14a5
commit 3c5ad95166
7 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-12-21 Werner Lemberg <wl@gnu.org>
* src/pfr/pfrdrivr.c, src/winfonts/winfnt.c, src/cache/ftcmanag.c,
src/smooth/ftgrays.c, src/base/ftobjc.s, src/sfobjs.c:
s/_Err_Bad_Argument/_Err_Invalid_Argument/. The former is for
errors in the bytecode interpreter only.
2008-12-21 Werner Lemberg <wl@gnu.org>
* src/base/ftpfr.c (FT_Get_PFR_Metrics): Protect against NULL

4
src/base/ftobjs.c
View File

@ -3444,11 +3444,11 @@
if ( size == NULL )
return FT_Err_Bad_Argument;
return FT_Err_Invalid_Argument;
face = size->face;
if ( face == NULL || face->driver == NULL )
return FT_Err_Bad_Argument;
return FT_Err_Invalid_Argument;
/* we don't need anything more complex than that; all size objects */
/* are already listed by the face */

6
src/cache/ftcmanag.c vendored
View File

@ -4,7 +4,7 @@
/* */
/* FreeType Cache Manager (body). */
/* */
/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006 by */
/* Copyright 2000-2001, 2002, 2003, 2004, 2005, 2006, 2008 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -181,7 +181,7 @@
if ( asize == NULL )
return FTC_Err_Bad_Argument;
return FTC_Err_Invalid_Argument;
*asize = NULL;
@ -306,7 +306,7 @@
if ( aface == NULL )
return FTC_Err_Bad_Argument;
return FTC_Err_Invalid_Argument;
*aface = NULL;

2
src/pfr/pfrdrivr.c
View File

@ -66,7 +66,7 @@
FT_Pos *anadvance )
{
PFR_Face face = (PFR_Face)pfrface;
FT_Error error = PFR_Err_Bad_Argument;
FT_Error error = PFR_Err_Invalid_Argument;
*anadvance = 0;

2
src/sfnt/sfobjs.c
View File

@ -458,7 +458,7 @@
face_index = 0;
if ( face_index >= face->ttc_header.count )
return SFNT_Err_Bad_Argument;
return SFNT_Err_Invalid_Argument;
if ( FT_STREAM_SEEK( face->ttc_header.offsets[face_index] ) )
return error;

2
src/smooth/ftgrays.c
View File

@ -184,7 +184,7 @@
#define ErrRaster_Invalid_Mode Smooth_Err_Cannot_Render_Glyph
#define ErrRaster_Invalid_Outline Smooth_Err_Invalid_Outline
#define ErrRaster_Memory_Overflow Smooth_Err_Out_Of_Memory
#define ErrRaster_Invalid_Argument Smooth_Err_Bad_Argument
#define ErrRaster_Invalid_Argument Smooth_Err_Invalid_Argument
#endif /* !_STANDALONE_ */

6
src/winfonts/winfnt.c
View File

@ -360,7 +360,7 @@
if ( face_index >= font_count )
{
error = FNT_Err_Bad_Argument;
error = FNT_Err_Invalid_Argument;
goto Exit;
}
else if ( face_index < 0 )
@ -566,7 +566,7 @@
if ( face_index >= face->root.num_faces )
{
error = FNT_Err_Bad_Argument;
error = FNT_Err_Invalid_Argument;
goto Exit;
}
}
@ -719,7 +719,7 @@
if ( !error )
{
if ( face_index > 0 )
error = FNT_Err_Bad_Argument;
error = FNT_Err_Invalid_Argument;
else if ( face_index < 0 )
goto Exit;
}