* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate):
Remove compiler warning. Formatting.
This commit is contained in:
parent
9207e00198
commit
6b87e6f0ff
20
ChangeLog
20
ChangeLog
|
@ -1,21 +1,27 @@
|
||||||
|
2007-01-02 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate):
|
||||||
|
Remove compiler warning.
|
||||||
|
|
||||||
2007-01-02 David Turner <david@freetype.org>
|
2007-01-02 David Turner <david@freetype.org>
|
||||||
|
|
||||||
* src/sfnt/sfobjs.c: adding documentation comment
|
* src/sfnt/sfobjs.c: Add documentation comment.
|
||||||
|
|
||||||
2006-12-31 Masatake YAMATO <jet@gyve.org>
|
2006-12-31 Masatake YAMATO <jet@gyve.org>
|
||||||
|
|
||||||
* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New function.
|
* src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New
|
||||||
Checks uniqueness of the gid pairs.
|
function.
|
||||||
|
Check uniqueness of the gid pairs.
|
||||||
(gxv_kern_subtable_fmt0_validate): Move some code to
|
(gxv_kern_subtable_fmt0_validate): Move some code to
|
||||||
`gxv_kern_subtable_fmt0_pairs_validate'.
|
`gxv_kern_subtable_fmt0_pairs_validate'.
|
||||||
|
|
||||||
2006-12-22 David Turner <david@freetype.org>
|
2006-12-22 David Turner <david@freetype.org>
|
||||||
|
|
||||||
* src/autofit/aflatin.c, src/truetype/ttgload.c: removing compiler
|
* src/autofit/aflatin.c, src/truetype/ttgload.c: Remove compiler
|
||||||
warnings
|
warnings.
|
||||||
|
|
||||||
* builds/win32/visualc/freetype.vcproj: adding _CRT_SECURE_NO_DEPRECATE
|
* builds/win32/visualc/freetype.vcproj: Add _CRT_SECURE_NO_DEPRECATE
|
||||||
to avoid deprecation warnings with Visual C++ 8
|
to avoid deprecation warnings with Visual C++ 8.
|
||||||
|
|
||||||
2006-12-16 Anders Kaseorg <anders@kaseorg.com>
|
2006-12-16 Anders Kaseorg <anders@kaseorg.com>
|
||||||
|
|
||||||
|
|
|
@ -797,11 +797,13 @@
|
||||||
|
|
||||||
p = first->prev;
|
p = first->prev;
|
||||||
if ( p->v < first_v )
|
if ( p->v < first_v )
|
||||||
segment->height = (FT_Short)(segment->height + (( first_v - p->v ) >> 1));
|
segment->height = (FT_Short)( segment->height +
|
||||||
|
( ( first_v - p->v ) >> 1 ) );
|
||||||
|
|
||||||
p = last->next;
|
p = last->next;
|
||||||
if ( p->v > last_v )
|
if ( p->v > last_v )
|
||||||
segment->height = (FT_Short)(segment->height + (( p->v - last_v ) >> 1));
|
segment->height = (FT_Short)( segment->height +
|
||||||
|
( ( p->v - last_v ) >> 1 ) );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -810,11 +812,13 @@
|
||||||
|
|
||||||
p = first->prev;
|
p = first->prev;
|
||||||
if ( p->v > first_v )
|
if ( p->v > first_v )
|
||||||
segment->height = (FT_Short)(segment->height + (( p->v - first_v ) >> 1));
|
segment->height = (FT_Short)( segment->height +
|
||||||
|
( ( p->v - first_v ) >> 1 ) );
|
||||||
|
|
||||||
p = last->next;
|
p = last->next;
|
||||||
if ( p->v < last_v )
|
if ( p->v < last_v )
|
||||||
segment->height = (FT_Short)(segment->height + (( last_v - p->v ) >> 1));
|
segment->height = (FT_Short)( segment->height +
|
||||||
|
( ( last_v - p->v ) >> 1 ) );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
/* */
|
/* */
|
||||||
/* TrueTypeGX/AAT kern table validation (body). */
|
/* TrueTypeGX/AAT kern table validation (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 2004, 2005 by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
|
/* Copyright 2004, 2005, 2006, 2007 */
|
||||||
|
/* by suzuki toshiya, Masatake YAMATO, Red Hat K.K., */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -117,8 +118,10 @@
|
||||||
FT_UShort last_gid_left = 0;
|
FT_UShort last_gid_left = 0;
|
||||||
FT_UShort last_gid_right = 0;
|
FT_UShort last_gid_right = 0;
|
||||||
|
|
||||||
|
FT_UNUSED( limit );
|
||||||
|
|
||||||
GXV_NAME_ENTER( "kern format 0 paris" );
|
|
||||||
|
GXV_NAME_ENTER( "kern format 0 pairs" );
|
||||||
|
|
||||||
for ( i = 0; i < nPairs; i++ )
|
for ( i = 0; i < nPairs; i++ )
|
||||||
{
|
{
|
||||||
|
@ -135,7 +138,7 @@
|
||||||
gid_right = FT_NEXT_USHORT( p );
|
gid_right = FT_NEXT_USHORT( p );
|
||||||
gxv_glyphid_validate( gid_right, valid );
|
gxv_glyphid_validate( gid_right, valid );
|
||||||
|
|
||||||
/* A pair of left and right gid must be uniqe and be sorted. */
|
/* Pairs of left and right GIDs must be unique and sorted. */
|
||||||
GXV_TRACE(( "left gid = %u, right gid = %u\n", gid_left, gid_right ));
|
GXV_TRACE(( "left gid = %u, right gid = %u\n", gid_left, gid_right ));
|
||||||
if ( gid_left == last_gid_left )
|
if ( gid_left == last_gid_left )
|
||||||
{
|
{
|
||||||
|
@ -170,7 +173,7 @@
|
||||||
FT_UShort unitSize;
|
FT_UShort unitSize;
|
||||||
|
|
||||||
|
|
||||||
GXV_NAME_ENTER( "kern subtable format0" );
|
GXV_NAME_ENTER( "kern subtable format 0" );
|
||||||
|
|
||||||
unitSize = 2 + 2 + 2;
|
unitSize = 2 + 2 + 2;
|
||||||
nPairs = 0;
|
nPairs = 0;
|
||||||
|
@ -300,7 +303,7 @@
|
||||||
GXV_kern_fmt1_StateOptRec vt_rec;
|
GXV_kern_fmt1_StateOptRec vt_rec;
|
||||||
|
|
||||||
|
|
||||||
GXV_NAME_ENTER( "kern subtable format1" );
|
GXV_NAME_ENTER( "kern subtable format 1" );
|
||||||
|
|
||||||
valid->statetable.optdata =
|
valid->statetable.optdata =
|
||||||
&vt_rec;
|
&vt_rec;
|
||||||
|
@ -402,7 +405,7 @@
|
||||||
FT_UShort rightOffsetTable;
|
FT_UShort rightOffsetTable;
|
||||||
|
|
||||||
|
|
||||||
GXV_NAME_ENTER( "kern subtable format2" );
|
GXV_NAME_ENTER( "kern subtable format 2" );
|
||||||
|
|
||||||
GXV_ODTECT_INIT( odtect );
|
GXV_ODTECT_INIT( odtect );
|
||||||
fmt2_rec.odtect = odtect;
|
fmt2_rec.odtect = odtect;
|
||||||
|
@ -459,7 +462,7 @@
|
||||||
FT_Byte flags;
|
FT_Byte flags;
|
||||||
|
|
||||||
|
|
||||||
GXV_NAME_ENTER( "kern subtable format3" );
|
GXV_NAME_ENTER( "kern subtable format 3" );
|
||||||
|
|
||||||
GXV_LIMIT_CHECK( 2 + 1 + 1 + 1 + 1 );
|
GXV_LIMIT_CHECK( 2 + 1 + 1 + 1 + 1 );
|
||||||
glyphCount = FT_NEXT_USHORT( p );
|
glyphCount = FT_NEXT_USHORT( p );
|
||||||
|
|
|
@ -229,11 +229,11 @@
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TT_MS_ID_UCS_4:
|
case TT_MS_ID_UCS_4:
|
||||||
/* apparently, when this value is found in a name table entry,
|
/* Apparently, if this value is found in a name table entry, it is */
|
||||||
* it is documented as "Full Unicode repertoire". Experience
|
/* documented as `full Unicode repertoire'. Experience with the */
|
||||||
* with the MsGothic shipped with Windows Vista shows that this is
|
/* MsGothic font shipped with Windows Vista shows that this really */
|
||||||
* really UTF-16 names (the real UCS-4 is only used for charmaps)
|
/* means UTF-16 encoded names (UCS-4 values are only used within */
|
||||||
*/
|
/* charmaps). */
|
||||||
convert = tt_name_entry_ascii_from_utf16;
|
convert = tt_name_entry_ascii_from_utf16;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -644,7 +644,7 @@
|
||||||
loader->exec->pts = *zone;
|
loader->exec->pts = *zone;
|
||||||
|
|
||||||
debug = FT_BOOL( !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
|
debug = FT_BOOL( !( loader->load_flags & FT_LOAD_NO_SCALE ) &&
|
||||||
((TT_Size)loader->size)->debug );
|
((TT_Size)loader->size)->debug );
|
||||||
|
|
||||||
error = TT_Run_Context( loader->exec, debug );
|
error = TT_Run_Context( loader->exec, debug );
|
||||||
if ( error && loader->exec->pedantic_hinting )
|
if ( error && loader->exec->pedantic_hinting )
|
||||||
|
|
Loading…
Reference in New Issue