upstream/oracle/xnv: open-src/lib/freetype/ttinterp.c.6.patch@425233ae7236 (annotated)

780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1	# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
919 425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	2	# Use is subject to license terms.
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	3	#
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	4	# Permission is hereby granted, free of charge, to any person obtaining a
919 425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	5	# copy of this software and associated documentation files (the "Software"),
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	6	# to deal in the Software without restriction, including without limitation
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	7	# the rights to use, copy, modify, merge, publish, distribute, sublicense,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	8	# and/or sell copies of the Software, and to permit persons to whom the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	9	# Software is furnished to do so, subject to the following conditions:
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	10	#
919 425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	11	# The above copyright notice and this permission notice (including the next
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	12	# paragraph) shall be included in all copies or substantial portions of the
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	13	# Software.
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	14	#
919 425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	15	# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	16	# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	17	# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	18	# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	19	# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	20	# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
425233ae7236 6931307 Standardize Sun copyright & license notices in X gate on current format Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 780 diff changeset	21	# DEALINGS IN THE SOFTWARE.
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	22	--- freetype-2.3.9/src/truetype/ttinterp.c 2009-01-25 10:00:11.000000000 -0500
2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	23	+++ freetype-2.3.9/src/truetype/ttinterp.c 2009-08-27 12:51:02.963900000 -0400
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	24	@@ -237,8 +237,8 @@
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	25	#define GUESS_VECTOR( V ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	26	if ( CUR.face->unpatented_hinting ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	27	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	28	- CUR.GS.V.x = (FT_F2Dot14)( CUR.GS.both_x_axis ? 0x4000 : 0 ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	29	- CUR.GS.V.y = (FT_F2Dot14)( CUR.GS.both_x_axis ? 0 : 0x4000 ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	30	+ CUR.FT_GS.V.x = (FT_F2Dot14)( CUR.FT_GS.both_x_axis ? 0x4000 : 0 ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	31	+ CUR.FT_GS.V.y = (FT_F2Dot14)( CUR.FT_GS.both_x_axis ? 0 : 0x4000 ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	32	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	33	#else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	34	#define GUESS_VECTOR( V )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	35	@@ -585,7 +585,7 @@
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	36	exec->codeRangeTable[i] = size->codeRangeTable[i];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	37
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	38	/* set graphics state */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	39	- exec->GS = size->GS;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	40	+ exec->FT_GS = size->FT_GS;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	41
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	42	exec->cvtSize = size->cvt_size;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	43	exec->cvt = size->cvt;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	44	@@ -713,22 +713,22 @@
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	45	exec->zp1 = exec->pts;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	46	exec->zp2 = exec->pts;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	47
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	48	- exec->GS.gep0 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	49	- exec->GS.gep1 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	50	- exec->GS.gep2 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	51	+ exec->FT_GS.gep0 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	52	+ exec->FT_GS.gep1 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	53	+ exec->FT_GS.gep2 = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	54
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	55	- exec->GS.projVector.x = 0x4000;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	56	- exec->GS.projVector.y = 0x0000;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	57	+ exec->FT_GS.projVector.x = 0x4000;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	58	+ exec->FT_GS.projVector.y = 0x0000;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	59
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	60	- exec->GS.freeVector = exec->GS.projVector;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	61	- exec->GS.dualVector = exec->GS.projVector;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	62	+ exec->FT_GS.freeVector = exec->FT_GS.projVector;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	63	+ exec->FT_GS.dualVector = exec->FT_GS.projVector;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	64
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	65	#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	66	- exec->GS.both_x_axis = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	67	+ exec->FT_GS.both_x_axis = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	68	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	69
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	70	- exec->GS.round_state = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	71	- exec->GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	72	+ exec->FT_GS.round_state = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	73	+ exec->FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	74
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	75	/* some glyphs leave something on the stack. so we clean it */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	76	/* before a new execution. */
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	77	@@ -1357,7 +1357,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	78	#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	79	if ( CUR.face->unpatented_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	80	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	81	- if ( CUR.GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	82	+ if ( CUR.FT_GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	83	CUR.tt_metrics.ratio = CUR.tt_metrics.x_ratio;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	84	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	85	CUR.tt_metrics.ratio = CUR.tt_metrics.y_ratio;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	86	@@ -1365,10 +1365,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	87	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	88	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	89	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	90	- if ( CUR.GS.projVector.y == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	91	+ if ( CUR.FT_GS.projVector.y == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	92	CUR.tt_metrics.ratio = CUR.tt_metrics.x_ratio;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	93
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	94	- else if ( CUR.GS.projVector.x == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	95	+ else if ( CUR.FT_GS.projVector.x == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	96	CUR.tt_metrics.ratio = CUR.tt_metrics.y_ratio;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	97
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	98	else
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	99	@@ -1376,9 +1376,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	100	FT_Long x, y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	101
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	102
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	103	- x = TT_MULDIV( CUR.GS.projVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	104	+ x = TT_MULDIV( CUR.FT_GS.projVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	105	CUR.tt_metrics.x_ratio, 0x4000 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	106	- y = TT_MULDIV( CUR.GS.projVector.y,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	107	+ y = TT_MULDIV( CUR.FT_GS.projVector.y,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	108	CUR.tt_metrics.y_ratio, 0x4000 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	109	CUR.tt_metrics.ratio = TT_VecLen( x, y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	110	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	111	@@ -1558,7 +1558,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	112	FT_ASSERT( !CUR.face->unpatented_hinting );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	113	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	114
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	115	- v = CUR.GS.freeVector.x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	116	+ v = CUR.FT_GS.freeVector.x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	117
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	118	if ( v != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	119	{
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	120	@@ -1569,7 +1569,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	121	zone->tags[point] \|= FT_CURVE_TAG_TOUCH_X;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	122	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	123
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	124	- v = CUR.GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	125	+ v = CUR.FT_GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	126
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	127	if ( v != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	128	{
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	129	@@ -1611,14 +1611,14 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	130	FT_ASSERT( !CUR.face->unpatented_hinting );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	131	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	132
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	133	- v = CUR.GS.freeVector.x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	134	+ v = CUR.FT_GS.freeVector.x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	135
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	136	if ( v != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	137	zone->org[point].x += TT_MULDIV( distance,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	138	v * 0x10000L,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	139	CUR.F_dot_P );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	140
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	141	- v = CUR.GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	142	+ v = CUR.FT_GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	143
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	144	if ( v != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	145	zone->org[point].y += TT_MULDIV( distance,
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	146	@@ -2198,8 +2198,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	147	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	148
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	149	return TT_DotFix14( dx, dy,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	150	- CUR.GS.projVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	151	- CUR.GS.projVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	152	+ CUR.FT_GS.projVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	153	+ CUR.FT_GS.projVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	154	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	155
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	156
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	157	@@ -2224,8 +2224,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	158	FT_Pos dy )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	159	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	160	return TT_DotFix14( dx, dy,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	161	- CUR.GS.dualVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	162	- CUR.GS.dualVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	163	+ CUR.FT_GS.dualVector.x,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	164	+ CUR.FT_GS.dualVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	165	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	166
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	167
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	168	@@ -2302,18 +2302,18 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	169	/* `both-x-axis' true, otherwise set it false. The x values only */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	170	/* need be tested because the vector has been normalised to a unit */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	171	/* vector of length 0x4000 = unity. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	172	- CUR.GS.both_x_axis = (FT_Bool)( CUR.GS.projVector.x == 0x4000 &&
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	173	- CUR.GS.freeVector.x == 0x4000 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	174	+ CUR.FT_GS.both_x_axis = (FT_Bool)( CUR.FT_GS.projVector.x == 0x4000 &&
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	175	+ CUR.FT_GS.freeVector.x == 0x4000 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	176
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	177	/* Throw away projection and freedom vector information */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	178	/* because the patents don't allow them to be stored. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	179	/* The relevant US Patents are 5155805 and 5325479. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	180	- CUR.GS.projVector.x = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	181	- CUR.GS.projVector.y = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	182	- CUR.GS.freeVector.x = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	183	- CUR.GS.freeVector.y = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	184	+ CUR.FT_GS.projVector.x = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	185	+ CUR.FT_GS.projVector.y = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	186	+ CUR.FT_GS.freeVector.x = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	187	+ CUR.FT_GS.freeVector.y = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	188
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	189	- if ( CUR.GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	190	+ if ( CUR.FT_GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	191	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	192	CUR.func_project = Project_x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	193	CUR.func_move = Direct_Move_X;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	194	@@ -2326,11 +2326,11 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	195	CUR.func_move_orig = Direct_Move_Orig_Y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	196	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	197
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	198	- if ( CUR.GS.dualVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	199	+ if ( CUR.FT_GS.dualVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	200	CUR.func_dualproj = Project_x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	201	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	202	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	203	- if ( CUR.GS.dualVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	204	+ if ( CUR.FT_GS.dualVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	205	CUR.func_dualproj = Project_y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	206	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	207	CUR.func_dualproj = Dual_Project;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	208	@@ -2343,32 +2343,32 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	209	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	210	#endif /* TT_CONFIG_OPTION_UNPATENTED_HINTING */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	211
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	212	- if ( CUR.GS.freeVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	213	- CUR.F_dot_P = CUR.GS.projVector.x * 0x10000L;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	214	+ if ( CUR.FT_GS.freeVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	215	+ CUR.F_dot_P = CUR.FT_GS.projVector.x * 0x10000L;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	216	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	217	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	218	- if ( CUR.GS.freeVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	219	- CUR.F_dot_P = CUR.GS.projVector.y * 0x10000L;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	220	+ if ( CUR.FT_GS.freeVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	221	+ CUR.F_dot_P = CUR.FT_GS.projVector.y * 0x10000L;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	222	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	223	- CUR.F_dot_P = (FT_Long)CUR.GS.projVector.x * CUR.GS.freeVector.x * 4 +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	224	- (FT_Long)CUR.GS.projVector.y * CUR.GS.freeVector.y * 4;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	225	+ CUR.F_dot_P = (FT_Long)CUR.FT_GS.projVector.x * CUR.FT_GS.freeVector.x * 4 +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	226	+ (FT_Long)CUR.FT_GS.projVector.y * CUR.FT_GS.freeVector.y * 4;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	227	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	228
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	229	- if ( CUR.GS.projVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	230	+ if ( CUR.FT_GS.projVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	231	CUR.func_project = (TT_Project_Func)Project_x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	232	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	233	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	234	- if ( CUR.GS.projVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	235	+ if ( CUR.FT_GS.projVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	236	CUR.func_project = (TT_Project_Func)Project_y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	237	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	238	CUR.func_project = (TT_Project_Func)Project;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	239	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	240
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	241	- if ( CUR.GS.dualVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	242	+ if ( CUR.FT_GS.dualVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	243	CUR.func_dualproj = (TT_Project_Func)Project_x;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	244	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	245	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	246	- if ( CUR.GS.dualVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	247	+ if ( CUR.FT_GS.dualVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	248	CUR.func_dualproj = (TT_Project_Func)Project_y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	249	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	250	CUR.func_dualproj = (TT_Project_Func)Dual_Project;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	251	@@ -2379,14 +2379,14 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	252
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	253	if ( CUR.F_dot_P == 0x40000000L )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	254	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	255	- if ( CUR.GS.freeVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	256	+ if ( CUR.FT_GS.freeVector.x == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	257	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	258	CUR.func_move = (TT_Move_Func)Direct_Move_X;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	259	CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig_X;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	260	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	261	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	262	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	263	- if ( CUR.GS.freeVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	264	+ if ( CUR.FT_GS.freeVector.y == 0x4000 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	265	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	266	CUR.func_move = (TT_Move_Func)Direct_Move_Y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	267	CUR.func_move_orig = (TT_Move_Func)Direct_Move_Orig_Y;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	268	@@ -2583,13 +2583,13 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	269	A = (FT_Short)( CUR.opcode & 1 ) << 14; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	270	B = A ^ (FT_Short)0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	271	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	272	- CUR.GS.freeVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	273	- CUR.GS.projVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	274	- CUR.GS.dualVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	275	+ CUR.FT_GS.freeVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	276	+ CUR.FT_GS.projVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	277	+ CUR.FT_GS.dualVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	278	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	279	- CUR.GS.freeVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	280	- CUR.GS.projVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	281	- CUR.GS.dualVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	282	+ CUR.FT_GS.freeVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	283	+ CUR.FT_GS.projVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	284	+ CUR.FT_GS.dualVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	285	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	286	COMPUTE_Funcs(); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	287	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	288	@@ -2603,11 +2603,11 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	289	A = (FT_Short)( CUR.opcode & 1 ) << 14; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	290	B = A ^ (FT_Short)0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	291	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	292	- CUR.GS.projVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	293	- CUR.GS.dualVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	294	+ CUR.FT_GS.projVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	295	+ CUR.FT_GS.dualVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	296	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	297	- CUR.GS.projVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	298	- CUR.GS.dualVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	299	+ CUR.FT_GS.projVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	300	+ CUR.FT_GS.dualVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	301	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	302	GUESS_VECTOR( freeVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	303	\
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	304	@@ -2623,8 +2623,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	305	A = (FT_Short)( CUR.opcode & 1 ) << 14; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	306	B = A ^ (FT_Short)0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	307	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	308	- CUR.GS.freeVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	309	- CUR.GS.freeVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	310	+ CUR.FT_GS.freeVector.x = A; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	311	+ CUR.FT_GS.freeVector.y = B; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	312	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	313	GUESS_VECTOR( projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	314	\
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	315	@@ -2636,9 +2636,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	316	if ( INS_SxVTL( (FT_UShort)args[1], \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	317	(FT_UShort)args[0], \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	318	CUR.opcode, \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	319	- &CUR.GS.projVector ) == SUCCESS ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	320	+ &CUR.FT_GS.projVector ) == SUCCESS ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	321	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	322	- CUR.GS.dualVector = CUR.GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	323	+ CUR.FT_GS.dualVector = CUR.FT_GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	324	GUESS_VECTOR( freeVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	325	COMPUTE_Funcs(); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	326	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	327	@@ -2648,7 +2648,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	328	if ( INS_SxVTL( (FT_UShort)args[1], \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	329	(FT_UShort)args[0], \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	330	CUR.opcode, \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	331	- &CUR.GS.freeVector ) == SUCCESS ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	332	+ &CUR.FT_GS.freeVector ) == SUCCESS ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	333	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	334	GUESS_VECTOR( projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	335	COMPUTE_Funcs(); \
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	336	@@ -2657,7 +2657,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	337
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	338	#define DO_SFVTPV \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	339	GUESS_VECTOR( projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	340	- CUR.GS.freeVector = CUR.GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	341	+ CUR.FT_GS.freeVector = CUR.FT_GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	342	COMPUTE_Funcs();
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	343
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	344
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	345	@@ -2673,9 +2673,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	346	S = (FT_Short)args[0]; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	347	X = (FT_Long)S; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	348	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	349	- NORMalize( X, Y, &CUR.GS.projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	350	+ NORMalize( X, Y, &CUR.FT_GS.projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	351	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	352	- CUR.GS.dualVector = CUR.GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	353	+ CUR.FT_GS.dualVector = CUR.FT_GS.projVector; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	354	GUESS_VECTOR( freeVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	355	COMPUTE_Funcs(); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	356	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	357	@@ -2693,7 +2693,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	358	S = (FT_Short)args[0]; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	359	X = S; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	360	\
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	361	- NORMalize( X, Y, &CUR.GS.freeVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	362	+ NORMalize( X, Y, &CUR.FT_GS.freeVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	363	GUESS_VECTOR( projVector ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	364	COMPUTE_Funcs(); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	365	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	366	@@ -2703,18 +2703,18 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	367	#define DO_GPV \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	368	if ( CUR.face->unpatented_hinting ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	369	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	370	- args[0] = CUR.GS.both_x_axis ? 0x4000 : 0; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	371	- args[1] = CUR.GS.both_x_axis ? 0 : 0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	372	+ args[0] = CUR.FT_GS.both_x_axis ? 0x4000 : 0; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	373	+ args[1] = CUR.FT_GS.both_x_axis ? 0 : 0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	374	} \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	375	else \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	376	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	377	- args[0] = CUR.GS.projVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	378	- args[1] = CUR.GS.projVector.y; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	379	+ args[0] = CUR.FT_GS.projVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	380	+ args[1] = CUR.FT_GS.projVector.y; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	381	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	382	#else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	383	#define DO_GPV \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	384	- args[0] = CUR.GS.projVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	385	- args[1] = CUR.GS.projVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	386	+ args[0] = CUR.FT_GS.projVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	387	+ args[1] = CUR.FT_GS.projVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	388	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	389
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	390
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	391	@@ -2722,72 +2722,72 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	392	#define DO_GFV \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	393	if ( CUR.face->unpatented_hinting ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	394	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	395	- args[0] = CUR.GS.both_x_axis ? 0x4000 : 0; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	396	- args[1] = CUR.GS.both_x_axis ? 0 : 0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	397	+ args[0] = CUR.FT_GS.both_x_axis ? 0x4000 : 0; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	398	+ args[1] = CUR.FT_GS.both_x_axis ? 0 : 0x4000; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	399	} \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	400	else \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	401	{ \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	402	- args[0] = CUR.GS.freeVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	403	- args[1] = CUR.GS.freeVector.y; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	404	+ args[0] = CUR.FT_GS.freeVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	405	+ args[1] = CUR.FT_GS.freeVector.y; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	406	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	407	#else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	408	#define DO_GFV \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	409	- args[0] = CUR.GS.freeVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	410	- args[1] = CUR.GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	411	+ args[0] = CUR.FT_GS.freeVector.x; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	412	+ args[1] = CUR.FT_GS.freeVector.y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	413	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	414
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	415
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	416	#define DO_SRP0 \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	417	- CUR.GS.rp0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	418	+ CUR.FT_GS.rp0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	419
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	420
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	421	#define DO_SRP1 \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	422	- CUR.GS.rp1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	423	+ CUR.FT_GS.rp1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	424
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	425
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	426	#define DO_SRP2 \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	427	- CUR.GS.rp2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	428	+ CUR.FT_GS.rp2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	429
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	430
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	431	#define DO_RTHG \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	432	- CUR.GS.round_state = TT_Round_To_Half_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	433	+ CUR.FT_GS.round_state = TT_Round_To_Half_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	434	CUR.func_round = (TT_Round_Func)Round_To_Half_Grid;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	435
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	436
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	437	#define DO_RTG \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	438	- CUR.GS.round_state = TT_Round_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	439	+ CUR.FT_GS.round_state = TT_Round_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	440	CUR.func_round = (TT_Round_Func)Round_To_Grid;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	441
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	442
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	443	#define DO_RTDG \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	444	- CUR.GS.round_state = TT_Round_To_Double_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	445	+ CUR.FT_GS.round_state = TT_Round_To_Double_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	446	CUR.func_round = (TT_Round_Func)Round_To_Double_Grid;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	447
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	448
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	449	#define DO_RUTG \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	450	- CUR.GS.round_state = TT_Round_Up_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	451	+ CUR.FT_GS.round_state = TT_Round_Up_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	452	CUR.func_round = (TT_Round_Func)Round_Up_To_Grid;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	453
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	454
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	455	#define DO_RDTG \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	456	- CUR.GS.round_state = TT_Round_Down_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	457	+ CUR.FT_GS.round_state = TT_Round_Down_To_Grid; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	458	CUR.func_round = (TT_Round_Func)Round_Down_To_Grid;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	459
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	460
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	461	#define DO_ROFF \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	462	- CUR.GS.round_state = TT_Round_Off; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	463	+ CUR.FT_GS.round_state = TT_Round_Off; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	464	CUR.func_round = (TT_Round_Func)Round_None;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	465
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	466
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	467	#define DO_SROUND \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	468	SET_SuperRound( 0x4000, args[0] ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	469	- CUR.GS.round_state = TT_Round_Super; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	470	+ CUR.FT_GS.round_state = TT_Round_Super; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	471	CUR.func_round = (TT_Round_Func)Round_Super;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	472
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	473
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	474	#define DO_S45ROUND \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	475	SET_SuperRound( 0x2D41, args[0] ); \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	476	- CUR.GS.round_state = TT_Round_Super_45; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	477	+ CUR.FT_GS.round_state = TT_Round_Super_45; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	478	CUR.func_round = (TT_Round_Func)Round_Super_45;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	479
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	480
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	481	@@ -2795,19 +2795,19 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	482	if ( args[0] < 0 ) \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	483	CUR.error = TT_Err_Bad_Argument; \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	484	else \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	485	- CUR.GS.loop = args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	486	+ CUR.FT_GS.loop = args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	487
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	488
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	489	#define DO_SMD \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	490	- CUR.GS.minimum_distance = args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	491	+ CUR.FT_GS.minimum_distance = args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	492
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	493
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	494	#define DO_SCVTCI \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	495	- CUR.GS.control_value_cutin = (FT_F26Dot6)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	496	+ CUR.FT_GS.control_value_cutin = (FT_F26Dot6)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	497
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	498
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	499	#define DO_SSWCI \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	500	- CUR.GS.single_width_cutin = (FT_F26Dot6)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	501	+ CUR.FT_GS.single_width_cutin = (FT_F26Dot6)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	502
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	503
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	504	/* XXX: UNDOCUMENTED! or bug in the Windows engine? */
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	505	@@ -2817,23 +2817,23 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	506	/* units. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	507	/* */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	508	#define DO_SSW \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	509	- CUR.GS.single_width_value = (FT_F26Dot6)( args[0] >> 10 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	510	+ CUR.FT_GS.single_width_value = (FT_F26Dot6)( args[0] >> 10 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	511
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	512
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	513	#define DO_FLIPON \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	514	- CUR.GS.auto_flip = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	515	+ CUR.FT_GS.auto_flip = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	516
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	517
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	518	#define DO_FLIPOFF \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	519	- CUR.GS.auto_flip = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	520	+ CUR.FT_GS.auto_flip = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	521
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	522
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	523	#define DO_SDB \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	524	- CUR.GS.delta_base = (FT_Short)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	525	+ CUR.FT_GS.delta_base = (FT_Short)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	526
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	527
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	528	#define DO_SDS \
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	529	- CUR.GS.delta_shift = (FT_Short)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	530	+ CUR.FT_GS.delta_shift = (FT_Short)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	531
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	532
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	533	#define DO_MD /* nothing */
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	534	@@ -4783,7 +4783,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	535
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	536	/* not part of the specs, but here for safety */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	537
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	538	- if ( CUR.GS.gep2 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	539	+ if ( CUR.FT_GS.gep2 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	540	CUR.zp2.org[L] = CUR.zp2.cur[L];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	541	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	542
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	543	@@ -4896,7 +4896,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	544	A = -C;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	545	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	546
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	547	- NORMalize( A, B, &CUR.GS.dualVector );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	548	+ NORMalize( A, B, &CUR.FT_GS.dualVector );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	549
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	550	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	551	FT_Vector* v1 = CUR.zp1.cur + p2;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	552	@@ -4914,7 +4914,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	553	A = -C;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	554	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	555
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	556	- NORMalize( A, B, &CUR.GS.projVector );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	557	+ NORMalize( A, B, &CUR.FT_GS.projVector );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	558
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	559	GUESS_VECTOR( freeVector );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	560
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	561	@@ -4947,7 +4947,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	562	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	563	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	564
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	565	- CUR.GS.gep0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	566	+ CUR.FT_GS.gep0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	567	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	568
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	569
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	570	@@ -4976,7 +4976,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	571	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	572	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	573
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	574	- CUR.GS.gep1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	575	+ CUR.FT_GS.gep1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	576	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	577
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	578
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	579	@@ -5005,7 +5005,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	580	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	581	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	582
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	583	- CUR.GS.gep2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	584	+ CUR.FT_GS.gep2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	585	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	586
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	587
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	588	@@ -5037,9 +5037,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	589	CUR.zp1 = CUR.zp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	590	CUR.zp2 = CUR.zp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	591
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	592	- CUR.GS.gep0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	593	- CUR.GS.gep1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	594	- CUR.GS.gep2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	595	+ CUR.FT_GS.gep0 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	596	+ CUR.FT_GS.gep1 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	597	+ CUR.FT_GS.gep2 = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	598	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	599
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	600
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	601	@@ -5068,8 +5068,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	602	if ( L != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	603	L = K;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	604
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	605	- CUR.GS.instruct_control = FT_BOOL(
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	606	- ( (FT_Byte)CUR.GS.instruct_control & ~(FT_Byte)K ) \| (FT_Byte)L );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	607	+ CUR.FT_GS.instruct_control = FT_BOOL(
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	608	+ ( (FT_Byte)CUR.FT_GS.instruct_control & ~(FT_Byte)K ) \| (FT_Byte)L );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	609	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	610
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	611
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	612	@@ -5090,32 +5090,32 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	613
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	614	if ( A == 0xFF )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	615	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	616	- CUR.GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	617	+ CUR.FT_GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	618	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	619	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	620	else if ( A == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	621	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	622	- CUR.GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	623	+ CUR.FT_GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	624	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	625	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	626
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	627	if ( ( args[0] & 0x100 ) != 0 && CUR.tt_metrics.ppem <= A )
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	628	- CUR.GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	629	+ CUR.FT_GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	630
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	631	if ( ( args[0] & 0x200 ) != 0 && CUR.tt_metrics.rotated )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	632	- CUR.GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	633	+ CUR.FT_GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	634
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	635	if ( ( args[0] & 0x400 ) != 0 && CUR.tt_metrics.stretched )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	636	- CUR.GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	637	+ CUR.FT_GS.scan_control = TRUE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	638
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	639	if ( ( args[0] & 0x800 ) != 0 && CUR.tt_metrics.ppem > A )
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	640	- CUR.GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	641	+ CUR.FT_GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	642
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	643	if ( ( args[0] & 0x1000 ) != 0 && CUR.tt_metrics.rotated )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	644	- CUR.GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	645	+ CUR.FT_GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	646
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	647	if ( ( args[0] & 0x2000 ) != 0 && CUR.tt_metrics.stretched )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	648	- CUR.GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	649	+ CUR.FT_GS.scan_control = FALSE;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	650	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	651
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	652
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	653	@@ -5129,7 +5129,7 @@
465 2109a795b937 6723656 Upgrade Freetype2 to version 2.3.7 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 440 diff changeset	654	Ins_SCANTYPE( INS_ARG )
2109a795b937 6723656 Upgrade Freetype2 to version 2.3.7 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 440 diff changeset	655	{
2109a795b937 6723656 Upgrade Freetype2 to version 2.3.7 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 440 diff changeset	656	if ( args[0] >= 0 )
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	657	- CUR.GS.scan_type = (FT_Int)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	658	+ CUR.FT_GS.scan_type = (FT_Int)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	659	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	660
465 2109a795b937 6723656 Upgrade Freetype2 to version 2.3.7 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 440 diff changeset	661
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	662	@@ -5156,13 +5156,13 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	663	FT_UNUSED_ARG;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	664
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	665
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	666	- if ( CUR.top < CUR.GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	667	+ if ( CUR.top < CUR.FT_GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	668	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	669	CUR.error = TT_Err_Too_Few_Arguments;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	670	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	671	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	672
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	673	- while ( CUR.GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	674	+ while ( CUR.FT_GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	675	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	676	CUR.args--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	677
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	678	@@ -5179,10 +5179,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	679	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	680	CUR.pts.tags[point] ^= FT_CURVE_TAG_ON;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	681
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	682	- CUR.GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	683	+ CUR.FT_GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	684	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	685
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	686	- CUR.GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	687	+ CUR.FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	688	CUR.new_top = CUR.args;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	689	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	690
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	691	@@ -5257,12 +5257,12 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	692	if ( CUR.opcode & 1 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	693	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	694	zp = CUR.zp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	695	- p = CUR.GS.rp1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	696	+ p = CUR.FT_GS.rp1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	697	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	698	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	699	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	700	zp = CUR.zp1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	701	- p = CUR.GS.rp2;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	702	+ p = CUR.FT_GS.rp2;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	703	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	704
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	705	if ( BOUNDS( p, zp.n_points ) )
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	706	@@ -5281,7 +5281,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	707	#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	708	if ( CUR.face->unpatented_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	709	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	710	- if ( CUR.GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	711	+ if ( CUR.FT_GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	712	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	713	*x = d;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	714	*y = 0;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	715	@@ -5296,10 +5296,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	716	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	717	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	718	*x = TT_MULDIV( d,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	719	- (FT_Long)CUR.GS.freeVector.x * 0x10000L,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	720	+ (FT_Long)CUR.FT_GS.freeVector.x * 0x10000L,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	721	CUR.F_dot_P );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	722	*y = TT_MULDIV( d,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	723	- (FT_Long)CUR.GS.freeVector.y * 0x10000L,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	724	+ (FT_Long)CUR.FT_GS.freeVector.y * 0x10000L,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	725	CUR.F_dot_P );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	726	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	727
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	728	@@ -5316,7 +5316,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	729	#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	730	if ( CUR.face->unpatented_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	731	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	732	- if ( CUR.GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	733	+ if ( CUR.FT_GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	734	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	735	CUR.zp2.cur[point].x += dx;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	736	if ( touch )
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	737	@@ -5332,14 +5332,14 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	738	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	739	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	740
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	741	- if ( CUR.GS.freeVector.x != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	742	+ if ( CUR.FT_GS.freeVector.x != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	743	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	744	CUR.zp2.cur[point].x += dx;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	745	if ( touch )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	746	CUR.zp2.tags[point] \|= FT_CURVE_TAG_TOUCH_X;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	747	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	748
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	749	- if ( CUR.GS.freeVector.y != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	750	+ if ( CUR.FT_GS.freeVector.y != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	751	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	752	CUR.zp2.cur[point].y += dy;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	753	if ( touch )
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	754	@@ -5367,7 +5367,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	755	FT_UNUSED_ARG;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	756
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	757
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	758	- if ( CUR.top < CUR.GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	759	+ if ( CUR.top < CUR.FT_GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	760	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	761	CUR.error = TT_Err_Invalid_Reference;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	762	return;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	763	@@ -5376,7 +5376,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	764	if ( COMPUTE_Point_Displacement( &dx, &dy, &zp, &refp ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	765	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	766
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	767	- while ( CUR.GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	768	+ while ( CUR.FT_GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	769	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	770	CUR.args--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	771	point = (FT_UShort)CUR.stack[CUR.args];
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	772	@@ -5393,10 +5393,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	773	/* XXX: UNDOCUMENTED! SHP touches the points */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	774	MOVE_Zp2_Point( point, dx, dy, TRUE );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	775
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	776	- CUR.GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	777	+ CUR.FT_GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	778	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	779
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	780	- CUR.GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	781	+ CUR.FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	782	CUR.new_top = CUR.args;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	783	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	784
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	785	@@ -5490,9 +5490,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	786	/* Twilight zone has no contours, so use `n_points'. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	787	/* Normal zone's `n_points' includes phantoms, so must */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	788	/* use end of last contour. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	789	- if ( CUR.GS.gep2 == 0 && CUR.zp2.n_points > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	790	+ if ( CUR.FT_GS.gep2 == 0 && CUR.zp2.n_points > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	791	last_point = (FT_UShort)( CUR.zp2.n_points - 1 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	792	- else if ( CUR.GS.gep2 == 1 && CUR.zp2.n_contours > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	793	+ else if ( CUR.FT_GS.gep2 == 1 && CUR.zp2.n_contours > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	794	last_point = (FT_UShort)( CUR.zp2.contours[CUR.zp2.n_contours - 1] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	795	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	796	last_point = 0;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	797	@@ -5519,7 +5519,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	798	FT_UShort point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	799
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	800
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	801	- if ( CUR.top < CUR.GS.loop + 1 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	802	+ if ( CUR.top < CUR.FT_GS.loop + 1 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	803	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	804	CUR.error = TT_Err_Invalid_Reference;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	805	return;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	806	@@ -5528,7 +5528,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	807	#ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	808	if ( CUR.face->unpatented_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	809	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	810	- if ( CUR.GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	811	+ if ( CUR.FT_GS.both_x_axis )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	812	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	813	dx = TT_MulFix14( args[0], 0x4000 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	814	dy = 0;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	815	@@ -5542,11 +5542,11 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	816	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	817	#endif
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	818	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	819	- dx = TT_MulFix14( args[0], CUR.GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	820	- dy = TT_MulFix14( args[0], CUR.GS.freeVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	821	+ dx = TT_MulFix14( args[0], CUR.FT_GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	822	+ dy = TT_MulFix14( args[0], CUR.FT_GS.freeVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	823	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	824
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	825	- while ( CUR.GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	826	+ while ( CUR.FT_GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	827	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	828	CUR.args--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	829
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	830	@@ -5563,10 +5563,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	831	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	832	MOVE_Zp2_Point( point, dx, dy, TRUE );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	833
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	834	- CUR.GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	835	+ CUR.FT_GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	836	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	837
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	838	- CUR.GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	839	+ CUR.FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	840	CUR.new_top = CUR.args;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	841	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	842
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	843	@@ -5587,7 +5587,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	844	point = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	845
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	846	if ( BOUNDS( point, CUR.zp1.n_points ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	847	- BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	848	+ BOUNDS( CUR.FT_GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	849	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	850	if ( CUR.pedantic_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	851	CUR.error = TT_Err_Invalid_Reference;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	852	@@ -5595,24 +5595,24 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	853	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	854
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	855	/* XXX: UNDOCUMENTED! behaviour */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	856	- if ( CUR.GS.gep1 == 0 ) /* if the point that is to be moved */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	857	+ if ( CUR.FT_GS.gep1 == 0 ) /* if the point that is to be moved */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	858	/* is in twilight zone */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	859	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	860	- CUR.zp1.org[point] = CUR.zp0.org[CUR.GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	861	+ CUR.zp1.org[point] = CUR.zp0.org[CUR.FT_GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	862	CUR_Func_move_orig( &CUR.zp1, point, args[1] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	863	CUR.zp1.cur[point] = CUR.zp1.org[point];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	864	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	865
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	866	distance = CUR_Func_project( CUR.zp1.cur + point,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	867	- CUR.zp0.cur + CUR.GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	868	+ CUR.zp0.cur + CUR.FT_GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	869
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	870	CUR_Func_move( &CUR.zp1, point, args[1] - distance );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	871
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	872	- CUR.GS.rp1 = CUR.GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	873	- CUR.GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	874	+ CUR.FT_GS.rp1 = CUR.FT_GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	875	+ CUR.FT_GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	876
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	877	if ( ( CUR.opcode & 1 ) != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	878	- CUR.GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	879	+ CUR.FT_GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	880	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	881
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	882
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	883	@@ -5652,8 +5652,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	884
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	885	CUR_Func_move( &CUR.zp0, point, distance );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	886
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	887	- CUR.GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	888	- CUR.GS.rp1 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	889	+ CUR.FT_GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	890	+ CUR.FT_GS.rp1 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	891	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	892
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	893
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	894	@@ -5707,10 +5707,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	895
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	896	distance = CUR_Func_read_cvt( cvtEntry );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	897
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	898	- if ( CUR.GS.gep0 == 0 ) /* If in twilight zone */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	899	+ if ( CUR.FT_GS.gep0 == 0 ) /* If in twilight zone */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	900	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	901	- CUR.zp0.org[point].x = TT_MulFix14( distance, CUR.GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	902	- CUR.zp0.org[point].y = TT_MulFix14( distance, CUR.GS.freeVector.y ),
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	903	+ CUR.zp0.org[point].x = TT_MulFix14( distance, CUR.FT_GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	904	+ CUR.zp0.org[point].y = TT_MulFix14( distance, CUR.FT_GS.freeVector.y ),
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	905	CUR.zp0.cur[point] = CUR.zp0.org[point];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	906	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	907
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	908	@@ -5718,7 +5718,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	909
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	910	if ( ( CUR.opcode & 1 ) != 0 ) /* rounding and control cutin flag */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	911	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	912	- if ( FT_ABS( distance - org_dist ) > CUR.GS.control_value_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	913	+ if ( FT_ABS( distance - org_dist ) > CUR.FT_GS.control_value_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	914	distance = org_dist;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	915
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	916	distance = CUR_Func_round( distance, CUR.tt_metrics.compensations[0] );
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	917	@@ -5726,8 +5726,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	918
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	919	CUR_Func_move( &CUR.zp0, point, distance - org_dist );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	920
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	921	- CUR.GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	922	- CUR.GS.rp1 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	923	+ CUR.FT_GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	924	+ CUR.FT_GS.rp1 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	925	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	926
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	927
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	928	@@ -5747,7 +5747,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	929	point = (FT_UShort)args[0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	930
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	931	if ( BOUNDS( point, CUR.zp1.n_points ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	932	- BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	933	+ BOUNDS( CUR.FT_GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	934	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	935	if ( CUR.pedantic_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	936	CUR.error = TT_Err_Invalid_Reference;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	937	@@ -5759,10 +5759,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	938
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	939	/* XXX: UNDOCUMENTED: twilight zone special case */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	940
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	941	- if ( CUR.GS.gep0 == 0 \|\| CUR.GS.gep1 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	942	+ if ( CUR.FT_GS.gep0 == 0 \|\| CUR.FT_GS.gep1 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	943	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	944	FT_Vector* vec1 = &CUR.zp1.org[point];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	945	- FT_Vector* vec2 = &CUR.zp0.org[CUR.GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	946	+ FT_Vector* vec2 = &CUR.zp0.org[CUR.FT_GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	947
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	948
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	949	org_dist = CUR_Func_dualproj( vec1, vec2 );
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	950	@@ -5770,7 +5770,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	951	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	952	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	953	FT_Vector* vec1 = &CUR.zp1.orus[point];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	954	- FT_Vector* vec2 = &CUR.zp0.orus[CUR.GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	955	+ FT_Vector* vec2 = &CUR.zp0.orus[CUR.FT_GS.rp0];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	956
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	957
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	958	if ( CUR.metrics.x_scale == CUR.metrics.y_scale )
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	959	@@ -5793,13 +5793,13 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	960
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	961	/* single width cut-in test */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	962
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	963	- if ( FT_ABS( org_dist - CUR.GS.single_width_value ) <
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	964	- CUR.GS.single_width_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	965	+ if ( FT_ABS( org_dist - CUR.FT_GS.single_width_value ) <
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	966	+ CUR.FT_GS.single_width_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	967	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	968	if ( org_dist >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	969	- org_dist = CUR.GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	970	+ org_dist = CUR.FT_GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	971	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	972	- org_dist = -CUR.GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	973	+ org_dist = -CUR.FT_GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	974	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	975
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	976	/* round flag */
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	977	@@ -5819,28 +5819,28 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	978	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	979	if ( org_dist >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	980	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	981	- if ( distance < CUR.GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	982	- distance = CUR.GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	983	+ if ( distance < CUR.FT_GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	984	+ distance = CUR.FT_GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	985	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	986	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	987	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	988	- if ( distance > -CUR.GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	989	- distance = -CUR.GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	990	+ if ( distance > -CUR.FT_GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	991	+ distance = -CUR.FT_GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	992	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	993	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	994
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	995	/* now move the point */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	996
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	997	org_dist = CUR_Func_project( CUR.zp1.cur + point,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	998	- CUR.zp0.cur + CUR.GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	999	+ CUR.zp0.cur + CUR.FT_GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1000
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1001	CUR_Func_move( &CUR.zp1, point, distance - org_dist );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1002
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1003	- CUR.GS.rp1 = CUR.GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1004	- CUR.GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1005	+ CUR.FT_GS.rp1 = CUR.FT_GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1006	+ CUR.FT_GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1007
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1008	if ( ( CUR.opcode & 16 ) != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1009	- CUR.GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1010	+ CUR.FT_GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1011	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1012
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1013
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1014	@@ -5869,7 +5869,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1015
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1016	if ( BOUNDS( point, CUR.zp1.n_points ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1017	BOUNDS( cvtEntry, CUR.cvtSize + 1 ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1018	- BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1019	+ BOUNDS( CUR.FT_GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1020	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1021	if ( CUR.pedantic_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1022	CUR.error = TT_Err_Invalid_Reference;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1023	@@ -5883,36 +5883,36 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1024
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1025	/* single width test */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1026
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1027	- if ( FT_ABS( cvt_dist - CUR.GS.single_width_value ) <
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1028	- CUR.GS.single_width_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1029	+ if ( FT_ABS( cvt_dist - CUR.FT_GS.single_width_value ) <
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1030	+ CUR.FT_GS.single_width_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1031	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1032	if ( cvt_dist >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1033	- cvt_dist = CUR.GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1034	+ cvt_dist = CUR.FT_GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1035	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1036	- cvt_dist = -CUR.GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1037	+ cvt_dist = -CUR.FT_GS.single_width_value;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1038	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1039
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1040	/* XXX: UNDOCUMENTED! -- twilight zone */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1041
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1042	- if ( CUR.GS.gep1 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1043	+ if ( CUR.FT_GS.gep1 == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1044	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1045	- CUR.zp1.org[point].x = CUR.zp0.org[CUR.GS.rp0].x +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1046	- TT_MulFix14( cvt_dist, CUR.GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1047	+ CUR.zp1.org[point].x = CUR.zp0.org[CUR.FT_GS.rp0].x +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1048	+ TT_MulFix14( cvt_dist, CUR.FT_GS.freeVector.x );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1049
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1050	- CUR.zp1.org[point].y = CUR.zp0.org[CUR.GS.rp0].y +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1051	- TT_MulFix14( cvt_dist, CUR.GS.freeVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1052	+ CUR.zp1.org[point].y = CUR.zp0.org[CUR.FT_GS.rp0].y +
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1053	+ TT_MulFix14( cvt_dist, CUR.FT_GS.freeVector.y );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1054
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1055	CUR.zp1.cur[point] = CUR.zp0.cur[point];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1056	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1057
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1058	org_dist = CUR_Func_dualproj( &CUR.zp1.org[point],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1059	- &CUR.zp0.org[CUR.GS.rp0] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1060	+ &CUR.zp0.org[CUR.FT_GS.rp0] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1061	cur_dist = CUR_Func_project ( &CUR.zp1.cur[point],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1062	- &CUR.zp0.cur[CUR.GS.rp0] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1063	+ &CUR.zp0.cur[CUR.FT_GS.rp0] );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1064
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1065	/* auto-flip test */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1066
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1067	- if ( CUR.GS.auto_flip )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1068	+ if ( CUR.FT_GS.auto_flip )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1069	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1070	if ( ( org_dist ^ cvt_dist ) < 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1071	cvt_dist = -cvt_dist;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1072	@@ -5925,8 +5925,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1073	/* XXX: UNDOCUMENTED! Only perform cut-in test when both points */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1074	/* refer to the same zone. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1075
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1076	- if ( CUR.GS.gep0 == CUR.GS.gep1 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1077	- if ( FT_ABS( cvt_dist - org_dist ) >= CUR.GS.control_value_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1078	+ if ( CUR.FT_GS.gep0 == CUR.FT_GS.gep1 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1079	+ if ( FT_ABS( cvt_dist - org_dist ) >= CUR.FT_GS.control_value_cutin )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1080	cvt_dist = org_dist;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1081
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1082	distance = CUR_Func_round(
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1083	@@ -5944,25 +5944,25 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1084	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1085	if ( org_dist >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1086	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1087	- if ( distance < CUR.GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1088	- distance = CUR.GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1089	+ if ( distance < CUR.FT_GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1090	+ distance = CUR.FT_GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1091	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1092	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1093	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1094	- if ( distance > -CUR.GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1095	- distance = -CUR.GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1096	+ if ( distance > -CUR.FT_GS.minimum_distance )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1097	+ distance = -CUR.FT_GS.minimum_distance;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1098	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1099	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1100
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1101	CUR_Func_move( &CUR.zp1, point, distance - cur_dist );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1102
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1103	- CUR.GS.rp1 = CUR.GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1104	+ CUR.FT_GS.rp1 = CUR.FT_GS.rp0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1105
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1106	if ( ( CUR.opcode & 16 ) != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1107	- CUR.GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1108	+ CUR.FT_GS.rp0 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1109
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1110	/* XXX: UNDOCUMENTED! */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1111	- CUR.GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1112	+ CUR.FT_GS.rp2 = point;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1113	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1114
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1115
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1116	@@ -5981,15 +5981,15 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1117	FT_UNUSED_ARG;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1118
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1119
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1120	- if ( CUR.top < CUR.GS.loop \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1121	- BOUNDS( CUR.GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1122	+ if ( CUR.top < CUR.FT_GS.loop \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1123	+ BOUNDS( CUR.FT_GS.rp0, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1124	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1125	if ( CUR.pedantic_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1126	CUR.error = TT_Err_Invalid_Reference;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1127	return;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1128	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1129
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1130	- while ( CUR.GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1131	+ while ( CUR.FT_GS.loop > 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1132	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1133	CUR.args--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1134
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1135	@@ -6006,15 +6006,15 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1136	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1137	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1138	distance = CUR_Func_project( CUR.zp1.cur + point,
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1139	- CUR.zp0.cur + CUR.GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1140	+ CUR.zp0.cur + CUR.FT_GS.rp0 );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1141
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1142	CUR_Func_move( &CUR.zp1, point, -distance );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1143	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1144
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1145	- CUR.GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1146	+ CUR.FT_GS.loop--;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1147	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1148
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1149	- CUR.GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1150	+ CUR.FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1151	CUR.new_top = CUR.args;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1152	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1153
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1154	@@ -6153,7 +6153,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1155	FT_UNUSED_ARG;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1156
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1157
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1158	- if ( CUR.top < CUR.GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1159	+ if ( CUR.top < CUR.FT_GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1160	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1161	CUR.error = TT_Err_Invalid_Reference;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1162	return;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1163	@@ -6164,9 +6164,9 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1164	* Otherwise, by definition, the value of CUR.twilight.orus[n] is (0,0),
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1165	* for every n.
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1166	*/
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1167	- twilight = CUR.GS.gep0 == 0 \|\| CUR.GS.gep1 == 0 \|\| CUR.GS.gep2 == 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1168	+ twilight = CUR.FT_GS.gep0 == 0 \|\| CUR.FT_GS.gep1 == 0 \|\| CUR.FT_GS.gep2 == 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1169
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1170	- if ( BOUNDS( CUR.GS.rp1, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1171	+ if ( BOUNDS( CUR.FT_GS.rp1, CUR.zp0.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1172	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1173	if ( CUR.pedantic_hinting )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1174	CUR.error = TT_Err_Invalid_Reference;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1175	@@ -6174,18 +6174,18 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1176	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1177
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1178	if ( twilight )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1179	- orus_base = &CUR.zp0.org[CUR.GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1180	+ orus_base = &CUR.zp0.org[CUR.FT_GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1181	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1182	- orus_base = &CUR.zp0.orus[CUR.GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1183	+ orus_base = &CUR.zp0.orus[CUR.FT_GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1184
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1185	- cur_base = &CUR.zp0.cur[CUR.GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1186	+ cur_base = &CUR.zp0.cur[CUR.FT_GS.rp1];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1187
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1188	/* XXX: There are some glyphs in some braindead but popular */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1189	/* fonts out there (e.g. [aeu]grave in monotype.ttf) */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1190	/* calling IP[] with bad values of rp[12]. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1191	/* Do something sane when this odd thing happens. */
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1192	- if ( BOUNDS( CUR.GS.rp1, CUR.zp0.n_points ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1193	- BOUNDS( CUR.GS.rp2, CUR.zp1.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1194	+ if ( BOUNDS( CUR.FT_GS.rp1, CUR.zp0.n_points ) \|\|
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1195	+ BOUNDS( CUR.FT_GS.rp2, CUR.zp1.n_points ) )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1196	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1197	old_range = 0;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1198	cur_range = 0;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1199	@@ -6193,16 +6193,16 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1200	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1201	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1202	if ( twilight )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1203	- old_range = CUR_Func_dualproj( &CUR.zp1.org[CUR.GS.rp2],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1204	+ old_range = CUR_Func_dualproj( &CUR.zp1.org[CUR.FT_GS.rp2],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1205	orus_base );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1206	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1207	- old_range = CUR_Func_dualproj( &CUR.zp1.orus[CUR.GS.rp2],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1208	+ old_range = CUR_Func_dualproj( &CUR.zp1.orus[CUR.FT_GS.rp2],
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1209	orus_base );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1210
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1211	- cur_range = CUR_Func_project ( &CUR.zp1.cur[CUR.GS.rp2], cur_base );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1212	+ cur_range = CUR_Func_project ( &CUR.zp1.cur[CUR.FT_GS.rp2], cur_base );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1213	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1214
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1215	- for ( ; CUR.GS.loop > 0; --CUR.GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1216	+ for ( ; CUR.FT_GS.loop > 0; --CUR.FT_GS.loop )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1217	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1218	FT_UInt point = (FT_UInt)CUR.stack[--CUR.args];
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1219	FT_F26Dot6 org_dist, cur_dist, new_dist;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1220	@@ -6235,7 +6235,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1221
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1222	CUR_Func_move( &CUR.zp2, (FT_UShort)point, new_dist - cur_dist );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1223	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1224	- CUR.GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1225	+ CUR.FT_GS.loop = 1;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1226	CUR.new_top = CUR.args;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1227	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1228
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1229	@@ -6264,10 +6264,10 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1230
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1231	mask = 0xFF;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1232
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1233	- if ( CUR.GS.freeVector.x != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1234	+ if ( CUR.FT_GS.freeVector.x != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1235	mask &= ~FT_CURVE_TAG_TOUCH_X;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1236
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1237	- if ( CUR.GS.freeVector.y != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1238	+ if ( CUR.FT_GS.freeVector.y != 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1239	mask &= ~FT_CURVE_TAG_TOUCH_Y;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1240
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1241	CUR.zp0.tags[point] &= mask;
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1242	@@ -6578,14 +6578,14 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1243	break;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1244	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1245
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1246	- C += CUR.GS.delta_base;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1247	+ C += CUR.FT_GS.delta_base;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1248
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1249	if ( CURRENT_Ppem() == (FT_Long)C )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1250	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1251	B = ( (FT_ULong)B & 0xF ) - 8;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1252	if ( B >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1253	B++;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1254	- B = B * 64 / ( 1L << CUR.GS.delta_shift );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1255	+ B = B * 64 / ( 1L << CUR.FT_GS.delta_shift );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1256
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1257	CUR_Func_move( &CUR.zp0, A, B );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1258	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1259	@@ -6673,14 +6673,14 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1260	break;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1261	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1262
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1263	- C += CUR.GS.delta_base;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1264	+ C += CUR.FT_GS.delta_base;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1265
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1266	if ( CURRENT_Ppem() == (FT_Long)C )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1267	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1268	B = ( (FT_ULong)B & 0xF ) - 8;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1269	if ( B >= 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1270	B++;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1271	- B = B * 64 / ( 1L << CUR.GS.delta_shift );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1272	+ B = B * 64 / ( 1L << CUR.FT_GS.delta_shift );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1273
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1274	CUR_Func_move_cvt( A, B );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1275	}
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1276	@@ -7120,7 +7120,7 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1277	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1278
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1279	COMPUTE_Funcs();
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1280	- COMPUTE_Round( (FT_Byte)exc->GS.round_state );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1281	+ COMPUTE_Round( (FT_Byte)exc->FT_GS.round_state );
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1282
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1283	do
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1284	{
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1285	@@ -7190,11 +7190,11 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1286
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1287	if ( opcode < 4 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1288	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1289	- CUR.GS.projVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1290	- CUR.GS.projVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1291	+ CUR.FT_GS.projVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1292	+ CUR.FT_GS.projVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1293
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1294	- CUR.GS.dualVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1295	- CUR.GS.dualVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1296	+ CUR.FT_GS.dualVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1297	+ CUR.FT_GS.dualVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1298	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1299	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1300	{
780 2ea47e897e86 6876618 Upgrade Freetype2 to 2.3.9 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: 465 diff changeset	1301	@@ -7203,8 +7203,8 @@
440 67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1302
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1303	if ( ( opcode & 2 ) == 0 )
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1304	{
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1305	- CUR.GS.freeVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1306	- CUR.GS.freeVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1307	+ CUR.FT_GS.freeVector.x = AA;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1308	+ CUR.FT_GS.freeVector.y = BB;
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1309	}
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1310	else
67cd7ac31bce 6712820 Upgrade freetype to 2.3.6 Stefan Teleman <Stefan.Teleman@Sun.COM> parents: diff changeset	1311	{

author	Alan Coopersmith <Alan.Coopersmith@Sun.COM>
	Tue, 02 Mar 2010 13:31:46 -0800
changeset 919	425233ae7236
parent 780	2ea47e897e86
child 943	294f64612d23
permissions	-rw-r--r--