From e3016420db2cca8a07273ad519ab54113db1402c Mon Sep 17 00:00:00 2001 From: Brad Lassey Date: Thu, 11 Nov 2010 17:30:52 -0500 Subject: [PATCH] bug 608896 - update in-tree freetype from 2.4.1 to 2.4.3 r=stuart a=blocking-fennec --- modules/freetype2/ChangeLog | 430 ++++++++++++++- modules/freetype2/ChangeLog.23 | 4 +- modules/freetype2/Jamfile | 2 +- modules/freetype2/README | 8 +- modules/freetype2/README.moz-patches | 2 +- modules/freetype2/builds/unix/config.guess | 10 +- modules/freetype2/builds/unix/config.sub | 10 +- modules/freetype2/builds/unix/configure | 20 +- modules/freetype2/builds/unix/configure.ac | 4 +- modules/freetype2/builds/unix/configure.raw | 2 +- modules/freetype2/builds/unix/ftconfig.in | 2 +- modules/freetype2/builds/unix/unix-cc.in | 3 +- .../builds/win32/vc2005/freetype.vcproj | 12 +- .../freetype2/builds/win32/vc2005/index.html | 10 +- .../builds/win32/vc2008/freetype.vcproj | 12 +- .../freetype2/builds/win32/vc2008/index.html | 10 +- .../builds/win32/visualc/freetype.dsp | 20 +- .../builds/win32/visualc/freetype.vcproj | 12 +- .../freetype2/builds/win32/visualc/index.html | 10 +- .../builds/win32/visualce/freetype.dsp | 20 +- .../builds/win32/visualce/freetype.vcproj | 84 +-- .../builds/win32/visualce/index.html | 10 +- .../builds/wince/vc2005-ce/freetype.vcproj | 76 +-- .../builds/wince/vc2005-ce/index.html | 10 +- .../builds/wince/vc2008-ce/freetype.vcproj | 76 +-- .../builds/wince/vc2008-ce/index.html | 10 +- modules/freetype2/configure | 15 +- modules/freetype2/devel/ftoption.h | 23 +- modules/freetype2/docs/CHANGES | 43 ++ modules/freetype2/docs/VERSION.DLL | 2 + modules/freetype2/docs/reference/.gitignore | 1 + .../docs/reference/ft2-base_interface.html | 99 ++-- .../docs/reference/ft2-basic_types.html | 6 +- .../docs/reference/ft2-bdf_fonts.html | 4 +- .../docs/reference/ft2-bitmap_handling.html | 4 +- .../docs/reference/ft2-cache_subsystem.html | 6 +- .../docs/reference/ft2-cid_fonts.html | 4 +- .../docs/reference/ft2-computations.html | 4 +- .../docs/reference/ft2-font_formats.html | 4 +- .../docs/reference/ft2-gasp_table.html | 4 +- .../docs/reference/ft2-glyph_management.html | 4 +- .../docs/reference/ft2-glyph_stroker.html | 4 +- .../docs/reference/ft2-glyph_variants.html | 4 +- .../docs/reference/ft2-gx_validation.html | 4 +- .../freetype2/docs/reference/ft2-gzip.html | 4 +- .../reference/ft2-header_file_macros.html | 4 +- .../docs/reference/ft2-incremental.html | 4 +- .../freetype2/docs/reference/ft2-index.html | 496 +++++++++--------- .../docs/reference/ft2-lcd_filtering.html | 4 +- .../docs/reference/ft2-list_processing.html | 4 +- modules/freetype2/docs/reference/ft2-lzw.html | 4 +- .../docs/reference/ft2-mac_specific.html | 4 +- .../docs/reference/ft2-module_management.html | 55 +- .../docs/reference/ft2-multiple_masters.html | 4 +- .../docs/reference/ft2-ot_validation.html | 4 +- .../reference/ft2-outline_processing.html | 4 +- .../docs/reference/ft2-pfr_fonts.html | 4 +- .../docs/reference/ft2-quick_advance.html | 4 +- .../freetype2/docs/reference/ft2-raster.html | 4 +- .../docs/reference/ft2-sfnt_names.html | 4 +- .../docs/reference/ft2-sizes_management.html | 4 +- .../docs/reference/ft2-system_interface.html | 4 +- modules/freetype2/docs/reference/ft2-toc.html | 6 +- .../docs/reference/ft2-truetype_engine.html | 4 +- .../docs/reference/ft2-truetype_tables.html | 4 +- .../docs/reference/ft2-type1_tables.html | 4 +- .../docs/reference/ft2-user_allocation.html | 4 +- .../freetype2/docs/reference/ft2-version.html | 6 +- .../docs/reference/ft2-winfnt_fonts.html | 4 +- .../include/freetype/config/ftconfig.h | 2 +- modules/freetype2/include/freetype/freetype.h | 36 +- modules/freetype2/include/freetype/ftcache.h | 7 +- modules/freetype2/include/freetype/ftimage.h | 12 + modules/freetype2/include/freetype/ftlcdfil.h | 2 +- modules/freetype2/include/freetype/ftmodapi.h | 35 ++ .../include/freetype/internal/ftobjs.h | 31 +- modules/freetype2/src/autofit/aflatin.c | 23 +- modules/freetype2/src/base/ftobjs.c | 132 +++-- modules/freetype2/src/base/ftstream.c | 2 +- modules/freetype2/src/base/ftsynth.c | 4 +- modules/freetype2/src/cache/ftccache.c | 2 +- modules/freetype2/src/cache/ftcsbits.c | 4 + modules/freetype2/src/cff/cffgload.c | 90 ++-- modules/freetype2/src/cff/cffload.c | 54 +- modules/freetype2/src/cff/cffobjs.c | 2 +- modules/freetype2/src/cid/cidgload.c | 3 +- modules/freetype2/src/pshinter/pshalgo.c | 4 +- modules/freetype2/src/raster/ftraster.c | 12 +- modules/freetype2/src/sfnt/ttload.c | 4 +- modules/freetype2/src/sfnt/ttpost.c | 59 ++- modules/freetype2/src/smooth/ftgrays.c | 267 +++++----- modules/freetype2/src/smooth/ftsmooth.c | 24 +- modules/freetype2/src/truetype/ttgload.c | 3 + modules/freetype2/src/truetype/ttinterp.c | 123 +++-- modules/freetype2/src/truetype/ttinterp.h | 2 +- modules/freetype2/src/truetype/ttobjs.c | 16 +- modules/freetype2/src/truetype/ttpload.c | 20 + modules/freetype2/src/type42/t42parse.c | 13 +- modules/freetype2/src/winfonts/winfnt.c | 14 +- 99 files changed, 1817 insertions(+), 936 deletions(-) mode change 100644 => 100755 modules/freetype2/configure create mode 100644 modules/freetype2/docs/reference/.gitignore diff --git a/modules/freetype2/ChangeLog b/modules/freetype2/ChangeLog index 72d7dd7e628..a69b7795893 100644 --- a/modules/freetype2/ChangeLog +++ b/modules/freetype2/ChangeLog @@ -1,3 +1,431 @@ +2010-10-03 Werner Lemberg + + * Version 2.4.3 released. + ========================= + + + Tag sources with `VER-2-4-3'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.3 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.2/2.4.3/, s/242/243/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. + + * builds/unix/configure.raw (version_info): Set to 12:1:6. + +2010-10-03 Werner Lemberg + + Avoid `configure' issues with symbolic links. + Based on a patch from Alexander Stohr . + + * configure: Compare directories using `ls -id'. + Check existence of `reference' subdirectory before creating it. + +2010-10-02 Werner Lemberg + + Fix Savannah bug #31088 (sort of). + + * src/sfnt/ttload.c (tt_face_load_maxp): Always allocate at least 64 + function entries. + +2010-10-02 Werner Lemberg + + [smooth] Fix splitting of cubics for negative values. + + Reported by Róbert Márki ; see + http://lists.gnu.org/archive/html/freetype/2010-09/msg00019.html. + + * src/smooth/ftgrays.c (gray_render_cubic): Fix thinko. + +2010-10-01 suzuki toshiya + + Fix Savannah bug #31040. + + * src/truetype/ttinterp.c (free_buffer_in_size): Remove. + (TT_RunIns): Updated. + +2010-09-20 suzuki toshiya + + [sfnt] Make error message filling NULL names less verbose. + + * src/sfnt/ttpost.c (load_format_20): Showing 1 summary message + when we fill `post' names by NULL, instead of per-entry message. + +2010-09-20 Graham Asher + David Bevan + + [smooth] Fix and improve spline flattening. + + This fixes the flattening of cubic, S-shaped curves and speeds up + the handling of both the conic and cubic arcs. + + See the discussions on the freetype-devel mailing list in late + August and September 2010 for details. + + * src/smooth/ftgrays.c (FT_MAX_CURVE_DEVIATION): New macro. + (TWorker): Remove `conic_level' and `cubic_level' elements. + (gray_render_conic): Simplify algorithm. + (gray_render_cubic): New algorithm; details are given in the code + comments. + (gray_convert_glyph): Remove heuristics. + +2010-09-19 Werner Lemberg + + Minor fixes. + + * src/cff/cffload.c (cff_charset_compute_cids): `charset->sids[i]' + is `FT_UShort'. + (cff_index_access_element): Don't use additions in comparison. + * src/sfnt/ttpost.c (load_format_20): Make `post_limit' of type + `FT_Long'. + Don't use additions in comparison. + Improve tracing messages. + (load_format_25, load_post_names): Make `post_limit' of type + `FT_Long'. + +2010-09-19 suzuki toshiya + + [cff] Truncate the element length at the end of the stream. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_index_access_element): `off2', the offset + to the next element is truncated at the end of the stream to prevent + invalid I/O. As `off1', the offset to the requested element has + been checked by FT_STREAM_SEEK(), `off2' should be checked + similarly. + +2010-09-19 suzuki toshiya + + [cff] Ignore CID > 0xFFFFU. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_compute_cids): Ignore CID if + greater than 0xFFFFU. CFF font spec does not mention maximum CID in + the font, but PostScript and PDF spec define that maximum CID is + 0xFFFFU. + +2010-09-19 suzuki toshiya + + [cff] Make trace message in cff_charset_load() verbose. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_load): Report the original `nleft' + and truncated `nleft'. + +2010-09-19 suzuki toshiya + + [cff] Correct `max_cid' from CID array length to max CID. + See Savannah bug #30975. + + * src/cff/cffload.c (cff_charset_compute_cids): Don't increment + max_cid after detecting max CID. The array CFF_Charset->cids is + allocated by max_cid + 1. + (cff_charset_cid_to_gindex): Permit CID is less than or equal to + CFF_Charset->max_cid. + * src/cff/cffobjs.c (cff_face_init): FT_Face->num_glyphs is + calculated as CFF_Charset->max_cid + 1. + +2010-09-19 suzuki toshiya + + [truetype] Sanitize the broken offsets in `loca'. + See Savannah bug #31040. + + * src/truetype/ttpload.c (tt_face_get_location): If `pos1', the + offset to the requested entry in `glyf' exceeds the end of the + table, return offset=0, length=0. If `pos2', the offset to the next + entry in `glyf' exceeds the end of the table, truncate the entry + length at the end of `glyf' table. + +2010-09-19 suzuki toshiya + + [sfnt] Prevent overrunning in `post' table parser. + See Savannah bug #31040. + + * src/sfnt/ttpost.c (load_post_names): Get the length of `post' + table and pass the limit of `post' table to load_format_20() and + load_format_25(). + (load_format_20): Stop the parsing when we reached at the limit of + `post' table. If more glyph names are required, they are filled by + NULL names. + +2010-09-17 suzuki toshiya + + [truetype] Don't duplicate size->twilight structure to be freed. + See Savannah bug #31040 for detail. + + * src/truetype/ttinterp.c (free_buffer_in_size): Don't duplicate + FT_GlyphZoneRec size->twilight to be freed. If duplicated, + FT_FREE() erases the duplicated pointers only and leave original + pointers. They can cause the double-free crash when the burst + errors occur in TrueType interpreter and free_buffer_in_size() is + invoked repeatedly. + +2010-09-15 Werner Lemberg + + Make bytecode debugging with FontForge work again. + + * src/truetype/ttinterp.c (TT_RunIns): Don't call + `free_buffer_in_size' in case of error if a debugger is active. + +2010-09-14 Werner Lemberg + + Improve tracing messages. + + * src/truetype/ttinterp.c (TT_RunIns): Improve wording of tracing + message. + * src/truetype/ttobjs.c (tt_size_run_fpgm, tt_size_run_prep): Add + tracing message. + * src/truetype/ttgload.c (tt_loader_init): Add tracing message. + * src/cache/ftcsbits.c (ftc_snode_load): Emit tracing message if + glyph doesn't fit into a small bitmap container. + +2010-09-13 Werner Lemberg + + Fix minor issues reported by . + + * src/autofit/aflatin.c (af_latin_compute_stem_width): Remove + redundant conditional check. + * src/base/ftsynth.c (FT_GlyphSlot_Embolden): Ditto. + * src/cff/cffload.c (cff_encoding_load): Remove conditional check + which always evaluates to `true'. + * src/pshinter/pshalgo.c (ps_glyph_interpolate_strong_points): + Ditto. + * src/truetype/ttinterp.c (Ins_IUP): Ditto. + * src/cid/cidgload.c (cid_slot_load_glyph): Don't check for NULL if + value is already dereferenced. + * src/winfonts/winfnt.c (FNT_Load_Glyph): Fix check of `face'. + +2010-08-31 suzuki toshiya + + Ignore the environmental setting of LIBTOOL. + Patch is suggested by Adrian Bunk, to prevent unexpected + reflection of environmental LIBTOOL. See: + http://savannah.nongnu.org/patch/?7290 + + * builds/unix/unix-cc.in: LIBTOOL is unconditionally set to + $(FT_LIBTOOL_DIR)/libtool. FT_LIBTOOL_DIR is set to $(BUILD_DIR) + by default. + * configure: When configured for the building out of source tee, + FT_LIBTOOL_DIR is set to $(OBJ_DIR). + +2010-08-31 suzuki toshiya + + [truetype] Decrease the trace level catching the interpreter error. + + * src/truetype/ttinterp.c (TT_RunIns): Decrease the trace level + showing the error when the interpreter returns with an error, + from FT_TRACE7() to FT_TRACE1(). + +2010-08-30 suzuki toshiya + + [truetype] Prevent bytecode reuse after the interpretation error. + + * src/truetype/ttinterp.c (free_buffer_in_size): New function to + free the buffer allocated during the interpretation of this glyph. + (TT_RunIns): Unset FT_Face->size->{cvt_ready,bytecode_ready} if + an error occurs in the bytecode interpretation. The interpretation + of invalid bytecode may break the function definitions and referring + them in later interpretation is danger. By unsetting these flags, + `fpgm' and `prep' tables are executed again in next interpretation. + + This fixes Savannah bug #30798, reported by Robert Święcki. + +2010-08-29 Werner Lemberg + + [ftraster] Pacify compiler. + + * src/raster/ftraster.c (ft_black_new) [_STANDALONE_]: `memory' is + not used. + +2010-08-29 Werner Lemberg + + [cff] Allow SIDs >= 65000. + + * src/cff/cffload.c (cff_charset_load): Fix change from 2009-03-20: + The threshold for SIDs is not applicable here. I misinterpreted the + `SID values 65000 and above are available for implementation use' + sentence in the CFF specification. + + Problem reported by Ivan Ninčić . + +2010-08-28 suzuki toshiya + + Force hinting when the font lacks its familyname. + + In Type42 or Type11 font embedded in PostScript & PDF, TrueType sfnt + stream may lack `name' table because they are not required. Hinting + for nameless fonts is safer for PDFs including embedded Chinese + fonts. Written by David Bevan, see: + + http://lists.gnu.org/archive/html/freetype-devel/2010-08/msg00021.html + http://lists.freedesktop.org/archives/poppler/2010-August/006310.html + + * src/truetype/ttobjs.c (tt_check_trickyness): If a NULL pointer by + nameless font is given, TRUE is returned to enable hinting. + +2010-08-28 suzuki toshiya + + Register yet another tricky TrueType font. + + * src/truetype/ttobjs.c (tt_check_trickyness): Add `HuaTianKaiTi?', + a Kaishu typeface paired with `HuaTianSongTi?' by Huatian + Information Industry. + +2010-08-17 Teijo Kinnunen + + Fix Savannah bug #30788. + + * src/cache/ftccache.c (FTC_Cache_Clear): Check `cache->buckets' for + NULL too. + +2010-08-10 Werner Lemberg + + Try to fix Savannah bug #30717 (and probably #30719 too). + + * src/smooth/ftsmooth.c (ft_smooth_render_generic): Add another + overflow test for `width' and `height'. + +2010-08-06 Werner Lemberg + + * Version 2.4.2 released. + ========================= + + + Tag sources with `VER-2-4-2'. + + * docs/CHANGES: Updated. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.4.2 + + * README, Jamfile (RefDoc), + builds/win32/vc2005/freetype.vcproj, builds/win32/vc2005/index.html, + builds/win32/vc2008/freetype.vcproj, builds/win32/vc2008/index.html, + builds/win32/visualc/freetype.dsp, + builds/win32/visualc/freetype.vcproj, + builds/win32/visualc/index.html, builds/win32/visualce/freetype.dsp, + builds/win32/visualce/freetype.vcproj, + builds/win32/visualce/index.html, + builds/wince/vc2005-ce/freetype.vcproj, + builds/wince/vc2005-ce/index.html, + builds/wince/vc2008-ce/freetype.vcproj, + builds/wince/vc2008-ce/index.html: s/2.4.1/2.4.2/, s/241/242/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. + + * builds/unix/configure.raw (version_info): Set to 12:0:6. + +2010-08-06 suzuki toshiya + + Fix Savannah bug #30648. + + * src/base/ftobjs.c (FT_Done_Library): Specify the order of font + drivers during the face closing process. Type42 faces should be + closed before TrueType faces, because a Type42 face refers to + another internal TrueType face which is created from sfnt[] array on + the memory. + +2010-08-06 Yuriy Kaminskiy + + [raster] Fix valgrind warning. + + * src/raster/ftraster.c (Decompose_Curve) : Access point[0] + only if we don't hit `limit'. + +2010-08-06 suzuki toshiya + + Fix Savannah bug #30658. + + * src/base/ftobjs.c (Mac_Read_POST_Resource): Check that the total + length of collected POST segments does not overrun the allocated + buffer. + +2010-08-06 Yuriy Kaminskiy + + Fix conditional usage of FT_MulFix_i386. + With -ansi flag, gcc does not define `i386', only `__i386__'. + + * include/freetype/config/ftconfig.h, builds/unix/ftconfig.in: + s/i386/__i386__/. + +2010-08-05 Werner Lemberg + + Fix Savannah bug #30657. + + * src/truetype/ttinterp.c (BOUNDSL): New macro. + Change `BOUNDS' to `BOUNDSL' where appropriate. + + * src/truetype/ttinterp.h (TT_ExecContextRec): Fix type of + `cvtSize'. + +2010-08-05 Werner Lemberg + + Fix Savannah bug #30656. + + * src/type42/t42parse.c (t42_parse_sfnts): Protect against negative + string_size. + Fix comparison. + +2010-08-05 suzuki toshiya + + [cff] Don't use any values in decoder after parsing error. + + * src/cff/cffgload.c (cff_slot_load): Skip the evaluations + of the values in decoder, if cff_decoder_parse_charstrings() + returns any error. + +2010-08-04 Werner Lemberg + + Fix Savannah bug #30644. + + * src/base/ftstream.c (FT_Stream_EnterFrame): Fix comparison. + +2010-08-04 Werner Lemberg + + `make devel' fails if FT_CONFIG_OPTION_OLD_INTERNALS is set. + + * devel/ftoption.h: Synchronize with + include/freetype/config/ftoption.h. + +2010-08-04 suzuki toshiya + + [cff] Improve stack overflow test. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Check stack + after execution of operations too. + +2010-07-18 Werner Lemberg + + Add reference counters and to FT_Library and FT_Face objects. + + * include/freetype/freetype.h (FT_Reference_Face): New function. + * include/freetype/ftmodapi.h (FT_Rererence_Library): New function. + + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec, + FT_LibraryRec): New field `refcount'. + + * src/base/ftobjs.c (FT_Open_Face, FT_New_Library): Handle + `refcount'. + (FT_Reference_Face, FT_Reference_Library): Implement new functions. + (FT_Done_Face, FT_Done_Library): Handle `refcount'. + + * docs/CHANGES: Updated. + 2010-07-18 Werner Lemberg * Version 2.4.1 released. @@ -283,7 +711,7 @@ * src/base/ftobjs.c (Mac_Read_POST_Resource): Check `rlen', the length of fragment declared in the POST fragment header, and prevent an underflow in length calculation. Some fonts set the length to - zero in spite of the existence of a following 16bit `type'. + zero in spite of the existence of a following 16bit `type'. Reported by Robert Święcki. 2010-07-01 suzuki toshiya diff --git a/modules/freetype2/ChangeLog.23 b/modules/freetype2/ChangeLog.23 index 83a7d53c6d4..bc46c84a044 100644 --- a/modules/freetype2/ChangeLog.23 +++ b/modules/freetype2/ChangeLog.23 @@ -113,7 +113,7 @@ * include/freetype/ftsnames.h (FT_PARAM_TAG_IGNORE_PREFERRED_FAMILY, FT_PARAM_TAG_IGNORE_PREFERRED_SUBFAMILY): Define. - * src/sfnt/sfobjs.h (sfnt_load_face): Check the arguments and + * src/sfnt/sfobjs.c (sfnt_load_face): Check the arguments and ignore preferred family and subfamily names if requested. 2010-01-27 Ken Sharp @@ -4525,7 +4525,7 @@ rasterizer. * include/freetype/ftimage.h (FT_OUTLINE_SMART_DROPOUTS, - FT_OUTLINE_EXCLUDE_STUBS): New flags for for FT_Outline. + FT_OUTLINE_EXCLUDE_STUBS): New flags for FT_Outline. * src/raster/ftraster.c (Vertical_Sweep_Drop, Horizontal_Sweep_Drop, Horizontal_Gray_Sweep_Drop): Use same mode numbers as given in the diff --git a/modules/freetype2/Jamfile b/modules/freetype2/Jamfile index 9276de42ca4..bea731f8c5f 100644 --- a/modules/freetype2/Jamfile +++ b/modules/freetype2/Jamfile @@ -194,7 +194,7 @@ rule RefDoc actions RefDoc { - python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.1 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h + python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 --title=FreeType-2.4.3 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h } RefDoc refdoc ; diff --git a/modules/freetype2/README b/modules/freetype2/README index f4efb0ab188..ffd9dc04ade 100644 --- a/modules/freetype2/README +++ b/modules/freetype2/README @@ -9,7 +9,7 @@ is called `libttf'. They are *not* compatible! - FreeType 2.4.1 + FreeType 2.4.3 ============== Please read the docs/CHANGES file, it contains IMPORTANT @@ -26,9 +26,9 @@ and download one of the following files. - freetype-doc-2.4.1.tar.bz2 - freetype-doc-2.4.1.tar.gz - ftdoc241.zip + freetype-doc-2.4.3.tar.bz2 + freetype-doc-2.4.3.tar.gz + ftdoc243.zip Bugs diff --git a/modules/freetype2/README.moz-patches b/modules/freetype2/README.moz-patches index fa7d37d1bc9..3a819666d96 100644 --- a/modules/freetype2/README.moz-patches +++ b/modules/freetype2/README.moz-patches @@ -1,4 +1,4 @@ -This directory contains freetype2 v2.4.1 downloaded from +This directory contains freetype2 v2.4.3 downloaded from http://savannah.nongnu.org/download/freetype/ Makefile.in is added for the mozilla build. diff --git a/modules/freetype2/builds/unix/config.guess b/modules/freetype2/builds/unix/config.guess index 115f944a61d..4c8f032e786 100644 --- a/modules/freetype2/builds/unix/config.guess +++ b/modules/freetype2/builds/unix/config.guess @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-04-03' +timestamp='2010-09-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -552,7 +552,7 @@ EOF echo rs6000-ibm-aix3.2 fi exit ;; - *:AIX:*:[456]) + *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 @@ -968,6 +968,9 @@ EOF sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; + tile*:Linux:*:*) + echo ${UNAME_MACHINE}-tilera-linux-gnu + exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; @@ -1231,6 +1234,9 @@ EOF *:QNX:*:4*) echo i386-pc-qnx exit ;; + NEO-?:NONSTOP_KERNEL:*:*) + echo neo-tandem-nsk${UNAME_RELEASE} + exit ;; NSE-?:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk${UNAME_RELEASE} exit ;; diff --git a/modules/freetype2/builds/unix/config.sub b/modules/freetype2/builds/unix/config.sub index 204218c0738..320e3038811 100644 --- a/modules/freetype2/builds/unix/config.sub +++ b/modules/freetype2/builds/unix/config.sub @@ -4,7 +4,7 @@ # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Free Software Foundation, Inc. -timestamp='2010-05-21' +timestamp='2010-09-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -283,6 +283,7 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ | or32 \ @@ -378,6 +379,7 @@ case $basic_machine in | mmix-* \ | mt-* \ | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -860,6 +862,12 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; nsr-tandem) basic_machine=nsr-tandem ;; diff --git a/modules/freetype2/builds/unix/configure b/modules/freetype2/builds/unix/configure index e04d6d9bfb6..dccd6062132 100755 --- a/modules/freetype2/builds/unix/configure +++ b/modules/freetype2/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for FreeType 2.4.1. +# Generated by GNU Autoconf 2.65 for FreeType 2.4.3. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.4.1' -PACKAGE_STRING='FreeType 2.4.1' +PACKAGE_VERSION='2.4.3' +PACKAGE_STRING='FreeType 2.4.3' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.4.1 to adapt to many kinds of systems. +\`configure' configures FreeType 2.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1474,7 +1474,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.4.1:";; + short | recursive ) echo "Configuration of FreeType 2.4.3:";; esac cat <<\_ACEOF @@ -1585,7 +1585,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.4.1 +FreeType configure 2.4.3 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2173,7 +2173,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.4.1, which was +It was created by FreeType $as_me 2.4.3, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2528,7 +2528,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:1:6' ft_version=`echo $version_info | tr : .` @@ -12318,7 +12318,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.4.1, which was +This file was extended by FreeType $as_me 2.4.3, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12384,7 +12384,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeType config.status 2.4.1 +FreeType config.status 2.4.3 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" diff --git a/modules/freetype2/builds/unix/configure.ac b/modules/freetype2/builds/unix/configure.ac index 1a237d5e2f9..93c970cbe64 100644 --- a/modules/freetype2/builds/unix/configure.ac +++ b/modules/freetype2/builds/unix/configure.ac @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.4.1], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.4.3], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:1:6' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/modules/freetype2/builds/unix/configure.raw b/modules/freetype2/builds/unix/configure.raw index 4ef9521d706..674aad441a1 100644 --- a/modules/freetype2/builds/unix/configure.raw +++ b/modules/freetype2/builds/unix/configure.raw @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='11:1:5' +version_info='12:1:6' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/modules/freetype2/builds/unix/ftconfig.in b/modules/freetype2/builds/unix/ftconfig.in index c5e4e46b40a..4c81187e50e 100644 --- a/modules/freetype2/builds/unix/ftconfig.in +++ b/modules/freetype2/builds/unix/ftconfig.in @@ -313,7 +313,7 @@ FT_BEGIN_HEADER #endif /* __arm__ && !__thumb__ */ -#if defined( i386 ) +#if defined( __i386__ ) #define FT_MULFIX_ASSEMBLER FT_MulFix_i386 static __inline__ FT_Int32 diff --git a/modules/freetype2/builds/unix/unix-cc.in b/modules/freetype2/builds/unix/unix-cc.in index 9c6d5de6e54..b84bc5d27b1 100644 --- a/modules/freetype2/builds/unix/unix-cc.in +++ b/modules/freetype2/builds/unix/unix-cc.in @@ -14,8 +14,9 @@ CC := @CC@ COMPILER_SEP := $(SEP) +FT_LIBTOOL_DIR ?= $(BUILD_DIR) -LIBTOOL ?= $(BUILD_DIR)/libtool +LIBTOOL := $(FT_LIBTOOL_DIR)/libtool # The object file extension (for standard and static libraries). This can be diff --git a/modules/freetype2/builds/win32/vc2005/freetype.vcproj b/modules/freetype2/builds/win32/vc2005/freetype.vcproj index cfed996b8d9..e12f35d62f0 100644 --- a/modules/freetype2/builds/win32/vc2005/freetype.vcproj +++ b/modules/freetype2/builds/win32/vc2005/freetype.vcproj @@ -16,7 +16,7 @@ - + @@ -33,7 +33,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -67,7 +67,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -101,7 +101,7 @@ - + diff --git a/modules/freetype2/builds/win32/vc2005/index.html b/modules/freetype2/builds/win32/vc2005/index.html index 446a63ef68c..6e00587f061 100644 --- a/modules/freetype2/builds/win32/vc2005/index.html +++ b/modules/freetype2/builds/win32/vc2005/index.html @@ -11,14 +11,14 @@

