forked from minhngoc25a/freetype2
- ft_new_input_stream: don't make a new copy of the pathname
- ft_done_stream: remove the FREE(pathname) call, which wasn't kosher - FT_Open_Face: after calling open_face, don't assume driver is the same as face->driver, use face->driver instead
This commit is contained in:
parent
59d8ac4615
commit
7eef5364b8
|
@ -244,11 +244,7 @@
|
||||||
else if ( args->pathname )
|
else if ( args->pathname )
|
||||||
{
|
{
|
||||||
error = FT_New_Stream( args->pathname, stream );
|
error = FT_New_Stream( args->pathname, stream );
|
||||||
if ( !error )
|
stream->pathname.pointer = args->pathname;
|
||||||
{
|
|
||||||
if ( !ALLOC( stream->pathname.pointer, strlen(args->pathname)+1 ) )
|
|
||||||
strcpy( stream->pathname.pointer, args->pathname );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* do we have a custom stream? */
|
/* do we have a custom stream? */
|
||||||
|
@ -284,13 +280,10 @@
|
||||||
FT_Stream stream = *astream;
|
FT_Stream stream = *astream;
|
||||||
FT_Memory memory = stream->memory;
|
FT_Memory memory = stream->memory;
|
||||||
|
|
||||||
|
|
||||||
if ( stream->close )
|
if ( stream->close )
|
||||||
stream->close( stream );
|
stream->close( stream );
|
||||||
|
|
||||||
if ( stream->pathname.pointer )
|
|
||||||
FREE( stream->pathname.pointer );
|
|
||||||
|
|
||||||
FREE( stream );
|
FREE( stream );
|
||||||
*astream = 0;
|
*astream = 0;
|
||||||
}
|
}
|
||||||
|
@ -1262,7 +1255,9 @@
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
node->data = face;
|
node->data = face;
|
||||||
FT_List_Add( &driver->faces_list, node );
|
/* don't assume driver is the same as face->driver, so use
|
||||||
|
face->driver instead. (JvR 3/5/2000) */
|
||||||
|
FT_List_Add( &face->driver->faces_list, node );
|
||||||
|
|
||||||
/* now allocate a glyph slot object for the face */
|
/* now allocate a glyph slot object for the face */
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue