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

* src/bdf/bdf.h (bdf_font_t): Correct `internal` type. 

* src/bdf/bdflib.c (*): Update users.
This commit is contained in:
Alexei Podtelezhnikov 2025-01-10 22:31:07 -05:00
parent 8d536080ec
commit cf451e5ff3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bdf/bdf.h
View File

@ -190,7 +190,7 @@ FT_BEGIN_HEADER
char* comments; /* Font comments. */
unsigned long comments_len; /* Length of comment string. */
void* internal; /* Internal data for the font. */
FT_Hash internal; /* Internal data for the font. */
unsigned short bpp; /* Bits per pixel. */

13
src/bdf/bdflib.c
View File

@ -1115,8 +1115,7 @@
/* First, check whether the property already exists in the font. */
if ( ( propid = ft_hash_str_lookup( name,
(FT_Hash)font->internal ) ) != NULL )
if ( ( propid = ft_hash_str_lookup( name, font->internal ) ) != NULL )
{
/* The property already exists in the font, so simply replace */
/* the value of the property with the current value. */
@ -1210,7 +1209,7 @@
/* Add the property to the font property table. */
error = ft_hash_str_insert( fp->name,
font->props_used,
(FT_Hash)font->internal,
font->internal,
memory );
if ( error )
goto Exit;
@ -1942,9 +1941,9 @@
}
}
if ( FT_QALLOC( p->font->internal, sizeof ( FT_HashRec ) ) )
if ( FT_QNEW( p->font->internal ) )
goto Exit;
error = ft_hash_str_init( (FT_Hash)p->font->internal, memory );
error = ft_hash_str_init( p->font->internal, memory );
if ( error )
goto Exit;
p->font->spacing = p->opts->font_spacing;
@ -2311,7 +2310,7 @@
/* Free up the internal hash table of property names. */
if ( font->internal )
{
ft_hash_str_free( (FT_Hash)font->internal, memory );
ft_hash_str_free( font->internal, memory );
FT_FREE( font->internal );
}
@ -2369,7 +2368,7 @@
if ( font == NULL || font->props_size == 0 || name == NULL || *name == 0 )
return 0;
propid = ft_hash_str_lookup( name, (FT_Hash)font->internal );
propid = ft_hash_str_lookup( name, font->internal );
return propid ? ( font->props + *propid ) : 0;
}