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

formatting

This commit is contained in:
Werner Lemberg 2007-03-21 13:30:14 +00:00
parent 6fb74f676b
commit c9f6c66f95
2 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,21 +1,20 @@
2007-03-19 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2007-03-19 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
* builds/unix/configure.raw: Dequote `OS_INLINE' in * builds/unix/configure.raw: Dequote `OS_INLINE' in comment of
comment conftest.c, to avoid unexpected shell evaluation. conftest.c, to avoid unexpected shell evaluation. Possibly it is a
Possibly it is a bug or undocumented behaviour of autoconf. bug or undocumented behaviour of autoconf.
2007-03-18 David Turner <david@freetype.org> 2007-03-18 David Turner <david@freetype.org>
* src/truetype/ttinterp.c (Ins_MDRP): another bytecode * src/truetype/ttinterp.c (Ins_MDRP): Another bytecode regression
regression fix; testing still needed fix; testing still needed.
* src/truetype/ttinterp.c (Ins_MD): another bytecode * src/truetype/ttinterp.c (Ins_MD): Another bytecode regression fix.
regression fix
2007-03-17 David Turner <david@freetype.org> 2007-03-17 David Turner <david@freetype.org>
* src/truetype/ttinterp.c (Ins_IP): fixing wrong handling * src/truetype/ttinterp.c (Ins_IP): Fix wrong handling of the
of the (undocumented) twilight zone special case. (undocumented) twilight zone special case.
2007-03-09 Werner Lemberg <wl@gnu.org> 2007-03-09 Werner Lemberg <wl@gnu.org>

64
src/truetype/ttinterp.c
View File

