From ebfdec871f70d27614d93327fe51068e13d81e82 Mon Sep 17 00:00:00 2001 From: dcoppa Date: Sun, 29 May 2016 11:57:09 +0000 Subject: [PATCH] Update to FreeType 2.6.3 ok sthen@, naddy@, matthieu@ --- lib/freetype/CMakeLists.txt | 4 +- lib/freetype/ChangeLog | 828 ++++++++++++++- lib/freetype/ChangeLog.20 | 2 +- lib/freetype/ChangeLog.21 | 2 +- lib/freetype/ChangeLog.22 | 2 +- lib/freetype/ChangeLog.23 | 2 +- lib/freetype/ChangeLog.24 | 2 +- lib/freetype/ChangeLog.25 | 2 +- lib/freetype/Jamfile | 4 +- lib/freetype/Jamrules | 2 +- lib/freetype/Makefile | 4 +- lib/freetype/README | 10 +- lib/freetype/README.git | 2 +- lib/freetype/autogen.sh | 2 +- lib/freetype/builds/amiga/README | 2 +- .../builds/amiga/include/config/ftconfig.h | 2 +- .../builds/amiga/include/config/ftmodule.h | 2 +- lib/freetype/builds/amiga/makefile | 2 +- lib/freetype/builds/amiga/makefile.os4 | 2 +- lib/freetype/builds/amiga/smakefile | 2 +- lib/freetype/builds/amiga/src/base/ftdebug.c | 2 +- lib/freetype/builds/amiga/src/base/ftsystem.c | 2 +- lib/freetype/builds/ansi/ansi-def.mk | 2 +- lib/freetype/builds/ansi/ansi.mk | 2 +- lib/freetype/builds/atari/ATARI.H | 2 +- lib/freetype/builds/atari/README.TXT | 8 +- lib/freetype/builds/beos/beos-def.mk | 2 +- lib/freetype/builds/beos/beos.mk | 2 +- lib/freetype/builds/beos/detect.mk | 2 +- lib/freetype/builds/cmake/iOS.cmake | 2 +- lib/freetype/builds/cmake/testbuild.sh | 2 +- lib/freetype/builds/compiler/ansi-cc.mk | 2 +- lib/freetype/builds/compiler/bcc-dev.mk | 2 +- lib/freetype/builds/compiler/bcc.mk | 2 +- lib/freetype/builds/compiler/emx.mk | 2 +- lib/freetype/builds/compiler/gcc-dev.mk | 2 +- lib/freetype/builds/compiler/gcc.mk | 2 +- lib/freetype/builds/compiler/intelc.mk | 2 +- lib/freetype/builds/compiler/unix-lcc.mk | 2 +- lib/freetype/builds/compiler/visualage.mk | 2 +- lib/freetype/builds/compiler/visualc.mk | 2 +- lib/freetype/builds/compiler/watcom.mk | 2 +- lib/freetype/builds/compiler/win-lcc.mk | 2 +- lib/freetype/builds/detect.mk | 2 +- lib/freetype/builds/dos/detect.mk | 2 +- lib/freetype/builds/dos/dos-def.mk | 2 +- lib/freetype/builds/dos/dos-emx.mk | 2 +- lib/freetype/builds/dos/dos-gcc.mk | 2 +- lib/freetype/builds/dos/dos-wat.mk | 2 +- lib/freetype/builds/exports.mk | 2 +- lib/freetype/builds/freetype.mk | 2 +- lib/freetype/builds/link_dos.mk | 2 +- lib/freetype/builds/link_std.mk | 2 +- lib/freetype/builds/mac/ftmac.c | 2 +- lib/freetype/builds/modules.mk | 2 +- lib/freetype/builds/os2/detect.mk | 2 +- lib/freetype/builds/os2/os2-def.mk | 2 +- lib/freetype/builds/os2/os2-dev.mk | 2 +- lib/freetype/builds/os2/os2-gcc.mk | 2 +- lib/freetype/builds/symbian/bld.inf | 2 +- lib/freetype/builds/symbian/freetype.mmp | 2 +- lib/freetype/builds/toplevel.mk | 2 +- lib/freetype/builds/unix/config.guess | 19 +- lib/freetype/builds/unix/config.sub | 18 +- lib/freetype/builds/unix/configure | 20 +- lib/freetype/builds/unix/configure.ac | 6 +- lib/freetype/builds/unix/configure.raw | 4 +- lib/freetype/builds/unix/detect.mk | 2 +- lib/freetype/builds/unix/freetype-config.in | 2 +- lib/freetype/builds/unix/freetype2.m4 | 2 +- lib/freetype/builds/unix/ft-munmap.m4 | 2 +- lib/freetype/builds/unix/ftconfig.h | 18 +- lib/freetype/builds/unix/ftconfig.in | 18 +- lib/freetype/builds/unix/ftsystem.c | 2 +- lib/freetype/builds/unix/install.mk | 5 +- lib/freetype/builds/unix/unix-cc.in | 2 +- lib/freetype/builds/unix/unix-def.in | 4 +- lib/freetype/builds/unix/unix-dev.mk | 2 +- lib/freetype/builds/unix/unix-lcc.mk | 2 +- lib/freetype/builds/unix/unix.mk | 2 +- lib/freetype/builds/unix/unixddef.mk | 2 +- lib/freetype/builds/vms/ftconfig.h | 18 +- lib/freetype/builds/vms/ftsystem.c | 2 +- lib/freetype/builds/wince/ftdebug.c | 2 +- .../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 +- lib/freetype/builds/windows/detect.mk | 2 +- lib/freetype/builds/windows/ftdebug.c | 2 +- .../builds/windows/vc2005/freetype.vcproj | 12 +- lib/freetype/builds/windows/vc2005/index.html | 10 +- .../builds/windows/vc2008/freetype.vcproj | 12 +- lib/freetype/builds/windows/vc2008/index.html | 10 +- .../builds/windows/vc2010/freetype.vcxproj | 24 +- lib/freetype/builds/windows/vc2010/index.html | 14 +- .../builds/windows/visualc/freetype.dsp | 20 +- .../builds/windows/visualc/freetype.vcproj | 12 +- .../builds/windows/visualc/index.html | 10 +- .../builds/windows/visualce/freetype.dsp | 20 +- .../builds/windows/visualce/freetype.vcproj | 84 +- .../builds/windows/visualce/index.html | 10 +- lib/freetype/builds/windows/w32-bcc.mk | 2 +- lib/freetype/builds/windows/w32-bccd.mk | 2 +- lib/freetype/builds/windows/w32-dev.mk | 2 +- lib/freetype/builds/windows/w32-gcc.mk | 2 +- lib/freetype/builds/windows/w32-icc.mk | 2 +- lib/freetype/builds/windows/w32-intl.mk | 2 +- lib/freetype/builds/windows/w32-lcc.mk | 2 +- lib/freetype/builds/windows/w32-mingw32.mk | 2 +- lib/freetype/builds/windows/w32-vcc.mk | 2 +- lib/freetype/builds/windows/w32-wat.mk | 2 +- lib/freetype/builds/windows/win32-def.mk | 2 +- lib/freetype/configure | 2 +- lib/freetype/devel/ft2build.h | 8 +- lib/freetype/devel/ftoption.h | 65 +- lib/freetype/docs/CHANGES | 51 +- lib/freetype/docs/CUSTOMIZE | 8 +- lib/freetype/docs/DEBUG | 2 +- lib/freetype/docs/INSTALL | 2 +- lib/freetype/docs/INSTALL.ANY | 2 +- lib/freetype/docs/INSTALL.CROSS | 2 +- lib/freetype/docs/INSTALL.GNU | 2 +- lib/freetype/docs/INSTALL.UNIX | 2 +- lib/freetype/docs/INSTALL.VMS | 2 +- lib/freetype/docs/LICENSE.TXT | 6 +- lib/freetype/docs/TODO | 2 +- lib/freetype/docs/VERSION.DLL | 3 +- lib/freetype/docs/formats.txt | 2 +- lib/freetype/docs/freetype-config.1 | 2 +- lib/freetype/docs/raster.txt | 2 +- .../docs/reference/ft2-auto_hinter.html | 4 +- .../docs/reference/ft2-base_interface.html | 125 ++- .../docs/reference/ft2-basic_types.html | 4 +- .../docs/reference/ft2-bdf_fonts.html | 4 +- .../docs/reference/ft2-bitmap_handling.html | 4 +- lib/freetype/docs/reference/ft2-bzip2.html | 4 +- .../docs/reference/ft2-cache_subsystem.html | 4 +- .../docs/reference/ft2-cff_driver.html | 4 +- .../docs/reference/ft2-cid_fonts.html | 4 +- .../docs/reference/ft2-computations.html | 4 +- .../docs/reference/ft2-error_code_values.html | 4 +- .../reference/ft2-error_enumerations.html | 8 +- .../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 +- lib/freetype/docs/reference/ft2-gzip.html | 4 +- .../reference/ft2-header_file_macros.html | 8 +- .../docs/reference/ft2-header_inclusion.html | 4 +- .../docs/reference/ft2-incremental.html | 4 +- lib/freetype/docs/reference/ft2-index.html | 6 +- .../docs/reference/ft2-lcd_filtering.html | 19 +- .../docs/reference/ft2-list_processing.html | 4 +- lib/freetype/docs/reference/ft2-lzw.html | 4 +- .../docs/reference/ft2-mac_specific.html | 4 +- .../docs/reference/ft2-module_management.html | 4 +- .../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 +- lib/freetype/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 +- lib/freetype/docs/reference/ft2-toc.html | 6 +- .../docs/reference/ft2-truetype_engine.html | 7 +- .../docs/reference/ft2-truetype_tables.html | 7 +- .../docs/reference/ft2-tt_driver.html | 4 +- .../docs/reference/ft2-type1_tables.html | 4 +- .../docs/reference/ft2-user_allocation.html | 4 +- lib/freetype/docs/reference/ft2-version.html | 15 +- .../docs/reference/ft2-winfnt_fonts.html | 4 +- lib/freetype/docs/release | 2 +- .../include/freetype/config/ftconfig.h | 18 +- .../include/freetype/config/ftheader.h | 13 +- .../include/freetype/config/ftoption.h | 65 +- .../include/freetype/config/ftstdlib.h | 11 +- lib/freetype/include/freetype/freetype.h | 62 +- lib/freetype/include/freetype/ftadvanc.h | 8 +- lib/freetype/include/freetype/ftautoh.h | 8 +- lib/freetype/include/freetype/ftbbox.h | 8 +- lib/freetype/include/freetype/ftbdf.h | 8 +- lib/freetype/include/freetype/ftbitmap.h | 8 +- lib/freetype/include/freetype/ftbzip2.h | 8 +- lib/freetype/include/freetype/ftcache.h | 8 +- lib/freetype/include/freetype/ftcffdrv.h | 8 +- lib/freetype/include/freetype/ftcid.h | 8 +- lib/freetype/include/freetype/fterrdef.h | 2 +- lib/freetype/include/freetype/fterrors.h | 22 +- lib/freetype/include/freetype/ftfntfmt.h | 11 +- lib/freetype/include/freetype/ftgasp.h | 8 +- lib/freetype/include/freetype/ftglyph.h | 8 +- lib/freetype/include/freetype/ftgxval.h | 8 +- lib/freetype/include/freetype/ftgzip.h | 8 +- lib/freetype/include/freetype/ftimage.h | 12 +- lib/freetype/include/freetype/ftincrem.h | 8 +- lib/freetype/include/freetype/ftlcdfil.h | 54 +- lib/freetype/include/freetype/ftlist.h | 8 +- lib/freetype/include/freetype/ftlzw.h | 8 +- lib/freetype/include/freetype/ftmac.h | 8 +- lib/freetype/include/freetype/ftmm.h | 8 +- lib/freetype/include/freetype/ftmodapi.h | 15 +- lib/freetype/include/freetype/ftmoderr.h | 10 +- lib/freetype/include/freetype/ftotval.h | 8 +- lib/freetype/include/freetype/ftoutln.h | 8 +- lib/freetype/include/freetype/ftpfr.h | 8 +- lib/freetype/include/freetype/ftrender.h | 8 +- lib/freetype/include/freetype/ftsizes.h | 8 +- lib/freetype/include/freetype/ftsnames.h | 8 +- lib/freetype/include/freetype/ftstroke.h | 8 +- lib/freetype/include/freetype/ftsynth.h | 8 +- lib/freetype/include/freetype/ftsystem.h | 8 +- lib/freetype/include/freetype/fttrigon.h | 8 +- lib/freetype/include/freetype/ftttdrv.h | 8 +- lib/freetype/include/freetype/fttypes.h | 8 +- lib/freetype/include/freetype/ftwinfnt.h | 8 +- .../include/freetype/internal/Makefile | 4 +- .../include/freetype/internal/autohint.h | 8 +- .../include/freetype/internal/ftcalc.h | 8 +- .../include/freetype/internal/ftdebug.h | 8 +- .../include/freetype/internal/ftdriver.h | 8 +- .../include/freetype/internal/ftgloadr.h | 28 +- .../include/freetype/internal/fthash.h | 136 +++ .../include/freetype/internal/ftmemory.h | 8 +- .../include/freetype/internal/ftobjs.h | 22 +- .../include/freetype/internal/ftpic.h | 8 +- .../include/freetype/internal/ftrfork.h | 8 +- .../include/freetype/internal/ftserv.h | 8 +- .../include/freetype/internal/ftstream.h | 8 +- .../include/freetype/internal/fttrace.h | 4 +- .../include/freetype/internal/ftvalid.h | 8 +- .../include/freetype/internal/internal.h | 3 +- .../include/freetype/internal/psaux.h | 10 +- .../include/freetype/internal/pshints.h | 8 +- .../freetype/internal/services/svbdf.h | 8 +- .../freetype/internal/services/svcid.h | 8 +- .../freetype/internal/services/svfntfmt.h | 8 +- .../freetype/internal/services/svgldict.h | 11 +- .../freetype/internal/services/svgxval.h | 8 +- .../freetype/internal/services/svkern.h | 8 +- .../include/freetype/internal/services/svmm.h | 8 +- .../freetype/internal/services/svotval.h | 8 +- .../freetype/internal/services/svpfr.h | 8 +- .../freetype/internal/services/svpostnm.h | 8 +- .../freetype/internal/services/svprop.h | 8 +- .../freetype/internal/services/svpscmap.h | 8 +- .../freetype/internal/services/svpsinfo.h | 8 +- .../freetype/internal/services/svsfnt.h | 8 +- .../freetype/internal/services/svttcmap.h | 8 +- .../freetype/internal/services/svtteng.h | 8 +- .../freetype/internal/services/svttglyf.h | 8 +- .../freetype/internal/services/svwinfnt.h | 8 +- lib/freetype/include/freetype/internal/sfnt.h | 8 +- .../include/freetype/internal/t1types.h | 10 +- .../include/freetype/internal/tttypes.h | 15 +- lib/freetype/include/freetype/t1tables.h | 8 +- lib/freetype/include/freetype/ttnameid.h | 8 +- lib/freetype/include/freetype/tttables.h | 8 +- lib/freetype/include/freetype/tttags.h | 8 +- lib/freetype/include/freetype/ttunpat.h | 19 +- lib/freetype/include/ft2build.h | 8 +- lib/freetype/modules.cfg | 2 +- lib/freetype/src/Jamfile | 2 +- lib/freetype/src/autofit/Jamfile | 4 +- lib/freetype/src/autofit/afangles.c | 2 +- lib/freetype/src/autofit/afblue.c | 219 ++-- lib/freetype/src/autofit/afblue.cin | 2 +- lib/freetype/src/autofit/afblue.dat | 270 +++-- lib/freetype/src/autofit/afblue.h | 217 ++-- lib/freetype/src/autofit/afblue.hin | 70 +- lib/freetype/src/autofit/afcjk.c | 175 ++- lib/freetype/src/autofit/afcjk.h | 8 +- lib/freetype/src/autofit/afcover.h | 2 +- lib/freetype/src/autofit/afdummy.c | 2 +- lib/freetype/src/autofit/afdummy.h | 8 +- lib/freetype/src/autofit/aferrors.h | 11 +- lib/freetype/src/autofit/afglobal.c | 29 +- lib/freetype/src/autofit/afglobal.h | 13 +- lib/freetype/src/autofit/afhints.c | 23 +- lib/freetype/src/autofit/afhints.h | 9 +- lib/freetype/src/autofit/afindic.c | 2 +- lib/freetype/src/autofit/afindic.h | 8 +- lib/freetype/src/autofit/aflatin.c | 995 +++++++++++------- lib/freetype/src/autofit/aflatin.h | 16 +- lib/freetype/src/autofit/aflatin2.c | 4 +- lib/freetype/src/autofit/aflatin2.h | 8 +- lib/freetype/src/autofit/afloader.c | 2 +- lib/freetype/src/autofit/afloader.h | 8 +- lib/freetype/src/autofit/afmodule.c | 2 +- lib/freetype/src/autofit/afmodule.h | 8 +- lib/freetype/src/autofit/afpic.c | 4 +- lib/freetype/src/autofit/afpic.h | 8 +- lib/freetype/src/autofit/afranges.c | 134 ++- lib/freetype/src/autofit/afranges.h | 12 +- lib/freetype/src/autofit/afscript.h | 113 +- .../src/autofit/{hbshim.c => afshaper.c} | 303 ++++-- .../src/autofit/{hbshim.h => afshaper.h} | 42 +- lib/freetype/src/autofit/afstyles.h | 39 +- lib/freetype/src/autofit/aftypes.h | 44 +- lib/freetype/src/autofit/afwarp.c | 4 +- lib/freetype/src/autofit/afwarp.h | 8 +- lib/freetype/src/autofit/afwrtsys.h | 8 +- lib/freetype/src/autofit/autofit.c | 4 +- lib/freetype/src/autofit/module.mk | 2 +- lib/freetype/src/autofit/rules.mk | 6 +- lib/freetype/src/base/Jamfile | 3 +- lib/freetype/src/base/basepic.c | 2 +- lib/freetype/src/base/basepic.h | 8 +- lib/freetype/src/base/ftadvanc.c | 14 +- lib/freetype/src/base/ftapi.c | 2 +- lib/freetype/src/base/ftbase.c | 3 +- lib/freetype/src/base/ftbase.h | 8 +- lib/freetype/src/base/ftbbox.c | 2 +- lib/freetype/src/base/ftbdf.c | 2 +- lib/freetype/src/base/ftbitmap.c | 2 +- lib/freetype/src/base/ftcalc.c | 4 +- lib/freetype/src/base/ftcid.c | 2 +- lib/freetype/src/base/ftdbgmem.c | 5 +- lib/freetype/src/base/ftdebug.c | 2 +- lib/freetype/src/base/ftfntfmt.c | 2 +- lib/freetype/src/base/ftfstype.c | 2 +- lib/freetype/src/base/ftgasp.c | 2 +- lib/freetype/src/base/ftgloadr.c | 2 +- lib/freetype/src/base/ftglyph.c | 2 +- lib/freetype/src/base/ftgxval.c | 2 +- lib/freetype/src/base/fthash.c | 338 ++++++ lib/freetype/src/base/ftinit.c | 2 +- lib/freetype/src/base/ftlcdfil.c | 20 +- lib/freetype/src/base/ftmac.c | 2 +- lib/freetype/src/base/ftmm.c | 2 +- lib/freetype/src/base/ftobjs.c | 15 +- lib/freetype/src/base/ftotval.c | 2 +- lib/freetype/src/base/ftoutln.c | 13 +- lib/freetype/src/base/ftpatent.c | 246 +---- lib/freetype/src/base/ftpfr.c | 2 +- lib/freetype/src/base/ftpic.c | 2 +- lib/freetype/src/base/ftrfork.c | 2 +- lib/freetype/src/base/ftsnames.c | 2 +- lib/freetype/src/base/ftstream.c | 2 +- lib/freetype/src/base/ftstroke.c | 9 +- lib/freetype/src/base/ftsynth.c | 2 +- lib/freetype/src/base/ftsystem.c | 2 +- lib/freetype/src/base/fttrigon.c | 5 +- lib/freetype/src/base/fttype1.c | 2 +- lib/freetype/src/base/ftutil.c | 2 +- lib/freetype/src/base/ftwinfnt.c | 2 +- lib/freetype/src/base/rules.mk | 3 +- lib/freetype/src/bdf/Jamfile | 2 +- lib/freetype/src/bdf/bdf.h | 27 +- lib/freetype/src/bdf/bdfdrivr.h | 6 +- lib/freetype/src/bdf/bdferror.h | 8 +- lib/freetype/src/bdf/bdflib.c | 567 +++------- lib/freetype/src/bzip2/Jamfile | 2 +- lib/freetype/src/bzip2/ftbzip2.c | 4 +- lib/freetype/src/bzip2/rules.mk | 2 +- lib/freetype/src/cache/Jamfile | 2 +- lib/freetype/src/cache/ftcache.c | 2 +- lib/freetype/src/cache/ftcbasic.c | 2 +- lib/freetype/src/cache/ftccache.c | 12 +- lib/freetype/src/cache/ftccache.h | 34 +- lib/freetype/src/cache/ftccback.h | 9 +- lib/freetype/src/cache/ftccmap.c | 4 +- lib/freetype/src/cache/ftcerror.h | 11 +- lib/freetype/src/cache/ftcglyph.c | 4 +- lib/freetype/src/cache/ftcglyph.h | 14 +- lib/freetype/src/cache/ftcimage.c | 4 +- lib/freetype/src/cache/ftcimage.h | 12 +- lib/freetype/src/cache/ftcmanag.c | 14 +- lib/freetype/src/cache/ftcmanag.h | 10 +- lib/freetype/src/cache/ftcmru.c | 2 +- lib/freetype/src/cache/ftcmru.h | 12 +- lib/freetype/src/cache/ftcsbits.c | 6 +- lib/freetype/src/cache/ftcsbits.h | 12 +- lib/freetype/src/cache/rules.mk | 2 +- lib/freetype/src/cff/Jamfile | 2 +- lib/freetype/src/cff/cf2arrst.h | 6 +- lib/freetype/src/cff/cf2blues.h | 6 +- lib/freetype/src/cff/cf2error.h | 8 +- lib/freetype/src/cff/cf2fixed.h | 6 +- lib/freetype/src/cff/cf2font.h | 7 +- lib/freetype/src/cff/cf2ft.h | 6 +- lib/freetype/src/cff/cf2glue.h | 6 +- lib/freetype/src/cff/cf2hints.h | 6 +- lib/freetype/src/cff/cf2intrp.c | 386 +++++-- lib/freetype/src/cff/cf2intrp.h | 6 +- lib/freetype/src/cff/cf2read.h | 6 +- lib/freetype/src/cff/cf2stack.c | 84 +- lib/freetype/src/cff/cf2stack.h | 11 +- lib/freetype/src/cff/cf2types.h | 6 +- lib/freetype/src/cff/cff.c | 2 +- lib/freetype/src/cff/cffcmap.c | 2 +- lib/freetype/src/cff/cffcmap.h | 8 +- lib/freetype/src/cff/cffdrivr.c | 2 +- lib/freetype/src/cff/cffdrivr.h | 8 +- lib/freetype/src/cff/cfferrs.h | 10 +- lib/freetype/src/cff/cffgload.c | 32 +- lib/freetype/src/cff/cffgload.h | 8 +- lib/freetype/src/cff/cffload.c | 6 +- lib/freetype/src/cff/cffload.h | 8 +- lib/freetype/src/cff/cffobjs.c | 5 +- lib/freetype/src/cff/cffobjs.h | 8 +- lib/freetype/src/cff/cffparse.c | 2 +- lib/freetype/src/cff/cffparse.h | 8 +- lib/freetype/src/cff/cffpic.c | 2 +- lib/freetype/src/cff/cffpic.h | 8 +- lib/freetype/src/cff/cfftoken.h | 2 +- lib/freetype/src/cff/cfftypes.h | 8 +- lib/freetype/src/cff/module.mk | 2 +- lib/freetype/src/cff/rules.mk | 2 +- lib/freetype/src/cid/Jamfile | 2 +- lib/freetype/src/cid/ciderrs.h | 10 +- lib/freetype/src/cid/cidgload.c | 9 +- lib/freetype/src/cid/cidgload.h | 8 +- lib/freetype/src/cid/cidload.c | 2 +- lib/freetype/src/cid/cidload.h | 8 +- lib/freetype/src/cid/cidobjs.c | 2 +- lib/freetype/src/cid/cidobjs.h | 8 +- lib/freetype/src/cid/cidparse.c | 2 +- lib/freetype/src/cid/cidparse.h | 8 +- lib/freetype/src/cid/cidriver.c | 2 +- lib/freetype/src/cid/cidriver.h | 8 +- lib/freetype/src/cid/cidtoken.h | 2 +- lib/freetype/src/cid/module.mk | 2 +- lib/freetype/src/cid/rules.mk | 2 +- lib/freetype/src/cid/type1cid.c | 2 +- lib/freetype/src/gxvalid/Jamfile | 2 +- lib/freetype/src/gxvalid/README | 2 +- lib/freetype/src/gxvalid/gxvalid.c | 2 +- lib/freetype/src/gxvalid/gxvalid.h | 8 +- lib/freetype/src/gxvalid/gxvbsln.c | 2 +- lib/freetype/src/gxvalid/gxvcommn.c | 7 +- lib/freetype/src/gxvalid/gxvcommn.h | 8 +- lib/freetype/src/gxvalid/gxverror.h | 10 +- lib/freetype/src/gxvalid/gxvfeat.c | 2 +- lib/freetype/src/gxvalid/gxvfeat.h | 8 +- lib/freetype/src/gxvalid/gxvfgen.c | 2 +- lib/freetype/src/gxvalid/gxvjust.c | 2 +- lib/freetype/src/gxvalid/gxvkern.c | 2 +- lib/freetype/src/gxvalid/gxvlcar.c | 2 +- lib/freetype/src/gxvalid/gxvmod.c | 2 +- lib/freetype/src/gxvalid/gxvmod.h | 8 +- lib/freetype/src/gxvalid/gxvmort.c | 2 +- lib/freetype/src/gxvalid/gxvmort.h | 8 +- lib/freetype/src/gxvalid/gxvmort0.c | 2 +- lib/freetype/src/gxvalid/gxvmort1.c | 2 +- lib/freetype/src/gxvalid/gxvmort2.c | 2 +- lib/freetype/src/gxvalid/gxvmort4.c | 2 +- lib/freetype/src/gxvalid/gxvmort5.c | 2 +- lib/freetype/src/gxvalid/gxvmorx.c | 2 +- lib/freetype/src/gxvalid/gxvmorx.h | 8 +- lib/freetype/src/gxvalid/gxvmorx0.c | 2 +- lib/freetype/src/gxvalid/gxvmorx1.c | 2 +- lib/freetype/src/gxvalid/gxvmorx2.c | 2 +- lib/freetype/src/gxvalid/gxvmorx4.c | 2 +- lib/freetype/src/gxvalid/gxvmorx5.c | 2 +- lib/freetype/src/gxvalid/gxvopbd.c | 2 +- lib/freetype/src/gxvalid/gxvprop.c | 2 +- lib/freetype/src/gxvalid/gxvtrak.c | 2 +- lib/freetype/src/gxvalid/module.mk | 2 +- lib/freetype/src/gxvalid/rules.mk | 2 +- lib/freetype/src/gzip/Jamfile | 2 +- lib/freetype/src/gzip/ftgzip.c | 4 +- lib/freetype/src/gzip/rules.mk | 2 +- lib/freetype/src/lzw/Jamfile | 2 +- lib/freetype/src/lzw/ftlzw.c | 4 +- lib/freetype/src/lzw/ftzopen.c | 2 +- lib/freetype/src/lzw/ftzopen.h | 8 +- lib/freetype/src/lzw/rules.mk | 2 +- lib/freetype/src/otvalid/Jamfile | 2 +- lib/freetype/src/otvalid/module.mk | 2 +- lib/freetype/src/otvalid/otvalid.c | 2 +- lib/freetype/src/otvalid/otvalid.h | 8 +- lib/freetype/src/otvalid/otvbase.c | 2 +- lib/freetype/src/otvalid/otvcommn.c | 2 +- lib/freetype/src/otvalid/otvcommn.h | 8 +- lib/freetype/src/otvalid/otverror.h | 10 +- lib/freetype/src/otvalid/otvgdef.c | 2 +- lib/freetype/src/otvalid/otvgpos.c | 2 +- lib/freetype/src/otvalid/otvgpos.h | 8 +- lib/freetype/src/otvalid/otvgsub.c | 2 +- lib/freetype/src/otvalid/otvjstf.c | 2 +- lib/freetype/src/otvalid/otvmath.c | 2 +- lib/freetype/src/otvalid/otvmod.c | 2 +- lib/freetype/src/otvalid/otvmod.h | 8 +- lib/freetype/src/otvalid/rules.mk | 2 +- lib/freetype/src/pcf/Jamfile | 2 +- lib/freetype/src/pcf/pcf.h | 6 +- lib/freetype/src/pcf/pcfdrivr.h | 6 +- lib/freetype/src/pcf/pcferror.h | 8 +- lib/freetype/src/pcf/pcfread.h | 6 +- lib/freetype/src/pcf/pcfutil.h | 6 +- lib/freetype/src/pfr/Jamfile | 2 +- lib/freetype/src/pfr/module.mk | 2 +- lib/freetype/src/pfr/pfr.c | 2 +- lib/freetype/src/pfr/pfrcmap.c | 2 +- lib/freetype/src/pfr/pfrcmap.h | 8 +- lib/freetype/src/pfr/pfrdrivr.c | 2 +- lib/freetype/src/pfr/pfrdrivr.h | 8 +- lib/freetype/src/pfr/pfrerror.h | 10 +- lib/freetype/src/pfr/pfrgload.c | 2 +- lib/freetype/src/pfr/pfrgload.h | 8 +- lib/freetype/src/pfr/pfrload.c | 2 +- lib/freetype/src/pfr/pfrload.h | 8 +- lib/freetype/src/pfr/pfrobjs.c | 2 +- lib/freetype/src/pfr/pfrobjs.h | 8 +- lib/freetype/src/pfr/pfrsbit.c | 2 +- lib/freetype/src/pfr/pfrsbit.h | 8 +- lib/freetype/src/pfr/pfrtypes.h | 8 +- lib/freetype/src/pfr/rules.mk | 2 +- lib/freetype/src/psaux/Jamfile | 2 +- lib/freetype/src/psaux/afmparse.c | 2 +- lib/freetype/src/psaux/afmparse.h | 8 +- lib/freetype/src/psaux/module.mk | 2 +- lib/freetype/src/psaux/psaux.c | 2 +- lib/freetype/src/psaux/psauxerr.h | 10 +- lib/freetype/src/psaux/psauxmod.c | 2 +- lib/freetype/src/psaux/psauxmod.h | 8 +- lib/freetype/src/psaux/psconv.c | 2 +- lib/freetype/src/psaux/psconv.h | 8 +- lib/freetype/src/psaux/psobjs.c | 2 +- lib/freetype/src/psaux/psobjs.h | 8 +- lib/freetype/src/psaux/rules.mk | 2 +- lib/freetype/src/psaux/t1cmap.c | 2 +- lib/freetype/src/psaux/t1cmap.h | 8 +- lib/freetype/src/psaux/t1decode.c | 16 +- lib/freetype/src/psaux/t1decode.h | 8 +- lib/freetype/src/pshinter/Jamfile | 2 +- lib/freetype/src/pshinter/module.mk | 2 +- lib/freetype/src/pshinter/pshalgo.c | 2 +- lib/freetype/src/pshinter/pshalgo.h | 8 +- lib/freetype/src/pshinter/pshglob.c | 2 +- lib/freetype/src/pshinter/pshglob.h | 8 +- lib/freetype/src/pshinter/pshinter.c | 2 +- lib/freetype/src/pshinter/pshmod.c | 2 +- lib/freetype/src/pshinter/pshmod.h | 8 +- lib/freetype/src/pshinter/pshnterr.h | 10 +- lib/freetype/src/pshinter/pshpic.c | 2 +- lib/freetype/src/pshinter/pshpic.h | 8 +- lib/freetype/src/pshinter/pshrec.c | 2 +- lib/freetype/src/pshinter/pshrec.h | 8 +- lib/freetype/src/pshinter/rules.mk | 2 +- lib/freetype/src/psnames/Jamfile | 2 +- lib/freetype/src/psnames/module.mk | 2 +- lib/freetype/src/psnames/psmodule.c | 2 +- lib/freetype/src/psnames/psmodule.h | 8 +- lib/freetype/src/psnames/psnamerr.h | 10 +- lib/freetype/src/psnames/psnames.c | 2 +- lib/freetype/src/psnames/pspic.c | 2 +- lib/freetype/src/psnames/pspic.h | 8 +- lib/freetype/src/psnames/pstables.h | 2 +- lib/freetype/src/psnames/rules.mk | 2 +- lib/freetype/src/raster/Jamfile | 2 +- lib/freetype/src/raster/ftmisc.h | 8 +- lib/freetype/src/raster/ftraster.c | 26 +- lib/freetype/src/raster/ftraster.h | 10 +- lib/freetype/src/raster/ftrend1.c | 2 +- lib/freetype/src/raster/ftrend1.h | 8 +- lib/freetype/src/raster/module.mk | 2 +- lib/freetype/src/raster/raster.c | 2 +- lib/freetype/src/raster/rasterrs.h | 10 +- lib/freetype/src/raster/rastpic.c | 2 +- lib/freetype/src/raster/rastpic.h | 8 +- lib/freetype/src/raster/rules.mk | 2 +- lib/freetype/src/sfnt/Jamfile | 2 +- lib/freetype/src/sfnt/module.mk | 2 +- lib/freetype/src/sfnt/pngshim.c | 2 +- lib/freetype/src/sfnt/pngshim.h | 8 +- lib/freetype/src/sfnt/rules.mk | 2 +- lib/freetype/src/sfnt/sfdriver.c | 2 +- lib/freetype/src/sfnt/sfdriver.h | 8 +- lib/freetype/src/sfnt/sferrors.h | 11 +- lib/freetype/src/sfnt/sfnt.c | 2 +- lib/freetype/src/sfnt/sfntpic.c | 2 +- lib/freetype/src/sfnt/sfntpic.h | 8 +- lib/freetype/src/sfnt/sfobjs.c | 2 +- lib/freetype/src/sfnt/sfobjs.h | 8 +- lib/freetype/src/sfnt/ttbdf.c | 2 +- lib/freetype/src/sfnt/ttbdf.h | 8 +- lib/freetype/src/sfnt/ttcmap.c | 2 +- lib/freetype/src/sfnt/ttcmap.h | 8 +- lib/freetype/src/sfnt/ttcmapc.h | 2 +- lib/freetype/src/sfnt/ttkern.c | 2 +- lib/freetype/src/sfnt/ttkern.h | 8 +- lib/freetype/src/sfnt/ttload.c | 2 +- lib/freetype/src/sfnt/ttload.h | 8 +- lib/freetype/src/sfnt/ttmtx.c | 2 +- lib/freetype/src/sfnt/ttmtx.h | 8 +- lib/freetype/src/sfnt/ttpost.c | 2 +- lib/freetype/src/sfnt/ttpost.h | 8 +- lib/freetype/src/sfnt/ttsbit.c | 2 +- lib/freetype/src/sfnt/ttsbit.h | 8 +- lib/freetype/src/smooth/Jamfile | 2 +- lib/freetype/src/smooth/ftgrays.c | 24 +- lib/freetype/src/smooth/ftgrays.h | 10 +- lib/freetype/src/smooth/ftsmerrs.h | 10 +- lib/freetype/src/smooth/ftsmooth.c | 2 +- lib/freetype/src/smooth/ftsmooth.h | 8 +- lib/freetype/src/smooth/ftspic.c | 2 +- lib/freetype/src/smooth/ftspic.h | 8 +- lib/freetype/src/smooth/module.mk | 2 +- lib/freetype/src/smooth/rules.mk | 2 +- lib/freetype/src/smooth/smooth.c | 2 +- lib/freetype/src/tools/afblue.pl | 17 +- lib/freetype/src/tools/docmaker/content.py | 2 +- lib/freetype/src/tools/docmaker/docmaker.py | 2 +- lib/freetype/src/tools/docmaker/formatter.py | 2 +- lib/freetype/src/tools/docmaker/sources.py | 2 +- lib/freetype/src/tools/docmaker/tohtml.py | 2 +- lib/freetype/src/tools/docmaker/utils.py | 2 +- lib/freetype/src/tools/ftfuzzer/README | 2 +- lib/freetype/src/tools/ftfuzzer/ftfuzzer.cc | 4 +- lib/freetype/src/tools/ftfuzzer/ftmutator.cc | 2 +- lib/freetype/src/tools/ftfuzzer/runinput.cc | 2 +- lib/freetype/src/tools/glnames.py | 2 +- lib/freetype/src/tools/no-copyright | 4 + lib/freetype/src/tools/update-copyright-year | 2 +- lib/freetype/src/truetype/Jamfile | 2 +- lib/freetype/src/truetype/module.mk | 2 +- lib/freetype/src/truetype/rules.mk | 2 +- lib/freetype/src/truetype/truetype.c | 2 +- lib/freetype/src/truetype/ttdriver.c | 9 +- lib/freetype/src/truetype/ttdriver.h | 8 +- lib/freetype/src/truetype/tterrors.h | 11 +- lib/freetype/src/truetype/ttgload.c | 2 +- lib/freetype/src/truetype/ttgload.h | 8 +- lib/freetype/src/truetype/ttgxvar.c | 2 +- lib/freetype/src/truetype/ttgxvar.h | 8 +- lib/freetype/src/truetype/ttinterp.c | 257 +---- lib/freetype/src/truetype/ttinterp.h | 8 +- lib/freetype/src/truetype/ttobjs.c | 36 +- lib/freetype/src/truetype/ttobjs.h | 12 +- lib/freetype/src/truetype/ttpic.c | 2 +- lib/freetype/src/truetype/ttpic.h | 8 +- lib/freetype/src/truetype/ttpload.c | 2 +- lib/freetype/src/truetype/ttpload.h | 8 +- lib/freetype/src/truetype/ttsubpix.c | 2 +- lib/freetype/src/truetype/ttsubpix.h | 9 +- lib/freetype/src/type1/Jamfile | 2 +- lib/freetype/src/type1/module.mk | 2 +- lib/freetype/src/type1/rules.mk | 2 +- lib/freetype/src/type1/t1afm.c | 4 +- lib/freetype/src/type1/t1afm.h | 8 +- lib/freetype/src/type1/t1driver.c | 37 +- lib/freetype/src/type1/t1driver.h | 8 +- lib/freetype/src/type1/t1errors.h | 10 +- lib/freetype/src/type1/t1gload.c | 11 +- lib/freetype/src/type1/t1gload.h | 8 +- lib/freetype/src/type1/t1load.c | 67 +- lib/freetype/src/type1/t1load.h | 9 +- lib/freetype/src/type1/t1objs.c | 5 +- lib/freetype/src/type1/t1objs.h | 8 +- lib/freetype/src/type1/t1parse.c | 2 +- lib/freetype/src/type1/t1parse.h | 8 +- lib/freetype/src/type1/t1tokens.h | 2 +- lib/freetype/src/type1/type1.c | 2 +- lib/freetype/src/type42/Jamfile | 2 +- lib/freetype/src/type42/module.mk | 2 +- lib/freetype/src/type42/rules.mk | 2 +- lib/freetype/src/type42/t42drivr.c | 2 +- lib/freetype/src/type42/t42drivr.h | 8 +- lib/freetype/src/type42/t42error.h | 10 +- lib/freetype/src/type42/t42objs.c | 5 +- lib/freetype/src/type42/t42objs.h | 8 +- lib/freetype/src/type42/t42parse.c | 2 +- lib/freetype/src/type42/t42parse.h | 8 +- lib/freetype/src/type42/t42types.h | 8 +- lib/freetype/src/type42/type42.c | 2 +- lib/freetype/src/winfonts/Jamfile | 2 +- lib/freetype/src/winfonts/fnterrs.h | 10 +- lib/freetype/src/winfonts/module.mk | 2 +- lib/freetype/src/winfonts/rules.mk | 2 +- lib/freetype/src/winfonts/winfnt.c | 2 +- lib/freetype/src/winfonts/winfnt.h | 8 +- lib/freetype/vms_make.com | 2 +- 678 files changed, 5705 insertions(+), 4137 deletions(-) create mode 100644 lib/freetype/include/freetype/internal/fthash.h rename lib/freetype/src/autofit/{hbshim.c => afshaper.c} (69%) rename lib/freetype/src/autofit/{hbshim.h => afshaper.h} (57%) create mode 100644 lib/freetype/src/base/fthash.c diff --git a/lib/freetype/CMakeLists.txt b/lib/freetype/CMakeLists.txt index 77a5622c3..f02ee518e 100644 --- a/lib/freetype/CMakeLists.txt +++ b/lib/freetype/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt # -# Copyright 2013-2015 by +# Copyright 2013-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # Written originally by John Cary @@ -149,7 +149,7 @@ endif () set(VERSION_MAJOR "2") set(VERSION_MINOR "6") -set(VERSION_PATCH "2") +set(VERSION_PATCH "3") set(PROJECT_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(SHARED_LIBRARY_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/lib/freetype/ChangeLog b/lib/freetype/ChangeLog index 31c2ac9e0..a19b4decf 100644 --- a/lib/freetype/ChangeLog +++ b/lib/freetype/ChangeLog @@ -1,3 +1,817 @@ +2016-02-07 Werner Lemberg + + * Version 2.6.3 released. + ========================= + + + Tag sources with `VER-2-6-3'. + + * docs/VERSION.DLL: Update documentation and bump version number to + 2.6.3. + + * README, Jamfile (RefDoc), builds/windows/vc2005/freetype.vcproj, + builds/windows/vc2005/index.html, + builds/windows/vc2008/freetype.vcproj, + builds/windows/vc2008/index.html, + builds/windows/vc2010/freetype.vcxproj, + builds/windows/vc2010/index.html, + builds/windows/visualc/freetype.dsp, + builds/windows/visualc/freetype.vcproj, + builds/windows/visualc/index.html, + builds/windows/visualce/freetype.dsp, + builds/windows/visualce/freetype.vcproj, + builds/windows/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.6.2/2.6.3/, s/262/263/. + + * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. + + * builds/unix/configure.raw (version_info): Set to 18:3:12. + * CMakeLists.txt (VERSION_PATCH): Set to 2. + + * docs/CHANGES: Updated. + +2016-02-07 Werner Lemberg + + Fix another runtime error found by clang's sanitizer (#47082). + + * src/base/ftstroke.c (ft_stroke_border_export): Properly handle + empty input buffer. + +2016-02-07 Werner Lemberg + + Fix runtime errors found by clang's sanitizer (#47082). + + * src/base/ftobjs.c (FT_Render_Glyph_Internal), src/base/ftoutln.c + (FT_Outline_Copy), src/cache/ftcsbits.c (ftc_sbit_copy_bitmap): + Properly handle empty input buffer. + +2016-02-07 Werner Lemberg + + [cff] Minor. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings) : + Remove dead code. + +2016-02-07 Werner Lemberg + + [cff] Implement missing operators in new engine (except `random'). + + * src/cff/cf2font.h (CF2_STORAGE_SIZE): New macro. + + * src/cff/cf2intrp.c (cf2_interpT2CharString): Implement the + following operators: abs, add, and, div, drop, dup, eq, exch, get, + ifelse, index, mul, neg, not, or, put, roll, sqrt, sub. + + * src/cff/cf2stack.h, src/cff/cf2stack.c (cf2_stack_roll): New + auxiliary function for `roll' operator. + +2016-02-06 Werner Lemberg + + [cff] Fix some Type 2 operators in old CFF engine. + + * src/cff/cffgload.c (cff_decoder_parse_charstrings): Fix `eq' + operator, add `not' and (unsupported) `blend' operators. + +2016-02-05 Sebastian Rasmussen + + Make direct call of `make install' work (#47072). + + * builds/unix/unix-def.in (freetype-config): Make sure + `freetype-config' is generated for both make targets (`all' and + `install'). + +2016-02-05 Werner Lemberg + + [base] Fix advance width loading for MM and GX fonts (#47064). + + * src/base/ftadvanc.c (LOAD_ADVANCE_FAST_CHECK): Return false for + MM and GX fonts. + Update callers. + +2016-02-03 Werner Lemberg + + [cff] Fix handling of face_index == -1 for pure CFF. + + * src/cff/cffobjs.c (cff_face_init): Return correct number of faces. + +2016-01-30 Werner Lemberg + + [autofit] Minor tracing improvement. + + * src/autofit/afhints.c (af_glyph_hints_dump_points): Insert newline + at the start of a new contour. + +2016-01-28 Nikolaus Waxweiler + + Remove unpatented hinter (3/3). + + * include/freetype/config/ftoption.h + (TT_CONFIG_OPTION_UNPATENTED_HINTING): Remove. + + * include/freetype/internal/ftobjs.h (FT_Face_InternalRec): Remove + `ignore_unpatented_hinter' field. + Update users. + (FT_DEBUG_HOOK_UNPATENTED_HINTING): Remove. + Update users. + + * include/freetype/internal/tttypes.h (TT_FaceRec): Remove + `unpatented_hinting' field. + Update users. + + * src/base/ftpatent.c (_tt_check_patents_in_range, + _tt_check_patents_in_table, _tt_face_check_patents): Remove. + (FT_Face_CheckTrueTypePatents, FT_Face_SetUnpatentedHinting): + Replace code with dummies. + + * src/truetype/ttobjs.c (tt_face_init): Remove now defunct code. + * src/truetype/ttobjs.h (TT_GraphicsState): Remove `both_x_axis' + field. + +2016-01-28 Nikolaus Waxweiler + + Remove unpatented hinter (2/3). + + * devel/ftoption.h (TT_CONFIG_OPTION_UNPATENTED_HINTING): Remove. + +2016-01-28 Nikolaus Waxweiler + + Remove unpatented hinter (1/3). + + * src/truetype/ttinterp.c [TT_CONFIG_OPTION_UNPATENTED_HINTING]: + Remove all code related to this macro. + +2016-01-28 Werner Lemberg + + [autofit] Add blue-zone support for Kannada script. + + This essentially moves the Kannada script from the `Indic' hinter to + the `Latin' hinter. + + * src/autofit/afblue.dat: Add blue zone data for Kannada. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Kannada standard characters and move + data out of AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afranges.c: Move Kannada data out of + AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afstyles.h: Update Kannada data; in particular, use + AF_WRITING_SYSTEM_LATIN. + +2016-01-22 Alexei Podtelezhnikov + + Better access to 64-bit integers for C99 compilers. + + * include/freetype/config/ftconfig.h [FT_LONG64]: Use + __STDC_VERSION__ to define 64-bit integers. + * builds/unix/ftconfig.in [FT_LONG64]: Ditto. + * builds/vms/ftconfig.h [FT_LONG64]: Ditto. + +2016-01-21 Werner Lemberg + + [gxvalid] Remove commented out code. + + * src/gxvalid/gxvcommn.c (gxv_EntryTable_validate): Do it. + +2016-01-20 Werner Lemberg + + [autofit] Complete last autofit commit. + + Problem reported by Kostya Serebryany . + + * src/autofit/afshaper.c (af_shaper_get_coverage) + [!FT_CONFIG_OPTION_USE_HARFBUZZ]: Update signature. + +2016-01-20 Werner Lemberg + + Still handle `__FTERRORS_H__'. + + We need this for backwards compatibility. + + Problem reported by John Emmas . + + * include/freetype/fterrors.h: Fix inclusion guard so that + undefining either `FTERRORS_H_' or `__FTERRORS_H__' works as + expected. + +2016-01-19 Werner Lemberg + + [autofit] Fix handling of default script. + + Patch taken from ttfautohint, commit + 071ae2c00e0d67f9d19418f4fade1c23d27dc185. + + There were two bugs. + + - We now use non-standard script tags like `khms' for special + purposes. However, HarfBuzz maps such tags to `DFLT', and + without this commit the associated lookups were incorrectly + assigned to the non-standard tags. + + - Let's assume we have a Bengali font, and the font's `DFLT' + script tag handles the necessary lookups for Bengali, too. + Without this commit, the `DFLT' lookups were assigned to + ttfautohint's default script (usually `latn') before the + standard lookups for Bengali were handled. + + We now have the following order while searching for covered + glyph indices. + + special features of scripts (e.g. `sups' for Cyrillic) + Unicode mappings of scripts + remaining features of scripts (especially important for Indic + scripts) + default features of default script + + * src/autofit/afshaper.c, src/autofit/afshaper.h + (af_shaper_get_coverage): Add boolean parameter to indicate default + script. + Update all callers. + + * src/autofit/afglobal.c (af_face_globals_compute_style_coverage): + Fix search order for coverages. + +2016-01-19 Werner Lemberg + + Various minor clang fixes. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths), + src/autofit/aflatin.c (af_latin_metrics_init_widths): Initialize + `ch'. + + * src/base/ftcalc.c (FT_MulFix) [FT_LONG64]: Add cast. + + * src/base/ftdbgmem.c (ft_mem_table_destroy): Add cast. + + * src/base/fthash.c (hash_num_lookup): Add cast. + + * src/base/fttrigon.c (ft_trig_downscale) [FT_LONG64]: Fix cast. + + * src/gxvalid/gxvcommn.c (gxv_EntryTable_validate): Comment out + redundant code. + + * src/type1/t1driver.c (t1_get_ps_font_value) : Add + cast. + + * src/type1/t1load.c (parse_subrs): Fix type of `count'. + +2016-01-19 Derek B. Noonburg + + [truetype] Add another tricky font. + + * src/truetype/ttobjs.c (TRICK_SFNT_IDS_NUM_FACES): Increase. + (sfnt_id): Add variant of `DFKaiShu'. + +2016-01-14 Alexei Podtelezhnikov + + [base] Empower `FT_Library_SetLcdFilterWeights'. + + * src/base/ftlcdfil.c (FT_Library_SetLcdFilterWeights): Enable filter + in addition to setting weights. + (FT_Library_SetLcdFilter): Clean out FT_FORCE_LIGHT_LCD_FILTER and + FT_FORCE_LEGACY_LCD_FILTER. + * include/freetype/ftlcdfil.h: Documentation update. + +2016-01-12 Werner Lemberg + + Don't use macro names that start with `_[A-Z]' [3/3]. + + Such macro names are reserved for both C and C++. + + * src/cache/ftccache.h: s/_FTC_FACE_ID_HASH/FTC_FACE_ID_HASH/. + Update all callers. + (FTC_CACHE_LOOKUP_CMP): Replace `_XXX' with `XXX_'. + * src/cache/ftcmru.c (FTC_MRULIST_LOOKUP_CMP): Ditto. + +2016-01-12 Werner Lemberg + + Don't use macro names that start with `_[A-Z]' [2/3]. + + Such macro names are reserved for both C and C++. + + * include/freetype/ftimage.h, src/raster/ftraster.c, + src/smooth/ftgrays.c, src/smooth/ftgrays.h: + s/_STANDALONE_/STANDALONE_/. + +2016-01-12 Werner Lemberg + + Don't use macro names that start with `_[A-Z]' [1/3]. + + Such macro names are reserved for both C and C++. + + * src/bdf/bdflib.c: Replace macros of the form `_BDF_XXX' with + `BDF_XXX_'. + +2016-01-12 Werner Lemberg + + Don't use macro names that contain `__' [2/2]. + + Such macro names are reserved for both C and C++. + + * src/cache/*: s/__/_/. + +2016-01-12 Werner Lemberg + + Don't use macro names that contain `__' [1/2]. + + Such macro names are reserved for both C and C++. + + * */*: Replace macros of the form `__XXX_H__' with `XXX_H_'. + +2016-01-10 Jered Gray + + [cff] Fix usage of `|' operator. + + * src/cff/cf2intrp.c (cf2_interpT2CharString) [cf2_cmdEXTENDEDNMBR, + default]: `|' is not guaranteed to be processed from left to right + by the compiler. However, the code repeatedly calls + `cf2_buf_readByte' to get the arguments to `|' ... Fix this. + +2015-12-25 Werner Lemberg + + [autofit] Make top-to-bottom hinting work in latin auto-hinter. + + This improves rendering of scripts like Bengali or Devanagari. + + * src/autofit/afhints.c (af_axis_hints_new_edge): Add parameter to + pass top-to-bottom hinting flag. This makes the function sort edges + in descending vertical position. + + * src/autofit/afhints.c: Updated. + + * src/autofit/aflatin.c (af_latin_hints_compute_edges, + af_latin_hint_edges): Use `top_to_bottom_hinting' flag. + + * src/autofit/afcjk.c (af_cjk_hints_compute_edges), + src/autofit/aflatin2.c (af_latin2_hints_compute_edges): Updated. + +2015-12-24 Werner Lemberg + + [autofit] Add hinting direction to `AF_ScriptClassRec'. + + Still unused. + + * src/autofit/afglobal.c (SCRIPT): Handle hinting direction. + + * src/autofit/aftypes.h (AF_ScriptClassRec): Add + `top_to_bottom_hinting' field. + (AF_HINTING_BOTTOM_TO_TOP, AF_HINTING_TOP_TO_BOTTOM): New macros. + (AF_DEFINE_SCRIPT_CLASS): Updated. + +2015-12-23 Werner Lemberg + + [autofit] Start implementing hinting direction (up/down, down/up). + + Right now, it does nothing. + + * src/autofit/afscript.h: Add another parameter to `SCRIPT', + specifying hinting direction. + + * src/autofit/afglobal.c, scr/autofit/afglobal.h, + src/autofit/afpic.c, src/autofit/afranges.h, src/autofit/afshaper.c, + src/autofit/aftypes.h: Extend `SCRIPT' definitions. + +2015-12-22 Werner Lemberg + + * src/type1/t1load.c (parse_subrs): Fix memory leak (#46744). + +2015-12-22 Werner Lemberg + + [base] Make hash interface symmetric. + + Use `num' and `str' infixes everywhere. + + * src/base/fthash.c (ft_hash_init): Renamed to... + (hash_init): ... This. + (ft_hash_str_init, ft_hash_num_init): New functions. + (ft_hash_free): Renamed to... + (ft_hash_str_free): ... This. + + * include/freetype/internal/fthash.h: Updated. + + * src/bdf/bdflib.c, src/type1/t1load.c, src/type1/t1objs.c: Updated. + +2015-12-21 Werner Lemberg + + [type1] Avoid shift of negative numbers (#46732). + + * src/type1/t1load.c (parse_subrs): Do it. + +2015-12-20 Werner Lemberg + + [type1, psaux] Handle large values of num_subrs correctly (#46692). + + We now use a hash to map from subr indices to array elements holding + the subroutines, if necessary. + + * include/freetype/internal/t1types.h: Include FT_INTERNAL_HASH_H. + (T1_FontRec): Add `subrs_hash' field. + + * include/freetype/internal/psaux.h: Include FT_INTERNAL_HASH_H. + (T1_DecoderRec): Add `subrs_hash' field. + + * src/type1/t1load.h (T1_LoaderRec): Add `subrs_hash' field. + + * src/type1/t1driver.c: Include FT_INTERNAL_HASH_H. + (t1_ps_get_font_value) [PS_DICT_SUBR]: Look up hash if necessary. + + * src/type1/t1load.c: Include FT_INTERNAL_HASH_H. + (parse_subrs): Use hash for subr indices that exceed the allocated + number of subr slots. + (t1_init_loader): Remove unnecessary code. + (t1_done_loader, T1_Open_Face): Updated. + + * src/type1/t1gload.c (T1_Compute_Max_Advance, T1_Get_Advances, + T1_Load_Glyph): Updated. + + * src/type1/t1objs.c (T1_Face_Done): Updated. + + * src/psaux/t1decode.c: Include FT_INTERNAL_HASH_H. + (t1_decoder_parse_charstrings) [op_callsubr]: Look up hash if + necessary. + + * src/cid/cidgload.c (cid_load_glyph): Updated. + +2015-12-20 Werner Lemberg + + [base] Thinko: Remove free function pointer. + + We don't copy keys or values while hashing. + + * include/freetype/internal/fthash.h (FT_Hash_FreeFunc): Removed. + (FT_HashRec): Remove `free' field. + + * src/base/fthash.c (hash_str_free): Removed. + (ft_hash_init, ft_hash_free): Updated. + +2015-12-20 Werner Lemberg + + [base, bdf] Don't expose `FT_Hashnode' in hash functions. + + * src/base/fthash.c (hash_lookup, ft_hash_str_lookup, + ft_hash_num_lookup): Return pointer to `size_t' instead of + `FT_Hashnode'. + + * include/freetype/internal/fthash.h: Updated. + + * src/bdf/bdflib.c (bdf_get_property, _bdf_add_property, + bdf_get_font_property): Updated. + +2015-12-20 Werner Lemberg + + [base, bdf] Add number hashing. + + * src/base/fthash.c (hash_num_lookup, hash_num_compare): New + functions. + (ft_hash_init): Add argument to select between number and string + hashing. + (ft_hash_num_insert, ft_hash_num_lookup): New functions. + + * include/freetype/internal/fthash.h: Updated. + + * src/bdf/bdflib.c (_bdf_parse_start): Updated. + +2015-12-20 Werner Lemberg + + [base] Introduce hash lookup, compare, and free function pointers. + + * include/freetype/internal/fthash.c (FT_Hash_LookupFunc, + FT_Hash_CompareFunc, FT_Hash_FreeFunc): New typedefs. + (FT_HashRec): Add `lookup', `compare', and `free' fields. + + * src/base/fthash.c (hash_str_lookup, hash_str_compare, + hash_str_free): New functions. + (ft_hash_init): Set function pointers. + (hash_bucket, ft_hash_free): Use them. + +2015-12-20 Werner Lemberg + + [base, bdf] Use a union as a hash key. + + We want to support both an integer and a string key later on. + + * include/freetype/internal/fthash.h (FT_Hashkey): New union. + (FT_HashnodeRec): Updated. + (ft_hash_insert, ft_hash_lookup): Renamed to ... + (ft_hash_str_insert, ft_hash_str_lookup): ... this. + + * src/base/fthash.c (hash_bucket): Updated. + (ft_hash_insert, ft_hash_lookup): Renamed to ... + (hash_insert, hash_lookup): ... this. + (ft_hash_str_insert, ft_hash_str_lookup): New wrapper functions. + + * src/bdf/bdflib.c: Updated. + +2015-12-19 Werner Lemberg + + [bdf] Use new hash functions. + + * src/bdf/bdf.h: Include FT_INTERNAL_HASH_H. + (hashnode, hashtable): Removed. + (bdf_font_t): Use `FT_HashRec' type for `proptbl'. + + * src/bdf/bdflib.c: Remove all hash functions. + Update code for new hash structure and function names. + +2015-12-19 Werner Lemberg + + [bdf, base] Lift hash functions from bdf driver to base module. + + * src/base/fthash.c, include/freetype/internal/fthash.h: New files, + containing (massaged) code from `bdflib.c' and `bdf.h'. + + * include/freetype/internal/internal.h (FT_INTERNAL_HASH_H): New + macro. + + * src/base/ftbase.c: Include `fthash.c'. + + * src/base/Jamfile (_sources): Add `fthash'. + + * src/base/rules.mk (BASE_SRC): Add `fthash.c'. + + * docs/LICENSE.TXT: Updated. + +2015-12-15 Werner Lemberg + + [autofit] Add blue-zone support for Bengali script. + + This essentially moves the Bengali script from the `Indic' hinter to + the `Latin' hinter. + + * src/autofit/afblue.dat: Add blue zone data for Bengali. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Bengali standard characters and move + data out of AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afranges.c: Move Bengali data out of + AF_CONFIG_OPTION_INDIC block. + + * src/autofit/afstyles.h: Update Bengali data; in particular, use + AF_WRITING_SYSTEM_LATIN. + +2015-12-14 Ben Wagner + + [bdf] Remove dead code (#46625). + + The BDF specification only allows decimal numbers, no octal or + hexidecimal decoding is needed. + + * src/bdf/bdflib.c (_bdf_atoul, _bdf_atol, _bdf_atous, + _bdf_atos): Remove unused code and parameters. + Update all callers. + (odigits): Remove. + +2015-12-14 Werner Lemberg + + [base] Fix calls to `FT_Stream_Seek'. + + * src/base/ftobjs.c (Mac_Read_sfnt_Resource, FT_Open_Face): Set + `error'. + +2015-12-14 Ben Wagner + + [base] Check error when seeking to data supplied offset (#46635). + + * src/base/ftobjs.c (open_face_PS_from_sfnt_stream): + `ft_lookup_PS_in_sfnt_stream' returns offset and and length from + user supplied data. Use of this these values must be checked. + +2015-12-13 Werner Lemberg + + [autofit] Add support for Myanmar script. + + * src/autofit/afblue.dat: Add blue zone data for Myanmar. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Myanmar standard characters. + + * src/autofit/afranges.c: Add Myanmar data. + + * src/autofit/afstyles.h: Add Myanmar data. + +2015-12-12 Werner Lemberg + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Minor. + +2015-12-12 Werner Lemberg + + * src/autofit/afscript.h: Avoid potential crash. + +2015-12-10 Werner Lemberg + + [autofit] Restore OpenType feature check. + + This was removed while rewriting the HarfBuzz interface. + + * src/autofit/afglobal.h (AF_FaceGlobalsRec): Add `hb_buf' field to + hold internal HarfBuzz buffer, needed for feature comparison. + + * src/autofit/afglobal.c (af_face_globals_new, + af_face_globals_free): Initialize and destroy `hb_buf'. + + * src/autofit/afshaper.c (af_shaper_get_cluster): Compare character + (cluster) with and without applied feature. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Fix tracing + message. + +2015-12-10 Werner Lemberg + + [autofit] Remove redundant code. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths): Do it. + +2015-12-09 Werner Lemberg + + [autofit] Thinko. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Don't count + empty blue zones (bug introduced 2015-12-06). + +2015-12-09 Werner Lemberg + + [autofit] Introduce subscript top blue zones. + + This feature is mainly for Khmer: The idea is to avoid a clash + between the top of subscript glyphs and the bottom of normal + baseline glyphs. + + This only works for character clusters mapped to multiple glyphs. + + * src/autofit/afblue.dat: Add subscript top blue zone for Khmer. + + * src/autofit/afblue.hin (AF_BLUE_PROPERTY_LATIN_SUB_TOP): New + macro. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/aflatin.h (AF_LATIN_IS_SUB_TOP_BLUE, + AF_LATIN_BLUE_SUB_TOP): New macros. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Handle new + blue zone property. + Update tracing messages. + (af_latin_metrics_scale_dim): Handle new blue zone property. + (af_latin_hints_compute_blue_edges): Updated. + +2015-12-09 Werner Lemberg + + [autofit] Fix tracing message. + + * src/autofit/aflatin.c (af_latin_metrics_scale_dim): Display + inactive blue zones also. + +2015-12-06 Werner Lemberg + + * src/autofit/afblue.dat: Add more Khmer clusters. + + Some fonts have incorrect ligatures; we need more samples to get a + good mean value. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + +2015-12-06 Werner Lemberg + + [autofit] Typos. + + * src/autofit/afshaper.c (af_shaper_buf_create, af_shaper_get_elem) + [!FT_CONFIG_OPTION_USE_HARFBUZZ]: Make it compile. + +2015-12-06 Werner Lemberg + + [autofit] Add support for Khmer script. + + We split Khmer into two auto-hinter scripts: `Khmer' (`khmr') and + `Khmer symbols' (`khms', U+19E0-U+19FF). + + * src/autofit/afblue.dat: Add blue zone data for Khmer. + + * src/autofit/afblue.c, src/autofit/afblue.h: Regenerated. + + * src/autofit/afscript.h: Add Khmer standard characters. + + * src/autofit/afranges.c: Add Khmer data. + + * src/autofit/afstyles.h: Add Khmer data. + +2015-12-06 Werner Lemberg + + [autofit] Rewrite HarfBuzz interface to support character clusters. + + Scripts like Khmer have blue zones that can't be directly + represented by Unicode characters. Instead, it is necessary to let + HarfBuzz convert character clusters into proper glyph representation + forms, then deriving the blue zone information from the resulting + glyphs. + + * src/autofit/hbshim.c, src/autofit/hbshim.h: Replaced by... + * src/autofit/afshaper.c, src/autofit/afshaper.h: ... these two new + files, providing a new API to access HarfBuzz. + + The new API manages a HarfBuzz buffer with `af_shaper_buf_create' + and `af_shaper_buf_destroy'. The buffer receives a UTF8 encoded + string with function `af_shaper_get_cluster', and the resulting + glyph data (indices, advance widths, vertical offsets) can be + iteratively accessed with function `af_shaper_get_elem'. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths, + af_cjk_metrics_init_blues, af_cjk_metrics_check_digits): Updated. + + * src/autofit/aflatin.c (af_latin_metrics_init_widths, + af_latin_metrics_init_blues, af_latin_metrics_check_digits): + Updated. + + * include/freetype/internal/fttrace.h: s/afharfbuzz/afshaper/. + + * src/autofit/afglobal.c: s/hbshim.h/afshaper.h/. + (af_face_globals_compute_style_coverage): Updated. + + * src/autofit/afglocal.h: s/hbshim.h/afshaper.h/. + + * src/autofit/autofit.c: s/hbshim.c/afshaper.c/. + + * src/autofit/Jamfile, src/autofit/rules.mk (AUTOF_DRV_SRC): + Updated. + +2015-12-06 Werner Lemberg + + [autofit] Prepare forthcoming changes. + + This makes it easier to control the commits. + + * src/autofit/aflatin.c (af_latin_metrics_init_blues): Add dummy + loop. No functional change. + +2015-12-06 Werner Lemberg + + [autofit] Use string of standard characters. + + This is more flexible; additionally, it would allow character + clusters. + + * src/autofit/aftypes.h (SCRIPT, AF_DEFINE_SCRIPT_CLASS): Updated. + (AF_ScriptClassRec): Replace `standard_char[123]' with + `standard_charstring'. + + * src/autofit/afscript.h: Replace last three character arguments + of the `SCRIPT' calls with a string parameter, holding the standard + characters (in UTF-8 encoding) separated with spaces. + + * src/autofit/afglobal.c, src/autofit/afglobal.h, + src/autofit/afpic.c, src/autofit/afranges.c, src/autofit/hbshim.c + (SCRIPT): Updated. + + * src/autofit/afcjk.c (af_cjk_metrics_init_widths), + src/autofit/aflatin.c (af_latin_metrics_init_widths): Updated. + +2015-12-05 Werner Lemberg + + * src/autofit/afblue.dat: Separate blue zone characters with spaces. + + Another preparation for character cluster support. + + * src/autofit/afblue.c, src/autofit.afblue.h: Regenerated. + +2015-12-05 Werner Lemberg + + * src/tools/afblue.pl (convert_ascii_chars): Don't ignore spaces. + + Instead, reduce multiple spaces to a single one. We need this later + for supporting character clusters in `afblue.dat'. + +2015-12-05 Werner Lemberg + + * src/autofit/afblue.hin (GET_UTF8_CHAR): Use `do...while(0)'. + + * src/autofit/afblue.h: Regenerated. + +2015-12-05 Werner Lemberg + + * src/autofit/afwarp.c: s/INT_MIN/FT_INT_MIN/. + +2015-12-03 Werner Lemberg + + * builds/unix/install.mk (install): Remove stale `ft2build.h'. + +2015-12-01 Werner Lemberg + + [type1] Avoid dangling pointer (#46572). + + * src/type1/t1afm.c (T1_Read_Metrics): Properly reset + `face->afm_data'. + +2015-11-28 Alexei Podtelezhnikov + + * include/freetype/ftlcdfil.h: Documentation tweak. + 2015-11-28 Werner Lemberg * Version 2.6.2 released. @@ -322,7 +1136,7 @@ Handle them. (af_autofitter_init): Initialize them. -2015-11-02 Bungeman +2015-11-02 Ben Wagner [ftfuzzer] Add support for multiple files (patch #8779). @@ -385,7 +1199,7 @@ (PFR_CHECK_SIZE): ... this. (PFR_SIZE): [!PFR_CONFIG_NO_CHECKS]: Define to PFR_CHECK_SIZE. - * src/pfr/pfrload.c (pfr_log_font_count): Check `count'. + * src/pfr/pfrload.c (pfr_log_font_count): Check `count'. (pfr_extra_item_load_kerning_pairs): Remove tracing message. (pfr_phy_font_load): Use PFR_CHECK_SIZE where appropriate. Allocate `chars' after doing a size checks. @@ -530,7 +1344,7 @@ * src/type1/t1afm.c (T1_Read_Metrics): Fix memory leak (#46229). -2015-10-19 Bungeman +2015-10-19 Ben Wagner [cid] Better handle invalid glyph stream offsets (#46221). @@ -608,7 +1422,7 @@ * src/tools/ftfuzzer/README: New file. -2015-10-15 Bungeman +2015-10-15 Ben Wagner [bdf] Fix memory leak (#46213). @@ -631,7 +1445,7 @@ The used indices were off by 1. -2015-10-15 Bungeman +2015-10-15 Ben Wagner Werner Lemberg * src/tools/ftfuzzer/ftfuzzer.cc: Handle fixed sizes (#46211). @@ -977,7 +1791,7 @@ * src/autofit/afstyles.h: Add Lao data. 2015-09-27 suzuki toshiya - + [base] Fix a leak by broken sfnt-PS or resource fork (#46028). open_face_from_buffer() frees passed buffer if valid font @@ -3590,7 +4404,7 @@ ---------------------------------------------------------------------------- -Copyright 2015 by +Copyright 2015-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.20 b/lib/freetype/ChangeLog.20 index 6dae58ea7..360bb4862 100644 --- a/lib/freetype/ChangeLog.20 +++ b/lib/freetype/ChangeLog.20 @@ -2597,7 +2597,7 @@ ---------------------------------------------------------------------------- -Copyright 2000-2015 by +Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.21 b/lib/freetype/ChangeLog.21 index 5ee9909ff..a61682df2 100644 --- a/lib/freetype/ChangeLog.21 +++ b/lib/freetype/ChangeLog.21 @@ -9423,7 +9423,7 @@ ---------------------------------------------------------------------------- -Copyright 2002-2015 by +Copyright 2002-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.22 b/lib/freetype/ChangeLog.22 index 08c5877e5..79f9478f7 100644 --- a/lib/freetype/ChangeLog.22 +++ b/lib/freetype/ChangeLog.22 @@ -2821,7 +2821,7 @@ ---------------------------------------------------------------------------- -Copyright 2005-2015 by +Copyright 2005-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.23 b/lib/freetype/ChangeLog.23 index 93fd33ce8..bc8ea5b48 100644 --- a/lib/freetype/ChangeLog.23 +++ b/lib/freetype/ChangeLog.23 @@ -7932,7 +7932,7 @@ ---------------------------------------------------------------------------- -Copyright 2006-2015 by +Copyright 2006-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.24 b/lib/freetype/ChangeLog.24 index df2119d8e..3a4abe290 100644 --- a/lib/freetype/ChangeLog.24 +++ b/lib/freetype/ChangeLog.24 @@ -6344,7 +6344,7 @@ ---------------------------------------------------------------------------- -Copyright 2010-2015 by +Copyright 2010-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/ChangeLog.25 b/lib/freetype/ChangeLog.25 index 75e840994..0766f576b 100644 --- a/lib/freetype/ChangeLog.25 +++ b/lib/freetype/ChangeLog.25 @@ -5145,7 +5145,7 @@ ---------------------------------------------------------------------------- -Copyright 2013-2015 by +Copyright 2013-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/Jamfile b/lib/freetype/Jamfile index 7db263050..8c033fcc9 100644 --- a/lib/freetype/Jamfile +++ b/lib/freetype/Jamfile @@ -1,6 +1,6 @@ # FreeType 2 top Jamfile. # -# Copyright 2001-2015 by +# Copyright 2001-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -197,7 +197,7 @@ actions RefDoc { python $(FT2_SRC)/tools/docmaker/docmaker.py --prefix=ft2 - --title=FreeType-2.6.2 + --title=FreeType-2.6.3 --output=$(DOC_DIR) $(FT2_INCLUDE)/freetype/*.h $(FT2_INCLUDE)/freetype/config/*.h diff --git a/lib/freetype/Jamrules b/lib/freetype/Jamrules index 91d196645..1e2d9b743 100644 --- a/lib/freetype/Jamrules +++ b/lib/freetype/Jamrules @@ -1,6 +1,6 @@ # FreeType 2 JamRules. # -# Copyright 2001-2015 by +# Copyright 2001-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/Makefile b/lib/freetype/Makefile index a10b7d975..9c5cf4648 100644 --- a/lib/freetype/Makefile +++ b/lib/freetype/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.42 2015/12/07 09:34:02 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.43 2016/05/29 11:57:09 dcoppa Exp $ FREETYPESRC= ${.CURDIR}/src # Get it from builds/unix/configure.ac -FT_VERSION_INFO= 18.2.12 +FT_VERSION_INFO= 18.3.12 INSTALL_PROGRAM = ${INSTALL} ${INSTALL_COPY} -m 755 -o $(BINOWN) -g $(BINGRP) .ifmake includes diff --git a/lib/freetype/README b/lib/freetype/README index f53644dac..ff81cdf3b 100644 --- a/lib/freetype/README +++ b/lib/freetype/README @@ -1,4 +1,4 @@ - FreeType 2.6.2 + FreeType 2.6.3 ============== Homepage: http://www.freetype.org @@ -24,9 +24,9 @@ and download one of the following files. - freetype-doc-2.6.2.tar.bz2 - freetype-doc-2.6.2.tar.gz - ftdoc262.zip + freetype-doc-2.6.3.tar.bz2 + freetype-doc-2.6.3.tar.gz + ftdoc263.zip To view the documentation online, go to @@ -71,7 +71,7 @@ ---------------------------------------------------------------------- -Copyright 2006-2015 by +Copyright 2006-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/README.git b/lib/freetype/README.git index 2350e78d6..34ee82df8 100644 --- a/lib/freetype/README.git +++ b/lib/freetype/README.git @@ -37,7 +37,7 @@ repository. ---------------------------------------------------------------------- -Copyright 2005-2015 by +Copyright 2005-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/autogen.sh b/lib/freetype/autogen.sh index 8f05b2da7..78053ccb6 100644 --- a/lib/freetype/autogen.sh +++ b/lib/freetype/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2015 by +# Copyright 2005-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/amiga/README b/lib/freetype/builds/amiga/README index d0e5ec5d6..eae9e3396 100644 --- a/lib/freetype/builds/amiga/README +++ b/lib/freetype/builds/amiga/README @@ -1,7 +1,7 @@ README for the builds/amiga subdirectory. -Copyright 2005-2015 by +Copyright 2005-2016 by Werner Lemberg and Detlef Würkner. This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/amiga/include/config/ftconfig.h b/lib/freetype/builds/amiga/include/config/ftconfig.h index 5ad8ded0f..0cb65b661 100644 --- a/lib/freetype/builds/amiga/include/config/ftconfig.h +++ b/lib/freetype/builds/amiga/include/config/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* Amiga-specific configuration file (specification only). */ /* */ -/* Copyright 2005-2015 by */ +/* Copyright 2005-2016 by */ /* Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/amiga/include/config/ftmodule.h b/lib/freetype/builds/amiga/include/config/ftmodule.h index 77a66db47..bbff9c522 100644 --- a/lib/freetype/builds/amiga/include/config/ftmodule.h +++ b/lib/freetype/builds/amiga/include/config/ftmodule.h @@ -4,7 +4,7 @@ /* */ /* Amiga-specific FreeType module selection. */ /* */ -/* Copyright 2005-2015 by */ +/* Copyright 2005-2016 by */ /* Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/amiga/makefile b/lib/freetype/builds/amiga/makefile index 038e4686a..34ba77d7e 100644 --- a/lib/freetype/builds/amiga/makefile +++ b/lib/freetype/builds/amiga/makefile @@ -5,7 +5,7 @@ # -# Copyright 2005-2015 by +# Copyright 2005-2016 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/amiga/makefile.os4 b/lib/freetype/builds/amiga/makefile.os4 index b7930558e..a25dd3e69 100644 --- a/lib/freetype/builds/amiga/makefile.os4 +++ b/lib/freetype/builds/amiga/makefile.os4 @@ -4,7 +4,7 @@ # -# Copyright 2005-2015 by +# Copyright 2005-2016 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/amiga/smakefile b/lib/freetype/builds/amiga/smakefile index 145b1ad6e..723a89027 100644 --- a/lib/freetype/builds/amiga/smakefile +++ b/lib/freetype/builds/amiga/smakefile @@ -3,7 +3,7 @@ # -# Copyright 2005-2015 by +# Copyright 2005-2016 by # Werner Lemberg and Detlef Würkner. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/amiga/src/base/ftdebug.c b/lib/freetype/builds/amiga/src/base/ftdebug.c index 14c353e3c..4ac6eefd6 100644 --- a/lib/freetype/builds/amiga/src/base/ftdebug.c +++ b/lib/freetype/builds/amiga/src/base/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component for amiga (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/amiga/src/base/ftsystem.c b/lib/freetype/builds/amiga/src/base/ftsystem.c index bb3ccfd13..080eaef3e 100644 --- a/lib/freetype/builds/amiga/src/base/ftsystem.c +++ b/lib/freetype/builds/amiga/src/base/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Amiga-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, Werner Lemberg and Detlef Würkner. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/ansi/ansi-def.mk b/lib/freetype/builds/ansi/ansi-def.mk index 35b9f32fe..933232d58 100644 --- a/lib/freetype/builds/ansi/ansi-def.mk +++ b/lib/freetype/builds/ansi/ansi-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/ansi/ansi.mk b/lib/freetype/builds/ansi/ansi.mk index 2816e14fe..19a3e1f23 100644 --- a/lib/freetype/builds/ansi/ansi.mk +++ b/lib/freetype/builds/ansi/ansi.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/atari/ATARI.H b/lib/freetype/builds/atari/ATARI.H index 9f78c924b..4ddd2eb2e 100644 --- a/lib/freetype/builds/atari/ATARI.H +++ b/lib/freetype/builds/atari/ATARI.H @@ -1,4 +1,4 @@ -#if defined( __GXVALID_H__ ) +#if defined( GXVALID_H_ ) #pragma warn -aus /* too many unevaluated variables in gxvalid */ #endif diff --git a/lib/freetype/builds/atari/README.TXT b/lib/freetype/builds/atari/README.TXT index 04eec6351..ffe65456d 100644 --- a/lib/freetype/builds/atari/README.TXT +++ b/lib/freetype/builds/atari/README.TXT @@ -18,8 +18,8 @@ To compile FreeType 2 as a library the following changes must be applied: - The file `freetype2/include/Ft2build.h' must be patched as follows to include ATARI.H: - #ifndef __FT2_BUILD_GENERIC_H__ - #define __FT2_BUILD_GENERIC_H__ + #ifndef FT2_BUILD_GENERIC_H_ + #define FT2_BUILD_GENERIC_H_ #include "ATARI.H" @@ -43,8 +43,8 @@ ge - In der Datei freetype2/include/Ft2build.h muss zu Beginn ein #include "ATARI.H" wie folgt eingefgt werden: - #ifndef __FT2_BUILD_GENERIC_H__ - #define __FT2_BUILD_GENERIC_H__ + #ifndef FT2_BUILD_GENERIC_H_ + #define FT2_BUILD_GENERIC_H_ #include "ATARI.H" diff --git a/lib/freetype/builds/beos/beos-def.mk b/lib/freetype/builds/beos/beos-def.mk index 5ddedc037..edd356ec2 100644 --- a/lib/freetype/builds/beos/beos-def.mk +++ b/lib/freetype/builds/beos/beos-def.mk @@ -5,7 +5,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/beos/beos.mk b/lib/freetype/builds/beos/beos.mk index 6c7fca11c..4b9e0971d 100644 --- a/lib/freetype/builds/beos/beos.mk +++ b/lib/freetype/builds/beos/beos.mk @@ -2,7 +2,7 @@ # FreeType 2 configuration rules for a BeOS system # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/beos/detect.mk b/lib/freetype/builds/beos/detect.mk index b23f94ee7..e85bc4172 100644 --- a/lib/freetype/builds/beos/detect.mk +++ b/lib/freetype/builds/beos/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/cmake/iOS.cmake b/lib/freetype/builds/cmake/iOS.cmake index 7970f2b10..9fb20c093 100644 --- a/lib/freetype/builds/cmake/iOS.cmake +++ b/lib/freetype/builds/cmake/iOS.cmake @@ -1,6 +1,6 @@ # iOS.cmake # -# Copyright 2014-2015 by +# Copyright 2014-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # Written by David Wimsey diff --git a/lib/freetype/builds/cmake/testbuild.sh b/lib/freetype/builds/cmake/testbuild.sh index 5af669c37..e05dd29cf 100755 --- a/lib/freetype/builds/cmake/testbuild.sh +++ b/lib/freetype/builds/cmake/testbuild.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -# Copyright 2015 by +# Copyright 2015-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/ansi-cc.mk b/lib/freetype/builds/compiler/ansi-cc.mk index c9f66088e..688b0c735 100644 --- a/lib/freetype/builds/compiler/ansi-cc.mk +++ b/lib/freetype/builds/compiler/ansi-cc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/bcc-dev.mk b/lib/freetype/builds/compiler/bcc-dev.mk index 8ab957e9c..a53fcefa5 100644 --- a/lib/freetype/builds/compiler/bcc-dev.mk +++ b/lib/freetype/builds/compiler/bcc-dev.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/bcc.mk b/lib/freetype/builds/compiler/bcc.mk index f38384064..398b85303 100644 --- a/lib/freetype/builds/compiler/bcc.mk +++ b/lib/freetype/builds/compiler/bcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/emx.mk b/lib/freetype/builds/compiler/emx.mk index 62fe35df7..2ce52be46 100644 --- a/lib/freetype/builds/compiler/emx.mk +++ b/lib/freetype/builds/compiler/emx.mk @@ -3,7 +3,7 @@ # -# Copyright 2003-2015 by +# Copyright 2003-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/gcc-dev.mk b/lib/freetype/builds/compiler/gcc-dev.mk index fd789af9e..f87f94d9d 100644 --- a/lib/freetype/builds/compiler/gcc-dev.mk +++ b/lib/freetype/builds/compiler/gcc-dev.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/gcc.mk b/lib/freetype/builds/compiler/gcc.mk index 0970d1c55..e102c6d34 100644 --- a/lib/freetype/builds/compiler/gcc.mk +++ b/lib/freetype/builds/compiler/gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/intelc.mk b/lib/freetype/builds/compiler/intelc.mk index 19e5962ea..b2e704707 100644 --- a/lib/freetype/builds/compiler/intelc.mk +++ b/lib/freetype/builds/compiler/intelc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/unix-lcc.mk b/lib/freetype/builds/compiler/unix-lcc.mk index ebe330654..20011f884 100644 --- a/lib/freetype/builds/compiler/unix-lcc.mk +++ b/lib/freetype/builds/compiler/unix-lcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/visualage.mk b/lib/freetype/builds/compiler/visualage.mk index db997faa3..14e6229f3 100644 --- a/lib/freetype/builds/compiler/visualage.mk +++ b/lib/freetype/builds/compiler/visualage.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/visualc.mk b/lib/freetype/builds/compiler/visualc.mk index 900c8bea2..62dc9d217 100644 --- a/lib/freetype/builds/compiler/visualc.mk +++ b/lib/freetype/builds/compiler/visualc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/watcom.mk b/lib/freetype/builds/compiler/watcom.mk index f83425e2b..da3d19ded 100644 --- a/lib/freetype/builds/compiler/watcom.mk +++ b/lib/freetype/builds/compiler/watcom.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/compiler/win-lcc.mk b/lib/freetype/builds/compiler/win-lcc.mk index 9e4f79df2..bd0d4bee4 100644 --- a/lib/freetype/builds/compiler/win-lcc.mk +++ b/lib/freetype/builds/compiler/win-lcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/detect.mk b/lib/freetype/builds/detect.mk index 4b789d3ab..cea55a57e 100644 --- a/lib/freetype/builds/detect.mk +++ b/lib/freetype/builds/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/dos/detect.mk b/lib/freetype/builds/dos/detect.mk index e49ba98ca..b610e463d 100644 --- a/lib/freetype/builds/dos/detect.mk +++ b/lib/freetype/builds/dos/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/dos/dos-def.mk b/lib/freetype/builds/dos/dos-def.mk index ac0be5ebb..9aa0ee648 100644 --- a/lib/freetype/builds/dos/dos-def.mk +++ b/lib/freetype/builds/dos/dos-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/dos/dos-emx.mk b/lib/freetype/builds/dos/dos-emx.mk index c421674fb..3933abac7 100644 --- a/lib/freetype/builds/dos/dos-emx.mk +++ b/lib/freetype/builds/dos/dos-emx.mk @@ -3,7 +3,7 @@ # -# Copyright 2003-2015 by +# Copyright 2003-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/dos/dos-gcc.mk b/lib/freetype/builds/dos/dos-gcc.mk index 991fb64ac..e191a8134 100644 --- a/lib/freetype/builds/dos/dos-gcc.mk +++ b/lib/freetype/builds/dos/dos-gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/dos/dos-wat.mk b/lib/freetype/builds/dos/dos-wat.mk index 0c34a0d90..a0fe4c94b 100644 --- a/lib/freetype/builds/dos/dos-wat.mk +++ b/lib/freetype/builds/dos/dos-wat.mk @@ -3,7 +3,7 @@ # -# Copyright 2003-2015 by +# Copyright 2003-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/exports.mk b/lib/freetype/builds/exports.mk index 687ced7ba..9685f1f49 100644 --- a/lib/freetype/builds/exports.mk +++ b/lib/freetype/builds/exports.mk @@ -3,7 +3,7 @@ # -# Copyright 2005-2015 by +# Copyright 2005-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/freetype.mk b/lib/freetype/builds/freetype.mk index 1cc7e29bc..43766beac 100644 --- a/lib/freetype/builds/freetype.mk +++ b/lib/freetype/builds/freetype.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/link_dos.mk b/lib/freetype/builds/link_dos.mk index 694845b9e..f04cc70c9 100644 --- a/lib/freetype/builds/link_dos.mk +++ b/lib/freetype/builds/link_dos.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/link_std.mk b/lib/freetype/builds/link_std.mk index 886b2e6b3..a5d192e88 100644 --- a/lib/freetype/builds/link_std.mk +++ b/lib/freetype/builds/link_std.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/mac/ftmac.c b/lib/freetype/builds/mac/ftmac.c index 7e2f292d1..4691deda0 100644 --- a/lib/freetype/builds/mac/ftmac.c +++ b/lib/freetype/builds/mac/ftmac.c @@ -5,7 +5,7 @@ /* Mac FOND support. Written by just@letterror.com. */ /* Heavily Fixed by mpsuzuki, George Williams and Sean McBride */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/modules.mk b/lib/freetype/builds/modules.mk index 0b8b0c1ff..787f86468 100644 --- a/lib/freetype/builds/modules.mk +++ b/lib/freetype/builds/modules.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/os2/detect.mk b/lib/freetype/builds/os2/detect.mk index fde932743..df0579230 100644 --- a/lib/freetype/builds/os2/detect.mk +++ b/lib/freetype/builds/os2/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/os2/os2-def.mk b/lib/freetype/builds/os2/os2-def.mk index 691036f1d..b8d4d7be4 100644 --- a/lib/freetype/builds/os2/os2-def.mk +++ b/lib/freetype/builds/os2/os2-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/os2/os2-dev.mk b/lib/freetype/builds/os2/os2-dev.mk index eacf58f8a..629d766e2 100644 --- a/lib/freetype/builds/os2/os2-dev.mk +++ b/lib/freetype/builds/os2/os2-dev.mk @@ -5,7 +5,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/os2/os2-gcc.mk b/lib/freetype/builds/os2/os2-gcc.mk index 8390a36fe..b3e590be7 100644 --- a/lib/freetype/builds/os2/os2-gcc.mk +++ b/lib/freetype/builds/os2/os2-gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/symbian/bld.inf b/lib/freetype/builds/symbian/bld.inf index b5aeb1e5b..cbbdc3abb 100644 --- a/lib/freetype/builds/symbian/bld.inf +++ b/lib/freetype/builds/symbian/bld.inf @@ -2,7 +2,7 @@ // FreeType 2 project for the symbian platform // -// Copyright 2008-2015 by +// Copyright 2008-2016 by // David Turner, Robert Wilhelm, and Werner Lemberg. // // This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/symbian/freetype.mmp b/lib/freetype/builds/symbian/freetype.mmp index b7691f07f..19440541b 100644 --- a/lib/freetype/builds/symbian/freetype.mmp +++ b/lib/freetype/builds/symbian/freetype.mmp @@ -2,7 +2,7 @@ // FreeType 2 makefile for the symbian platform // -// Copyright 2008-2015 by +// Copyright 2008-2016 by // David Turner, Robert Wilhelm, and Werner Lemberg. // // This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/toplevel.mk b/lib/freetype/builds/toplevel.mk index 243c11330..7cea85dca 100644 --- a/lib/freetype/builds/toplevel.mk +++ b/lib/freetype/builds/toplevel.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/config.guess b/lib/freetype/builds/unix/config.guess index b3f905370..3d2c4507d 100644 --- a/lib/freetype/builds/unix/config.guess +++ b/lib/freetype/builds/unix/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2015 Free Software Foundation, Inc. +# Copyright 1992-2016 Free Software Foundation, Inc. -timestamp='2015-10-21' +timestamp='2016-01-01' # 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 @@ -27,7 +27,7 @@ timestamp='2015-10-21' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to . @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2015 Free Software Foundation, Inc. +Copyright 1992-2016 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -237,6 +237,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit ;; + *:LibertyBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/LibertyBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} exit ;; @@ -1393,6 +1397,9 @@ EOF x86_64:VMkernel:*:*) echo ${UNAME_MACHINE}-unknown-esx exit ;; + amd64:Isilon\ OneFS:*:*) + echo x86_64-unknown-onefs + exit ;; esac cat >&2 <. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.6.2' -PACKAGE_STRING='FreeType 2.6.2' +PACKAGE_VERSION='2.6.3' +PACKAGE_STRING='FreeType 2.6.3' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -1328,7 +1328,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.6.2 to adapt to many kinds of systems. +\`configure' configures FreeType 2.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1393,7 +1393,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.6.2:";; + short | recursive ) echo "Configuration of FreeType 2.6.3:";; esac cat <<\_ACEOF @@ -1539,7 +1539,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.6.2 +FreeType configure 2.6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2137,7 +2137,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.6.2, which was +It was created by FreeType $as_me 2.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2493,7 +2493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='18:2:12' +version_info='18:3:12' ft_version=`echo $version_info | tr : .` @@ -14694,7 +14694,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.6.2, which was +This file was extended by FreeType $as_me 2.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14760,7 +14760,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.6.2 +FreeType config.status 2.6.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/lib/freetype/builds/unix/configure.ac b/lib/freetype/builds/unix/configure.ac index 2ca3053e8..b568e51e0 100644 --- a/lib/freetype/builds/unix/configure.ac +++ b/lib/freetype/builds/unix/configure.ac @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001-2015 by +# Copyright 2001-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -11,13 +11,13 @@ # indicate that you have read the license and understand and accept it # fully. -AC_INIT([FreeType], [2.6.2], [freetype@nongnu.org], [freetype]) +AC_INIT([FreeType], [2.6.3], [freetype@nongnu.org], [freetype]) AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='18:2:12' +version_info='18:3:12' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/lib/freetype/builds/unix/configure.raw b/lib/freetype/builds/unix/configure.raw index 7f4986f7e..1be10a3ca 100644 --- a/lib/freetype/builds/unix/configure.raw +++ b/lib/freetype/builds/unix/configure.raw @@ -2,7 +2,7 @@ # # Process this file with autoconf to produce a configure script. # -# Copyright 2001-2015 by +# Copyright 2001-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,7 +17,7 @@ AC_CONFIG_SRCDIR([ftconfig.in]) # Don't forget to update docs/VERSION.DLL! -version_info='18:2:12' +version_info='18:3:12' AC_SUBST([version_info]) ft_version=`echo $version_info | tr : .` AC_SUBST([ft_version]) diff --git a/lib/freetype/builds/unix/detect.mk b/lib/freetype/builds/unix/detect.mk index 025ed491d..557dc92ac 100644 --- a/lib/freetype/builds/unix/detect.mk +++ b/lib/freetype/builds/unix/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/freetype-config.in b/lib/freetype/builds/unix/freetype-config.in index bb80e8c0f..142bf002b 100644 --- a/lib/freetype/builds/unix/freetype-config.in +++ b/lib/freetype/builds/unix/freetype-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright 2000-2015 by +# Copyright 2000-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/freetype2.m4 b/lib/freetype/builds/unix/freetype2.m4 index 3dc88076a..1462fc791 100644 --- a/lib/freetype/builds/unix/freetype2.m4 +++ b/lib/freetype/builds/unix/freetype2.m4 @@ -1,7 +1,7 @@ # Configure paths for FreeType2 # Marcelo Magallon 2001-10-26, based on gtk.m4 by Owen Taylor # -# Copyright 2001-2015 by +# Copyright 2001-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/ft-munmap.m4 b/lib/freetype/builds/unix/ft-munmap.m4 index 72b08645d..db798d8d9 100644 --- a/lib/freetype/builds/unix/ft-munmap.m4 +++ b/lib/freetype/builds/unix/ft-munmap.m4 @@ -1,6 +1,6 @@ ## FreeType specific autoconf tests # -# Copyright 2002-2015 by +# Copyright 2002-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/ftconfig.h b/lib/freetype/builds/unix/ftconfig.h index 185964b6a..0e1945b7c 100644 --- a/lib/freetype/builds/unix/ftconfig.h +++ b/lib/freetype/builds/unix/ftconfig.h @@ -5,7 +5,7 @@ /* */ /* UNIX-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -35,8 +35,8 @@ /*************************************************************************/ -#ifndef __FTCONFIG_H__ -#define __FTCONFIG_H__ +#ifndef FTCONFIG_H_ +#define FTCONFIG_H_ #include #include FT_CONFIG_OPTIONS_H @@ -306,7 +306,13 @@ FT_BEGIN_HEADER /* */ #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) -#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ +#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L + +#define FT_LONG64 +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int + +#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 @@ -340,7 +346,7 @@ FT_BEGIN_HEADER #define FT_INT64 long long int #define FT_UINT64 unsigned long long int -#endif /* _MSC_VER */ +#endif /* __STDC_VERSION__ >= 199901L */ #endif /* FT_SIZEOF_LONG == 8 */ @@ -492,7 +498,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTCONFIG_H__ */ +#endif /* FTCONFIG_H_ */ /* END */ diff --git a/lib/freetype/builds/unix/ftconfig.in b/lib/freetype/builds/unix/ftconfig.in index fc5c89ba3..fbb1c1474 100644 --- a/lib/freetype/builds/unix/ftconfig.in +++ b/lib/freetype/builds/unix/ftconfig.in @@ -4,7 +4,7 @@ /* */ /* UNIX-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -34,8 +34,8 @@ /*************************************************************************/ -#ifndef __FTCONFIG_H__ -#define __FTCONFIG_H__ +#ifndef FTCONFIG_H_ +#define FTCONFIG_H_ #include #include FT_CONFIG_OPTIONS_H @@ -305,7 +305,13 @@ FT_BEGIN_HEADER /* */ #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) -#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ +#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L + +#define FT_LONG64 +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int + +#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 @@ -339,7 +345,7 @@ FT_BEGIN_HEADER #define FT_INT64 long long int #define FT_UINT64 unsigned long long int -#endif /* _MSC_VER */ +#endif /* __STDC_VERSION__ >= 199901L */ #endif /* FT_SIZEOF_LONG == 8 */ @@ -491,7 +497,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTCONFIG_H__ */ +#endif /* FTCONFIG_H_ */ /* END */ diff --git a/lib/freetype/builds/unix/ftsystem.c b/lib/freetype/builds/unix/ftsystem.c index d7513d9e9..a5e44591c 100644 --- a/lib/freetype/builds/unix/ftsystem.c +++ b/lib/freetype/builds/unix/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Unix-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/unix/install.mk b/lib/freetype/builds/unix/install.mk index c7a20a35e..f944c5c23 100644 --- a/lib/freetype/builds/unix/install.mk +++ b/lib/freetype/builds/unix/install.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -28,8 +28,11 @@ # installing new files to avoid interferences with files installed by # previous FreeType versions (which use slightly different locations). # +# We also remove `$(includedir)/ft2build.h' for the same reason. +# install: $(PROJECT_LIBRARY) -$(DELDIR) $(DESTDIR)$(includedir)/freetype2 + -$(DELETE) $(DESTDIR)$(includedir)/ft2build.h $(MKINSTALLDIRS) $(DESTDIR)$(libdir) \ $(DESTDIR)$(libdir)/pkgconfig \ $(DESTDIR)$(includedir)/freetype2/freetype/config \ diff --git a/lib/freetype/builds/unix/unix-cc.in b/lib/freetype/builds/unix/unix-cc.in index d53b25f6d..0083e05b0 100644 --- a/lib/freetype/builds/unix/unix-cc.in +++ b/lib/freetype/builds/unix/unix-cc.in @@ -2,7 +2,7 @@ # FreeType 2 template for Unix-specific compiler definitions # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/unix-def.in b/lib/freetype/builds/unix/unix-def.in index 3c2d599d0..f7b557fb4 100644 --- a/lib/freetype/builds/unix/unix-def.in +++ b/lib/freetype/builds/unix/unix-def.in @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -142,7 +142,7 @@ $(OBJ_BUILD)/freetype2.pc: $(TOP_DIR)/builds/unix/freetype2.in chmod a-w $@.tmp mv $@.tmp $@ -all: $(OBJ_BUILD)/freetype-config \ +all install: $(OBJ_BUILD)/freetype-config \ $(OBJ_BUILD)/freetype2.pc # EOF diff --git a/lib/freetype/builds/unix/unix-dev.mk b/lib/freetype/builds/unix/unix-dev.mk index 62de3445f..3c72e577f 100644 --- a/lib/freetype/builds/unix/unix-dev.mk +++ b/lib/freetype/builds/unix/unix-dev.mk @@ -6,7 +6,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/unix-lcc.mk b/lib/freetype/builds/unix/unix-lcc.mk index 328cc80eb..1c254d13a 100644 --- a/lib/freetype/builds/unix/unix-lcc.mk +++ b/lib/freetype/builds/unix/unix-lcc.mk @@ -6,7 +6,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/unix.mk b/lib/freetype/builds/unix/unix.mk index 542aa7fe3..fba1e1d87 100644 --- a/lib/freetype/builds/unix/unix.mk +++ b/lib/freetype/builds/unix/unix.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/unix/unixddef.mk b/lib/freetype/builds/unix/unixddef.mk index f3336408f..adba517d1 100644 --- a/lib/freetype/builds/unix/unixddef.mk +++ b/lib/freetype/builds/unix/unixddef.mk @@ -4,7 +4,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/vms/ftconfig.h b/lib/freetype/builds/vms/ftconfig.h index 4a3fa09b5..fb75e4064 100644 --- a/lib/freetype/builds/vms/ftconfig.h +++ b/lib/freetype/builds/vms/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* VMS-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -33,8 +33,8 @@ /* */ /*************************************************************************/ -#ifndef __FTCONFIG_H__ -#define __FTCONFIG_H__ +#ifndef FTCONFIG_H_ +#define FTCONFIG_H_ #include #include FT_CONFIG_OPTIONS_H @@ -248,7 +248,13 @@ FT_BEGIN_HEADER /* */ #elif !defined( __STDC__ ) || defined( FT_CONFIG_OPTION_FORCE_INT64 ) -#if defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ +#if defined( __STDC_VERSION__ ) && __STDC_VERSION__ >= 199901L + +#define FT_LONG64 +#define FT_INT64 long long int +#define FT_UINT64 unsigned long long int + +#elif defined( _MSC_VER ) && _MSC_VER >= 900 /* Visual C++ (and Intel C++) */ /* this compiler provides the __int64 type */ #define FT_LONG64 @@ -282,7 +288,7 @@ FT_BEGIN_HEADER #define FT_INT64 long long int #define FT_UINT64 unsigned long long int -#endif /* _MSC_VER */ +#endif /* __STDC_VERSION__ >= 199901L */ #endif /* FT_SIZEOF_LONG == (64 / FT_CHAR_BIT) */ @@ -434,7 +440,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTCONFIG_H__ */ +#endif /* FTCONFIG_H_ */ /* END */ diff --git a/lib/freetype/builds/vms/ftsystem.c b/lib/freetype/builds/vms/ftsystem.c index 74d3392ce..a13cb220e 100644 --- a/lib/freetype/builds/vms/ftsystem.c +++ b/lib/freetype/builds/vms/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* VMS-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/wince/ftdebug.c b/lib/freetype/builds/wince/ftdebug.c index 17b4d6145..6e35e170c 100644 --- a/lib/freetype/builds/wince/ftdebug.c +++ b/lib/freetype/builds/wince/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component for WinCE (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj b/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj index 9097566dc..020d954f6 100644 --- a/lib/freetype/builds/wince/vc2005-ce/freetype.vcproj +++ b/lib/freetype/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/lib/freetype/builds/wince/vc2005-ce/index.html b/lib/freetype/builds/wince/vc2005-ce/index.html index fffdd92be..a477550f9 100644 --- a/lib/freetype/builds/wince/vc2005-ce/index.html +++ b/lib/freetype/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.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj b/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj index 2ad69022b..8a87e3c71 100644 --- a/lib/freetype/builds/wince/vc2008-ce/freetype.vcproj +++ b/lib/freetype/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.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/windows/detect.mk b/lib/freetype/builds/windows/detect.mk index 26297f20f..087230310 100644 --- a/lib/freetype/builds/windows/detect.mk +++ b/lib/freetype/builds/windows/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/ftdebug.c b/lib/freetype/builds/windows/ftdebug.c index 09c3b65a7..f29cca08b 100644 --- a/lib/freetype/builds/windows/ftdebug.c +++ b/lib/freetype/builds/windows/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component for Win32 (body). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/lib/freetype/builds/windows/vc2005/freetype.vcproj b/lib/freetype/builds/windows/vc2005/freetype.vcproj index 3c550df6f..e9310eca2 100644 --- a/lib/freetype/builds/windows/vc2005/freetype.vcproj +++ b/lib/freetype/builds/windows/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/lib/freetype/builds/windows/vc2005/index.html b/lib/freetype/builds/windows/vc2005/index.html index 998451783..bc6751e32 100644 --- a/lib/freetype/builds/windows/vc2005/index.html +++ b/lib/freetype/builds/windows/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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/windows/vc2008/freetype.vcproj b/lib/freetype/builds/windows/vc2008/freetype.vcproj index 54f7f4a18..c90a08c5d 100644 --- a/lib/freetype/builds/windows/vc2008/freetype.vcproj +++ b/lib/freetype/builds/windows/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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/windows/vc2010/freetype.vcxproj b/lib/freetype/builds/windows/vc2010/freetype.vcxproj index 3709ef3c7..96f76cae8 100644 --- a/lib/freetype/builds/windows/vc2010/freetype.vcxproj +++ b/lib/freetype/builds/windows/vc2010/freetype.vcxproj @@ -191,18 +191,18 @@ - freetype262d - freetype262d - freetype262MTd - freetype262MTd - freetype262STd - freetype262STd - freetype262 - freetype262 - freetype262MT - freetype262MT - freetype262ST - freetype262ST + freetype263d + freetype263d + freetype263MTd + freetype263MTd + freetype263STd + freetype263STd + freetype263 + freetype263 + freetype263MT + freetype263MT + freetype263ST + freetype263ST diff --git a/lib/freetype/builds/windows/vc2010/index.html b/lib/freetype/builds/windows/vc2010/index.html index 31ab72800..aaac97923 100644 --- a/lib/freetype/builds/windows/vc2010/index.html +++ b/lib/freetype/builds/windows/vc2010/index.html @@ -12,16 +12,16 @@

    This directory contains a project file for Visual C++ (VS.NET 2010 or newer), named freetype.vcxproj, and Visual Studio, called freetype.sln. It compiles the following libraries from the -FreeType 2.6.2 sources:

    +FreeType 2.6.3 sources:

      -    freetype262.lib    - release build
