rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing comment in unixddef.mk which caused a trailing blank. 

Adding a new error, FT_Err_Invalid_Pixel_Size (used in winfnt.c)

Fixing FT_Read_Fields() which failed for ft_frame_{bytes,skip}.  This bug
disabled the Winfont driver.

Minor formatting issues.
This commit is contained in:
Werner Lemberg 2000-09-29 06:41:56 +00:00
parent 42022c8c94
commit 8bb45ec8fb
6 changed files with 57 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builds/unix/unixddef.mk
View File

@ -22,7 +22,8 @@ DELETE := rm -f
SEP := /
HOSTSEP := $(SEP)
BUILD := $(TOP)/builds/unix/devel # we use a special devel ftoption.h
PLATFORM := unixdev # do not set it to `unix', or libtool will trick you
# do not set the platform to `unix', or libtool will trick you
PLATFORM := unixdev
# The directory where all object files are placed.

2
include/freetype/fterrors.h
View File

@ -97,6 +97,8 @@
"invalid composite glyph" )
FT_ERRORDEF( FT_Err_Too_Many_Hints, 0x0016, \
"too many hints" )
FT_ERRORDEF( FT_Err_Invalid_Pixel_Size, 0x0017, \
"invalid pixel size" )
/* handle errors */

6
src/base/ftstream.c
View File

@ -674,7 +674,7 @@
FT_UInt len = fields->size;
if ( stream->cursor + len > stream->limit )
if ( cursor + len > stream->limit )
{
error = FT_Err_Invalid_Stream_Operation;
goto Exit;
@ -683,9 +683,9 @@
if ( fields->value == ft_frame_bytes )
{
p = (FT_Byte*)structure + fields->offset;
MEM_Copy( p, stream->cursor, len );
MEM_Copy( p, cursor, len );
}
stream->cursor += len;
cursor += len;
fields++;
continue;
}

5
src/winfonts/winfnt.c
View File

@ -153,7 +153,7 @@
if ( header->file_type & 1 )
{
FT_TRACE2(( "can't handle vector FNT fonts\n" ));
FT_TRACE2(( "[can't handle vector FNT fonts]\n" ));
error = FT_Err_Unknown_File_Format;
goto Exit;
}
@ -188,6 +188,7 @@
face->num_fonts = 0;
}
static
FT_Error fnt_get_dll_fonts( FNT_Face face )
{
@ -470,7 +471,7 @@
}
}
return ( size->font ? FT_Err_Ok : FT_Err_Invalid_Argument );
return ( size->font ? FT_Err_Ok : FT_Err_Invalid_Pixel_Size );
}