diff --git a/ChangeLog b/ChangeLog index 7619c5fa6..749396237 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,22 +1,25 @@ 2005-10-20 David Turner - * src/base/ftdbgmem.c: fixes to better account for memory reallocations + * src/base/ftdbgmem.c (ft_mem_table_set, ft_mem_table_remove, + ft_mem_debug_alloc, ft_mem_debug_free, ft_mem_debug_realloc): Fixes + to better account for memory reallocations. - * src/lzw/ftlzw2.c, src/lzw/ftzopen.h, src/lzw/ftzopen.c, src/lzw/rules.mk: - first version of LZW loader re-implementation. Apparently, saves about - 260 KB of heap memory when loading timR24.pcf.Z + * src/lzw/ftlzw2.c, src/lzw/ftzopen.h, src/lzw/ftzopen.c, + src/lzw/rules.mk: First version of LZW loader re-implementation. + Apparently, this saves about 260 KB of heap memory when loading + timR24.pcf.Z. 2005-10-20 Chia-I Wu * include/freetype/ftbitmap.h (FT_Bitmap_Copy, FT_Bitmap_Embolden), src/base/ftbdf.c (FT_Get_BDF_Property), src/cache/ftcmru.c - (FTC_MruList_Reset, FTC_MruList_Done, FTC_MruList_Lookup): Misuse of - FT_EXPORT/FT_EXPORT_DEF. + (FTC_MruList_Reset, FTC_MruList_Done, FTC_MruList_Lookup): Fix + FT_EXPORT/FT_EXPORT_DEF tagging. 2005-10-19 Chia-I Wu - * src/truetype/ttgload.c (TT_Load_Glyph): Allow size->ttmetrics to be - invalid when FT_LOAD_NO_SCALE is set. + * src/truetype/ttgload.c (TT_Load_Glyph): Allow size->ttmetrics to + be invalid when FT_LOAD_NO_SCALE is set. 2005-10-17 David Turner diff --git a/src/lzw/ftlzw2.c b/src/lzw/ftlzw2.c index a4ef80bc5..1e3bda8b5 100644 --- a/src/lzw/ftlzw2.c +++ b/src/lzw/ftlzw2.c @@ -1,8 +1,8 @@ /***************************************************************************/ /* */ -/* ftlzw.c */ +/* ftlzw2.c */ /* */ -/* FreeType support for .Z compressed files. */ +/* FreeType support for .Z compressed files (reimplementation). */ /* */ /* This optional component relies on NetBSD's zopen(). It should mainly */ /* be used to parse compressed PCF fonts, as found with many X11 server */ diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c index aa5f1a808..af6c211b6 100644 --- a/src/lzw/ftzopen.c +++ b/src/lzw/ftzopen.c @@ -1,3 +1,23 @@ +/***************************************************************************/ +/* */ +/* ftzopen.c */ +/* */ +/* FreeType support for .Z compressed files. */ +/* */ +/* This optional component relies on NetBSD's zopen(). It should mainly */ +/* be used to parse compressed PCF fonts, as found with many X11 server */ +/* distributions. */ +/* */ +/* Copyright 2005 by David Turner. */ +/* */ +/* 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 "ftzopen.h" #include FT_INTERNAL_MEMORY_H #include FT_INTERNAL_STREAM_H diff --git a/src/lzw/ftzopen.h b/src/lzw/ftzopen.h index 89ede530b..9fb68be0f 100644 --- a/src/lzw/ftzopen.h +++ b/src/lzw/ftzopen.h @@ -1,3 +1,23 @@ +/***************************************************************************/ +/* */ +/* ftzopen.h */ +/* */ +/* FreeType support for .Z compressed files. */ +/* */ +/* This optional component relies on NetBSD's zopen(). It should mainly */ +/* be used to parse compressed PCF fonts, as found with many X11 server */ +/* distributions. */ +/* */ +/* Copyright 2005 by David Turner. */ +/* */ +/* 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. */ +/* */ +/***************************************************************************/ + #ifndef __FT_ZOPEN_H__ #define __FT_ZOPEN_H__ diff --git a/src/lzw/rules.mk b/src/lzw/rules.mk index 8f748c8b4..8d44673ba 100644 --- a/src/lzw/rules.mk +++ b/src/lzw/rules.mk @@ -3,7 +3,7 @@ # -# Copyright 2004 by +# Copyright 2004, 2005 by # Albert Chin-A-Young. # # Based on src/lzw/rules.mk, Copyright 2002 by diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index 68be2ab53..a779fb62e 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -2020,7 +2020,7 @@ #endif /* TT_CONFIG_OPTION_EMBEDDED_BITMAPS */ - /* if FT_LOAD_NO_SCALE is not set, ttmetirc must be valid */ + /* if FT_LOAD_NO_SCALE is not set, `ttmetrics' must be valid */ if ( !( load_flags & FT_LOAD_NO_SCALE ) && !size->ttmetrics.valid ) return TT_Err_Invalid_Size_Handle; @@ -2062,7 +2062,8 @@ /* This is _critical_ to get correct output for monochrome */ /* TrueType glyphs at all sizes using the bytecode interpreter. */ /* */ - if ( !( load_flags & FT_LOAD_NO_SCALE ) && size->root.metrics.y_ppem < 24 ) + if ( !( load_flags & FT_LOAD_NO_SCALE ) && + size->root.metrics.y_ppem < 24 ) glyph->outline.flags |= FT_OUTLINE_HIGH_PRECISION; return error;