-    freetype262d.lib   - debug build
-    freetype262ST.lib  - release build; single threaded
-    freetype262STd.lib - debug build;   single threaded
-    freetype262MT.lib  - release build; multi-threaded
-    freetype262MTd.lib - debug build;   multi-threaded
      + freetype263.lib - release build + freetype263d.lib - debug build + freetype263ST.lib - release build; single threaded + freetype263STd.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MTd.lib - debug build; multi-threaded

    Both Win32 and x64 builds are supported.

    diff --git a/lib/freetype/builds/windows/visualc/freetype.dsp b/lib/freetype/builds/windows/visualc/freetype.dsp index 58bcbee4f..0ffc9ad1c 100644 --- a/lib/freetype/builds/windows/visualc/freetype.dsp +++ b/lib/freetype/builds/windows/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\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263.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\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263_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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT_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\freetype262.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT.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\freetype262.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype262ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype263ST.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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263ST_D.lib" !ENDIF diff --git a/lib/freetype/builds/windows/visualc/freetype.vcproj b/lib/freetype/builds/windows/visualc/freetype.vcproj index 7e2963d92..462223a6b 100644 --- a/lib/freetype/builds/windows/visualc/freetype.vcproj +++ b/lib/freetype/builds/windows/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.6.2 sources:

    +compiles the following libraries from the FreeType 2.6.3 sources:

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/windows/visualce/freetype.dsp b/lib/freetype/builds/windows/visualce/freetype.dsp index 58bcbee4f..0ffc9ad1c 100644 --- a/lib/freetype/builds/windows/visualce/freetype.dsp +++ b/lib/freetype/builds/windows/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\freetype262.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263.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\freetype262_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263_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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT_D.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT_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\freetype262.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262MT.lib" +# ADD BASE LIB32 /nologo /out:"lib\freetype263.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263MT.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\freetype262.lib" -# ADD LIB32 /out:"..\..\..\objs\freetype262ST.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263.lib" +# ADD LIB32 /out:"..\..\..\objs\freetype263ST.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\freetype262_D.lib" -# ADD LIB32 /nologo /out:"..\..\..\objs\freetype262ST_D.lib" +# ADD BASE LIB32 /nologo /out:"..\..\..\objs\freetype263_D.lib" +# ADD LIB32 /nologo /out:"..\..\..\objs\freetype263ST_D.lib" !ENDIF diff --git a/lib/freetype/builds/windows/visualce/freetype.vcproj b/lib/freetype/builds/windows/visualce/freetype.vcproj index d5de12315..fa097bd3f 100644 --- a/lib/freetype/builds/windows/visualce/freetype.vcproj +++ b/lib/freetype/builds/windows/visualce/freetype.vcproj @@ -87,7 +87,7 @@ /> PPC/SP WM6 (Windows Mobile 6) -It compiles the following libraries from the FreeType 2.6.2 sources:

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

      -    freetype262.lib     - release build; single threaded
