ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[pcf] Fix handling of undefined glyph (#56067). 

This commit fixes the changes from 2018-07-21, which broke charmap
iteration.  We now add the default character as a new glyph with
index 0, thus increasing the number of glyphs by one (as before).

* src/pcf/pcfread.c (pcf_get_metrics): Adjust to new artificial
glyph with index 0.
Limit number of elements to 65534.
(pcf_get_bitmaps): Ditto.
Unify two loops into one; this avoids allocation of an intermediate
array.
(pcf_get_encodings): Don't flip indices but copy glyph metrics of
default character to index 0.
Also handle invalid default character.

* docs/CHANGES: Updated.
This commit is contained in:
Werner Lemberg 2019-04-17 07:49:17 +02:00
parent ebe3750812
commit c149f7397e
5 changed files with 117 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2019-04-18 Werner Lemberg <wl@gnu.org>
[pcf] Fix handling of undefined glyph (#56067).
This commit fixes the changes from 2018-07-21, which broke charmap
iteration. We now add the default character as a new glyph with
index 0, thus increasing the number of glyphs by one (as before).
* src/pcf/pcfread.c (pcf_get_metrics): Adjust to new artificial
glyph with index 0.
Limit number of elements to 65534.
(pcf_get_bitmaps): Ditto.
Unify two loops into one; this avoids allocation of an intermediate
array.
(pcf_get_encodings): Don't flip indices but copy glyph metrics of
default character to index 0.
Also handle invalid default character.
* docs/CHANGES: Updated.
2019-04-15 Minmin Gong <gongminmin@msn.com>
* CMakeLists.txt: Avoid rewriting of unchanged configuration files.

4
docs/CHANGES
View File

@ -11,6 +11,10 @@ CHANGES BETWEEN 2.10.0 and 2.10.1
- For distribution, `.tar.bz2' packages are replaced with `.tar.xz'
bundles.
- The handling of the default character in PCF fonts as introduced
in version 2.9.1 was partially broken, causing premature abortion
of charmap iteration for many fonts.
======================================================================

3
src/pcf/pcf.h
View File

@ -99,7 +99,8 @@ FT_BEGIN_HEADER
FT_Short ascent;
FT_Short descent;
FT_Short attributes;
FT_ULong bits;
FT_ULong bits; /* offset into the PCF_BITMAPS table */
} PCF_MetricRec, *PCF_Metric;

153
src/pcf/pcfread.c
View File

@ -743,33 +743,39 @@ THE SOFTWARE.
if ( !orig_nmetrics )
return FT_THROW( Invalid_Table );
/* PCF is a format from ancient times; Unicode was in its */
/* infancy, and widely used two-byte character sets for CJK */
/* scripts (Big 5, GB 2312, JIS X 0208, etc.) did have at most */
/* 15000 characters. Even the more exotic CNS 11643 and CCCII */
/* standards, which were essentially three-byte character sets, */
/* provided less then 65536 assigned characters. */
/* */
/* While technically possible to have a larger number of glyphs */
/* in PCF files, we thus limit the number to 65536. */
if ( orig_nmetrics > 65536 )
/*
* PCF is a format from ancient times; Unicode was in its infancy, and
* widely used two-byte character sets for CJK scripts (Big 5, GB 2312,
* JIS X 0208, etc.) did have at most 15000 characters. Even the more
* exotic CNS 11643 and CCCII standards, which were essentially
* three-byte character sets, provided less then 65536 assigned
* characters.
*
* While technically possible to have a larger number of glyphs in PCF
* files, we thus limit the number to 65535, taking into account that we
* synthesize the metrics of glyph 0 to be a copy of the `default
* character', and that 0xFFFF in the encodings array indicates a
* missing glyph.
*/
if ( orig_nmetrics > 65534 )
{
FT_TRACE0(( "pcf_get_metrics:"
" only loading first 65536 metrics\n" ));
nmetrics = 65536;
" only loading first 65534 metrics\n" ));
nmetrics = 65534;
}
else
nmetrics = orig_nmetrics;
face->nmetrics = nmetrics;
face->nmetrics = nmetrics + 1;
if ( FT_NEW_ARRAY( face->metrics, nmetrics ) )
if ( FT_NEW_ARRAY( face->metrics, face->nmetrics ) )
return error;
metrics = face->metrics;
/* we handle glyph index 0 later on */
metrics = face->metrics + 1;
FT_TRACE4(( "\n" ));
for ( i = 0; i < nmetrics; i++, metrics++ )
for ( i = 1; i < face->nmetrics; i++, metrics++ )
{
FT_TRACE5(( " idx %ld:", i ));
error = pcf_get_metric( stream, format, metrics );
@ -809,10 +815,8 @@ THE SOFTWARE.
PCF_Face face )
{
FT_Error error;
FT_Memory memory = FT_FACE( face )->memory;
FT_ULong* offsets = NULL;
FT_ULong bitmapSizes[GLYPHPADOPTIONS];
FT_ULong format, size;
FT_ULong format, size, pos;
FT_ULong nbitmaps, orig_nbitmaps, i, sizebitmaps = 0;
@ -859,31 +863,46 @@ THE SOFTWARE.
FT_TRACE4(( " number of bitmaps: %ld\n", orig_nbitmaps ));
/* see comment in `pcf_get_metrics' */
if ( orig_nbitmaps > 65536 )
if ( orig_nbitmaps > 65534 )
{
FT_TRACE0(( "pcf_get_bitmaps:"
" only loading first 65536 bitmaps\n" ));
nbitmaps = 65536;
" only loading first 65534 bitmaps\n" ));
nbitmaps = 65534;
}
else
nbitmaps = orig_nbitmaps;
if ( nbitmaps != face->nmetrics )
/* no extra bitmap for glyph 0 */
if ( nbitmaps != face->nmetrics - 1 )
return FT_THROW( Invalid_File_Format );
if ( FT_NEW_ARRAY( offsets, nbitmaps ) )
return error;
/* start position of bitmap data */
pos = stream->pos + nbitmaps * 4 + 4 * 4;
FT_TRACE5(( "\n" ));
for ( i = 0; i < nbitmaps; i++ )
for ( i = 1; i <= nbitmaps; i++ )
{
FT_ULong offset;
if ( PCF_BYTE_ORDER( format ) == MSBFirst )
(void)FT_READ_ULONG( offsets[i] );
(void)FT_READ_ULONG( offset );
else
(void)FT_READ_ULONG_LE( offsets[i] );
(void)FT_READ_ULONG_LE( offset );
FT_TRACE5(( " bitmap %lu: offset %lu (0x%lX)\n",
i, offsets[i], offsets[i] ));
i, offset, offset ));
/* right now, we only check the offset with a rough estimate; */
/* actual bitmaps are only loaded on demand */
if ( offset > size )
{
FT_TRACE0(( "pcf_get_bitmaps:"
" invalid offset to bitmap data of glyph %lu\n", i ));
face->metrics[i].bits = pos;
}
else
face->metrics[i].bits = pos + offset;
}
if ( error )
goto Bail;
@ -910,24 +929,9 @@ THE SOFTWARE.
FT_UNUSED( sizebitmaps ); /* only used for debugging */
/* right now, we only check the bitmap offsets; */
/* actual bitmaps are only loaded on demand */
for ( i = 0; i < nbitmaps; i++ )
{
/* rough estimate */
if ( offsets[i] > size )
{
FT_TRACE0(( "pcf_get_bitmaps:"
" invalid offset to bitmap data of glyph %lu\n", i ));
}
else
face->metrics[i].bits = stream->pos + offsets[i];
}
face->bitmapsFormat = format;
Bail:
FT_FREE( offsets );
return error;
}
@ -1062,13 +1066,16 @@ THE SOFTWARE.
defaultCharCol = enc->firstCol;
}
/* FreeType mandates that glyph index 0 is the `undefined glyph', */
/* which PCF calls the `default character'. For this reason, we */
/* swap the positions of glyph index 0 and the index corresponding */
/* to `defaultChar' in case they are different. */
/* `stream->cursor' still points at the beginning of the frame; */
/* we can thus easily get the offset to the default character */
/*
* FreeType mandates that glyph index 0 is the `undefined glyph', which
* PCF calls the `default character'. However, FreeType needs glyph
* index 0 to be used for the undefined glyph only, which is is not the
* case for PCF. For this reason, we add one slot for glyph index 0 and
* simply copy the default character to it.
*
* `stream->cursor' still points to the beginning of the frame; we can
* thus easily get the offset to the default character.
*/
pos = stream->cursor +
2 * ( ( defaultCharRow - enc->firstRow ) *
( enc->lastCol - enc->firstCol + 1 ) +
@ -1079,24 +1086,32 @@ THE SOFTWARE.
else
defaultCharEncodingOffset = FT_PEEK_USHORT_LE( pos );
if ( defaultCharEncodingOffset == 0xFFFF )
{
FT_TRACE0(( "pcf_get_encodings:"
" No glyph for default character,\n"
" "
" setting it to the first glyph of the font\n" ));
defaultCharEncodingOffset = 1;
}
else
{
defaultCharEncodingOffset++;
if ( defaultCharEncodingOffset >= face->nmetrics )
{
FT_TRACE0(( "pcf_get_encodings:"
" Invalid glyph index for default character,"
" setting to zero\n" ));
defaultCharEncodingOffset = 0;
" Invalid glyph index for default character,\n"
" "
" setting it to the first glyph of the font\n" ));
defaultCharEncodingOffset = 1;
}
}
if ( defaultCharEncodingOffset )
{
/* do the swapping */
PCF_MetricRec tmp = face->metrics[defaultCharEncodingOffset];
face->metrics[defaultCharEncodingOffset] = face->metrics[0];
face->metrics[0] = tmp;
}
/* copy metrics of default character to index 0 */
face->metrics[0] = face->metrics[defaultCharEncodingOffset];
/* now loop over all values */
offset = enc->offset;
for ( i = enc->firstRow; i <= enc->lastRow; i++ )
{
@ -1111,15 +1126,9 @@ THE SOFTWARE.
else
encodingOffset = FT_GET_USHORT_LE();
if ( encodingOffset != 0xFFFFU )
{
if ( encodingOffset == defaultCharEncodingOffset )
encodingOffset = 0;
else if ( encodingOffset == 0 )
encodingOffset = defaultCharEncodingOffset;
}
*offset++ = encodingOffset;
/* everything is off by 1 due to the artificial glyph 0 */
*offset++ = encodingOffset == 0xFFFF ? 0xFFFF
: encodingOffset + 1;
}
}
FT_Stream_ExitFrame( stream );