This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.3 sources:

    -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/win32/vc2008/freetype.vcproj b/modules/freetype2/builds/win32/vc2008/freetype.vcproj index d5a6577b718..e4dbdc1dafb 100644 --- a/modules/freetype2/builds/win32/vc2008/freetype.vcproj +++ b/modules/freetype2/builds/win32/vc2008/freetype.vcproj @@ -70,7 +70,7 @@ /> This directory contains project files for Visual C++, named freetype.vcproj, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.3 sources:

    -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/win32/visualc/freetype.dsp b/modules/freetype2/builds/win32/visualc/freetype.dsp index 86a8444dacf..3b7e6356173 100644 --- a/modules/freetype2/builds/win32/visualc/freetype.dsp +++ b/modules/freetype2/builds/win32/visualc/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype243_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype243.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype241ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype243ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243ST_D.lib" !ENDIF diff --git a/modules/freetype2/builds/win32/visualc/freetype.vcproj b/modules/freetype2/builds/win32/visualc/freetype.vcproj index c144bfc36de..5a0a8ef7777 100644 --- a/modules/freetype2/builds/win32/visualc/freetype.vcproj +++ b/modules/freetype2/builds/win32/visualc/freetype.vcproj @@ -69,7 +69,7 @@ /> This directory contains project files for Visual C++, named freetype.dsp, and Visual Studio, called freetype.sln. It -compiles the following libraries from the FreeType 2.4.1 sources:

