2001-12-05 02:22:05 +01:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* pshrec.c */
|
|
|
|
/* */
|
|
|
|
/* FreeType PostScript hints recorder (body). */
|
|
|
|
/* */
|
2007-01-26 23:18:56 +01:00
|
|
|
/* Copyright 2001, 2002, 2003, 2004, 2007 by */
|
2001-12-05 02:22:05 +01:00
|
|
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
|
|
|
/* */
|
|
|
|
/* This file is part of the FreeType project, and may only be used, */
|
|
|
|
/* modified, and distributed under the terms of the FreeType project */
|
|
|
|
/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
|
|
|
|
/* this file you indicate that you have read the license and */
|
|
|
|
/* understand and accept it fully. */
|
|
|
|
/* */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
#include <ft2build.h>
|
|
|
|
#include FT_FREETYPE_H
|
|
|
|
#include FT_INTERNAL_OBJECTS_H
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
#include "pshrec.h"
|
|
|
|
#include "pshalgo.h"
|
|
|
|
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
#include "pshnterr.h"
|
|
|
|
|
2001-12-22 15:38:40 +01:00
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_pshrec
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
2002-08-19 08:06:44 +02:00
|
|
|
PS_Hints ps_debug_hints = 0;
|
|
|
|
int ps_debug_no_horz_hints = 0;
|
|
|
|
int ps_debug_no_vert_hints = 0;
|
2001-10-18 13:38:43 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** PS_HINT MANAGEMENT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* destroy hints table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hint_table_done( PS_Hint_Table table,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( table->hints );
|
2001-10-18 13:38:43 +02:00
|
|
|
table->num_hints = 0;
|
|
|
|
table->max_hints = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* ensure that a table can contain "count" elements */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_hint_table_ensure( PS_Hint_Table table,
|
|
|
|
FT_UInt count,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_UInt old_max = table->max_hints;
|
|
|
|
FT_UInt new_max = count;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( new_max > old_max )
|
|
|
|
{
|
|
|
|
/* try to grow the table */
|
2003-12-24 02:10:46 +01:00
|
|
|
new_max = FT_PAD_CEIL( new_max, 8 );
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( !FT_RENEW_ARRAY( table->hints, old_max, new_max ) )
|
2001-10-18 13:38:43 +02:00
|
|
|
table->max_hints = new_max;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static FT_Error
|
|
|
|
ps_hint_table_alloc( PS_Hint_Table table,
|
|
|
|
FT_Memory memory,
|
|
|
|
PS_Hint *ahint )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
FT_UInt count;
|
|
|
|
PS_Hint hint = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
count = table->num_hints;
|
|
|
|
count++;
|
|
|
|
|
|
|
|
if ( count >= table->max_hints )
|
|
|
|
{
|
|
|
|
error = ps_hint_table_ensure( table, count, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
hint = table->hints + count - 1;
|
2001-10-18 13:38:43 +02:00
|
|
|
hint->pos = 0;
|
|
|
|
hint->len = 0;
|
|
|
|
hint->flags = 0;
|
|
|
|
|
|
|
|
table->num_hints = count;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
*ahint = hint;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** PS_MASK MANAGEMENT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* destroy mask */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_mask_done( PS_Mask mask,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( mask->bytes );
|
2001-10-18 13:38:43 +02:00
|
|
|
mask->num_bits = 0;
|
|
|
|
mask->max_bits = 0;
|
|
|
|
mask->end_point = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* ensure that a mask can contain "count" bits */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_ensure( PS_Mask mask,
|
|
|
|
FT_UInt count,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_UInt old_max = ( mask->max_bits + 7 ) >> 3;
|
|
|
|
FT_UInt new_max = ( count + 7 ) >> 3;
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( new_max > old_max )
|
|
|
|
{
|
2003-12-24 02:10:46 +01:00
|
|
|
new_max = FT_PAD_CEIL( new_max, 8 );
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( !FT_RENEW_ARRAY( mask->bytes, old_max, new_max ) )
|
2001-12-05 02:22:05 +01:00
|
|
|
mask->max_bits = new_max * 8;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* test a bit value in a given mask */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Int
|
|
|
|
ps_mask_test_bit( PS_Mask mask,
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( (FT_UInt)idx >= mask->num_bits )
|
2001-10-18 13:38:43 +02:00
|
|
|
return 0;
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
return mask->bytes[idx >> 3] & ( 0x80 >> ( idx & 7 ) );
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* clear a given bit */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_mask_clear_bit( PS_Mask mask,
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
FT_Byte* p;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( (FT_UInt)idx >= mask->num_bits )
|
2001-10-18 13:38:43 +02:00
|
|
|
return;
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
p = mask->bytes + ( idx >> 3 );
|
|
|
|
p[0] = (FT_Byte)( p[0] & ~( 0x80 >> ( idx & 7 ) ) );
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* set a given bit, possibly grow the mask */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_set_bit( PS_Mask mask,
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx,
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
FT_Byte* p;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx < 0 )
|
2001-10-18 13:38:43 +02:00
|
|
|
goto Exit;
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( (FT_UInt)idx >= mask->num_bits )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
error = ps_mask_ensure( mask, idx + 1, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-19 11:17:49 +02:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
mask->num_bits = idx + 1;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
p = mask->bytes + ( idx >> 3 );
|
|
|
|
p[0] = (FT_Byte)( p[0] | ( 0x80 >> ( idx & 7 ) ) );
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* destroy mask table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_mask_table_done( PS_Mask_Table table,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_UInt count = table->max_masks;
|
|
|
|
PS_Mask mask = table->masks;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
for ( ; count > 0; count--, mask++ )
|
|
|
|
ps_mask_done( mask, memory );
|
|
|
|
|
2002-03-22 14:52:37 +01:00
|
|
|
FT_FREE( table->masks );
|
2001-10-18 13:38:43 +02:00
|
|
|
table->num_masks = 0;
|
|
|
|
table->max_masks = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* ensure that a mask table can contain "count" masks */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_table_ensure( PS_Mask_Table table,
|
|
|
|
FT_UInt count,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_UInt old_max = table->max_masks;
|
|
|
|
FT_UInt new_max = count;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( new_max > old_max )
|
|
|
|
{
|
2003-12-24 02:10:46 +01:00
|
|
|
new_max = FT_PAD_CEIL( new_max, 8 );
|
2002-03-22 14:52:37 +01:00
|
|
|
if ( !FT_RENEW_ARRAY( table->masks, old_max, new_max ) )
|
2001-10-18 13:38:43 +02:00
|
|
|
table->max_masks = new_max;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* allocate a new mask in a table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_table_alloc( PS_Mask_Table table,
|
|
|
|
FT_Memory memory,
|
|
|
|
PS_Mask *amask )
|
|
|
|
{
|
|
|
|
FT_UInt count;
|
|
|
|
FT_Error error = 0;
|
2001-12-05 02:22:05 +01:00
|
|
|
PS_Mask mask = 0;
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
count = table->num_masks;
|
|
|
|
count++;
|
|
|
|
|
|
|
|
if ( count > table->max_masks )
|
|
|
|
{
|
|
|
|
error = ps_mask_table_ensure( table, count, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
mask = table->masks + count - 1;
|
|
|
|
mask->num_bits = 0;
|
|
|
|
mask->end_point = 0;
|
|
|
|
table->num_masks = count;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
*amask = mask;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* return last hint mask in a table, create one if the table is empty */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_table_last( PS_Mask_Table table,
|
|
|
|
FT_Memory memory,
|
|
|
|
PS_Mask *amask )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
FT_UInt count;
|
|
|
|
PS_Mask mask;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
count = table->num_masks;
|
|
|
|
if ( count == 0 )
|
|
|
|
{
|
|
|
|
error = ps_mask_table_alloc( table, memory, &mask );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
else
|
2001-12-05 02:22:05 +01:00
|
|
|
mask = table->masks + count - 1;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
Exit:
|
|
|
|
*amask = mask;
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* set a new mask to a given bit range */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
2007-05-20 20:07:52 +02:00
|
|
|
ps_mask_table_set_bits( PS_Mask_Table table,
|
|
|
|
const FT_Byte* source,
|
|
|
|
FT_UInt bit_pos,
|
|
|
|
FT_UInt bit_count,
|
|
|
|
FT_Memory memory )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
PS_Mask mask;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2004-02-21 17:47:20 +01:00
|
|
|
error = ps_mask_table_last( table, memory, &mask );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
error = ps_mask_ensure( mask, bit_count, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
mask->num_bits = bit_count;
|
|
|
|
|
|
|
|
/* now, copy bits */
|
|
|
|
{
|
2007-05-20 20:07:52 +02:00
|
|
|
FT_Byte* read = (FT_Byte*)source + ( bit_pos >> 3 );
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_Int rmask = 0x80 >> ( bit_pos & 7 );
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Byte* write = mask->bytes;
|
|
|
|
FT_Int wmask = 0x80;
|
|
|
|
FT_Int val;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
for ( ; bit_count > 0; bit_count-- )
|
|
|
|
{
|
|
|
|
val = write[0] & ~wmask;
|
|
|
|
|
|
|
|
if ( read[0] & rmask )
|
|
|
|
val |= wmask;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
write[0] = (FT_Byte)val;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
rmask >>= 1;
|
|
|
|
if ( rmask == 0 )
|
|
|
|
{
|
|
|
|
read++;
|
|
|
|
rmask = 0x80;
|
|
|
|
}
|
|
|
|
|
|
|
|
wmask >>= 1;
|
|
|
|
if ( wmask == 0 )
|
|
|
|
{
|
|
|
|
write++;
|
|
|
|
wmask = 0x80;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* test whether two masks in a table intersect */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Int
|
|
|
|
ps_mask_table_test_intersect( PS_Mask_Table table,
|
|
|
|
FT_Int index1,
|
|
|
|
FT_Int index2 )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
PS_Mask mask1 = table->masks + index1;
|
|
|
|
PS_Mask mask2 = table->masks + index2;
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Byte* p1 = mask1->bytes;
|
|
|
|
FT_Byte* p2 = mask2->bytes;
|
|
|
|
FT_UInt count1 = mask1->num_bits;
|
|
|
|
FT_UInt count2 = mask2->num_bits;
|
|
|
|
FT_UInt count;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
count = ( count1 <= count2 ) ? count1 : count2;
|
|
|
|
for ( ; count >= 8; count -= 8 )
|
|
|
|
{
|
|
|
|
if ( p1[0] & p2[0] )
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
p1++;
|
|
|
|
p2++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( count == 0 )
|
|
|
|
return 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
return ( p1[0] & p2[0] ) & ~( 0xFF >> count );
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* merge two masks, used by ps_mask_table_merge_all */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_table_merge( PS_Mask_Table table,
|
|
|
|
FT_Int index1,
|
|
|
|
FT_Int index2,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_UInt temp;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* swap index1 and index2 so that index1 < index2 */
|
|
|
|
if ( index1 > index2 )
|
|
|
|
{
|
|
|
|
temp = index1;
|
|
|
|
index1 = index2;
|
2002-02-19 02:12:23 +01:00
|
|
|
index2 = temp;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( index1 < index2 && index1 >= 0 && index2 < (FT_Int)table->num_masks )
|
|
|
|
{
|
|
|
|
/* we need to merge the bitsets of index1 and index2 with a */
|
2001-12-05 02:22:05 +01:00
|
|
|
/* simple union */
|
|
|
|
PS_Mask mask1 = table->masks + index1;
|
|
|
|
PS_Mask mask2 = table->masks + index2;
|
|
|
|
FT_UInt count1 = mask1->num_bits;
|
|
|
|
FT_UInt count2 = mask2->num_bits;
|
|
|
|
FT_Int delta;
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
if ( count2 > 0 )
|
|
|
|
{
|
|
|
|
FT_UInt pos;
|
|
|
|
FT_Byte* read;
|
|
|
|
FT_Byte* write;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* if "count2" is greater than "count1", we need to grow the */
|
2001-12-05 02:22:05 +01:00
|
|
|
/* first bitset, and clear the highest bits */
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( count2 > count1 )
|
|
|
|
{
|
|
|
|
error = ps_mask_ensure( mask1, count2, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
for ( pos = count1; pos < count2; pos++ )
|
|
|
|
ps_mask_clear_bit( mask1, pos );
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* merge (unite) the bitsets */
|
2001-10-18 13:38:43 +02:00
|
|
|
read = mask2->bytes;
|
|
|
|
write = mask1->bytes;
|
2001-12-05 02:22:05 +01:00
|
|
|
pos = (FT_UInt)( ( count2 + 7 ) >> 3 );
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
for ( ; pos > 0; pos-- )
|
|
|
|
{
|
|
|
|
write[0] = (FT_Byte)( write[0] | read[0] );
|
|
|
|
write++;
|
|
|
|
read++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* Now, remove "mask2" from the list. We need to keep the masks */
|
|
|
|
/* sorted in order of importance, so move table elements. */
|
2001-10-18 13:38:43 +02:00
|
|
|
mask2->num_bits = 0;
|
|
|
|
mask2->end_point = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
delta = table->num_masks - 1 - index2; /* number of masks to move */
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( delta > 0 )
|
|
|
|
{
|
|
|
|
/* move to end of table for reuse */
|
|
|
|
PS_MaskRec dummy = *mask2;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
* README.UNX: updated the Unix-specific quick-compilation guide to
warn about the GNU Make requirement at compile time..
* include/freetype/config/ftstdlib.h,
include/freetype/config/ftconfig.h,
include/freetype/config/ftheader.h,
include/freetype/internal/ftmemory.h,
include/freetype/internal/ftobjs.h,
src/autohint/ahoptim.c,
src/base/ftdbgmem.c, src/base/ftdebug.c,
src/base/ftmac.c, src/base/ftobjs.c,
src/base/ftsystem.c,
src/cache/ftcimage.c, src/cache/ftcsbits.c,
src/cff/cffdriver.c, src/cff/cffload.c, src/cff/cffobjs.c,
src/cid/cidload.c, src/cid/cidparse.c, src/cid/cidriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfread.c,
src/psaux/t1cmap.c, src/psaux/t1decode.c,
src/pshinter/pshalgo1.c, src/pshinter/pshalgo2.c,
src/pshinter/pshrec.c,
src/psnames/psmodule.c,
src/raster/ftraster.c,
src/sfnt/sfdriver.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/smooth/ftgrays.c,
src/type1/t1afm.c, src/type1/t1driver.c, src/type1/t1gload.c,
src/type1/t1load.c, src/type1/t1objs.c, src/type1/t1parse.c:
added the new configuration file "ftstdlib.h" used to define
aliases for all ISO C library functions used by the engine
(e.g. strlen, qsort, setjmp, etc...)
this eases the porting of FreeType 2 to exotic environments like
XFree86 modules/extensions..
also removed many #include <string.h>, #include <stdlib.h>, etc...
from the engine's sources where they're not needed..
2002-04-12 11:31:48 +02:00
|
|
|
ft_memmove( mask2, mask2 + 1, delta * sizeof ( PS_MaskRec ) );
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
mask2[delta] = dummy;
|
|
|
|
}
|
|
|
|
|
|
|
|
table->num_masks--;
|
|
|
|
}
|
|
|
|
else
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_mask_table_merge: ignoring invalid indices (%d,%d)\n",
|
2001-10-18 13:38:43 +02:00
|
|
|
index1, index2 ));
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
/* Try to merge all masks in a given table. This is used to merge */
|
|
|
|
/* all counter masks into independent counter "paths". */
|
|
|
|
/* */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_mask_table_merge_all( PS_Mask_Table table,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_Int index1, index2;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
for ( index1 = table->num_masks - 1; index1 > 0; index1-- )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
for ( index2 = index1 - 1; index2 >= 0; index2-- )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
if ( ps_mask_table_test_intersect( table, index1, index2 ) )
|
|
|
|
{
|
|
|
|
error = ps_mask_table_merge( table, index2, index1, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** PS_DIMENSION MANAGEMENT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* finalize a given dimension */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_dimension_done( PS_Dimension dimension,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
ps_mask_table_done( &dimension->counters, memory );
|
|
|
|
ps_mask_table_done( &dimension->masks, memory );
|
|
|
|
ps_hint_table_done( &dimension->hints, memory );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* initialize a given dimension */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_dimension_init( PS_Dimension dimension )
|
|
|
|
{
|
|
|
|
dimension->hints.num_hints = 0;
|
|
|
|
dimension->masks.num_masks = 0;
|
|
|
|
dimension->counters.num_masks = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#if 0
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
/* set a bit at a given index in the current hint mask */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_set_mask_bit( PS_Dimension dim,
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_UInt idx,
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
PS_Mask mask;
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* get last hint mask */
|
|
|
|
error = ps_mask_table_last( &dim->masks, memory, &mask );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
error = ps_mask_set_bit( mask, idx, memory );
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
#endif
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* set the end point in a mask, called from "End" & "Reset" methods */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_dimension_end_mask( PS_Dimension dim,
|
|
|
|
FT_UInt end_point )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_UInt count = dim->masks.num_masks;
|
|
|
|
PS_Mask mask;
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
if ( count > 0 )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
mask = dim->masks.masks + count - 1;
|
2001-10-18 13:38:43 +02:00
|
|
|
mask->end_point = end_point;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* set the end point in the current mask, then create a new empty one */
|
|
|
|
/* (called by "Reset" method) */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_reset_mask( PS_Dimension dim,
|
|
|
|
FT_UInt end_point,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
PS_Mask mask;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* end current mask */
|
|
|
|
ps_dimension_end_mask( dim, end_point );
|
|
|
|
|
|
|
|
/* allocate new one */
|
|
|
|
return ps_mask_table_alloc( &dim->masks, memory, &mask );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* set a new mask, called from the "T2Stem" method */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_set_mask_bits( PS_Dimension dim,
|
|
|
|
const FT_Byte* source,
|
|
|
|
FT_UInt source_pos,
|
|
|
|
FT_UInt source_bits,
|
|
|
|
FT_UInt end_point,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* reset current mask, if any */
|
|
|
|
error = ps_dimension_reset_mask( dim, end_point, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
/* set bits in new mask */
|
2007-05-20 20:07:52 +02:00
|
|
|
error = ps_mask_table_set_bits( &dim->masks, source,
|
2001-12-05 02:22:05 +01:00
|
|
|
source_pos, source_bits, memory );
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* add a new single stem (called from "T1Stem" method) */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_add_t1stem( PS_Dimension dim,
|
|
|
|
FT_Int pos,
|
|
|
|
FT_Int len,
|
|
|
|
FT_Memory memory,
|
|
|
|
FT_Int *aindex )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
FT_UInt flags = 0;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* detect ghost stem */
|
|
|
|
if ( len < 0 )
|
|
|
|
{
|
|
|
|
flags |= PS_HINT_FLAG_GHOST;
|
|
|
|
if ( len == -21 )
|
|
|
|
{
|
|
|
|
flags |= PS_HINT_FLAG_BOTTOM;
|
|
|
|
pos += len;
|
|
|
|
}
|
|
|
|
len = 0;
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( aindex )
|
2001-10-18 13:38:43 +02:00
|
|
|
*aindex = -1;
|
|
|
|
|
|
|
|
/* now, lookup stem in the current hints table */
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
PS_Mask mask;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_UInt idx;
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_UInt max = dim->hints.num_hints;
|
|
|
|
PS_Hint hint = dim->hints.hints;
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
for ( idx = 0; idx < max; idx++, hint++ )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
if ( hint->pos == pos && hint->len == len )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we need to create a new hint in the table */
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
if ( idx >= max )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
error = ps_hint_table_alloc( &dim->hints, memory, &hint );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
hint->pos = pos;
|
|
|
|
hint->len = len;
|
|
|
|
hint->flags = flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now, store the hint in the current mask */
|
|
|
|
error = ps_mask_table_last( &dim->masks, memory, &mask );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
error = ps_mask_set_bit( mask, idx, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
if ( aindex )
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
*aindex = (FT_Int)idx;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* add a "hstem3/vstem3" counter to our dimension table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_add_counter( PS_Dimension dim,
|
|
|
|
FT_Int hint1,
|
|
|
|
FT_Int hint2,
|
|
|
|
FT_Int hint3,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
|
|
|
FT_UInt count = dim->counters.num_masks;
|
|
|
|
PS_Mask counter = dim->counters.masks;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* try to find an existing counter mask that already uses */
|
2001-12-05 02:22:05 +01:00
|
|
|
/* one of these stems here */
|
2001-10-18 13:38:43 +02:00
|
|
|
for ( ; count > 0; count--, counter++ )
|
|
|
|
{
|
|
|
|
if ( ps_mask_test_bit( counter, hint1 ) ||
|
|
|
|
ps_mask_test_bit( counter, hint2 ) ||
|
|
|
|
ps_mask_test_bit( counter, hint3 ) )
|
2001-12-05 02:22:05 +01:00
|
|
|
break;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
2007-01-26 23:18:56 +01:00
|
|
|
/* create a new counter when needed */
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( count == 0 )
|
|
|
|
{
|
|
|
|
error = ps_mask_table_alloc( &dim->counters, memory, &counter );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* now, set the bits for our hints in the counter mask */
|
|
|
|
error = ps_mask_set_bit( counter, hint1, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
error = ps_mask_set_bit( counter, hint2, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
error = ps_mask_set_bit( counter, hint3, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* end of recording session for a given dimension */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_dimension_end( PS_Dimension dim,
|
|
|
|
FT_UInt end_point,
|
|
|
|
FT_Memory memory )
|
|
|
|
{
|
|
|
|
/* end hint mask table */
|
|
|
|
ps_dimension_end_mask( dim, end_point );
|
|
|
|
|
|
|
|
/* merge all counter masks into independent "paths" */
|
|
|
|
return ps_mask_table_merge_all( &dim->counters, memory );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** PS_RECORDER MANAGEMENT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* destroy hints */
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL( void )
|
2001-12-05 02:22:05 +01:00
|
|
|
ps_hints_done( PS_Hints hints )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
FT_Memory memory = hints->memory;
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
ps_dimension_done( &hints->dimension[0], memory );
|
|
|
|
ps_dimension_done( &hints->dimension[1], memory );
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
hints->error = 0;
|
|
|
|
hints->memory = 0;
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL( FT_Error )
|
2001-12-05 02:22:05 +01:00
|
|
|
ps_hints_init( PS_Hints hints,
|
2001-10-18 13:38:43 +02:00
|
|
|
FT_Memory memory )
|
|
|
|
{
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( hints, sizeof ( *hints ) );
|
2001-10-18 13:38:43 +02:00
|
|
|
hints->memory = memory;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
/* initialize a hints for a new session */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hints_open( PS_Hints hints,
|
|
|
|
PS_Hint_Type hint_type )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
switch ( hint_type )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
case PS_HINT_TYPE_1:
|
|
|
|
case PS_HINT_TYPE_2:
|
|
|
|
hints->error = 0;
|
|
|
|
hints->hint_type = hint_type;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
ps_dimension_init( &hints->dimension[0] );
|
|
|
|
ps_dimension_init( &hints->dimension[1] );
|
|
|
|
break;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
default:
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
hints->error = PSH_Err_Invalid_Argument;
|
2001-12-05 02:22:05 +01:00
|
|
|
hints->hint_type = hint_type;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_open: invalid charstring type!\n" ));
|
2001-12-05 02:22:05 +01:00
|
|
|
break;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* add one or more stems to the current hints table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hints_stem( PS_Hints hints,
|
|
|
|
FT_Int dimension,
|
|
|
|
FT_UInt count,
|
|
|
|
FT_Long* stems )
|
|
|
|
{
|
|
|
|
if ( !hints->error )
|
|
|
|
{
|
|
|
|
/* limit "dimension" to 0..1 */
|
|
|
|
if ( dimension < 0 || dimension > 1 )
|
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_stem: invalid dimension (%d) used\n",
|
2001-10-18 13:38:43 +02:00
|
|
|
dimension ));
|
2001-12-05 02:22:05 +01:00
|
|
|
dimension = ( dimension != 0 );
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* record the stems in the current hints/masks table */
|
|
|
|
switch ( hints->hint_type )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
case PS_HINT_TYPE_1: /* Type 1 "hstem" or "vstem" operator */
|
|
|
|
case PS_HINT_TYPE_2: /* Type 2 "hstem" or "vstem" operator */
|
|
|
|
{
|
|
|
|
PS_Dimension dim = &hints->dimension[dimension];
|
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, stems += 2 )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_Error error;
|
|
|
|
FT_Memory memory = hints->memory;
|
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
|
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/psaux.h, src/cid/cidgload.c,
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
Many casts and slight argument type changes to make it work with
a 16bit compiler.
2003-06-05 06:31:05 +02:00
|
|
|
error = ps_dimension_add_t1stem(
|
|
|
|
dim, (FT_Int)stems[0], (FT_Int)stems[1],
|
|
|
|
memory, NULL );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_stem: could not add stem"
|
2001-12-05 02:22:05 +01:00
|
|
|
" (%d,%d) to hints table\n", stems[0], stems[1] ));
|
|
|
|
|
|
|
|
hints->error = error;
|
|
|
|
return;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2001-12-05 02:22:05 +01:00
|
|
|
}
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
default:
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_stem: called with invalid hint type (%d)\n",
|
2001-10-18 13:38:43 +02:00
|
|
|
hints->hint_type ));
|
2001-12-05 02:22:05 +01:00
|
|
|
break;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* add one Type1 counter stem to the current hints table */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hints_t1stem3( PS_Hints hints,
|
|
|
|
FT_Int dimension,
|
|
|
|
FT_Long* stems )
|
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_Error error = 0;
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
if ( !hints->error )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
PS_Dimension dim;
|
|
|
|
FT_Memory memory = hints->memory;
|
|
|
|
FT_Int count;
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
FT_Int idx[3];
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* limit "dimension" to 0..1 */
|
|
|
|
if ( dimension < 0 || dimension > 1 )
|
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_t1stem3: invalid dimension (%d) used\n",
|
2001-10-18 13:38:43 +02:00
|
|
|
dimension ));
|
2001-12-05 02:22:05 +01:00
|
|
|
dimension = ( dimension != 0 );
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
dim = &hints->dimension[dimension];
|
|
|
|
|
|
|
|
/* there must be 6 elements in the 'stem' array */
|
|
|
|
if ( hints->hint_type == PS_HINT_TYPE_1 )
|
|
|
|
{
|
|
|
|
/* add the three stems to our hints/masks table */
|
|
|
|
for ( count = 0; count < 3; count++, stems += 2 )
|
|
|
|
{
|
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/psaux.h, src/cid/cidgload.c,
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
Many casts and slight argument type changes to make it work with
a 16bit compiler.
2003-06-05 06:31:05 +02:00
|
|
|
error = ps_dimension_add_t1stem(
|
|
|
|
dim, (FT_Int)stems[0], (FT_Int)stems[1],
|
|
|
|
memory, &idx[count] );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* now, add the hints to the counters table */
|
* src/base/ftdbgmem.c (ft_mem_table_resize, ft_mem_table_new,
ft_mem_table_set, ft_mem_debug_alloc, ft_mem_debug_free,
ft_mem_debug_realloc, ft_mem_debug_done, FT_Alloc_Debug,
FT_Realloc_Debug, FT_Free_Debug): Fix compiler warnings.
* src/base/ftcalc.c (FT_MulFix): Ditto.
* src/cff/cffdrivr.c (cff_get_name_index): Ditto.
* src/cff/cffobjs.c (CFF_Size_Get_Global_Funcs, CFF_Size_Init,
CFF_GlyphSlot_Init): Ditto.
* src/cid/cidobjs.c (CID_GlyphSlot_Init,
CID_Size_Get_Globals_Funcs): Ditto.
* src/type1/t1objs.c (T1_Size_Get_Globals_Funcs, T1_GlyphSlot_Init):
Ditto.
* src/pshinter/pshmod.c (pshinter_interface): Use `static const'.
* src/winfonts/winfnt.c (FNT_Get_Next_Char): Remove unused
variables.
* include/freetype/internal/psaux.h (T1_Builder_Funcs): Renamed
to...
(T1_Builder_FuncsRec): This.
(T1_Builder_Funcs): New typedef.
(PSAux_Interface): Remove compiler warnings.
* src/psaux/psauxmod.c (t1_builder_funcs), src/psaux/psobjs.h
(t1_builder_funcs): Updated.
* src/pshinter/pshglob.h (PSH_Blue_Align): Replaced with ...
(PSH_BLUE_ALIGN_{NONE,TOP,BOT}): New defines.
(PSH_AlignmentRec): Updated.
* include/freetype/internal/ftstream.h (GET_Char, GET_Byte): Fix
typo.
* include/freetype/internal/ftgloadr.h (FT_SubGlyph): Ditto.
* src/base/ftstream (FT_Get_Char): Rename to...
(FT_Stream_Get_Char): This.
* src/base/ftnames.c (FT_Get_Sfnt_Name): s/index/idx/ -- `index' is
a built-in function in gcc, causing warning messages with gcc 3.0.
* src/autohint/ahglyph.c (ah_outline_load): Ditto.
* src/autohint/ahglobal.c (ah_hinter_compute_blues): Ditto.
* src/cache/ftcmanag.c (ftc_family_table_alloc,
ftc_family_table_free, FTC_Manager_Done, FTC_Manager_Register_Cache):
Ditto.
* src/cff/cffload.c (cff_new_index, cff_done_index,
cff_explicit_index, CFF_Access_Element, CFF_Forget_Element,
CFF_Get_Name, CFF_Get_String, CFF_Load_SubFont, CFF_Load_Font,
CFF_Done_Font): Ditto.
* src/psaux/psobjs.c (PS_Table_Add, PS_Parser_LoadField): Ditto.
* src/psaux/t1decode.c (T1_Decoder_Parse_Charstrings): Ditto.
* src/pshinter/pshrec.c (ps_mask_test_bit, ps_mask_clear_bit,
ps_mask_set_bit, ps_dimension_add_t1stem, ps_hints_t1stem3,
* src/pshinter/pshalgo1.c (psh1_hint_table_record,
psh1_hint_table_record_mask, psh1_hint_table_activate_mask): Ditto.
* src/pshinter/pshalgo2.c (psh2_hint_table_record,
psh2_hint_table_record_mask, psh2_hint_table_activate_mask): Ditto.
* src/sfnt/ttpost.c (Load_Format_20, Load_Format_25,
TT_Get_PS_Name): Ditto.
* src/truetype/ttgload.c (TT_Get_Metrics, Get_HMetrics,
load_truetype_glyph): Ditto.
* src/type1/t1load.c (parse_subrs, T1_Open_Face): Ditto.
* src/type1/t1afm.c (T1_Get_Kerning): Ditto.
* include/freetype/cache/ftcmanag.h (ftc_family_table_free): Ditto.
2002-03-07 22:59:59 +01:00
|
|
|
error = ps_dimension_add_counter( dim, idx[0], idx[1], idx[2],
|
|
|
|
memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_t1stem3: called with invalid hint type!\n" ));
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
error = PSH_Err_Invalid_Argument;
|
2001-10-18 13:38:43 +02:00
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
Fail:
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_t1stem3: could not add counter stems to table\n" ));
|
2001-10-18 13:38:43 +02:00
|
|
|
hints->error = error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* reset hints (only with Type 1 hints) */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hints_t1reset( PS_Hints hints,
|
|
|
|
FT_UInt end_point )
|
|
|
|
{
|
|
|
|
FT_Error error = 0;
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( !hints->error )
|
|
|
|
{
|
|
|
|
FT_Memory memory = hints->memory;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( hints->hint_type == PS_HINT_TYPE_1 )
|
|
|
|
{
|
|
|
|
error = ps_dimension_reset_mask( &hints->dimension[0],
|
2001-12-05 02:22:05 +01:00
|
|
|
end_point, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
error = ps_dimension_reset_mask( &hints->dimension[1],
|
2001-12-05 02:22:05 +01:00
|
|
|
end_point, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* invalid hint type */
|
* src/winfonts/winfnt.c (FNT_Load_Glyph): Use first_char in
computation of glyph_index.
(FNT_Size_Set_Pixels): To find a strike, first check pixel_height
only, then try to find a better hit by comparing pixel_width also.
Without this fix it isn't possible to access all strikes.
Also compute metrics.max_advance to be in sync with other bitmap
drivers.
* src/base/ftobjs.c (FT_Set_Char_Size): Remove redundant code.
(FT_Set_Pixel_Size): Assign value to `metrics' after validation of
arguments.
Synchronize computation of height and width for bitmap strikes. The
`width' field in the FT_Bitmap_Size structure is now only useful to
enumerate different strikes. The `max_advance' field of the
FT_Size_Metrics structure should be used to get the (maximum) width
of a strike.
* src/bdf/bdfdrivr.c (BDF_Face_Init): Don't use AVERAGE_WIDTH for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/pcf/pcfread.c (pcf_load_font): Don't use RESOLUTION_X for
computing `available_sizes->width' but make it always equal to
`available_sizes->height'.
* src/truetype/ttdriver.c (Set_Pixel_Sizes): Pass only single
argument to function.
* src/psnames/psmodule.c (ps_unicode_value): Handle `.' after
`uniXXXX' and `uXXXX[X[X]]'.
* src/bdf/bdfdrivr.c: s/FT_Err_/BDF_Err/.
* src/cache/ftccache.c, src/cache/ftcsbits.c, src/cache/ftlru.c:
s/FT_Err_/FTC_Err_/.
* src/cff/cffcmap.c: s/FT_Err_/CFF_Err_/.
* src/pcf/pcfdrivr.c: s/FT_Err_/PCF_Err_/.
* src/psaux/t1cmap.c: Include psauxerr.h.
s/FT_Err_/PSaux_Err_/.
* src/pshinter/pshnterr.h: New file.
* src/pshinter/rules.mk: Updated.
* src/pshinter/pshalgo.c, src/pshinter/pshrec.c: Include pshnterr.h.
s/FT_Err_/PSH_Err_/.
* src/pfr/pfrdrivr.c, src/pfr/pfrobjs.c, src/pfr/pfrsbit.c:
s/FT_Err_/PFR_Err_/.
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttload.c: s/FT_Err_/SFNT_Err_/.
* src/truetype/ttgload.c: s/FT_Err_/TT_Err_/.
* src/gzip/ftgzip.c: Load FT_MODULE_ERRORS_H and define
FT_ERR_PREFIX and FT_ERR_BASE.
s/FT_Err_/Gzip_Err_/.
2003-06-22 17:33:53 +02:00
|
|
|
error = PSH_Err_Invalid_Argument;
|
2001-10-18 13:38:43 +02:00
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
Fail:
|
|
|
|
hints->error = error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* Type2 "hintmask" operator, add a new hintmask to each direction */
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
|
|
|
ps_hints_t2mask( PS_Hints hints,
|
|
|
|
FT_UInt end_point,
|
|
|
|
FT_UInt bit_count,
|
|
|
|
const FT_Byte* bytes )
|
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( !hints->error )
|
|
|
|
{
|
|
|
|
PS_Dimension dim = hints->dimension;
|
|
|
|
FT_Memory memory = hints->memory;
|
|
|
|
FT_UInt count1 = dim[0].hints.num_hints;
|
|
|
|
FT_UInt count2 = dim[1].hints.num_hints;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
/* check bit count; must be equal to current total hint count */
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( bit_count != count1 + count2 )
|
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_t2mask: "
|
|
|
|
"called with invalid bitcount %d (instead of %d)\n",
|
2001-12-05 02:22:05 +01:00
|
|
|
bit_count, count1 + count2 ));
|
2003-12-24 02:10:46 +01:00
|
|
|
|
2001-12-21 22:21:13 +01:00
|
|
|
/* simply ignore the operator */
|
|
|
|
return;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* set-up new horizontal and vertical hint mask now */
|
2004-02-21 17:47:20 +01:00
|
|
|
error = ps_dimension_set_mask_bits( &dim[0], bytes, count2, count1,
|
2001-10-18 13:38:43 +02:00
|
|
|
end_point, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
2004-02-21 17:47:20 +01:00
|
|
|
error = ps_dimension_set_mask_bits( &dim[1], bytes, 0, count2,
|
2001-10-18 13:38:43 +02:00
|
|
|
end_point, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
Fail:
|
|
|
|
hints->error = error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
ps_hints_t2counter( PS_Hints hints,
|
|
|
|
FT_UInt bit_count,
|
|
|
|
const FT_Byte* bytes )
|
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
if ( !hints->error )
|
|
|
|
{
|
|
|
|
PS_Dimension dim = hints->dimension;
|
|
|
|
FT_Memory memory = hints->memory;
|
|
|
|
FT_UInt count1 = dim[0].hints.num_hints;
|
|
|
|
FT_UInt count2 = dim[1].hints.num_hints;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
/* check bit count, must be equal to current total hint count */
|
|
|
|
if ( bit_count != count1 + count2 )
|
|
|
|
{
|
2001-12-22 15:38:40 +01:00
|
|
|
FT_ERROR(( "ps_hints_t2counter: "
|
|
|
|
"called with invalid bitcount %d (instead of %d)\n",
|
2001-12-05 02:22:05 +01:00
|
|
|
bit_count, count1 + count2 ));
|
2003-12-24 02:10:46 +01:00
|
|
|
|
2001-12-21 22:21:13 +01:00
|
|
|
/* simply ignore the operator */
|
|
|
|
return;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* set-up new horizontal and vertical hint mask now */
|
|
|
|
error = ps_dimension_set_mask_bits( &dim[0], bytes, 0, count1,
|
2001-12-05 02:22:05 +01:00
|
|
|
0, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
error = ps_dimension_set_mask_bits( &dim[1], bytes, count1, count2,
|
2001-12-05 02:22:05 +01:00
|
|
|
0, memory );
|
|
|
|
if ( error )
|
|
|
|
goto Fail;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
return;
|
|
|
|
|
|
|
|
Fail:
|
|
|
|
hints->error = error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/* end recording session */
|
2001-10-18 13:38:43 +02:00
|
|
|
static FT_Error
|
|
|
|
ps_hints_close( PS_Hints hints,
|
|
|
|
FT_UInt end_point )
|
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
error = hints->error;
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( !error )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
2001-12-05 02:22:05 +01:00
|
|
|
FT_Memory memory = hints->memory;
|
2001-10-18 13:38:43 +02:00
|
|
|
PS_Dimension dim = hints->dimension;
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
error = ps_dimension_end( &dim[0], end_point, memory );
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( !error )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
error = ps_dimension_end( &dim[1], end_point, memory );
|
|
|
|
}
|
|
|
|
}
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-11-20 02:29:34 +01:00
|
|
|
#ifdef DEBUG_HINTER
|
2001-12-05 02:22:05 +01:00
|
|
|
if ( !error )
|
2001-11-20 02:29:34 +01:00
|
|
|
ps_debug_hints = hints;
|
2001-10-19 11:17:49 +02:00
|
|
|
#endif
|
2001-10-18 13:38:43 +02:00
|
|
|
return error;
|
|
|
|
}
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE 1 HINTS RECORDING INTERFACE *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
static void
|
|
|
|
t1_hints_open( T1_Hints hints )
|
|
|
|
{
|
|
|
|
ps_hints_open( (PS_Hints)hints, PS_HINT_TYPE_1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2001-12-05 02:22:05 +01:00
|
|
|
t1_hints_stem( T1_Hints hints,
|
|
|
|
FT_Int dimension,
|
|
|
|
FT_Long* coords )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
ps_hints_stem( (PS_Hints)hints, dimension, 1, coords );
|
2001-10-19 11:17:49 +02:00
|
|
|
}
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
2001-10-18 13:38:43 +02:00
|
|
|
t1_hints_funcs_init( T1_Hints_FuncsRec* funcs )
|
|
|
|
{
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( (char*)funcs, sizeof ( *funcs ) );
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
funcs->open = (T1_Hints_OpenFunc) t1_hints_open;
|
|
|
|
funcs->close = (T1_Hints_CloseFunc) ps_hints_close;
|
|
|
|
funcs->stem = (T1_Hints_SetStemFunc) t1_hints_stem;
|
|
|
|
funcs->stem3 = (T1_Hints_SetStem3Func)ps_hints_t1stem3;
|
|
|
|
funcs->reset = (T1_Hints_ResetFunc) ps_hints_t1reset;
|
2003-05-29 00:42:41 +02:00
|
|
|
funcs->apply = (T1_Hints_ApplyFunc) ps_hints_apply;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
2001-10-19 11:17:49 +02:00
|
|
|
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** TYPE 2 HINTS RECORDING INTERFACE *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
static void
|
|
|
|
t2_hints_open( T2_Hints hints )
|
|
|
|
{
|
|
|
|
ps_hints_open( (PS_Hints)hints, PS_HINT_TYPE_2 );
|
|
|
|
}
|
|
|
|
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-18 13:38:43 +02:00
|
|
|
static void
|
2001-12-05 02:22:05 +01:00
|
|
|
t2_hints_stems( T2_Hints hints,
|
|
|
|
FT_Int dimension,
|
|
|
|
FT_Int count,
|
|
|
|
FT_Fixed* coords )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
* include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/psaux.h, src/cid/cidgload.c,
src/psaux/psobjs.c, src/psaux/t1decode.c, src/psaux/psobjs.h,
src/pshinter/pshrec.c, src/pshinter/pshalgo.c,
src/psnames/psmodule.c, src/raster/ftraster.c, src/sfnt/sfobjs.c,
src/smooth/ftgrays.c, src/smooth/ftsmooth.c, src/truetype/ttobjs.c,
src/truetype/ttdriver.c, src/truetype/ttgload.c, src/type1/t1afm.c,
src/type1/t1gload.c, src/type1/t1gload.h, src/type1/t1load.c,
src/type1/t1objs.c, src/type42/t42parse.c, src/type42/t42parse.h:
Many casts and slight argument type changes to make it work with
a 16bit compiler.
2003-06-05 06:31:05 +02:00
|
|
|
FT_Pos stems[32], y, n;
|
|
|
|
FT_Int total = count;
|
2001-12-05 02:22:05 +01:00
|
|
|
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
y = 0;
|
2001-12-05 02:22:05 +01:00
|
|
|
while ( total > 0 )
|
2001-10-18 13:38:43 +02:00
|
|
|
{
|
|
|
|
/* determine number of stems to write */
|
|
|
|
count = total;
|
2001-12-20 14:14:18 +01:00
|
|
|
if ( count > 16 )
|
|
|
|
count = 16;
|
2001-10-19 11:17:49 +02:00
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
/* compute integer stem positions in font units */
|
2001-12-05 02:22:05 +01:00
|
|
|
for ( n = 0; n < count * 2; n++ )
|
2001-12-20 14:14:18 +01:00
|
|
|
{
|
|
|
|
y += coords[n];
|
2003-06-23 21:26:53 +02:00
|
|
|
stems[n] = ( y + 0x8000L ) >> 16;
|
2001-12-20 14:14:18 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* compute lengths */
|
2001-12-20 22:22:02 +01:00
|
|
|
for ( n = 0; n < count * 2; n += 2 )
|
|
|
|
stems[n + 1] = stems[n + 1] - stems[n];
|
2001-10-18 13:38:43 +02:00
|
|
|
|
|
|
|
/* add them to the current dimension */
|
|
|
|
ps_hints_stem( (PS_Hints)hints, dimension, count, stems );
|
|
|
|
|
2001-12-20 14:14:18 +01:00
|
|
|
total -= count;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-01 03:26:22 +01:00
|
|
|
FT_LOCAL_DEF( void )
|
2001-10-18 13:38:43 +02:00
|
|
|
t2_hints_funcs_init( T2_Hints_FuncsRec* funcs )
|
|
|
|
{
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( funcs, sizeof ( *funcs ) );
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
funcs->open = (T2_Hints_OpenFunc) t2_hints_open;
|
|
|
|
funcs->close = (T2_Hints_CloseFunc) ps_hints_close;
|
|
|
|
funcs->stems = (T2_Hints_StemsFunc) t2_hints_stems;
|
|
|
|
funcs->hintmask= (T2_Hints_MaskFunc) ps_hints_t2mask;
|
|
|
|
funcs->counter = (T2_Hints_CounterFunc)ps_hints_t2counter;
|
2003-05-29 00:42:41 +02:00
|
|
|
funcs->apply = (T2_Hints_ApplyFunc) ps_hints_apply;
|
2001-10-18 13:38:43 +02:00
|
|
|
}
|
2001-12-05 02:22:05 +01:00
|
|
|
|
|
|
|
|
|
|
|
/* END */
|