Chiebot-Mirror
/
freetype
mirror of https://github.com/freetype/freetype.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanups; adding some copyrights; formatting.

Browse Source
BRANCH-2-1-5
Werner Lemberg 22 years ago
parent 33829f219b
commit 74675ec796
9 changed files with 563 additions and 409 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 101
      ChangeLog
  2. 20
      src/base/ftbdf.c
  3. 2
      src/base/ftdbgmem.c
  4. 4
      src/base/ftglyph.c
  5. 44
      src/base/ftobjs.c
  6. 34
      src/base/ftpfr.c
  7. 749
      src/base/ftstroker.c
  8. 2
      src/base/ftsynth.c
  9. 16
      src/base/ftwinfnt.c

101
ChangeLog
Unescape View File

@ -36,9 +36,10 @@
will ignore stem quantization only when FT_LOAD_TARGET_SMOOTH is
used.
* src/base/ftobjs.c: Changed the default computations to include
rounding in all cases; this is required to provide accurate kerning
data when native TrueType hinting is enabled.
* src/base/ftobjs.c (FT_Set_Char_Size): Changed the default
computations to include rounding in all cases; this is required to
provide accurate kerning data when native TrueType hinting is
enabled.
* src/type1/t1load.c: The Type 1 loader now accepts more general
names according to the PostScript specification (the previous one
@ -71,9 +72,11 @@
* include/freetype/internal/ftobjs.h (ft_glyphslot_free_bitmap,
ft_glyphslot_alloc_bitmap, ft_glyphslot_set_bitmap): New functions.
* src/base/ftobjs.c, src/bdf/bdfdrivr.c, src/pcf/pcfdriver.c,
src/pfr/pfrsbit.c, src/sfnt/ttsbit.c, src/type42/t42objs.c,
src/winfonts/winfnt.c:
* src/base/ftobjs.c: Implement them.
(ft_glyphslot_done): Use ft_glyphslot_free_bitmap.
* src/bdf/bdfdrivr.c, src/pcf/pcfdriver.c, src/pfr/pfrsbit.c,
src/sfnt/ttsbit.c, src/type42/t42objs.c, src/winfonts/winfnt.c:
* src/cache/ftlru.c: Fixed an invalid assertion check.
@ -99,10 +102,16 @@
2003-03-13 David Turner <david@freetype.org>
* src/base/ftdbgmem.c, docs/DEBUG.TXT: Added new environment
variables to control memory debugging with FreeType. See the
description of "FT2_DEBUG_MEMORY", "FT2_ALLOC_TOTAL_MAX" and
"FT2_ALLOC_COUNT_MAX" in DEBUG.TXT.
Added new environment variables to control memory debugging with
FreeType. See the description of "FT2_DEBUG_MEMORY",
"FT2_ALLOC_TOTAL_MAX" and "FT2_ALLOC_COUNT_MAX" in DEBUG.TXT.
* src/base/ftdbgmem.c (FT_MemTableRec): Add `alloc_count',
`bound_total', `alloc_total_max', `bound_count', `alloc_count_max'.
(ft_mem_debug_alloc): Handle new variables.
(ft_mem_debug_init): s/FT_DEBUG_MEMORY/FT2_DEBUG_MEMORY/.
Handle new environment variables.
* docs/DEBUG.TXT: Updated.
* src/cache/ftccache.c, src/cache/ftccmap.c, src/cache/ftcsbits.c,
src/cache/ftlru.c: Fixed the cache sub-system to correctly deal with
@ -166,11 +175,14 @@
2003-02-18 David Turner <david@freetype.org>
* src/truetype/ttdriver.c, src/truetype/ttobjs.h,
src/truetype/ttobjs.c, src/truetype/ttinterp.c, src/base/ftobjs.c:
Fixing the slight distortion problem that ocurred due to the latest
Fixing the slight distortion problem that occurred due to the latest
auto-hinter changes.
* src/base/ftobjs.c (ft_recompute_scaled_metrics): Fix rounding.
* src/truetype/ttdriver.c, src/truetype/ttobjs.h,
src/truetype/ttobjs.c, src/truetype/ttinterp.c:
* src/autohint/ahhint.c (ah_hinter_load): Disabled the advance width
"correction" which seemed to provide more trouble than benefits.
@ -214,7 +226,9 @@
the top of non-capital letters is aligned on a pixel boundary
whenever possible.
* src/base/ftobjs.c, src/truetype/ttobjs.c:
* src/base/ftobjs.c (FT_Set_Char_Size)
[FT_CONFIG_CHESTER_BLUE_SCALE]: Round differently.
* src/truetype/ttobjs.c:
* src/pshinter/pshalgo3.c: Improved the Postscript hinter. Getting
rid of stem snapping seems to work well here (though the stems are
@ -238,8 +252,12 @@
FT_Get_BDF_Property): New function.
* include/freetype/internal/bdftypes.h: Include FT_BDF_H.
(BDF_GetPropertyFunc): New function pointer.
src/base/ftbdf.c, src/bdf/bdfdrivr.c, src/pcf/pcfdrivr.c,
src/pcf/pcfread.h:
* src/base/ftbdf.c (test_font_type): New helper function.
(FT_Get_BDF_Charset_ID): Use `test_font_type'.
(FT_Get_BDF_Property): New function.
* src/bdf/bdfdrivr.c, src/pcf/pcfdrivr.c, src/pcf/pcfread.h:
* src/sfnt/ttload.c (sfnt_dir_check): Relaxed the "head" table size
verification to accept a few broken fonts who pad the size
@ -279,9 +297,11 @@
* include/freetype/internal/fnttypes.h: Move Windows FNT definition
to...
* include/freetype/ftwinfnt.h: This new file.
* include/freetype/internal/fnttypes.h, src/base/winfnt.c,
src/winfonts/winfnt.c, src/base/Jamfile, src/base/rules.mk,
src/base/descrip.mms:
* src/base/ftwinfnt.c: New file, providing `FT_Get_WinFNT_Header'.
* src/winfonts/winfnt.c:
* src/base/Jamfile, src/base/descrip.mms, src/base/rules.mk:
Updated.
2003-01-14 Graham Asher <graham.asher@btinternet.com>
@ -353,6 +373,7 @@
returned when the font doesn't contain a Unicode charmap. This
allows FT2 to load "symbol.ttf" and a few others correctly since the
last release.
(open_face): Fix return value.
2003-01-08 Owen Taylor <owen@redhat.com>
@ -382,6 +403,11 @@
* src/base/ftstroker.c: Probably the last bug-fixes to the stroker;
the API is likely to change, however.
(ft_stroke_border_close): Don't record empty paths.
(ft_stroke_border_get_counts): Increase `num_points' also in for loop.
(ft_stroke_border_export): Don't increase `write' twice in for loops.
(ft_stroker_outside): Handle `phi' together with `theta'.
(FT_Stroker_ParseOutline): New function.
* src/base/fttrigon.c (FT_Angle_Diff): Fixing function: It returned
invalid values for large negative angle differences (resulting in
@ -391,7 +417,7 @@
assertion, and changing code to avoid hash table size contraction.
* src/base/Jamfile, src/base/rules.mk, src/base/descrip.mms: Adding
"ftstroker.obj" to default build, as optional component.
"ftstroker" to default build, as optional component.
2002-12-26 David Turner <david@freetype.org>
@ -417,6 +443,7 @@
function pointer.
* include/freetype/tttables.h (FT_Load_Sfnt_Table): New function.
* src/base/ftobjs.c: Implement it.
2002-12-17 David Turner <david@freetype.org>
@ -443,9 +470,9 @@
* src/base/ftobjs.c: Modified the logic to get Unicode charmaps.
Now it loads UCS-4 charmaps when there is one.
* src/base/ftobjs.c (find_unicode_charmap): New function.
* src/base/ftobjs.c (open_face): Refer to the above one.
* src/base/ftobjs.c (FT_Select_Charmap): Idem.
(find_unicode_charmap): New function.
(open_face): Refer to the above one.
(FT_Select_Charmap): Idem.
2002-11-29 Antoine Leca <Antoine-Freetype@Leca-Marti.org>
@ -538,6 +565,29 @@
* src/psaux/psobjs.c (ps_table_add): Modified increment loop in
order to implement exponential behaviour.
2002-11-01 David Turner <david@freetype.org>
Added PFR-specific public API. Fixed the kerning retrievel routine
(it returned invalid values when the outline and metrics resolution
differ).
* include/freetype/ftpfr.h, include/freetype/internal/pfr.h: New
files.
* include/freetype/internal/internal.h (FT_INTERNAL_PFR_H): New
macro for pfr.h.
src/base/ftpfr.c: New file.
* src/base/Jamfile, src/base/descrip.mms: Updated.
* src/base/ftobjs.c (ft_glyphslot_clear): Small internal fix to
better support bitmap-based font formats.
* src/base/ftsynth.c (FT_GlyphSlot_Embolden): Fix handling of
`scale'.
Fix arguments to `FT_Vector_From_Polar'.
2002-10-31 David Turner <david@freetype.org>
* include/freetype/ftgzip.h, src/gzip/ftgzip.c: New files, adding
@ -550,9 +600,6 @@
* include/freetype/internal/pcftypes.h (PCF_Public_FaceRec): Add
`gzip_stream' and `gzip_source'.
* include/freetype/ftpfr.h, include/freetype/internal/pfr.h: New
files.
* include/freetype/config/ftoption.h (FT_CONFIG_OPTION_USE_ZLIB):
New macro.
(T1_CONFIG_OPTION_DISABLE_HINTER, FT_CONFIG_OPTION_USE_CMAPS
@ -564,8 +611,6 @@
that platform specific configuration file can override.
* include/freetype/internal/ftstream.h: Include FT_SYSTEM_H.
* include/freetype/internal/internal.h (FT_INTERNAL_PFR_H): New
macro for pfr.h.
2002-10-30 David Turner <david@freetype.org>

20
src/base/ftbdf.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* FreeType API for accessing BDF-specific strings (body). */
/* */
/* Copyright 2002 by */
/* Copyright 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -20,13 +20,16 @@
#include FT_INTERNAL_BDF_TYPES_H
#include FT_INTERNAL_OBJECTS_H
static FT_Bool
test_font_type( FT_Face face, const char* name )
test_font_type( FT_Face face,
const char* name )
{
if ( face && face->driver )
{
FT_Module driver = (FT_Module)face->driver;
if ( driver->clazz && driver->clazz->module_name )
{
if ( ft_strcmp( driver->clazz->module_name, name ) == 0 )
@ -74,7 +77,8 @@
const char* prop_name,
BDF_PropertyRec *aproperty )
{
FT_Error error;
FT_Error error;
error = FT_Err_Invalid_Argument;
@ -82,15 +86,17 @@
if ( face != NULL && face->driver != NULL )
{
FT_Driver driver = face->driver;
BDF_GetPropertyFunc func;
FT_Driver driver = face->driver;
BDF_GetPropertyFunc func;
func = (BDF_GetPropertyFunc) driver->root.clazz->get_interface(
FT_MODULE( driver ), "get_bdf_property" );
func = (BDF_GetPropertyFunc)driver->root.clazz->get_interface(
FT_MODULE( driver ), "get_bdf_property" );
if ( func )
error = func( face, prop_name, aproperty );
}
return error;
}
/* END */

2
src/base/ftdbgmem.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* Memory debugger (body). */
/* */
/* Copyright 2001, 2002 by */
/* Copyright 2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

4
src/base/ftglyph.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* FreeType convenience functions to handle glyphs (body). */
/* */
/* Copyright 1996-2001, 2002 by */
/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -57,7 +57,7 @@
FT_EXPORT_DEF( void )
FT_Matrix_Multiply( const FT_Matrix* a,
FT_Matrix* b )
FT_Matrix *b )
{
FT_Fixed xx, xy, yx, yy;

44
src/base/ftobjs.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* The FreeType private base classes (body). */
/* */
/* Copyright 1996-2001, 2002 by */
/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -260,7 +260,7 @@
slot->bitmap.rows = 0;
slot->bitmap.pitch = 0;
slot->bitmap.pixel_mode = 0;
/* don't touch 'slot->bitmap.buffer' !! */
/* don't touch 'slot->bitmap.buffer'! */
slot->bitmap_left = 0;
slot->bitmap_top = 0;
@ -748,11 +748,11 @@
/* <Description> */
/* This function finds a Unicode charmap, if there is one. */
/* And if there is more than one, it tries to favour the more */
/* extensive one, i.e. one that supports UCS-4 against those which */
/* extensive one, i.e., one that supports UCS-4 against those which */
/* are limited to the BMP (said UCS-2 encoding.) */
/* */
/* This function is called from open_face() (just below), and also */
/* from FT_Select_Charmap( , FT_ENCODING_UNICODE). */
/* from FT_Select_Charmap( ..., FT_ENCODING_UNICODE). */
/* */
static FT_Error
find_unicode_charmap( FT_Face face )
@ -771,26 +771,26 @@
return FT_Err_Invalid_CharMap_Handle;
/*
* the original TrueType specification(s) only specified charmap
* The original TrueType specification(s) only specified charmap
* formats that are capable of mapping 8 or 16 bit character codes to
* glyph indices.
*
* however, recent updates to the Apple and OpenType specifications
* However, recent updates to the Apple and OpenType specifications
* introduced new formats that are capable of mapping 32-bit character
* codes as well. And these are already used on some fonts, mainly to
* codes as well. And these are already used on some fonts, mainly to
* map non-BMP Asian ideographs as defined in Unicode.
*
* for compatibility purposes, these fonts generally come with
* For compatibility purposes, these fonts generally come with
* *several* Unicode charmaps:
*
* - one of them in the "old" 16-bit format, that cannot access
* all glyphs in the font
* - One of them in the "old" 16-bit format, that cannot access
* all glyphs in the font.
*
* - another one in the "new" 32-bit format, that can access all
* - Another one in the "new" 32-bit format, that can access all
* the glyphs.
*
* this function has been written to always favor a 32-bit charmap
* when found. Otherwise, a 16-bit one is returned when found
* This function has been written to always favor a 32-bit charmap
* when found. Otherwise, a 16-bit one is returned when found.
*/
/* since the `interesting' table, with id's 3,10, is normally the */
@ -1570,10 +1570,10 @@
if ( !face )
return FT_Err_Invalid_Face_Handle;
/* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
/* charmap available, i.e. one with UCS-4 characters, if possible. */
/* */
/* This is done by find_unicode_charmap() above, to share code. */
/* FT_ENCODING_UNICODE is special. We try to find the `best' Unicode */
/* charmap available, i.e., one with UCS-4 characters, if possible. */
/* */
/* This is done by find_unicode_charmap() above, to share code. */
if ( encoding == FT_ENCODING_UNICODE )
return find_unicode_charmap( face );
@ -1906,11 +1906,11 @@
/* documentation is in tttables.h */
FT_EXPORT_DEF( FT_Error )
FT_Load_Sfnt_Table( FT_Face face,
FT_ULong tag,
FT_Long offset,
FT_Byte* buffer,
FT_ULong* length )
FT_Load_Sfnt_Table( FT_Face face,
FT_ULong tag,
FT_Long offset,
FT_Byte* buffer,
FT_ULong* length )
{
SFNT_Load_Table_Func func;
FT_Driver driver;

34
src/base/ftpfr.c
Unescape View File

@ -2,9 +2,9 @@
/* */
/* ftpfr.c */
/* */
/* FreeType API for accessing PFR-specific data */
/* FreeType API for accessing PFR-specific data (body). */
/* */
/* Copyright 2002 by */
/* Copyright 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -20,18 +20,20 @@
#include FT_INTERNAL_OBJECTS_H
/* check the format */
/* check the format */
static FT_Error
ft_pfr_check( FT_Face face,
FT_PFR_Service *aservice )
ft_pfr_check( FT_Face face,
FT_PFR_Service *aservice )
{
FT_Error error = FT_Err_Bad_Argument;
if ( face && face->driver )
{
FT_Module module = (FT_Module) face->driver;
const char* name = module->clazz->module_name;
if ( name[0] == 'p' &&
name[1] == 'f' &&
name[2] == 'r' &&
@ -45,17 +47,17 @@
}
FT_EXPORT_DEF( FT_Error )
FT_Get_PFR_Metrics( FT_Face face,
FT_UInt *aoutline_resolution,
FT_UInt *ametrics_resolution,
FT_Fixed *ametrics_x_scale,
FT_Fixed *ametrics_y_scale )
FT_Get_PFR_Metrics( FT_Face face,
FT_UInt *aoutline_resolution,
FT_UInt *ametrics_resolution,
FT_Fixed *ametrics_x_scale,
FT_Fixed *ametrics_y_scale )
{
FT_Error error;
FT_PFR_Service service;
error = ft_pfr_check( face, &service );
if ( !error )
{
@ -68,6 +70,7 @@
return error;
}
FT_EXPORT_DEF( FT_Error )
FT_Get_PFR_Kerning( FT_Face face,
FT_UInt left,
@ -77,6 +80,7 @@
FT_Error error;
FT_PFR_Service service;
error = ft_pfr_check( face, &service );
if ( !error )
{
@ -87,13 +91,14 @@
FT_EXPORT_DEF( FT_Error )
FT_Get_PFR_Advance( FT_Face face,
FT_UInt gindex,
FT_Pos *aadvance )
FT_Get_PFR_Advance( FT_Face face,
FT_UInt gindex,
FT_Pos *aadvance )
{
FT_Error error;
FT_PFR_Service service;
error = ft_pfr_check( face, &service );
if ( !error )
{
@ -102,4 +107,5 @@
return error;
}
/* END */

749
src/base/ftstroker.c
View File

File diff suppressed because it is too large Load Diff

2
src/base/ftsynth.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* FreeType synthesizing code for emboldening and slanting (body). */
/* */
/* Copyright 2000-2001 by */
/* Copyright 2000-2001, 2002 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */

16
src/base/ftwinfnt.c
Unescape View File

@ -4,7 +4,7 @@
/* */
/* FreeType API for accessing Windows FNT specific info (body). */
/* */
/* Copyright 2002 by */
/* Copyright 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -23,10 +23,11 @@
FT_EXPORT_DEF( FT_Error )
FT_Get_WinFNT_Header( FT_Face face,
FT_WinFNT_HeaderRec *header )
FT_Get_WinFNT_Header( FT_Face face,
FT_WinFNT_HeaderRec *header )
{
FT_Error error;
FT_Error error;
error = FT_Err_Invalid_Argument;
@ -41,10 +42,11 @@
FNT_Size size = (FNT_Size)face->size;
FNT_Font font = size->font;
if (font)
if ( font )
{
FT_MEM_COPY( header, &font->header, sizeof(*header) );
error = 0;
FT_MEM_COPY( header, &font->header, sizeof ( *header ) );
error = FT_Err_Ok;
}
}
}

Write Preview
Loading…
Cancel
Save