-    freetype262_D.lib   - debug build;   single threaded
-    freetype262MT.lib   - release build; multi-threaded
-    freetype262MT_D.lib - debug build;   multi-threaded
      + freetype263.lib - release build; single threaded + freetype263_D.lib - debug build; single threaded + freetype263MT.lib - release build; multi-threaded + freetype263MT_D.lib - debug build; multi-threaded

    Be sure to extract the files with the Windows (CR+LF) line endings. ZIP diff --git a/lib/freetype/builds/windows/w32-bcc.mk b/lib/freetype/builds/windows/w32-bcc.mk index d483df57a..269262227 100644 --- a/lib/freetype/builds/windows/w32-bcc.mk +++ b/lib/freetype/builds/windows/w32-bcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-bccd.mk b/lib/freetype/builds/windows/w32-bccd.mk index bd72ca117..2e52672a6 100644 --- a/lib/freetype/builds/windows/w32-bccd.mk +++ b/lib/freetype/builds/windows/w32-bccd.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-dev.mk b/lib/freetype/builds/windows/w32-dev.mk index 11d1afd3f..8ddbfb0ed 100644 --- a/lib/freetype/builds/windows/w32-dev.mk +++ b/lib/freetype/builds/windows/w32-dev.mk @@ -5,7 +5,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-gcc.mk b/lib/freetype/builds/windows/w32-gcc.mk index 1092fb785..04097d286 100644 --- a/lib/freetype/builds/windows/w32-gcc.mk +++ b/lib/freetype/builds/windows/w32-gcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-icc.mk b/lib/freetype/builds/windows/w32-icc.mk index b2dcbe59d..66a4dcbc6 100644 --- a/lib/freetype/builds/windows/w32-icc.mk +++ b/lib/freetype/builds/windows/w32-icc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-intl.mk b/lib/freetype/builds/windows/w32-intl.mk index de9912fa3..14ee7edf9 100644 --- a/lib/freetype/builds/windows/w32-intl.mk +++ b/lib/freetype/builds/windows/w32-intl.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-lcc.mk b/lib/freetype/builds/windows/w32-lcc.mk index 75979f38d..687c87fef 100644 --- a/lib/freetype/builds/windows/w32-lcc.mk +++ b/lib/freetype/builds/windows/w32-lcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-mingw32.mk b/lib/freetype/builds/windows/w32-mingw32.mk index 1300a44ac..03963b326 100644 --- a/lib/freetype/builds/windows/w32-mingw32.mk +++ b/lib/freetype/builds/windows/w32-mingw32.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-vcc.mk b/lib/freetype/builds/windows/w32-vcc.mk index fcf1aa004..68370e6a7 100644 --- a/lib/freetype/builds/windows/w32-vcc.mk +++ b/lib/freetype/builds/windows/w32-vcc.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/w32-wat.mk b/lib/freetype/builds/windows/w32-wat.mk index cc5eaf0a2..01d6a9bcc 100644 --- a/lib/freetype/builds/windows/w32-wat.mk +++ b/lib/freetype/builds/windows/w32-wat.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/builds/windows/win32-def.mk b/lib/freetype/builds/windows/win32-def.mk index 516c5cd95..6fd972fe1 100644 --- a/lib/freetype/builds/windows/win32-def.mk +++ b/lib/freetype/builds/windows/win32-def.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2015 by +# Copyright 1996-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/configure b/lib/freetype/configure index fd525816c..9a09a4271 100644 --- a/lib/freetype/configure +++ b/lib/freetype/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002-2015 by +# Copyright 2002-2016 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, diff --git a/lib/freetype/devel/ft2build.h b/lib/freetype/devel/ft2build.h index b9eade2dd..d055f51a2 100644 --- a/lib/freetype/devel/ft2build.h +++ b/lib/freetype/devel/ft2build.h @@ -4,7 +4,7 @@ /* */ /* FreeType 2 build and setup macros (development version). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,14 +27,14 @@ * */ -#ifndef __FT2BUILD_H__ -#define __FT2BUILD_H__ +#ifndef FT2BUILD_H_ +#define FT2BUILD_H_ #define FT_CONFIG_OPTIONS_H #include -#endif /* __FT2BUILD_H__ */ +#endif /* FT2BUILD_H_ */ /* END */ diff --git a/lib/freetype/devel/ftoption.h b/lib/freetype/devel/ftoption.h index f68b3adec..b354efdcd 100644 --- a/lib/freetype/devel/ftoption.h +++ b/lib/freetype/devel/ftoption.h @@ -4,7 +4,7 @@ /* */ /* User-selectable configuration macros (specification only). */ /* */ -/* Copyright 1996-2015 by */ +/* Copyright 1996-2016 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -16,8 +16,8 @@ /***************************************************************************/ -#ifndef __FTOPTION_H__ -#define __FTOPTION_H__ +#ifndef FTOPTION_H_ +#define FTOPTION_H_ #include @@ -605,56 +605,6 @@ FT_BEGIN_HEADER #define TT_CONFIG_OPTION_SUBPIXEL_HINTING - /*************************************************************************/ - /* */ - /* If you define TT_CONFIG_OPTION_UNPATENTED_HINTING, a special version */ - /* of the TrueType bytecode interpreter is used that doesn't implement */ - /* any of the patented opcodes and algorithms. The patents related to */ - /* TrueType hinting have expired worldwide since May 2010; this option */ - /* is now deprecated. */ - /* */ - /* Note that the TT_CONFIG_OPTION_UNPATENTED_HINTING macro is *ignored* */ - /* if you define TT_CONFIG_OPTION_BYTECODE_INTERPRETER; in other words, */ - /* either define TT_CONFIG_OPTION_BYTECODE_INTERPRETER or */ - /* TT_CONFIG_OPTION_UNPATENTED_HINTING but not both at the same time. */ - /* */ - /* This macro is only useful for a small number of font files (mostly */ - /* for Asian scripts) that require bytecode interpretation to properly */ - /* load glyphs. For all other fonts, this produces unpleasant results, */ - /* thus the unpatented interpreter is never used to load glyphs from */ - /* TrueType fonts unless one of the following two options is used. */ - /* */ - /* - The unpatented interpreter is explicitly activated by the user */ - /* through the FT_PARAM_TAG_UNPATENTED_HINTING parameter tag */ - /* when opening the FT_Face. */ - /* */ - /* - FreeType detects that the FT_Face corresponds to one of the */ - /* `trick' fonts (e.g., `Mingliu') it knows about. The font engine */ - /* contains a hard-coded list of font names and other matching */ - /* parameters (see function `tt_face_init' in file */ - /* `src/truetype/ttobjs.c'). */ - /* */ - /* Here a sample code snippet for using FT_PARAM_TAG_UNPATENTED_HINTING. */ - /* */ - /* { */ - /* FT_Parameter parameter; */ - /* FT_Open_Args open_args; */ - /* */ - /* */ - /* parameter.tag = FT_PARAM_TAG_UNPATENTED_HINTING; */ - /* */ - /* open_args.flags = FT_OPEN_PATHNAME | FT_OPEN_PARAMS; */ - /* open_args.pathname = my_font_pathname; */ - /* open_args.num_params = 1; */ - /* open_args.params = ¶meter; */ - /* */ - /* error = FT_Open_Face( library, &open_args, index, &face ); */ - /* ... */ - /* } */ - /* */ -/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */ - - /*************************************************************************/ /* */ /* Define TT_CONFIG_OPTION_COMPONENT_OFFSET_SCALED to compile the */ @@ -856,14 +806,11 @@ FT_BEGIN_HEADER /* - * This macro is defined if either unpatented or native TrueType - * hinting is requested by the definitions above. + * This macro is defined if native TrueType hinting is requested by the + * definitions above. */ #ifdef TT_CONFIG_OPTION_BYTECODE_INTERPRETER #define TT_USE_BYTECODE_INTERPRETER -#undef TT_CONFIG_OPTION_UNPATENTED_HINTING -#elif defined TT_CONFIG_OPTION_UNPATENTED_HINTING -#define TT_USE_BYTECODE_INTERPRETER #endif @@ -898,7 +845,7 @@ FT_BEGIN_HEADER FT_END_HEADER -#endif /* __FTOPTION_H__ */ +#endif /* FTOPTION_H_ */ /* END */ diff --git a/lib/freetype/docs/CHANGES b/lib/freetype/docs/CHANGES index 67ab23329..ee2f21d1d 100644 --- a/lib/freetype/docs/CHANGES +++ b/lib/freetype/docs/CHANGES @@ -1,4 +1,53 @@ +CHANGES BETWEEN 2.6.2 and 2.6.3 + + I. IMPORTANT CHANGES + + - Khmer, Myanmar, Bengali, and Kannada script support has been + added to the auto-hinter. + + + II. MISCELLANEOUS + + - Better support of Indic scripts like Devanagari by using a + top-to-bottom hinting flow. + + - All FreeType macros starting with two underscores have been + renamed to avoid a violation of both the C and C++ standards. + Example: Header macros of the form `__FOO_H__' are now called + `FOO_H_'. In most cases, this should be completely transparent + to the user. The exception to this is `__FTERRORS_H__', which + must be sometimes undefined by the user to get FreeType error + strings: Both this form and the new `FTERRORS_H_' macro are + accepted for backwards compatibility. + + - Minor improvements mainly to the Type 1 driver. + + - The new CFF engine now supports all Type 2 operators except + `random'. + + - The macro `_STANDALONE_', used for compiling the B/W and smooth + rasterizers as stand-alone modules, has been renamed to + `STANDALONE_', since macro names starting with an underscore and + followed by an uppercase letter are reserved in both C and C++. + + - Function `FT_Library_SetLcdFilterWeights' now also activates + custom LCD filter weights (instead of just adjusting them). + + - Support for `unpatented hinting' has been completely removed: + Consequently, the two functions `FT_Face_CheckTrueTypePatents' + and `FT_Face_SetUnpatentedHinting' now return always false, + doing nothing. + + - The `ftgamma' demo program has been modernized; the gamma grid + display has been moved from `ftview' to this program. + + - It is now possible to cycle through the available LCD fitlering + modes. + + +====================================================================== + CHANGES BETWEEN 2.6.1 and 2.6.2 I. IMPORTANT CHANGES @@ -4406,7 +4455,7 @@ Extensions support: ------------------------------------------------------------------------ -Copyright 2000-2015 by +Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/CUSTOMIZE b/lib/freetype/docs/CUSTOMIZE index 42fc31381..e8817b72b 100644 --- a/lib/freetype/docs/CUSTOMIZE +++ b/lib/freetype/docs/CUSTOMIZE @@ -117,15 +117,15 @@ IV. Overriding default configuration and module headers name the configuration headers. To do so, you need a custom `ft2build.h' whose content can be as simple as: - #ifndef __FT2_BUILD_MY_PLATFORM_H__ - #define __FT2_BUILD_MY_PLATFORM_H__ + #ifndef FT2_BUILD_MY_PLATFORM_H_ + #define FT2_BUILD_MY_PLATFORM_H_ #define FT_CONFIG_OPTIONS_H #define FT_CONFIG_MODULES_H #include - #endif /* __FT2_BUILD_MY_PLATFORM_H__ */ + #endif /* FT2_BUILD_MY_PLATFORM_H_ */ Place those files in a separate directory, e.g., @@ -139,7 +139,7 @@ IV. Overriding default configuration and module headers ---------------------------------------------------------------------- -Copyright 2003-2015 by +Copyright 2003-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/DEBUG b/lib/freetype/docs/DEBUG index ab2c769ac..29e10721c 100644 --- a/lib/freetype/docs/DEBUG +++ b/lib/freetype/docs/DEBUG @@ -191,7 +191,7 @@ behaviour of FreeType at runtime. ------------------------------------------------------------------------ -Copyright 2002-2015 by +Copyright 2002-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/INSTALL b/lib/freetype/docs/INSTALL index 193c5300a..5155a4b2e 100644 --- a/lib/freetype/docs/INSTALL +++ b/lib/freetype/docs/INSTALL @@ -75,7 +75,7 @@ II. Custom builds of the library ---------------------------------------------------------------------- -Copyright 2000-2015 by +Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/INSTALL.ANY b/lib/freetype/docs/INSTALL.ANY index 23b66e46c..aae277308 100644 --- a/lib/freetype/docs/INSTALL.ANY +++ b/lib/freetype/docs/INSTALL.ANY @@ -143,7 +143,7 @@ II. Support for flat-directory compilation ---------------------------------------------------------------------- -Copyright 2003-2015 by +Copyright 2003-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/INSTALL.CROSS b/lib/freetype/docs/INSTALL.CROSS index a83638d64..428580416 100644 --- a/lib/freetype/docs/INSTALL.CROSS +++ b/lib/freetype/docs/INSTALL.CROSS @@ -163,7 +163,7 @@ procedure. ---------------------------------------------------------------------- -Copyright 2006-2015 by +Copyright 2006-2016 by suzuki toshiya, David Turner, Robert Wilhelm, and Werner Lemberg. diff --git a/lib/freetype/docs/INSTALL.GNU b/lib/freetype/docs/INSTALL.GNU index 1a7c09797..f1eb0819f 100644 --- a/lib/freetype/docs/INSTALL.GNU +++ b/lib/freetype/docs/INSTALL.GNU @@ -148,7 +148,7 @@ instructions in the file `INSTALL.UNIX' instead. ---------------------------------------------------------------------- -Copyright 2003-2015 by +Copyright 2003-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/INSTALL.UNIX b/lib/freetype/docs/INSTALL.UNIX index 0dab2c60a..b043883a1 100644 --- a/lib/freetype/docs/INSTALL.UNIX +++ b/lib/freetype/docs/INSTALL.UNIX @@ -102,7 +102,7 @@ or MSys on Win32: ---------------------------------------------------------------------- -Copyright 2003-2015 by +Copyright 2003-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/INSTALL.VMS b/lib/freetype/docs/INSTALL.VMS index 48a323eae..ef371d70b 100644 --- a/lib/freetype/docs/INSTALL.VMS +++ b/lib/freetype/docs/INSTALL.VMS @@ -49,7 +49,7 @@ V7.2-1. ------------------------------------------------------------------------ -Copyright 2000-2015 by +Copyright 2000-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/LICENSE.TXT b/lib/freetype/docs/LICENSE.TXT index 99dc342d7..af5a1c50f 100644 --- a/lib/freetype/docs/LICENSE.TXT +++ b/lib/freetype/docs/LICENSE.TXT @@ -23,9 +23,11 @@ any of your projects or products. GPL. Note that the FTL is incompatible with GPLv2 due to its advertisement clause. -The contributed BDF and PCF drivers come with a license similar to that +The contributed BDF and PCF drivers come with a license similar to that of the X Window System. It is compatible to the above two licenses (see -file src/bdf/README and src/pcf/README). +file src/bdf/README and src/pcf/README). The same holds for the files +`fthash.c' and `fthash.h'; their code was part of the BDF driver in +earlier FreeType versions. The gzip module uses the zlib license (see src/gzip/zlib.h) which too is compatible to the above two licenses. diff --git a/lib/freetype/docs/TODO b/lib/freetype/docs/TODO index 43eeae349..4aa3f0904 100644 --- a/lib/freetype/docs/TODO +++ b/lib/freetype/docs/TODO @@ -27,7 +27,7 @@ Other bugs have been registered at the savannah bugzilla of FreeType. ------------------------------------------------------------------------ -Copyright 2001-2015 by +Copyright 2001-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/VERSION.DLL b/lib/freetype/docs/VERSION.DLL index 1cc1c5d9b..804c2f236 100644 --- a/lib/freetype/docs/VERSION.DLL +++ b/lib/freetype/docs/VERSION.DLL @@ -52,6 +52,7 @@ on _most_ systems, but not all of them: release libtool so ------------------------------- + 2.6.3 18.3.12 6.12.3 2.6.2 18.2.12 6.12.2 2.6.1 18.1.12 6.12.1 2.6.0 18.0.12 6.12.0 @@ -105,7 +106,7 @@ other release numbers. ------------------------------------------------------------------------ -Copyright 2002-2015 by +Copyright 2002-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/formats.txt b/lib/freetype/docs/formats.txt index 243919850..4966bd746 100644 --- a/lib/freetype/docs/formats.txt +++ b/lib/freetype/docs/formats.txt @@ -165,7 +165,7 @@ MAC --- PS TYPE_1 --- type1 T1_SPEC.pdf ------------------------------------------------------------------------ -Copyright 2004-2015 by +Copyright 2004-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/freetype-config.1 b/lib/freetype/docs/freetype-config.1 index ec7d87ec8..1720d476b 100644 --- a/lib/freetype/docs/freetype-config.1 +++ b/lib/freetype/docs/freetype-config.1 @@ -1,4 +1,4 @@ -.TH FREETYPE-CONFIG 1 "November 2015" "FreeType 2.6.2" +.TH FREETYPE-CONFIG 1 "February 2016" "FreeType 2.6.3" . . .SH NAME diff --git a/lib/freetype/docs/raster.txt b/lib/freetype/docs/raster.txt index dc55d64e5..5e8df51e3 100644 --- a/lib/freetype/docs/raster.txt +++ b/lib/freetype/docs/raster.txt @@ -618,7 +618,7 @@ II. Rendering Technology ------------------------------------------------------------------------ -Copyright 2003-2015 by +Copyright 2003-2016 by David Turner, Robert Wilhelm, and Werner Lemberg. This file is part of the FreeType project, and may only be used, diff --git a/lib/freetype/docs/reference/ft2-auto_hinter.html b/lib/freetype/docs/reference/ft2-auto_hinter.html index 497ce8af8..77c6a1c92 100644 --- a/lib/freetype/docs/reference/ft2-auto_hinter.html +++ b/lib/freetype/docs/reference/ft2-auto_hinter.html @@ -3,7 +3,7 @@ -FreeType-2.6.2 API Reference +FreeType-2.6.3 API Reference