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

* src/psaux/t1cmap.c (t1_cmap_custom_char_index, 

t1_cmap_custom_char_next): Fix index computation -- indices start
with 0 and not with cmap->first.

Provide default charmaps.

* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdriver.c
(PCF_Face_Init), src/pfr/pfrobjs.c (pfr_face_init),
src/type1/t1objs (T1_Face_Init), src/winfonts/winfnt.c
(FNT_Face_Init): Implement it.
This commit is contained in:
Werner Lemberg 2002-06-19 15:57:55 +00:00
parent 73ffc7a0ea
commit d594a7012b
7 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,16 @@
2002-06-18 Detlef Würkner <TetiSoft@apg.lahn.de>
* src/psaux/t1cmap.c (t1_cmap_custom_char_index,
t1_cmap_custom_char_next): Fix index computation -- indices start
with 0 and not with cmap->first.
Provide default charmaps.
* src/bdf/bdfdrivr.c (BDF_Face_Init), src/pcf/pcfdriver.c
(PCF_Face_Init), src/pfr/pfrobjs.c (pfr_face_init),
src/type1/t1objs (T1_Face_Init), src/winfonts/winfnt.c
(FNT_Face_Init): Implement it.
2002-06-17 Sven Neumann <sven@gimp.org>
* src/pfr/pfrobjs.c (pfr_face_init): Fix typo.
@ -43,7 +56,7 @@
2002-06-14 Detlef Würkner <TetiSoft@apg.lahn.de>
Add new cmap support to BDF driver
Add new cmap support to BDF driver.
* src/bdf/bdfdrivr.c (BDF_CMapRec) [FT_CONFIG_OPTION_USE_CMAPS]:
New structure.

12
src/bdf/bdfdrivr.c
View File

@ -448,6 +448,10 @@ THE SOFTWARE.
}
error = FT_CMap_New( &bdf_cmap_class, NULL, &charmap, NULL );
/* Select default charmap */
if (root->num_charmaps)
root->charmap = root->charmaps[0];
}
#else /* !FT_CONFIG_OPTION_USE_CMAPS */
@ -481,11 +485,15 @@ THE SOFTWARE.
charmap.face = FT_FACE( face );
charmap.encoding = ft_encoding_none;
charmap.platform_id = 0;
charmap.encoding = ft_encoding_adobe_standard;
charmap.platform_id = 7;
charmap.encoding_id = 0;
error = FT_CMap_New( &bdf_cmap_class, NULL, &charmap, NULL );
/* Select default charmap */
if (root->num_charmaps)
root->charmap = root->charmaps[0];
}
#else /* !FT_CONFIG_OPTION_USE_CMAPS */

4
src/pcf/pcfdriver.c
View File

@ -340,6 +340,10 @@ THE SOFTWARE.
}
error = FT_CMap_New( &pcf_cmap_class, NULL, &charmap, NULL );
/* Select default charmap */
if (face->root.num_charmaps)
face->root.charmap = face->root.charmaps[0];
}
#else /* !FT_CONFIG_OPTION_USE_CMAPS */

4
src/pfr/pfrobjs.c
View File

@ -175,6 +175,10 @@
charmap.encoding = ft_encoding_unicode;
FT_CMap_New( &pfr_cmap_class_rec, NULL, &charmap, NULL );
/* Select default charmap */
if (root->num_charmaps)
root->charmap = root->charmaps[0];
}
}

13
src/psaux/t1cmap.c
View File

@ -197,12 +197,11 @@
FT_UInt32 char_code )
{
FT_UInt result = 0;
FT_UInt32 idx;
idx = (FT_UInt32)( char_code - cmap->first );
if ( idx < cmap->count )
result = cmap->indices[idx];
if ( ( char_code >= cmap->first ) &&
( char_code < ( cmap->first + cmap->count ) ) )
result = cmap->indices[char_code];
return result;
}
@ -214,7 +213,6 @@
{
FT_UInt result = 0;
FT_UInt32 char_code = *pchar_code;
FT_UInt32 idx;
++char_code;
@ -222,10 +220,9 @@
if ( char_code < cmap->first )
char_code = cmap->first;
idx = (FT_UInt32)( char_code - cmap->first );
for ( ; idx < cmap->count; idx++, char_code++ )
for ( ; char_code < ( cmap->first + cmap->count ); char_code++ )
{
result = cmap->indices[idx];
result = cmap->indices[char_code];
if ( result != 0 )
goto Exit;
}

4
src/type1/t1objs.c
View File

@ -485,6 +485,10 @@
if ( clazz )
FT_CMap_New( clazz, NULL, &charmap, NULL );
/* Select default charmap */
if (root->num_charmaps)
root->charmap = root->charmaps[0];
}
}

7
src/winfonts/winfnt.c
View File

@ -548,7 +548,12 @@
NULL,
&charmap,
NULL );
if (error) goto Fail;
if ( error )
goto Fail;
/* Select default charmap */
if ( root->num_charmaps )
root->charmap = root->charmaps[0];
}
#else /* !FT_CONFIG_OPTION_USE_CMAPS */