2002-05-21 16:13:01 +02:00
|
|
|
/* bdfdrivr.c
|
|
|
|
|
|
|
|
FreeType font driver for bdf files
|
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
Copyright (C) 2001, 2002, 2003, 2004 by
|
2002-05-21 16:13:01 +02:00
|
|
|
Francesco Zappa Nardelli
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <ft2build.h>
|
|
|
|
|
|
|
|
#include FT_INTERNAL_DEBUG_H
|
|
|
|
#include FT_INTERNAL_STREAM_H
|
|
|
|
#include FT_INTERNAL_OBJECTS_H
|
2003-01-22 23:45:28 +01:00
|
|
|
#include FT_BDF_H
|
2002-05-21 16:13:01 +02:00
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
#include FT_SERVICE_BDF_H
|
|
|
|
#include FT_SERVICE_XFREE86_NAME_H
|
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
#include "bdf.h"
|
|
|
|
#include "bdfdrivr.h"
|
|
|
|
|
|
|
|
#include "bdferror.h"
|
|
|
|
|
|
|
|
|
|
|
|
/*************************************************************************/
|
|
|
|
/* */
|
|
|
|
/* The macro FT_COMPONENT is used in trace mode. It is an implicit */
|
|
|
|
/* parameter of the FT_TRACE() and FT_ERROR() macros, used to print/log */
|
|
|
|
/* messages during execution. */
|
|
|
|
/* */
|
|
|
|
#undef FT_COMPONENT
|
|
|
|
#define FT_COMPONENT trace_bdfdriver
|
|
|
|
|
|
|
|
|
2002-06-14 10:54:02 +02:00
|
|
|
typedef struct BDF_CMapRec_
|
|
|
|
{
|
|
|
|
FT_CMapRec cmap;
|
|
|
|
FT_UInt num_encodings;
|
|
|
|
BDF_encoding_el* encodings;
|
|
|
|
|
|
|
|
} BDF_CMapRec, *BDF_CMap;
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
|
|
|
bdf_cmap_init( BDF_CMap cmap )
|
|
|
|
{
|
|
|
|
BDF_Face face = (BDF_Face)FT_CMAP_FACE( cmap );
|
|
|
|
|
|
|
|
|
2002-06-16 03:14:16 +02:00
|
|
|
cmap->num_encodings = face->bdffont->glyphs_used;
|
2002-06-14 10:54:02 +02:00
|
|
|
cmap->encodings = face->en_table;
|
|
|
|
|
* 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 BDF_Err_Ok;
|
2002-06-14 10:54:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( void )
|
|
|
|
bdf_cmap_done( BDF_CMap cmap )
|
|
|
|
{
|
|
|
|
cmap->encodings = NULL;
|
|
|
|
cmap->num_encodings = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_UInt )
|
|
|
|
bdf_cmap_char_index( BDF_CMap cmap,
|
|
|
|
FT_UInt32 charcode )
|
|
|
|
{
|
|
|
|
BDF_encoding_el* encodings = cmap->encodings;
|
|
|
|
FT_UInt min, max, mid;
|
|
|
|
FT_UInt result = 0;
|
|
|
|
|
|
|
|
|
|
|
|
min = 0;
|
|
|
|
max = cmap->num_encodings;
|
|
|
|
|
|
|
|
while ( min < max )
|
|
|
|
{
|
|
|
|
FT_UInt32 code;
|
|
|
|
|
|
|
|
|
|
|
|
mid = ( min + max ) >> 1;
|
|
|
|
code = encodings[mid].enc;
|
|
|
|
|
|
|
|
if ( charcode == code )
|
|
|
|
{
|
2002-06-16 03:14:16 +02:00
|
|
|
result = encodings[mid].glyph + 1;
|
2002-06-14 10:54:02 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( charcode < code )
|
|
|
|
max = mid;
|
|
|
|
else
|
|
|
|
min = mid + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_UInt )
|
|
|
|
bdf_cmap_char_next( BDF_CMap cmap,
|
|
|
|
FT_UInt32 *acharcode )
|
|
|
|
{
|
|
|
|
BDF_encoding_el* encodings = cmap->encodings;
|
|
|
|
FT_UInt min, max, mid;
|
|
|
|
FT_UInt32 charcode = *acharcode + 1;
|
|
|
|
FT_UInt result = 0;
|
|
|
|
|
|
|
|
|
|
|
|
min = 0;
|
|
|
|
max = cmap->num_encodings;
|
|
|
|
|
|
|
|
while ( min < max )
|
|
|
|
{
|
|
|
|
FT_UInt32 code;
|
|
|
|
|
|
|
|
|
|
|
|
mid = ( min + max ) >> 1;
|
|
|
|
code = encodings[mid].enc;
|
|
|
|
|
|
|
|
if ( charcode == code )
|
|
|
|
{
|
2002-06-16 03:14:16 +02:00
|
|
|
result = encodings[mid].glyph + 1;
|
2002-06-14 10:54:02 +02:00
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( charcode < code )
|
|
|
|
max = mid;
|
|
|
|
else
|
|
|
|
min = mid + 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
charcode = 0;
|
|
|
|
if ( min < cmap->num_encodings )
|
|
|
|
{
|
|
|
|
charcode = encodings[min].enc;
|
2002-06-16 03:14:16 +02:00
|
|
|
result = encodings[min].glyph + 1;
|
2002-06-14 10:54:02 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
*acharcode = charcode;
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec bdf_cmap_class =
|
|
|
|
{
|
|
|
|
sizeof( BDF_CMapRec ),
|
|
|
|
(FT_CMap_InitFunc) bdf_cmap_init,
|
|
|
|
(FT_CMap_DoneFunc) bdf_cmap_done,
|
|
|
|
(FT_CMap_CharIndexFunc)bdf_cmap_char_index,
|
|
|
|
(FT_CMap_CharNextFunc) bdf_cmap_char_next
|
|
|
|
};
|
|
|
|
|
|
|
|
|
2003-11-13 11:19:27 +01:00
|
|
|
static FT_Error
|
|
|
|
bdf_interpret_style( BDF_Face bdf )
|
|
|
|
{
|
|
|
|
FT_Error error = BDF_Err_Ok;
|
|
|
|
FT_Face face = FT_FACE( bdf );
|
|
|
|
FT_Memory memory = face->memory;
|
|
|
|
bdf_font_t* font = bdf->bdffont;
|
|
|
|
bdf_property_t* prop;
|
|
|
|
|
|
|
|
char *istr = NULL, *bstr = NULL;
|
|
|
|
char *sstr = NULL, *astr = NULL;
|
|
|
|
|
2003-12-19 21:25:14 +01:00
|
|
|
int parts = 0, len = 0;
|
2003-11-13 11:19:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
face->style_flags = 0;
|
|
|
|
|
|
|
|
prop = bdf_get_font_property( font, (char *)"SLANT" );
|
|
|
|
if ( prop && prop->format == BDF_ATOM &&
|
|
|
|
prop->value.atom &&
|
|
|
|
( *(prop->value.atom) == 'O' || *(prop->value.atom) == 'o' ||
|
|
|
|
*(prop->value.atom) == 'I' || *(prop->value.atom) == 'i' ) )
|
|
|
|
{
|
|
|
|
face->style_flags |= FT_STYLE_FLAG_ITALIC;
|
|
|
|
istr = ( *(prop->value.atom) == 'O' || *(prop->value.atom) == 'o' )
|
|
|
|
? (char *)"Oblique"
|
|
|
|
: (char *)"Italic";
|
|
|
|
len += ft_strlen( istr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = bdf_get_font_property( font, (char *)"WEIGHT_NAME" );
|
|
|
|
if ( prop && prop->format == BDF_ATOM &&
|
|
|
|
prop->value.atom &&
|
|
|
|
( *(prop->value.atom) == 'B' || *(prop->value.atom) == 'b' ) )
|
|
|
|
{
|
|
|
|
face->style_flags |= FT_STYLE_FLAG_BOLD;
|
|
|
|
bstr = (char *)"Bold";
|
|
|
|
len += ft_strlen( bstr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = bdf_get_font_property( font, (char *)"SETWIDTH_NAME" );
|
|
|
|
if ( prop && prop->format == BDF_ATOM &&
|
|
|
|
prop->value.atom && *(prop->value.atom) &&
|
|
|
|
!( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) )
|
|
|
|
{
|
|
|
|
sstr = (char *)(prop->value.atom);
|
|
|
|
len += ft_strlen( sstr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
prop = bdf_get_font_property( font, (char *)"ADD_STYLE_NAME" );
|
|
|
|
if ( prop && prop->format == BDF_ATOM &&
|
|
|
|
prop->value.atom && *(prop->value.atom) &&
|
|
|
|
!( *(prop->value.atom) == 'N' || *(prop->value.atom) == 'n' ) )
|
|
|
|
{
|
|
|
|
astr = (char *)(prop->value.atom);
|
|
|
|
len += ft_strlen( astr );
|
|
|
|
parts++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ( !parts || !len )
|
|
|
|
face->style_name = (char *)"Regular";
|
|
|
|
else
|
|
|
|
{
|
2003-12-19 21:25:14 +01:00
|
|
|
char *style, *s;
|
2003-11-15 18:44:13 +01:00
|
|
|
unsigned int i;
|
2003-11-13 11:19:27 +01:00
|
|
|
|
|
|
|
|
|
|
|
if ( FT_ALLOC( style, len + parts ) )
|
|
|
|
return error;
|
|
|
|
|
|
|
|
s = style;
|
|
|
|
|
|
|
|
if ( astr )
|
|
|
|
{
|
2003-11-15 18:44:13 +01:00
|
|
|
ft_strcpy( s, astr );
|
|
|
|
for ( i = 0; i < ft_strlen( astr ); i++, s++ )
|
|
|
|
if ( *s == ' ' )
|
|
|
|
*s = '-'; /* replace spaces with dashes */
|
2003-11-13 11:19:27 +01:00
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( bstr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, bstr );
|
|
|
|
s += ft_strlen( bstr );
|
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( istr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, istr );
|
|
|
|
s += ft_strlen( istr );
|
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
if ( sstr )
|
|
|
|
{
|
|
|
|
ft_strcpy( s, sstr );
|
2003-11-15 18:44:13 +01:00
|
|
|
for ( i = 0; i < ft_strlen( sstr ); i++, s++ )
|
|
|
|
if ( *s == ' ' )
|
|
|
|
*s = '-'; /* replace spaces with dashes */
|
2003-11-13 11:19:27 +01:00
|
|
|
*(s++) = ' ';
|
|
|
|
}
|
|
|
|
*(--s) = '\0'; /* overwrite last ' ', terminate the string */
|
|
|
|
|
|
|
|
face->style_name = style; /* allocated string */
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
|
|
|
BDF_Face_Done( BDF_Face face )
|
|
|
|
{
|
|
|
|
FT_Memory memory = FT_FACE_MEMORY( face );
|
|
|
|
|
|
|
|
|
|
|
|
bdf_free_font( face->bdffont );
|
|
|
|
|
|
|
|
FT_FREE( face->en_table );
|
|
|
|
|
|
|
|
FT_FREE( face->charset_encoding );
|
|
|
|
FT_FREE( face->charset_registry );
|
|
|
|
FT_FREE( face->root.family_name );
|
|
|
|
|
|
|
|
FT_FREE( face->root.available_sizes );
|
|
|
|
|
|
|
|
FT_FREE( face->bdffont );
|
|
|
|
|
|
|
|
FT_TRACE4(( "BDF_Face_Done: done face\n" ));
|
|
|
|
|
|
|
|
return BDF_Err_Ok;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
FT_CALLBACK_DEF( FT_Error )
|
|
|
|
BDF_Face_Init( FT_Stream stream,
|
|
|
|
BDF_Face face,
|
|
|
|
FT_Int face_index,
|
|
|
|
FT_Int num_params,
|
|
|
|
FT_Parameter* params )
|
|
|
|
{
|
|
|
|
FT_Error error = BDF_Err_Ok;
|
|
|
|
FT_Memory memory = FT_FACE_MEMORY( face );
|
|
|
|
|
|
|
|
bdf_font_t* font;
|
|
|
|
bdf_options_t options;
|
|
|
|
|
|
|
|
FT_UNUSED( num_params );
|
|
|
|
FT_UNUSED( params );
|
|
|
|
FT_UNUSED( face_index );
|
|
|
|
|
|
|
|
|
|
|
|
if ( FT_STREAM_SEEK( 0 ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
options.correct_metrics = 1; /* FZ XXX: options semantics */
|
|
|
|
options.keep_unencoded = 1;
|
|
|
|
options.keep_comments = 0;
|
|
|
|
options.font_spacing = BDF_PROPORTIONAL;
|
|
|
|
|
|
|
|
error = bdf_load_font( stream, memory, &options, &font );
|
|
|
|
if ( error == BDF_Err_Missing_Startfont_Field )
|
|
|
|
{
|
|
|
|
FT_TRACE2(( "[not a valid BDF file]\n" ));
|
|
|
|
goto Fail;
|
|
|
|
}
|
|
|
|
else if ( error )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
/* we have a bdf font: let's construct the face object */
|
|
|
|
face->bdffont = font;
|
|
|
|
{
|
|
|
|
FT_Face root = FT_FACE( face );
|
|
|
|
bdf_property_t* prop = NULL;
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( "number of glyphs: %d (%d)\n",
|
|
|
|
font->glyphs_size,
|
|
|
|
font->glyphs_used ));
|
|
|
|
FT_TRACE4(( "number of unencoded glyphs: %d (%d)\n",
|
|
|
|
font->unencoded_size,
|
|
|
|
font->unencoded_used ));
|
|
|
|
|
|
|
|
root->num_faces = 1;
|
|
|
|
root->face_index = 0;
|
|
|
|
root->face_flags = FT_FACE_FLAG_FIXED_SIZES |
|
|
|
|
FT_FACE_FLAG_HORIZONTAL |
|
|
|
|
FT_FACE_FLAG_FAST_GLYPHS;
|
|
|
|
|
2003-04-25 07:35:04 +02:00
|
|
|
prop = bdf_get_font_property( font, "SPACING" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop && prop->format == BDF_ATOM &&
|
|
|
|
prop->value.atom &&
|
|
|
|
( *(prop->value.atom) == 'M' || *(prop->value.atom) == 'm' ||
|
|
|
|
*(prop->value.atom) == 'C' || *(prop->value.atom) == 'c' ) )
|
|
|
|
root->face_flags |= FT_FACE_FLAG_FIXED_WIDTH;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
/* FZ XXX: TO DO: FT_FACE_FLAGS_VERTICAL */
|
|
|
|
/* FZ XXX: I need a font to implement this */
|
|
|
|
|
2003-04-25 07:35:04 +02:00
|
|
|
prop = bdf_get_font_property( font, "FAMILY_NAME" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop && prop->value.atom )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
|
|
|
int l = ft_strlen( prop->value.atom ) + 1;
|
|
|
|
|
|
|
|
|
|
|
|
if ( FT_NEW_ARRAY( root->family_name, l ) )
|
|
|
|
goto Exit;
|
|
|
|
ft_strcpy( root->family_name, prop->value.atom );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
root->family_name = 0;
|
|
|
|
|
2003-12-19 21:25:14 +01:00
|
|
|
if ( ( error = bdf_interpret_style( face ) ) != 0 )
|
2003-11-13 11:19:27 +01:00
|
|
|
goto Exit;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
root->num_glyphs = font->glyphs_size; /* unencoded included */
|
|
|
|
|
|
|
|
root->num_fixed_sizes = 1;
|
|
|
|
if ( FT_NEW_ARRAY( root->available_sizes, 1 ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
{
|
2003-07-01 09:28:55 +02:00
|
|
|
FT_Bitmap_Size* bsize = root->available_sizes;
|
2004-02-08 17:30:37 +01:00
|
|
|
FT_Short resolution_x = 0, resolution_y = 0;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
|
|
|
|
|
|
|
FT_MEM_ZERO( bsize, sizeof ( FT_Bitmap_Size ) );
|
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
bsize->height = font->font_ascent + font->font_descent;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
|
|
|
prop = bdf_get_font_property( font, "AVERAGE_WIDTH" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2003-07-01 09:28:55 +02:00
|
|
|
bsize->width = (FT_Short)( ( prop->value.int32 + 5 ) / 10 );
|
2004-02-08 17:30:37 +01:00
|
|
|
else
|
|
|
|
bsize->width = bsize->height * 2/3;
|
2003-07-01 09:28:55 +02:00
|
|
|
|
2003-04-25 07:35:04 +02:00
|
|
|
prop = bdf_get_font_property( font, "POINT_SIZE" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2003-09-01 09:06:06 +02:00
|
|
|
/* convert from 722.7 decipoints to 72 points per inch */
|
2003-07-01 09:28:55 +02:00
|
|
|
bsize->size =
|
|
|
|
(FT_Pos)( ( prop->value.int32 * 64 * 7200 + 36135L ) / 72270L );
|
2002-05-21 16:13:01 +02:00
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
prop = bdf_get_font_property( font, "PIXEL_SIZE" );
|
|
|
|
if ( prop )
|
|
|
|
bsize->y_ppem = (FT_Short)prop->value.int32 << 6;
|
|
|
|
|
2003-07-01 09:28:55 +02:00
|
|
|
prop = bdf_get_font_property( font, "RESOLUTION_X" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2004-02-08 17:30:37 +01:00
|
|
|
resolution_x = (FT_Short)prop->value.int32;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
2003-07-01 09:28:55 +02:00
|
|
|
prop = bdf_get_font_property( font, "RESOLUTION_Y" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2004-02-08 17:30:37 +01:00
|
|
|
resolution_y = (FT_Short)prop->value.int32;
|
* 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
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
if ( bsize->y_ppem == 0 )
|
2003-07-01 09:28:55 +02:00
|
|
|
{
|
2004-02-08 17:30:37 +01:00
|
|
|
bsize->y_ppem = bsize->size;
|
|
|
|
if ( resolution_y )
|
|
|
|
bsize->y_ppem = bsize->y_ppem * resolution_y / 72;
|
2003-07-01 09:28:55 +02:00
|
|
|
}
|
2004-02-08 17:30:37 +01:00
|
|
|
if ( resolution_x && resolution_y )
|
|
|
|
bsize->x_ppem = bsize->y_ppem * resolution_x / resolution_y;
|
|
|
|
else
|
|
|
|
bsize->x_ppem = bsize->y_ppem;
|
2003-07-01 09:28:55 +02:00
|
|
|
}
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
/* encoding table */
|
|
|
|
{
|
|
|
|
bdf_glyph_t* cur = font->glyphs;
|
|
|
|
unsigned long n;
|
|
|
|
|
|
|
|
|
|
|
|
if ( FT_NEW_ARRAY( face->en_table, font->glyphs_size ) )
|
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
for ( n = 0; n < font->glyphs_size; n++ )
|
|
|
|
{
|
|
|
|
(face->en_table[n]).enc = cur[n].encoding;
|
|
|
|
FT_TRACE4(( "idx %d, val 0x%lX\n", n, cur[n].encoding ));
|
2002-05-22 07:41:06 +02:00
|
|
|
(face->en_table[n]).glyph = (FT_Short)n;
|
2002-05-21 16:13:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* charmaps */
|
|
|
|
{
|
|
|
|
bdf_property_t *charset_registry = 0, *charset_encoding = 0;
|
2002-06-14 10:54:02 +02:00
|
|
|
FT_Bool unicode_charmap = 0;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
|
|
|
|
charset_registry =
|
2003-04-25 07:35:04 +02:00
|
|
|
bdf_get_font_property( font, "CHARSET_REGISTRY" );
|
2002-05-21 16:13:01 +02:00
|
|
|
charset_encoding =
|
2003-04-25 07:35:04 +02:00
|
|
|
bdf_get_font_property( font, "CHARSET_ENCODING" );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( charset_registry && charset_encoding )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( charset_registry->format == BDF_ATOM &&
|
|
|
|
charset_encoding->format == BDF_ATOM &&
|
|
|
|
charset_registry->value.atom &&
|
|
|
|
charset_encoding->value.atom )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
2003-05-21 09:39:42 +02:00
|
|
|
const char* s;
|
|
|
|
|
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
if ( FT_NEW_ARRAY( face->charset_encoding,
|
|
|
|
strlen( charset_encoding->value.atom ) + 1 ) )
|
|
|
|
goto Exit;
|
2002-06-14 10:54:02 +02:00
|
|
|
if ( FT_NEW_ARRAY( face->charset_registry,
|
|
|
|
strlen( charset_registry->value.atom ) + 1 ) )
|
2002-05-21 16:13:01 +02:00
|
|
|
goto Exit;
|
2003-05-21 09:39:42 +02:00
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
ft_strcpy( face->charset_registry, charset_registry->value.atom );
|
|
|
|
ft_strcpy( face->charset_encoding, charset_encoding->value.atom );
|
2003-05-21 09:39:42 +02:00
|
|
|
|
|
|
|
/* Uh, oh, compare first letters manually to avoid dependency
|
|
|
|
on locales. */
|
|
|
|
s = face->charset_registry;
|
|
|
|
if ( ( s[0] == 'i' || s[0] == 'I' ) &&
|
|
|
|
( s[1] == 's' || s[1] == 'S' ) &&
|
|
|
|
( s[2] == 'o' || s[2] == 'O' ) )
|
|
|
|
{
|
|
|
|
s += 3;
|
|
|
|
if ( !ft_strcmp( s, "10646" ) ||
|
|
|
|
( !ft_strcmp( s, "8859" ) &&
|
|
|
|
!ft_strcmp( face->charset_encoding, "1" ) ) )
|
2002-06-14 10:54:02 +02:00
|
|
|
unicode_charmap = 1;
|
2003-05-21 09:39:42 +02:00
|
|
|
}
|
2002-06-14 10:54:02 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
FT_CharMapRec charmap;
|
|
|
|
|
|
|
|
|
|
|
|
charmap.face = FT_FACE( face );
|
* 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
|
|
|
charmap.encoding = FT_ENCODING_NONE;
|
2002-06-14 10:54:02 +02:00
|
|
|
charmap.platform_id = 0;
|
|
|
|
charmap.encoding_id = 0;
|
|
|
|
|
|
|
|
if ( unicode_charmap )
|
|
|
|
{
|
* 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
|
|
|
charmap.encoding = FT_ENCODING_UNICODE;
|
2002-06-14 10:54:02 +02:00
|
|
|
charmap.platform_id = 3;
|
|
|
|
charmap.encoding_id = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
error = FT_CMap_New( &bdf_cmap_class, NULL, &charmap, NULL );
|
2002-06-19 17:57:55 +02:00
|
|
|
|
2002-07-18 00:51:06 +02:00
|
|
|
#if 0
|
2002-06-19 17:57:55 +02:00
|
|
|
/* Select default charmap */
|
|
|
|
if (root->num_charmaps)
|
|
|
|
root->charmap = root->charmaps[0];
|
2002-07-18 00:51:06 +02:00
|
|
|
#endif
|
2002-06-14 10:54:02 +02:00
|
|
|
}
|
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-14 10:54:02 +02:00
|
|
|
/* otherwise assume Adobe standard encoding */
|
|
|
|
|
|
|
|
{
|
|
|
|
FT_CharMapRec charmap;
|
|
|
|
|
|
|
|
|
|
|
|
charmap.face = FT_FACE( face );
|
* 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
|
|
|
charmap.encoding = FT_ENCODING_ADOBE_STANDARD;
|
2002-06-19 17:57:55 +02:00
|
|
|
charmap.platform_id = 7;
|
2002-06-14 10:54:02 +02:00
|
|
|
charmap.encoding_id = 0;
|
|
|
|
|
|
|
|
error = FT_CMap_New( &bdf_cmap_class, NULL, &charmap, NULL );
|
2002-06-19 17:57:55 +02:00
|
|
|
|
|
|
|
/* Select default charmap */
|
|
|
|
if (root->num_charmaps)
|
|
|
|
root->charmap = root->charmaps[0];
|
2002-06-14 10:54:02 +02:00
|
|
|
}
|
2002-05-21 16:13:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
|
|
|
|
Fail:
|
|
|
|
BDF_Face_Done( face );
|
|
|
|
return BDF_Err_Unknown_File_Format;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-06-14 10:54:02 +02:00
|
|
|
static FT_Error
|
|
|
|
BDF_Set_Pixel_Size( FT_Size size )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
|
|
|
BDF_Face face = (BDF_Face)FT_SIZE_FACE( size );
|
|
|
|
FT_Face root = FT_FACE( face );
|
|
|
|
|
|
|
|
|
|
|
|
FT_TRACE4(( "rec %d - pres %d\n",
|
2004-02-08 17:30:37 +01:00
|
|
|
size->metrics.y_ppem, root->available_sizes->y_ppem ));
|
2002-05-21 16:13:01 +02:00
|
|
|
|
2004-02-08 17:30:37 +01:00
|
|
|
if ( size->metrics.y_ppem == root->available_sizes->y_ppem >> 6 )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
2004-02-08 17:30:37 +01:00
|
|
|
size->metrics.ascender = face->bdffont->font_ascent << 6;
|
|
|
|
size->metrics.descender = -face->bdffont->font_descent << 6;
|
|
|
|
size->metrics.height = ( face->bdffont->font_ascent +
|
|
|
|
face->bdffont->font_descent ) << 6;
|
2003-05-02 20:52:17 +02:00
|
|
|
size->metrics.max_advance = face->bdffont->bbx.width << 6;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
return BDF_Err_Ok;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
return BDF_Err_Invalid_Pixel_Size;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static FT_Error
|
|
|
|
BDF_Glyph_Load( FT_GlyphSlot slot,
|
|
|
|
FT_Size size,
|
|
|
|
FT_UInt glyph_index,
|
* src/sfnt/ttpost.c (load_post_names, tt_face_free_ps_names,
tt_face_get_ps_name): Replace switch statement with if clauses to
make it more portable.
* src/cff/cffobjs.c (cff_face_init): Ditto.
* include/freetype/ftmodule.h (FT_Module_Class): Use `FT_Long' for
`module_size'.
* include/freetype/ftrender.h (FT_Glyph_Class_): Use `FT_Long' for
`glyph_size'.
* src/base/ftobjs.c (FT_Render_Glyph): Change second parameter to
`FT_Render_Mode'.
(FT_Render_Glyph_Internal): Change third parameter to
`FT_Render_Mode'.
* src/base/ftglyph.c (FT_Glyph_To_Bitmap): Change second parameter
to `FT_Render_Mode'.
* src/raster/ftrend1.c (ft_raster1_render): Change third parameter
to `FT_Render_Mode'.
* src/smooth/ftsmooth.c (ft_smooth_render, ft_smooth_render_lcd,
ft_smooth_render_lcd_v): Ditto.
(ft_smooth_render_generic): Change third and fifth parameter to
`FT_Render_Mode'.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
include/freetype/ftglyph.h: Updated.
* src/cff/cffdrivr.c (Load_Glyph), src/pcf/pcfdriver.c
(PCF_Glyph_Load), src/pfr/pfrobjs.c (pfr_slot_load),
src/winfonts/winfnt.c (FNT_Load_Glyph), src/t42/t42objs.c
(T42_GlyphSlot_Load), src/bdf/bdfdrivr.c (BDF_Glyph_Load): Change
fourth parameter to `FT_Int32'.
* src/pfr/pfrobjs.c (pfr_face_init): Add two missing parameters
and declare them as unused.
* src/cid/cidparse.h (CID_Parser): Use FT_Long for `postscript_len'.
* src/psnames/psnames.h (PS_Unicode_Value_Func): Change return
value to FT_UInt32.
* src/psnames/psmodule.c (ps_unicode_value, ps_build_unicode_table):
Updated accordingly.
* src/cff/cffdrivr.c (Get_Kerning): Use FT_Long for `middle'.
(cff_get_glyph_name): Use cast for result of ft_strlen.
* src/cff/cffparse.c (cff_parse_real): User cast for assigning
`exp'.
* src/cff/cffload.c (cff_index_get_pointers): Use FT_ULong for
some local variables.
(cff_charset_load, cff_encoding_load): Use casts to FT_UInt for some
switch statements.
(cff_font_load): Use cast in call to CFF_Load_FD_Select.
* src/cff/cffobjs.c (cff_size_init): Use more casts.
(cff_face_init): Use FT_Int32 for `flags'.
* src/cff/cffgload.c (cff_operator_seac): Use cast for assigning
`adx' and `ady'.
(cff_decoder_parse_charstrings): Use FT_ULong for third parameter.
Use more casts.
* src/cff/cffcmap.c (cff_cmap_unicode_init): Use cast for `count'.
* src/cid/cidload.c (cid_read_subrs): Use FT_ULong for `len'.
* src/cid/cidgload.c (cid_load_glyph): Add missing cast for
`cid_get_offset'.
* src/psaux/t1decode.c (t1_decoder_parse_charstrings) <18>: Use
cast for `num_points'.
(t1_decoder_init): Use cast for assigning `decoder->num_glyphs'.
* src/base/ftdebug.c (ft_debug_init): Use FT_Int.
* include/freetype/internal/ftdriver.h (FT_Slot_LoadFunc): Use
`FT_Int32' for fourth parameter.
* src/base/ftobjs.c (open_face): Use cast for calling
clazz->init_face.
* src/raster/ftraster.c (Set_High_Precision): Use `1' instead of
`1L'.
(Finalize_Profile_Table, Line_Up, ft_black_init): Use casts.
* src/raster/ftrend1.c (ft_raster1_render): Ditto.
* src/sfnt/sfnt_dir_check: Compare `magic' with unsigned long
constant.
* builds/amiga/include/freetype/config/ftmodule.h: Updated.
2002-09-27 13:09:23 +02:00
|
|
|
FT_Int32 load_flags )
|
2002-05-21 16:13:01 +02:00
|
|
|
{
|
|
|
|
BDF_Face face = (BDF_Face)FT_SIZE_FACE( size );
|
|
|
|
FT_Error error = BDF_Err_Ok;
|
|
|
|
FT_Bitmap* bitmap = &slot->bitmap;
|
|
|
|
bdf_glyph_t glyph;
|
|
|
|
int bpp = face->bdffont->bpp;
|
|
|
|
int i, j, count;
|
|
|
|
unsigned char *p, *pp;
|
|
|
|
|
|
|
|
FT_UNUSED( load_flags );
|
|
|
|
|
|
|
|
|
|
|
|
if ( !face )
|
|
|
|
{
|
|
|
|
error = BDF_Err_Invalid_Argument;
|
|
|
|
goto Exit;
|
|
|
|
}
|
|
|
|
|
2002-06-16 03:14:16 +02:00
|
|
|
if ( glyph_index > 0 )
|
|
|
|
glyph_index--;
|
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
/* slot, bitmap => freetype, glyph => bdflib */
|
|
|
|
glyph = face->bdffont->glyphs[glyph_index];
|
|
|
|
|
2002-06-14 10:54:02 +02:00
|
|
|
bitmap->rows = glyph.bbx.height;
|
|
|
|
bitmap->width = glyph.bbx.width;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
if ( bpp == 1 )
|
|
|
|
{
|
* 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
|
|
|
bitmap->pixel_mode = FT_PIXEL_MODE_MONO;
|
2002-05-21 16:13:01 +02:00
|
|
|
bitmap->pitch = glyph.bpr;
|
|
|
|
|
2003-03-20 08:04:40 +01:00
|
|
|
/* note: we don't allocate a new array to hold the bitmap, we */
|
|
|
|
/* can simply point to it */
|
|
|
|
ft_glyphslot_set_bitmap( slot, glyph.bitmap );
|
2002-05-21 16:13:01 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* blow up pixmap to have 8 bits per pixel */
|
* 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
|
|
|
bitmap->pixel_mode = FT_PIXEL_MODE_GRAY;
|
2002-05-21 16:13:01 +02:00
|
|
|
bitmap->pitch = bitmap->width;
|
|
|
|
|
2003-03-20 08:04:40 +01:00
|
|
|
error = ft_glyphslot_alloc_bitmap( slot, bitmap->rows * bitmap->pitch );
|
|
|
|
if ( error )
|
2002-05-21 16:13:01 +02:00
|
|
|
goto Exit;
|
|
|
|
|
|
|
|
switch ( bpp )
|
|
|
|
{
|
|
|
|
case 2:
|
|
|
|
bitmap->num_grays = 4;
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
p = glyph.bitmap;
|
|
|
|
|
|
|
|
for ( i = 0; i < bitmap->rows; i++ )
|
|
|
|
{
|
|
|
|
pp = p;
|
|
|
|
|
|
|
|
/* get the full bytes */
|
|
|
|
for ( j = 0; j < ( bitmap->width >> 2 ); j++ )
|
|
|
|
{
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0xC0 ) >> 6 );
|
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0x30 ) >> 4 );
|
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0x0C ) >> 2 );
|
|
|
|
bitmap->buffer[count++] = (FT_Byte)( *pp & 0x03 );
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
pp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get remaining pixels (if any) */
|
|
|
|
switch ( bitmap->width & 3 )
|
|
|
|
{
|
|
|
|
case 3:
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0xC0 ) >> 6 );
|
2002-05-21 16:13:01 +02:00
|
|
|
/* fall through */
|
|
|
|
case 2:
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0x30 ) >> 4 );
|
2002-05-21 16:13:01 +02:00
|
|
|
/* fall through */
|
|
|
|
case 1:
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0x0C ) >> 2 );
|
2002-05-21 16:13:01 +02:00
|
|
|
/* fall through */
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
p += glyph.bpr;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case 4:
|
|
|
|
bitmap->num_grays = 16;
|
|
|
|
|
|
|
|
count = 0;
|
|
|
|
p = glyph.bitmap;
|
|
|
|
|
|
|
|
for ( i = 0; i < bitmap->rows; i++ )
|
|
|
|
{
|
|
|
|
pp = p;
|
|
|
|
|
|
|
|
/* get the full bytes */
|
|
|
|
for ( j = 0; j < ( bitmap->width >> 1 ); j++ )
|
|
|
|
{
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0xF0 ) >> 4 );
|
|
|
|
bitmap->buffer[count++] = (FT_Byte)( *pp & 0x0F );
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
pp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* get remaining pixel (if any) */
|
|
|
|
switch ( bitmap->width & 1 )
|
|
|
|
{
|
|
|
|
case 1:
|
2002-05-22 07:41:06 +02:00
|
|
|
bitmap->buffer[count++] = (FT_Byte)( ( *pp & 0xF0 ) >> 4 );
|
2002-05-21 16:13:01 +02:00
|
|
|
/* fall through */
|
|
|
|
case 0:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
p += glyph.bpr;
|
|
|
|
}
|
|
|
|
break;
|
2002-06-03 22:01:23 +02:00
|
|
|
|
|
|
|
case 8:
|
|
|
|
bitmap->num_grays = 256;
|
|
|
|
|
|
|
|
FT_MEM_COPY( bitmap->buffer, glyph.bitmap,
|
|
|
|
bitmap->rows * bitmap->pitch );
|
|
|
|
break;
|
2002-05-21 16:13:01 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-03-22 10:25:04 +01:00
|
|
|
slot->bitmap_left = glyph.bbx.x_offset;
|
2002-05-21 16:13:01 +02:00
|
|
|
slot->bitmap_top = glyph.bbx.ascent;
|
|
|
|
|
|
|
|
/* FZ XXX: TODO: vertical metrics */
|
|
|
|
slot->metrics.horiAdvance = glyph.dwidth << 6;
|
|
|
|
slot->metrics.horiBearingX = glyph.bbx.x_offset << 6;
|
2004-03-22 10:25:04 +01:00
|
|
|
slot->metrics.horiBearingY = glyph.bbx.ascent << 6;
|
2002-05-21 16:13:01 +02:00
|
|
|
slot->metrics.width = bitmap->width << 6;
|
|
|
|
slot->metrics.height = bitmap->rows << 6;
|
|
|
|
|
|
|
|
slot->linearHoriAdvance = (FT_Fixed)glyph.dwidth << 16;
|
* 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
|
|
|
slot->format = FT_GLYPH_FORMAT_BITMAP;
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
Exit:
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
/*
|
|
|
|
*
|
|
|
|
* BDF SERVICE
|
|
|
|
*
|
|
|
|
*/
|
2003-12-19 21:25:14 +01:00
|
|
|
|
2003-01-22 23:45:28 +01:00
|
|
|
static FT_Error
|
|
|
|
bdf_get_bdf_property( BDF_Face face,
|
|
|
|
const char* prop_name,
|
|
|
|
BDF_PropertyRec *aproperty )
|
|
|
|
{
|
|
|
|
bdf_property_t* prop;
|
|
|
|
|
2003-04-23 08:47:12 +02:00
|
|
|
|
2003-01-22 23:45:28 +01:00
|
|
|
FT_ASSERT( face && face->bdffont );
|
|
|
|
|
2003-04-25 07:35:04 +02:00
|
|
|
prop = bdf_get_font_property( face->bdffont, prop_name );
|
2003-11-13 11:19:27 +01:00
|
|
|
if ( prop )
|
2003-01-22 23:45:28 +01:00
|
|
|
{
|
|
|
|
switch ( prop->format )
|
|
|
|
{
|
2003-04-23 08:47:12 +02:00
|
|
|
case BDF_ATOM:
|
|
|
|
aproperty->type = BDF_PROPERTY_TYPE_ATOM;
|
|
|
|
aproperty->u.atom = prop->value.atom;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BDF_INTEGER:
|
|
|
|
aproperty->type = BDF_PROPERTY_TYPE_INTEGER;
|
|
|
|
aproperty->u.integer = prop->value.int32;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case BDF_CARDINAL:
|
|
|
|
aproperty->type = BDF_PROPERTY_TYPE_CARDINAL;
|
|
|
|
aproperty->u.cardinal = prop->value.card32;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
goto Fail;
|
2003-01-22 23:45:28 +01:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2003-04-23 08:47:12 +02:00
|
|
|
|
2003-01-22 23:45:28 +01:00
|
|
|
Fail:
|
* 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 BDF_Err_Invalid_Argument;
|
2003-01-22 23:45:28 +01:00
|
|
|
}
|
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
static FT_Error
|
|
|
|
bdf_get_charset_id( BDF_Face face,
|
|
|
|
const char* *acharset_encoding,
|
|
|
|
const char* *acharset_registry )
|
|
|
|
{
|
|
|
|
*acharset_encoding = face->charset_encoding;
|
|
|
|
*acharset_registry = face->charset_registry;
|
2003-12-19 21:25:14 +01:00
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
return 0;
|
2003-12-19 21:25:14 +01:00
|
|
|
}
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
|
|
|
|
|
|
|
|
static const FT_Service_BDFRec bdf_service_bdf =
|
|
|
|
{
|
2003-09-17 07:26:33 +02:00
|
|
|
(FT_BDF_GetCharsetIdFunc)bdf_get_charset_id,
|
|
|
|
(FT_BDF_GetPropertyFunc) bdf_get_bdf_property
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
*
|
|
|
|
* SERVICES LIST
|
|
|
|
*
|
|
|
|
*/
|
2003-12-19 21:25:14 +01:00
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
static const FT_ServiceDescRec bdf_services[] =
|
|
|
|
{
|
|
|
|
{ FT_SERVICE_ID_BDF, &bdf_service_bdf },
|
|
|
|
{ FT_SERVICE_ID_XF86_NAME, FT_XF86_FORMAT_BDF },
|
|
|
|
{ NULL, NULL }
|
|
|
|
};
|
|
|
|
|
2003-01-22 23:45:28 +01:00
|
|
|
|
|
|
|
static FT_Module_Interface
|
|
|
|
bdf_driver_requester( FT_Module module,
|
|
|
|
const char* name )
|
|
|
|
{
|
|
|
|
FT_UNUSED( module );
|
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
return ft_service_list_lookup( bdf_services, name );
|
2003-01-22 23:45:28 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
* include/freetype/ftmm.h, include/freetype/ftmodule.h,
include/freetype/tttables.h, include/freetype/config/ftconfig.h,
include/freetype/internal/ftobjs.h,
include/freetype/internal/ftserv.h,
include/freetype/internal/internal.h,
include/freetype/internal/sfnt.h,
include/freetype/internal/tttypes.h,
include/freetype/internal/services/bdf.h,
include/freetype/internal/services/glyfdict.h,
include/freetype/internal/services/multmast.h,
include/freetype/internal/services/postname.h,
include/freetype/internal/services/sfnt.h,
include/freetype/internal/services/xf86name.h,
src/base/ftbdf.c, src/base/ftmm.c, src/base/ftobjs.c,
src/base/ftxf86.c, src/bdf/bdfdrivr.c, src/cff/cffdrivr.c,
src/cid/cidriver.c, src/pcf/pcfdrivr.c, src/sfnt/sfdriver.c,
src/truetype/ttdriver.c, src/type1/t1driver.c, src/type42/t42drivr.c:
heavy internal modifications to introduce the concept of
"module services". This is the first step towards a massive
simplification of the engine's internals, in order to
get rid of various numbers of hacks.
Note that this changes will break source & binary compatibility
for authors of external font drivers.
Maybe 2.1.6 will be called 2.2.0 after all :-)
2003-09-11 21:51:54 +02:00
|
|
|
|
2002-05-21 16:13:01 +02:00
|
|
|
FT_CALLBACK_TABLE_DEF
|
|
|
|
const FT_Driver_ClassRec bdf_driver_class =
|
|
|
|
{
|
|
|
|
{
|
* include/freetype/ftglyph.h (ft_glyph_bbox_unscaled,
ft_glyph_bbox_subpixels, ft_glyph_bbox_gridfit,
ft_glyph_bbox_truncate, ft_glyph_bbox_pixels): Replaced with
FT_GLYPH_BBOX_UNSCALED, FT_GLYPH_BBOX_SUBPIXELS,
FT_GLYPH_BBIX_GRIDFIT, FT_GLYPH_BBOX_TRUNCATE, FT_GLYPH_BBOX_PIXELS.
The lowercase variants are now (deprecated aliases) to the uppercase
versions.
Updated all other files.
* include/freetype/ftmodule.h (ft_module_font_driver,
ft_module_renderer, ft_module_hinter, ft_module_styler,
ft_module_driver_scalable, ft_module_driver_no_outlines,
ft_module_driver_has_hinter): Replaced with FT_MODULE_FONT_DRIVER,
FT_MODULE_RENDERER, FT_MODULE_HINTER, FT_MODULE_STYLER,
FT_MODULE_DRIVER_SCALABLE, FT_MODULE_DRIVER_NO_OUTLINES,
FT_MODULE_DRIVER_HAS_HINTER.
The lowercase variants are now (deprecated aliases) to the uppercase
versions.
Updated all other files.
* src/base/ftglyph.c (FT_Glyph_Get_CBox): Handle bbox_mode better
as enumeration.
* src/pcf/pcfdrivr.c (pcf_driver_class), src/winfonts/winfnt.c
(winfnt_driver_class), src/bdf/bdfdrivr.c (bdf_driver_class): Add
the FT_MODULE_DRIVER_NO_OUTLINES flag.
2003-06-17 12:42:27 +02:00
|
|
|
FT_MODULE_FONT_DRIVER |
|
|
|
|
FT_MODULE_DRIVER_NO_OUTLINES,
|
2002-05-21 16:13:01 +02:00
|
|
|
sizeof ( FT_DriverRec ),
|
|
|
|
|
|
|
|
"bdf",
|
|
|
|
0x10000L,
|
|
|
|
0x20000L,
|
|
|
|
|
|
|
|
0,
|
|
|
|
|
|
|
|
(FT_Module_Constructor)0,
|
|
|
|
(FT_Module_Destructor) 0,
|
2003-01-22 23:45:28 +01:00
|
|
|
(FT_Module_Requester) bdf_driver_requester
|
2002-05-21 16:13:01 +02:00
|
|
|
},
|
|
|
|
|
2002-06-14 10:54:02 +02:00
|
|
|
sizeof ( BDF_FaceRec ),
|
|
|
|
sizeof ( FT_SizeRec ),
|
|
|
|
sizeof ( FT_GlyphSlotRec ),
|
2002-05-21 16:13:01 +02:00
|
|
|
|
|
|
|
(FT_Face_InitFunc) BDF_Face_Init,
|
|
|
|
(FT_Face_DoneFunc) BDF_Face_Done,
|
|
|
|
(FT_Size_InitFunc) 0,
|
|
|
|
(FT_Size_DoneFunc) 0,
|
|
|
|
(FT_Slot_InitFunc) 0,
|
|
|
|
(FT_Slot_DoneFunc) 0,
|
|
|
|
|
|
|
|
(FT_Size_ResetPointsFunc) BDF_Set_Pixel_Size,
|
|
|
|
(FT_Size_ResetPixelsFunc) BDF_Set_Pixel_Size,
|
|
|
|
|
|
|
|
(FT_Slot_LoadFunc) BDF_Glyph_Load,
|
|
|
|
|
|
|
|
(FT_Face_GetKerningFunc) 0,
|
|
|
|
(FT_Face_AttachFunc) 0,
|
* include/freetype/config/ftoption.h, include/freetype/internal/tttypes.h,
src/base/ftobjs.c, src/bdf/bdfdrivr.c, src/cff/cffobjs.c,
src/pcf/pcfdrivr.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c,
src/sfnt/ttcmap0.h, src/sfnt/ttload.c, src/type1/t1objs.c,
src/type42/t42objs.c, src/winfonts/winfnt.c: code cleanup,
FT_CONFIG_OPTION_USE_CMAPS is now the default
2002-07-17 23:52:20 +02:00
|
|
|
(FT_Face_GetAdvancesFunc) 0
|
2002-05-21 16:13:01 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* END */
|