[Xorg-commit] xc/extras/freetype2/src/psaux psauxmod.c,1.1.4.1,1.1.4.2 psobjs.c,1.1.4.1,1.1.4.2 psobjs.h,1.1.4.1,1.1.4.2 rules.mk,1.1,1.1.4.1 t1cmap.c,1.1.4.1,1.1.4.2 t1cmap.h,1.1,1.1.4.1 t1decode.c,1.1.4.1,1.1.4.2 t1decode.h,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
- Previous message: [Xorg-commit] xc/include Xpoll.h,1.1.4.1.2.1,1.1.4.1.2.2
- Next message: [Xorg-commit] xc/extras/freetype2/src/pshinter Jamfile,1.1.4.1,1.1.4.2 pshalgo.h,1.1.4.1,1.1.4.2 pshglob.c,1.1.4.1,1.1.4.2 pshglob.h,1.1.4.1,1.1.4.2 pshinter.c,1.1.4.1,1.1.4.2 pshrec.c,1.1.4.1,1.1.4.2 pshrec.h,1.1,1.1.4.1 rules.mk,1.1.4.1,1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: kaleb
Update of /cvs/xorg/xc/extras/freetype2/src/psaux
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/extras/freetype2/src/psaux
Modified Files:
Tag: XORG-CURRENT
psauxmod.c psobjs.c psobjs.h rules.mk t1cmap.c t1cmap.h
t1decode.c t1decode.h
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: psauxmod.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/psauxmod.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/psauxmod.c 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/psauxmod.c 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* FreeType auxiliary PostScript module implementation (body). */
/* */
-/* Copyright 2000-2001, 2002 by */
+/* Copyright 2000-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -39,9 +39,10 @@
ps_parser_init,
ps_parser_done,
ps_parser_skip_spaces,
- ps_parser_skip_alpha,
+ ps_parser_skip_PS_token,
ps_parser_to_int,
ps_parser_to_fixed,
+ ps_parser_to_bytes,
ps_parser_to_coord_array,
ps_parser_to_fixed_array,
ps_parser_to_token,
@@ -104,7 +105,7 @@
0,
sizeof( FT_ModuleRec ),
"psaux",
- 0x10000L,
+ 0x20000L,
0x20000L,
&psaux_interface, /* module-specific interface */
Index: psobjs.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/psobjs.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/psobjs.c 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/psobjs.c 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* Auxiliary functions for PostScript fonts (body). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -153,10 +153,10 @@
/* reallocation fails. */
/* */
[...1175 lines suppressed...]
}
FT_LOCAL_DEF( FT_Bool )
T1_ToBool( PS_Parser parser )
{
- return t1_tobool( &parser->cursor, parser->limit );
+ return ps_tobool( &parser->cursor, parser->limit );
}
#endif /* 0 */
@@ -1118,7 +1496,7 @@
FT_Byte* limit,
FT_Memory memory )
{
- parser->error = 0;
+ parser->error = PSaux_Err_Ok;
parser->base = base;
parser->limit = limit;
parser->cursor = base;
Index: psobjs.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/psobjs.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/psobjs.h 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/psobjs.h 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* Auxiliary functions for PostScript fonts (specification). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -52,10 +52,10 @@
FT_Memory memory );
FT_LOCAL( FT_Error )
- ps_table_add( PS_Table table,
- FT_Int idx,
- void* object,
- FT_Int length );
+ ps_table_add( PS_Table table,
+ FT_Int idx,
+ void* object,
+ FT_PtrDist length );
FT_LOCAL( void )
ps_table_done( PS_Table table );
@@ -78,7 +78,7 @@
ps_parser_skip_spaces( PS_Parser parser );
FT_LOCAL( void )
- ps_parser_skip_alpha( PS_Parser parser );
+ ps_parser_skip_PS_token( PS_Parser parser );
FT_LOCAL( void )
ps_parser_to_token( PS_Parser parser,
@@ -108,6 +108,14 @@
ps_parser_to_int( PS_Parser parser );
+ FT_LOCAL( FT_Error )
+ ps_parser_to_bytes( PS_Parser parser,
+ FT_Byte* bytes,
+ FT_Long max_bytes,
+ FT_Long* pnum_bytes,
+ FT_Bool delimiters );
+
+
FT_LOCAL( FT_Fixed )
ps_parser_to_fixed( PS_Parser parser,
FT_Int power_ten );
Index: rules.mk
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/rules.mk,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/rules.mk 14 Nov 2003 16:48:24 -0000 1.1
+++ b/rules.mk 23 Feb 2004 21:32:56 -0000 1.1.4.1
@@ -3,7 +3,7 @@
#
-# Copyright 1996-2000, 2002 by
+# Copyright 1996-2000, 2002, 2003 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used, modified,
@@ -15,26 +15,25 @@
# PSAUX driver directory
#
-PSAUX_DIR := $(SRC_)psaux
-PSAUX_DIR_ := $(PSAUX_DIR)$(SEP)
+PSAUX_DIR := $(SRC_DIR)/psaux
# compilation flags for the driver
#
-PSAUX_COMPILE := $(FT_COMPILE) $I$(PSAUX_DIR)
+PSAUX_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSAUX_DIR))
# PSAUX driver sources (i.e., C files)
#
-PSAUX_DRV_SRC := $(PSAUX_DIR_)psobjs.c \
- $(PSAUX_DIR_)t1decode.c \
- $(PSAUX_DIR_)t1cmap.c \
- $(PSAUX_DIR_)psauxmod.c
+PSAUX_DRV_SRC := $(PSAUX_DIR)/psobjs.c \
+ $(PSAUX_DIR)/t1decode.c \
+ $(PSAUX_DIR)/t1cmap.c \
+ $(PSAUX_DIR)/psauxmod.c
# PSAUX driver headers
#
PSAUX_DRV_H := $(PSAUX_DRV_SRC:%c=%h) \
- $(PSAUX_DIR_)psauxerr.h
+ $(PSAUX_DIR)/psauxerr.h
# PSAUX driver object(s)
@@ -42,25 +41,25 @@
# PSAUX_DRV_OBJ_M is used during `multi' builds.
# PSAUX_DRV_OBJ_S is used during `single' builds.
#
-PSAUX_DRV_OBJ_M := $(PSAUX_DRV_SRC:$(PSAUX_DIR_)%.c=$(OBJ_)%.$O)
-PSAUX_DRV_OBJ_S := $(OBJ_)psaux.$O
+PSAUX_DRV_OBJ_M := $(PSAUX_DRV_SRC:$(PSAUX_DIR)/%.c=$(OBJ_DIR)/%.$O)
+PSAUX_DRV_OBJ_S := $(OBJ_DIR)/psaux.$O
# PSAUX driver source file for single build
#
-PSAUX_DRV_SRC_S := $(PSAUX_DIR_)psaux.c
+PSAUX_DRV_SRC_S := $(PSAUX_DIR)/psaux.c
# PSAUX driver - single object
#
$(PSAUX_DRV_OBJ_S): $(PSAUX_DRV_SRC_S) $(PSAUX_DRV_SRC) \
$(FREETYPE_H) $(PSAUX_DRV_H)
- $(PSAUX_COMPILE) $T$@ $(PSAUX_DRV_SRC_S)
+ $(PSAUX_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(PSAUX_DRV_SRC_S))
# PSAUX driver - multiple objects
#
-$(OBJ_)%.$O: $(PSAUX_DIR_)%.c $(FREETYPE_H) $(PSAUX_DRV_H)
- $(PSAUX_COMPILE) $T$@ $<
+$(OBJ_DIR)/%.$O: $(PSAUX_DIR)/%.c $(FREETYPE_H) $(PSAUX_DRV_H)
+ $(PSAUX_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
# update main driver object lists
Index: t1cmap.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/t1cmap.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/t1cmap.c 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/t1cmap.c 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* Type 1 character map support (body). */
/* */
-/* Copyright 2002 by */
+/* Copyright 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -20,6 +20,8 @@
#include FT_INTERNAL_DEBUG_H
+#include "psauxerr.h"
+
/*************************************************************************/
/*************************************************************************/
@@ -33,8 +35,8 @@
t1_cmap_std_init( T1_CMapStd cmap,
FT_Int is_expert )
{
- T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
- PSNames_Service psnames = (PSNames_Service)face->psnames;
+ T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
+ FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
cmap->num_glyphs = face->type1.num_glyphs;
@@ -261,26 +263,26 @@
{
FT_UInt32 u1 = ((T1_CMapUniPair)pair1)->unicode;
FT_UInt32 u2 = ((T1_CMapUniPair)pair2)->unicode;
-
+
if ( u1 < u2 )
return -1;
-
+
if ( u1 > u2 )
return +1;
-
+
return 0;
- }
+ }
FT_CALLBACK_DEF( FT_Error )
t1_cmap_unicode_init( T1_CMapUnicode cmap )
{
- FT_Error error;
- FT_UInt count;
- T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
- FT_Memory memory = FT_FACE_MEMORY( face );
- PSNames_Service psnames = (PSNames_Service)face->psnames;
+ FT_Error error;
+ FT_UInt count;
+ T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
+ FT_Memory memory = FT_FACE_MEMORY( face );
+ FT_Service_PsCMaps psnames = (FT_Service_PsCMaps)face->psnames;
cmap->num_pairs = 0;
@@ -314,13 +316,13 @@
}
}
}
-
+
new_count = (FT_UInt)( pair - cmap->pairs );
if ( new_count == 0 )
{
/* there are no unicode characters in here! */
FT_FREE( cmap->pairs );
- error = FT_Err_Invalid_Argument;
+ error = PSaux_Err_Invalid_Argument;
}
else
{
Index: t1cmap.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/t1cmap.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/t1cmap.h 14 Nov 2003 16:48:24 -0000 1.1
+++ b/t1cmap.h 23 Feb 2004 21:32:56 -0000 1.1.4.1
@@ -4,7 +4,7 @@
/* */
/* Type 1 character map support (specification). */
/* */
-/* Copyright 2002 by */
+/* Copyright 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -22,7 +22,6 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
#include FT_INTERNAL_TYPE1_TYPES_H
-#include FT_INTERNAL_POSTSCRIPT_NAMES_H
FT_BEGIN_HEADER
@@ -47,16 +46,16 @@
FT_UInt num_glyphs;
const char* const* glyph_names;
-
+
} T1_CMapStdRec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_standard_class_rec;
-
+
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_expert_class_rec;
-
+
/*************************************************************************/
/*************************************************************************/
@@ -67,20 +66,20 @@
/*************************************************************************/
typedef struct T1_CMapCustomRec_* T1_CMapCustom;
-
+
typedef struct T1_CMapCustomRec_
{
FT_CMapRec cmap;
FT_UInt first;
FT_UInt count;
FT_UShort* indices;
-
+
} T1_CMapCustomRec;
FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_custom_class_rec;
-
+
/*************************************************************************/
/*************************************************************************/
@@ -97,7 +96,7 @@
{
FT_UInt32 unicode;
FT_UInt gindex;
-
+
} T1_CMapUniPairRec, *T1_CMapUniPair;
@@ -115,7 +114,7 @@
/* */
-
+
FT_END_HEADER
#endif /* __T1CMAP_H__ */
Index: t1decode.c
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/t1decode.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/t1decode.c 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/t1decode.c 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* PostScript Type 1 decoding routines (body). */
/* */
-/* Copyright 2000-2001, 2002 by */
+/* Copyright 2000-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -125,9 +125,9 @@
t1_lookup_glyph_by_stdcharcode( T1_Decoder decoder,
FT_Int charcode )
{
- FT_UInt n;
- const FT_String* glyph_name;
- PSNames_Service psnames = decoder->psnames;
+ FT_UInt n;
+ const FT_String* glyph_name;
+ FT_Service_PsCMaps psnames = decoder->psnames;
/* check range of standard char code */
@@ -143,7 +143,7 @@
if ( name && name[0] == glyph_name[0] &&
- ft_strcmp( name,glyph_name ) == 0 )
+ ft_strcmp( name, glyph_name ) == 0 )
return n;
}
@@ -241,8 +241,8 @@
/* subglyph 1 = accent character */
subg->index = achar_index;
subg->flags = FT_SUBGLYPH_FLAG_ARGS_ARE_XY_VALUES;
- subg->arg1 = adx - asb;
- subg->arg2 = ady;
+ subg->arg1 = (FT_Int)( adx - asb );
+ subg->arg2 = (FT_Int)ady;
/* set up remaining glyph fields */
glyph->num_subglyphs = 2;
@@ -565,7 +565,7 @@
goto Stack_Underflow;
top -= 2;
- switch ( top[1] )
+ switch ( (FT_Int)top[1] )
{
case 1: /* start flex feature */
if ( top[0] != 0 )
@@ -706,7 +706,7 @@
values = top;
for ( nn = 0; nn < num_points; nn++ )
{
- FT_Int tmp = values[0];
+ FT_Long tmp = values[0];
for ( mm = 1; mm < blend->num_designs; mm++ )
@@ -785,8 +785,8 @@
case op_seac:
/* return immediately after the processing */
- return t1operator_seac( decoder, top[0], top[1],
- top[2], top[3], top[4] );
+ return t1operator_seac( decoder, top[0], top[1], top[2],
+ (FT_Int)top[3], (FT_Int)top[4] );
case op_sbw:
FT_TRACE4(( " sbw" ));
@@ -945,7 +945,7 @@
FT_TRACE4(( " callsubr" ));
- idx = top[0];
+ idx = (FT_Int)top[0];
if ( idx < 0 || idx >= (FT_Int)decoder->num_subrs )
{
FT_ERROR(( "t1_decoder_parse_charstrings: "
@@ -1129,11 +1129,10 @@
/* retrieve PSNames interface from list of current modules */
{
- PSNames_Service psnames = 0;
+ FT_Service_PsCMaps psnames = 0;
- psnames = (PSNames_Service)FT_Get_Module_Interface(
- FT_FACE_LIBRARY(face), "psnames" );
+ FT_FACE_FIND_GLOBAL_SERVICE( face, psnames, POSTSCRIPT_CMAPS );
if ( !psnames )
{
FT_ERROR(( "t1_decoder_init: " ));
@@ -1148,7 +1147,6 @@
decoder->num_glyphs = (FT_UInt)face->num_glyphs;
decoder->glyph_names = glyph_names;
- decoder->hint_flags = face->internal->hint_flags;
decoder->hint_mode = hint_mode;
decoder->blend = blend;
decoder->parse_callback = parse_callback;
Index: t1decode.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/src/psaux/t1decode.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/t1decode.h 26 Nov 2003 22:48:27 -0000 1.1.4.1
+++ b/t1decode.h 23 Feb 2004 21:32:56 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* PostScript Type 1 decoding routines (specification). */
/* */
-/* Copyright 2000-2001, 2002 by */
+/* Copyright 2000-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -22,7 +22,6 @@
#include <ft2build.h>
#include FT_INTERNAL_POSTSCRIPT_AUX_H
-#include FT_INTERNAL_POSTSCRIPT_NAMES_H
#include FT_INTERNAL_TYPE1_TYPES_H
- Previous message: [Xorg-commit] xc/include Xpoll.h,1.1.4.1.2.1,1.1.4.1.2.2
- Next message: [Xorg-commit] xc/extras/freetype2/src/pshinter Jamfile,1.1.4.1,1.1.4.2 pshalgo.h,1.1.4.1,1.1.4.2 pshglob.c,1.1.4.1,1.1.4.2 pshglob.h,1.1.4.1,1.1.4.2 pshinter.c,1.1.4.1,1.1.4.2 pshrec.c,1.1.4.1,1.1.4.2 pshrec.h,1.1,1.1.4.1 rules.mk,1.1.4.1,1.1.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit
mailing list