+compiles the following libraries from the FreeType 2.4.3 sources:

    -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/win32/visualce/freetype.dsp b/modules/freetype2/builds/win32/visualce/freetype.dsp index 86a8444dacf..3b7e6356173 100644 --- a/modules/freetype2/builds/win32/visualce/freetype.dsp +++ b/modules/freetype2/builds/win32/visualce/freetype.dsp @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug" @@ -78,7 +78,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Debug Multithreaded" @@ -102,8 +102,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype243_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT_D.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Multithreaded" @@ -126,8 +126,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"lib\freetype241.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype243.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243MT.lib" !ELSEIF "$(CFG)" == "freetype - Win32 Release Singlethreaded" @@ -151,8 +151,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype241ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype243ST.lib" # SUBTRACT LIB32 /nologo !ELSEIF "$(CFG)" == "freetype - Win32 Debug Singlethreaded" @@ -177,8 +177,8 @@ BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo LIB32=link.exe -lib -# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype241_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype241ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype243_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype243ST_D.lib" !ENDIF diff --git a/modules/freetype2/builds/win32/visualce/freetype.vcproj b/modules/freetype2/builds/win32/visualce/freetype.vcproj index be58cd8ba1b..3374ac54cc2 100644 --- a/modules/freetype2/builds/win32/visualce/freetype.vcproj +++ b/modules/freetype2/builds/win32/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.1 sources:

