2002-07-03 23:00:26 +02:00
|
|
|
/***************************************************************************/
|
|
|
|
/* */
|
2003-05-29 00:42:41 +02:00
|
|
|
/* pshalgo.c */
|
2002-07-03 23:00:26 +02:00
|
|
|
/* */
|
2004-01-15 12:02:07 +01:00
|
|
|
/* PostScript hinting algorithm (body). */
|
2002-07-03 23:00:26 +02:00
|
|
|
/* */
|
2004-01-15 12:02:07 +01:00
|
|
|
/* Copyright 2001, 2002, 2003, 2004 by */
|
2002-07-03 23:00:26 +02: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. */
|
|
|
|
/* */
|
|
|
|
/***************************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
#include <ft2build.h>
|
|
|
|
#include FT_INTERNAL_OBJECTS_H
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
2003-05-29 00:42:41 +02:00
|
|
|
#include "pshalgo.h"
|
2002-07-03 23:00:26 +02:00
|
|
|
|
* 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"
|
|
|
|
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_pshalgo2
|
|
|
|
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#ifdef DEBUG_HINTER
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint_Table ps_debug_hint_table = 0;
|
|
|
|
PSH_HintFunc ps_debug_hint_func = 0;
|
|
|
|
PSH_Glyph ps_debug_glyph = 0;
|
2002-07-03 23:00:26 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
2002-08-30 00:50:17 +02:00
|
|
|
#define COMPUTE_INFLEXS /* compute inflection points to optimize "S" and others */
|
|
|
|
#define STRONGER /* slightly increase the contrast of smooth hinting */
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** BASIC HINTS RECORDINGS *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
/* return true iff two stem hints overlap */
|
|
|
|
static FT_Int
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_overlap( PSH_Hint hint1,
|
|
|
|
PSH_Hint hint2 )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
return ( hint1->org_pos + hint1->org_len >= hint2->org_pos &&
|
2002-09-05 17:10:54 +02:00
|
|
|
hint2->org_pos + hint2->org_len >= hint1->org_pos );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* destroy hints table */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_done( PSH_Hint_Table table,
|
|
|
|
FT_Memory memory )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_FREE( table->zones );
|
|
|
|
table->num_zones = 0;
|
|
|
|
table->zone = 0;
|
|
|
|
|
|
|
|
FT_FREE( table->sort );
|
|
|
|
FT_FREE( table->hints );
|
|
|
|
table->num_hints = 0;
|
|
|
|
table->max_hints = 0;
|
|
|
|
table->sort_global = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* deactivate all hints in a table */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_deactivate( PSH_Hint_Table table )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt count = table->max_hints;
|
|
|
|
PSH_Hint hint = table->hints;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, hint++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_deactivate( hint );
|
2002-07-03 23:00:26 +02:00
|
|
|
hint->order = -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* internal function used to record a new hint */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_record( PSH_Hint_Table table,
|
|
|
|
FT_UInt idx )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint = table->hints + idx;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( idx >= table->max_hints )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_ERROR(( "psh_hint_table_record: invalid hint index %d\n", idx ));
|
2002-07-03 23:00:26 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* ignore active hints */
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_hint_is_active( hint ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
return;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_activate( hint );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* now scan the current active hint set in order to determine */
|
|
|
|
/* if we are overlapping with another segment */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint* sorted = table->sort_global;
|
|
|
|
FT_UInt count = table->num_hints;
|
|
|
|
PSH_Hint hint2;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
hint->parent = 0;
|
|
|
|
for ( ; count > 0; count--, sorted++ )
|
|
|
|
{
|
|
|
|
hint2 = sorted[0];
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_hint_overlap( hint, hint2 ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
hint->parent = hint2;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( table->num_hints < table->max_hints )
|
|
|
|
table->sort_global[table->num_hints++] = hint;
|
|
|
|
else
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_ERROR(( "psh_hint_table_record: too many sorted hints! BUG!\n" ));
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_record_mask( PSH_Hint_Table table,
|
|
|
|
PS_Mask hint_mask )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Int mask = 0, val = 0;
|
|
|
|
FT_Byte* cursor = hint_mask->bytes;
|
|
|
|
FT_UInt idx, limit;
|
|
|
|
|
|
|
|
|
|
|
|
limit = hint_mask->num_bits;
|
|
|
|
|
|
|
|
for ( idx = 0; idx < limit; idx++ )
|
|
|
|
{
|
|
|
|
if ( mask == 0 )
|
|
|
|
{
|
|
|
|
val = *cursor++;
|
|
|
|
mask = 0x80;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( val & mask )
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_record( table, idx );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
mask >>= 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* create hints table */
|
|
|
|
static FT_Error
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_init( PSH_Hint_Table table,
|
|
|
|
PS_Hint_Table hints,
|
|
|
|
PS_Mask_Table hint_masks,
|
|
|
|
PS_Mask_Table counter_masks,
|
|
|
|
FT_Memory memory )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_UInt count = hints->num_hints;
|
|
|
|
FT_Error error;
|
|
|
|
|
|
|
|
FT_UNUSED( counter_masks );
|
|
|
|
|
|
|
|
|
|
|
|
/* allocate our tables */
|
|
|
|
if ( FT_NEW_ARRAY( table->sort, 2 * count ) ||
|
|
|
|
FT_NEW_ARRAY( table->hints, count ) ||
|
|
|
|
FT_NEW_ARRAY( table->zones, 2 * count + 1 ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
table->max_hints = count;
|
|
|
|
table->sort_global = table->sort + count;
|
|
|
|
table->num_hints = 0;
|
|
|
|
table->num_zones = 0;
|
|
|
|
table->zone = 0;
|
|
|
|
|
|
|
|
/* now, initialize the "hints" array */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint write = table->hints;
|
|
|
|
PS_Hint read = hints->hints;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, write++, read++ )
|
|
|
|
{
|
|
|
|
write->org_pos = read->pos;
|
|
|
|
write->org_len = read->len;
|
|
|
|
write->flags = read->flags;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* we now need to determine the initial "parent" stems; first */
|
|
|
|
/* activate the hints that are given by the initial hint masks */
|
|
|
|
if ( hint_masks )
|
|
|
|
{
|
|
|
|
FT_UInt Count = hint_masks->num_masks;
|
|
|
|
PS_Mask Mask = hint_masks->masks;
|
|
|
|
|
|
|
|
|
|
|
|
table->hint_masks = hint_masks;
|
|
|
|
|
|
|
|
for ( ; Count > 0; Count--, Mask++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_record_mask( table, Mask );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* now, do a linear parse in case some hints were left alone */
|
|
|
|
if ( table->num_hints != table->max_hints )
|
|
|
|
{
|
2002-07-26 16:52:29 +02:00
|
|
|
FT_UInt Index, Count;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_ERROR(( "psh_hint_table_init: missing/incorrect hint masks!\n" ));
|
2002-07-03 23:00:26 +02:00
|
|
|
Count = table->max_hints;
|
|
|
|
for ( Index = 0; Index < Count; Index++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_record( table, Index );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_activate_mask( PSH_Hint_Table table,
|
|
|
|
PS_Mask hint_mask )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Int mask = 0, val = 0;
|
|
|
|
FT_Byte* cursor = hint_mask->bytes;
|
|
|
|
FT_UInt idx, limit, count;
|
|
|
|
|
|
|
|
|
|
|
|
limit = hint_mask->num_bits;
|
|
|
|
count = 0;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_deactivate( table );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
for ( idx = 0; idx < limit; idx++ )
|
|
|
|
{
|
|
|
|
if ( mask == 0 )
|
|
|
|
{
|
|
|
|
val = *cursor++;
|
|
|
|
mask = 0x80;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( val & mask )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint = &table->hints[idx];
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_hint_is_active( hint ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_UInt count2;
|
|
|
|
|
|
|
|
#if 0
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint* sort = table->sort;
|
|
|
|
PSH_Hint hint2;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
for ( count2 = count; count2 > 0; count2--, sort++ )
|
|
|
|
{
|
|
|
|
hint2 = sort[0];
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_hint_overlap( hint, hint2 ) )
|
|
|
|
FT_ERROR(( "psh_hint_table_activate_mask:"
|
2002-07-26 16:52:29 +02:00
|
|
|
" found overlapping hints\n" ))
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
count2 = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if ( count2 == 0 )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_activate( hint );
|
2002-07-03 23:00:26 +02:00
|
|
|
if ( count < table->max_hints )
|
|
|
|
table->sort[count++] = hint;
|
|
|
|
else
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_ERROR(( "psh_hint_tableactivate_mask:"
|
2002-07-26 16:52:29 +02:00
|
|
|
" too many active hints\n" ));
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mask >>= 1;
|
|
|
|
}
|
|
|
|
table->num_hints = count;
|
|
|
|
|
|
|
|
/* now, sort the hints; they are guaranteed to not overlap */
|
|
|
|
/* so we can compare their "org_pos" field directly */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Int i1, i2;
|
|
|
|
PSH_Hint hint1, hint2;
|
|
|
|
PSH_Hint* sort = table->sort;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* a simple bubble sort will do, since in 99% of cases, the hints */
|
|
|
|
/* will be already sorted -- and the sort will be linear */
|
|
|
|
for ( i1 = 1; i1 < (FT_Int)count; i1++ )
|
|
|
|
{
|
|
|
|
hint1 = sort[i1];
|
|
|
|
for ( i2 = i1 - 1; i2 >= 0; i2-- )
|
|
|
|
{
|
|
|
|
hint2 = sort[i2];
|
|
|
|
|
|
|
|
if ( hint2->org_pos < hint1->org_pos )
|
|
|
|
break;
|
|
|
|
|
|
|
|
sort[i2 + 1] = hint2;
|
|
|
|
sort[i2] = hint1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** HINTS GRID-FITTING AND OPTIMIZATION *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
2003-03-27 22:35:44 +01:00
|
|
|
#if 1
|
2002-09-08 23:29:11 +02:00
|
|
|
static FT_Pos
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_dimension_quantize_len( PSH_Dimension dim,
|
|
|
|
FT_Pos len,
|
|
|
|
FT_Bool do_snapping )
|
2002-09-08 23:29:11 +02:00
|
|
|
{
|
|
|
|
if ( len <= 64 )
|
|
|
|
len = 64;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_Pos delta = len - dim->stdw.widths[0].cur;
|
|
|
|
|
|
|
|
|
|
|
|
if ( delta < 0 )
|
|
|
|
delta = -delta;
|
|
|
|
|
|
|
|
if ( delta < 40 )
|
|
|
|
{
|
|
|
|
len = dim->stdw.widths[0].cur;
|
|
|
|
if ( len < 48 )
|
|
|
|
len = 48;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( len < 3 * 64 )
|
|
|
|
{
|
|
|
|
delta = ( len & 63 );
|
|
|
|
len &= -64;
|
|
|
|
|
|
|
|
if ( delta < 10 )
|
|
|
|
len += delta;
|
|
|
|
|
|
|
|
else if ( delta < 32 )
|
|
|
|
len += 10;
|
|
|
|
|
|
|
|
else if ( delta < 54 )
|
|
|
|
len += 54;
|
|
|
|
|
|
|
|
else
|
|
|
|
len += delta;
|
|
|
|
}
|
|
|
|
else
|
2003-12-24 02:10:46 +01:00
|
|
|
len = FT_PIX_ROUND( len );
|
2002-09-08 23:29:11 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( do_snapping )
|
2003-12-24 02:10:46 +01:00
|
|
|
len = FT_PIX_ROUND( len );
|
2002-09-08 23:29:11 +02:00
|
|
|
|
|
|
|
return len;
|
|
|
|
}
|
2003-01-31 00:24:18 +01:00
|
|
|
#endif /* 0 */
|
2002-09-08 23:29:11 +02:00
|
|
|
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#ifdef DEBUG_HINTER
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
ps_simple_scale( PSH_Hint_Table table,
|
|
|
|
FT_Fixed scale,
|
|
|
|
FT_Fixed delta,
|
|
|
|
FT_Int dimension )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint;
|
|
|
|
FT_UInt count;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( count = 0; count < table->max_hints; count++ )
|
|
|
|
{
|
|
|
|
hint = table->hints + count;
|
|
|
|
|
|
|
|
hint->cur_pos = FT_MulFix( hint->org_pos, scale ) + delta;
|
|
|
|
hint->cur_len = FT_MulFix( hint->org_len, scale );
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ps_debug_hint_func )
|
|
|
|
ps_debug_hint_func( hint, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
2002-07-26 16:52:29 +02:00
|
|
|
|
|
|
|
#endif /* DEBUG_HINTER */
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
static FT_Fixed
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_snap_stem_side_delta( FT_Fixed pos,
|
|
|
|
FT_Fixed len )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-12-24 02:10:46 +01:00
|
|
|
FT_Fixed delta1 = FT_PIX_ROUND( pos ) - pos;
|
|
|
|
FT_Fixed delta2 = FT_PIX_ROUND( pos + len ) - pos - len;
|
2002-07-26 16:52:29 +02:00
|
|
|
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
if ( ABS( delta1 ) <= ABS( delta2 ) )
|
|
|
|
return delta1;
|
|
|
|
else
|
|
|
|
return delta2;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_align( PSH_Hint hint,
|
|
|
|
PSH_Globals globals,
|
|
|
|
FT_Int dimension,
|
|
|
|
PSH_Glyph glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
PSH_Dimension dim = &globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
|
|
|
FT_Fixed delta = dim->scale_delta;
|
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_hint_is_fitted( hint ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Pos pos = FT_MulFix( hint->org_pos, scale ) + delta;
|
|
|
|
FT_Pos len = FT_MulFix( hint->org_len, scale );
|
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
FT_Int do_snapping;
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
FT_Pos fit_len;
|
2002-07-03 23:00:26 +02:00
|
|
|
PSH_AlignmentRec align;
|
|
|
|
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
|
|
|
|
/* ignore stem alignments when requested through the hint flags */
|
2002-09-08 23:29:11 +02:00
|
|
|
if ( ( dimension == 0 && !glyph->do_horz_hints ) ||
|
|
|
|
( dimension == 1 && !glyph->do_vert_hints ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
hint->cur_pos = pos;
|
|
|
|
hint->cur_len = len;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_set_fitted( hint );
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
return;
|
2002-07-26 16:52:29 +02:00
|
|
|
}
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
/* perform stem snapping when requested - this is necessary
|
|
|
|
* for monochrome and LCD hinting modes only
|
|
|
|
*/
|
2002-09-08 23:29:11 +02:00
|
|
|
do_snapping = ( dimension == 0 && glyph->do_horz_snapping ) ||
|
|
|
|
( dimension == 1 && glyph->do_vert_snapping );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
hint->cur_len = fit_len = len;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* check blue zones for horizontal stems */
|
2002-08-19 08:06:44 +02:00
|
|
|
align.align = PSH_BLUE_ALIGN_NONE;
|
2002-07-03 23:00:26 +02:00
|
|
|
align.align_bot = align.align_top = 0;
|
|
|
|
|
|
|
|
if ( dimension == 1 )
|
|
|
|
psh_blues_snap_stem( &globals->blues,
|
|
|
|
hint->org_pos + hint->org_len,
|
|
|
|
hint->org_pos,
|
|
|
|
&align );
|
|
|
|
|
|
|
|
switch ( align.align )
|
|
|
|
{
|
|
|
|
case PSH_BLUE_ALIGN_TOP:
|
|
|
|
/* the top of the stem is aligned against a blue zone */
|
|
|
|
hint->cur_pos = align.align_top - fit_len;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSH_BLUE_ALIGN_BOT:
|
|
|
|
/* the bottom of the stem is aligned against a blue zone */
|
|
|
|
hint->cur_pos = align.align_bot;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSH_BLUE_ALIGN_TOP | PSH_BLUE_ALIGN_BOT:
|
|
|
|
/* both edges of the stem are aligned against blue zones */
|
|
|
|
hint->cur_pos = align.align_bot;
|
|
|
|
hint->cur_len = align.align_top - align.align_bot;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint parent = hint->parent;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( parent )
|
|
|
|
{
|
|
|
|
FT_Pos par_org_center, par_cur_center;
|
|
|
|
FT_Pos cur_org_center, cur_delta;
|
|
|
|
|
|
|
|
|
|
|
|
/* ensure that parent is already fitted */
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_hint_is_fitted( parent ) )
|
|
|
|
psh_hint_align( parent, globals, dimension, glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
par_org_center = parent->org_pos + ( parent->org_len >> 1 );
|
|
|
|
par_cur_center = parent->cur_pos + ( parent->cur_len >> 1 );
|
|
|
|
cur_org_center = hint->org_pos + ( hint->org_len >> 1 );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
cur_delta = FT_MulFix( cur_org_center - par_org_center, scale );
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
pos = par_cur_center + cur_delta - ( len >> 1 );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
hint->cur_pos = pos;
|
|
|
|
hint->cur_len = fit_len;
|
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
/* Stem adjustment tries to snap stem widths to standard
|
|
|
|
* ones. This is important to prevent unpleasant rounding
|
|
|
|
* artefacts.
|
|
|
|
*/
|
2003-01-08 10:52:32 +01:00
|
|
|
if ( glyph->do_stem_adjust )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-01-08 10:52:32 +01:00
|
|
|
if ( len <= 64 )
|
|
|
|
{
|
2003-04-23 17:17:43 +02:00
|
|
|
/* the stem is less than one pixel; we will center it
|
|
|
|
* around the nearest pixel center
|
|
|
|
*/
|
2003-01-30 15:57:38 +01:00
|
|
|
#if 1
|
2003-12-24 02:10:46 +01:00
|
|
|
pos = FT_PIX_FLOOR( pos + ( len >> 1 ) );
|
2003-01-30 15:57:38 +01:00
|
|
|
#else
|
2003-04-23 17:17:43 +02:00
|
|
|
/* this seems to be a bug! */
|
2003-12-24 02:10:46 +01:00
|
|
|
pos = pos + FT_PIX_FLOOR( len >> 1 );
|
2003-01-31 00:24:18 +01:00
|
|
|
#endif
|
2003-01-08 10:52:32 +01:00
|
|
|
len = 64;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
len = psh_dimension_quantize_len( dim, len, 0 );
|
2003-01-08 10:52:32 +01:00
|
|
|
}
|
2002-09-08 23:29:11 +02:00
|
|
|
}
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
/* now that we have a good hinted stem width, try to position */
|
|
|
|
/* the stem along a pixel grid integer coordinate */
|
2003-05-29 00:42:41 +02:00
|
|
|
hint->cur_pos = pos + psh_hint_snap_stem_side_delta( pos, len );
|
2002-09-08 23:29:11 +02:00
|
|
|
hint->cur_len = len;
|
|
|
|
}
|
|
|
|
}
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
if ( do_snapping )
|
|
|
|
{
|
2003-01-31 00:24:18 +01:00
|
|
|
pos = hint->cur_pos;
|
2002-09-08 23:29:11 +02:00
|
|
|
len = hint->cur_len;
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
if ( len < 64 )
|
|
|
|
len = 64;
|
|
|
|
else
|
2003-12-24 02:10:46 +01:00
|
|
|
len = FT_PIX_ROUND( len );
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
switch ( align.align )
|
|
|
|
{
|
|
|
|
case PSH_BLUE_ALIGN_TOP:
|
|
|
|
hint->cur_pos = align.align_top - len;
|
|
|
|
hint->cur_len = len;
|
|
|
|
break;
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
case PSH_BLUE_ALIGN_BOT:
|
|
|
|
hint->cur_len = len;
|
|
|
|
break;
|
2002-08-30 00:50:17 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
case PSH_BLUE_ALIGN_BOT | PSH_BLUE_ALIGN_TOP:
|
|
|
|
/* don't touch */
|
|
|
|
break;
|
2002-08-30 00:50:17 +02:00
|
|
|
|
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
default:
|
2002-08-30 00:50:17 +02:00
|
|
|
hint->cur_len = len;
|
2002-09-08 23:29:11 +02:00
|
|
|
if ( len & 64 )
|
2003-12-24 02:10:46 +01:00
|
|
|
pos = FT_PIX_FLOOR( pos + ( len >> 1 ) ) + 32;
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
else
|
2003-12-24 02:10:46 +01:00
|
|
|
pos = FT_PIX_ROUND( pos + ( len >> 1 ) );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
hint->cur_pos = pos - ( len >> 1 );
|
|
|
|
hint->cur_len = len;
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
}
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
* include/freetype/freetype.h, src/base/ftobjs.h,
freetype/internal/ftobjs.h, freetype/internal/psaux.h,
freetype/internal/pshints.h, src/psaux/t1decode.c, src/cff/cffgload.h,
src/cff/cffgload.c, src/pshinter/pshalgo1.h, src/pshinter/pshalgo1.c,
src/pshinter/pshalgo2.h, src/pshinter/pshalgo2.c, src/pshinter/pshalgo3.h,
src/pshinter/pshalgo3.c: Adding support for hinter-specific bit flags,
and the new FT_Set_Hint_Flags high-level API
2002-07-09 00:26:11 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_set_fitted( hint );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ps_debug_hint_func )
|
|
|
|
ps_debug_hint_func( hint, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-03-27 22:35:44 +01:00
|
|
|
#if 0 /* not used for now, experimental */
|
|
|
|
|
2003-01-30 15:57:38 +01:00
|
|
|
/*
|
|
|
|
* A variant to perform "light" hinting (i.e. FT_RENDER_MODE_LIGHT)
|
|
|
|
* of stems
|
|
|
|
*/
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_align_light( PSH_Hint hint,
|
|
|
|
PSH_Globals globals,
|
|
|
|
FT_Int dimension,
|
|
|
|
PSH_Glyph glyph )
|
2003-01-30 15:57:38 +01:00
|
|
|
{
|
|
|
|
PSH_Dimension dim = &globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
|
|
|
FT_Fixed delta = dim->scale_delta;
|
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_hint_is_fitted( hint ) )
|
2003-01-30 15:57:38 +01:00
|
|
|
{
|
|
|
|
FT_Pos pos = FT_MulFix( hint->org_pos, scale ) + delta;
|
|
|
|
FT_Pos len = FT_MulFix( hint->org_len, scale );
|
|
|
|
|
|
|
|
FT_Pos fit_len;
|
|
|
|
|
|
|
|
PSH_AlignmentRec align;
|
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
|
2003-01-30 15:57:38 +01:00
|
|
|
/* ignore stem alignments when requested through the hint flags */
|
|
|
|
if ( ( dimension == 0 && !glyph->do_horz_hints ) ||
|
|
|
|
( dimension == 1 && !glyph->do_vert_hints ) )
|
|
|
|
{
|
|
|
|
hint->cur_pos = pos;
|
|
|
|
hint->cur_len = len;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_set_fitted( hint );
|
2003-01-30 15:57:38 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
fit_len = len;
|
|
|
|
|
|
|
|
hint->cur_len = fit_len;
|
|
|
|
|
|
|
|
/* check blue zones for horizontal stems */
|
|
|
|
align.align = PSH_BLUE_ALIGN_NONE;
|
|
|
|
align.align_bot = align.align_top = 0;
|
|
|
|
|
|
|
|
if ( dimension == 1 )
|
|
|
|
psh_blues_snap_stem( &globals->blues,
|
|
|
|
hint->org_pos + hint->org_len,
|
|
|
|
hint->org_pos,
|
|
|
|
&align );
|
|
|
|
|
|
|
|
switch ( align.align )
|
|
|
|
{
|
|
|
|
case PSH_BLUE_ALIGN_TOP:
|
|
|
|
/* the top of the stem is aligned against a blue zone */
|
|
|
|
hint->cur_pos = align.align_top - fit_len;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSH_BLUE_ALIGN_BOT:
|
|
|
|
/* the bottom of the stem is aligned against a blue zone */
|
|
|
|
hint->cur_pos = align.align_bot;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PSH_BLUE_ALIGN_TOP | PSH_BLUE_ALIGN_BOT:
|
|
|
|
/* both edges of the stem are aligned against blue zones */
|
|
|
|
hint->cur_pos = align.align_bot;
|
|
|
|
hint->cur_len = align.align_top - align.align_bot;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint parent = hint->parent;
|
2003-01-30 15:57:38 +01:00
|
|
|
|
|
|
|
|
|
|
|
if ( parent )
|
|
|
|
{
|
|
|
|
FT_Pos par_org_center, par_cur_center;
|
|
|
|
FT_Pos cur_org_center, cur_delta;
|
|
|
|
|
|
|
|
|
|
|
|
/* ensure that parent is already fitted */
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_hint_is_fitted( parent ) )
|
|
|
|
psh_hint_align_light( parent, globals, dimension, glyph );
|
2003-01-30 15:57:38 +01:00
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
par_org_center = parent->org_pos + ( parent->org_len / 2 );
|
|
|
|
par_cur_center = parent->cur_pos + ( parent->cur_len / 2 );
|
|
|
|
cur_org_center = hint->org_pos + ( hint->org_len / 2 );
|
2003-01-30 15:57:38 +01:00
|
|
|
|
|
|
|
cur_delta = FT_MulFix( cur_org_center - par_org_center, scale );
|
|
|
|
pos = par_cur_center + cur_delta - ( len >> 1 );
|
|
|
|
}
|
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
/* Stems less than one pixel wide are easy -- we want to
|
|
|
|
* make them as dark as possible, so they must fall within
|
|
|
|
* one pixel. If the stem is split between two pixels
|
|
|
|
* then snap the edge that is nearer to the pixel boundary
|
|
|
|
* to the pixel boundary.
|
|
|
|
*/
|
|
|
|
if ( len <= 64 )
|
2003-01-30 15:57:38 +01:00
|
|
|
{
|
|
|
|
if ( ( pos + len + 63 ) / 64 != pos / 64 + 1 )
|
2003-05-29 00:42:41 +02:00
|
|
|
pos += psh_hint_snap_stem_side_delta ( pos, len );
|
2003-01-30 15:57:38 +01:00
|
|
|
}
|
2003-04-23 17:17:43 +02:00
|
|
|
|
|
|
|
/* Position stems other to minimize the amount of mid-grays.
|
|
|
|
* There are, in general, two positions that do this,
|
|
|
|
* illustrated as A) and B) below.
|
|
|
|
*
|
|
|
|
* + + + +
|
|
|
|
*
|
|
|
|
* A) |--------------------------------|
|
|
|
|
* B) |--------------------------------|
|
|
|
|
* C) |--------------------------------|
|
|
|
|
*
|
|
|
|
* Position A) (split the excess stem equally) should be better
|
|
|
|
* for stems of width N + f where f < 0.5.
|
|
|
|
*
|
|
|
|
* Position B) (split the deficiency equally) should be better
|
|
|
|
* for stems of width N + f where f > 0.5.
|
|
|
|
*
|
|
|
|
* It turns out though that minimizing the total number of lit
|
|
|
|
* pixels is also important, so position C), with one edge
|
|
|
|
* aligned with a pixel boundary is actually preferable
|
|
|
|
* to A). There are also more possibile positions for C) than
|
|
|
|
* for A) or B), so it involves less distortion of the overall
|
|
|
|
* character shape.
|
|
|
|
*/
|
2003-01-30 15:57:38 +01:00
|
|
|
else /* len > 64 */
|
|
|
|
{
|
2003-04-23 17:17:43 +02:00
|
|
|
FT_Fixed frac_len = len & 63;
|
|
|
|
FT_Fixed center = pos + ( len >> 1 );
|
|
|
|
FT_Fixed delta_a, delta_b;
|
|
|
|
|
2003-01-30 15:57:38 +01:00
|
|
|
|
|
|
|
if ( ( len / 64 ) & 1 )
|
|
|
|
{
|
2003-12-24 02:10:46 +01:00
|
|
|
delta_a = FT_PIX_FLOOR( center ) + 32 - center;
|
|
|
|
delta_b = FT_PIX_ROUND( center ) - center;
|
2003-01-30 15:57:38 +01:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-12-24 02:10:46 +01:00
|
|
|
delta_a = FT_PIX_ROUND( center ) - center;
|
|
|
|
delta_b = FT_PIX_FLOOR( center ) + 32 - center;
|
2003-01-30 15:57:38 +01:00
|
|
|
}
|
|
|
|
|
2003-04-23 17:17:43 +02:00
|
|
|
/* We choose between B) and C) above based on the amount
|
|
|
|
* of fractinal stem width; for small amounts, choose
|
|
|
|
* C) always, for large amounts, B) always, and inbetween,
|
|
|
|
* pick whichever one involves less stem movement.
|
|
|
|
*/
|
|
|
|
if ( frac_len < 32 )
|
2003-01-30 15:57:38 +01:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
pos += psh_hint_snap_stem_side_delta ( pos, len );
|
2003-01-30 15:57:38 +01:00
|
|
|
}
|
2003-04-23 17:17:43 +02:00
|
|
|
else if ( frac_len < 48 )
|
2003-01-30 15:57:38 +01:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Fixed side_delta = psh_hint_snap_stem_side_delta ( pos,
|
|
|
|
len );
|
2003-04-23 17:17:43 +02:00
|
|
|
|
2003-01-30 15:57:38 +01:00
|
|
|
if ( ABS( side_delta ) < ABS( delta_b ) )
|
|
|
|
pos += side_delta;
|
|
|
|
else
|
|
|
|
pos += delta_b;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
pos += delta_b;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
hint->cur_pos = pos;
|
|
|
|
}
|
|
|
|
} /* switch */
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_set_fitted( hint );
|
2003-01-30 15:57:38 +01:00
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ps_debug_hint_func )
|
|
|
|
ps_debug_hint_func( hint, dimension );
|
2003-01-30 15:57:38 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-03-27 22:35:44 +01:00
|
|
|
#endif /* 0 */
|
|
|
|
|
2003-01-30 15:57:38 +01:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_align_hints( PSH_Hint_Table table,
|
|
|
|
PSH_Globals globals,
|
|
|
|
FT_Int dimension,
|
|
|
|
PSH_Glyph glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint;
|
2002-07-03 23:00:26 +02:00
|
|
|
FT_UInt count;
|
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
PSH_Dimension dim = &globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
|
|
|
FT_Fixed delta = dim->scale_delta;
|
|
|
|
|
|
|
|
|
|
|
|
if ( ps_debug_no_vert_hints && dimension == 0 )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
ps_simple_scale( table, scale, delta, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( ps_debug_no_horz_hints && dimension == 1 )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
ps_simple_scale( table, scale, delta, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
return;
|
|
|
|
}
|
2002-07-26 16:52:29 +02:00
|
|
|
|
|
|
|
#endif /* DEBUG_HINTER*/
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
hint = table->hints;
|
|
|
|
count = table->max_hints;
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, hint++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_align( hint, globals, dimension, glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** POINTS INTERPOLATION ROUTINES *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
#define PSH_ZONE_MIN -3200000L
|
|
|
|
#define PSH_ZONE_MAX +3200000L
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
#define xxDEBUG_ZONES
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG_ZONES
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_print_zone( PSH_Zone zone )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
printf( "zone [scale,delta,min,max] = [%.3f,%.3f,%d,%d]\n",
|
2002-07-26 16:52:29 +02:00
|
|
|
zone->scale / 65536.0,
|
|
|
|
zone->delta / 64.0,
|
2002-07-03 23:00:26 +02:00
|
|
|
zone->min,
|
|
|
|
zone->max );
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
#define psh_print_zone( x ) do { } while ( 0 )
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-07-26 16:52:29 +02:00
|
|
|
#endif /* DEBUG_ZONES */
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** HINTER GLYPH MANAGEMENT *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
#ifdef COMPUTE_INFLEXS
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
/* compute all inflex points in a given glyph */
|
2002-08-19 08:06:44 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_compute_inflections( PSH_Glyph glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-08-19 08:06:44 +02:00
|
|
|
FT_UInt n;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
for ( n = 0; n < glyph->num_contours; n++ )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point first, start, end, before, after;
|
|
|
|
FT_Angle angle_in, angle_seg, angle_out;
|
|
|
|
FT_Angle diff_in, diff_out;
|
|
|
|
FT_Int finished = 0;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* we need at least 4 points to create an inflection point */
|
|
|
|
if ( glyph->contours[n].count < 4 )
|
|
|
|
continue;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* compute first segment in contour */
|
2002-08-22 08:04:32 +02:00
|
|
|
first = glyph->contours[n].start;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
start = end = first;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
end = end->next;
|
|
|
|
if ( end == first )
|
|
|
|
goto Skip;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
} while ( PSH_POINT_EQUAL_ORG( end, first ) );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
angle_seg = PSH_POINT_ANGLE( start, end );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* extend the segment start whenever possible */
|
|
|
|
before = start;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
start = before;
|
|
|
|
before = before->prev;
|
|
|
|
if ( before == first )
|
|
|
|
goto Skip;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
} while ( PSH_POINT_EQUAL_ORG( before, start ) );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
angle_in = PSH_POINT_ANGLE( before, start );
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( angle_in == angle_seg );
|
2002-08-19 08:06:44 +02:00
|
|
|
|
|
|
|
first = start;
|
|
|
|
diff_in = FT_Angle_Diff( angle_in, angle_seg );
|
|
|
|
|
|
|
|
/* now, process all segments in the contour */
|
|
|
|
do
|
|
|
|
{
|
|
|
|
/* first, extend current segment's end whenever possible */
|
|
|
|
after = end;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
end = after;
|
|
|
|
after = after->next;
|
|
|
|
if ( after == first )
|
|
|
|
finished = 1;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
} while ( PSH_POINT_EQUAL_ORG( end, after ) );
|
2002-08-19 08:06:44 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
angle_out = PSH_POINT_ANGLE( end, after );
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( angle_out == angle_seg );
|
2002-08-19 08:06:44 +02:00
|
|
|
|
|
|
|
diff_out = FT_Angle_Diff( angle_seg, angle_out );
|
|
|
|
|
2002-08-22 00:06:41 +02:00
|
|
|
if ( ( diff_in ^ diff_out ) < 0 )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
/* diff_in and diff_out have different signs, we have */
|
|
|
|
/* inflection points here... */
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_inflex( start );
|
2002-08-19 08:06:44 +02:00
|
|
|
start = start->next;
|
|
|
|
}
|
|
|
|
while ( start != end );
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_inflex( start );
|
2002-08-19 08:06:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
start = end;
|
|
|
|
end = after;
|
|
|
|
angle_seg = angle_out;
|
|
|
|
diff_in = diff_out;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( !finished );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
Skip:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
}
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
#endif /* COMPUTE_INFLEXS */
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_done( PSH_Glyph glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Memory memory = glyph->memory;
|
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_done( &glyph->hint_tables[1], memory );
|
|
|
|
psh_hint_table_done( &glyph->hint_tables[0], memory );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
FT_FREE( glyph->points );
|
|
|
|
FT_FREE( glyph->contours );
|
|
|
|
|
|
|
|
glyph->num_points = 0;
|
|
|
|
glyph->num_contours = 0;
|
|
|
|
|
|
|
|
glyph->memory = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_compute_dir( FT_Pos dx,
|
|
|
|
FT_Pos dy )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Pos ax, ay;
|
2003-05-29 00:42:41 +02:00
|
|
|
int result = PSH_DIR_NONE;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
ax = ( dx >= 0 ) ? dx : -dx;
|
|
|
|
ay = ( dy >= 0 ) ? dy : -dy;
|
|
|
|
|
|
|
|
if ( ay * 12 < ax )
|
|
|
|
{
|
|
|
|
/* |dy| <<< |dx| means a near-horizontal segment */
|
2003-05-29 00:42:41 +02:00
|
|
|
result = ( dx >= 0 ) ? PSH_DIR_RIGHT : PSH_DIR_LEFT;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
else if ( ax * 12 < ay )
|
|
|
|
{
|
|
|
|
/* |dx| <<< |dy| means a near-vertical segment */
|
2003-05-29 00:42:41 +02:00
|
|
|
result = ( dy >= 0 ) ? PSH_DIR_UP : PSH_DIR_DOWN;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* load outline point coordinates into hinter glyph */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_load_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
FT_Vector* vec = glyph->outline->points;
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point point = glyph->points;
|
2002-08-19 08:06:44 +02:00
|
|
|
FT_UInt count = glyph->num_points;
|
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, point++, vec++ )
|
|
|
|
{
|
|
|
|
point->flags2 = 0;
|
|
|
|
point->hint = NULL;
|
|
|
|
if ( dimension == 0 )
|
|
|
|
{
|
|
|
|
point->org_u = vec->x;
|
|
|
|
point->org_v = vec->y;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
point->org_u = vec->y;
|
|
|
|
point->org_v = vec->x;
|
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
|
|
|
point->org_x = vec->x;
|
|
|
|
point->org_y = vec->y;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* save hinted point coordinates back to outline */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_save_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
FT_UInt n;
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point point = glyph->points;
|
2002-08-19 08:06:44 +02:00
|
|
|
FT_Vector* vec = glyph->outline->points;
|
|
|
|
char* tags = glyph->outline->tags;
|
|
|
|
|
|
|
|
|
|
|
|
for ( n = 0; n < glyph->num_points; n++ )
|
|
|
|
{
|
|
|
|
if ( dimension == 0 )
|
|
|
|
vec[n].x = point->cur_u;
|
|
|
|
else
|
|
|
|
vec[n].y = point->cur_u;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_strong( point ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
tags[n] |= (char)( ( dimension == 0 ) ? 32 : 64 );
|
|
|
|
|
|
|
|
#ifdef DEBUG_HINTER
|
|
|
|
|
|
|
|
if ( dimension == 0 )
|
|
|
|
{
|
|
|
|
point->cur_x = point->cur_u;
|
|
|
|
point->flags_x = point->flags2 | point->flags;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
point->cur_y = point->cur_u;
|
|
|
|
point->flags_y = point->flags2 | point->flags;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
point++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
static FT_Error
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_init( PSH_Glyph glyph,
|
|
|
|
FT_Outline* outline,
|
|
|
|
PS_Hints ps_hints,
|
|
|
|
PSH_Globals globals )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
FT_Error error;
|
|
|
|
FT_Memory memory;
|
|
|
|
|
|
|
|
|
|
|
|
/* clear all fields */
|
2002-07-28 07:05:24 +02:00
|
|
|
FT_MEM_ZERO( glyph, sizeof ( *glyph ) );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2004-01-15 12:02:07 +01:00
|
|
|
memory = glyph->memory = globals->memory;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* allocate and setup points + contours arrays */
|
|
|
|
if ( FT_NEW_ARRAY( glyph->points, outline->n_points ) ||
|
|
|
|
FT_NEW_ARRAY( glyph->contours, outline->n_contours ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
glyph->num_points = outline->n_points;
|
|
|
|
glyph->num_contours = outline->n_contours;
|
|
|
|
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt first = 0, next, n;
|
|
|
|
PSH_Point points = glyph->points;
|
|
|
|
PSH_Contour contour = glyph->contours;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( n = 0; n < glyph->num_contours; n++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Int count;
|
|
|
|
PSH_Point point;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
next = outline->contours[n] + 1;
|
|
|
|
count = next - first;
|
|
|
|
|
|
|
|
contour->start = points + first;
|
|
|
|
contour->count = (FT_UInt)count;
|
|
|
|
|
|
|
|
if ( count > 0 )
|
|
|
|
{
|
|
|
|
point = points + first;
|
|
|
|
|
|
|
|
point->prev = points + next - 1;
|
|
|
|
point->contour = contour;
|
|
|
|
|
|
|
|
for ( ; count > 1; count-- )
|
|
|
|
{
|
|
|
|
point[0].next = point + 1;
|
|
|
|
point[1].prev = point;
|
|
|
|
point++;
|
|
|
|
point->contour = contour;
|
|
|
|
}
|
|
|
|
point->next = points + first;
|
|
|
|
}
|
|
|
|
|
|
|
|
contour++;
|
|
|
|
first = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point points = glyph->points;
|
|
|
|
PSH_Point point = points;
|
2002-07-03 23:00:26 +02:00
|
|
|
FT_Vector* vec = outline->points;
|
|
|
|
FT_UInt n;
|
|
|
|
|
|
|
|
|
|
|
|
for ( n = 0; n < glyph->num_points; n++, point++ )
|
|
|
|
{
|
* 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_Int n_prev = (FT_Int)( point->prev - points );
|
|
|
|
FT_Int n_next = (FT_Int)( point->next - points );
|
2002-07-03 23:00:26 +02:00
|
|
|
FT_Pos dxi, dyi, dxo, dyo;
|
|
|
|
|
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
if ( !( outline->tags[n] & FT_CURVE_TAG_ON ) )
|
2003-05-29 00:42:41 +02:00
|
|
|
point->flags = PSH_POINT_OFF;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
dxi = vec[n].x - vec[n_prev].x;
|
|
|
|
dyi = vec[n].y - vec[n_prev].y;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
point->dir_in = (FT_Char)psh_compute_dir( dxi, dyi );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
dxo = vec[n_next].x - vec[n].x;
|
|
|
|
dyo = vec[n_next].y - vec[n].y;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
point->dir_out = (FT_Char)psh_compute_dir( dxo, dyo );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* detect smooth points */
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( point->flags & PSH_POINT_OFF )
|
|
|
|
point->flags |= PSH_POINT_SMOOTH;
|
|
|
|
else if ( point->dir_in != PSH_DIR_NONE ||
|
|
|
|
point->dir_out != PSH_DIR_NONE )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
if ( point->dir_in == point->dir_out )
|
2003-05-29 00:42:41 +02:00
|
|
|
point->flags |= PSH_POINT_SMOOTH;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
FT_Angle angle_in, angle_out, diff;
|
|
|
|
|
|
|
|
|
|
|
|
angle_in = FT_Atan2( dxi, dyi );
|
|
|
|
angle_out = FT_Atan2( dxo, dyo );
|
|
|
|
|
|
|
|
diff = angle_in - angle_out;
|
|
|
|
if ( diff < 0 )
|
|
|
|
diff = -diff;
|
|
|
|
|
|
|
|
if ( diff > FT_ANGLE_PI )
|
|
|
|
diff = FT_ANGLE_2PI - diff;
|
|
|
|
|
|
|
|
if ( diff < FT_ANGLE_PI / 16 )
|
2003-05-29 00:42:41 +02:00
|
|
|
point->flags |= PSH_POINT_SMOOTH;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
glyph->outline = outline;
|
|
|
|
glyph->globals = globals;
|
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
#ifdef COMPUTE_INFLEXS
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_load_points( glyph, 0 );
|
|
|
|
psh_glyph_compute_inflections( glyph );
|
2002-08-19 08:06:44 +02:00
|
|
|
#endif /* COMPUTE_INFLEXS */
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
/* now deal with hints tables */
|
2003-05-29 00:42:41 +02:00
|
|
|
error = psh_hint_table_init( &glyph->hint_tables [0],
|
|
|
|
&ps_hints->dimension[0].hints,
|
|
|
|
&ps_hints->dimension[0].masks,
|
|
|
|
&ps_hints->dimension[0].counters,
|
|
|
|
memory );
|
2002-07-03 23:00:26 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
error = psh_hint_table_init( &glyph->hint_tables [1],
|
|
|
|
&ps_hints->dimension[1].hints,
|
|
|
|
&ps_hints->dimension[1].masks,
|
|
|
|
&ps_hints->dimension[1].counters,
|
|
|
|
memory );
|
2002-07-03 23:00:26 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
/* compute all extrema in a glyph for a given dimension */
|
2002-07-03 23:00:26 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_compute_extrema( PSH_Glyph glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-08-22 08:04:32 +02:00
|
|
|
FT_UInt n;
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* first of all, compute all local extrema */
|
|
|
|
for ( n = 0; n < glyph->num_contours; n++ )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point first = glyph->contours[n].start;
|
|
|
|
PSH_Point point, before, after;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-28 07:52:05 +02:00
|
|
|
if ( glyph->contours[n].count == 0 )
|
|
|
|
continue;
|
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
point = first;
|
|
|
|
before = point;
|
|
|
|
after = point;
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
before = before->prev;
|
|
|
|
if ( before == first )
|
|
|
|
goto Skip;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
} while ( before->org_u == point->org_u );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
first = point = before->next;
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
after = point;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
after = after->next;
|
|
|
|
if ( after == first )
|
|
|
|
goto Next;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( after->org_u == point->org_u );
|
2002-08-19 08:06:44 +02:00
|
|
|
|
|
|
|
if ( before->org_u < point->org_u )
|
|
|
|
{
|
|
|
|
if ( after->org_u < point->org_u )
|
|
|
|
{
|
|
|
|
/* local maximum */
|
|
|
|
goto Extremum;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else /* before->org_u > point->org_u */
|
|
|
|
{
|
|
|
|
if ( after->org_u > point->org_u )
|
|
|
|
{
|
|
|
|
/* local minimum */
|
|
|
|
Extremum:
|
|
|
|
do
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_extremum( point );
|
2002-08-19 08:06:44 +02:00
|
|
|
point = point->next;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( point != after );
|
2002-08-19 08:06:44 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
before = after->prev;
|
|
|
|
point = after;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
} /* for */
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
Next:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
/* for each extrema, determine its direction along the */
|
|
|
|
/* orthogonal axis */
|
2002-07-03 23:00:26 +02:00
|
|
|
for ( n = 0; n < glyph->num_points; n++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point point, before, after;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-22 00:06:41 +02:00
|
|
|
point = &glyph->points[n];
|
|
|
|
before = point;
|
|
|
|
after = point;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_extremum( point ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
before = before->prev;
|
|
|
|
if ( before == point )
|
|
|
|
goto Skip;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( before->org_v == point->org_v );
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
do
|
|
|
|
{
|
|
|
|
after = after->next;
|
|
|
|
if ( after == point )
|
|
|
|
goto Skip;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
} while ( after->org_v == point->org_v );
|
2002-08-19 08:06:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( before->org_v < point->org_v &&
|
|
|
|
after->org_v > point->org_v )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_positive( point );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
2002-08-19 08:06:44 +02:00
|
|
|
else if ( before->org_v > point->org_v &&
|
|
|
|
after->org_v < point->org_v )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_negative( point );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
Skip:
|
|
|
|
;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
#define PSH_STRONG_THRESHOLD 30
|
2002-08-19 08:06:44 +02:00
|
|
|
|
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
/* major_dir is the direction for points on the bottom/left of the stem; */
|
|
|
|
/* Points on the top/right of the stem will have a direction of */
|
|
|
|
/* -major_dir. */
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_find_strong_point( PSH_Hint_Table table,
|
|
|
|
PSH_Point point,
|
|
|
|
FT_Int major_dir )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint* sort = table->sort;
|
|
|
|
FT_UInt num_hints = table->num_hints;
|
|
|
|
FT_Int point_dir = 0;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( PSH_DIR_COMPARE( point->dir_in, major_dir ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
point_dir = point->dir_in;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
else if ( PSH_DIR_COMPARE( point->dir_out, major_dir ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
point_dir = point->dir_out;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
if ( point_dir )
|
|
|
|
{
|
|
|
|
FT_UInt flag;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
for ( ; num_hints > 0; num_hints--, sort++ )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint = sort[0];
|
|
|
|
FT_Pos d;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
if ( point_dir == major_dir )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
flag = PSH_POINT_EDGE_MIN;
|
2002-08-19 08:06:44 +02:00
|
|
|
d = point->org_u - hint->org_pos;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ABS( d ) < PSH_STRONG_THRESHOLD )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
Is_Strong:
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_strong( point );
|
2002-08-19 08:06:44 +02:00
|
|
|
point->flags2 |= flag;
|
|
|
|
point->hint = hint;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( point_dir == -major_dir )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
flag = PSH_POINT_EDGE_MAX;
|
|
|
|
d = point->org_u - hint->org_pos - hint->org_len;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ABS( d ) < PSH_STRONG_THRESHOLD )
|
2002-08-19 08:06:44 +02:00
|
|
|
goto Is_Strong;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
2002-08-19 08:06:44 +02:00
|
|
|
}
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#if 1
|
2003-05-29 00:42:41 +02:00
|
|
|
else if ( psh_point_is_extremum( point ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
/* treat extrema as special cases for stem edge alignment */
|
|
|
|
FT_UInt min_flag, max_flag;
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( major_dir == PSH_DIR_HORIZONTAL )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
min_flag = PSH_POINT_POSITIVE;
|
|
|
|
max_flag = PSH_POINT_NEGATIVE;
|
2002-08-19 08:06:44 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
min_flag = PSH_POINT_NEGATIVE;
|
|
|
|
max_flag = PSH_POINT_POSITIVE;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
for ( ; num_hints > 0; num_hints--, sort++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint = sort[0];
|
* 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 d;
|
|
|
|
FT_Int flag;
|
2002-08-19 08:06:44 +02:00
|
|
|
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
if ( point->flags2 & min_flag )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
flag = PSH_POINT_EDGE_MIN;
|
2002-08-19 08:06:44 +02:00
|
|
|
d = point->org_u - hint->org_pos;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ABS( d ) < PSH_STRONG_THRESHOLD )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
Is_Strong2:
|
|
|
|
point->flags2 |= flag;
|
|
|
|
point->hint = hint;
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_strong( point );
|
2002-08-19 08:06:44 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( point->flags2 & max_flag )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
flag = PSH_POINT_EDGE_MAX;
|
2002-08-19 08:06:44 +02:00
|
|
|
d = point->org_u - hint->org_pos - hint->org_len;
|
2002-08-22 08:04:32 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ABS( d ) < PSH_STRONG_THRESHOLD )
|
2002-08-19 08:06:44 +02:00
|
|
|
goto Is_Strong2;
|
|
|
|
}
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
if ( point->org_u >= hint->org_pos &&
|
|
|
|
point->org_u <= hint->org_pos + hint->org_len )
|
|
|
|
{
|
|
|
|
point->hint = hint;
|
|
|
|
}
|
|
|
|
}
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
2002-08-22 08:04:32 +02:00
|
|
|
|
|
|
|
#endif /* 1 */
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* find strong points in a glyph */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_find_strong_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
/* a point is strong if it is located on a stem */
|
|
|
|
/* edge and has an "in" or "out" tangent to the hint's direction */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint_Table table = &glyph->hint_tables[dimension];
|
|
|
|
PS_Mask mask = table->hint_masks->masks;
|
|
|
|
FT_UInt num_masks = table->hint_masks->num_masks;
|
|
|
|
FT_UInt first = 0;
|
|
|
|
FT_Int major_dir = dimension == 0 ? PSH_DIR_VERTICAL
|
|
|
|
: PSH_DIR_HORIZONTAL;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* process secondary hints to "selected" points */
|
2002-09-10 01:45:29 +02:00
|
|
|
if ( num_masks > 1 && glyph->num_points > 0 )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
first = mask->end_point;
|
|
|
|
mask++;
|
|
|
|
for ( ; num_masks > 1; num_masks--, mask++ )
|
|
|
|
{
|
|
|
|
FT_UInt next;
|
|
|
|
FT_Int count;
|
|
|
|
|
|
|
|
|
|
|
|
next = mask->end_point;
|
|
|
|
count = next - first;
|
|
|
|
if ( count > 0 )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point point = glyph->points + first;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_activate_mask( table, mask );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
for ( ; count > 0; count--, point++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_find_strong_point( table, point, major_dir );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
first = next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* process primary hints for all points */
|
|
|
|
if ( num_masks == 1 )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt count = glyph->num_points;
|
|
|
|
PSH_Point point = glyph->points;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_activate_mask( table, table->hint_masks->masks );
|
2002-07-03 23:00:26 +02:00
|
|
|
for ( ; count > 0; count--, point++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_point_is_strong( point ) )
|
|
|
|
psh_hint_table_find_strong_point( table, point, major_dir );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now, certain points may have been attached to hint and */
|
|
|
|
/* not marked as strong; update their flags then */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt count = glyph->num_points;
|
|
|
|
PSH_Point point = glyph->points;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, point++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( point->hint && !psh_point_is_strong( point ) )
|
|
|
|
psh_point_set_strong( point );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* interpolate strong points with the help of hinted coordinates */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_interpolate_strong_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-07-26 16:52:29 +02:00
|
|
|
PSH_Dimension dim = &glyph->globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt count = glyph->num_points;
|
|
|
|
PSH_Point point = glyph->points;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, point++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Hint hint = point->hint;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( hint )
|
|
|
|
{
|
|
|
|
FT_Pos delta;
|
|
|
|
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_edge_min( point ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
point->cur_u = hint->cur_pos;
|
|
|
|
}
|
2003-05-29 00:42:41 +02:00
|
|
|
else if ( psh_point_is_edge_max( point ) )
|
2002-08-19 08:06:44 +02:00
|
|
|
{
|
|
|
|
point->cur_u = hint->cur_pos + hint->cur_len;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
delta = point->org_u - hint->org_pos;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
if ( delta <= 0 )
|
|
|
|
point->cur_u = hint->cur_pos + FT_MulFix( delta, scale );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
else if ( delta >= hint->org_len )
|
|
|
|
point->cur_u = hint->cur_pos + hint->cur_len +
|
2002-08-22 08:04:32 +02:00
|
|
|
FT_MulFix( delta - hint->org_len, scale );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
else if ( hint->org_len > 0 )
|
|
|
|
point->cur_u = hint->cur_pos +
|
2002-08-22 08:04:32 +02:00
|
|
|
FT_MulDiv( delta, hint->cur_len,
|
|
|
|
hint->org_len );
|
2002-08-19 08:06:44 +02:00
|
|
|
else
|
|
|
|
point->cur_u = hint->cur_pos;
|
|
|
|
}
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_fitted( point );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_interpolate_normal_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#if 1
|
2002-07-26 16:52:29 +02:00
|
|
|
|
|
|
|
PSH_Dimension dim = &glyph->globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* first technique: a point is strong if it is a local extrema */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_UInt count = glyph->num_points;
|
|
|
|
PSH_Point point = glyph->points;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count > 0; count--, point++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_strong( point ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/* sometimes, some local extremas are smooth points */
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_smooth( point ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( point->dir_in == PSH_DIR_NONE ||
|
2002-07-03 23:00:26 +02:00
|
|
|
point->dir_in != point->dir_out )
|
|
|
|
continue;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_point_is_extremum( point ) &&
|
|
|
|
!psh_point_is_inflex( point ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
continue;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
point->flags &= ~PSH_POINT_SMOOTH;
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* find best enclosing point coordinates */
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point before = 0;
|
|
|
|
PSH_Point after = 0;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Pos diff_before = -32000;
|
|
|
|
FT_Pos diff_after = 32000;
|
|
|
|
FT_Pos u = point->org_u;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Int count2 = glyph->num_points;
|
|
|
|
PSH_Point cur = glyph->points;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; count2 > 0; count2--, cur++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_strong( cur ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-07-26 16:52:29 +02:00
|
|
|
FT_Pos diff = cur->org_u - u;;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
if ( diff <= 0 )
|
|
|
|
{
|
|
|
|
if ( diff > diff_before )
|
|
|
|
{
|
|
|
|
diff_before = diff;
|
|
|
|
before = cur;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if ( diff >= 0 )
|
|
|
|
{
|
|
|
|
if ( diff < diff_after )
|
|
|
|
{
|
|
|
|
diff_after = diff;
|
|
|
|
after = cur;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !before )
|
|
|
|
{
|
|
|
|
if ( !after )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* we are before the first strong point coordinate; */
|
|
|
|
/* simply translate the point */
|
|
|
|
point->cur_u = after->cur_u +
|
|
|
|
FT_MulFix( point->org_u - after->org_u, scale );
|
|
|
|
}
|
|
|
|
else if ( !after )
|
|
|
|
{
|
|
|
|
/* we are after the last strong point coordinate; */
|
|
|
|
/* simply translate the point */
|
|
|
|
point->cur_u = before->cur_u +
|
|
|
|
FT_MulFix( point->org_u - before->org_u, scale );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ( diff_before == 0 )
|
|
|
|
point->cur_u = before->cur_u;
|
|
|
|
|
|
|
|
else if ( diff_after == 0 )
|
|
|
|
point->cur_u = after->cur_u;
|
|
|
|
|
|
|
|
else
|
|
|
|
point->cur_u = before->cur_u +
|
|
|
|
FT_MulDiv( u - before->org_u,
|
|
|
|
after->cur_u - before->cur_u,
|
|
|
|
after->org_u - before->org_u );
|
|
|
|
}
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_point_set_fitted( point );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-07-26 16:52:29 +02:00
|
|
|
|
|
|
|
#endif /* 1 */
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* interpolate other points */
|
|
|
|
static void
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_interpolate_other_points( PSH_Glyph glyph,
|
|
|
|
FT_Int dimension )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2002-07-26 16:52:29 +02:00
|
|
|
PSH_Dimension dim = &glyph->globals->dimension[dimension];
|
|
|
|
FT_Fixed scale = dim->scale_mult;
|
|
|
|
FT_Fixed delta = dim->scale_delta;
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Contour contour = glyph->contours;
|
2002-07-26 16:52:29 +02:00
|
|
|
FT_UInt num_contours = glyph->num_contours;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
for ( ; num_contours > 0; num_contours--, contour++ )
|
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_Point start = contour->start;
|
|
|
|
PSH_Point first, next, point;
|
|
|
|
FT_UInt fit_count;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/* count the number of strong points in this contour */
|
|
|
|
next = start + contour->count;
|
|
|
|
fit_count = 0;
|
|
|
|
first = 0;
|
|
|
|
|
|
|
|
for ( point = start; point < next; point++ )
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_fitted( point ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
|
|
|
if ( !first )
|
|
|
|
first = point;
|
|
|
|
|
|
|
|
fit_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if there are less than 2 fitted points in the contour, we */
|
|
|
|
/* simply scale and eventually translate the contour points */
|
|
|
|
if ( fit_count < 2 )
|
|
|
|
{
|
|
|
|
if ( fit_count == 1 )
|
|
|
|
delta = first->cur_u - FT_MulFix( first->org_u, scale );
|
|
|
|
|
|
|
|
for ( point = start; point < next; point++ )
|
|
|
|
if ( point != first )
|
|
|
|
point->cur_u = FT_MulFix( point->org_u, scale ) + delta;
|
|
|
|
|
|
|
|
goto Next_Contour;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* there are more than 2 strong points in this contour; we */
|
|
|
|
/* need to interpolate weak points between them */
|
|
|
|
start = first;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
point = first;
|
|
|
|
|
|
|
|
/* skip consecutive fitted points */
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
next = first->next;
|
|
|
|
if ( next == start )
|
|
|
|
goto Next_Contour;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( !psh_point_is_fitted( next ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
first = next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find next fitted point after unfitted one */
|
|
|
|
for (;;)
|
|
|
|
{
|
|
|
|
next = next->next;
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( psh_point_is_fitted( next ) )
|
2002-07-03 23:00:26 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* now interpolate between them */
|
|
|
|
{
|
|
|
|
FT_Pos org_a, org_ab, cur_a, cur_ab;
|
|
|
|
FT_Pos org_c, org_ac, cur_c;
|
|
|
|
FT_Fixed scale_ab;
|
|
|
|
|
|
|
|
|
|
|
|
if ( first->org_u <= next->org_u )
|
|
|
|
{
|
|
|
|
org_a = first->org_u;
|
|
|
|
cur_a = first->cur_u;
|
|
|
|
org_ab = next->org_u - org_a;
|
|
|
|
cur_ab = next->cur_u - cur_a;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
org_a = next->org_u;
|
|
|
|
cur_a = next->cur_u;
|
|
|
|
org_ab = first->org_u - org_a;
|
|
|
|
cur_ab = first->cur_u - cur_a;
|
|
|
|
}
|
|
|
|
|
|
|
|
scale_ab = 0x10000L;
|
|
|
|
if ( org_ab > 0 )
|
|
|
|
scale_ab = FT_DivFix( cur_ab, org_ab );
|
|
|
|
|
|
|
|
point = first->next;
|
|
|
|
do
|
|
|
|
{
|
|
|
|
org_c = point->org_u;
|
|
|
|
org_ac = org_c - org_a;
|
|
|
|
|
|
|
|
if ( org_ac <= 0 )
|
|
|
|
{
|
|
|
|
/* on the left of the interpolation zone */
|
|
|
|
cur_c = cur_a + FT_MulFix( org_ac, scale );
|
|
|
|
}
|
|
|
|
else if ( org_ac >= org_ab )
|
|
|
|
{
|
|
|
|
/* on the right on the interpolation zone */
|
|
|
|
cur_c = cur_a + cur_ab + FT_MulFix( org_ac - org_ab, scale );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* within the interpolation zone */
|
|
|
|
cur_c = cur_a + FT_MulFix( org_ac, scale_ab );
|
|
|
|
}
|
|
|
|
|
|
|
|
point->cur_u = cur_c;
|
|
|
|
|
|
|
|
point = point->next;
|
|
|
|
|
|
|
|
} while ( point != next );
|
|
|
|
}
|
|
|
|
|
|
|
|
/* keep going until all points in the contours have been processed */
|
|
|
|
first = next;
|
|
|
|
|
|
|
|
} while ( first != start );
|
|
|
|
|
|
|
|
Next_Contour:
|
|
|
|
;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
/***** *****/
|
|
|
|
/***** HIGH-LEVEL INTERFACE *****/
|
|
|
|
/***** *****/
|
|
|
|
/*************************************************************************/
|
|
|
|
/*************************************************************************/
|
|
|
|
|
|
|
|
FT_Error
|
2003-05-29 00:42:41 +02:00
|
|
|
ps_hints_apply( PS_Hints ps_hints,
|
|
|
|
FT_Outline* outline,
|
|
|
|
PSH_Globals globals,
|
|
|
|
FT_Render_Mode hint_mode )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
PSH_GlyphRec glyphrec;
|
|
|
|
PSH_Glyph glyph = &glyphrec;
|
|
|
|
FT_Error error;
|
2002-07-03 23:00:26 +02:00
|
|
|
#ifdef DEBUG_HINTER
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Memory memory;
|
2002-07-03 23:00:26 +02:00
|
|
|
#endif
|
2003-05-29 00:42:41 +02:00
|
|
|
FT_Int dimension;
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
|
2003-05-21 00:06:38 +02:00
|
|
|
/* something to do? */
|
|
|
|
if ( outline->n_points == 0 || outline->n_contours == 0 )
|
* 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
|
|
|
return PSH_Err_Ok;
|
2003-05-21 00:06:38 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#ifdef DEBUG_HINTER
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
memory = globals->memory;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
if ( ps_debug_glyph )
|
2002-07-03 23:00:26 +02:00
|
|
|
{
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_done( ps_debug_glyph );
|
|
|
|
FT_FREE( ps_debug_glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if ( FT_NEW( glyph ) )
|
|
|
|
return error;
|
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
ps_debug_glyph = glyph;
|
2002-07-26 16:52:29 +02:00
|
|
|
|
|
|
|
#endif /* DEBUG_HINTER */
|
2002-07-03 23:00:26 +02:00
|
|
|
|
2003-05-29 00:42:41 +02:00
|
|
|
error = psh_glyph_init( glyph, outline, ps_hints, globals );
|
2002-07-03 23:00:26 +02:00
|
|
|
if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
2003-05-20 07:01:49 +02:00
|
|
|
/* try to optimize the y_scale so that the top of non-capital letters
|
|
|
|
* is aligned on a pixel boundary whenever possible
|
|
|
|
*/
|
|
|
|
{
|
|
|
|
PSH_Dimension dim_x = &glyph->globals->dimension[0];
|
|
|
|
PSH_Dimension dim_y = &glyph->globals->dimension[1];
|
|
|
|
|
|
|
|
FT_Fixed x_scale = dim_x->scale_mult;
|
|
|
|
FT_Fixed y_scale = dim_y->scale_mult;
|
|
|
|
|
|
|
|
FT_Fixed scaled;
|
|
|
|
FT_Fixed fitted;
|
|
|
|
|
|
|
|
|
|
|
|
scaled = FT_MulFix( globals->blues.normal_top.zones->org_ref, y_scale );
|
2003-12-24 02:10:46 +01:00
|
|
|
fitted = FT_PIX_ROUND( scaled );
|
2003-05-20 07:01:49 +02:00
|
|
|
|
|
|
|
if (scaled != fitted ) {
|
|
|
|
y_scale = FT_MulDiv( y_scale, fitted, scaled );
|
|
|
|
|
|
|
|
if ( fitted < scaled )
|
|
|
|
x_scale -= x_scale / 50;
|
|
|
|
|
|
|
|
psh_globals_set_scale( glyph->globals, x_scale, y_scale, 0, 0 );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-09-08 23:29:11 +02:00
|
|
|
glyph->do_horz_hints = 1;
|
|
|
|
glyph->do_vert_hints = 1;
|
|
|
|
|
|
|
|
glyph->do_horz_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
|
|
|
|
hint_mode == FT_RENDER_MODE_LCD );
|
|
|
|
|
|
|
|
glyph->do_vert_snapping = FT_BOOL( hint_mode == FT_RENDER_MODE_MONO ||
|
|
|
|
hint_mode == FT_RENDER_MODE_LCD_V );
|
|
|
|
|
2003-01-08 10:52:32 +01:00
|
|
|
glyph->do_stem_adjust = FT_BOOL( hint_mode != FT_RENDER_MODE_LIGHT );
|
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
for ( dimension = 0; dimension < 2; dimension++ )
|
|
|
|
{
|
|
|
|
/* load outline coordinates into glyph */
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_load_points( glyph, dimension );
|
* massive re-formatting changes to many, many source files. I don't
want to list them all here. The operations performed were all logical
transformations of the sources:
- trying to convert all enums and constants to CAPITALIZED_STYLE, with
#define definitions like
#define my_old_constants MY_NEW_CONSTANT
- big, big update of the documentation comments
* include/freetype/freetype.h, src/base/ftobjs.c, src/smooth/ftsmooth.c,
include/freetype/ftimage.h: adding support for LCD-optimized rendering
though the new constants/enums:
FT_RENDER_MODE_LCD, FT_RENDER_MODE_LCD_V
FT_PIXEL_MODE_LCD, FT_PIXEL_MODE_LCD_V
this is still work in progress, don't expect everything to work correctly
though most of the features have been implemented.
* adding new FT_LOAD_XXX flags, used to specify both hinting and rendering
targets:
FT_LOAD_TARGET_NORMAL :: anti-aliased hinting & rendering
FT_LOAD_TARGET_MONO :: monochrome bitmaps
FT_LOAD_TARGET_LCD :: horizontal RGB/BGR decimated hinting & rendering
FT_LOAD_TARGET_LCD_V :: vertical RGB/BGR decimated hinting & rendering
note that FT_LOAD_TARGET_NORMAL is 0, which means that the default
behaviour of the font engine is _unchanged_.
2002-08-27 22:20:29 +02:00
|
|
|
|
2002-08-19 08:06:44 +02:00
|
|
|
/* compute local extrema */
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_compute_extrema( glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* compute aligned stem/hints positions */
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_hint_table_align_hints( &glyph->hint_tables[dimension],
|
|
|
|
glyph->globals,
|
|
|
|
dimension,
|
|
|
|
glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* find strong points, align them, then interpolate others */
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_find_strong_points( glyph, dimension );
|
|
|
|
psh_glyph_interpolate_strong_points( glyph, dimension );
|
|
|
|
psh_glyph_interpolate_normal_points( glyph, dimension );
|
|
|
|
psh_glyph_interpolate_other_points( glyph, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
|
|
|
|
/* save hinted coordinates back to outline */
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_save_points( glyph, dimension );
|
2002-07-03 23:00:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
#ifndef DEBUG_HINTER
|
2003-05-29 00:42:41 +02:00
|
|
|
psh_glyph_done( glyph );
|
2002-07-03 23:00:26 +02:00
|
|
|
#endif
|
2002-07-26 16:52:29 +02:00
|
|
|
|
2002-07-03 23:00:26 +02:00
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* END */
|