ref: a11cd4e183b97a3a23b9f2a95eb15ef59a13b5a6
parent: 2f553a2c38f0fce5e130db9195882662e2dff04a
author: David Turner <[email protected]>
date: Fri Oct 26 03:21:38 EDT 2001
a few updates used to debug the auto-hinter as well as try to improve it significantly
--- a/src/autohint/ahglyph.c
+++ b/src/autohint/ahglyph.c
@@ -752,7 +752,6 @@
if ( point == last )
break;
}
-
}
last = point;
--- a/src/autohint/ahhint.c
+++ b/src/autohint/ahhint.c
@@ -1296,6 +1296,10 @@
slot->format = ft_glyph_format_outline;
}
+#ifdef DEBUG_HINTER
+ ah_debug_hinter = hinter;
+#endif
+
Exit:
return error;
}
--- a/src/autohint/ahmodule.c
+++ b/src/autohint/ahmodule.c
@@ -24,6 +24,10 @@
#include "ahhint.h"
+#ifdef DEBUG_HINTER
+ extern AH_Hinter* ah_debug_hinter = NULL;
+#endif
+
typedef struct FT_AutoHinterRec_
{FT_ModuleRec root;
@@ -35,7 +39,14 @@
FT_CALLBACK_DEF( FT_Error )
ft_autohinter_init( FT_AutoHinter module )
{- return ah_hinter_new( module->root.library, &module->hinter );
+ FT_Error error;
+
+ error = ah_hinter_new( module->root.library, &module->hinter );
+#ifdef DEBUG_HINTER
+ if ( !error )
+ ah_debug_hinter = module->hinter;
+#endif
+ return error;
}
@@ -43,6 +54,10 @@
ft_autohinter_done( FT_AutoHinter module )
{ah_hinter_done( module->hinter );
+
+#ifdef DEBUG_HINTER
+ ah_debug_hinter = NULL;
+#endif
}
--- a/src/autohint/ahtypes.h
+++ b/src/autohint/ahtypes.h
@@ -26,7 +26,12 @@
#include <ft2build.h>
#include FT_INTERNAL_OBJECTS_H
+
+#ifdef DEBUG_HINTER
+#include <../src/autohint/ahloader.h>
+#else
#include "ahloader.h"
+#endif
#define xxAH_DEBUG
@@ -186,7 +191,7 @@
/* */
/* fx, fy :: The current coordinates in font units. */
/* */
- /* x, y :: The current hinter coordinates. */
+ /* x, y :: The current hinted coordinates. */
/* */
/* u, v :: Point coordinates -- meaning varies with context. */
/* */
@@ -484,6 +489,10 @@
FT_Bool disable_vert_edges;
} AH_Hinter;
+
+#ifdef DEBUG_HINTER
+ extern AH_Hinter* ah_debug_hinter;
+#endif /* DEBUG_HINTER */
FT_END_HEADER
--- a/src/pshinter/pshalgo2.c
+++ b/src/pshinter/pshalgo2.c
@@ -460,6 +460,10 @@
FT_UInt count;
#ifdef DEBUG_HINTER
+ PSH_Dimension dim = &globals->dimension[vertical];
+ FT_Fixed scale = dim->scale_mult;
+ FT_Fixed delta = dim->scale_delta;
+
if ( ps_debug_no_vert_hints && vertical )
{ps_simple_scale( table, scale, delta, vertical );
--- a/tests/Jamfile
+++ b/tests/Jamfile
@@ -2,9 +2,9 @@
test_programs = gview ;
-SubDirHdrs [ FT2_SubDir .. .. nirvana include ] ;
+SubDirHdrs [ FT2_SubDir .. nirvana include ] ;
-NV_TOP = [ FT2_SubDir .. .. .. nirvana ] ;
+NV_TOP = [ FT2_SubDir .. .. nirvana ] ;
NIRVANA_LINKLIBS = $(NV_TOP)\\objs\\nirvana$(SUFLIB) ;
--- a/tests/gview.c
+++ b/tests/gview.c
@@ -10,6 +10,8 @@
#include <../src/pshinter/pshalgo1.h>
#include <../src/pshinter/pshalgo2.h>
+#include <../src/autohint/ahtypes.h>
+
/************************************************************************/
/************************************************************************/
/***** *****/
@@ -79,6 +81,14 @@
static char temp_message[1024];
+static NV_Path symbol_dot = NULL;
+static NV_Path symbol_circle = NULL;
+static NV_Path symbol_square = NULL;
+static NV_Path symbol_rect_h = NULL;
+static NV_Path symbol_rect_v = NULL;
+
+
+
#define AXIS_COLOR 0xFFFF0000
#define GRID_COLOR 0xFFD0D0D0
#define ON_COLOR 0xFFFF2000
@@ -105,6 +115,33 @@
}
+static void
+init_symbols( void )
+{+ nv_path_new_rectangle( renderer, -1, -1, 3, 3, 0, 0, &symbol_square );
+ nv_path_new_rectangle( renderer, -1, -6, 2, 12, 0, 0, &symbol_rect_v );
+ nv_path_new_rectangle( renderer, -6, -1, 12, 2, 0, 0, &symbol_rect_h );
+ nv_path_new_circle( renderer, 0, 0, 3., &symbol_dot );
+ nv_path_stroke( symbol_dot, 0.6,
+ nv_path_linecap_butt,
+ nv_path_linejoin_miter, 1.,
+ &symbol_circle );
+
+ nv_path_destroy( symbol_dot );
+ nv_path_new_circle( renderer, 0, 0, 2., &symbol_dot );
+
+ }
+
+static void
+done_symbols( void )
+{+ nv_path_destroy( symbol_circle );
+ nv_path_destroy( symbol_dot );
+ nv_path_destroy( symbol_rect_v );
+ nv_path_destroy( symbol_rect_h );
+ nv_path_destroy( symbol_square );
+}
+
/************************************************************************/
/************************************************************************/
/***** *****/
@@ -525,11 +562,6 @@
NV_Path horz_rect;
NV_Path dot, circle;
- nv_path_new_rectangle( renderer, -1, -6, 2, 12, 0, 0, &vert_rect );
- nv_path_new_rectangle( renderer, -6, -1, 12, 2, 0, 0, &horz_rect );
- nv_path_new_circle( renderer, 0, 0, 3., &dot );
- nv_path_stroke( dot, 0.6, nv_path_linecap_butt, nv_path_linejoin_miter, 1., &circle );
-
for ( ; count > 0; count--, point++ )
{NV_Vector vec;
@@ -543,7 +575,7 @@
if ( option_show_smooth && !psh2_point_is_smooth(point) )
{nv_painter_set_color( painter, SMOOTH_COLOR, 256 );
- nv_painter_fill_path( painter, trans, 0, circle );
+ nv_painter_fill_path( painter, trans, 0, symbol_circle );
}
if (option_show_horz_hints)
@@ -551,7 +583,7 @@
if ( point->flags_y & PSH2_POINT_STRONG )
{nv_painter_set_color( painter, STRONG_COLOR, 256 );
- nv_painter_fill_path( painter, trans, 0, horz_rect );
+ nv_painter_fill_path( painter, trans, 0, symbol_rect_h );
}
}
@@ -560,18 +592,35 @@
if ( point->flags_x & PSH2_POINT_STRONG )
{nv_painter_set_color( painter, STRONG_COLOR, 256 );
- nv_painter_fill_path( painter, trans, 0, vert_rect );
+ nv_painter_fill_path( painter, trans, 0, symbol_rect_v );
}
}
}
+ }
+}
- nv_path_destroy( circle );
- nv_path_destroy( dot );
- nv_path_destroy( horz_rect );
- nv_path_destroy( vert_rect );
+ /************************************************************************/
+ /************************************************************************/
+ /***** *****/
+ /***** AUTOHINTER DRAWING ROUTINES *****/
+ /***** *****/
+ /************************************************************************/
+ /************************************************************************/
+
+static void
+ah_draw_smooth_points( AH_Hinter hinter )
+{+ if ( ah_debug_hinter )
+ {+
}
}
+static void
+ah_draw_edges( AH_Hinter hinter )
+{+}
+
/************************************************************************/
/************************************************************************/
/***** *****/
@@ -590,6 +639,8 @@
ps1_debug_hint_func = option_show_ps_hints ? draw_ps1_hint : 0;
ps2_debug_hint_func = option_show_ps_hints ? draw_ps2_hint : 0;
+ ah_debug_hinter = NULL;
+
error = FT_Load_Glyph( face, glyph_index, option_hinting
? FT_LOAD_NO_BITMAP
: FT_LOAD_NO_BITMAP | FT_LOAD_NO_HINTING );
@@ -635,8 +686,6 @@
NV_Scale r = 2;
NV_Int n, first, last;
- nv_path_new_circle( renderer, 0, 0, 2., &plot );
-
nv_path_get_outline( path, NULL, memory, &out );
first = 0;
@@ -660,14 +709,12 @@
nv_transform_set_translate( &trans, vec->x/64.0, vec->y/64.0 );
nv_painter_set_color( painter, color, 256 );
- nv_painter_fill_path( painter, &trans, 0, plot );
+ nv_painter_fill_path( painter, &trans, 0, symbol_dot );
}
first = last + 1;
}
-
- nv_path_destroy( plot );
}
nv_path_destroy( path );
@@ -872,8 +919,9 @@
/* create library */
error = nv_renderer_new( 0, &renderer );
if (error) Panic( "could not create Nirvana renderer" );
-
+
memory = nv_renderer_get_memory( renderer );
+ init_symbols();
error = nvv_display_new( renderer, &display );
if (error) Panic( "could not create display" );
@@ -939,6 +987,8 @@
/* destroy display (and surface) */
nvv_display_unref( display );
+
+ done_symbols();
nv_renderer_unref( renderer );
return 0;