+It compiles the following libraries from the FreeType 2.4.3 sources:

    -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
    + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj b/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj index 4a1fdb21dc6..ce1ed73000d 100644 --- a/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj +++ b/modules/freetype2/builds/wince/vc2005-ce/freetype.vcproj @@ -21,7 +21,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -221,7 +221,7 @@ - + @@ -241,7 +241,7 @@ - + @@ -261,7 +261,7 @@ - + @@ -281,7 +281,7 @@ - + @@ -301,7 +301,7 @@ - + @@ -321,7 +321,7 @@ - + @@ -341,7 +341,7 @@ - + @@ -361,7 +361,7 @@ - + @@ -381,7 +381,7 @@ - + @@ -401,7 +401,7 @@ - + @@ -421,7 +421,7 @@ - + @@ -441,7 +441,7 @@ - + @@ -461,7 +461,7 @@ - + @@ -481,7 +481,7 @@ - + @@ -501,7 +501,7 @@ - + @@ -521,7 +521,7 @@ - + @@ -541,7 +541,7 @@ - + @@ -561,7 +561,7 @@ - + @@ -581,7 +581,7 @@ - + @@ -601,7 +601,7 @@ - + @@ -621,7 +621,7 @@ - + @@ -641,7 +641,7 @@ - + @@ -661,7 +661,7 @@ - + @@ -681,7 +681,7 @@ - + @@ -701,7 +701,7 @@ - + @@ -721,7 +721,7 @@ - + @@ -741,7 +741,7 @@ - + @@ -758,7 +758,7 @@ - + diff --git a/modules/freetype2/builds/wince/vc2005-ce/index.html b/modules/freetype2/builds/wince/vc2005-ce/index.html index c3e69209587..12864114fa2 100644 --- a/modules/freetype2/builds/wince/vc2005-ce/index.html +++ b/modules/freetype2/builds/wince/vc2005-ce/index.html @@ -21,14 +21,14 @@ the following targets:

  • PPC/SP WM6 (Windows Mobile 6)
    • -It compiles the following libraries from the FreeType 2.4.1 sources:

    +It compiles the following libraries from the FreeType 2.4.3 sources:

      -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
      + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj b/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj index 76b63876d00..e4c891bffcd 100644 --- a/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj +++ b/modules/freetype2/builds/wince/vc2008-ce/freetype.vcproj @@ -88,7 +88,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.4.1 sources:

    +It compiles the following libraries from the FreeType 2.4.3 sources:

      -    freetype241.lib     - release build; single threaded