@ -1201,7 +1201,7 @@
lo = l; lo = l;
l = lo + 0x2000U; l = lo + 0x2000U;
hi += (l < lo); hi += l < lo;
return ( hi << 18 ) | ( l >> 14 ); return ( hi << 18 ) | ( l >> 14 );
} }
@ -2165,7 +2165,7 @@
break; break;
} }
if ( (selector & 0x0F) == 0 ) if ( ( selector & 0x0F ) == 0 )
CUR.threshold = CUR.period - 1; CUR.threshold = CUR.period - 1;
else else
CUR.threshold = ( (FT_Int)( selector & 0x0F ) - 4 ) * CUR.period / 8; CUR.threshold = ( (FT_Int)( selector & 0x0F ) - 4 ) * CUR.period / 8;
@ -4663,7 +4663,7 @@
FT_UShort L, K; FT_UShort L, K;
L = (FT_UShort)(CUR.opcode - 0xB0 + 1); L = (FT_UShort)( CUR.opcode - 0xB0 + 1 );
if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) )
{ {
@ -4688,7 +4688,7 @@
FT_UShort L, K; FT_UShort L, K;
L = (FT_UShort)(CUR.opcode - 0xB8 + 1); L = (FT_UShort)( CUR.opcode - 0xB8 + 1 );
if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) ) if ( BOUNDS( L, CUR.stackSize + 1 - CUR.top ) )
{ {
@ -4840,8 +4840,8 @@
if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 ) if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 )
{ {
vec1.x = CUR.zp0.org[L].x - CUR.zp1.org[K].x; vec1.x = CUR.zp0.org[L].x - CUR.zp1.org[K].x;
vec1.y = CUR.zp0.org[L].y - CUR.zp1.org[K].y; vec1.y = CUR.zp0.org[L].y - CUR.zp1.org[K].y;
} }
else else
{ {
@ -5111,25 +5111,25 @@
A *= 64; A *= 64;
#if 0 #if 0
if ( (args[0] & 0x100) != 0 && CUR.metrics.pointSize <= A ) if ( ( args[0] & 0x100 ) != 0 && CUR.metrics.pointSize <= A )
CUR.GS.scan_control = TRUE; CUR.GS.scan_control = TRUE;
#endif #endif
if ( (args[0] & 0x200) != 0 && CUR.tt_metrics.rotated ) if ( ( args[0] & 0x200 ) != 0 && CUR.tt_metrics.rotated )
CUR.GS.scan_control = TRUE; CUR.GS.scan_control = TRUE;
if ( (args[0] & 0x400) != 0 && CUR.tt_metrics.stretched ) if ( ( args[0] & 0x400 ) != 0 && CUR.tt_metrics.stretched )
CUR.GS.scan_control = TRUE; CUR.GS.scan_control = TRUE;
#if 0 #if 0
if ( (args[0] & 0x800) != 0 && CUR.metrics.pointSize > A ) if ( ( args[0] & 0x800 ) != 0 && CUR.metrics.pointSize > A )
CUR.GS.scan_control = FALSE; CUR.GS.scan_control = FALSE;
#endif #endif
if ( (args[0] & 0x1000) != 0 && CUR.tt_metrics.rotated ) if ( ( args[0] & 0x1000 ) != 0 && CUR.tt_metrics.rotated )
CUR.GS.scan_control = FALSE; CUR.GS.scan_control = FALSE;
if ( (args[0] & 0x2000) != 0 && CUR.tt_metrics.stretched ) if ( ( args[0] & 0x2000 ) != 0 && CUR.tt_metrics.stretched )
CUR.GS.scan_control = FALSE; CUR.GS.scan_control = FALSE;
} }
@ -5634,7 +5634,7 @@
CUR.GS.rp1 = CUR.GS.rp0; CUR.GS.rp1 = CUR.GS.rp0;
CUR.GS.rp2 = point; CUR.GS.rp2 = point;
if ( (CUR.opcode & 1) != 0 ) if ( ( CUR.opcode & 1 ) != 0 )
CUR.GS.rp0 = point; CUR.GS.rp0 = point;
} }
@ -5706,7 +5706,7 @@
return; return;
} }
/* UNDOCUMENTED! */ /* XXX: UNDOCUMENTED! */
/* */ /* */
/* The behaviour of an MIAP instruction is quite */ /* The behaviour of an MIAP instruction is quite */
/* different when used in the twilight zone. */ /* different when used in the twilight zone. */
@ -5782,13 +5782,14 @@
#ifdef FIX_BYTECODE #ifdef FIX_BYTECODE
/* UNDOCUMENTED: twilight zone special case */ /* XXX: UNDOCUMENTED: twilight zone special case */
if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 ) if ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 )
{ {
FT_Vector* vec1 = &CUR.zp1.org[point]; FT_Vector* vec1 = &CUR.zp1.org[point];
FT_Vector* vec2 = &CUR.zp0.org[CUR.GS.rp0]; FT_Vector* vec2 = &CUR.zp0.org[CUR.GS.rp0];
org_dist = CUR_Func_dualproj( vec1, vec2 ); org_dist = CUR_Func_dualproj( vec1, vec2 );
} }
else else
@ -5807,6 +5808,7 @@
{ {
FT_Vector vec; FT_Vector vec;
vec.x = TT_MULFIX( vec1->x - vec2->x, CUR.metrics.x_scale ); vec.x = TT_MULFIX( vec1->x - vec2->x, CUR.metrics.x_scale );
vec.y = TT_MULFIX( vec1->y - vec2->y, CUR.metrics.y_scale ); vec.y = TT_MULFIX( vec1->y - vec2->y, CUR.metrics.y_scale );
@ -6196,19 +6198,19 @@
* Otherwise, by definition, the value of CUR.twilight.orus[n] is (0,0), * Otherwise, by definition, the value of CUR.twilight.orus[n] is (0,0),
* for every n. * for every n.
*/ */
twilight = ( CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 || CUR.GS.gep2 == 0 ); twilight = CUR.GS.gep0 == 0 || CUR.GS.gep1 == 0 || CUR.GS.gep2 == 0;
if (twilight) if ( twilight )
orus_base = &CUR.zp0.org[CUR.GS.rp1]; orus_base = &CUR.zp0.org[CUR.GS.rp1];
else else
orus_base = &CUR.zp0.orus[CUR.GS.rp1]; orus_base = &CUR.zp0.orus[CUR.GS.rp1];
cur_base = &CUR.zp0.cur[CUR.GS.rp1]; cur_base = &CUR.zp0.cur[CUR.GS.rp1];
/* XXX: There are some glyphs in some braindead but popular */ /* XXX: There are some glyphs in some braindead but popular */
/* fonts out there (e.g. [aeu]grave in monotype.ttf) */ /* fonts out there (e.g. [aeu]grave in monotype.ttf) */
/* calling IP[] with bad values of rp[12]. */ /* calling IP[] with bad values of rp[12]. */
/* Do something sane when this odd thing happens. */ /* Do something sane when this odd thing happens. */
if ( BOUNDS( CUR.GS.rp1, CUR.zp0.n_points ) || if ( BOUNDS( CUR.GS.rp1, CUR.zp0.n_points ) ||
BOUNDS( CUR.GS.rp2, CUR.zp1.n_points ) ) BOUNDS( CUR.GS.rp2, CUR.zp1.n_points ) )
{ {
@ -6217,12 +6219,14 @@
} }
else else
{ {
if (twilight) if ( twilight )
old_range = CUR_Func_dualproj( &CUR.zp1.org[CUR.GS.rp2], orus_base ); old_range = CUR_Func_dualproj( &CUR.zp1.org[CUR.GS.rp2],
orus_base );
else else
old_range = CUR_Func_dualproj( &CUR.zp1.orus[CUR.GS.rp2], orus_base ); old_range = CUR_Func_dualproj( &CUR.zp1.orus[CUR.GS.rp2],
orus_base );
cur_range = CUR_Func_project ( &CUR.zp1.cur[CUR.GS.rp2], cur_base ); cur_range = CUR_Func_project ( &CUR.zp1.cur[CUR.GS.rp2], cur_base );
} }
for ( ; CUR.GS.loop > 0; --CUR.GS.loop ) for ( ; CUR.GS.loop > 0; --CUR.GS.loop )
@ -6242,13 +6246,13 @@
continue; continue;
} }
if (twilight) if ( twilight )
org_dist = CUR_Func_dualproj( &CUR.zp2.org[point], orus_base ); org_dist = CUR_Func_dualproj( &CUR.zp2.org[point], orus_base );
else else
org_dist = CUR_Func_dualproj( &CUR.zp2.orus[point], orus_base ); org_dist = CUR_Func_dualproj( &CUR.zp2.orus[point], orus_base );
cur_dist = CUR_Func_project ( &CUR.zp2.cur[point], cur_base ); cur_dist = CUR_Func_project ( &CUR.zp2.cur[point], cur_base );
new_dist = (old_range != 0) new_dist = ( old_range != 0 )
? TT_MULDIV( org_dist, cur_range, old_range ) ? TT_MULDIV( org_dist, cur_range, old_range )
: cur_dist; : cur_dist;
@ -6548,7 +6552,7 @@
end_point = CUR.pts.contours[contour] - CUR.pts.first_point; end_point = CUR.pts.contours[contour] - CUR.pts.first_point;
first_point = point; first_point = point;
while ( point <= end_point && (CUR.pts.tags[point] & mask) == 0 ) while ( point <= end_point && ( CUR.pts.tags[point] & mask ) == 0 )
point++; point++;
if ( point <= end_point ) if ( point <= end_point )