-    freetype241_D.lib   - debug build;   single threaded
-    freetype241MT.lib   - release build; multi-threaded
-    freetype241MT_D.lib - debug build;   multi-threaded
      + freetype243.lib - release build; single threaded + freetype243_D.lib - debug build; single threaded + freetype243MT.lib - release build; multi-threaded + freetype243MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/modules/freetype2/configure b/modules/freetype2/configure old mode 100644 new mode 100755 index 2efa2696797..06fdc8ea7a7 --- a/modules/freetype2/configure +++ b/modules/freetype2/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009 by +# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009, 2010 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -78,10 +78,15 @@ if test $# -gt 0; then done fi -# build a dummy Makefile if we are not building in the source tree +# build a dummy Makefile if we are not building in the source tree; +# we use inodes to avoid issues with symbolic links +inode_src=`ls -id $abs_ft2_dir | sed 's/ .*//'` +inode_dst=`ls -id $abs_curr_dir | sed 's/ .*//'` -if test "$abs_curr_dir" != "$abs_ft2_dir"; then - mkdir reference +if test $inode_src -ne $inode_dst; then + if test ! -d reference; then + mkdir reference + fi if test ! -r $abs_curr_dir/modules.cfg; then echo "Copying \`modules.cfg'" cp $abs_ft2_dir/modules.cfg $abs_curr_dir @@ -91,7 +96,7 @@ if test "$abs_curr_dir" != "$abs_ft2_dir"; then echo "OBJ_DIR := $abs_curr_dir" >> Makefile echo "OBJ_BUILD := \$(OBJ_DIR)" >> Makefile echo "DOC_DIR := \$(OBJ_DIR)/reference" >> Makefile - echo "LIBTOOL := \$(OBJ_DIR)/libtool" >> Makefile + echo "FT_LIBTOOL_DIR := \$(OBJ_DIR)" >> Makefile echo "ifndef FT2DEMOS" >> Makefile echo " include \$(TOP_DIR)/Makefile" >> Makefile echo "else" >> Makefile diff --git a/modules/freetype2/devel/ftoption.h b/modules/freetype2/devel/ftoption.h index 058601e4cc4..32dd25aa7fd 100644 --- a/modules/freetype2/devel/ftoption.h +++ b/modules/freetype2/devel/ftoption.h @@ -689,7 +689,28 @@ FT_BEGIN_HEADER * is recommended to disable the macro since it reduces the library's code * size and activates a few memory-saving optimizations as well. */ -/* #define FT_CONFIG_OPTION_OLD_INTERNALS */ +#define FT_CONFIG_OPTION_OLD_INTERNALS + + + /* + * To detect legacy cache-lookup call from a rogue client (<= 2.1.7), + * we restrict the number of charmaps in a font. The current API of + * FTC_CMapCache_Lookup() takes cmap_index & charcode, but old API + * takes charcode only. To determine the passed value is for cmap_index + * or charcode, the possible cmap_index is restricted not to exceed + * the minimum possible charcode by a rogue client. It is also very + * unlikely that a rogue client is interested in Unicode values 0 to 15. + * + * NOTE: The original threshold was 4 deduced from popular number of + * cmap subtables in UCS-4 TrueType fonts, but now it is not + * irregular for OpenType fonts to have more than 4 subtables, + * because variation selector subtables are available for Apple + * and Microsoft platforms. + */ + +#ifdef FT_CONFIG_OPTION_OLD_INTERNALS +#define FT_MAX_CHARMAP_CACHEABLE 15 +#endif /* diff --git a/modules/freetype2/docs/CHANGES b/modules/freetype2/docs/CHANGES index cc38a756c42..8e4fb6fa71a 100644 --- a/modules/freetype2/docs/CHANGES +++ b/modules/freetype2/docs/CHANGES @@ -1,4 +1,47 @@ +CHANGES BETWEEN 2.4.2 and 2.4.3 + + I. IMPORTANT BUG FIXES + + - Fix rendering of certain cubic, S-shaped arcs. This regression + has been introduced in version 2.4.0. + + + II. MISCELLANEOUS + + - To fix the above mentioned rendering issue, a new spline + flattening algorithm has been introduced which speeds up both + conic and cubic arcs. + + - Handling of broken fonts has been further improved. + + +====================================================================== + +CHANGES BETWEEN 2.4.1 and 2.4.2 + + I. IMPORTANT BUG FIXES + + - A stack overflow in CFF Type2 CharStrings interpreter is fixed. + + - Handling Type 42 font deallocation was broken; additionally, the + library is now more robust against malformed Type 42 fonts. + + + II. MISCELLANEOUS + + - Two new functions, `FT_Reference_Library' (in FT_MODULE_H) and + `FT_Reference_Face' (in FT_FREETYPE_H), have been added to + simplify life-cycle management. A counter gets initialized to 1 + at the time an FT_Library (or FT_Face) structure is created. + The two new functions increment the respective counter. + `FT_Done_Library' and `FT_Done_Face' then only destroy a library + or face if the counter is 1, otherwise they simply decrement the + counter. + + +====================================================================== + CHANGES BETWEEN 2.4.0 and 2.4.1 I. IMPORTANT CHANGES diff --git a/modules/freetype2/docs/VERSION.DLL b/modules/freetype2/docs/VERSION.DLL index e5877ae6f12..af796c5eedd 100644 --- a/modules/freetype2/docs/VERSION.DLL +++ b/modules/freetype2/docs/VERSION.DLL @@ -53,6 +53,8 @@ systems, but not all of them: release libtool so ------------------------------- + 2.4.3 12.1.6 6.6.1 + 2.4.2 12.0.6 6.6.0 2.4.1 11.1.5 6.5.1 2.4.0 11.0.5 6.5.0 2.3.12 10.0.4 6.4.0 diff --git a/modules/freetype2/docs/reference/.gitignore b/modules/freetype2/docs/reference/.gitignore new file mode 100644 index 00000000000..2d19fc766d9 --- /dev/null +++ b/modules/freetype2/docs/reference/.gitignore @@ -0,0 +1 @@ +*.html diff --git a/modules/freetype2/docs/reference/ft2-base_interface.html b/modules/freetype2/docs/reference/ft2-base_interface.html index b59f6bc48cb..311420629ae 100644 --- a/modules/freetype2/docs/reference/ft2-base_interface.html +++ b/modules/freetype2/docs/reference/ft2-base_interface.html @@ -3,7 +3,7 @@ -FreeType-2.4.1 API Reference +FreeType-2.4.3 API Reference